gnupg/m4 (ChangeLog libcurl.m4)

[cvs user dshaw]

    Date: Sunday, April 24, 2005 @ 18:52:15
  Author: dshaw
    Path: /cvs/gnupg/gnupg/m4

Modified: ChangeLog libcurl.m4

* libcurl.m4: Add a check for curl_free() since older versions of
libcurl don't have it.  Substitute free() as an alternative.


------------+
 ChangeLog  |    5 +++++
 libcurl.m4 |   20 +++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)


Index: gnupg/m4/ChangeLog
diff -u gnupg/m4/ChangeLog:1.17 gnupg/m4/ChangeLog:1.18
--- gnupg/m4/ChangeLog:1.17	Mon Mar 21 15:32:44 2005
+++ gnupg/m4/ChangeLog	Sun Apr 24 18:52:14 2005
@@ -1,3 +1,8 @@
+2005-04-24  David Shaw  <dshaw at jabberwocky.com>
+
+	* libcurl.m4: Add a check for curl_free() since older versions of
+	libcurl don't have it.  Substitute free() as an alternative.
+
 2005-03-21  David Shaw  <dshaw at jabberwocky.com>
 
 	* readline.m4: Check for completion functionality.
Index: gnupg/m4/libcurl.m4
diff -u gnupg/m4/libcurl.m4:1.10 gnupg/m4/libcurl.m4:1.11
--- gnupg/m4/libcurl.m4:1.10	Tue Mar  1 01:05:16 2005
+++ gnupg/m4/libcurl.m4	Sun Apr 24 18:52:15 2005
@@ -1,7 +1,7 @@
 # LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION],
 #                       [ACTION-IF-YES], [ACTION-IF-NO])
 # ----------------------------------------------------------
-#      David Shaw <dshaw at jabberwocky.com>   Jan-23-2005
+#      David Shaw <dshaw at jabberwocky.com>   Apr-21-2005
 #
 # Checks for libcurl.  DEFAULT-ACTION is the string yes or no to
 # specify whether to default to --with-libcurl or --without-libcurl.
@@ -155,6 +155,24 @@
            ])
 
         if test $libcurl_cv_lib_curl_usable = yes ; then
+
+	   # Does curl_free() exist in this version of libcurl?
+	   # If not, fake it with free()
+
+           _libcurl_save_cppflags=$CPPFLAGS
+           CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
+           _libcurl_save_libs=$LIBS
+           LIBS="$LIBS $LIBCURL"
+
+           AC_CHECK_FUNC(curl_free,,
+  	      AC_DEFINE(curl_free,free,
+		[Define curl_free() as free() if our version of curl lacks curl_free.]))
+
+           CPPFLAGS=$_libcurl_save_cppflags
+           LIBS=$_libcurl_save_libs
+           unset _libcurl_save_cppflags
+           unset _libcurl_save_libs
+
            AC_DEFINE(HAVE_LIBCURL,1,
              [Define to 1 if you have a functional curl library.])
            AC_SUBST(LIBCURL_CPPFLAGS)