diff options
| author | David Shaw <[email protected]> | 2005-01-25 02:47:57 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2005-01-25 02:47:57 +0000 |
| commit | 9198b9de5cbd5ea5ea9ad303eb70ef382f702ed4 (patch) | |
| tree | 15b72a03d65998dc8eaea6103be5c20c1c3bd42a | |
| parent | * gpgkeys_ldap.c (print_nocr): New. (get_key): Call it here to (diff) | |
| download | gnupg-9198b9de5cbd5ea5ea9ad303eb70ef382f702ed4.tar.gz gnupg-9198b9de5cbd5ea5ea9ad303eb70ef382f702ed4.zip | |
* libcurl.m4: All versions of curl-config support --feature.
| -rw-r--r-- | m4/ChangeLog | 8 | ||||
| -rw-r--r-- | m4/libcurl.m4 | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index 5508f38cf..fffd48af0 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,9 +1,13 @@ -2005-01-22 David Shaw <[email protected]> +2005-01-24 David Shaw <[email protected]> + + * libcurl.m4: All versions of curl-config support --feature. + +2005-01-22 David Shaw <[email protected]> * libcurl.m4: Note that FTPS existed, but wasn't fully standards-compliant until version 7.11.0. -2005-01-17 David Shaw <[email protected]> +2005-01-17 David Shaw <[email protected]> * libcurl.m4: Use LIBCURL_CPPFLAGS and not LIBCURL_INCLUDES to match automake syntax. diff --git a/m4/libcurl.m4 b/m4/libcurl.m4 index 41bbc0269..eb98e17d4 100644 --- a/m4/libcurl.m4 +++ b/m4/libcurl.m4 @@ -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 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG], 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 |