configure: test for zlib only w/--enable-experimental

Only builds with --enable-experimental require zlib currently.
A base install of mingw will not include the development headers and
library. libwebp itself will now build in such environments.
Additionally, remove -lz from **/Makefile.am, -lz will be added to LIBS
by AC_CHECK_LIB when necessary.

Change-Id: Iae8319cdf00162ecb7ed44661c02f40beb34f155
This commit is contained in:
James Zern
2011-06-03 12:39:14 -07:00
parent b2b0090b4c
commit e29072a8ce
3 changed files with 9 additions and 4 deletions

View File

@ -10,7 +10,12 @@ AC_SUBST([pkgconfigdir])
dnl === Check libz is present
AC_CHECK_LIB(z, gzsetparams, [AC_CHECK_HEADER(zlib.h,,)], [AC_MSG_ERROR(zlib library not found)])
if test "$enable_experimental" = "yes"; then
AC_CHECK_HEADER(zlib.h,
AC_CHECK_LIB(z, gzsetparams,,AC_MSG_ERROR(zlib library not found)),
AC_MSG_ERROR(zlib not available - no zlib.h)
)
fi
dnl === check for PNG support ===