ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Fix OpenCL includes on systems with only CL/cl.h.

This commit is contained in:
Adam Martinson 2010-12-28 12:46:09 -06:00 committed by Alexandre Julliard
parent 01b9fd3679
commit 2eb2f71c03
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -2641,7 +2641,7 @@ fi
# Check whether --with-opencl was given. # Check whether --with-opencl was given.
if test "${with_opencl+set}" = set; then : if test "${with_opencl+set}" = set; then :
withval=$with_opencl; if test "x$withval" = "xno"; then ac_cv_header_CL_opencl_h=no; ac_cv_header_OpenCL_opencl_h=no; fi withval=$with_opencl; if test "x$withval" = "xno"; then ac_cv_header_CL_cl_h=no; ac_cv_header_OpenCL_opencl_h=no; fi
fi fi
@ -5760,7 +5760,7 @@ for ac_header in \
AL/al.h \ AL/al.h \
AudioToolbox/AudioConverter.h \ AudioToolbox/AudioConverter.h \
AudioUnit/AudioUnit.h \ AudioUnit/AudioUnit.h \
CL/opencl.h \ CL/cl.h \
Carbon/Carbon.h \ Carbon/Carbon.h \
CoreAudio/CoreAudio.h \ CoreAudio/CoreAudio.h \
DiskArbitration/DiskArbitration.h \ DiskArbitration/DiskArbitration.h \
@ -9064,7 +9064,7 @@ Use the --without-x option if you really want this." "$LINENO" 5 ;;
esac esac
fi fi
if test "$ac_cv_header_CL_opencl_h" = "yes" if test "$ac_cv_header_CL_cl_h" = "yes"
then then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clGetPlatformInfo in -lOpenCL" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clGetPlatformInfo in -lOpenCL" >&5
$as_echo_n "checking for clGetPlatformInfo in -lOpenCL... " >&6; } $as_echo_n "checking for clGetPlatformInfo in -lOpenCL... " >&6; }

6
configure.ac
View File

@ -69,7 +69,7 @@ AC_ARG_WITH(nas, AS_HELP_STRING([--without-nas],[do not use the NAS sound
AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]),
[if test "x$withval" = "xno"; then ac_cv_header_AL_al_h=no; ac_cv_header_OpenAL_al_h=no; fi]) [if test "x$withval" = "xno"; then ac_cv_header_AL_al_h=no; ac_cv_header_OpenAL_al_h=no; fi])
AC_ARG_WITH(opencl, AS_HELP_STRING([--without-opencl],[do not use OpenCL]), AC_ARG_WITH(opencl, AS_HELP_STRING([--without-opencl],[do not use OpenCL]),
[if test "x$withval" = "xno"; then ac_cv_header_CL_opencl_h=no; ac_cv_header_OpenCL_opencl_h=no; fi]) [if test "x$withval" = "xno"; then ac_cv_header_CL_cl_h=no; ac_cv_header_OpenCL_opencl_h=no; fi])
AC_ARG_WITH(opengl, AS_HELP_STRING([--without-opengl],[do not use OpenGL])) AC_ARG_WITH(opengl, AS_HELP_STRING([--without-opengl],[do not use OpenGL]))
AC_ARG_WITH(openssl, AS_HELP_STRING([--without-openssl],[do not use OpenSSL]), AC_ARG_WITH(openssl, AS_HELP_STRING([--without-openssl],[do not use OpenSSL]),
[if test "x$withval" = "xno"; then ac_cv_header_openssl_err_h=no; ac_cv_header_openssl_ssl_h=no; fi]) [if test "x$withval" = "xno"; then ac_cv_header_openssl_err_h=no; ac_cv_header_openssl_ssl_h=no; fi])
@ -370,7 +370,7 @@ AC_CHECK_HEADERS(\
AL/al.h \ AL/al.h \
AudioToolbox/AudioConverter.h \ AudioToolbox/AudioConverter.h \
AudioUnit/AudioUnit.h \ AudioUnit/AudioUnit.h \
CL/opencl.h \ CL/cl.h \
Carbon/Carbon.h \ Carbon/Carbon.h \
CoreAudio/CoreAudio.h \ CoreAudio/CoreAudio.h \
DiskArbitration/DiskArbitration.h \ DiskArbitration/DiskArbitration.h \
@ -1107,7 +1107,7 @@ without X support, which probably isn't what you want. You will need
to install ${notice_platform}development packages of Xlib/Xfree86 at the very least.]) to install ${notice_platform}development packages of Xlib/Xfree86 at the very least.])
dnl **** Check for OpenCL **** dnl **** Check for OpenCL ****
if test "$ac_cv_header_CL_opencl_h" = "yes" if test "$ac_cv_header_CL_cl_h" = "yes"
then then
AC_CHECK_LIB(OpenCL,clGetPlatformInfo,[AC_SUBST(LIBOPENCL,["-lOpenCL"])]) AC_CHECK_LIB(OpenCL,clGetPlatformInfo,[AC_SUBST(LIBOPENCL,["-lOpenCL"])])
fi fi

4
dlls/opencl/opencl.c
View File

@ -30,8 +30,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(opencl); WINE_DEFAULT_DEBUG_CHANNEL(opencl);
#if defined(HAVE_CL_OPENCL_H) #if defined(HAVE_CL_CL_H)
#include <CL/opencl.h> #include <CL/cl.h>
#elif defined(HAVE_OPENCL_OPENCL_H) #elif defined(HAVE_OPENCL_OPENCL_H)
#include <OpenCL/opencl.h> #include <OpenCL/opencl.h>
#endif #endif

4
include/config.h.in
View File

@ -54,8 +54,8 @@
/* Define to 1 if you have the `chsize' function. */ /* Define to 1 if you have the `chsize' function. */
#undef HAVE_CHSIZE #undef HAVE_CHSIZE
/* Define to 1 if you have the <CL/opencl.h> header file. */ /* Define to 1 if you have the <CL/cl.h> header file. */
#undef HAVE_CL_OPENCL_H #undef HAVE_CL_CL_H
/* Define to 1 if you have the <CoreAudio/CoreAudio.h> header file. */ /* Define to 1 if you have the <CoreAudio/CoreAudio.h> header file. */
#undef HAVE_COREAUDIO_COREAUDIO_H #undef HAVE_COREAUDIO_COREAUDIO_H