security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

List readline support in configure summary 

* m4/readline.m4: Set gnupg_cv_have_readline.
* configure.ac: Add readline support to summary output.
--

Readline is an optional feature which is build if the readline
development files are available on the build systems.  Too often they
are missing on a (new) build machine which at least makes debugging
inconvenient.
Backport useful code from fixes for bug 1447.

* configure.ac: Cehck for inet_ntop.
* m4/libcurl.m4: Provide a #define for the version of the curl
library.
--

We do not have keyserver helpers anymore but this fixes may come handy
eventually.
This commit is contained in:
Werner Koch 2014-03-11 09:24:16 +01:00
parent ac5a1a3ccb
commit f30d8b0188
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -1870,6 +1870,7 @@ echo "
Use standard socket: $use_standard_socket Use standard socket: $use_standard_socket
Dirmngr auto start: $dirmngr_auto_start Dirmngr auto start: $dirmngr_auto_start
Readline support: $gnupg_cv_have_readline
" "
if test x"$use_regex" != xyes ; then if test x"$use_regex" != xyes ; then
echo " echo "

3
m4/readline.m4
View File

@ -10,6 +10,7 @@ dnl
dnl Defines HAVE_LIBREADLINE to 1 if a working readline setup is dnl Defines HAVE_LIBREADLINE to 1 if a working readline setup is
dnl found, and sets @LIBREADLINE@ to the necessary libraries. dnl found, and sets @LIBREADLINE@ to the necessary libraries.
AC_DEFUN([GNUPG_CHECK_READLINE], AC_DEFUN([GNUPG_CHECK_READLINE],
[ [
AC_ARG_WITH(readline, AC_ARG_WITH(readline,
@ -17,6 +18,7 @@ AC_DEFUN([GNUPG_CHECK_READLINE],
[look for the readline library in DIR]), [look for the readline library in DIR]),
[_do_readline=$withval],[_do_readline=yes]) [_do_readline=$withval],[_do_readline=yes])
gnupg_cv_have_readline=no
if test "$_do_readline" != "no" ; then if test "$_do_readline" != "no" ; then
if test -d "$withval" ; then if test -d "$withval" ; then
CPPFLAGS="${CPPFLAGS} -I$withval/include" CPPFLAGS="${CPPFLAGS} -I$withval/include"
@ -51,6 +53,7 @@ rl_completion_matches(NULL,NULL);
AC_DEFINE(HAVE_LIBREADLINE,1, AC_DEFINE(HAVE_LIBREADLINE,1,
[Define to 1 if you have a fully functional readline library.]) [Define to 1 if you have a fully functional readline library.])
AC_SUBST(LIBREADLINE,$_combo) AC_SUBST(LIBREADLINE,$_combo)
gnupg_cv_have_readline=yes
break break
fi fi
done done