Changeset 372 for ImageMagick/trunk/m4

Show
Ignore:
Timestamp:
10/13/09 20:16:55 (6 weeks ago)
Author:
cristy
Message:
 
Files:
1 modified

Legend:

Unmodified
Added
Removed

  • ImageMagick/trunk/m4/ax_check_cl.m4

    r369 r372  
    3737AC_DEFUN([AX_CHECK_CL], 
    3838[AC_REQUIRE([AC_CANONICAL_HOST])dnl 
    39 AC_REQUIRE([AC_PATH_X])dnl 
    4039AC_REQUIRE([AC_PROG_SED])dnl 
    4140AC_REQUIRE([ACX_PTHREAD])dnl 
    … …  
    4645      [CL_CFLAGS="${PTHREAD_CFLAGS}"; CL_LIBS="${PTHREAD_LIBS} -lm"]) 
    4746 
    48 # 
    49 # Use x_includes and x_libraries if they have been set (presumably by 
    50 # AC_PATH_X). 
    51 # 
    52 AS_IF([test X$no_x != Xyes], 
    53       [AS_IF([test -n "$x_includes"], 
    54              [CL_CFLAGS="-I$x_includes $CL_CFLAGS"])] 
    55        AS_IF([test -n "$x_libraries"], 
    56              [CL_LIBS="-L$x_libraries -lX11 $CL_LIBS"])) 
    57  
    5847ax_save_CPPFLAGS=$CPPFLAGS 
    5948CPPFLAGS="$CL_CFLAGS $CPPFLAGS" 
    60 AC_CHECK_HEADERS([CL/OpenCL.h OpenCL/OpenCL.h]) 
     49AC_CHECK_HEADERS([CL/opencl.h OpenCL/OpenCL.h]) 
    6150CPPFLAGS=$ax_save_CPPFLAGS 
    6251 
    … …  
    6958# endif 
    7059# ifdef HAVE_CL_OPENCL_H 
    71 #   include <CL/cl.h> 
     60#   include <CL/opencl.h> 
    7261# elif defined(HAVE_OPENCL_OPENCL_H) 
    7362#   include <OpenCL/OpenCL.h>