security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-01 16:33:02 +01:00
Code Activity

* readline.m4: Make sure that readline is modern enough to understand

Browse Source 
rl_catch_signals.

* libcurl.m4: Don't require curl-config to be present since it seems some
binary packages don't include it.  Allow users to specify LIBCURL and
LIBCURL_INCLUDES for us.
This commit is contained in:
David Shaw 2004-12-23 16:12:13 +00:00
parent 97b8f41b08
commit 7c67985457
3 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
m4/ChangeLog
View File

@ -1,3 +1,12 @@
2004-12-23 David Shaw <dshaw@jabberwocky.com>
* readline.m4: Make sure that readline is modern enough to
understand rl_catch_signals.
* libcurl.m4: Don't require curl-config to be present since it
seems some binary packages don't include it. Allow users to
specify LIBCURL and LIBCURL_INCLUDES for us.
2004-12-22 David Shaw <dshaw@jabberwocky.com>
* libcurl.m4: Be much more strict with libcurl by trying to

28
m4/libcurl.m4
View File

@ -24,19 +24,28 @@ AC_DEFUN([GNUPG_CHECK_LIBCURL],
LDFLAGS="${LDFLAGS} -L$withval/lib"
fi
AC_MSG_CHECKING([for libcurl])
AC_MSG_CHECKING([for curl-config])
if eval curl-config --version 2>/dev/null >/dev/null; then
AC_SUBST([LIBCURL_INCLUDES],[`curl-config --cflags`])
AC_SUBST([LIBCURL],[`curl-config --libs`])
have_libcurl=yes
if test x"$LIBCURL_INCLUDES" = "x" ; then
LIBCURL_INCLUDES=`curl-config --cflags`
fi
if test x"$LIBCURL" = "x" ; then
LIBCURL=`curl-config --libs`
fi
_have_config=yes
else
have_libcurl=no
_have_config=no
fi
AC_MSG_RESULT([$have_libcurl])
AC_MSG_RESULT([$_have_config])
AC_MSG_CHECKING([whether libcurl is modern enough])
# we didn't find curl-config, so let's see if the user-supplied
# link line (or failing that, "-lcurl") is enough.
LIBCURL=${LIBCURL-"-lcurl"}
AC_MSG_CHECKING([whether libcurl is usable])
_libcurl_save_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $LIBCURL_INCLUDES"
@ -53,7 +62,7 @@ x=CURLOPT_FILE;
x=CURLOPT_ERRORBUFFER;
x=CURLOPT_STDERR;
x=CURLOPT_VERBOSE;
]),,have_libcurl=no)
]),have_libcurl=yes,have_libcurl=no)
CPPFLAGS=$_libcurl_save_cppflags
LDFLAGS=$_libcurl_save_ldflags
@ -63,9 +72,12 @@ x=CURLOPT_VERBOSE;
if test $have_libcurl = yes ; then
AC_DEFINE(HAVE_LIBCURL,1,
[Define to 1 if you have a fully functional curl library.])
AC_SUBST(LIBCURL_INCLUDES)
AC_SUBST(LIBCURL)
fi
unset _do_libcurl
unset _have_config
unset _libcurl_save_cppflags
unset _libcurl_save_ldflags
fi

5
m4/readline.m4
View File

@ -34,7 +34,10 @@ AC_DEFUN([GNUPG_CHECK_READLINE],
#include <stdio.h>
#include <readline/readline.h>
#include <readline/history.h>
],[add_history("foobar");]),_found_readline=yes,_found_readline=no)
],[
add_history("foobar");
rl_catch_signals=0;
]),_found_readline=yes,_found_readline=no)
AC_MSG_RESULT([$_found_readline])