summaryrefslogtreecommitdiffstats
path: root/src/kadmin/testing/scripts
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1998-02-28 04:56:29 +0000
committerTheodore Tso <tytso@mit.edu>1998-02-28 04:56:29 +0000
commitb6c55142a3021a802472aad98e612f5429593743 (patch)
tree0eb9ab06b25c0f5e1be3095df26ef4ddca19171c /src/kadmin/testing/scripts
parenta95be5fbe58ebd38bce7edc734e2ce3cbbb0a580 (diff)
downloadkrb5-b6c55142a3021a802472aad98e612f5429593743.tar.gz
krb5-b6c55142a3021a802472aad98e612f5429593743.tar.xz
krb5-b6c55142a3021a802472aad98e612f5429593743.zip
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
Diffstat (limited to 'src/kadmin/testing/scripts')
-rw-r--r--src/kadmin/testing/scripts/ChangeLog6
-rw-r--r--src/kadmin/testing/scripts/Makefile.in2
-rw-r--r--src/kadmin/testing/scripts/configure.in13
3 files changed, 7 insertions, 14 deletions
diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog
index ca0fbf037..dedd72d44 100644
--- 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 bd1fcadae..ed26c6902 100644
--- 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
index 8aaad2f5d..000000000
--- 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