[Bug 603] Only link with libelf if we need it.

bk: 44f2b149p02Yk_QTwPi-Rt8a_08Xdg

diff --git a/configure.ac b/configure.ac
index b815b487bbad1a06801ed0382d18ce17ddfb0036..a85293aebbb8d33ec7e4ff63aed66059c1d4efb6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -296,11 +296,7 @@ case "$host" in
     AC_CHECK_LIB(advapi32, main)
     ;;
 esac
-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)
+
 AC_CHECK_FUNC(gethostent, ,
   AC_CHECK_LIB(nsl, gethostent, , , $libxnet -lsocket))
 AC_CHECK_FUNC(openlog, , 
@@ -480,16 +476,28 @@ case "$host" in
   ;;
 esac
 
-AC_CHECK_HEADER(nlist.h,
-[AC_DEFINE(NLIST_STRUCT, 1, [nlist stuff])
-AC_CACHE_CHECK([for n_un in struct nlist], ac_cv_struct_nlist_n_un,
-[AC_TRY_COMPILE([#include <nlist.h>],
-[struct nlist n; n.n_un.n_name = 0;],
-ac_cv_struct_nlist_n_un=yes, ac_cv_struct_nlist_n_un=no)])
-if test $ac_cv_struct_nlist_n_un = yes; then
-  AC_DEFINE(NLIST_NAME_UNION, 1, [does struct nlist use a name union?])
+case "$host" in
+ *-*-linux*)
+    AC_CHECK_FUNCS(__adjtimex __ntp_gettime)
+    ;;
+esac
+if test $ac_cv_func___adjtimex != yes; then
+    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)
+    AC_CHECK_HEADER(nlist.h,
+    [AC_DEFINE(NLIST_STRUCT, 1, [nlist stuff])
+    AC_CACHE_CHECK([for n_un in struct nlist], ac_cv_struct_nlist_n_un,
+    [AC_TRY_COMPILE([#include <nlist.h>],
+    [struct nlist n; n.n_un.n_name = 0;],
+    ac_cv_struct_nlist_n_un=yes, ac_cv_struct_nlist_n_un=no)])
+    if test $ac_cv_struct_nlist_n_un = yes; then
+      AC_DEFINE(NLIST_NAME_UNION, 1, [does struct nlist use a name union?])
+    fi
+    ])dnl
 fi
-])dnl
 
 dnl AC_CHECK_HEADERS(net/if.h, [], [],
 dnl [#if HAVE_SYS_TYPES_H
@@ -924,11 +932,6 @@ case "$ac_cv_c_char_unsigned$ac_cv_sizeof_signed_char$ac_cv_type_s_char" in
 esac
 AC_TYPE_UID_T
 
-case "$host" in
- *-*-linux*)
-    AC_CHECK_FUNCS(__adjtimex __ntp_gettime)
-    ;;
-esac
 case "$host" in
  *-*-aix[[45]]*)
        # (prr) aix 4.1 doesn't have clock_settime, but in aix 4.3 it's a stub