aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2005-07-20 20:45:44 +0000
committerDavid Shaw <[email protected]>2005-07-20 20:45:44 +0000
commitf23b94596552ef37a2d1ff0855456b7ca601b53b (patch)
treedbb0a9fe893c1c29d0c33325f230f64aea835fc6
parentDocument --limit-card-insert-tries. (diff)
downloadgnupg-f23b94596552ef37a2d1ff0855456b7ca601b53b.tar.gz
gnupg-f23b94596552ef37a2d1ff0855456b7ca601b53b.zip
* libcurl.m4: Check that our libcurl has curl_version_info(CURLINFO_NOW).
Diffstat (limited to '')
-rw-r--r--m4/ChangeLog5
-rw-r--r--m4/libcurl.m46
2 files changed, 9 insertions, 2 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog
index e77ef1992..ec1cee584 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-20 David Shaw <[email protected]>
+
+ * libcurl.m4: Check that our libcurl has
+ curl_version_info(CURLINFO_NOW).
+
2005-06-22 David Shaw <[email protected]>
* libcurl.m4: Only do the OS X linker fix on Panther. Tiger has a
diff --git a/m4/libcurl.m4 b/m4/libcurl.m4
index 882770924..16c447c95 100644
--- a/m4/libcurl.m4
+++ b/m4/libcurl.m4
@@ -1,7 +1,7 @@
# LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION],
# [ACTION-IF-YES], [ACTION-IF-NO])
# ----------------------------------------------------------
-# David Shaw <[email protected]> Jun-21-2005
+# David Shaw <[email protected]> Jul-20-2005
#
# Checks for libcurl. DEFAULT-ACTION is the string yes or no to
# specify whether to default to --with-libcurl or --without-libcurl.
@@ -32,7 +32,8 @@
# found is after version 7.7.2, the first version that included the
# curl-config script. Note that it is very important for people
# packaging binary versions of libcurl to include this script!
-# Without curl-config, we can only guess what protocols are available.
+# Without curl-config, we can only guess what protocols are available,
+# (or use curl_version_info to figure it out at runtime).
AC_DEFUN([LIBCURL_CHECK_CONFIG],
[
@@ -141,6 +142,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
missing symbols or can't link. */
int x;
curl_easy_setopt(NULL,CURLOPT_URL,NULL);
+curl_version_info2(CURLINFO_NOW);
x=CURL_ERROR_SIZE;
x=CURLOPT_WRITEFUNCTION;
x=CURLOPT_FILE;