Mass makefile/configure.in build system revamp

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

24 files changed, 73 insertions, 48 deletions

diff --git a/src/tests/ChangeLog b/src/tests/ChangeLog
index eecbbff61..4fa0b1279 100644
--- a/src/tests/ChangeLog
+++ b/src/tests/ChangeLog
@@ -1,3 +1,11 @@
+Mon Feb  2 16:47:05 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
+	* 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.
+	
 Wed Nov 19 10:54:01 1997  Ezra Peisach  <epeisach@mit.edu>
 
 	* Makefile.in (kdb_check): Remove temporary file generated during test.
diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index 9a5bca5f8..944288406 100644
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -1,3 +1,7 @@
+thisconfigdir=./
+BUILDTOP=$(U)
+LOCAL_SUBDIRS = resolve asn.1 create hammer verify gssapi dejagnu
+
 CFLAGS = $(CCOPTS)
 RUN_SETUP = @KRB5_RUN_ENV@ KRB5_KDC_PROFILE=kdc.conf KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf
 KRB5_RUN_ENV= @KRB5_RUN_ENV@
diff --git a/src/tests/asn.1/ChangeLog b/src/tests/asn.1/ChangeLog
index ca980084b..54f988a24 100644
--- a/src/tests/asn.1/ChangeLog
+++ b/src/tests/asn.1/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 16:46:31 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Sun Aug 17 14:26:19 1997  Ezra Peisach  <epeisach@mit.edu>
 
 	* Makefile.in (SRCS): Add $(srcdir).
diff --git a/src/tests/asn.1/Makefile.in b/src/tests/asn.1/Makefile.in
index 0c5b93ab2..efaa54aa1 100644
--- a/src/tests/asn.1/Makefile.in
+++ b/src/tests/asn.1/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./../
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDES)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/tests/asn.1/configure.in b/src/tests/asn.1/configure.in
deleted file mode 100644
index e75a82c7c..000000000
--- a/src/tests/asn.1/configure.in
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(krb5_encode_test.c)
-CONFIG_RULES
-KRB5_RUN_FLAGS
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/tests/configure.in b/src/tests/configure.in
index 258b17141..ea62f3ee0 100644
--- a/src/tests/configure.in
+++ b/src/tests/configure.in
@@ -1,6 +1,22 @@
 AC_INIT(configure.in)
 CONFIG_RULES
 KRB5_RUN_FLAGS
-CONFIG_DIRS(resolve asn.1 create hammer verify gssapi dejagnu)
-DO_SUBDIRS
-V5_AC_OUTPUT_MAKEFILE
+KRB5_BUILD_PROGRAM
+AC_HEADER_STDC
+AC_CHECK_FUNCS(strchr)
+AC_CHECK_HEADERS(unistd.h stdlib.h sys/param.h sys/socket.h)
+AC_CONST
+AC_PROG_INSTALL
+AC_CHECK_PROG(RUNTEST,runtest,runtest)
+AC_RETSIGTYPE
+CHECK_SIGNALS
+K5_GEN_MAKEFILE(.)
+K5_GEN_MAKEFILE(resolve)
+K5_GEN_MAKEFILE(asn.1)
+K5_GEN_MAKEFILE(create)
+K5_GEN_MAKEFILE(hammer)
+K5_GEN_MAKEFILE(verify)
+K5_GEN_MAKEFILE(gssapi)
+K5_GEN_MAKEFILE(dejagnu)
+K5_OUTPUT_FILES
+
diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog
index 86f6e3a73..1ffc4911d 100644
--- a/src/tests/create/ChangeLog
+++ b/src/tests/create/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 16:46:04 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Sun Aug 17 14:26:57 1997  Ezra Peisach  <epeisach@mit.edu>
 
 	* Makefile.in (SRCS): Add $(SRCS) line.
