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

diff --git a/src/kadmin/ChangeLog b/src/kadmin/ChangeLog
index ec2435212f53215f0b0de3fe388f9a3e7caa205f..e9c10c3c4cd4427e4f7e636b836b2f1f472ace74 100644 (file)
--- a/src/kadmin/ChangeLog
+++ b/src/kadmin/ChangeLog
@@ -1,3 +1,12 @@
+Fri Feb 27 23:32:38 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * configure.in: Move tests from all of kadmin's subdirectories into
+               this configure.in, and make it generate makefiles for all
+               of the subdirectories.
+
+       * Makefile.in: Add a LOCAL_SUBDIRS macro for all subdirectories in
+               the kadmin directory.
+
 Wed Feb 18 15:53:46 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in (thisconfigdir): Remove trailing slash.

diff --git a/src/kadmin/Makefile.in b/src/kadmin/Makefile.in
index a8b035560a903eb6b226dde3e1e76257c9e6665c..b6ced74229e0908b52cf52844e594a76c3704859 100644 (file)
--- a/src/kadmin/Makefile.in
+++ b/src/kadmin/Makefile.in
@@ -1,6 +1,7 @@
 thisconfigdir=.
 BUILDTOP=$(REL)$(U)
 CFLAGS = $(CCOPTS)
+LOCAL_SUBDIRS = cli dbutil passwd ktutil server @V4SERVER@ v5passwdd testing
 
 all::
 

diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index 2cf4ed6f8e3e0043e8ee05a1cc8a33f296e48c75..9bf1d76f00b9aa811db22fccaad797913e82749d 100644 (file)
--- a/src/kadmin/cli/ChangeLog
+++ b/src/kadmin/cli/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 15:54:11 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash.  Fix up BUILDTOP for new

diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in
index c055dd6e0141e6cc4e557771bdfcded8c3d937bd..2ed5c95e98324eb6488050b102a367abb9c63a8a 100644 (file)
--- a/src/kadmin/cli/Makefile.in
+++ b/src/kadmin/cli/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=.
+thisconfigdir=./..
 BUILDTOP=$(REL)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)

diff --git a/src/kadmin/cli/configure.in b/src/kadmin/cli/configure.in
deleted file mode 100644 (file)
index d843fc3..0000000
--- a/src/kadmin/cli/configure.in
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_INIT(getdate.y)
-CONFIG_RULES
-AC_PROG_INSTALL
-AC_PROG_YACC
-AC_HAVE_HEADERS(unistd.h sys/timeb.h alloca.h)
-AC_HAVE_FUNCS(ftime timezone)
-AC_REPLACE_FUNCS([memmove strftime])
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE

diff --git a/src/kadmin/configure.in b/src/kadmin/configure.in
index be60003d0bab3404d893572fd8bd790eb002fa7a..e849ccc87b5e9d337836a3fbe8cd110f34e52236 100644 (file)
--- a/src/kadmin/configure.in
+++ b/src/kadmin/configure.in
@@ -1,9 +1,64 @@
 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 alloca.h sys/time.h sys/select.h)
+AC_CHECK_FUNCS(ftime timezone getcwd strstr waitpid vsprintf)
+AC_REPLACE_FUNCS([memmove strftime])
+CHECK_SIGNALS
+CHECK_WAIT_TYPE
+CHECK_SETJMP
+AC_CANONICAL_HOST
+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 The following are substituted into testing/scripts/env-setup.sh
+AC_SUBST(SRCTOP)
+RBUILD=`pwd`/..
+AC_SUBST(RBUILD)
+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)
+dnl See if we should build v4server
 if test -z "$KRB4_LIB"; then
-v4server=""
+V4SERVER=""
 else
-v4server=v4server
+V4SERVER=v4server
 fi
-AC_CONFIG_SUBDIRS(cli dbutil passwd ktutil server $v4server v5passwdd testing)
-V5_AC_OUTPUT_MAKEFILE
+AC_SUBST(V4SERVER)
+dnl
+KRB5_BUILD_PROGRAM
+dnl
+K5_GEN_MAKEFILE(.)
+K5_GEN_MAKEFILE(cli)
+K5_GEN_MAKEFILE(dbutil)
+K5_GEN_MAKEFILE(passwd)
+K5_GEN_MAKEFILE(passwd/unit-test)
+K5_GEN_MAKEFILE(ktutil)
+K5_GEN_MAKEFILE(server)
+K5_GEN_MAKEFILE(v4server)
+K5_GEN_MAKEFILE(v4server/unit-test)
+K5_GEN_MAKEFILE(v5passwdd)
+K5_GEN_MAKEFILE(testing)
+K5_GEN_MAKEFILE(testing/scripts)
+K5_GEN_FILE(testing/scripts/env-setup.sh:testing/scripts/env-setup.shin)
+K5_GEN_MAKEFILE(testing/util)
+K5_AC_OUTPUT
+

diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index f397515b757e7a0f8b5babdf9b6ccd19093250fc..4f89fdd176dbc1ec0773f86f6064e41116eece99 100644 (file)
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/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 15:55:06 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up

diff --git a/src/kadmin/dbutil/Makefile.in b/src/kadmin/dbutil/Makefile.in
index f49072bea2741ef72458f745c1f78aaa15a399b7..48aed70594fed37afce00212ce5920b6203d1730 100644 (file)
--- a/src/kadmin/dbutil/Makefile.in
+++ b/src/kadmin/dbutil/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=.
+thisconfigdir=./..
 BUILDTOP=$(REL)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) -DKDB4_DISABLE -I. $(LOCALINCLUDE) @KRB4_INCLUDES@ 
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)

diff --git a/src/kadmin/dbutil/configure.in b/src/kadmin/dbutil/configure.in
deleted file mode 100644 (file)
index f2e6dd2..0000000
--- a/src/kadmin/dbutil/configure.in
+++ /dev/null
@@ -1,8 +0,0 @@
-AC_INIT(kdb5_create.c)
-CONFIG_RULES
-AC_HAVE_FUNCS(getcwd strstr)
-AC_PROG_INSTALL
-AC_PROG_AWK
-KRB5_BUILD_PROGRAM
-AC_CHECK_HEADERS(krb_db.h kdc.h) dnl 
-V5_AC_OUTPUT_MAKEFILE

diff --git a/src/kadmin/kdbkeys/configure.in b/src/kadmin/kdbkeys/configure.in
deleted file mode 100644 (file)
index fe426e8..0000000
--- a/src/kadmin/kdbkeys/configure.in
+++ /dev/null
@@ -1,7 +0,0 @@
-AC_INIT(kdbkeys.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-AC_PROG_AWK
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
-V5_AC_OUTPUT_MAKEFILE

diff --git a/src/kadmin/ktutil/ChangeLog b/src/kadmin/ktutil/ChangeLog
index 8ae3565ee5a39f81701fdabd0e6442e18743d94a..54e4e71fa27ed16a4f927a84b6c6ac7e5889a6c4 100644 (file)
--- a/src/kadmin/ktutil/ChangeLog
+++ b/src/kadmin/ktutil/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 15:56:16 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up

diff --git a/src/kadmin/ktutil/Makefile.in b/src/kadmin/ktutil/Makefile.in
index 525524d3ab73a987927a8bded31760ff96e1fd31..44cc3b8bf04355ea8b115ca87a5c8760cbc6bfad 100644 (file)
--- a/src/kadmin/ktutil/Makefile.in
+++ b/src/kadmin/ktutil/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=.
+thisconfigdir=./..
 BUILDTOP=$(REL)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(KRB4_INCLUDES)
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)

