Collapse ftp and ftpd's configure.in into gssftp's configure.in

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

9 files changed, 84 insertions, 74 deletions

diff --git a/src/appl/gssftp/ChangeLog b/src/appl/gssftp/ChangeLog
index 86fe377..2381b74 100644
--- a/src/appl/gssftp/ChangeLog
+++ b/src/appl/gssftp/ChangeLog
@@ -1,3 +1,12 @@
+Fri Feb 13 15:31:26 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define LOCAL_SUBDIRS to recurse into the
+		ftp and ftpd subdirectories.
+
+	* configure.in: Create the makefiles for all of the subdirectories
+		and move all of the configure.in tests from the
+		subdirectories into this configure.in.
+	
 Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* configure.in: Use AC_CONFIG_DIRS instead of CONFIG_DIRS, and
diff --git a/src/appl/gssftp/Makefile.in b/src/appl/gssftp/Makefile.in
index 89ff07c..b36f38e 100644
--- a/src/appl/gssftp/Makefile.in
+++ b/src/appl/gssftp/Makefile.in
@@ -1,4 +1,5 @@
 thisconfigdir=./
 BUILDTOP=$(U)$(U)
+LOCAL_SUBDIRS=ftp ftpd
 CFLAGS = $(CCOPTS)
 LDFLAGS = -g
diff --git a/src/appl/gssftp/configure.in b/src/appl/gssftp/configure.in
index 11fa91a..d993eb3 100644
--- a/src/appl/gssftp/configure.in
+++ b/src/appl/gssftp/configure.in
@@ -1,4 +1,61 @@
-AC_INIT(configure.in)
+AC_INIT(README.gssftp)
 CONFIG_RULES
-AC_CONFIG_SUBDIRS(ftp ftpd)
-V5_AC_OUTPUT_MAKEFILE
+AC_CONST
+AC_PROG_INSTALL
+AC_PROG_YACC
+KRB5_SIGTYPE
+USE_ANAME
+CHECK_SIGPROCMASK
+CHECK_WAIT_TYPE
+DECLARE_SYS_ERRLIST
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+AC_FUNC_VFORK
+AC_HAVE_FUNCS(getcwd getdtablesize)
+AC_HEADER_STDARG
+AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK(cfsetispeed,AC_DEFINE(POSIX_TERMIOS)))
+AC_CHECK_HEADERS(unistd.h stdlib.h string.h sys/select.h)
+CHECK_UTMP
+DECLARE_SYS_ERRLIST
+AC_REPLACE_FUNCS(getdtablesize)
+AC_HAVE_FUNCS(getcwd getusershell seteuid setreuid setresuid)
+AC_CHECK_LIB(crypt,crypt) dnl 
+dnl 
+dnl copied from appl/bsd/configure.in
+dnl
+AC_MSG_CHECKING([setenv])
+AC_CACHE_VAL(krb5_cv_setenv,
+[AC_TRY_LINK(
+[],[setenv("PATH","/bin",0);],
+krb5_cv_setenv=yes,krb5_cv_setenv=no)])
+AC_MSG_RESULT($krb5_cv_setenv)
+if test $krb5_cv_setenv = no; then
+SETENVSRC='$(srcdir)/../bsd/setenv.c'
+SETENVOBJ=setenv.o
+AC_SUBST([SETENVSRC])
+AC_SUBST([SETENVOBJ])
+fi
+dnl
+dnl
+dnl
+AC_MSG_CHECKING([shadow password support])
+AC_CACHE_VAL(krb5_cv_shadow_pwd,
+[AC_TRY_LINK(
+[#include <sys/types.h>
+#include <pwd.h>
+#include <shadow.h>],
+[struct spwd *sp = getspnam("root")],
+krb5_cv_shadow_pwd=yes, krb5_cv_shadow_pwd=no)])
+AC_MSG_RESULT($krb5_cv_shadow_pwd)
+if test $krb5_cv_shadow_pwd = yes; then
+AC_DEFINE(HAVE_SHADOW)
+fi
+dnl
+dnl
+dnl
+KRB5_BUILD_PROGRAM
+K5_GEN_MAKEFILE(.)
+K5_GEN_MAKEFILE(ftp)
+K5_GEN_MAKEFILE(ftpd)
+K5_AC_OUTPUT
diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 8c3c1a8..a3cfbfc 100644
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 13 15:31:46 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in (thisconfigdir), configure.in: Point the
+ 		configuration directory at our parent, and remove our
+		local configure.in
+
 Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
diff --git a/src/appl/gssftp/ftp/Makefile.in b/src/appl/gssftp/ftp/Makefile.in
index 5e971b1..11d95bf 100644
--- a/src/appl/gssftp/ftp/Makefile.in
+++ b/src/appl/gssftp/ftp/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=./
+thisconfigdir=./../
 BUILDTOP=$(U)$(U)$(U)
 #
 # appl/gssftp/ftp/Makefile.in
diff --git a/src/appl/gssftp/ftp/configure.in b/src/appl/gssftp/ftp/configure.in
deleted file mode 100644
index cac62b4..0000000
--- a/src/appl/gssftp/ftp/configure.in
+++ /dev/null
@@ -1,20 +0,0 @@
-AC_INIT(ftp.c)
-CONFIG_RULES
-AC_CONST
-AC_PROG_INSTALL
-KRB5_SIGTYPE
-USE_ANAME
-CHECK_SIGPROCMASK
-CHECK_WAIT_TYPE
-DECLARE_SYS_ERRLIST
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-AC_FUNC_VFORK
-AC_HAVE_FUNCS(getcwd getdtablesize)
-AC_HEADER_STDARG
-AC_CHECK_HEADERS(sys/select.h)
-AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK(cfsetispeed,AC_DEFINE(POSIX_TERMIOS)))
-AC_CHECK_HEADERS(stdlib.h)
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index da05409..5794fc7 100644
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 13 15:31:46 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in (thisconfigdir), configure.in: Point the
+ 		configuration directory at our parent, and remove our
+		local configure.in
+
 Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
diff --git a/src/appl/gssftp/ftpd/Makefile.in b/src/appl/gssftp/ftpd/Makefile.in
index a237964..73c2149 100644
--- a/src/appl/gssftp/ftpd/Makefile.in
+++ b/src/appl/gssftp/ftpd/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=./
+thisconfigdir=./../
 BUILDTOP=$(U)$(U)$(U)
 #
 # appl/gssftp/ftpd/Makefile.in
diff --git a/src/appl/gssftp/ftpd/configure.in b/src/appl/gssftp/ftpd/configure.in
deleted file mode 100644
index 055ad84..0000000
--- a/src/appl/gssftp/ftpd/configure.in
+++ /dev/null
@@ -1,49 +0,0 @@
-AC_INIT(ftpcmd.y)
-CONFIG_RULES
-AC_CONST
-AC_PROG_INSTALL
-AC_PROG_YACC
-KRB5_SIGTYPE
-CHECK_UTMP
-CHECK_SIGPROCMASK
-CHECK_WAIT_TYPE
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-DECLARE_SYS_ERRLIST
-AC_FUNC_VFORK
-AC_HEADER_STDARG
-AC_CHECK_HEADERS(unistd.h stdlib.h string.h)
-AC_REPLACE_FUNCS(getdtablesize)
-AC_HAVE_FUNCS(getcwd getusershell seteuid setreuid setresuid)
-AC_CHECK_LIB(crypt,crypt) dnl 
-dnl 
-dnl copied from appl/bsd/configure.in
-AC_MSG_CHECKING([setenv])
-AC_CACHE_VAL(krb5_cv_setenv,
-[AC_TRY_LINK(
-[],[setenv("PATH","/bin",0);],
-krb5_cv_setenv=yes,krb5_cv_setenv=no)])
-AC_MSG_RESULT($krb5_cv_setenv)
-if test $krb5_cv_setenv = no; then
-SETENVSRC='$(srcdir)/../bsd/setenv.c'
-SETENVOBJ=setenv.o
-AC_SUBST([SETENVSRC])
-AC_SUBST([SETENVOBJ])
-fi
-AC_MSG_CHECKING([shadow password support])
-AC_CACHE_VAL(krb5_cv_shadow_pwd,
-[AC_TRY_LINK(
-[#include <sys/types.h>
-#include <pwd.h>
-#include <shadow.h>],
-[struct spwd *sp = getspnam("root")],
-krb5_cv_shadow_pwd=yes, krb5_cv_shadow_pwd=no)])
-AC_MSG_RESULT($krb5_cv_shadow_pwd)
-if test $krb5_cv_shadow_pwd = yes; then
-AC_DEFINE(HAVE_SHADOW)
-fi
-dnl
-dnl
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE