(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 24e66fff4710f3b064fbb3453fbc42720d631b64..d5dc7ed7df9e328a2dfad1c64145f8e08b3dea1b 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -34,7 +34,7 @@ extern "C" {
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2011-09-21"
+#define MagickReleaseDate  "2011-09-25"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/config/configure.xml b/config/configure.xml
index 6eac2c6d1dc0fcdfeb1756776989197000b466f5..830ab5b9cb448dcaac92c4bc4c0f4befbe7c3df6 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -11,7 +11,7 @@
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
   <configure name="SVN_REVISION" value="5364" />
-  <configure name="RELEASE_DATE" value="2011-09-21"/>
+  <configure name="RELEASE_DATE" value="2011-09-25"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/configure b/configure
index f275e36ea10e18efc96f8cac74eed26d9f49e5a3..127d1eeac1e4777723b918bb56f30a345cb21bc9 100755 (executable)
--- a/configure
+++ b/configure
@@ -31244,26 +31244,26 @@ $as_echo "" >&6; }
     PERSIST_LDFLAGS=$LDFLAGS
     PERSIST_CPPFLAGS=$CPPFLAGS
     xml2_config=''
-    for ac_prog in xml2-config
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+    # Extract the first word of "xml2-config", so it can be a program name with args.
+set dummy xml2-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_xml2_config+:} false; then :
+if ${ac_cv_path_xml2_config+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$xml2_config"; then
-  ac_cv_prog_xml2_config="$xml2_config" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  case $xml2_config in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_xml2_config="$xml2_config" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_xml2_config="$ac_prog"
+    ac_cv_path_xml2_config="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -31271,9 +31271,10 @@ done
   done
 IFS=$as_save_IFS
 
+  ;;
+esac
 fi
-fi
-xml2_config=$ac_cv_prog_xml2_config
+xml2_config=$ac_cv_path_xml2_config
 if test -n "$xml2_config"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xml2_config" >&5
 $as_echo "$xml2_config" >&6; }
@@ -31282,9 +31283,6 @@ else
 $as_echo "no" >&6; }
 fi
 
-
-  test -n "$xml2_config" && break
-done
     if test -n "$xml2_config"; then
         # Debian installs libxml headers under /usr/include/libxml2/libxml with
         # the shared library installed under /usr/lib, whereas the package
@@ -31307,9 +31305,93 @@ else
 fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlParseExternalEntity in -lxml2" >&5
-$as_echo_n "checking for xmlParseExternalEntity in -lxml2... " >&6; }
-if ${ac_cv_lib_xml2_xmlParseExternalEntity+:} false; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlSAXVersion in -lxml2" >&5
+$as_echo_n "checking for xmlSAXVersion in -lxml2... " >&6; }
+if ${ac_cv_lib_xml2_xmlSAXVersion+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lxml2  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* 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 xmlSAXVersion ();
+int
+main ()
+{
+return xmlSAXVersion ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_xml2_xmlSAXVersion=yes
+else
+  ac_cv_lib_xml2_xmlSAXVersion=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_xmlSAXVersion" >&5
+$as_echo "$ac_cv_lib_xml2_xmlSAXVersion" >&6; }
+if test "x$ac_cv_lib_xml2_xmlSAXVersion" = xyes; then :
+  passed=`expr $passed + 1`
+else
+  failed=`expr $failed + 1`
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlParseChunk in -lxml2" >&5
+$as_echo_n "checking for xmlParseChunk in -lxml2... " >&6; }
+if ${ac_cv_lib_xml2_xmlParseChunk+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lxml2  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* 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 xmlParseChunk ();
+int
+main ()
+{
+return xmlParseChunk ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_xml2_xmlParseChunk=yes
+else
+  ac_cv_lib_xml2_xmlParseChunk=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_xmlParseChunk" >&5
+$as_echo "$ac_cv_lib_xml2_xmlParseChunk" >&6; }
+if test "x$ac_cv_lib_xml2_xmlParseChunk" = xyes; then :
+  passed=`expr $passed + 1`
+else
+  failed=`expr $failed + 1`
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlCreatePushParserCtxt in -lxml2" >&5
+$as_echo_n "checking for xmlCreatePushParserCtxt in -lxml2... " >&6; }
+if ${ac_cv_lib_xml2_xmlCreatePushParserCtxt+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -31323,27 +31405,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char xmlParseExternalEntity ();
+char xmlCreatePushParserCtxt ();
 int
 main ()
 {
-return xmlParseExternalEntity ();
+return xmlCreatePushParserCtxt ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_xml2_xmlParseExternalEntity=yes
+  ac_cv_lib_xml2_xmlCreatePushParserCtxt=yes
 else
-  ac_cv_lib_xml2_xmlParseExternalEntity=no
+  ac_cv_lib_xml2_xmlCreatePushParserCtxt=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_xmlParseExternalEntity" >&5
-$as_echo "$ac_cv_lib_xml2_xmlParseExternalEntity" >&6; }
-if test "x$ac_cv_lib_xml2_xmlParseExternalEntity" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_xmlCreatePushParserCtxt" >&5
+$as_echo "$ac_cv_lib_xml2_xmlCreatePushParserCtxt" >&6; }
+if test "x$ac_cv_lib_xml2_xmlCreatePushParserCtxt" = xyes; then :
   passed=`expr $passed + 1`
 else
   failed=`expr $failed + 1`

diff --git a/configure.ac b/configure.ac
index d8998fe239bba805eca34b81da71e946c732fa89..21d37e5ea28abb758156d5223dffec38a5850c8d 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -2750,7 +2750,7 @@ if test "$with_xml" != 'no'; then
     PERSIST_LDFLAGS=$LDFLAGS
     PERSIST_CPPFLAGS=$CPPFLAGS
     xml2_config=''
-    AC_CHECK_PROGS(xml2_config,xml2-config,)dnl
+    AC_PATH_PROG(xml2_config,xml2-config,)dnl
     if test -n "$xml2_config"; then
         # Debian installs libxml headers under /usr/include/libxml2/libxml with
         # the shared library installed under /usr/lib, whereas the package
@@ -2766,7 +2766,9 @@ if test "$with_xml" != 'no'; then
     failed=0
     passed=0
     AC_CHECK_HEADER(libxml/parser.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
-    AC_CHECK_LIB(xml2,xmlParseExternalEntity,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+    AC_CHECK_LIB(xml2,xmlSAXVersion,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+    AC_CHECK_LIB(xml2,xmlParseChunk,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+    AC_CHECK_LIB(xml2,xmlCreatePushParserCtxt,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
     AC_MSG_CHECKING([if XML package is complete])
     if test $passed -gt 0; then
         if test $failed -gt 0; then