Skip to content

Commit a07025c

Browse files
committed
configure: Clean code for --enable-opencl
* Remove unneeded arguments for AC_ARG_ENABLE * Use AS_HELP_STRING * Use [] instead of () for default in help text * Run AC_CHECK_HEADERS, AC_CHECK_LIB only if OpenCL support is enabled Signed-off-by: Stefan Weil <sw@weilnetz.de>
1 parent 0ad6e3e commit a07025c

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

configure.ac

+7-7
Original file line numberDiff line numberDiff line change
@@ -180,15 +180,15 @@ AC_OPENMP
180180
# check whether to build opencl version
181181
AC_MSG_CHECKING([--enable-opencl argument])
182182
AC_ARG_ENABLE([opencl],
183-
[ --enable-opencl enable opencl build (default=no)],
184-
[enable_opencl=$enableval],
185-
[enable_opencl="no"])
183+
AS_HELP_STRING([--enable-opencl], [enable opencl build [default=no]]))
186184
AC_MSG_RESULT([$enable_opencl])
187185
# check for opencl header
188186
have_opencl=false
189-
AC_CHECK_HEADERS([CL/cl.h], [have_opencl=true], [
187+
if test "$enable_opencl" = "yes"; then
188+
AC_CHECK_HEADERS([CL/cl.h], [have_opencl=true], [
190189
AC_CHECK_HEADERS(OpenCL/cl.h, have_opencl=true, have_opencl=false)
191-
])
190+
])
191+
fi
192192

193193
have_tiff=false
194194
AC_CHECK_HEADERS([tiffio.h], [have_tiff=true], [have_tiff=false])
@@ -232,9 +232,9 @@ case "${host_os}" in
232232
;;
233233
*)
234234
# default
235-
AC_CHECK_LIB([OpenCL], [clGetPlatformIDs],
236-
[have_opencl_lib=true], [have_opencl_lib=false])
237235
if test "$enable_opencl" = "yes"; then
236+
AC_CHECK_LIB([OpenCL], [clGetPlatformIDs],
237+
[have_opencl_lib=true], [have_opencl_lib=false])
238238
if !($have_opencl); then
239239
AC_MSG_ERROR([Required OpenCL headers not found!])
240240
fi

0 commit comments

Comments
 (0)