diff --git a/src/tests/create/Makefile.in b/src/tests/create/Makefile.in
index 72773527c..256a2a8b5 100644
--- a/src/tests/create/Makefile.in
+++ b/src/tests/create/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./../
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/tests/create/configure.in b/src/tests/create/configure.in
deleted file mode 100644
index 2f106fc98..000000000
--- a/src/tests/create/configure.in
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(kdb5_mkdums.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/tests/dejagnu/ChangeLog b/src/tests/dejagnu/ChangeLog
index a0e52c43b..32abbbd0a 100644
--- a/src/tests/dejagnu/ChangeLog
+++ b/src/tests/dejagnu/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 16:45:49 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Tue Oct  7 08:02:13 1997  Ezra Peisach  <epeisach@mit.edu>
 
 	* Makefile.in (runenv.vars): Use tr to remove newlines in multiple
diff --git a/src/tests/dejagnu/Makefile.in b/src/tests/dejagnu/Makefile.in
index 6a75a5f4e..decd46265 100644
--- a/src/tests/dejagnu/Makefile.in
+++ b/src/tests/dejagnu/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./../
+BUILDTOP=$(U)$(U)
 HAVE_RUNTEST = @RUNTEST@
 RUNTESTFLAGS =
 KRB5_RUN_ENV= @KRB5_RUN_ENV@
diff --git a/src/tests/dejagnu/configure.in b/src/tests/dejagnu/configure.in
deleted file mode 100644
index bdf362182..000000000
--- a/src/tests/dejagnu/configure.in
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_INIT(Makefile.in)
-CONFIG_RULES
-AC_PROG_INSTALL
-AC_CHECK_PROG(RUNTEST,runtest,runtest)
-AC_RETSIGTYPE
-CHECK_SIGNALS
-KRB5_RUN_FLAGS
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/tests/gssapi/ChangeLog b/src/tests/gssapi/ChangeLog
index bfdbc51ea..be6b3b71b 100644
--- a/src/tests/gssapi/ChangeLog
+++ b/src/tests/gssapi/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 16:45:28 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Sun Feb  9 01:40:15 1997  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in:
diff --git a/src/tests/gssapi/Makefile.in b/src/tests/gssapi/Makefile.in
index 6e75130e9..ec48ab976 100644
--- a/src/tests/gssapi/Makefile.in
+++ b/src/tests/gssapi/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./../
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -DUSE_AUTOCONF_H
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/tests/gssapi/configure.in b/src/tests/gssapi/configure.in
deleted file mode 100644
index 45cdb51c4..000000000
--- a/src/tests/gssapi/configure.in
+++ /dev/null
@@ -1,8 +0,0 @@
-AC_INIT(t_imp_name.c)
-CONFIG_RULES
-AC_CHECK_HEADERS(unistd.h stdlib.h)
-AC_CHECK_HEADER(string.h,AC_DEFINE(USE_STRING_H))
-AC_CONST
-AC_PROG_INSTALL
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/tests/hammer/ChangeLog b/src/tests/hammer/ChangeLog
index 865c25f5d..f39421f30 100644
--- a/src/tests/hammer/ChangeLog
+++ b/src/tests/hammer/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 16:45:05 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Sun Aug 17 14:26:57 1997  Ezra Peisach  <epeisach@mit.edu>
 
 	* Makefile.in (SRCS): Add $(SRCS) line.
diff --git a/src/tests/hammer/Makefile.in b/src/tests/hammer/Makefile.in
index f4afeebbc..d6317dd68 100644
--- a/src/tests/hammer/Makefile.in
+++ b/src/tests/hammer/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./../
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/tests/hammer/configure.in b/src/tests/hammer/configure.in
deleted file mode 100644
index ee62c087a..000000000
--- a/src/tests/hammer/configure.in
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(kdc5_hammer.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/tests/resolve/ChangeLog b/src/tests/resolve/ChangeLog
index ba8cc14d1..6af715a76 100644
--- a/src/tests/resolve/ChangeLog
+++ b/src/tests/resolve/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 16:44:41 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Wed Feb 26 23:12:24 1997  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in: Add $(LIBS) so that compile doesn't blow out under
diff --git a/src/tests/resolve/Makefile.in b/src/tests/resolve/Makefile.in
index d9f6b34a6..33a9c45db 100644
--- a/src/tests/resolve/Makefile.in
+++ b/src/tests/resolve/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./../
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDES)
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/tests/resolve/configure.in b/src/tests/resolve/configure.in
deleted file mode 100644
index 5a6f90db4..000000000
--- a/src/tests/resolve/configure.in
+++ /dev/null
@@ -1,8 +0,0 @@
-AC_INIT(resolve.c)
-CONFIG_RULES
-AC_HEADER_STDC
-AC_CHECK_FUNCS(strchr)
-AC_CHECK_HEADERS(sys/param.h sys/socket.h)
-KRB5_RUN_FLAGS
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/tests/verify/ChangeLog b/src/tests/verify/ChangeLog
index deee45301..560645cfd 100644
--- a/src/tests/verify/ChangeLog
+++ b/src/tests/verify/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 16:44:21 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Sun Aug 17 14:26:57 1997  Ezra Peisach  <epeisach@mit.edu>
 
 	* Makefile.in (SRCS): Add $(SRCS) line.
diff --git a/src/tests/verify/Makefile.in b/src/tests/verify/Makefile.in
index afc353938..32e22fc54 100644
--- a/src/tests/verify/Makefile.in
+++ b/src/tests/verify/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./../
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/tests/verify/configure.in b/src/tests/verify/configure.in
deleted file mode 100644
index 711a78b60..000000000
--- a/src/tests/verify/configure.in
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(kdb5_verify.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE