diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-08-13 06:17:42 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-08-13 06:17:42 -0400 |
| commit | 31593bf6331776d08c1b439675b70a58492d657e (patch) | |
| tree | 7d04f22002f37f3ab7c32eb6b773bd4c2a2a6aa0 /autogen | |
| parent | 9cda66e432f4f17a9aa150a56de389df5577c914 (diff) | |
Auto-commit of generated files.
Diffstat (limited to 'autogen')
| -rwxr-xr-x | autogen/configure | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/autogen/configure b/autogen/configure index 54e8f290293..45d5b7954c9 100755 --- a/autogen/configure +++ b/autogen/configure @@ -13640,13 +13640,8 @@ fi HAVE_ZLIB=no LIBZ= if test "${with_zlib}" != "no"; then - if test "${HAVE_PNG}" = "yes"; then - ### PNG depends on zlib, so if we have PNG, we have zlib. - HAVE_ZLIB=yes - else - ### No PNG, so check zlib ourselves. - OLIBS=$LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inflateEnd" >&5 + OLIBS=$LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inflateEnd" >&5 $as_echo_n "checking for library containing inflateEnd... " >&6; } if test "${ac_cv_search_inflateEnd+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -13702,16 +13697,19 @@ if test "$ac_res" != no; then : HAVE_ZLIB=yes fi - LIBS=$OLIBS - case $ac_cv_search_inflateEnd in - -*) LIBZ=$ac_cv_search_inflateEnd ;; - esac - fi + LIBS=$OLIBS + case $ac_cv_search_inflateEnd in + -*) LIBZ=$ac_cv_search_inflateEnd ;; + esac fi if test "${HAVE_ZLIB}" = "yes"; then $as_echo "#define HAVE_ZLIB 1" >>confdefs.h + ### mingw32 doesn't use -lz, since it loads the library dynamically. + if test "${opsys}" = "mingw32"; then + LIBZ= + fi fi |