diff options
| author | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2012-03-28 20:19:08 +0200 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2012-03-28 20:19:08 +0200 |
| commit | e55f485d803cb1f82e0d8a53d1998e1887c7920f (patch) | |
| tree | 3518ebb8f3205ec84aa0c9bcd53acd3ea8f24cde /m4 | |
| parent | e88c17d45220eea60a3dd7fab26a067616388c5f (diff) | |
Improve m4/libjpeg.m4
m4/libjpeg.m4 uses USER_INCLUDES and USER_LDFLAGS in it, but
USER_INCLUDES is not reflected when jpeglib.h is searched.
this patch modifies m4/libjpeg.m4 to reflect USER_INCLUDES
when jpeglib.h is searched.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/libjpeg.m4 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/m4/libjpeg.m4 b/m4/libjpeg.m4 index 505abc27..d3843436 100644 --- a/m4/libjpeg.m4 +++ b/m4/libjpeg.m4 @@ -68,7 +68,13 @@ 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) +ac_save_CPPFLAGS="$CPPFLAGS" +ac_save_CFLAGS="$CFLAGS" +CPPFLAGS="$CFLAGS $all_includes $USER_INCLUDES" +CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" AC_CHECK_HEADER([jpeglib.h], [jpeg_incdir=yes], [jpeg_incdir=NO]) +CPPFLAGS="$ac_save_CPPFLAGS" +CFLAGS="$ac_save_CFLAGS" test "x$jpeg_incdir" = xNO && jpeg_incdir= dnl if headers _and_ libraries are missing, this is no error, and we |