From 36b6d485ca7f1ad25c5b60fb09b655546c8e5830 Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@google.com>
Date: Thu, 17 Apr 2008 13:00:22 -0700
Subject: [PATCH] msxml3: check for xsltInit before calling it.

---
 configure           |   98 +++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac        |    5 +++
 dlls/msxml3/main.c  |    2 +-
 include/config.h.in |    3 ++
 4 files changed, 107 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 01fdf19..a617b29 100755
--- a/configure
+++ b/configure
@@ -11948,7 +11948,10 @@ then
         ac_xslt_libs="`xslt-config --libs 2>/dev/null`"
         ac_xslt_cflags="`xslt-config --cflags 2>/dev/null`"
     fi
+    ac_save_LIBS="$LIBS"
+    ac_save_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
+    LIBS="$LIBS $ac_xslt_libs"
 
 
 for ac_header in libxslt/pattern.h libxslt/transform.h
@@ -12081,7 +12084,102 @@ fi
 
 done
 
+
+for ac_func in xsltInit
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
     CPPFLAGS="$ac_save_CPPFLAGS"
+    LIBS="$ac_save_LIBS"
 fi
 if test "$ac_cv_lib_xslt_xsltCompilePattern" != "yes"; then
   case "x$with_xslt" in
diff --git a/configure.ac b/configure.ac
index b5c4bf2..ee37879 100644
--- a/configure.ac
+++ b/configure.ac
@@ -826,7 +826,10 @@ then
         ac_xslt_libs="`xslt-config --libs 2>/dev/null`"
         ac_xslt_cflags="`xslt-config --cflags 2>/dev/null`"
     fi
+    ac_save_LIBS="$LIBS"
+    ac_save_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
+    LIBS="$LIBS $ac_xslt_libs"
     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])
@@ -836,7 +839,9 @@ then
     [#ifdef HAVE_LIBXSLT_PATTERN_H
 # include <libxslt/pattern.h>
 #endif])
+    AC_CHECK_FUNCS(xsltInit)
     CPPFLAGS="$ac_save_CPPFLAGS"
+    LIBS="$ac_save_LIBS"
 fi
 WINE_NOTICE_WITH(xslt,[test "$ac_cv_lib_xslt_xsltCompilePattern" != "yes"],
                  [libxslt development files not found, xslt won't be supported.])
diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c
index 7296690..3c2bc22 100644
--- a/dlls/msxml3/main.c
+++ b/dlls/msxml3/main.c
@@ -175,7 +175,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
 #ifdef HAVE_LIBXML2
         xmlInitParser();
 #endif
-#ifdef HAVE_LIBXSLT
+#ifdef HAVE_XSLTINIT
         xsltInit();
 #endif
         hInstance = hInstDLL;
diff --git a/include/config.h.in b/include/config.h.in
index f867662..d8ea44c 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -324,6 +324,9 @@
 /* Define if you have the libxslt library */
 #undef HAVE_LIBXSLT
 
+/* Define if you have xlstInit */
+#undef HAVE_XSLTINIT
+
 /* Define to 1 if you have the <libxslt/pattern.h> header file. */
 #undef HAVE_LIBXSLT_PATTERN_H
 
-- 
1.5.3.6