[Bug 603] Only link with nlist()-related libraries when needed: More cleanup

bk: 4f25bed5pfqDcv7G8UfHxbwTuklt9g

diff --git a/ChangeLog b/ChangeLog
index 4db3497ce9e491c41a075ab155b98c5c302f870f..74a90bfba4ba34d1d2ee9a915b5f45ed264be908 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+* [Bug 603] Only link with nlist()-related libraries when needed:
+  More cleanup.
 (4.2.7p254) 2012/01/29 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 603] Only link with nlist()-related libraries when needed.
 (4.2.7p253) 2012/01/26 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/configure.ac b/configure.ac
index d5e2e340d264ff2f434e3018a6775077bb0ac786..be2abd2585887106db54005d09d08eeaa62a9dd0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -355,6 +355,7 @@ case "$host" in
      yes)
        AC_DEFINE([ntp_adjtime], [adjtimex], [deviant])
        AC_DEFINE([HAVE_NTP_ADJTIME], [1], [via adjtimex])
+       have_adjtimex=1
        ;;
      *)
        AC_CHECK_FUNCS([__adjtimex])
@@ -364,14 +365,16 @@ case "$host" in
            AC_DEFINE([HAVE_NTP_ADJTIME], [1], [via __adjtimex])
            AC_DEFINE([adjtimex], [__adjtimex], [deviant])
            AC_DEFINE([HAVE_ADJTIMEX], [1], [via __adjtimex])
+           have_adjtimex=1
        esac
        ;;
     esac
 esac
-case "$HAVE_ADJTIMEX" in
+case "$have_adjtimex" in
  '')
     # nlist stuff is only needed for tickadj.
     saved_LIBS="$LIBS"
+    LIBS=
     AC_SEARCH_LIBS([nlist], [elf ld mld])
     AC_SEARCH_LIBS([kvm_open], [kvm])  dnl We already know about -lelf here...
     AC_CHECK_HEADERS([nlist.h sys/var.h])
@@ -760,11 +763,13 @@ AC_CHECK_FUNCS(
 
 AC_CHECK_FUNCS([getbootfile getuid getrusage nanosleep strsignal])
 
+# kvm_open() is only used by tickadj.  Also see above.
 case "$ac_cv_header_kvm_h" in
  yes)
     AC_CHECK_FUNCS([kvm_open])
     ;;
 esac
+
 case "$host" in
  *-*-sco3.2v5.0.*)
     # Just stubs.  Idiots.