From 48dd0c56736cab730d4af6a5bb9be55388f66c31 Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
Date: Thu, 1 Nov 2007 18:55:00 +0000
Subject: Fixed curl-config --features to not display libz when it wasn't used
 due to a missing header file.

---
 CHANGES       | 4 ++++
 RELEASE-NOTES | 2 +-
 configure.ac  | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 75e101b3d..c866fd8f1 100644
--- 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 e0194b487..82cc069ed 100644
--- 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 8dc46afc1..2be648541 100644
--- 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!])
-- 
cgit v1.2.3