gnupg/m4 (ChangeLog libcurl.m4)

[cvs user dshaw]

    Date: Wednesday, June 22, 2005 @ 07:31:52
  Author: dshaw
    Path: /cvs/gnupg/gnupg/m4

Modified: ChangeLog libcurl.m4

* libcurl.m4: Only do the OS X linker fix on Panther.  Tiger has a
clean curl-config.


------------+
 ChangeLog  |    5 +++++
 libcurl.m4 |    7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)


Index: gnupg/m4/ChangeLog
diff -u gnupg/m4/ChangeLog:1.18 gnupg/m4/ChangeLog:1.19
--- gnupg/m4/ChangeLog:1.18	Sun Apr 24 18:52:14 2005
+++ gnupg/m4/ChangeLog	Wed Jun 22 07:31:52 2005
@@ -1,3 +1,8 @@
+2005-06-22  David Shaw  <dshaw at jabberwocky.com>
+
+	* libcurl.m4: Only do the OS X linker fix on Panther.  Tiger has a
+	clean curl-config.
+
 2005-04-24  David Shaw  <dshaw at jabberwocky.com>
 
 	* libcurl.m4: Add a check for curl_free() since older versions of
Index: gnupg/m4/libcurl.m4
diff -u gnupg/m4/libcurl.m4:1.11 gnupg/m4/libcurl.m4:1.12
--- gnupg/m4/libcurl.m4:1.11	Sun Apr 24 18:52:15 2005
+++ gnupg/m4/libcurl.m4	Wed Jun 22 07:31:52 2005
@@ -1,7 +1,7 @@
 # LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION],
 #                       [ACTION-IF-YES], [ACTION-IF-NO])
 # ----------------------------------------------------------
-#      David Shaw <dshaw at jabberwocky.com>   Apr-21-2005
+#      David Shaw <dshaw at jabberwocky.com>   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 @@
               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