diff options
| author | David Shaw <[email protected]> | 2005-06-22 05:31:52 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2005-06-22 05:31:52 +0000 |
| commit | b0ba0c631467447b40e3773f6a2d022e52dd54bb (patch) | |
| tree | 4421b3a317aaabf7f29e799dc71479778ba62556 | |
| parent | * gpgkeys_http.c (get_key), gpgkeys_oldhkp.c (send_key, get_key, (diff) | |
| download | gnupg-b0ba0c631467447b40e3773f6a2d022e52dd54bb.tar.gz gnupg-b0ba0c631467447b40e3773f6a2d022e52dd54bb.zip | |
* libcurl.m4: Only do the OS X linker fix on Panther. Tiger has a
clean curl-config.
Diffstat (limited to '')
| -rw-r--r-- | m4/ChangeLog | 5 | ||||
| -rw-r--r-- | m4/libcurl.m4 | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index b864cb74f..e77ef1992 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2005-06-22 David Shaw <[email protected]> + + * libcurl.m4: Only do the OS X linker fix on Panther. Tiger has a + clean curl-config. + 2005-04-24 David Shaw <[email protected]> * libcurl.m4: Add a check for curl_free() since older versions of diff --git a/m4/libcurl.m4 b/m4/libcurl.m4 index 8ade5445c..882770924 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]> Apr-21-2005 +# David Shaw <[email protected]> Jun-21-2005 # # Checks for libcurl. DEFAULT-ACTION is the string yes or no to # specify whether to default to --with-libcurl or --without-libcurl. @@ -99,9 +99,10 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG], LIBCURL=`$_libcurl_config --libs` # This is so silly, but Apple actually has a bug in their - # curl-config script! + # curl-config script. Fixed in Tiger, but there are still + # lots of Panther installs around. case "${host}" in - powerpc-apple-darwin*) + powerpc-apple-darwin7*) LIBCURL=`echo $LIBCURL | sed -e 's|-arch i386||g'` ;; esac |