From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 13 Oct 2013 09:26:49 +0000 (+0000)
Subject: Prep for fixing bug 2256
X-Git-Tag: NTP_4_2_7P394~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59fa523238e21406b6011d23ff0ef4819f15630d;p=thirdparty%2Fntp.git

Prep for fixing bug 2256

bk: 525a6759b6BA-4pWOLojboo51R2xOA
---

diff --git a/configure.ac b/configure.ac
index 4297760cc..d823ec76d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,6 +187,7 @@ esac
 
 # HMS: a check for -lnsl used to be here - now being done in NTP_LIBNTP
 AC_SEARCH_LIBS([openlog], [gen syslog])
+# XXX library list will be in ac_cv_search_openlog
 
 NTP_FACILITYNAMES
 
@@ -207,6 +208,9 @@ case "$host" in
     # HMS: Make sure we check for -lrt for clock_* before this...
     AC_CHECK_LIB([rt], [sched_setscheduler], [],
 	[AC_CHECK_LIB([posix4], [sched_setscheduler])])
+    # XXX: Should we convert the above to AC_SEARCH_LIBS()?
+    # results of AC_CHECK_LIB in ac_cv_lib_rt_sched_setscheduler
+    # and ac_cv_lib_posix4_sched_setscheduler
     ;;
 esac
 
@@ -223,6 +227,7 @@ AC_CHECK_HEADER(
 case "$ac_cv_lib_dns_sd_DNSServiceRegister" in
  yes)
     LIBS="-ldns_sd $LIBS"
+    # XXX
 esac
 AC_CHECK_HEADERS([fcntl.h ieeefp.h inttypes.h kvm.h math.h])
 
@@ -360,7 +365,9 @@ case "$have_adjtimex" in
     saved_LIBS="$LIBS"
     LIBS=
     AC_SEARCH_LIBS([nlist], [elf ld mld])
+    # XXX ac_cv_search_nlist will be 'none required', 'no', or '-l...'
     AC_SEARCH_LIBS([kvm_open], [kvm])	dnl We already know about -lelf here...
+    # XXX ac_cv_search_kvm_open will be 'none required', 'no', or '-l...'
     AC_CHECK_HEADERS([nlist.h sys/var.h])
     case "$ac_cv_header_nlist_h" in
      yes)
@@ -709,6 +716,7 @@ esac
 saved_LIBS="$LIBS"
 LIBS="$LIBS $LDADD_LIBNTP"
 AC_CHECK_FUNCS([daemon])
+# XXX if we keep everything in LIBS and also keep separate lists, this simplifies.
 LIBS="$saved_LIBS"
 AS_UNSET([saved_LIBS])
 
@@ -721,6 +729,7 @@ AC_CHECK_FUNCS(
 	[
 	    AC_MSG_CHECKING([for isfinite with <math.h>])
 	    _libs=$LIBS
+	    # XXX
 	    LIBS="$LIBS -lm"
 	    AC_LINK_IFELSE(
 		[AC_LANG_PROGRAM(
diff --git a/sntp/configure.ac b/sntp/configure.ac
index 2a2c170fc..311c52cda 100644
--- a/sntp/configure.ac
+++ b/sntp/configure.ac
@@ -107,7 +107,9 @@ AM_COND_IF(
 
 dnl NTP_LIBNTP checks for inet_XtoY
 dnl AC_SEARCH_LIBS([inet_pton], [nsl])
-AC_SEARCH_LIBS([openlog], [gen syslog])
+
+dnl AC_SEARCH_LIBS([openlog], [gen syslog])
+HMS_SEARCH_LIBS([LIB_SYSLOG], [openlog], [gen syslog])
 
 # Checks for header files.
 AC_CHECK_HEADERS([netdb.h string.h strings.h syslog.h])
@@ -134,6 +136,9 @@ AC_CHECK_FUNCS([socket])
 AC_PROG_CXX
 NTP_GOOGLETEST
 
+# All libraries should be in various LIB_* variables now. 
+LIBS=
+
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([include/Makefile])
 AC_CONFIG_FILES([scripts/Makefile])