(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 457ddd375469fcefa18d9e34c9c4fd9e3cde723c..2746b2291a52cd6c7f283f13377c9df6adb695a1 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %global VERSION  6.6.6
-%global Patchlevel  4
+%global Patchlevel  3
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/config/configure.xml b/config/configure.xml
index 8bb4d957e38174ca0ee071629115c85b0cec14c0..2a5e20d187d1b0873cd64366518d51cc5fa11d1c 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -8,7 +8,7 @@
 <configuremap>
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x666"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,6,6,4"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,6,6,3"/>
   <configure name="RELEASE_DATE" value="2010-12-04"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/configure b/configure
index 93313b0f22785946537a1f750efdfedd3971a9d9..d3188871abcbbc6facb164957e6e7d68e4c10be4 100755 (executable)
--- a/configure
+++ b/configure
@@ -9023,7 +9023,7 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cl_libcl="$ax_try_lib $ax_check_cl_nvidia_flags"; break
 else
-  ax_check_cl_dylib_flag='-framework OpenCL -L/System/Library/Frameworks/OpenCL.framework/Versions/A/Libraries' LIBS="$ax_try_lib $ax_check_cl_dylib_flag $CL_LIBS $ax_save_LIBS"
+  ax_check_cl_dylib_flag='-Wl,-framework,OpenCL -L/System/Library/Frameworks/OpenCL.framework/Versions/A/Libraries' LIBS="$ax_try_lib $ax_check_cl_dylib_flag $CL_LIBS $ax_save_LIBS"
                                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -9059,7 +9059,7 @@ rm -f core conftest.err conftest.$ac_objext \
   done
 
   if test "X$ax_cv_check_cl_libcl" = Xno -a X$no_x = Xyes; then :
-  LIBS='-framework OpenCL'
+  LIBS='-Wl,-framework,OpenCL'
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 

diff --git a/libtool b/libtool
index 0b9166eefad5218ca1ac968a902b641cee2caa3d..b8d025770798a79db405638edede7af14755fee9 100755 (executable)
--- a/libtool
+++ b/libtool
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # libtool - Provide generalized library-building support services.
-# Generated automatically by config.status (ImageMagick) 6.6.6-4
+# Generated automatically by config.status (ImageMagick) 6.6.6-3
 # Libtool was configured on host magick.imagemagick.org:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #

diff --git a/m4/ax_opencl.m4 b/m4/ax_opencl.m4
index 2100942bb3a36c8bb971b3355ff02f12aef725a9..f41dad808c372e828461645c248c3911e4f2980d 100644 (file)
--- a/m4/ax_opencl.m4
+++ b/m4/ax_opencl.m4
@@ -93,13 +93,13 @@ if test "$disable_opencl" = 'yes'; then
                  [ax_check_cl_nvidia_flags="-L/usr/$ax_check_cl_libdir/nvidia" LIBS="$ax_try_lib $ax_check_cl_nvidia_flags $CL_LIBS $ax_save_LIBS"
                  AC_LINK_IFELSE([AX_OPENCL_PROGRAM],
                                 [ax_cv_check_cl_libcl="$ax_try_lib $ax_check_cl_nvidia_flags"; break],
-                                [ax_check_cl_dylib_flag='-framework OpenCL -L/System/Library/Frameworks/OpenCL.framework/Versions/A/Libraries' LIBS="$ax_try_lib $ax_check_cl_dylib_flag $CL_LIBS $ax_save_LIBS"
+                                [ax_check_cl_dylib_flag='-Wl,-framework,OpenCL -L/System/Library/Frameworks/OpenCL.framework/Versions/A/Libraries' LIBS="$ax_try_lib $ax_check_cl_dylib_flag $CL_LIBS $ax_save_LIBS"
                                 AC_LINK_IFELSE([AX_OPENCL_PROGRAM],
                                                [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],
-        [LIBS='-framework OpenCL'
+        [LIBS='-Wl,-framework,OpenCL'
         AC_LINK_IFELSE([AX_OPENCL_PROGRAM],
                        [ax_cv_check_cl_libcl=$LIBS])])
   

diff --git a/magick/version.h b/magick/version.h
index f640a8da34a153911032ac0e629457d561b78f34..460baa05dd24262314159f8c46223dd6d2741755 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,7 +30,7 @@ extern "C" {
 #define MagickLibVersion  0x666
 #define MagickLibVersionText  "6.6.6"
 #define MagickLibVersionNumber  4,0,0
-#define MagickLibAddendum  "-4"
+#define MagickLibAddendum  "-3"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
 #define MagickReleaseDate  "2010-12-04"

diff --git a/version.sh b/version.sh
index eb41a586308ef1b16957464eca3050c1410a5368..46493167436712e6220d81d028f6a8f256c91f12 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick'
 # PACKAGE_NAME (e.g. "1.0.0").
 PACKAGE_VERSION='6.6.6'
 PACKAGE_LIB_VERSION="0x666"
-PACKAGE_RELEASE="4"
+PACKAGE_RELEASE="3"
 PACKAGE_LIB_VERSION_NUMBER="6,6,6,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"