9 files changed, 36 insertions, 17 deletions
diff --git a/src/appl/simple/ChangeLog b/src/appl/simple/ChangeLog
index a2ae28f..3c69c21 100644
--- a/src/appl/simple/ChangeLog
+++ b/src/appl/simple/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.
+	
 Fri Sep 15 14:24:37 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* simple.h (SIMPLE_SERVICE, SIMPLE_PORT): Use separate definitions
diff --git a/src/appl/simple/Makefile.in b/src/appl/simple/Makefile.in
index 16fdba5..5c3584f 100644
--- a/src/appl/simple/Makefile.in
+++ b/src/appl/simple/Makefile.in
@@ -1 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
+LOCAL_SUBDIRS = client server
+
 CFLAGS = $(CCOPTS)
diff --git a/src/appl/simple/client/ChangeLog b/src/appl/simple/client/ChangeLog
index 7201759..794f419 100644
--- a/src/appl/simple/client/ChangeLog
+++ b/src/appl/simple/client/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Tue Feb 18 18:11:03 1997  Richard Basch  <basch@lehman.com>
 
 	* sim_client.c: Replace krb5_xfree with krb5_free_data_contents
diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in
index f9f5303..104c2b4 100644
--- a/src/appl/simple/client/Makefile.in
+++ b/src/appl/simple/client/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./../
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/appl/simple/client/configure.in b/src/appl/simple/client/configure.in
deleted file mode 100644
index 3d81282..0000000
--- a/src/appl/simple/client/configure.in
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_INIT(sim_client.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-AC_CHECK_HEADERS(stdlib.h)
-if test "$ac_cv_lib_socket" = "yes" -a "$ac_cv_lib_nsl" = "yes"; then
-	AC_DEFINE(BROKEN_STREAMS_SOCKETS)
-fi
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/simple/configure.in b/src/appl/simple/configure.in
index b155112..dc8492e 100644
--- a/src/appl/simple/configure.in
+++ b/src/appl/simple/configure.in
@@ -1,5 +1,14 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-CONFIG_DIRS(client server)
-DO_SUBDIRS
-V5_AC_OUTPUT_MAKEFILE
+AC_PROG_INSTALL
+AC_CHECK_HEADERS(stdlib.h)
+if test "$ac_cv_lib_socket" = "yes" -a "$ac_cv_lib_nsl" = "yes"; then
+	AC_DEFINE(BROKEN_STREAMS_SOCKETS)
+fi
+KRB5_BUILD_PROGRAM
+K5_GEN_MAKEFILE(.)
+K5_GEN_MAKEFILE(client)
+K5_GEN_MAKEFILE(server)
+K5_OUTPUT_FILES
+
+
diff --git a/src/appl/simple/server/ChangeLog b/src/appl/simple/server/ChangeLog
index e6fd132..1a11f94 100644
--- a/src/appl/simple/server/ChangeLog
+++ b/src/appl/simple/server/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Tue Feb 18 18:12:16 1997  Richard Basch  <basch@lehman.com>
 
 	* sim_server.c: Use krb5_free_data_contents instead of krb5_xfree
diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in
index 332c266..e3118ea 100644
--- a/src/appl/simple/server/Makefile.in
+++ b/src/appl/simple/server/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./../
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
 LOCALINCLUDE= -I.. -I$(srcdir)/..
diff --git a/src/appl/simple/server/configure.in b/src/appl/simple/server/configure.in
deleted file mode 100644
index 61590e6..0000000
--- a/src/appl/simple/server/configure.in
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(sim_server.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE