gnupg/m4 (ChangeLog libcurl.m4)

[cvs user dshaw]

    Date: Tuesday, January 25, 2005 @ 03:47:57
  Author: dshaw
    Path: /cvs/gnupg/gnupg/m4

Modified: ChangeLog libcurl.m4

* libcurl.m4: All versions of curl-config support --feature.


------------+
 ChangeLog  |    8 ++++++--
 libcurl.m4 |    9 +++++----
 2 files changed, 11 insertions(+), 6 deletions(-)


Index: gnupg/m4/ChangeLog
diff -u gnupg/m4/ChangeLog:1.12 gnupg/m4/ChangeLog:1.13
--- gnupg/m4/ChangeLog:1.12	Sun Jan 23 00:10:23 2005
+++ gnupg/m4/ChangeLog	Tue Jan 25 03:47:57 2005
@@ -1,9 +1,13 @@
-2005-01-22  David Shaw  <dshaw at grover.jabberwocky.com>
+2005-01-24  David Shaw  <dshaw at jabberwocky.com>
+
+	* libcurl.m4: All versions of curl-config support --feature.
+
+2005-01-22  David Shaw  <dshaw at jabberwocky.com>
 
 	* libcurl.m4: Note that FTPS existed, but wasn't fully
 	standards-compliant until version 7.11.0.
 
-2005-01-17  David Shaw  <dshaw at grover.jabberwocky.com>
+2005-01-17  David Shaw  <dshaw at jabberwocky.com>
 
 	* libcurl.m4: Use LIBCURL_CPPFLAGS and not LIBCURL_INCLUDES to
 	match automake syntax.
Index: gnupg/m4/libcurl.m4
diff -u gnupg/m4/libcurl.m4:1.7 gnupg/m4/libcurl.m4:1.8
--- gnupg/m4/libcurl.m4:1.7	Sun Jan 23 00:10:23 2005
+++ gnupg/m4/libcurl.m4	Tue Jan 25 03:47:57 2005
@@ -25,6 +25,9 @@
 # Note that xxx and yyy keep the same capitalization as in the
 # curl-config list (e.g. it's "HTTP" and not "http").
 #
+# Users may override the detected values by doing something like:
+# LIBCURL="-lcurl" LIBCURL_CPPFLAGS="-I/usr/myinclude" ./configure
+#
 # For the sake of sanity, this macro assumes that any libcurl that is
 # found is after version 7.7.2, the first version that included the
 # curl-config script.  Note that it is very important for people
@@ -110,10 +113,8 @@
               esac
            fi
 
-           # Is it modern enough to have --feature?
-	   if test $_libcurl_version -ge 0 ; then
-	      _libcurl_features=`$_libcurl_config --feature`
-	   fi
+	   # All curl-config scripts support --feature
+	   _libcurl_features=`$_libcurl_config --feature`
 
            # Is it modern enough to have --protocols? (7.12.4)
 	   if test $_libcurl_version -ge 461828 ; then