diff --git a/src/kadmin/ktutil/configure.in b/src/kadmin/ktutil/configure.in
deleted file mode 100644 (file)
index 90987d4..0000000
--- a/src/kadmin/ktutil/configure.in
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(ktutil.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE

diff --git a/src/kadmin/passwd/ChangeLog b/src/kadmin/passwd/ChangeLog
index fba27eb96ef08653e382e1f48f261237b3be6497..081562663a025ab3dcd59edaddeddf7441579375 100644 (file)
--- a/src/kadmin/passwd/ChangeLog
+++ b/src/kadmin/passwd/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 15:56:44 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trialing slash from thisconfigdir.  Fix up

diff --git a/src/kadmin/passwd/Makefile.in b/src/kadmin/passwd/Makefile.in
index 704104463453271329d74ab87db9d444a036d4d4..9b634eec0bc37c33a362f2a3a5a604af7adf077e 100644 (file)
--- a/src/kadmin/passwd/Makefile.in
+++ b/src/kadmin/passwd/Makefile.in
@@ -1,8 +1,9 @@
-thisconfigdir=.
+thisconfigdir=./..
 BUILDTOP=$(REL)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -I. -DUSE_KADM5_API_VERSION=1
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
+LOCAL_SUBDIRS = unit-test
 
 PROG = kpasswd
 OBJS = tty_kpasswd.o kpasswd.o kpasswd_strings.o

diff --git a/src/kadmin/passwd/configure.in b/src/kadmin/passwd/configure.in
deleted file mode 100644 (file)
index cd597bb..0000000
--- a/src/kadmin/passwd/configure.in
+++ /dev/null
@@ -1,7 +0,0 @@
-AC_INIT(kpasswd.c)
-CONFIG_RULES
-AC_CONFIG_SUBDIRS(unit-test)
-AC_PROG_INSTALL
-AC_PROG_AWK
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE

diff --git a/src/kadmin/passwd/unit-test/ChangeLog b/src/kadmin/passwd/unit-test/ChangeLog
index cb40a0ef82fce7c1aa79fe6476920d991a1b0f1b..6f67447468fcdf0788c58bc5de45b8377f65fac9 100644 (file)
--- a/src/kadmin/passwd/unit-test/ChangeLog
+++ b/src/kadmin/passwd/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 15:57:38 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up

diff --git a/src/kadmin/passwd/unit-test/Makefile.in b/src/kadmin/passwd/unit-test/Makefile.in
index fd7fd7de537f8248b7e092105915c21bd9093bb1..465889b2e64bbbdce36ba3767edfc36013401f77 100644 (file)
--- a/src/kadmin/passwd/unit-test/Makefile.in
+++ b/src/kadmin/passwd/unit-test/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=.
+thisconfigdir=./../..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 check unit-test:: unit-test-@DO_TEST@
 

diff --git a/src/kadmin/passwd/unit-test/configure.in b/src/kadmin/passwd/unit-test/configure.in
deleted file mode 100644 (file)
index 609206f..0000000
--- a/src/kadmin/passwd/unit-test/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-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 "$PERL" = perl -a "$RUNTEST" = runtest -a "$TCL_LIBS" != ""; then
-       DO_TEST=ok
-fi
-AC_SUBST(DO_TEST) 
-dnl
-V5_AC_OUTPUT_MAKEFILE

diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index 77cf0df94ecc0f6ebbfff1a98e2b138bb1d5d8a9..fa9506e9641562c652cecf6004d3f291a5922ab0 100644 (file)
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/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 25 14:00:32 1998  Ezra Peisach  <epeisach@mit.edu>
 
        * schpw.c (process_chpw_request): Free memory of allocated for

diff --git a/src/kadmin/server/Makefile.in b/src/kadmin/server/Makefile.in
index b33ab28ab52f5677b3027a7583a5c10f7160e74f..db1ce7f10117ff2d1b55626eb927986fbb0180b3 100644 (file)
--- a/src/kadmin/server/Makefile.in
+++ b/src/kadmin/server/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=.
+thisconfigdir=./..
 BUILDTOP=$(REL)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 

diff --git a/src/kadmin/server/configure.in b/src/kadmin/server/configure.in
deleted file mode 100644 (file)
index 17d9f90..0000000
--- a/src/kadmin/server/configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
-AC_INIT(ovsec_kadmd.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-dnl AC_CHECK_FUNCS(waitpid vsprintf)
-dnl AC_CHECK_HEADERS(sys/select.h)
-dnl CHECK_SIGNALS
-dnl CHECK_SETJMP
-dnl CHECK_WAIT_TYPE
-dnl ET_RULES
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE

diff --git a/src/kadmin/testing/ChangeLog b/src/kadmin/testing/ChangeLog
index b3237ccc06fea1b6277043d914f156e07f398ded..c6eeac1149fac34526a22efdf0ab69c18ddb5596 100644 (file)
--- a/src/kadmin/testing/ChangeLog
+++ b/src/kadmin/testing/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 15:58:53 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up

diff --git a/src/kadmin/testing/Makefile.in b/src/kadmin/testing/Makefile.in
index 03dae6bd07ce9ddb2728032d598d4ddd46430f03..e803cd090e4190826fee4e1ded1375b2d0f62544 100644 (file)
--- a/src/kadmin/testing/Makefile.in
+++ b/src/kadmin/testing/Makefile.in
@@ -1,6 +1,7 @@
-thisconfigdir=.
+thisconfigdir=./..
 BUILDTOP=$(REL)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS)
+LOCAL_SUBDIRS = scripts util
 
 all::
 

diff --git a/src/kadmin/testing/configure.in b/src/kadmin/testing/configure.in
deleted file mode 100644 (file)
index 60dd52a..0000000
--- a/src/kadmin/testing/configure.in
+++ /dev/null
@@ -1,4 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-AC_CONFIG_SUBDIRS(scripts util)
-V5_AC_OUTPUT_MAKEFILE

diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog
index ca0fbf03713da0f53b536884bfe11ba25b76d924..dedd72d4486124fd467e7fcd027587528c516f40 100644 (file)
--- a/src/kadmin/testing/scripts/ChangeLog
+++ b/src/kadmin/testing/scripts/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 15:59:31 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up

diff --git a/src/kadmin/testing/scripts/Makefile.in b/src/kadmin/testing/scripts/Makefile.in
index bd1fcadae1d8340669683818c03b0a7e5ba25610..ed26c6902482150c6b1dddf5013dbd17f9195e44 100644 (file)
--- a/src/kadmin/testing/scripts/Makefile.in
+++ b/src/kadmin/testing/scripts/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=.
+thisconfigdir=./../..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 PERL=@PERL@
 

diff --git a/src/kadmin/testing/scripts/configure.in b/src/kadmin/testing/scripts/configure.in
deleted file mode 100644 (file)
index 8aaad2f..0000000
--- a/src/kadmin/testing/scripts/configure.in
+++ /dev/null
@@ -1,13 +0,0 @@
-AC_INIT(init_db)
-CONFIG_RULES
-AC_PATH_PROG(PERL,perl)
-AC_PATH_PROG(EXPECT,expect)
-KRB5_RUN_FLAGS
-RBUILD=`pwd`/../../..
-AC_SUBST(RBUILD)
-dnl The following are substituted into env-setup.sh
-AC_SUBST(SRCTOP)
-K5_GEN_MAKEFILE(.)
-K5_GEN_FILE(env-setup.sh:env-setup.shin)
-K5_OUTPUT_FILES
-dnl AC_OUTPUT to keep autoreconf happy

diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog
index e75958cdc9a94bf256113b2ddc97cd5d19232a8a..2528951e59ba9b71e94594cc71c370c3bcbda704 100644 (file)
--- a/src/kadmin/testing/util/ChangeLog
+++ b/src/kadmin/testing/util/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:13 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up

diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in
index 1b45da88889389708b6b618d4f2f93d014a7edb9..62a98f613b9ee66a0b98aa7313aef2321130668b 100644 (file)
--- a/src/kadmin/testing/util/Makefile.in
+++ b/src/kadmin/testing/util/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=.
+thisconfigdir=./../..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(TCL_INCLUDES)
 

diff --git a/src/kadmin/testing/util/configure.in b/src/kadmin/testing/util/configure.in
deleted file mode 100644 (file)
index 6c6d32f..0000000
--- a/src/kadmin/testing/util/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-AC_INIT(tcl_kadm5.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-dnl Test for tcl
-AC_KRB5_TCL    
-if test "$TCL_LIBS" != "" ;  then
-       DO_ALL=tcl
-fi
-AC_SUBST(DO_ALL)
-dnl
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE

diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog
index 35ff70acb25a3fb38b7583e811faf4dfa554762d..d64d0850a92dcb00abd671a1bdc3b5a0f169a54a 100644 (file)
--- 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 ff7b072b010b64e6cd687c6d53738bfaace63cf7..19b7ee81cae0cac80bffcb39faa6b7b14f95e52c 100644 (file)
--- 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 (file)
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 788ee1611709b432fab8d16732bb685e3598c572..c7960495b6b472ef0c3d970a69e3ebe9bcef08ee 100644 (file)
--- 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 051ed684da99ca73043a82b1e8c7aa9a59f7e595..540b696e88a9a37f1b87799706a6bd8d57fbb2e5 100644 (file)
--- 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 (file)
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

diff --git a/src/kadmin/v5passwdd/ChangeLog b/src/kadmin/v5passwdd/ChangeLog
index 7e745dab653a8027603ffa37ed7be5e5203c6cd8..548e75e87bb726680ff7d10577e0a4e19dbb3fa5 100644 (file)
--- a/src/kadmin/v5passwdd/ChangeLog
+++ b/src/kadmin/v5passwdd/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:02:27 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up

diff --git a/src/kadmin/v5passwdd/Makefile.in b/src/kadmin/v5passwdd/Makefile.in
index df4d0549268aeea7d0685a0ad8a2cbbab4fed3f1..d5abd661153fbb217a79b5965f02e348484fcf1c 100644 (file)
--- a/src/kadmin/v5passwdd/Makefile.in
+++ b/src/kadmin/v5passwdd/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=.
+thisconfigdir=./..
 BUILDTOP=$(REL)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)

diff --git a/src/kadmin/v5passwdd/configure.in b/src/kadmin/v5passwdd/configure.in
deleted file mode 100644 (file)
index 28fc95d..0000000
--- a/src/kadmin/v5passwdd/configure.in
+++ /dev/null
@@ -1,10 +0,0 @@
-AC_INIT(proto_serv.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-AC_CHECK_FUNCS(waitpid vsprintf)
-AC_CHECK_HEADERS(sys/select.h)
-CHECK_SIGNALS
-CHECK_SETJMP
-CHECK_WAIT_TYPE
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE