summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2009-03-08 15:29:02 +0100
committerAlbert Astals Cid <aacid@kde.org>2009-03-08 15:31:49 +0100
commit8dc9e4d57a4759de2b56a87d9bace80d5d563fef (patch)
treefc0caecf886e507fe3bc9ee050286f2f93dd7d8c /m4
parentbf2e2f056cadbc488cd3e9576b44beb34689ec81 (diff)
use AC_CHECK_HEADER to find headers
The original m4/libjpeg.m4 used AC_FIND_FILE to look for jpeg header file. This test is not cross-compiling save. This patch uses the autoconf function AC_CHECK_HEADER to look for the jpeg header, which works in the native and the cross compiling scenaria. Bug #20538
Diffstat (limited to 'm4')
-rw-r--r--m4/libjpeg.m43
1 files changed, 1 insertions, 2 deletions
diff --git a/m4/libjpeg.m4 b/m4/libjpeg.m4
index 580dd78f..505abc27 100644
--- a/m4/libjpeg.m4
+++ b/m4/libjpeg.m4
@@ -68,8 +68,7 @@ KDE_FIND_JPEG_HELPER(6b, 6b,
dnl then search the headers (can't use simply AC_TRY_xxx, as jpeglib.h
dnl requires system dependent includes loaded before it)
-jpeg_incdirs="`eval echo $includedir` /usr/include /usr/local/include /mingw/include"
-AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
+AC_CHECK_HEADER([jpeglib.h], [jpeg_incdir=yes], [jpeg_incdir=NO])
test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we