Collapse all configure.in files under the kadmin directory into the

kadmin directory.

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

6 files changed, 15 insertions, 30 deletions

diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog
index 35ff70a..d64d085 100644
--- a/src/kadmin/v4server/ChangeLog
+++ b/src/kadmin/v4server/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 27 23:32:38 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Changed thisconfigdir to point at the kadmin
+ 		directory, since we've moved all of the configure.in
+		tests to the toplevel kadmin configure.in
+
 Wed Feb 18 16:00:59 1998  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
diff --git a/src/kadmin/v4server/Makefile.in b/src/kadmin/v4server/Makefile.in
index ff7b072..19b7ee8 100644
--- a/src/kadmin/v4server/Makefile.in
+++ b/src/kadmin/v4server/Makefile.in
@@ -1,9 +1,10 @@
-thisconfigdir=.
+thisconfigdir=./..
 BUILDTOP=$(REL)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) \
 	-DKADM5 -DNEED_SOCKETS @HESIOD_DEFS@
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
 PROG_RPATH=$(KRB5_LIBDIR)
+LOCAL_SUBDIRS = unit-test
 
 HESIOD_LIBS=@HESIOD_LIBS@
 
diff --git a/src/kadmin/v4server/configure.in b/src/kadmin/v4server/configure.in
deleted file mode 100644
index 9af805d..0000000
--- a/src/kadmin/v4server/configure.in
+++ /dev/null
@@ -1,10 +0,0 @@
-AC_INIT(admin_server.c)
-CONFIG_RULES
-AC_CONFIG_SUBDIRS(unit-test)
-AC_PROG_INSTALL
-AC_CHECK_HEADERS(sys/time.h unistd.h stdlib.h)
-CHECK_SIGNALS
-CHECK_WAIT_TYPE
-AC_PROG_AWK
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/v4server/unit-test/ChangeLog b/src/kadmin/v4server/unit-test/ChangeLog
index 788ee16..c796049 100644
--- a/src/kadmin/v4server/unit-test/ChangeLog
+++ b/src/kadmin/v4server/unit-test/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 27 23:32:38 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Changed thisconfigdir to point at the kadmin
+ 		directory, since we've moved all of the configure.in
+		tests to the toplevel kadmin configure.in
+
 Wed Feb 18 16:01:35 1998  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
diff --git a/src/kadmin/v4server/unit-test/Makefile.in b/src/kadmin/v4server/unit-test/Makefile.in
index 051ed68..540b696 100644
--- a/src/kadmin/v4server/unit-test/Makefile.in
+++ b/src/kadmin/v4server/unit-test/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=.
+thisconfigdir=./../..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 #
 # $Id$
diff --git a/src/kadmin/v4server/unit-test/configure.in b/src/kadmin/v4server/unit-test/configure.in
deleted file mode 100644
index a41c1c4..0000000
--- a/src/kadmin/v4server/unit-test/configure.in
+++ /dev/null
@@ -1,18 +0,0 @@
-AC_INIT(getpid.sh)
-CONFIG_RULES
-AC_CANONICAL_HOST
-ath_compat=
-AC_ARG_ENABLE([athena],
-[  --enable-athena         build with MIT Project Athena configuration],
-ath_compat=compat,)
-
-dnl The following are tests for the presence of programs required for testing 
-AC_CHECK_PROG(RUNTEST,runtest,runtest)
-AC_CHECK_PROG(PERL,perl,perl)
-AC_KRB5_TCL	
-if test "$ath_compat" = compat -a "$PERL" = perl -a "$RUNTEST" = runtest -a "$TCL_LIBS" != ""; then
- 	DO_TEST=ok
-fi
-AC_SUBST(DO_TEST) 
-dnl
-V5_AC_OUTPUT_MAKEFILE