diff options
| author | jcid <devnull@localhost> | 2008-05-13 01:11:52 +0200 |
|---|---|---|
| committer | jcid <devnull@localhost> | 2008-05-13 01:11:52 +0200 |
| commit | d44ef978ff96788e6ab9c30f0621e9e1f3418265 (patch) | |
| tree | ab7ab564f2ff33baea2d62a9a0996f5b175e0a40 /configure.in | |
| parent | c6ee10ee8581770e349255237f87e58c7291b0ec (diff) | |
- Made zlib a configure requirement.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/configure.in b/configure.in index 6613928e..0c6a031f 100644 --- a/configure.in +++ b/configure.in @@ -184,31 +184,29 @@ if test "x$jpeg_ok" = "xyes"; then AC_DEFINE([ENABLE_JPEG], [], [Enable JPEG images]) fi -dnl ------------------------------ -dnl Test for zlib (libpng uses it) -dnl ------------------------------ +dnl ------------- +dnl Test for zlib +dnl ------------- dnl -if test "x$enable_png" = "xyes"; then - AC_CHECK_HEADER(zlib.h, libz_ok=yes, libz_ok=no) +AC_CHECK_HEADER(zlib.h, libz_ok=yes, libz_ok=no) - if test "x$libz_ok" = "xyes"; then - old_libs="$LIBS" - AC_CHECK_LIB(z, zlibVersion, libz_ok=yes, libz_ok=no) - LIBS="$old_libs" - fi +if test "x$libz_ok" = "xyes"; then + old_libs="$LIBS" + AC_CHECK_LIB(z, zlibVersion, libz_ok=yes, libz_ok=no) + LIBS="$old_libs" +fi - if test "x$libz_ok" = xyes; then - LIBZ_LIBS="-lz" - else - AC_MSG_WARN([*** No libz found. Disabling PNG images ***]) - fi +if test "x$libz_ok" = xyes; then + LIBZ_LIBS="-lz" +else + AC_ERROR(zlib must be installed!) fi dnl --------------- dnl Test for libpng dnl --------------- dnl -if test "x$enable_png" = "xyes" && test "x$libz_ok" = "xyes"; then +if test "x$enable_png" = "xyes"; then AC_MSG_CHECKING([for libpng-config]) dnl Check if the user hasn't set the variable $PNG_CONFIG |