diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 7 | ||||
| -rw-r--r-- | g10/Makefile.am | 2 | ||||
| -rw-r--r-- | g10/signal.c | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index a6b092b29..1e0b08aa2 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,10 @@ +2004-12-18 David Shaw <[email protected]> + + * signal.c: Use only HAVE_LIBREADLINE to detect readline + availability. + + * Makefile.am: Link with readline where necessary. + 2004-12-17 Werner Koch <[email protected]> * passphrase.c (agent_get_passphrase): Define NREAD locally as diff --git a/g10/Makefile.am b/g10/Makefile.am index a3f2ff6e9..3e7e0e165 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -132,7 +132,7 @@ gpgv_SOURCES = gpgv.c \ # ks-db.h \ # $(common_source) -LDADD = $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@ +LDADD = $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@ @LIBREADLINE@ gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB_LIBS@ $(PROGRAMS): $(needed_libs) diff --git a/g10/signal.c b/g10/signal.c index 0f904ed97..7f91070f3 100644 --- a/g10/signal.c +++ b/g10/signal.c @@ -27,7 +27,7 @@ #include <string.h> #include <errno.h> #include <assert.h> -#ifdef HAVE_READLINE_READLINE_H +#ifdef HAVE_LIBREADLINE #include <readline/readline.h> #include <readline/history.h> #endif @@ -83,7 +83,7 @@ got_fatal_signal( int sig ) secmem_term(); -#if defined(HAVE_READLINE_READLINE_H) && defined(HAVE_LIBREADLINE) +#ifdef HAVE_LIBREADLINE rl_free_line_state (); rl_cleanup_after_signal (); #endif |