diff options
| -rw-r--r-- | acinclude.m4 | 18 | ||||
| -rwxr-xr-x | configure.in | 63 |
2 files changed, 38 insertions, 43 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 71f01544d11b..a42a0f1ce830 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -118,21 +118,3 @@ esac AC_LANG_POP(C) ]) dnl end AC_DEFUN - -dnl PKG_CHECK_MODULES_MACHACK is like PKG_CHECK_MODULES but sneaks in an extra -dnl argument between the first and second, denoting a program to call instead of -dnl pkg-config on Mac OS X (aka Darwin): -AC_DEFUN([PKG_CHECK_MODULES_MACHACK], -[if test "$_os" = "Darwin"; then - AC_MSG_CHECKING($1_CFLAGS) - $1_CFLAGS=`$2 --cflags` - AC_MSG_RESULT($$1_CFLAGS) - AC_MSG_CHECKING($1_LIBS) - $1_LIBS=`$2 --libs` - AC_MSG_RESULT($$1_LIBS) - AC_SUBST($1_CFLAGS) - AC_SUBST($1_LIBS) - else - PKG_CHECK_MODULES($1, $3, $4, $5, $6) - fi -]) diff --git a/configure.in b/configure.in index 4452d699f51b..2bf9aa3f3088 100755 --- a/configure.in +++ b/configure.in @@ -4305,50 +4305,63 @@ if test -n "$with_system_libxml" -o -n "$with_system_libs" && \ fi fi -dnl =================================================================== -dnl Check for system libxslt -dnl =================================================================== +# =================================================================== +# Check for system libxslt +# =================================================================== AC_MSG_CHECKING([which libxslt to use]) if test -n "$with_system_libxslt" -o -n "$with_system_libs" -o \ "$_os" = "Darwin" && \ test "$with_system_libxslt" != "no"; then - AC_MSG_RESULT([external]) - SYSTEM_LIBXSLT=YES - - PKG_CHECK_MODULES_MACHACK(LIBXSLT, xslt-config, libxslt) + AC_MSG_RESULT([external]) + SYSTEM_LIBXSLT=YES + if test "$_os" = "Darwin"; then + dnl make sure to use SDK path + LIBXSLT_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/usr/include/libxml2" + dnl omit -L/usr/lib + LIBXSLT_LIBS="-lxslt -lxml2 -lz -lpthread -liconv -lm" + else + PKG_CHECK_MODULES(LIBXSLT, xslt-config, libxslt) + fi - dnl Check for xsltproc - AC_PATH_PROG(XSLTPROC, xsltproc, no) - if test "$XSLTPROC" = "no"; then - AC_MSG_ERROR([xsltproc is required]) - fi + dnl Check for xsltproc + AC_PATH_PROG(XSLTPROC, xsltproc, no) + if test "$XSLTPROC" = "no"; then + AC_MSG_ERROR([xsltproc is required]) + fi else - AC_MSG_RESULT([internal]) - SYSTEM_LIBXSLT=NO - BUILD_TYPE="$BUILD_TYPE LIBXSLT" + AC_MSG_RESULT([internal]) + SYSTEM_LIBXSLT=NO + BUILD_TYPE="$BUILD_TYPE LIBXSLT" - if test "$cross_compiling" = "yes"; then - AC_PATH_PROG(XSLTPROC, xsltproc, no) - if test "$XSLTPROC" = "no"; then - AC_MSG_ERROR([xsltproc is required]) - fi - fi + if test "$cross_compiling" = "yes"; then + AC_PATH_PROG(XSLTPROC, xsltproc, no) + if test "$XSLTPROC" = "no"; then + AC_MSG_ERROR([xsltproc is required]) + fi + fi fi AC_SUBST(SYSTEM_LIBXSLT) AC_SUBST(LIBXSLT_CFLAGS) AC_SUBST(LIBXSLT_LIBS) AC_SUBST(XSLTPROC) -dnl =================================================================== -dnl Check for system libxml -dnl =================================================================== +# =================================================================== +# Check for system libxml +# =================================================================== AC_MSG_CHECKING([which libxml to use]) if test -n "$with_system_libxml" -o -n "$with_system_libs" -o \ "$_os" = "Darwin" && \ test "$with_system_libxml" != "no"; then AC_MSG_RESULT([external]) SYSTEM_LIBXML=YES - PKG_CHECK_MODULES_MACHACK(LIBXML, xml2-config, libxml-2.0 >= 2.0) + if test "$_os" = "Darwin"; then + dnl make sure to use SDK path + LIBXML_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/usr/include/libxml2" + dnl omit -L/usr/lib + LIBXML_LIBS="-lxml2 -lz -lpthread -liconv -lm" + else + PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.0) + fi BUILD_TYPE="$BUILD_TYPE LIBXMLSEC" else AC_MSG_RESULT([internal]) |