(no commit message)

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 1df0a4fa8362bb22daf93e4add282373eca63b0f..2726a74e3fde3f0f6dab78f556afb7ba2dc5a8c6 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -12,9 +12,7 @@
 /* #undef AUTOTRACE_DELEGATE */
 
 /* Define if coders and filters are to be built as modules. */
-#ifndef MAGICKCORE_BUILD_MODULES
-#define MAGICKCORE_BUILD_MODULES 1
-#endif
+/* #undef BUILD_MODULES */
 
 /* Define if you have the bzip2 library */
 #ifndef MAGICKCORE_BZLIB_DELEGATE
@@ -80,9 +78,7 @@
 #endif
 
 /* Define if you have FFTW library */
-#ifndef MAGICKCORE_FFTW_DELEGATE
-#define MAGICKCORE_FFTW_DELEGATE 1
-#endif
+/* #undef FFTW_DELEGATE */
 
 /* Location of filter modules */
 #ifndef MAGICKCORE_FILTER_PATH
@@ -436,15 +432,15 @@
 #endif
 
 /* Define if you have the <lcms2.h> header file. */
-/* #undef HAVE_LCMS2_H */
+#ifndef MAGICKCORE_HAVE_LCMS2_H
+#define MAGICKCORE_HAVE_LCMS2_H 1
+#endif
 
 /* Define if you have the <lcms2/lcms2.h> header file. */
 /* #undef HAVE_LCMS2_LCMS2_H */
 
 /* Define if you have the <lcms.h> header file. */
-#ifndef MAGICKCORE_HAVE_LCMS_H
-#define MAGICKCORE_HAVE_LCMS_H 1
-#endif
+/* #undef HAVE_LCMS_H */
 
 /* Define if you have the <lcms/lcms.h> header file. */
 /* #undef HAVE_LCMS_LCMS_H */
@@ -1167,9 +1163,7 @@
 #endif
 
 /* Define if you have JBIG library */
-#ifndef MAGICKCORE_JBIG_DELEGATE
-#define MAGICKCORE_JBIG_DELEGATE 1
-#endif
+/* #undef JBIG_DELEGATE */
 
 /* Define if you have JPEG version 2 "Jasper" library */
 #ifndef MAGICKCORE_JP2_DELEGATE
@@ -1198,9 +1192,7 @@
 #endif
 
 /* Define if you have LQR library */
-#ifndef MAGICKCORE_LQR_DELEGATE
-#define MAGICKCORE_LQR_DELEGATE 1
-#endif
+/* #undef LQR_DELEGATE */
 
 /* Define if using libltdl to support dynamically loadable modules */
 #ifndef MAGICKCORE_LTDL_DELEGATE
@@ -1212,7 +1204,7 @@
 
 /* Define to the system default library search path. */
 #ifndef MAGICKCORE_LT_DLSEARCH_PATH
-#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/nvidia:/usr/lib64/qt-3.3/lib:/usr/lib64/xulrunner-2"
+#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib/llvm:/usr/lib64/llvm:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2"
 #endif
 
 /* The archive extension */
@@ -1263,9 +1255,7 @@
 /* #undef NO_MINUS_C_MINUS_O */
 
 /* Define if you have OPENEXR library */
-#ifndef MAGICKCORE_OPENEXR_DELEGATE
-#define MAGICKCORE_OPENEXR_DELEGATE 1
-#endif
+/* #undef OPENEXR_DELEGATE */
 
 /* Define to the address where bug reports for this package should be sent. */
 #ifndef MAGICKCORE_PACKAGE_BUGREPORT
@@ -1320,9 +1310,7 @@
 #endif
 
 /* Define if you have RSVG library */
-#ifndef MAGICKCORE_RSVG_DELEGATE
-#define MAGICKCORE_RSVG_DELEGATE 1
-#endif
+/* #undef RSVG_DELEGATE */
 
 /* Define to the type of arg 1 for `select'. */
 #ifndef MAGICKCORE_SELECT_TYPE_ARG1
@@ -1459,9 +1447,7 @@
 
 
 /* Define if you have WEBP library */
-#ifndef MAGICKCORE_WEBP_DELEGATE
-#define MAGICKCORE_WEBP_DELEGATE 1
-#endif
+/* #undef WEBP_DELEGATE */
 
 /* Define to use the Windows GDI32 library */
 /* #undef WINGDI32_DELEGATE */
@@ -1470,9 +1456,7 @@
 /* #undef WITH_DMALLOC */
 
 /* Define if you have WMF library */
-#ifndef MAGICKCORE_WMF_DELEGATE
-#define MAGICKCORE_WMF_DELEGATE 1
-#endif
+/* #undef WMF_DELEGATE */
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */

diff --git a/MagickCore/version.h b/MagickCore/version.h
index b5c78d050945c93efc64a3e6c2df1bbb328a1377..58bd13ffb9a7a4b18cb40b054c3c8eba8269e784 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision  "exported"
+#define MagickSVNRevision  "5245"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  5,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  5
 #define MagickLibMinInterface  5
