Better support for using libutil on systems that need it for various

pty-related functions.

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

10 files changed, 25 insertions, 8 deletions

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 6430cf57f..9ba9fc160 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-22  Tom Yu  <tlyu@mit.edu>
+
+	* configure.in: Use KRB5_AC_LIBUTIL.
+
+	* Makefile.in (kshd, klogind): Use UTIL_LIB.
+
 2004-09-08  Tom Yu  <tlyu@mit.edu>
 
 	* login.c (main): Don't overwrite "PATH" environment variable if
diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in
index fb40d0684..81b338e41 100644
--- a/src/appl/bsd/Makefile.in
+++ b/src/appl/bsd/Makefile.in
@@ -67,10 +67,10 @@ install::
 	fi
 
 kshd: krshd.o kcmd.o forward.o compat_recv.o $(SETENVOBJ) $(LIBOBJS) $(PTY_DEPLIB) $(KRB4COMPAT_DEPLIBS) $(APPUTILS_DEPLIB)
-	$(CC_LINK) -o kshd krshd.o kcmd.o forward.o compat_recv.o $(SETENVOBJ) $(LIBOBJS) $(KRSHDLIBS) $(PTY_LIB) $(KRB4COMPAT_LIBS) $(APPUTILS_LIB)
+	$(CC_LINK) -o kshd krshd.o kcmd.o forward.o compat_recv.o $(SETENVOBJ) $(LIBOBJS) $(KRSHDLIBS) $(PTY_LIB) $(UTIL_LIB) $(KRB4COMPAT_LIBS) $(APPUTILS_LIB)
 
 klogind: krlogind.o kcmd.o forward.o compat_recv.o $(SETENVOBJ) $(LIBOBJS) $(PTY_DEPLIB) $(KRB4COMPAT_DEPLIBS) $(APPUTILS_DEPLIB)
-	$(CC_LINK) -o klogind krlogind.o  kcmd.o forward.o compat_recv.o $(SETENVOBJ) $(LIBOBJS) $(PTY_LIB) $(KRB4COMPAT_LIBS) $(APPUTILS_LIB)
+	$(CC_LINK) -o klogind krlogind.o  kcmd.o forward.o compat_recv.o $(SETENVOBJ) $(LIBOBJS) $(PTY_LIB) $(UTIL_LIB) $(KRB4COMPAT_LIBS) $(APPUTILS_LIB)
 
 install::
 	for f in kshd klogind; do \
diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in
index e2716453b..71f1f6815 100644
--- a/src/appl/bsd/configure.in
+++ b/src/appl/bsd/configure.in
@@ -12,7 +12,6 @@ if test $with_afs != no; then
 fi
 AC_PROG_INSTALL
 dnl dbm libs for use of an_to_ln
-AC_CHECK_LIB(util,main)
 save_LIBS="$LIBS"
  LIBS=
  AC_CHECK_LIB(crypt,crypt)
@@ -191,6 +190,6 @@ else
 fi
 
 AC_CHECK_HEADERS(krb4-proto.h)
-
+KRB5_AC_LIBUTIL
 KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/gssftp/configure.in b/src/appl/gssftp/configure.in
index bf6d3b832..cd012e631 100644
--- a/src/appl/gssftp/configure.in
+++ b/src/appl/gssftp/configure.in
@@ -20,7 +20,7 @@ DECLARE_SYS_ERRLIST
 AC_REPLACE_FUNCS(getdtablesize)
 AC_CHECK_FUNCS(getcwd getdtablesize getusershell seteuid setreuid setresuid strerror getenv)
 AC_CHECK_LIB(crypt,crypt) dnl 
-AC_CHECK_LIB(util,logwtmp) dnl
+KRB5_AC_LIBUTIL
 dnl 
 dnl copied from appl/bsd/configure.in
 dnl
diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index 8038333cb..6ead450fc 100644
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-22  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in (ftpd): Use UTIL_LIB.
+
 2004-08-27  Ken Raeburn  <raeburn@mit.edu>
 
 	* ftpd.c (ftpd_gss_convert_creds): Terminate argument list to
diff --git a/src/appl/gssftp/ftpd/Makefile.in b/src/appl/gssftp/ftpd/Makefile.in
index 9adaa613e..67e601e11 100644
--- a/src/appl/gssftp/ftpd/Makefile.in
+++ b/src/appl/gssftp/ftpd/Makefile.in
@@ -30,7 +30,7 @@ LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir) @KRB4_INCLUDES@
 all::	ftpd
 
 ftpd:	$(OBJS) $(PTY_DEPLIB) $(GSS_DEPLIBS) $(KRB4COMPAT_DEPLIBS)
-	$(CC_LINK) -o $@ $(OBJS) $(FTPD_LIBS) $(PTY_LIB) $(GSS_LIBS) $(KRB4COMPAT_LIBS)
+	$(CC_LINK) -o $@ $(OBJS) $(FTPD_LIBS) $(PTY_LIB) $(UTIL_LIB) $(GSS_LIBS) $(KRB4COMPAT_LIBS)
 
 clean::
 	$(RM) ftpd ftpcmd.c
diff --git a/src/appl/telnet/ChangeLog b/src/appl/telnet/ChangeLog
index 8a847a286..5457af948 100644
--- a/src/appl/telnet/ChangeLog
+++ b/src/appl/telnet/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-22  Tom Yu  <tlyu@mit.edu>
+
+	* configure.in: Use KRB5_AC_LIBUTIL.
+
 2004-03-07  Ken Raeburn  <raeburn@mit.edu>
 
 	* configure.in: Move test for setupterm back down below addition
diff --git a/src/appl/telnet/configure.in b/src/appl/telnet/configure.in
index 30a4cbfbe..818c2e45f 100644
--- a/src/appl/telnet/configure.in
+++ b/src/appl/telnet/configure.in
@@ -96,7 +96,6 @@ dnl
 dnl from old telnetd/configure.in
 dnl
 dnl AC_PROG_INSTALL
-AC_CHECK_LIB(util,main)
 AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP)
 LIBS="$LIBS -ltermcap",
   AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses",
@@ -172,4 +171,5 @@ TELNETD_LIBS="$LIBS"
 AC_SUBST(TELNETD_LIBS)
 LIBS="$old_LIBS"
 dnl
+KRB5_AC_LIBUTIL
 V5_AC_OUTPUT_MAKEFILE(. libtelnet telnet telnetd)
diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index d1b44c702..1902a32f7 100644
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-22  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in (telnetd): Use UTIL_LIB.
+
 2004-03-04  Ken Raeburn  <raeburn@mit.edu>
 
 	* configure.in: Deleted; configure this dir from parent now.
diff --git a/src/appl/telnet/telnetd/Makefile.in b/src/appl/telnet/telnetd/Makefile.in
index fb1dd94be..bb2dffb32 100644
--- a/src/appl/telnet/telnetd/Makefile.in
+++ b/src/appl/telnet/telnetd/Makefile.in
@@ -61,7 +61,7 @@ OBJS=	telnetd.o \
 all:: telnetd
 
 telnetd: $(OBJS) $(PTY_DEPLIB) $(KRB4COMPAT_DEPLIBS) ../libtelnet/libtelnet.a
-	$(CC_LINK) -o $@ $(OBJS) ../libtelnet/libtelnet.a $(PTY_LIB) $(KRB4COMPAT_LIBS)
+	$(CC_LINK) -o $@ $(OBJS) ../libtelnet/libtelnet.a $(PTY_LIB) $(UTIL_LIB) $(KRB4COMPAT_LIBS)
 
 clean::
 	$(RM) telnetd