[poppler] Branch 'poppler-0.10' - m4/libjpeg.m4

[Albert Astals Cid]

 m4/libjpeg.m4 |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit a6b9df959523ef1c3678322591a9a6b551cf27ab
Author: Marc Kleine-Budde <mkl at pengutronix.de>
Date:   Sun Mar 8 15:29:02 2009 +0100

    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

diff --git a/m4/libjpeg.m4 b/m4/libjpeg.m4
index 580dd78..505abc2 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