From: Theodore Tso Date: Sat, 28 Feb 1998 04:56:29 +0000 (+0000) Subject: Collapse all configure.in files under the kadmin directory into the X-Git-Tag: krb5-1.1-beta1~792 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b6c55142a3021a802472aad98e612f5429593743;p=krb5.git 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 ec2435212..e9c10c3c4 100644 --- a/src/kadmin/ChangeLog +++ b/src/kadmin/ChangeLog @@ -1,3 +1,12 @@ +Fri Feb 27 23:32:38 1998 Theodore Ts'o + + * 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 * Makefile.in (thisconfigdir): Remove trailing slash. diff --git a/src/kadmin/Makefile.in b/src/kadmin/Makefile.in index a8b035560..b6ced7422 100644 --- 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 2cf4ed6f8..9bf1d76f0 100644 --- a/src/kadmin/cli/ChangeLog +++ b/src/kadmin/cli/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:54:11 1998 Tom Yu * 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 c055dd6e0..2ed5c95e9 100644 --- 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 index d843fc37e..000000000 --- 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 be60003d0..e849ccc87 100644 --- 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 f397515b7..4f89fdd17 100644 --- a/src/kadmin/dbutil/ChangeLog +++ b/src/kadmin/dbutil/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:55:06 1998 Tom Yu * Makefile.in: Remove trailing slash from thisconfigdir. Fix up diff --git a/src/kadmin/dbutil/Makefile.in b/src/kadmin/dbutil/Makefile.in index f49072bea..48aed7059 100644 --- 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 index f2e6dd2f8..000000000 --- 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 index fe426e878..000000000 --- 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 8ae3565ee..54e4e71fa 100644 --- a/src/kadmin/ktutil/ChangeLog +++ b/src/kadmin/ktutil/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:56:16 1998 Tom Yu * Makefile.in: Remove trailing slash from thisconfigdir. Fix up diff --git a/src/kadmin/ktutil/Makefile.in b/src/kadmin/ktutil/Makefile.in index 525524d3a..44cc3b8bf 100644 --- 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 index 90987d44b..000000000 --- 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 fba27eb96..081562663 100644 --- a/src/kadmin/passwd/ChangeLog +++ b/src/kadmin/passwd/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:56:44 1998 Tom Yu * Makefile.in: Remove trialing slash from thisconfigdir. Fix up diff --git a/src/kadmin/passwd/Makefile.in b/src/kadmin/passwd/Makefile.in index 704104463..9b634eec0 100644 --- 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 index cd597bbc3..000000000 --- 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 cb40a0ef8..6f6744746 100644 --- 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 + + * 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 * 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 fd7fd7de5..465889b2e 100644 --- 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 index 609206fea..000000000 --- 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 77cf0df94..fa9506e96 100644 --- a/src/kadmin/server/ChangeLog +++ b/src/kadmin/server/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 25 14:00:32 1998 Ezra Peisach * 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 b33ab28ab..db1ce7f10 100644 --- 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 index 17d9f9009..000000000 --- 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 b3237ccc0..c6eeac114 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 03dae6bd0..e803cd090 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 60dd52a5a..000000000 --- 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 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 + + * 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 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 diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog index e75958cdc..2528951e5 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 1b45da888..62a98f613 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 6c6d32ffd..000000000 --- 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 35ff70acb..d64d0850a 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 + + * 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 * Makefile.in: Remove trailing slash from thisconfigdir. Fix up diff --git a/src/kadmin/v4server/Makefile.in b/src/kadmin/v4server/Makefile.in index ff7b072b0..19b7ee81c 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 9af805d9b..000000000 --- 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 788ee1611..c7960495b 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 + + * 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 * 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 051ed684d..540b696e8 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 a41c1c46f..000000000 --- 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 7e745dab6..548e75e87 100644 --- a/src/kadmin/v5passwdd/ChangeLog +++ b/src/kadmin/v5passwdd/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:02:27 1998 Tom Yu * Makefile.in: Remove trailing slash from thisconfigdir. Fix up diff --git a/src/kadmin/v5passwdd/Makefile.in b/src/kadmin/v5passwdd/Makefile.in index df4d05492..d5abd6611 100644 --- 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 index 28fc95dac..000000000 --- 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