Commit 21399d96 authored by cristy's avatar cristy

git-svn-id:...

git-svn-id: https://subversion.imagemagick.org/subversion/ImageMagick/trunk@372 aa41f4f7-0bf4-0310-aa73-e5a19afd5a74
parent 2a42e6c1
......@@ -122,7 +122,7 @@
/* Define to 1 if you have the `closedir' function. */
#undef HAVE_CLOSEDIR
/* Define to 1 if you have the <CL/OpenCL.h> header file. */
/* 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. */
......
This diff is collapsed.
......@@ -388,6 +388,8 @@ AC_SUBST(OPENMP_CFLAGS)
# Enable support for OpenCL
AX_CHECK_CL
CFLAGS="$CL_CFLAGS $CFLAGS"
LIBS="$CL_LIBS $LIBS"
########
#
......
......@@ -36,7 +36,6 @@
#
AC_DEFUN([AX_CHECK_CL],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_PATH_X])dnl
AC_REQUIRE([AC_PROG_SED])dnl
AC_REQUIRE([ACX_PTHREAD])dnl
......@@ -45,19 +44,9 @@ AX_LANG_COMPILER_MS
AS_IF([test X$ax_compiler_ms = Xno],
[CL_CFLAGS="${PTHREAD_CFLAGS}"; CL_LIBS="${PTHREAD_LIBS} -lm"])
#
# Use x_includes and x_libraries if they have been set (presumably by
# AC_PATH_X).
#
AS_IF([test X$no_x != Xyes],
[AS_IF([test -n "$x_includes"],
[CL_CFLAGS="-I$x_includes $CL_CFLAGS"])]
AS_IF([test -n "$x_libraries"],
[CL_LIBS="-L$x_libraries -lX11 $CL_LIBS"]))
ax_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CL_CFLAGS $CPPFLAGS"
AC_CHECK_HEADERS([CL/OpenCL.h OpenCL/OpenCL.h])
AC_CHECK_HEADERS([CL/opencl.h OpenCL/OpenCL.h])
CPPFLAGS=$ax_save_CPPFLAGS
AC_CHECK_HEADERS([windows.h])
......@@ -68,7 +57,7 @@ m4_define([AX_CHECK_CL_PROGRAM],
# include <windows.h>
# endif
# ifdef HAVE_CL_OPENCL_H
# include <CL/cl.h>
# include <CL/opencl.h>
# elif defined(HAVE_OPENCL_OPENCL_H)
# include <OpenCL/OpenCL.h>
# else
......
......@@ -187,7 +187,7 @@
#define MAGICKCORE_HAVE_CLOSEDIR 1
#endif
/* Define to 1 if you have the <CL/OpenCL.h> header file. */
/* 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. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment