[Mesa-dev] [PATCH 2/2] configure: enable the OpenCL ICD by default

[Emil Velikov]

From: Emil Velikov <emil.velikov at collabora.com>

Nearly all the distributions* that build Mesa OpenCL, enable the ICD.
Since building a non-ICD driver has the chance of conflicting with
existing OpenCL binary (libOpenCL.so).

Furthermore, some applications expect the library to provide
annotated/versioned symbols.

https://lists.freedesktop.org/archives/mesa-dev/2017-September/171093.html

*Fedora, Suse, Arch, Debian, Ubuntu, FreeBSD use the ICD
Gentoo manages the conflicting files via eselect.

Cc: Aaron Watry <awatry at gmail.com>
Cc: Francisco Jerez <currojerez at riseup.net>
Cc: Matt Turner <mattst88 at gmail.com>
Cc: Jan Vesely <jan.vesely at rutgers.edu>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 Makefile.am  | 1 +
 configure.ac | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a4f49d3d332..ec432b471d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-glx-tls \
 	--enable-nine \
 	--enable-opencl \
+	--enable-opencl-icd \
 	--enable-opengl \
 	--enable-va \
 	--enable-vdpau \
diff --git a/configure.ac b/configure.ac
index 62d33a1941c..9728675ccb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1269,9 +1269,9 @@ AC_ARG_ENABLE([opencl],
 AC_ARG_ENABLE([opencl_icd],
    [AS_HELP_STRING([--enable-opencl-icd],
           [Build an OpenCL ICD library to be loaded by an ICD implementation
-           @<:@default=disabled@:>@])],
+           @<:@default=enabled@:>@])],
     [enable_opencl_icd="$enableval"],
-    [enable_opencl_icd=no])
+    [enable_opencl_icd=yes])
 
 AC_ARG_ENABLE([gallium-tests],
     [AS_HELP_STRING([--enable-gallium-tests],
-- 
2.14.1