Bug 162: Only link programs with libreadline that use it (ntpdc and ntpq), From...

bk: 3f235be9nKLaHvWls22So4J1r88Ajg

diff --git a/configure.in b/configure.in
index c62e325e9156c28dc8a2903e16bcf0a88be8dcd6..1ba769e9892ee3a778dd2d40e9aed4dec9bc0d52 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -212,7 +212,9 @@ dnl HMS: What a hack...
 AC_CHECK_HEADERS(readline/history.h readline/readline.h)
 case "$ac_cv_header_readline_history_h$ac_cv_header_readline_readline_h" in
  *no*) ;;
- *) AC_CHECK_LIB(readline, readline, ,
+ *) save_LIBS=$LIBS
+    LIBS=
+    AC_CHECK_LIB(readline, readline, ,
      AC_MSG_NOTICE([Trying again with -lcurses])
      unset ac_cv_lib_readline_readline
      AC_CHECK_LIB(readline, readline,
@@ -220,6 +222,9 @@ case "$ac_cv_header_readline_history_h$ac_cv_header_readline_readline_h" in
       AC_DEFINE(HAVE_LIBREADLINE)
       AC_DEFINE(HAVE_LIBCURSES, , [Do we have the curses library?])
       , , -lcurses))
+    READLINE_LIBS=$LIBS
+    AC_SUBST(READLINE_LIBS)
+    LIBS=$save_LIBS
     ;;
 esac
 

diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index 538a3ef3b303cbc3c9da49e22170e9d99389ba4d..8b88386eafc843c9d7f99bf2d33ec1a52f254392 100644 (file)
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = ../util/ansi2knr
 bin_PROGRAMS = ntpdc
 INCLUDES = -I$(top_srcdir)/include
 # LDADD might need RESLIB and ADJLIB
-LDADD =        version.o ../libntp/libntp.a
+LDADD =        version.o ../libntp/libntp.a @READLINE_LIBS@
 DISTCLEANFILES = .version version.c
 noinst_HEADERS = ntpdc.h
 #EXTRA_DIST = ntpdc.mak

diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 8bd6a5cf6083af1f3a14a1613e96ceeb4cae2976..566e68f056d6b3f2bfd2339413c3b9dbb52eb98d 100644 (file)
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = ../util/ansi2knr
 bin_PROGRAMS = ntpq
 INCLUDES = -I$(top_srcdir)/include
 # LDADD might need RESLIB and ADJLIB
-LDADD =        version.o ../libntp/libntp.a
+LDADD =        version.o ../libntp/libntp.a @READLINE_LIBS@
 DISTCLEANFILES = .version version.c
 noinst_HEADERS = ntpq.h
 #EXTRA_DIST = ntpq.mak