Fixed curl-config --features to not display libz when it wasn't used

due to a missing header file.

diff --git a/CHANGES b/CHANGES
index 75e101b3d8f6ce532dd8a7fcc4194a332f112deb..c866fd8f1f74db86351e17a0ab257376b7836868 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+Dan F (1 Nov 2007)
+- Fixed curl-config --features to not display libz when it wasn't used
+  due to a missing header file.
+
 Dan F (31 October 2007)
 - Fixed the output of curl-config --protocols which showed SCP and SFTP
   always, except when --without-libssh2 was given

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e0194b48722bcadc5eefcc22c69b4aa25c1a7e71..82cc069edf4493da0a2e1905c41312d82d92eb38 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -15,7 +15,7 @@ This release includes the following changes:
 This release includes the following bugfixes:
 
  o curl-config --features and --protocols show the correct output when built
-   with NSS, and also when SCP and SFTP are not available
+   with NSS, and also when SCP, SFTP and libz are not available
 
 This release includes the following known bugs:
 

diff --git a/configure.ac b/configure.ac
index 8dc46afc106e690c6c009dff156e5d466376b812..2be64854116548cc212f1a54c387b3e5ee35e0d3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1292,6 +1292,7 @@ else
   if test "$HAVE_LIBZ" = "1" && test "$HAVE_ZLIB_H" != "1"
   then
     AC_MSG_WARN([configure found only the libz lib, not the header file!])
+    HAVE_LIBZ=""
   elif test "$HAVE_LIBZ" != "1" && test "$HAVE_ZLIB_H" = "1"
   then
     AC_MSG_WARN([configure found only the libz header file, not the lib!])