diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2019-11-12 16:09:34 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2019-11-12 16:09:56 +0900 |
| commit | 52575733efa1b63a3f5fa615821c38c54387d409 (patch) | |
| tree | 2a96c99bddd684894ffe0c1aab414241e2f5d5f1 /configure.ac | |
| parent | 478150ad4e1d828cd9a7e500314d1dd2a273b73e (diff) | |
| download | libxslt-accepted/tizen/6.5/base/tool/20211027.120349.tar.gz libxslt-accepted/tizen/6.5/base/tool/20211027.120349.tar.bz2 libxslt-accepted/tizen/6.5/base/tool/20211027.120349.zip | |
Bump to libxslt 1.1.34tizen_6.5.m2_releasetizen_6.0.m2_releasesubmit/tizen_base/20201208.051733submit/tizen_base/20201208.051231submit/tizen_base/20201207.055733submit/tizen_base/20191112.071109submit/tizen_6.5_base/20211027.200801submit/tizen_6.5_base/20211027.183101submit/tizen_6.5_base/20211026.180901submit/tizen_6.0_base_hotfix/20201102.162701submit/tizen_6.0_base_hotfix/20201030.192501submit/tizen_6.0_base/20201029.184801accepted/tizen/base/20191118.234239accepted/tizen/6.5/base/tool/20211027.120349accepted/tizen/6.0/base/tool/hotfix/20201102.090337accepted/tizen/6.0/base/tool/hotfix/20201030.125028accepted/tizen/6.0/base/tool/20201029.112223accepted/tizen/6.0/base/20201029.110942tizen_6.0_base_hotfixbackup/libxslt-1.1.34-20220913accepted/tizen_6.0_base_tool_hotfix
Change-Id: Ia9f72aa71f565490443282cba6154ddc66e39280
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 66 |
1 files changed, 28 insertions, 38 deletions
diff --git a/configure.ac b/configure.ac index 325a7bea..05b4e862 100644 --- a/configure.ac +++ b/configure.ac @@ -508,37 +508,31 @@ dnl dnl Override other variables if LIBXML_SRC is set dnl -if test "x$LIBXML_SRC" != "x"; then - CWD=`pwd` - if cd $LIBXML_SRC; then - LIBXML_SRC=`pwd` - XML_CONFIG="${LIBXML_SRC}/xml2-config" - LIBXML_CFLAGS="-I${LIBXML_SRC}/include" - if test "$build_static_libs" = "no"; then - LIBXML_LIBS="-L${LIBXML_SRC} `$XML_CONFIG --libs --dynamic`" - else - LIBXML_LIBS="-L${LIBXML_SRC} `$XML_CONFIG --libs`" - fi - WITH_MODULES="`$XML_CONFIG --modules`" - cd $CWD - else - AC_MSG_ERROR([libxml source dir not found (${LIBXML_SRC}), typo?]) - fi +if test "x$LIBXML_SRC" != "x" +then + CWD=`pwd` + if cd $LIBXML_SRC + then + LIBXML_SRC=`pwd` + XML_CONFIG="${LIBXML_SRC}/xml2-config" + LIBXML_CFLAGS="-I${LIBXML_SRC}/include" + LIBXML_LIBS="-L${LIBXML_SRC} `$XML_CONFIG --libs`" + WITH_MODULES="`$XML_CONFIG --modules`" + cd $CWD + else + AC_MSG_ERROR([libxml source dir not found (${LIBXML_SRC}), typo?]) + fi fi dnl dnl Try pkg-config first if nothing is set dnl -if test "x$LIBXML_CONFIG_PREFIX" = "x" -a "x$LIBXML_LIBS" = "x"; then - if test "$build_static_libs" = "no"; then - PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= $LIBXML_REQUIRED_VERSION], [ - WITH_MODULES="`$PKG_CONFIG --variable=modules libxml-2.0`" - ], [ ]) - else - PKG_CHECK_MODULES_STATIC([LIBXML], [libxml-2.0 >= $LIBXML_REQUIRED_VERSION], - [ ], [ ]) - fi +if test "x$LIBXML_CONFIG_PREFIX" = "x" -a "x$LIBXML_LIBS" = "x" +then + PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= $LIBXML_REQUIRED_VERSION], [ + WITH_MODULES="`$PKG_CONFIG --variable=modules libxml-2.0`" + ], [ ]) fi dnl @@ -548,19 +542,15 @@ dnl if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1 then - AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) - XMLVERS=`$XML_CONFIG --version` - if test VERSION_TO_NUMBER(echo $XMLVERS) -ge VERSION_TO_NUMBER(echo $LIBXML_REQUIRED_VERSION); then - AC_MSG_RESULT($XMLVERS found) - else - AC_MSG_ERROR(Version $XMLVERS found. You need at least libxml2 $LIBXML_REQUIRED_VERSION for this version of libxslt) - fi - - if test "$build_static_libs" = "no"; then - LIBXML_LIBS="`$XML_CONFIG --libs --dynamic`" - else - LIBXML_LIBS="`$XML_CONFIG --libs`" - fi + AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) + XMLVERS=`$XML_CONFIG --version` + if test VERSION_TO_NUMBER(echo $XMLVERS) -ge VERSION_TO_NUMBER(echo $LIBXML_REQUIRED_VERSION) + then + AC_MSG_RESULT($XMLVERS found) + else + AC_MSG_ERROR(Version $XMLVERS found. You need at least libxml2 $LIBXML_REQUIRED_VERSION for this version of libxslt) + fi + LIBXML_LIBS="`$XML_CONFIG --libs`" LIBXML_CFLAGS="`$XML_CONFIG --cflags`" WITH_MODULES="`$XML_CONFIG --modules`" fi |