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>
This commit is contained in:
Stefan Weil 2018-07-19 09:36:58 +02:00
parent 0ad6e3e77f
commit a07025c993

View File

@ -180,15 +180,15 @@ AC_OPENMP
# check whether to build opencl version # check whether to build opencl version
AC_MSG_CHECKING([--enable-opencl argument]) AC_MSG_CHECKING([--enable-opencl argument])
AC_ARG_ENABLE([opencl], AC_ARG_ENABLE([opencl],
[ --enable-opencl enable opencl build (default=no)], AS_HELP_STRING([--enable-opencl], [enable opencl build [default=no]]))
[enable_opencl=$enableval],
[enable_opencl="no"])
AC_MSG_RESULT([$enable_opencl]) AC_MSG_RESULT([$enable_opencl])
# check for opencl header # check for opencl header
have_opencl=false have_opencl=false
AC_CHECK_HEADERS([CL/cl.h], [have_opencl=true], [ if test "$enable_opencl" = "yes"; then
AC_CHECK_HEADERS([CL/cl.h], [have_opencl=true], [
AC_CHECK_HEADERS(OpenCL/cl.h, have_opencl=true, have_opencl=false) AC_CHECK_HEADERS(OpenCL/cl.h, have_opencl=true, have_opencl=false)
]) ])
fi
have_tiff=false have_tiff=false
AC_CHECK_HEADERS([tiffio.h], [have_tiff=true], [have_tiff=false]) AC_CHECK_HEADERS([tiffio.h], [have_tiff=true], [have_tiff=false])
@ -232,9 +232,9 @@ case "${host_os}" in
;; ;;
*) *)
# default # default
if test "$enable_opencl" = "yes"; then
AC_CHECK_LIB([OpenCL], [clGetPlatformIDs], AC_CHECK_LIB([OpenCL], [clGetPlatformIDs],
[have_opencl_lib=true], [have_opencl_lib=false]) [have_opencl_lib=true], [have_opencl_lib=false])
if test "$enable_opencl" = "yes"; then
if !($have_opencl); then if !($have_opencl); then
AC_MSG_ERROR([Required OpenCL headers not found!]) AC_MSG_ERROR([Required OpenCL headers not found!])
fi fi