Fix the readline history test

bk: 4716a70b_vp6F57EvlCPx0kIW_bQ_w

diff --git a/ChangeLog b/ChangeLog
index 2550fd677bf33180389d57ff28af0d521e20f6f7..702f8f079c4c0baf87f8e410527fd6c3e164c76c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Fix the readline history test.
 * [Bug 931] Require -lreadline to be asked for explicitly.
 * [Bug 764] When looking for -lreadline support, also try using -lncurses.
 * [Bug 909] Fix int32_t errors for ntohl().

diff --git a/m4/ntp_lineeditlibs.m4 b/m4/ntp_lineeditlibs.m4
index 0bde3130da554a9fbfd9759f039b53a25572307b..eedc9bf6eeed21fa8ea46a62353636b691af0811 100644 (file)
--- a/m4/ntp_lineeditlibs.m4
+++ b/m4/ntp_lineeditlibs.m4
@@ -70,9 +70,12 @@ AC_DEFUN([NTP_LINEEDITLIBS], [
               [Define if you have a readline compatible library])
        AC_CHECK_HEADERS(readline.h readline/readline.h)
        AC_CACHE_CHECK([whether readline supports history],
-                   ntp_cv_lib_lineedit_history, [
+           ntp_cv_lib_lineedit_history, [
            ntp_cv_lib_lineedit_history="no"
+           ORIG_LIBS="$LIBS"
+           LIBS="$ORIG_LIBS $ntp_cv_lib_lineedit"
            AC_TRY_LINK_FUNC(add_history, ntp_cv_lib_lineedit_history="yes")
+           LIBS="$ORIG_LIBS"
        ])
        case "$ntp_cv_lib_lineedit_history" in
         yes)