From: Ezra Peisach <epeisach@mit.edu>
Date: Wed, 13 Mar 2002 16:36:21 +0000 (+0000)
Subject: 	* configure.in: Do not explicitly add getent.o and setenv.o to
X-Git-Tag: krb5-1.3-alpha1~831
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=475ab95020e45c7c873c5d400040425d014cd720;p=krb5.git

	* configure.in: Do not explicitly add getent.o and setenv.o to
	LIBOBJS. Autoconf 2.53 labels this as an error. Move to
	Makefile.in.

	* Makefile.in (OBJS): Add getent.o and setenv.o explicity.

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

diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog
index 37af30fe7..7b79c5ac2 100644
--- a/src/appl/telnet/libtelnet/ChangeLog
+++ b/src/appl/telnet/libtelnet/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-13  Ezra Peisach  <epeisach@mit.edu>
+
+	* configure.in: Do not explicitly add getent.o and setenv.o to
+	LIBOBJS. Autoconf 2.53 labels this as an error. Move to
+	Makefile.in.
+
+	* Makefile.in (OBJS): Add getent.o and setenv.o explicity. 
+
 2001-10-09  Ken Raeburn  <raeburn@mit.edu>
 
 	* auth-proto.h, auth.h, enc-proto.h, enc_des.c, encrypt.c,
diff --git a/src/appl/telnet/libtelnet/Makefile.in b/src/appl/telnet/libtelnet/Makefile.in
index 0e8efb157..f6c4a7f66 100644
--- a/src/appl/telnet/libtelnet/Makefile.in
+++ b/src/appl/telnet/libtelnet/Makefile.in
@@ -29,6 +29,9 @@ LOCALINCLUDES=-I.. -I$(srcdir)/.. @KRB4_INCLUDES@
 DEFINES = $(AUTH_DEF)
 LIBOBJS=@LIBOBJS@
 
+SETENVSRC=@SETENVSRC@
+SETENVOBJ=@SETENVOBJ@
+
 LIB=    libtelnet.a
 SRCS=   $(srcdir)/auth.c \
 	$(srcdir)/encrypt.c \
@@ -51,7 +54,7 @@ SRCS=   $(srcdir)/auth.c \
 
 OBJS=   auth.o encrypt.o genget.o \
 	misc.o kerberos.o kerberos5.o forward.o spx.o enc_des.o \
-	$(LIBOBJS)
+	$(LIBOBJS) getent.o $(SETENVOBJ)
 
 TELNET_H= $(srcdir)/../arpa/telnet.h
 
diff --git a/src/appl/telnet/libtelnet/configure.in b/src/appl/telnet/libtelnet/configure.in
index 81703e159..207aa72f4 100644
--- a/src/appl/telnet/libtelnet/configure.in
+++ b/src/appl/telnet/libtelnet/configure.in
@@ -6,10 +6,12 @@ AC_PROG_RANLIB
 AC_REPLACE_FUNCS([strcasecmp strdup setsid strerror strftime getopt herror parsetos])
 AC_CHECK_FUNCS(setenv unsetenv getenv gettosbyname cgetent)
 AC_CHECK_HEADERS(stdlib.h string.h)
-LIBOBJS="$LIBOBJS getent.o"
 if test $ac_cv_func_setenv = no || test $ac_cv_func_unsetenv = no \
   || test $ac_cv_func_getenv = no; then
-  LIBOBJS="$LIBOBJS setenv.o"
+  SETENVSRC=setenv.c
+  SETENVOBJ=setenv.o
+  AC_SUBST([SETENVSRC])
+  AC_SUBST([SETENVOBJ])
   AC_DEFINE([NEED_SETENV])
 fi
 dnl