Minor zlib configuration tweaks.

* configure.ac (HAVE_ZLIB): Don't assume zlib is linked if PNG is.
* src/decompress.c (fn_inflateInit2) [!WINDOWSNT]:
Don't assume presence of fn_inflateInit2_ zlib internal function.

2 files changed, 10 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3a8fcfe7e9c..cf851d5bec0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Minor zlib configuration tweaks.
+        * decompress.c (fn_inflateInit2) [!WINDOWSNT]:
+        Don't assume presence of fn_inflateInit2_ zlib internal function.
+
 2013-08-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * decompress.c (Fzlib_decompress_gzipped_region): Rename to
diff --git a/src/decompress.c b/src/decompress.c
index 3605d446e5a..4e4e3a9c7dc 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -67,17 +67,17 @@ init_zlib_functions (void)
   return 1;
 }
 
+#define fn_inflateInit2(strm, windowBits) \
+        fn_inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
+
 #else /* !WINDOWSNT */
 
-#define fn_inflateInit2_        inflateInit2_
+#define fn_inflateInit2         inflateInit2
 #define fn_inflate              inflate
 #define fn_inflateEnd           inflateEnd
 
 #endif  /* WINDOWSNT */
 
-#define fn_inflateInit2(strm, windowBits) \
-        fn_inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
-
 
 struct decompress_unwind_data
 {