Remove ISODE_INCLUDE, replace check for -lsocket and -lnsl with

WITH_NETLIB check.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5039 dc483132-0cff-0310-8789-dd5450dbe970

47 files changed, 143 insertions, 68 deletions

diff --git a/src/admin/aname/ChangeLog b/src/admin/aname/ChangeLog
index 4475b44113..872f9d920e 100644
--- a/src/admin/aname/ChangeLog
+++ b/src/admin/aname/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 11:50:48 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 02:04:08 1995  John Gilmore  (gnu at toad.com)
 
 	* kdb5_anadd.c:  Avoid <krb5/...> and <com_err.h> includes.
diff --git a/src/admin/aname/configure.in b/src/admin/aname/configure.in
index 1921a989ea..5551711a8e 100644
--- a/src/admin/aname/configure.in
+++ b/src/admin/aname/configure.in
@@ -3,11 +3,9 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 AC_CHECK_LIB(ndbm,main)
 AC_CHECK_LIB(dbm,main)
 KRB_INCLUDE
-ISODE_INCLUDE
 WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/admin/convert/ChangeLog b/src/admin/convert/ChangeLog
index d07fa8105a..246ba91b84 100644
--- a/src/admin/convert/ChangeLog
+++ b/src/admin/convert/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 11:51:54 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 02:04:57 1995  John Gilmore  (gnu at toad.com)
 
 	* kdb5_convert.c:  Avoid <krb5/...> and <com_err.h> includes.	
diff --git a/src/admin/convert/configure.in b/src/admin/convert/configure.in
index 30afbf766a..fa12982d46 100644
--- a/src/admin/convert/configure.in
+++ b/src/admin/convert/configure.in
@@ -3,12 +3,10 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 AC_CHECK_LIB(ndbm,main)
 AC_CHECK_LIB(dbm,main)
 KRB_INCLUDE
-ISODE_INCLUDE
 WITH_KRB4
 WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/admin/create/ChangeLog b/src/admin/create/ChangeLog
index ade471ba24..090b97916c 100644
--- a/src/admin/create/ChangeLog
+++ b/src/admin/create/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 11:52:18 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 02:05:32 1995  John Gilmore  (gnu at toad.com)
 
 	* kdb5_create.c:  Avoid <krb5/...> and <com_err.h> includes.
diff --git a/src/admin/create/configure.in b/src/admin/create/configure.in
index 6e129292dc..df853ceebb 100644
--- a/src/admin/create/configure.in
+++ b/src/admin/create/configure.in
@@ -4,10 +4,8 @@ CONFIG_RULES
 WITH_KRB5ROOT
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 AC_CHECK_LIB(ndbm,main)
 AC_CHECK_LIB(dbm,main)
 KRB_INCLUDE
-ISODE_INCLUDE
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/admin/destroy/ChangeLog b/src/admin/destroy/ChangeLog
index 3f338a0832..f3bc805ed9 100644
--- a/src/admin/destroy/ChangeLog
+++ b/src/admin/destroy/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 11:52:36 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 02:05:53 1995  John Gilmore  (gnu at toad.com)
 
 	* kdb5_destroy.c:  Avoid <krb5/...> and <com_err.h> includes.
diff --git a/src/admin/destroy/configure.in b/src/admin/destroy/configure.in
index e606568b14..bb539976fe 100644
--- a/src/admin/destroy/configure.in
+++ b/src/admin/destroy/configure.in
@@ -3,11 +3,9 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 AC_CHECK_LIB(ndbm,main)
 AC_CHECK_LIB(dbm,main)
 KRB_INCLUDE
-ISODE_INCLUDE
 WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog
index 60baab1787..0c2ebfcb27 100644
--- a/src/admin/edit/ChangeLog
+++ b/src/admin/edit/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 11:53:02 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 02:06:26 1995  John Gilmore  (gnu at toad.com)
 
 	* dump.c, dumpv4.c, kdb5_edit.c, ss_wrapper.c, tcl_wrapper.c,
