Merge about 1/3 of the remaining configure scripts into the top level. This

still leaves out appl and tests, and static library and plugin directories.

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

11 files changed, 23 insertions, 82 deletions

diff --git a/src/kadmin/Makefile.in b/src/kadmin/Makefile.in
index 3be9036a8..5c83425bc 100644
--- a/src/kadmin/Makefile.in
+++ b/src/kadmin/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=.
+thisconfigdir=..
 myfulldir=kadmin
-mydir=.
+mydir=kadmin
 BUILDTOP=$(REL)..
 LOCAL_SUBDIRS = cli dbutil passwd ktutil server testing
 
diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in
index c58e9f9ea..3cbaa58e2 100644
--- a/src/kadmin/cli/Makefile.in
+++ b/src/kadmin/cli/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
 myfulldir=kadmin/cli
-mydir=cli
+mydir=kadmin/cli
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/kadmin/configure.in b/src/kadmin/configure.in
deleted file mode 100644
index e18eec56b..000000000
--- a/src/kadmin/configure.in
+++ /dev/null
@@ -1,59 +0,0 @@
-K5_AC_INIT(configure.in)
-CONFIG_RULES
-AC_PROG_INSTALL
-AC_PROG_YACC
-AC_PROG_AWK
-AC_CHECK_HEADERS(unistd.h stdlib.h krb_db.h kdc.h regex.h alloca.h sys/time.h sys/select.h memory.h arpa/inet.h)
-AC_CHECK_FUNCS(ftime timezone getcwd strstr waitpid vsprintf)
-KRB5_AC_NEED_DAEMON
-AC_HEADER_TIME
-CHECK_SIGNALS
-CHECK_WAIT_TYPE
-CHECK_SETJMP
-KRB5_GETSOCKNAME_ARGS
-ath_compat=
-AC_ARG_ENABLE([athena],
-[  --enable-athena         build with MIT Project Athena configuration],
-ath_compat=compat,)
-dnl
-dnl The following are tests for the presence of programs required for testing 
-AC_CHECK_PROG(have_RUNTEST,runtest,runtest)
-AC_CHECK_PROG(have_PERL,perl,perl)
-AC_KRB5_TCL	
-if test "$have_PERL" = perl -a "$have_RUNTEST" = runtest -a "$TCL_LIBS" != ""; then
- 	DO_TEST=ok
-fi
-AC_SUBST(DO_TEST) 
-dnl
-DO_V4_TEST=
-if test "$have_PERL" = perl -a "$have_RUNTEST" = runtest -a "$TCL_LIBS" != "" -a "$ath_compat" != ""; then
- 	DO_V4_TEST=ok
-fi
-AC_SUBST(DO_V4_TEST)
-dnl
-dnl The following are substituted into testing/scripts/env-setup.sh
-RBUILD=`pwd`/..
-AC_SUBST(RBUILD)
-case "$srcdir" in
-/*)
-	S_TOP=$srcdir/..
-	;;
-*)
-	S_TOP=`pwd`/$srcdir/..
-	;;
-esac
-AC_SUBST(S_TOP)
-AC_PATH_PROG(PERL,perl)
-AC_PATH_PROG(EXPECT,expect)
-dnl
-KRB5_RUN_FLAGS
-dnl For testing/util/Makefile.in
-if test "$TCL_LIBS" != "" ;  then
-	DO_ALL=tcl
-fi
-AC_SUBST(DO_ALL)
-KRB5_BUILD_PROGRAM
-KRB5_AC_PRIOCNTL_HACK
-dnl
-K5_GEN_FILE(testing/scripts/env-setup.sh:testing/scripts/env-setup.shin)
-V5_AC_OUTPUT_MAKEFILE(. cli dbutil passwd passwd/unit-test ktutil server  testing testing/scripts testing/util)
diff --git a/src/kadmin/dbutil/Makefile.in b/src/kadmin/dbutil/Makefile.in
index 61071382c..82b309894 100644
--- a/src/kadmin/dbutil/Makefile.in
+++ b/src/kadmin/dbutil/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
 myfulldir=kadmin/dbutil
-mydir=dbutil
+mydir=kadmin/dbutil
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DKDB4_DISABLE
 DEFS=
diff --git a/src/kadmin/ktutil/Makefile.in b/src/kadmin/ktutil/Makefile.in
index 76da34fcc..fbf0824e4 100644
--- a/src/kadmin/ktutil/Makefile.in
+++ b/src/kadmin/ktutil/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
 myfulldir=kadmin/ktutil
-mydir=ktutil
+mydir=kadmin/ktutil
 BUILDTOP=$(REL)..$(S)..
 LOCALINCLUDES = $(KRB4_INCLUDES)
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
diff --git a/src/kadmin/passwd/Makefile.in b/src/kadmin/passwd/Makefile.in
index 7cddcb4ce..d5f06f609 100644
--- a/src/kadmin/passwd/Makefile.in
+++ b/src/kadmin/passwd/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
 myfulldir=kadmin/passwd
-mydir=passwd
+mydir=kadmin/passwd
 BUILDTOP=$(REL)..$(S)..
 LOCALINCLUDES = -I.
 DEFINES = -DUSE_KADM5_API_VERSION=1
diff --git a/src/kadmin/passwd/unit-test/Makefile.in b/src/kadmin/passwd/unit-test/Makefile.in
index 5445a2811..969ee8207 100644
--- a/src/kadmin/passwd/unit-test/Makefile.in
+++ b/src/kadmin/passwd/unit-test/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./../..
+thisconfigdir=../../..
 myfulldir=kadmin/passwd/unit-test
-mydir=passwd/unit-test
+mydir=kadmin/passwd/unit-test
 BUILDTOP=$(REL)..$(S)..$(S)..
 check unit-test:: unit-test-@DO_TEST@
 
diff --git a/src/kadmin/server/Makefile.in b/src/kadmin/server/Makefile.in
index 3e99a7094..68ffe20f8 100644
--- a/src/kadmin/server/Makefile.in
+++ b/src/kadmin/server/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
 myfulldir=kadmin/server
-mydir=server
+mydir=kadmin/server
 BUILDTOP=$(REL)..$(S)..
 KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
 DEFS=
diff --git a/src/kadmin/testing/Makefile.in b/src/kadmin/testing/Makefile.in
index c164a7e24..74600d1c9 100644
--- a/src/kadmin/testing/Makefile.in
+++ b/src/kadmin/testing/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
 myfulldir=kadmin/testing
-mydir=testing
+mydir=kadmin/testing
 BUILDTOP=$(REL)..$(S)..
 LOCAL_SUBDIRS = scripts util
 
diff --git a/src/kadmin/testing/scripts/Makefile.in b/src/kadmin/testing/scripts/Makefile.in
index 3f58e9248..6161b1db8 100644
--- a/src/kadmin/testing/scripts/Makefile.in
+++ b/src/kadmin/testing/scripts/Makefile.in
@@ -1,8 +1,8 @@
-thisconfigdir=./../..
+thisconfigdir=../../..
 myfulldir=kadmin/testing/scripts
-mydir=testing/scripts
+mydir=kadmin/testing/scripts
 BUILDTOP=$(REL)..$(S)..$(S)..
-PERL=@PERL@
+PERL_PATH=@PERL_PATH@
 
 .SUFFIXES: .plin .pl
 
@@ -17,7 +17,7 @@ env-setup.sh: env-setup.stamp
 env-setup.stamp: $(srcdir)/env-setup.shin $(thisconfigdir)/config.status \
 		Makefile 
 	cd $(thisconfigdir) && \
-		CONFIG_FILES=./testing/scripts/env-setup.sh:./testing/scripts/env-setup.shin $(SHELL) \
+		CONFIG_FILES=$(mydir)/env-setup.sh:$(mydir)/env-setup.shin $(SHELL) \
 		config.status
 	chmod +x env-setup.sh
 	touch env-setup.stamp
@@ -28,7 +28,7 @@ restore_files.sh:
 
 .plin.pl: 
 	-rm -f $@.tmp
-	echo "#!$(PERL)" > $@.tmp
+	echo "#!$(PERL_PATH)" > $@.tmp
 	sed 1d $< >> $@.tmp
 	chmod +x $@.tmp
 	mv $@.tmp $@
diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in
index fa3c3827f..cf38caec1 100644
--- a/src/kadmin/testing/util/Makefile.in
+++ b/src/kadmin/testing/util/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./../..
+thisconfigdir=../../..
 myfulldir=kadmin/testing/util
-mydir=testing/util
+mydir=kadmin/testing/util
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = $(TCL_INCLUDES) -I$(BUILDTOP)/lib/kdb/
 # Force Tcl headers to use stdarg.h, because krb5 does too, and if