[cig-commits] [commit] master: improve OpenCL configuration (dd45009)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/autoconf_cig

On branch  : master
Link       : https://github.com/geodynamics/autoconf_cig/compare/09ca47be4e87a6133563b7e8e32974a6da7c5d58...b58c6fb1cdfc650eeca28274913dc239888a09d4

>---------------------------------------------------------------

commit dd4500960c60ad1d07a5361c143429f0433397fa
Author: Kevin Pouget <kevin.pouget at st.com>
Date:   Fri Apr 18 16:21:34 2014 +0200

    improve OpenCL configuration


>---------------------------------------------------------------

dd4500960c60ad1d07a5361c143429f0433397fa
 cit_opencl.m4 | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/cit_opencl.m4 b/cit_opencl.m4
index dd541db..6c91c50 100644
--- a/cit_opencl.m4
+++ b/cit_opencl.m4
@@ -11,47 +11,47 @@
 # ----------------------------------------------------------------------
 # Determine the directory containing <CL/cl.h>
 AC_DEFUN([CIT_OPENCL_CONFIG], [
-  AC_ARG_VAR(OPENCL_INC, [Location of OpenCL include files])
-  AC_ARG_VAR(OPENCL_LIB, [Location of Opencl library libopencl])
+  AC_ARG_VAR(OCL_INC, [Location of OpenCL include files])
+  AC_ARG_VAR(OCL_LIB, [Location of OpenCL library libOpenCL])
 
-  AC_LANG_PUSH([C++])
+  AC_LANG_PUSH([C])
   AC_REQUIRE_CPP
-  CPPFLAGS_save="$CPPFLAGS"
+  CFLAGS_save="$CFLAGS"
   LDFLAGS_save="$LDFLAGS"
   LIBS_save="$LIBS"
 
   dnl Check for OpenCL headers
-  if test "x$OPENCL_INC" != "x"; then
-    OPENCL_CPPFLAGS="-I$OPENCL_INC"
-    CPPFLAGS="$OPENCL_CPPFLAGS $CPPFLAGS"
+  if test "x$OCL_INC" != "x"; then
+    OCL_CFLAGS="-I$OCL_INC"
+    CFLAGS="$OCL_CFLAGS $CFLAGS"
   fi
   AC_CHECK_HEADER([CL/cl.h], [], [
-    AC_MSG_ERROR([OpenCL header not found; try setting OPENCL_INC.])
+    AC_MSG_ERROR([OpenCL header not found; try setting OCL_INC.])
   ])
 
-  if test "x$OPENCL_LIB" != "x"; then
-    OPENCL_LDFLAGS="-L$OPENCL_LIB"
-    LDFLAGS="$OPENCL_LDFLAGS $LDFLAGS"
+  if test "x$OCL_LIB" != "x"; then
+    OCL_LDFLAGS="-L$OCL_LIB"
+    LDFLAGS="$OCL_LDFLAGS $LDFLAGS"
   fi
-  OPENCL_LIBS="-lOpenCL"
-  LIBS="$OPENCL_LIBS $LIBS"
+  OCL_LIBS="-lOpenCL"
+  LIBS="$OCL_LIBS $LIBS"
   AC_MSG_CHECKING([for clCreateBuffer in -lOpenCL])
   AC_LINK_IFELSE(
     [AC_LANG_PROGRAM([[#include <CL/cl.h>]],
   	             [[clGetPlatformIDs(0, 0, 0);]])],
     [AC_MSG_RESULT(yes)],
     [AC_MSG_RESULT(no)
-     AC_MSG_ERROR([OpenCL library not found; try setting OPENCL_LIB.])
+     AC_MSG_ERROR([OpenCL library not found; try setting OCL_LIB.])
   ])
 
-  CPPFLAGS="$CPPFLAGS_save"
+  CFLAGS="$CFLAGS_save"
   LDFLAGS="$LDFLAGS_save"
   LIBS="$LIBS_save"
-  AC_LANG_POP([C++])
+  AC_LANG_POP([C])
 
-  AC_SUBST([OPENCL_CPPFLAGS])
-  AC_SUBST([OPENCL_LDFLAGS])
-  AC_SUBST([OPENCL_LIBS])
+  AC_SUBST([OCL_CFLAGS])
+  AC_SUBST([OCL_LDFLAGS])
+  AC_SUBST([OCL_LIBS])
 ])dnl CIT_OPENCL_COMPILER