(no commit message)

diff --git a/config/config.h.in b/config/config.h.in
index ed89d039e4989a27190ddd9227929623e7cca484..3a3b49617c00ceb7bba6069c05b0b2fdfb8a90be 100644 (file)
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -122,8 +122,8 @@
 /* Define to 1 if you have the `closedir' function. */
 #undef HAVE_CLOSEDIR
 
-/* Define to 1 if you have the <CL/cl.h> header file. */
-#undef HAVE_CL_CL_H
+/* Define to 1 if you have the <CL/OpenCL.h> header file. */
+#undef HAVE_CL_OPENCL_H
 
 /* Define to 1 if you have the <complex.h> header file. */
 #undef HAVE_COMPLEX_H
@@ -309,8 +309,8 @@
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 #undef HAVE_NDIR_H
 
-/* Define to 1 if you have the <OpenCL/cl.h> header file. */
-#undef HAVE_OPENCL_CL_H
+/* Define to 1 if you have the <OpenCL/OpenCL.h> header file. */
+#undef HAVE_OPENCL_OPENCL_H
 
 /* Define to 1 if you have the `opendir' function. */
 #undef HAVE_OPENDIR

diff --git a/config/configure.xml b/config/configure.xml
index 0fb85016a81fdbdbf11a03bc379329deb025f18e..03693e6578c68819a9ffe75379bd2b5b31b70c9f 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x657"/>
   <configure name="LIB_VERSION_NUMBER" value="6,5,7,0"/>
-  <configure name="RELEASE_DATE" value="2009-10-11"/>
+  <configure name="RELEASE_DATE" value="2009-10-12"/>
   <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 4d324a8d6b47e45a3abb89e805d4ea032db99f0d..3b57a8e8f242120e5602602cc7da9b16aa39bfc5 100755 (executable)
--- a/configure
+++ b/configure
@@ -8081,7 +8081,7 @@ ax_save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CL_CFLAGS $CPPFLAGS"
 
 
-for ac_header in CL/cl.h OpenCL/cl.h
+for ac_header in CL/OpenCL.h OpenCL/OpenCL.h
 do
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -8420,17 +8420,17 @@ cat >>conftest.$ac_ext <<_ACEOF
 # if defined(HAVE_WINDOWS_H) && defined(_WIN32)
 #   include <windows.h>
 # endif
-# ifdef HAVE_CL_CL_H
+# ifdef HAVE_CL_OPENCL_H
 #   include <CL/cl.h>
-# elif defined(HAVE_OPENCL_CL_H)
-#   include <OpenCL/cl.h>
+# elif defined(HAVE_OPENCL_OPENCL_H)
+#   include <OpenCL/OpenCL.h>
 # else
-#   error no cl.h
+#   error no OpenCL.h
 # endif
 int
 main ()
 {
-clBegin(0)
+clCreateContext(0)
   ;
   return 0;
 }
@@ -8472,17 +8472,17 @@ cat >>conftest.$ac_ext <<_ACEOF
 # if defined(HAVE_WINDOWS_H) && defined(_WIN32)
 #   include <windows.h>
 # endif
-# ifdef HAVE_CL_CL_H
+# ifdef HAVE_CL_OPENCL_H
 #   include <CL/cl.h>
-# elif defined(HAVE_OPENCL_CL_H)
-#   include <OpenCL/cl.h>
+# elif defined(HAVE_OPENCL_OPENCL_H)
+#   include <OpenCL/OpenCL.h>
 # else
-#   error no cl.h
+#   error no OpenCL.h
 # endif
 int
 main ()
 {
-clBegin(0)
+clCreateContext(0)
   ;
   return 0;
 }
@@ -8524,17 +8524,17 @@ cat >>conftest.$ac_ext <<_ACEOF
 # if defined(HAVE_WINDOWS_H) && defined(_WIN32)
 #   include <windows.h>
 # endif
-# ifdef HAVE_CL_CL_H
+# ifdef HAVE_CL_OPENCL_H
 #   include <CL/cl.h>
-# elif defined(HAVE_OPENCL_CL_H)
-#   include <OpenCL/cl.h>
+# elif defined(HAVE_OPENCL_OPENCL_H)
+#   include <OpenCL/OpenCL.h>
 # else
-#   error no cl.h
+#   error no OpenCL.h
 # endif
 int
 main ()
 {
-clBegin(0)
+clCreateContext(0)
   ;
   return 0;
 }
@@ -8595,17 +8595,17 @@ cat >>conftest.$ac_ext <<_ACEOF
 # if defined(HAVE_WINDOWS_H) && defined(_WIN32)
 #   include <windows.h>
 # endif
-# ifdef HAVE_CL_CL_H
+# ifdef HAVE_CL_OPENCL_H
 #   include <CL/cl.h>
