* Makefile.in, configure.in: back out previous changes and use

		Ezra's patches instead.

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

diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index bea3f2a3f3b6e38e60c4b6444a44c80a3bea7cf1..03ea955d9e8622d6856c65abfa3e0999232137aa 100644 (file)
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun  3 16:12:59 1996  Tom Yu  <tlyu@mit.edu>
+
+       * Makefile.in, configure.in: back out previous changes and use
+               Ezra's patches instead.
+
 Sun Jun  2 22:08:17 1996  Tom Yu  <tlyu@mit.edu>
 
        * configure.in, Makefile.in: only link getdtablesize.o if needed

diff --git a/src/appl/gssftp/ftpd/Makefile.in b/src/appl/gssftp/ftpd/Makefile.in
index 68ceb468a7e40d54ec21166f4dcca4c49b4a941e..c6dec9907d3cccc82b6695f7470d826b6bd8890a 100644 (file)
--- a/src/appl/gssftp/ftpd/Makefile.in
+++ b/src/appl/gssftp/ftpd/Makefile.in
@@ -5,16 +5,17 @@ CFLAGS = -DGSSAPI -DFTP_BUFSIZ=10240 $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
 SETENVSRC=@SETENVSRC@
 SETENVOBJ=@SETENVOBJ@
+LIBOBJS=@LIBOBJS@
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 SRCS   = ftpd.c ftpcmd.y logwtmp.c popen.c vers.c \
          $(srcdir)../ftp/glob.c \
          $(srcdir)../ftp/radix.c \
          $(srcdir)../ftp/secure.c \
-         $(GETDTABLESIZESRC) $(SETENVSRC)
+         $(srcdir)../../bsd/getdtablesize.c $(SETENVSRC)
 
 OBJS   = ftpd.o ftpcmd.o glob.o popen.o logwtmp.o vers.o radix.o \
-         secure.o $(GETDTABLESIZEOBJ) $(SETENVOBJ)
+         secure.o $(LIBOBJS) $(SETENVOBJ)
 
 KLIB = -lgssapi_krb5 -lkrb5 -lcrypto $(COMERRLIB)
 DEPKLIB = $(TOPLIBD)/gssapi/libgssapi_krb5.a $(TOPLIBD)/libkrb5.a \

diff --git a/src/appl/gssftp/ftpd/configure.in b/src/appl/gssftp/ftpd/configure.in
index 0bb213de829edb2f850ec16c094b80a206a376f3..a91cce0c32fa5ab131fc5c7218b5e5b1269c849d 100644 (file)
--- a/src/appl/gssftp/ftpd/configure.in
+++ b/src/appl/gssftp/ftpd/configure.in
@@ -11,11 +11,6 @@ DECLARE_SYS_ERRLIST
 AC_FUNC_VFORK
 AC_HEADER_STDARG
 AC_CHECK_HEADERS(unistd.h stdlib.h string.h)
-AC_CHECK_FUNC(getdtablesize,,
-[GETDTABLESIZESRC='$(srcdir)/../bsd/getdtablesize.c'
-GETDTABLESIZEOBJ=getdtablesize.o
-AC_SUBST([GETDTABLESIZESRC])
-AC_SUBST([GETDTABLESIZEOBJ])])
 AC_REPLACE_FUNCS(getdtablesize)
 AC_HAVE_FUNCS(getcwd getusershell seteuid setreuid setresuid)
 AC_CHECK_LIB(crypt,crypt) dnl