From f3baa0602066abc19fae157c1d7614bd89889809 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Sat, 18 Dec 2004 22:39:31 +0000 Subject: [PATCH] Oddly commit missed this one. * configure.ac: Call the new GNUPG_CHECK_READLINE macro for readline stuff. --- ChangeLog | 5 +++++ configure.ac | 16 +--------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5cc21d620..cdda977ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-12-18 David Shaw + + * configure.ac: Call the new GNUPG_CHECK_READLINE macro for + readline stuff. + 2004-12-17 David Shaw * configure.ac: Add a --with-ldap=DIR so people can add to the diff --git a/configure.ac b/configure.ac index ecdb2c907..8117b1ee2 100644 --- a/configure.ac +++ b/configure.ac @@ -116,14 +116,6 @@ AC_ARG_ENABLE(card-support, card_support=$enableval, card_support=yes) AC_MSG_RESULT($card_support) -AC_MSG_CHECKING([whether readline support is requested]) -AC_ARG_WITH(readline, - AC_HELP_STRING([--without-readline], - [do not support fancy command line editing]), - [readline_support="$withval"], [readline_support=yes]) -case "$readline_support" in yes);; no);; *)readline_support=yes;; esac -AC_MSG_RESULT($readline_support) - AC_MSG_CHECKING([whether the new iconv based code is requested]) AC_ARG_ENABLE(gnupg-iconv, AC_HELP_STRING([--disable-gnupg-iconv], @@ -1176,14 +1168,8 @@ fi AC_SUBST(LIBUSB_LIBS) AC_CHECK_FUNCS(usb_get_busses) -# # Check for readline support -# -if test "$readline_support" = yes ; then - AC_CHECK_LIB(readline, add_history) - AC_CHECK_HEADERS([readline/readline.h]) -fi - +GNUPG_CHECK_READLINE # Allow users to append something to the version string without # flagging it as development version. The user version parts is