security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-23 20:08:04 +01:00
Code Activity

* libcurl.m4: Check for curl_easy_escape() and curl_easy_unescape().

Browse Source 
Replace with curl_escape() and curl_unescape() if libcurl doesn't have
it.
This commit is contained in:
David Shaw 2007-01-16 06:10:31 +00:00
parent e5f521db93
commit 5af8d68211
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
m4/ChangeLog
View File

@ -1,3 +1,9 @@
2007-01-16 David Shaw <dshaw@jabberwocky.com>
* libcurl.m4: Check for curl_easy_escape() and
curl_easy_unescape(). Replace with curl_escape() and
curl_unescape() if libcurl doesn't have it.
2006-10-02 Werner Koch <wk@g10code.com> 2006-10-02 Werner Koch <wk@g10code.com>
* autobuild.m4: New. * autobuild.m4: New.

36
m4/libcurl.m4
View File

@ -1,7 +1,7 @@
# LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION], # LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION],
# [ACTION-IF-YES], [ACTION-IF-NO]) # [ACTION-IF-YES], [ACTION-IF-NO])
# ---------------------------------------------------------- # ----------------------------------------------------------
# David Shaw <dshaw@jabberwocky.com> May-09-2006 # David Shaw <dshaw@jabberwocky.com> Jan-16-2007
# #
# Checks for libcurl. DEFAULT-ACTION is the string yes or no to # Checks for libcurl. DEFAULT-ACTION is the string yes or no to
# specify whether to default to --with-libcurl or --without-libcurl. # specify whether to default to --with-libcurl or --without-libcurl.
@ -162,17 +162,39 @@ x=CURLOPT_VERBOSE;
if test $libcurl_cv_lib_curl_usable = yes ; then 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 _libcurl_save_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS" CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
_libcurl_save_libs=$LIBS _libcurl_save_libs=$LIBS
LIBS="$LIBS $LIBCURL" LIBS="$LIBS $LIBCURL"
AC_CHECK_FUNC(curl_free,, # Check for some libcurl functions that aren't in all
AC_DEFINE(curl_free,free, # versions.
[Define curl_free() as free() if our version of curl lacks curl_free.]))
AC_CHECK_FUNCS([curl_free curl_easy_escape curl_easy_unescape])
AH_BOTTOM([
#ifdef HAVE_LIBCURL
/* Define curl_free() via free() if our version of curl lacks
curl_free() */
#if !defined(curl_free) && !defined(HAVE_CURL_FREE)
#define curl_free(a) free((a))
#endif
/* Define curl_easy_escape() via curl_escape() if our version of curl
lacks curl_easy_escape() */
#if !defined(curl_easy_escape) && !defined(HAVE_CURL_EASY_ESCAPE)
#define curl_easy_escape(a,b,c) curl_escape((b),(c))
#endif
/* Define curl_easy_unescape() via curl_unescape() if our version of
curl lacks curl_easy_unescape() */
#if !defined(curl_easy_unescape) && !defined(HAVE_CURL_EASY_UNESCAPE)
#define curl_easy_unescape(a,b,c) curl_unescape((b),(c))
#endif
#endif /* HAVE_LIBCURL */
])
CPPFLAGS=$_libcurl_save_cppflags CPPFLAGS=$_libcurl_save_cppflags
LIBS=$_libcurl_save_libs LIBS=$_libcurl_save_libs