-#define MagickReleaseDate  "2011-09-09"
+#define MagickReleaseDate  "2011-09-10"
 #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 ccf7ac1532dc6522997b595b47a170907025d4da..5d3357535e1b57bde7aa7e47e8a0e91f6313ce58 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,8 +10,8 @@
   <configure name="VERSION" value="7.0.0"/>
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
-  <configure name="SVN_REVISION" value="5221" />
-  <configure name="RELEASE_DATE" value="2011-09-08"/>
+  <configure name="SVN_REVISION" value="5245" />
+  <configure name="RELEASE_DATE" value="2011-09-10"/>
   <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 dd311a5e2d86a65caa89a11fb29308b298d1de4c..fdc482f844165d1aa10d5fb3e6b0106c40d359f0 100755 (executable)
--- a/configure
+++ b/configure
@@ -3583,7 +3583,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=5221
+MAGICK_SVN_REVISION=5245
 
 
 
@@ -30020,7 +30020,6 @@ fi
 
 
 
-if test "$have_zlib" == 'yes'; then
 #
 # Check for PNG delegate library.
 #
@@ -30040,7 +30039,7 @@ fi
 have_png='no'
 PNG_LIBS=''
 
-if test "$with_png" != 'no'; then
+if test "$with_png" != 'no' -a  "$have_zlib" != 'no' ; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5
 $as_echo "-------------------------------------------------------------" >&6; }
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PNG support " >&5
@@ -30060,12 +30059,12 @@ fi
 
   if test $passed -gt 0; then
     for var in 5 4 2 '' ; do
-      if test "x${var}" == 'x' ; then
-        pnglib='png'
-      else
-        pnglib="png1${var}"
-      fi
       if test "$have_png" == 'no' ; then
+        if test "x${var}" == 'x' ; then
+          pnglib='png'
+        else
+          pnglib="png1${var}"
+        fi
 
 #       Test for compatible LIBPNG library
         failed=0
@@ -30382,18 +30381,18 @@ fi
 $as_echo_n "checking if ${pnglib} package is complete... " >&6; }
             if test $passed -gt 0 ; then
               if test $failed -gt 0 ; then
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5
 $as_echo "no -- some components failed test" >&6; }
-                have_png='no (failed tests)'
+                  have_png='no (failed tests)'
               else
-                PNG_LIBS="-l${pnglib}"
-                LIBS="$PNG_LIBS $LIBS"
+                  PNG_LIBS="-l${pnglib}"
+                  LIBS="$PNG_LIBS $LIBS"
 
 $as_echo "#define PNG_DELEGATE 1" >>confdefs.h
 
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-                have_png='yes'
+                  have_png='yes'
               fi
             fi
           fi
@@ -30412,10 +30411,7 @@ else
 fi
 
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: PNG requires zlib support" >&5
-$as_echo "PNG requires zlib support" >&6; }
-fi
+
 
 
 #

diff --git a/configure.ac b/configure.ac
index a85d5afcbb327edb5fb8724c7bc3894acecb3f72..5ca7753903f9efd9c1e30ce26c79181efd62bcc4 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -2398,7 +2398,6 @@ AC_SUBST(OPENEXR_LIBS)
 
 dnl ===========================================================================
 
-if test "$have_zlib" == 'yes'; then
 #
 # Check for PNG delegate library.
 #
@@ -2415,7 +2414,7 @@ fi
 have_png='no'
 PNG_LIBS=''
 
-if test "$with_png" != 'no'; then
+if test "$with_png" != 'no' -a  "$have_zlib" != 'no' ; then
   AC_MSG_RESULT([-------------------------------------------------------------])
   AC_MSG_CHECKING(for PNG support )
   AC_MSG_RESULT()
@@ -2426,12 +2425,12 @@ if test "$with_png" != 'no'; then
 
   if test $passed -gt 0; then
     for var in 5 4 2 '' ; do
-      if test "x${var}" == 'x' ; then
-        pnglib='png'
-      else
-        pnglib="png1${var}"
-      fi
       if test "$have_png" == 'no' ; then
+        if test "x${var}" == 'x' ; then
+          pnglib='png'
+        else
+          pnglib="png1${var}"
+        fi
 
 #       Test for compatible LIBPNG library
         failed=0
@@ -2493,14 +2492,14 @@ return 0;
             AC_MSG_CHECKING(if ${pnglib} package is complete)
             if test $passed -gt 0 ; then
               if test $failed -gt 0 ; then
-                AC_MSG_RESULT(no -- some components failed test)
-                have_png='no (failed tests)'
+                  AC_MSG_RESULT(no -- some components failed test)
+                  have_png='no (failed tests)'
               else
-                PNG_LIBS="-l${pnglib}"
-                LIBS="$PNG_LIBS $LIBS"
-                AC_DEFINE(PNG_DELEGATE,1,Define if you have PNG library)
-                AC_MSG_RESULT(yes)
-                have_png='yes'
+                  PNG_LIBS="-l${pnglib}"
+                  LIBS="$PNG_LIBS $LIBS"
+                  AC_DEFINE(PNG_DELEGATE,1,Define if you have PNG library)
+                  AC_MSG_RESULT(yes)
+                  have_png='yes'
               fi
             fi
           fi
@@ -2512,9 +2511,7 @@ fi
 
 AM_CONDITIONAL(PNG_DELEGATE,test "$have_png" = 'yes')
 AC_SUBST(PNG_LIBS)
-else
-  AC_MSG_RESULT(PNG requires zlib support)
-fi
+
 
 dnl ===========================================================================