(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index b11b6fae2128c6c86e62c97556568350a29e01c8..fbcbfdd348ad437335a6daf5f2d91a95d86868d7 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision  "11453:11459M"
+#define MagickSVNRevision  "11453:11464M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0

diff --git a/configure b/configure
index 3d43257ca68de852527ec068aca15290ecc26b07..23ada52780972010566eca67033de6334597a64a 100755 (executable)
--- a/configure
+++ b/configure
@@ -3675,7 +3675,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=11453:11459M
+MAGICK_SVN_REVISION=11453:11464M
 
 
 # Substitute library versioning
@@ -31880,9 +31880,9 @@ else
 fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WebPPictureInit in -lwebp" >&5
-$as_echo_n "checking for WebPPictureInit in -lwebp... " >&6; }
-if ${ac_cv_lib_webp_WebPPictureInit+:} false; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WebPPictureInitInternal in -lwebp" >&5
+$as_echo_n "checking for WebPPictureInitInternal in -lwebp... " >&6; }
+if ${ac_cv_lib_webp_WebPPictureInitInternal+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -31896,27 +31896,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char WebPPictureInit ();
+char WebPPictureInitInternal ();
 int
 main ()
 {
-return WebPPictureInit ();
+return WebPPictureInitInternal ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_webp_WebPPictureInit=yes
+  ac_cv_lib_webp_WebPPictureInitInternal=yes
 else
-  ac_cv_lib_webp_WebPPictureInit=no
+  ac_cv_lib_webp_WebPPictureInitInternal=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_webp_WebPPictureInit" >&5
-$as_echo "$ac_cv_lib_webp_WebPPictureInit" >&6; }
-if test "x$ac_cv_lib_webp_WebPPictureInit" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_webp_WebPPictureInitInternal" >&5
+$as_echo "$ac_cv_lib_webp_WebPPictureInitInternal" >&6; }
+if test "x$ac_cv_lib_webp_WebPPictureInitInternal" = xyes; then :
   passed=`expr $passed + 1`
 else
   failed=`expr $failed + 1`

diff --git a/configure.ac b/configure.ac
index b6389af5c7337bdefc33f04808d341a441d774d8..990dddddb7d19398aca67c3261fb2e2654019721 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -2777,7 +2777,7 @@ if test "$with_webp" != 'no'; then
     failed=0
     passed=0
     AC_CHECK_HEADER(webp/decode.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
-    AC_CHECK_LIB(webp,WebPPictureInit,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+    AC_CHECK_LIB(webp,WebPPictureInitInternal,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
     AC_MSG_CHECKING([if WEBP package is complete])
     if test $passed -gt 0; then
         if test $failed -gt 0; then