[Emacs-diffs] trunk r113839: Auto-commit of generated files.

[Glenn Morris]

------------------------------------------------------------
revno: 113839
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-08-13 06:17:42 -0400
message:
  Auto-commit of generated files.
modified:
  autogen/configure              configure-20091113204419-o5vbwnq5f7feedwu-1624

=== modified file 'autogen/configure'
--- a/autogen/configure 2013-08-12 10:17:43 +0000
+++ b/autogen/configure 2013-08-13 10:17:42 +0000
@@ -13640,13 +13640,8 @@
 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 @@
   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