-# elif defined(HAVE_OPENCL_CL_H)
-#   include <OpenCL/cl.h>
+# elif defined(HAVE_OPENCL_OPENCL_H)
+#   include <OpenCL/OpenCL.h>
 # else
-#   error no cl.h
+#   error no OpenCL.h
 # endif
 int
 main ()
 {
-clBegin(0)
+clCreateContext(0)
   ;
   return 0;
 }

diff --git a/m4/ax_check_cl.m4 b/m4/ax_check_cl.m4
index e0829adaaf9d1edd552cd1399a90cb8951708780..fe4b81db9b6fa063771a9a70bc340ab321a9078d 100644 (file)
--- a/m4/ax_check_cl.m4
+++ b/m4/ax_check_cl.m4
@@ -7,8 +7,8 @@
 # "CL_LIBS", respectively.  If no usable CL implementation is found, "no_cl"
 # is set to "yes".
 #
-# If the header "CL/cl.h" is found, "HAVE_CL_CL_H" is defined.  If the header
-# "OpenCL/cl.h" is found, HAVE_OPENCL_CL_H is defined.  These preprocessor
+# If the header "CL/OpenCL.h" is found, "HAVE_CL_OPENCL_H" is defined.  If the header
+# "OpenCL/OpenCL.h" is found, HAVE_OPENCL_OPENCL_H is defined.  These preprocessor
 # definitions may not be mutually exclusive.
 #
 # Based on AX_CHECK_GL, version: 2.4 author: Braden McDaniel
@@ -57,7 +57,7 @@ AS_IF([test X$no_x != Xyes],
 
 ax_save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CL_CFLAGS $CPPFLAGS"
-AC_CHECK_HEADERS([CL/cl.h OpenCL/cl.h])
+AC_CHECK_HEADERS([CL/OpenCL.h OpenCL/OpenCL.h])
 CPPFLAGS=$ax_save_CPPFLAGS
 
 AC_CHECK_HEADERS([windows.h])
@@ -67,14 +67,14 @@ m4_define([AX_CHECK_CL_PROGRAM],
 # if defined(HAVE_WINDOWS_H) && defined(_WIN32)
 #   include <windows.h>
 # endif
-# ifdef HAVE_CL_CL_H
+# ifdef HAVE_CL_OPENCL_H
 #   include <CL/cl.h>
-# elif defined(HAVE_OPENCL_CL_H)
-#   include <OpenCL/cl.h>
+# elif defined(HAVE_OPENCL_OPENCL_H)
+#   include <OpenCL/OpenCL.h>
 # else
-#   error no cl.h
+#   error no OpenCL.h
 # endif]],
-                           [[clBegin(0)]])])
+                           [[clCreateContext(0)]])])
 
 AC_CACHE_CHECK([for OpenCL library], [ax_cv_check_cl_libcl],
 [ax_cv_check_cl_libcl=no

diff --git a/magick/magick-config.h b/magick/magick-config.h
index 102b94b6f89e4f33b031a24347193d556dff2892..093b7d4683244c9873e7eda636ac9816443b091c 100644 (file)
--- a/magick/magick-config.h
+++ b/magick/magick-config.h
@@ -187,8 +187,8 @@
 #define MAGICKCORE_HAVE_CLOSEDIR  1 
 #endif
 
-/* Define to 1 if you have the <CL/cl.h> header file. */
-/* #undef HAVE_CL_CL_H */
+/* Define to 1 if you have the <CL/OpenCL.h> header file. */
+/* #undef HAVE_CL_OPENCL_H */
 
 /* Define to 1 if you have the <complex.h> header file. */
 #ifndef MAGICKCORE_HAVE_COMPLEX_H 
@@ -464,8 +464,8 @@
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 /* #undef HAVE_NDIR_H */
 
-/* Define to 1 if you have the <OpenCL/cl.h> header file. */
-/* #undef HAVE_OPENCL_CL_H */
+/* Define to 1 if you have the <OpenCL/OpenCL.h> header file. */
+/* #undef HAVE_OPENCL_OPENCL_H */
 
 /* Define to 1 if you have the `opendir' function. */
 #ifndef MAGICKCORE_HAVE_OPENDIR 

diff --git a/magick/version.h b/magick/version.h
index 848f6b6a4c9faee08d228426a62b423ae7661588..9dd6addbca1d4f1e69d376ee6ff5019e7bb4a78a 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -31,7 +31,7 @@ extern "C" {
 #define MagickLibVersionText  "6.5.7"
 #define MagickLibVersionNumber  2,0,0
 #define MagickLibSubversion  "-0"
-#define MagickReleaseDate  "2009-10-11"
+#define MagickReleaseDate  "2009-10-12"
 #define MagickChangeDate   "20091010"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.5.7/index.html"