projects / packages / imlib.git / blame
| Commit | Line | Data |
|---|---|---|
| a8988095 JB |
1 | --- imlib-1.9.14/configure.in.orig Wed May 1 21:54:31 2002 |
| 2 | +++ imlib-1.9.14/configure.in Wed May 1 21:59:55 2002 | |
| 69f14c82 | 3 | @@ -233,21 +233,21 @@ |
| 8eb708ad JB |
4 | |
| 5 | dnl Test for libtiff | |
| 6 | AC_CHECK_LIB(tiff, TIFFReadScanline, | |
| 7 | - AC_CHECK_HEADER(tiffio.h, | |
| a8988095 JB |
8 | + [AC_CHECK_HEADER(tiffio.h,[ |
| 9 | TIFFLIBS="-ltiff" | |
| 8eb708ad | 10 | - SUPPORT_LIBS="$SUPPORT_LIBS -ltiff"; AC_DEFINE(HAVE_LIBTIFF), |
| 69f14c82 | 11 | - AC_MSG_ERROR(*** TIFF header files not found ***)), |
| 8eb708ad JB |
12 | - AC_CHECK_LIB(tiff, TIFFWriteScanline, |
| 13 | - AC_CHECK_HEADER(tiffio.h, | |
| a8988095 JB |
14 | + SUPPORT_LIBS="$SUPPORT_LIBS -ltiff"; AC_DEFINE(HAVE_LIBTIFF)], |
| 15 | + AC_MSG_ERROR([*** TIFF header files not found ***]))], | |
| 16 | + [AC_CHECK_LIB(tiff, TIFFWriteScanline, | |
| 17 | + [AC_CHECK_HEADER(tiffio.h,[ | |
| 18 | TIFFLIBS="-ltiff -ljpeg -lz" | |
| 8eb708ad | 19 | - SUPPORT_LIBS="$SUPPORT_LIBS -ltiff -ljpeg -lz"; AC_DEFINE(HAVE_LIBTIFF), |
| 69f14c82 | 20 | - AC_MSG_ERROR(*** TIFF header files not found ***)), |
| 8eb708ad JB |
21 | - AC_CHECK_LIB(tiff34, TIFFFlushData, |
| 22 | - AC_CHECK_HEADER(tiffio.h, | |
| 23 | + SUPPORT_LIBS="$SUPPORT_LIBS -ltiff -ljpeg -lz"; AC_DEFINE(HAVE_LIBTIFF)], | |
| 69f14c82 | 24 | + AC_MSG_ERROR([*** TIFF header files not found ***]))], |
| 8eb708ad | 25 | + [AC_CHECK_LIB(tiff34, TIFFFlushData, |
| a8988095 JB |
26 | + [AC_CHECK_HEADER(tiffio.h,[ |
| 27 | TIFFLIBS="-ltiff34 -ljpeg -lz" | |
| 28 | - SUPPORT_LIBS="$SUPPORT_LIBS -ltiff34 -ljpeg -lz"; AC_DEFINE(HAVE_LIBTIFF), | |
| 29 | - AC_MSG_ERROR(*** TIFF header files not found ***)), | |
| 30 | - AC_MSG_ERROR(*** TIFF library not found ***), -ljpeg -lz $GX_LIBS), -ljpeg -lz $GX_LIBS), $GX_LIBS) | |
| 8eb708ad | 31 | + SUPPORT_LIBS="$SUPPORT_LIBS -ltiff34 -ljpeg -lz"; AC_DEFINE(HAVE_LIBTIFF)], |
| 69f14c82 | 32 | + AC_MSG_ERROR([*** TIFF header files not found ***]))], |
| a8988095 | 33 | + AC_MSG_ERROR([*** TIFF library not found ***]), [-ljpeg -lz $GX_LIBS])], [-ljpeg -lz $GX_LIBS])], [$GX_LIBS]) |
| 8eb708ad JB |
34 | |
| 35 | ||
| 36 | AC_CHECK_HEADER(gif_lib.h, | |
| a8988095 JB |
37 | @@ -265,10 +265,10 @@ |
| 38 | AC_MSG_ERROR(*** GIF header not found ***)) | |
| 39 | ||
| 40 | AC_CHECK_LIB(png, png_read_info, | |
| 41 | - AC_CHECK_HEADER(png.h, | |
| 42 | + [AC_CHECK_HEADER(png.h, | |
| 43 | png_ok=yes, | |
| 44 | - png_ok=no), | |
| 45 | - AC_MSG_ERROR(*** PNG library not found ***), -lz -lm $GX_LIBS) | |
| 46 | + png_ok=no)], | |
| 47 | + AC_MSG_ERROR([*** PNG library not found ***]), [-lz -lm $GX_LIBS]) | |
| 48 | if test "$png_ok" = yes; then | |
| 49 | AC_MSG_CHECKING([for png_structp in png.h]) | |
| 50 | AC_TRY_COMPILE([#include <png.h>], |