commit 9d7f7bfc5e4c3c0fd1039c14df0aae44a490b3b9
author Lei Zhang <thestig@google.com> Thu Apr 17 13:00:22 2008 -0700
committer Alexandre Julliard <julliard@winehq.org> Fri Apr 18 13:57:15 2008 +0200
tree bf6179c9b997072bfc253d84a27a7bc436ba61d4
parent bb8d1ca672b545900d6916a3716e71a39fcf3565

msxml3: Check for xsltInit before calling it.

configure.ac

diff --git a/configure.ac b/configure.ac
index b5c4bf2..31bf9ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -826,17 +826,24 @@
         ac_xslt_libs="`xslt-config --libs 2>/dev/null`"
         ac_xslt_cflags="`xslt-config --cflags 2>/dev/null`"
     fi
+    ac_save_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
-    AC_CHECK_HEADERS([libxslt/pattern.h libxslt/transform.h],
-            [AC_CHECK_LIB(xslt, xsltCompilePattern,
-                [AC_DEFINE(HAVE_LIBXSLT, 1, [Define if you have the libxslt library])
-                 XSLTLIBS="$ac_xslt_libs"
-                 XSLTINCL="$ac_xslt_cflags"],,$ac_xslt_libs)
-            ],,
+    AC_CHECK_HEADERS([libxslt/pattern.h libxslt/transform.h],,,
     [#ifdef HAVE_LIBXSLT_PATTERN_H
 # include <libxslt/pattern.h>
 #endif])
     CPPFLAGS="$ac_save_CPPFLAGS"
+    if test "$ac_cv_header_libxslt_transform_h" = "yes"
+    then
+        AC_CHECK_LIB(xslt, xsltCompilePattern,
+            [AC_DEFINE(HAVE_LIBXSLT, 1, [Define if you have the libxslt library])
+             XSLTLIBS="$ac_xslt_libs"
+             XSLTINCL="$ac_xslt_cflags"
+             ac_save_LIBS="$LIBS"
+             LIBS="$LIBS $ac_xslt_libs"
+             AC_CHECK_FUNCS(xsltInit)
+             LIBS="$ac_save_LIBS"],,$ac_xslt_libs)
+    fi
 fi
 WINE_NOTICE_WITH(xslt,[test "$ac_cv_lib_xslt_xsltCompilePattern" != "yes"],
                  [libxslt development files not found, xslt won't be supported.])