diff --git a/src/admin/edit/configure.in b/src/admin/edit/configure.in
index 60f53251b8..3e7921ebd8 100644
--- a/src/admin/edit/configure.in
+++ b/src/admin/edit/configure.in
@@ -7,14 +7,12 @@ AC_PROG_YACC
 AC_HAVE_HEADERS(unistd.h sys/timeb.h alloca.h)
 AC_HAVE_FUNCS(ftime timezone)
 AC_CONST
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 AC_CHECK_LIB(ndbm,main)
 AC_CHECK_LIB(dbm,main)
 AC_HAVE_FUNCS(getcwd)
 SS_RULES
 KRB_INCLUDE
-ISODE_INCLUDE
 WITH_KRB4
 AC_ARG_WITH([krb4],
 [  --with-krb4=KRB4DIR     build with Kerberos V4 backwards compatibility],
diff --git a/src/admin/stash/ChangeLog b/src/admin/stash/ChangeLog
index 51a88d7a14..10d9aad21c 100644
--- a/src/admin/stash/ChangeLog
+++ b/src/admin/stash/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 11:53:29 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 02:08:04 1995  John Gilmore  (gnu at toad.com)
 
 	* kdb5_stach.c:  Avoid <krb5/...> and <com_err.h> includes.
diff --git a/src/admin/stash/configure.in b/src/admin/stash/configure.in
index 030b0a98af..e8ca7d6dba 100644
--- a/src/admin/stash/configure.in
+++ b/src/admin/stash/configure.in
@@ -3,11 +3,9 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 AC_CHECK_LIB(ndbm,main)
 AC_CHECK_LIB(dbm,main)
 KRB_INCLUDE
-ISODE_INCLUDE
 WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/gss-sample/ChangeLog b/src/appl/gss-sample/ChangeLog
index 38bfb7a510..c13074c0dd 100644
--- a/src/appl/gss-sample/ChangeLog
+++ b/src/appl/gss-sample/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 11:55:15 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Fri Feb  3 06:21:02 1995  Theodore Y. Ts'o  (tytso@dcl)
 
 	* gss-server.c: ret_flags should be an int based on the prototype
diff --git a/src/appl/gss-sample/configure.in b/src/appl/gss-sample/configure.in
index ffbfabd691..2f29829963 100644
--- a/src/appl/gss-sample/configure.in
+++ b/src/appl/gss-sample/configure.in
@@ -2,11 +2,9 @@ AC_INIT(gss-client.c)
 WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 AC_HAVE_HEADERS(unistd.h)
 KRB_INCLUDE
-ISODE_INCLUDE
 WITH_KRB5ROOT
 AC_PROG_INSTALL
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/mailquery/ChangeLog b/src/appl/mailquery/ChangeLog
index 565ee8f21a..70d271caeb 100644
--- a/src/appl/mailquery/ChangeLog
+++ b/src/appl/mailquery/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 11:55:43 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Replace check for -lsocket and -lnsl with
+	        WITH_NETLIB check.
+
 Tue Feb 28 01:52:34 1995  John Gilmore  (gnu at toad.com)
 
 	* poplib.c:  Avoid <krb5/...> includes.
diff --git a/src/appl/mailquery/configure.in b/src/appl/mailquery/configure.in
index ea794f00a6..c371893dec 100644
--- a/src/appl/mailquery/configure.in
+++ b/src/appl/mailquery/configure.in
@@ -3,8 +3,7 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 AC_HAVE_HEADERS(unistd.h)
 WITH_KRB5ROOT
 AC_FUNC_CHECK(strerror,AC_DEFINE(HAS_STRERROR))
diff --git a/src/appl/popper/ChangeLog b/src/appl/popper/ChangeLog
index 6004056114..4f40b149bf 100644
--- a/src/appl/popper/ChangeLog
+++ b/src/appl/popper/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 11:56:31 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 01:54:56 1995  John Gilmore  (gnu at toad.com)
 
 	* pop_init.c, pop_pass.c, pop_user.c, mh-6.8.patch:  Avoid
diff --git a/src/appl/popper/configure.in b/src/appl/popper/configure.in
index ef547d9c87..8bfa5d9e6a 100644
--- a/src/appl/popper/configure.in
+++ b/src/appl/popper/configure.in
@@ -1,12 +1,10 @@
 AC_INIT(popper.c)
 WITH_CCOPTS
 CONFIG_RULES
-ISODE_INCLUDE
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
 AC_FUNC_CHECK(vsprintf,AC_DEFINE(HAS_VSPRINTF))
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 AC_CHECK_LIB(BSD,main)
 AC_CHECK_LIB(ndbm,main)
 AC_CHECK_LIB(dbm,main)
diff --git a/src/appl/sample/sclient/ChangeLog b/src/appl/sample/sclient/ChangeLog
index 5be255ce5b..16031d208c 100644
--- a/src/appl/sample/sclient/ChangeLog
+++ b/src/appl/sample/sclient/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 11:56:51 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 01:58:39 1995  John Gilmore  (gnu at toad.com)
 
 	* sclient.c:  Avoid <krb5/...> and <com_err.h> includes.
diff --git a/src/appl/sample/sclient/configure.in b/src/appl/sample/sclient/configure.in
index 7060900073..9c33b39176 100644
--- a/src/appl/sample/sclient/configure.in
+++ b/src/appl/sample/sclient/configure.in
@@ -3,9 +3,7 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 KRB_INCLUDE
-ISODE_INCLUDE
 WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/sample/sserver/ChangeLog b/src/appl/sample/sserver/ChangeLog
index 64c8ab6a8a..4d6320c560 100644
--- a/src/appl/sample/sserver/ChangeLog
+++ b/src/appl/sample/sserver/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 11:57:12 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 01:59:17 1995  John Gilmore  (gnu at toad.com)
 
 	* sserver.c:  Avoid <krb5/...> and <com_err.h> includes.
diff --git a/src/appl/sample/sserver/configure.in b/src/appl/sample/sserver/configure.in
index ac43cc1240..bbb04a5bc9 100644
--- a/src/appl/sample/sserver/configure.in
+++ b/src/appl/sample/sserver/configure.in
@@ -3,9 +3,7 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 KRB_INCLUDE
-ISODE_INCLUDE
 WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/simple/client/ChangeLog b/src/appl/simple/client/ChangeLog
index a53ed22a95..ec147ee714 100644
--- a/src/appl/simple/client/ChangeLog
+++ b/src/appl/simple/client/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 16:24:21 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 02:01:29 1995  John Gilmore  (gnu at toad.com)
 
 	* sim_client.c:  Avoid <krb5/...> and <com_err.h> includes.
diff --git a/src/appl/simple/client/configure.in b/src/appl/simple/client/configure.in
index ac3f1c1517..d50718caaf 100644
--- a/src/appl/simple/client/configure.in
+++ b/src/appl/simple/client/configure.in
@@ -3,9 +3,7 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 KRB_INCLUDE
-ISODE_INCLUDE
 WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/simple/server/ChangeLog b/src/appl/simple/server/ChangeLog
index 698cef59e1..a7f8be0d9c 100644
--- a/src/appl/simple/server/ChangeLog
+++ b/src/appl/simple/server/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 16:24:58 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 02:01:53 1995  John Gilmore  (gnu at toad.com)
 
 	* sim_server.c:  Avoid <krb5/...> and <com_err.h> includes.
diff --git a/src/appl/simple/server/configure.in b/src/appl/simple/server/configure.in
index 8c63675a22..71fe06bf35 100644
--- a/src/appl/simple/server/configure.in
+++ b/src/appl/simple/server/configure.in
@@ -3,9 +3,7 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 KRB_INCLUDE
-ISODE_INCLUDE
 WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/user_user/ChangeLog b/src/appl/user_user/ChangeLog
index 41d99ef589..99d4f238ec 100644
--- a/src/appl/user_user/ChangeLog
+++ b/src/appl/user_user/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 16:26:20 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 01:51:29 1995  John Gilmore  (gnu at toad.com)
 
 	* client.c, server.c:  Avoid <krb5/...> and <com_err.h> includes.
diff --git a/src/appl/user_user/configure.in b/src/appl/user_user/configure.in
index 275eece5a1..f55394def5 100644
--- a/src/appl/user_user/configure.in
+++ b/src/appl/user_user/configure.in
@@ -3,9 +3,7 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 KRB_INCLUDE
-ISODE_INCLUDE
 WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/clients/kinit/ChangeLog b/src/clients/kinit/ChangeLog
index d5ce03ac4a..32a9683b22 100644
--- a/src/clients/kinit/ChangeLog
+++ b/src/clients/kinit/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 16:27:21 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 02:10:44 1995  John Gilmore  (gnu at toad.com)
 
 	* kinit.c:  Avoid <krb5/...> and <com_err.h> includes.
diff --git a/src/clients/kinit/configure.in b/src/clients/kinit/configure.in
index 06b99a3331..4a04eee063 100644
--- a/src/clients/kinit/configure.in
+++ b/src/clients/kinit/configure.in
@@ -3,9 +3,7 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 KRB_INCLUDE
-ISODE_INCLUDE
 WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/clients/ksu/ChangeLog b/src/clients/ksu/ChangeLog
index 3e92452444..cde54e927a 100644
--- a/src/clients/ksu/ChangeLog
+++ b/src/clients/ksu/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 16:28:36 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 02:11:21 1995  John Gilmore  (gnu at toad.com)
 
 	* ksu.h:  Avoid <krb5/...> and <com_err.h> includes.
diff --git a/src/clients/ksu/configure.in b/src/clients/ksu/configure.in
index 5bed1e5b78..12a3773e47 100644
--- a/src/clients/ksu/configure.in
+++ b/src/clients/ksu/configure.in
@@ -3,12 +3,10 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 AC_CHECK_LIB(ndbm,main)
 AC_CHECK_LIB(dbm,main)
 KRB_INCLUDE
-ISODE_INCLUDE
 WITH_KRB5ROOT
 CHECK_STDARG
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/client/ChangeLog b/src/kadmin/client/ChangeLog
index c3a1175b1e..c3126a6e85 100644
--- a/src/kadmin/client/ChangeLog
+++ b/src/kadmin/client/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 16:29:19 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 02:18:37 1995  John Gilmore  (gnu at toad.com)
 
 	* *.c:  Avoid <krb5/...> and <com_err.h> includes.
diff --git a/src/kadmin/client/configure.in b/src/kadmin/client/configure.in
index e4c57b3e73..55d33a6c87 100644
--- a/src/kadmin/client/configure.in
+++ b/src/kadmin/client/configure.in
@@ -3,10 +3,8 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 ET_RULES
 KRB_INCLUDE
-ISODE_INCLUDE
 WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/kpasswd/ChangeLog b/src/kadmin/kpasswd/ChangeLog
index d9ceb486fd..3ed8be55f5 100644
--- a/src/kadmin/kpasswd/ChangeLog
+++ b/src/kadmin/kpasswd/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 16:29:34 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 02:21:41 1995  John Gilmore  (gnu at toad.com)
 
 	* kpasswd.c:  Avoid <krb5/...> includes.
diff --git a/src/kadmin/kpasswd/configure.in b/src/kadmin/kpasswd/configure.in
index 050cc62056..54b6bb7af5 100644
--- a/src/kadmin/kpasswd/configure.in
+++ b/src/kadmin/kpasswd/configure.in
@@ -3,13 +3,11 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 AC_HAVE_HEADERS(unistd.h)
 CHECK_UTMP
 AC_FUNC_CHECK(getutent,AC_DEFINE(HAVE_GETUTENT))
 ET_RULES
 KRB_INCLUDE
-ISODE_INCLUDE
 WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index 8a4a74f5cc..f3d2471809 100644
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 16:29:53 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 02:23:46 1995  John Gilmore  (gnu at toad.com)
 
 	* *.c:  Avoid <krb5/...> and <com_err.h> includes.
diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index 119c9b3db6..3091cad2c9 100644
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 16:30:50 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 00:18:38 1995  John Gilmore  (gnu at toad.com)
 
 	* des_int.h:  Avoid <krb5/...> includes.
diff --git a/src/lib/crypto/des/configure.in b/src/lib/crypto/des/configure.in
index 7a45f40e0b..02ee60867a 100644
--- a/src/lib/crypto/des/configure.in
+++ b/src/lib/crypto/des/configure.in
@@ -2,9 +2,7 @@ AC_INIT(configure.in)
 WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_RULES
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
-ISODE_INCLUDE
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog
index 0203ec037a..5deebbdbfe 100644
--- a/src/slave/ChangeLog
+++ b/src/slave/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 16:31:13 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 01:21:52 1995  John Gilmore  (gnu at toad.com)
 
 	* kprop.c, kpropd.c:  Avoid <krb5/...> includes.
diff --git a/src/slave/configure.in b/src/slave/configure.in
index 85a7a0ded0..6cd6885391 100644
--- a/src/slave/configure.in
+++ b/src/slave/configure.in
@@ -4,10 +4,8 @@ CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
 AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK([tcsetattr],AC_DEFINE(POSIX_TERMIOS)))
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 AC_CHECK_LIB(util,main)
 KRB_INCLUDE
