Only link with nlist()-related libraries when needed

bk: 4f248398KJqyAFV21fXyvn_-e4TWcQ

diff --git a/ChangeLog b/ChangeLog
index b73a5dee527649c45efb6e319a0a39e3fe8883fc..dbf8cf15b95cd3b4aece1a7eb6d921c683b1ace7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 603] Only link with nlist()-related libraries when needed.
 (4.2.7p253) 2012/01/26 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2126] Compile error on Windows with libopts from Autogen 5.14.
 * Update one of the license URLs.

diff --git a/configure.ac b/configure.ac
index 1cf14f37e010a3f6e97cb4042062511e96fd1b9e..d5e2e340d264ff2f434e3018a6775077bb0ac786 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -370,11 +370,10 @@ case "$host" in
 esac
 case "$HAVE_ADJTIMEX" in
  '')
-    AC_CHECK_LIB([elf], [nlist])       dnl Only needed for tickadj...
-    dnl AC_CHECK_LIB(kvm, main, , , -lelf)
-    AC_CHECK_LIB([kvm], [main])                dnl We already know about -lelf here...
-    AC_CHECK_LIB([ld], [nlist])
-    AC_CHECK_LIB([mld], [nlist])
+    # nlist stuff is only needed for tickadj.
+    saved_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])
     case "$ac_cv_header_nlist_h" in
      yes)
@@ -402,6 +401,10 @@ case "$HAVE_ADJTIMEX" in
                [does struct nlist use a name union?])
        esac
     esac
+    AC_SUBST([LDADD_NLIST])
+    LDADD_NLIST="$LIBS"
+    LIBS="$saved_LIBS"
+    AS_UNSET([saved_LIBS])
 esac
 
 AC_CHECK_HEADERS([sys/proc.h], [], [], [

diff --git a/util/Makefile.am b/util/Makefile.am
index 4b906f618eee6057a861c802468d3a99007ff3e1..5ef4af9524262f009880a0534fed090a0dc6f10d 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -20,6 +20,8 @@ ntp_keygen_LDADD  = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a
 ntp_keygen_LDADD += $(LDADD_LIBNTP) $(PTHREAD_LIBS) $(LCRYPTO)
 ntp_keygen_SOURCES = ntp-keygen.c ntp-keygen-opts.c ntp-keygen-opts.h
 
+tickadj_LDADD= ../libntp/libntp.a $(LDADD_LIBNTP) $(LDADD_NLIST)
+
 EXTRA_DIST=                            \
        ntp-keygen-opts.def             \
        ntp-keygen-opts.menu            \