(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index d1ac266c244855152ab0a05a1dfca8a87302bc64..4c9a7422f7e74efe2ccbbbf0053102f4265a57da 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "6216"
+#define MagickSVNRevision  "6244"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2011-12-18"
+#define MagickReleaseDate  "2011-12-22"
 #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 48dde769c6cab6a4805097ece6ce164f7ec2a138..d05f325402a55463f48c49224cd6e1e32ed03b7b 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="6216" />
-  <configure name="RELEASE_DATE" value="2011-12-18"/>
+  <configure name="SVN_REVISION" value="6244" />
+  <configure name="RELEASE_DATE" value="2011-12-22"/>
   <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 50ad9a965546bd5af93e4e6648d6ef02b76de6a1..20fc7c877507d18f0763702b0b7a6f0df79d92ca 100755 (executable)
--- a/configure
+++ b/configure
@@ -3610,7 +3610,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=6216
+MAGICK_SVN_REVISION=6244
 
 
 
@@ -9368,7 +9368,7 @@ rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   done
 
-  if test "X$ax_cv_check_cl_libcl" = Xno -a X$no_x = Xyes; then :
+  if test "X$ax_cv_check_cl_libcl" = Xno; then :
   LIBS='-Wl,-framework,OpenCL'
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */

diff --git a/m4/ax_opencl.m4 b/m4/ax_opencl.m4
index f41dad808c372e828461645c248c3911e4f2980d..28c17a76279a4ea1d427d7eee5fde34512c8c8f6 100644 (file)
--- a/m4/ax_opencl.m4
+++ b/m4/ax_opencl.m4
@@ -98,7 +98,7 @@ if test "$disable_opencl" = 'yes'; then
                                                [ax_cv_check_cl_libcl="$ax_try_lib $ax_check_cl_dylib_flag"; break])])])
   done
   
-  AS_IF([test "X$ax_cv_check_cl_libcl" = Xno -a X$no_x = Xyes],
+  AS_IF([test "X$ax_cv_check_cl_libcl" = Xno],
         [LIBS='-Wl,-framework,OpenCL'
         AC_LINK_IFELSE([AX_OPENCL_PROGRAM],
                        [ax_cv_check_cl_libcl=$LIBS])])