diff options
| author | Hugh McMaster <hugh.mcmaster@outlook.com> | 2020-08-21 22:25:25 +1000 |
|---|---|---|
| committer | Hugh McMaster <hugh.mcmaster@outlook.com> | 2020-09-08 23:40:09 +1000 |
| commit | abfdfb44cc00dfafbad4e594618621fce21590e1 (patch) | |
| tree | 0d65f261658d5ad88985742f7164cc66c510b27b | |
| parent | 3af116d61babd7042b42018c67a63baebf486df7 (diff) | |
| download | raptor-abfdfb44cc00dfafbad4e594618621fce21590e1.tar.gz | |
configure.ac: Allow use of pkg-config to detect the libxslt library
| -rw-r--r-- | configure.ac | 77 |
1 files changed, 40 insertions, 37 deletions
diff --git a/configure.ac b/configure.ac index de840405..adbd274d 100644 --- a/configure.ac +++ b/configure.ac @@ -571,6 +571,44 @@ if test "X$xslt_config" != "Xno" ; then fi fi +if test "X$XSLT_CONFIG" != "X"; then + XSLT_CFLAGS=`$XSLT_CONFIG --cflags` + XSLT_LIBS=`$XSLT_CONFIG --libs` + + CPPFLAGS="$XSLT_CFLAGS $CPPFLAGS" + LIBS="$LIBS $XSLT_LIBS" + + AC_CHECK_FUNC(xsltSaveResultToString, have_xsltSaveResultToString=yes, have_xsltSaveResultToString=no) + AC_MSG_CHECKING(for libxslt via xslt-config) + if test $have_xsltSaveResultToString = yes; then + have_libxslt=1 + LIBXSLT_VERSION=`$XSLT_CONFIG --version` + libxslt_version_dec=`echo $LIBXSLT_VERSION | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'` + libxslt_min_version_dec=`echo $libxslt_min_version | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + 3)};'` + AC_MSG_RESULT(yes - version $LIBXSLT_VERSION) + if test $libxslt_version_dec -lt $libxslt_min_version_dec; then + AC_MSG_WARN(Using libxslt $LIBXSLT_VERSION is unsupported - $libxslt_min_version or newer required.) + have_libxslt=0 + fi + fi + + AC_CHECK_FUNC(xsltInit) + + AC_CHECK_HEADERS(libxslt/xslt.h) + if test "$ac_cv_header_libxslt_xslt_h" = no ; then + AC_MSG_WARN(libxslt library found but not headers - disabling) + have_libxslt_lib=0 + have_libxslt=0 + fi + CPPFLAGS="$oCPPFLAGS" + LIBS="$oLIBS" +else + PKG_CHECK_MODULES([XSLT], [libxslt > $libxslt_min_version], [ + LIBXSLT_VERSION=`$PKG_CONFIG libxslt --modversion` + have_libxslt=1 + ], [have_libxslt=0]) +fi + dnl curl AC_ARG_WITH(curl-config, [ --with-curl-config=PATH Location of libcurl curl-config []], curl_config="$withval", curl_config="") @@ -734,41 +772,6 @@ fi CPPFLAGS="$oCPPFLAGS" LIBS="$oLIBS" - -have_libxslt=0 - -if test "X$XSLT_CONFIG" != X; then - CPPFLAGS="`$XSLT_CONFIG --cflags` $CPPFLAGS" - LIBS="$LIBS `$XSLT_CONFIG --libs`" - AC_CHECK_FUNC(xsltSaveResultToString, have_xsltSaveResultToString=yes, have_xsltSaveResultToString=no) - AC_MSG_CHECKING(for system libxslt library) - if test $have_xsltSaveResultToString = yes; then - have_libxslt=1 - LIBXSLT_VERSION=`$XSLT_CONFIG --version` - libxslt_version_dec=`echo $LIBXSLT_VERSION | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'` - libxslt_min_version_dec=`echo $libxslt_min_version | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'` - AC_MSG_RESULT(yes - version $LIBXSLT_VERSION) - if test $libxslt_version_dec -lt $libxslt_min_version_dec; then - AC_MSG_WARN(Using libxslt $LIBXSLT_VERSION is unsupported - $libxslt_min_version or newer required.) - have_libxslt=0 - fi - else - AC_MSG_RESULT(no) - fi - - AC_CHECK_FUNC(xsltInit) - - AC_CHECK_HEADERS(libxslt/xslt.h) - if test "$ac_cv_header_libxslt_xslt_h" = no ; then - AC_MSG_WARN(libxslt library found but not headers - disabling) - have_libxslt_lib=0 - have_libxslt=0 - fi -fi -CPPFLAGS="$oCPPFLAGS" -LIBS="$oLIBS" - - dnl Check for JSON library AC_ARG_WITH(yajl, [ --with-yajl=DIR YAJL installation directory or 'no' to disable (default=auto)], yajl_prefix="$withval", yajl_prefix="none") @@ -1271,8 +1274,8 @@ AM_CONDITIONAL(RAPTOR_XML_LIBXML, test $need_libxml = 1) if test $need_libxslt = 1; then - RAPTOR_LDFLAGS="$RAPTOR_LDFLAGS `$XSLT_CONFIG --libs`" - CPPFLAGS="`$XSLT_CONFIG --cflags` $CPPFLAGS" + RAPTOR_LDFLAGS="$RAPTOR_LDFLAGS $XSLT_LIBS" + CPPFLAGS="$CPPFLAGS $XSLT_CFLAGS" fi if test $need_libyajl = 1; then |