[Mesa-dev] [PATCH 01/11] configure.ac: Add HAVE_OPENCL AM_CONDITIONAL

[Tom Stellard]

---
 configs/autoconf.in |    1 +
 configure.ac        |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/configs/autoconf.in b/configs/autoconf.in
index 3c8f4c1..28f3cb4 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -222,3 +222,4 @@ HAVE_XF86VIDMODE = @HAVE_XF86VIDMODE@
 
 GALLIUM_PIPE_LOADER_DEFINES = @GALLIUM_PIPE_LOADER_DEFINES@
 GALLIUM_PIPE_LOADER_LIBS = @GALLIUM_PIPE_LOADER_LIBS@
+HAVE_OPENCL = @HAVE_OPENCL@
diff --git a/configure.ac b/configure.ac
index 2d1265a..793585c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -880,6 +880,7 @@ AC_SUBST([GALLIUM_WINSYS_DIRS])
 AC_SUBST([GALLIUM_DRIVERS_DIRS])
 AC_SUBST([GALLIUM_STATE_TRACKERS_DIRS])
 AC_SUBST([MESA_LLVM])
+AC_SUBST([HAVE_OPENCL])
 
 # Check for libdrm
 PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED],
@@ -1613,6 +1614,7 @@ dnl OpenCL configuration
 dnl
 
 if test "x$enable_opencl" = xyes; then
+    HAVE_OPENCL=1
     if test "x$with_gallium_drivers" = x; then
         AC_MSG_ERROR([cannot enable OpenCL without Gallium])
     fi
@@ -2070,6 +2072,7 @@ AM_CONDITIONAL(NEED_RADEON_GALLIUM, test x$NEED_RADEON_GALLIUM = xyes)
 AM_CONDITIONAL(USE_R600_LLVM_COMPILER, test x$USE_R600_LLVM_COMPILER = xyes)
 AM_CONDITIONAL(HAVE_LOADER_GALLIUM, test x$enable_gallium_loader = xyes)
 AM_CONDITIONAL(HAVE_DRM_LOADER_GALLIUM, test x$enable_gallium_drm_loader = xyes)
+AM_CONDITIONAL(HAVE_OPENCL, test x$enable_opencl = xyes)
 AC_SUBST([GALLIUM_MAKE_DIRS])
 
 dnl prepend CORE_DIRS to SRC_DIRS
-- 
1.7.7.6