-ISODE_INCLUDE
 WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog
index 019d369287..422cffb0aa 100644
--- a/src/tests/create/ChangeLog
+++ b/src/tests/create/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 16:32:20 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 01:24:52 1995  John Gilmore  (gnu at toad.com)
 
 	* kdb5_mkdums.c:  Avoid <krb5/...> includes.
diff --git a/src/tests/create/configure.in b/src/tests/create/configure.in
index 66f9b88457..ec1fc316e5 100644
--- a/src/tests/create/configure.in
+++ b/src/tests/create/configure.in
@@ -3,11 +3,9 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 AC_CHECK_LIB(ndbm,main)
 AC_CHECK_LIB(dbm,main)
 KRB_INCLUDE
-ISODE_INCLUDE
 WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/tests/hammer/ChangeLog b/src/tests/hammer/ChangeLog
index 50650f3eb3..6ecf2364d5 100644
--- a/src/tests/hammer/ChangeLog
+++ b/src/tests/hammer/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 16:32:38 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 01:25:13 1995  John Gilmore  (gnu at toad.com)
 
 	* kdc5_hammer.c, pp.c:  Avoid <krb5/...> includes.
diff --git a/src/tests/hammer/configure.in b/src/tests/hammer/configure.in
index 3fe5e05238..374edfd949 100644
--- a/src/tests/hammer/configure.in
+++ b/src/tests/hammer/configure.in
@@ -3,9 +3,7 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 KRB_INCLUDE
-ISODE_INCLUDE
 WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/tests/verify/ChangeLog b/src/tests/verify/ChangeLog
index b41e8ab42b..d0c7658763 100644
--- a/src/tests/verify/ChangeLog
+++ b/src/tests/verify/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 16:33:01 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Remove ISODE_INCLUDE, replace check for -lsocket
+		and -lnsl with WITH_NETLIB check.
+
 Tue Feb 28 01:25:37 1995  John Gilmore  (gnu at toad.com)
 
 	* kdb5_verify.c:  Avoid <krb5/...> includes.
diff --git a/src/tests/verify/configure.in b/src/tests/verify/configure.in
index 2f27eb116d..25050015ed 100644
--- a/src/tests/verify/configure.in
+++ b/src/tests/verify/configure.in
@@ -3,11 +3,9 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_CHECK_LIB(socket,main)
-AC_CHECK_LIB(nsl,main)
+WITH_NETLIB
 AC_CHECK_LIB(ndbm,main)
 AC_CHECK_LIB(dbm,main)
 KRB_INCLUDE
-ISODE_INCLUDE
 WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE