blob: d6aaae4e9df0fa73ba7a50d5c14440a82f186416 [file] [log] [blame]
diff -ur libxslt-1.1.26.orig/libxslt.m4 libxslt-1.1.26/libxslt.m4
--- libxslt-1.1.26.orig/libxslt.m4 2009-05-12 09:29:34.000000000 +0300
+++ libxslt-1.1.26/libxslt.m4 2009-10-07 17:03:04.000000000 +0300
@@ -52,8 +52,10 @@
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_xslttest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
+ ac_save_CXXFLAGS="$CXXFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $XSLT_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $XSLT_CFLAGS"
LIBS="$XSLT_LIBS $LIBS"
dnl
dnl Now check if the installed libxslt is sufficiently new.
@@ -138,6 +140,7 @@
}
],, no_xslt=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
+ CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
@@ -158,6 +161,7 @@
else
echo "*** Could not run libxslt test program, checking why..."
CFLAGS="$CFLAGS $XSLT_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $XSLT_CFLAGS"
LIBS="$LIBS $XSLT_LIBS"
AC_TRY_LINK([
#include <libxslt/xslt.h>
@@ -177,6 +181,7 @@
echo "*** or that you have moved LIBXSLT since it was installed. In the latter case, you"
echo "*** may want to edit the xslt-config script: $XSLT_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"
+ CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
fi
fi