From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 8 Oct 1999 03:04:12 +0000 (-0000)
Subject: ChangeLog, configure, configure.in, Makefile.in:
X-Git-Tag: PRE_NT_991015~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc07f790c7160ea70530bcadc1cc2917ded410c3;p=thirdparty%2Fntp.git

ChangeLog, configure, configure.in, Makefile.in:
  * configure.in: We might need -lsocket for the -lnsl check.
  Rebuild generated files

bk: 37fd5f2c2QG_vG_Pb1HDHT5OWay9ug
---

diff --git a/ChangeLog b/ChangeLog
index 48ce78a011..ca191769e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-10-04  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+	* configure.in: We might need -lsocket for the -lnsl check.
+
 1999-09-19  Harlan Stenn  <stenn@whimsy.udel.edu>
 
 	* ntpd/refclock_ulink.c: Typos in C++ comment
diff --git a/configure b/configure
index 25ea5066f9..6718fbc278 100755
--- a/configure
+++ b/configure
@@ -2161,7 +2161,7 @@ if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lnsl  $LIBS"
+LIBS="-lnsl -lsocket $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 2167 "configure"
 #include "confdefs.h"
diff --git a/configure.in b/configure.in
index df1d8056b1..0dd12e7c29 100644
--- a/configure.in
+++ b/configure.in
@@ -167,7 +167,7 @@ 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))
+AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent, , , -lsocket))
 AC_CHECK_FUNC(openlog, , AC_CHECK_LIB(gen, openlog))
 
 dnl Digital UNIX V4.0 and Solaris 7 have POSIX.1c functions in -lrt
diff --git a/include/Makefile.in b/include/Makefile.in
index 17690dafb6..e709184c0c 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -63,8 +63,6 @@ host_alias = @host_alias@
 host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
-AMTAR = @AMTAR@
-AMTARFLAGS = @AMTARFLAGS@
 AWK = @AWK@
 CC = @CC@
 CFLAGS = @CFLAGS@
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 008640b5d8..98ef6a512e 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -63,8 +63,6 @@ host_alias = @host_alias@
 host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
-AMTAR = @AMTAR@
-AMTARFLAGS = @AMTARFLAGS@
 AWK = @AWK@
 CC = @CC@
 CFLAGS = @CFLAGS@