Skip to content

Commit b15624e

Browse files
committed
Fix regression (shared libraries no longer supported)
The first usage of AC_CHECK_HEADERS must be unconditional, otherwise configure fails to detect support for shared libraries. This fixes a regression introduced by commit a07025c. Signed-off-by: Stefan Weil <sw@weilnetz.de>
1 parent 364ffeb commit b15624e

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

configure.ac

+5-4
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,10 @@ fi
177177
# check whether to build OpenMP support
178178
AC_OPENMP
179179

180+
have_tiff=false
181+
# Note that the first usage of AC_CHECK_HEADERS must be unconditional.
182+
AC_CHECK_HEADERS([tiffio.h], [have_tiff=true], [have_tiff=false])
183+
180184
# check whether to build opencl version
181185
AC_MSG_CHECKING([--enable-opencl argument])
182186
AC_ARG_ENABLE([opencl],
@@ -186,13 +190,10 @@ AC_MSG_RESULT([$enable_opencl])
186190
have_opencl=false
187191
if test "$enable_opencl" = "yes"; then
188192
AC_CHECK_HEADERS([CL/cl.h], [have_opencl=true], [
189-
AC_CHECK_HEADERS(OpenCL/cl.h, have_opencl=true, have_opencl=false)
193+
AC_CHECK_HEADERS(OpenCL/cl.h, [have_opencl=true], [have_opencl=false])
190194
])
191195
fi
192196

193-
have_tiff=false
194-
AC_CHECK_HEADERS([tiffio.h], [have_tiff=true], [have_tiff=false])
195-
196197
# https://lists.apple.com/archives/unix-porting/2009/Jan/msg00026.html
197198
m4_define([MY_CHECK_FRAMEWORK],
198199
[AC_CACHE_CHECK([if -framework $1 works],[my_cv_framework_$1],

0 commit comments

Comments
 (0)