(no commit message)

diff --git a/Makefile.in b/Makefile.in
index 31935e2161e611809c25161c061d4df8e1573b83..ffd008bf2f05101239203bec91d5d4a5ee143342 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -303,6 +303,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_compile_warnings.m4 \
        $(top_srcdir)/m4/framework.m4 $(top_srcdir)/m4/libtool.m4 \
        $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \
        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 \
        $(top_srcdir)/m4/magick_check_pthread_lib.m4 \
        $(top_srcdir)/m4/magick_func_mmap_fileio.m4 \
        $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac

diff --git a/configure b/configure
index 02a58f172545219090f4056c35646a4f8e2a23e3..f5c54ab43b88d135f7bd868e128c75babaa05a3f 100755 (executable)
--- a/configure
+++ b/configure
@@ -8401,7 +8401,7 @@ ax_save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CL_CFLAGS $CPPFLAGS"
 ax_save_LIBS=$LIBS
 LIBS=""
-ax_check_libs="-lopencl32 -lCL"
+ax_check_libs="-lOpenCL -lCL"
 for ax_lib in $ax_check_libs; do
   if test X$ax_compiler_ms = Xyes; then
   ax_try_lib=`echo $ax_lib | $SED -e 's/^-l//' -e 's/$/.lib/'`

diff --git a/m4/ax_check_cl.m4 b/m4/ax_check_cl.m4
index 2c2d86d93346f352337f46fd5f2f3f4e29b7fedb..e0829adaaf9d1edd552cd1399a90cb8951708780 100644 (file)
--- a/m4/ax_check_cl.m4
+++ b/m4/ax_check_cl.m4
@@ -86,7 +86,7 @@ ax_save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CL_CFLAGS $CPPFLAGS"
 ax_save_LIBS=$LIBS
 LIBS=""
-ax_check_libs="-lopencl32 -lCL"
+ax_check_libs="-lOpenCL -lCL"
 for ax_lib in $ax_check_libs; do
   AS_IF([test X$ax_compiler_ms = Xyes],
         [ax_try_lib=`echo $ax_lib | $SED -e 's/^-l//' -e 's/$/.lib/'`],