From d8a6d4c1b5192fd5b5a173d3b5d99f97002a177a Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Wed, 1 Mar 1995 21:52:59 +0000 Subject: [PATCH] Remove ISODE_INCLUDE and ISODE_DEFS, replace check for -lsocket and -lnsl with WITH_NETLIB check. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5040 dc483132-0cff-0310-8789-dd5450dbe970 --- src/appl/bsd/ChangeLog | 5 +++++ src/appl/bsd/configure.in | 5 +---- src/appl/telnet/telnet/ChangeLog | 5 +++++ src/appl/telnet/telnet/configure.in | 5 +---- src/appl/telnet/telnetd/ChangeLog | 5 +++++ src/appl/telnet/telnetd/configure.in | 5 +---- src/kdc/ChangeLog | 5 +++++ src/kdc/configure.in | 5 +---- src/tests/asn.1/ChangeLog | 5 +++++ src/tests/asn.1/configure.in | 5 +---- 10 files changed, 30 insertions(+), 20 deletions(-) diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index 230b9a2dd..14a5c330f 100644 --- a/src/appl/bsd/ChangeLog +++ b/src/appl/bsd/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 1 11:54:50 1995 Theodore Y. Ts'o + + * configure.in: Remove ISODE_INCLUDE and ISODE_DEFS, replace check + for -lsocket and -lnsl with WITH_NETLIB check. + Tue Feb 28 01:41:04 1995 John Gilmore (gnu at toad.com) * forward.c, kcmd.c, krcp.c, krlogin.c, krlogind.c, krsh.c, diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in index 53c876086..9b711342f 100644 --- a/src/appl/bsd/configure.in +++ b/src/appl/bsd/configure.in @@ -1,12 +1,9 @@ AC_INIT(krlogind.c) WITH_CCOPTS -ISODE_DEFS -ISODE_INCLUDE CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL -AC_CHECK_LIB(socket,main) -AC_CHECK_LIB(nsl,main) +WITH_NETLIB dnl dbm libs for use of an_to_ln AC_CHECK_LIB(ndbm,main) AC_CHECK_LIB(dbm,main) diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog index 147fcc3c4..8fcb5ed2d 100644 --- a/src/appl/telnet/telnet/ChangeLog +++ b/src/appl/telnet/telnet/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 1 16:25:34 1995 Theodore Y. Ts'o + + * configure.in: Remove ISODE_INCLUDE and ISODE_DEFS, replace check + for -lsocket and -lnsl with WITH_NETLIB check. + Tue Feb 28 13:28:02 1995 Theodore Y. Ts'o * Makefile.in (install): Add $(srcdir) to install line so that diff --git a/src/appl/telnet/telnet/configure.in b/src/appl/telnet/telnet/configure.in index 10dd67ead..7c365d676 100644 --- a/src/appl/telnet/telnet/configure.in +++ b/src/appl/telnet/telnet/configure.in @@ -1,8 +1,6 @@ AC_INIT(telnet.c) WITH_CCOPTS WITH_KRB5ROOT -ISODE_DEFS -ISODE_INCLUDE CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL @@ -31,6 +29,7 @@ AC_HEADER_CHECK(sys/filio.h,AC_DEFINE(FILIO_H)) AC_HEADER_CHECK(sys/stream.h,AC_DEFINE(STREAMS)) AC_FUNC_CHECK(cgetent,AC_DEFINE(HAS_CGETENT)) AC_FUNC_CHECK(setupterm,AC_DEFINE(HAS_SETUPTERM)) +WITH_NETLIB AC_CHECK_LIB(ndbm,main) AC_CHECK_LIB(dbm,main) CHECK_SIGNALS @@ -40,6 +39,4 @@ ADD_DEF(-DKRB4) K4LIB='$(KRB4)/lib/libkrb.a $(KRB4)/lib/libdes.a', K4LIB=) AC_SUBST(K4LIB) -AC_CHECK_LIB(socket,main) -AC_CHECK_LIB(nsl,main) V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog index 6af8ace0e..7b3601cf9 100644 --- a/src/appl/telnet/telnetd/ChangeLog +++ b/src/appl/telnet/telnetd/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 1 16:25:58 1995 Theodore Y. Ts'o + + * configure.in: Remove ISODE_INCLUDE and ISODE_DEFS, replace check + for -lsocket and -lnsl with WITH_NETLIB check. + Tue Feb 28 01:50:22 1995 John Gilmore (gnu at toad.com) * sys_term.c: Avoid includes. diff --git a/src/appl/telnet/telnetd/configure.in b/src/appl/telnet/telnetd/configure.in index 4726b6627..af64ed4ad 100644 --- a/src/appl/telnet/telnetd/configure.in +++ b/src/appl/telnet/telnetd/configure.in @@ -1,8 +1,6 @@ AC_INIT(telnetd.c) WITH_CCOPTS WITH_KRB5ROOT -ISODE_DEFS -ISODE_INCLUDE CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL @@ -14,9 +12,8 @@ K4LIB='$(KRB4)/lib/libkrb.a $(KRB4)/lib/libdes.a', K4LIB=) AC_SUBST(K4LIB) ISODE_INCLUDE +WITH_NETLIB AC_CHECK_LIB(ndbm,main) -AC_CHECK_LIB(socket,main) -AC_CHECK_LIB(nsl,main) AC_CHECK_LIB(dbm,main) AC_CHECK_LIB(util,main) AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP) diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index 8fc248cee..db83682c4 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 1 16:30:27 1995 Theodore Y. Ts'o + + * configure.in: Remove ISODE_INCLUDE and ISODE_DEFS, replace check + for -lsocket and -lnsl with WITH_NETLIB check. + Tue Feb 28 02:27:11 1995 John Gilmore (gnu at toad.com) * *.[ch]: Avoid and includes. diff --git a/src/kdc/configure.in b/src/kdc/configure.in index dc345aa59..976dc6381 100644 --- a/src/kdc/configure.in +++ b/src/kdc/configure.in @@ -1,17 +1,14 @@ AC_INIT(main.c) WITH_CCOPTS CONFIG_RULES -ISODE_DEFS 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) AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK([tcsetattr],AC_DEFINE(POSIX_TERMIOS))) ET_RULES KRB_INCLUDE -ISODE_INCLUDE WITH_KRB4 WITH_KRB5ROOT AC_ARG_WITH([krb4], diff --git a/src/tests/asn.1/ChangeLog b/src/tests/asn.1/ChangeLog index f6a0b30ac..6a58ee3bd 100644 --- a/src/tests/asn.1/ChangeLog +++ b/src/tests/asn.1/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 1 16:32:02 1995 Theodore Y. Ts'o + + * configure.in: Remove ISODE_INCLUDE and ISODE_DEFS, replace check + for -lsocket and -lnsl with WITH_NETLIB check. + Tue Feb 28 01:23:57 1995 John Gilmore (gnu at toad.com) * krb5_decode_test.c, krb5_encode_test.c, ktest.h, ktest_equal.h, diff --git a/src/tests/asn.1/configure.in b/src/tests/asn.1/configure.in index 0c377200d..b3b27833a 100644 --- a/src/tests/asn.1/configure.in +++ b/src/tests/asn.1/configure.in @@ -1,12 +1,9 @@ AC_INIT(krb5_encode_test.c) WITH_CCOPTS CONFIG_RULES -ISODE_DEFS 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 -- 2.26.2