[Emacs-diffs] trunk r113819: Minor zlib configuration tweaks.

[Paul Eggert]

------------------------------------------------------------
revno: 113819
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2013-08-12 09:05:58 -0700
message:
  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.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/decompress.c               decompress.c-20130811194033-wfhl0tqmmc36jfmu-1

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-08-12 13:15:01 +0000
+++ b/ChangeLog 2013-08-12 16:05:58 +0000
@@ -1,3 +1,8 @@
+2013-08-12  Paul Eggert  <address@hidden>
+
+       Minor zlib configuration tweaks.
+       * configure.ac (HAVE_ZLIB): Don't assume zlib is linked if PNG is.
+
 2013-08-12  Eli Zaretskii  <address@hidden>
 
        * configure.ac (LIBZ): Comment on w32 peculiarities regarding LIBZ.

=== modified file 'configure.ac'
--- a/configure.ac      2013-08-12 13:15:01 +0000
+++ b/configure.ac      2013-08-12 16:05:58 +0000
@@ -2946,21 +2946,12 @@
 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.
-    ### Note: w32 does not link against libpng, but instead loads it
-    ### dynamically, but it also does the same with zlib.  So it is OK
-    ### not to have -lz in LIBZ on w32.
-    HAVE_ZLIB=yes
-  else
-    ### No PNG, so check zlib ourselves.
-    OLIBS=$LIBS
-    AC_SEARCH_LIBS([inflateEnd], [z], [HAVE_ZLIB=yes])
-    LIBS=$OLIBS
-    case $ac_cv_search_inflateEnd in
-      -*) LIBZ=$ac_cv_search_inflateEnd ;;
-    esac
-  fi
+  OLIBS=$LIBS
+  AC_SEARCH_LIBS([inflateEnd], [z], [HAVE_ZLIB=yes])
+  LIBS=$OLIBS
+  case $ac_cv_search_inflateEnd in
+    -*) LIBZ=$ac_cv_search_inflateEnd ;;
+  esac
 fi
 if test "${HAVE_ZLIB}" = "yes"; then
   AC_DEFINE([HAVE_ZLIB], 1, [Define to 1 if you have the zlib library (-lz).])

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-12 13:54:45 +0000
+++ b/src/ChangeLog     2013-08-12 16:05:58 +0000
@@ -1,3 +1,9 @@
+2013-08-12  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        * decompress.c (Fzlib_decompress_gzipped_region): Rename to

=== modified file 'src/decompress.c'
--- a/src/decompress.c  2013-08-12 13:54:45 +0000
+++ b/src/decompress.c  2013-08-12 16:05:58 +0000
@@ -67,17 +67,17 @@
   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
 {