aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2007-11-01 18:55:00 +0000
committerDan Fandrich <dan@coneharvesters.com>2007-11-01 18:55:00 +0000
commit48dd0c56736cab730d4af6a5bb9be55388f66c31 (patch)
tree2a233a166332fab59a5bb94c134a8ea85c0ba515
parent8be493296dd465207be426738e5e7e8e9c8037b5 (diff)
Fixed curl-config --features to not display libz when it wasn't used
due to a missing header file.
-rw-r--r--CHANGES4
-rw-r--r--RELEASE-NOTES2
-rw-r--r--configure.ac1
3 files changed, 6 insertions, 1 deletions
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!])