From b6c55142a3021a802472aad98e612f5429593743 Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Sat, 28 Feb 1998 04:56:29 +0000 Subject: 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 --- src/kadmin/testing/ChangeLog | 6 ++++++ src/kadmin/testing/Makefile.in | 3 ++- src/kadmin/testing/configure.in | 4 ---- src/kadmin/testing/scripts/ChangeLog | 6 ++++++ src/kadmin/testing/scripts/Makefile.in | 2 +- src/kadmin/testing/scripts/configure.in | 13 ------------- src/kadmin/testing/util/ChangeLog | 6 ++++++ src/kadmin/testing/util/Makefile.in | 2 +- src/kadmin/testing/util/configure.in | 12 ------------ 9 files changed, 22 insertions(+), 32 deletions(-) delete mode 100644 src/kadmin/testing/configure.in delete mode 100644 src/kadmin/testing/scripts/configure.in delete mode 100644 src/kadmin/testing/util/configure.in (limited to 'src/kadmin/testing') diff --git a/src/kadmin/testing/ChangeLog b/src/kadmin/testing/ChangeLog index b3237cc..c6eeac1 100644 --- a/src/kadmin/testing/ChangeLog +++ b/src/kadmin/testing/ChangeLog @@ -1,3 +1,9 @@ +Fri Feb 27 23:32:38 1998 Theodore Ts'o + + * 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 * Makefile.in: Remove trailing slash from thisconfigdir. Fix up diff --git a/src/kadmin/testing/Makefile.in b/src/kadmin/testing/Makefile.in index 03dae6b..e803cd0 100644 --- 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 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 ca0fbf0..dedd72d 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 + + * 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 * 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 bd1fcad..ed26c69 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 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 e75958c..2528951 100644 --- 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 + + * 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 * 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 1b45da8..62a98f6 100644 --- 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 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 -- cgit v1.1