From: Theodore Tso Date: Sat, 28 Feb 1998 03:42:34 +0000 (+0000) Subject: Collapse all of lib/kadm5's configure scripts into a single top-level X-Git-Tag: krb5-1.1-beta1~794 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e8ef794c93618276b9c95aec8c6c75676bb3e79d;p=krb5.git Collapse all of lib/kadm5's configure scripts into a single top-level configure script. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10479 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog index d8b3e485e..301bfbfab 100644 --- a/src/lib/kadm5/ChangeLog +++ b/src/lib/kadm5/ChangeLog @@ -1,3 +1,12 @@ +Fri Feb 27 22:30:41 1998 Theodore Ts'o + + * configure.in: Move tests from all of kadm5'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 kadm5 library. + Wed Feb 18 16:13:56 1998 Tom Yu * Makefile.in: Remove trailing slash from thisconfigdir. Fix up diff --git a/src/lib/kadm5/Makefile.in b/src/lib/kadm5/Makefile.in index 58e1f8872..f7a1ed531 100644 --- a/src/lib/kadm5/Makefile.in +++ b/src/lib/kadm5/Makefile.in @@ -1,6 +1,7 @@ thisconfigdir=. BUILDTOP=$(REL)$(U)$(S)$(U) CFLAGS = $(CCOPTS) $(DEFS) +LOCAL_SUBDIRS = clnt srv unit-test ##DOSBUILDTOP = ..\.. diff --git a/src/lib/kadm5/clnt/ChangeLog b/src/lib/kadm5/clnt/ChangeLog index 4f320ee03..ac8ea2f6c 100644 --- a/src/lib/kadm5/clnt/ChangeLog +++ b/src/lib/kadm5/clnt/ChangeLog @@ -1,3 +1,9 @@ +Fri Feb 27 22:32:16 1998 Theodore Ts'o + + * Makefile.in: Changed thisconfigdir to point at the lib/kadm5 + directory, since we've moved all of the configure.in + tests to the toplevel lib/kadm5 configure.in + Wed Feb 18 16:14:27 1998 Tom Yu * Makefile.in: Remove trailing slash from thisconfigdir. Fix up diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in index bee2f1a28..bccc4b16e 100644 --- a/src/lib/kadm5/clnt/Makefile.in +++ b/src/lib/kadm5/clnt/Makefile.in @@ -1,4 +1,4 @@ -thisconfigdir=. +thisconfigdir=./.. BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I$(BUILDTOP)/include/kadm5 diff --git a/src/lib/kadm5/clnt/configure.in b/src/lib/kadm5/clnt/configure.in deleted file mode 100644 index 7594455be..000000000 --- a/src/lib/kadm5/clnt/configure.in +++ /dev/null @@ -1,9 +0,0 @@ -AC_INIT(client_rpc.c) -CONFIG_RULES -AC_PROG_ARCHIVE -AC_PROG_ARCHIVE_ADD -AC_PROG_RANLIB -AC_PROG_INSTALL -KRB5_BUILD_LIBOBJS -KRB5_BUILD_LIBRARY_WITH_DEPS -V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/kadm5/configure.in b/src/lib/kadm5/configure.in index 67fb8e759..1225a0969 100644 --- a/src/lib/kadm5/configure.in +++ b/src/lib/kadm5/configure.in @@ -1,6 +1,5 @@ AC_INIT(configure.in) CONFIG_RULES -AC_CONFIG_SUBDIRS(clnt srv unit-test) AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD AC_PROG_RANLIB @@ -9,5 +8,37 @@ AC_PROG_LEX AC_PROG_AWK AC_CHECK_HEADERS(syslog.h) AC_CHECK_FUNCS(openlog syslog closelog strftime vsprintf) +KRB5_AC_REGEX_FUNCS +dnl +dnl AIX is unusual in that it wants all symbols resolved at link time +dnl Fortunately, it will allow us to link the kdb library now, even if +dnl it is linked again later. +AIX_DB_LIB='' +case $krb5_cv_host in +*-*-aix*) + AIX_DB_LIB="-ldb" + ;; +esac +AC_SUBST(AIX_DB_LIB) +dnl +AC_CANONICAL_HOST +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_CHECK_FUNCS(srand48 srand srandom) +AC_KRB5_TCL +if test "$PERL" = perl -a "$RUNTEST" = runtest -a "$TCL_LIBS" != ""; then + DO_TEST=ok +fi +AC_SUBST(DO_TEST) +dnl KRB5_BUILD_LIBOBJS -V5_AC_OUTPUT_MAKEFILE +KRB5_BUILD_LIBRARY_WITH_DEPS +KRB5_BUILD_PROGRAM +dnl +K5_GEN_MAKEFILE(., libobj) +K5_GEN_MAKEFILE(clnt, lib libobj) +K5_GEN_MAKEFILE(srv, lib libobj) +K5_GEN_MAKEFILE(unit-test) +K5_AC_OUTPUT + diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog index 7db0652b2..d5d7d422e 100644 --- a/src/lib/kadm5/srv/ChangeLog +++ b/src/lib/kadm5/srv/ChangeLog @@ -1,3 +1,13 @@ +Fri Feb 27 22:33:05 1998 Theodore Ts'o + + * Makefile.in: Changed thisconfigdir to point at the lib/kadm5 + directory, since we've moved all of the configure.in + tests to the toplevel lib/kadm5 configure.in. + Instead of adding @LIBS@ to the list of libraries which + should be linked as shared library dependencies, add + @GEN_LIB@ and @AIX_DB_LIB@ which will get expanded if + necessary. + Wed Feb 18 16:15:22 1998 Tom Yu * Makefile.in: Remove trailing slash from thisconfigdir. Fix up diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in index 3b2ae5a59..7cfa585d8 100644 --- a/src/lib/kadm5/srv/Makefile.in +++ b/src/lib/kadm5/srv/Makefile.in @@ -1,4 +1,4 @@ -thisconfigdir=. +thisconfigdir=./.. BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I$(BUILDTOP)/include/kadm5 @HESIOD_DEFS@ @@ -17,7 +17,7 @@ SHLIB_EXPDEPS=\ $(TOPLIBD)/libcrypto$(SHLIBEXT) \ $(TOPLIBD)/libcom_err$(SHLIBEXT) \ $(TOPLIBD)/libdyn$(SHLIBEXT) -SHLIB_EXPLIBS=-lgssrpc -lgssapi_krb5 -lkdb5 -lkrb5 -lcrypto -lcom_err -ldyn @LIBS@ +SHLIB_EXPLIBS=-lgssrpc -lgssapi_krb5 -lkdb5 -lkrb5 -lcrypto -lcom_err -ldyn @GEN_LIB@ @AIX_DB_LIB@ SHLIB_DIRS=-L$(TOPLIBD) SHLIB_RDIRS=$(KRB5_LIBDIR) RELDIR=kadm5/srv diff --git a/src/lib/kadm5/srv/configure.in b/src/lib/kadm5/srv/configure.in deleted file mode 100644 index 6730797a8..000000000 --- a/src/lib/kadm5/srv/configure.in +++ /dev/null @@ -1,31 +0,0 @@ -AC_INIT(server_kdb.c) -CONFIG_RULES -AC_PROG_ARCHIVE -AC_PROG_ARCHIVE_ADD -AC_PROG_RANLIB -AC_PROG_INSTALL -AC_PROG_LEX -AC_PROG_AWK - -save_LIBS="$LIBS" -LIBS=-lgen -AC_CHECK_FUNCS(compile step) -if test "$ac_cv_func_compile" = true ; then - LIBS="$save_LIBS -lgen" -else - LIBS="$save_LIBS" -fi - -AC_CHECK_FUNCS(re_comp re_exec regcomp regexec) -dnl AIX is unusual in that it wants all symbols resolved at link time -dnl Fortunately, it will allow us to link the kdb library now, even if -dnl it is linked again later. -case $krb5_cv_host in -*-*-aix*) - LIBS="$LIBS -ldb" - ;; -esac - -KRB5_BUILD_LIBOBJS -KRB5_BUILD_LIBRARY_WITH_DEPS -V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog index 1f42f2f93..32929cc29 100644 --- a/src/lib/kadm5/unit-test/ChangeLog +++ b/src/lib/kadm5/unit-test/ChangeLog @@ -1,3 +1,9 @@ +Fri Feb 27 22:32:54 1998 Theodore Ts'o + + * Makefile.in: Changed thisconfigdir to point at the lib/kadm5 + directory, since we've moved all of the configure.in + tests to the toplevel lib/kadm5 configure.in + Wed Feb 18 16:15:53 1998 Tom Yu * Makefile.in: Remove trailing slash from thisconfigdir. Fix up diff --git a/src/lib/kadm5/unit-test/Makefile.in b/src/lib/kadm5/unit-test/Makefile.in index 3916cd11c..9b01d49c9 100644 --- a/src/lib/kadm5/unit-test/Makefile.in +++ b/src/lib/kadm5/unit-test/Makefile.in @@ -1,4 +1,4 @@ -thisconfigdir=. +thisconfigdir=./.. BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -DUSE_KADM5_API_VERSION=1 PROG_LIBPATH=-L$(TOPLIBD) diff --git a/src/lib/kadm5/unit-test/configure.in b/src/lib/kadm5/unit-test/configure.in deleted file mode 100644 index d49a2bba7..000000000 --- a/src/lib/kadm5/unit-test/configure.in +++ /dev/null @@ -1,15 +0,0 @@ -AC_INIT(init-test.c) -CONFIG_RULES -AC_CANONICAL_HOST -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_CHECK_FUNCS(srand48 srand srandom) -AC_KRB5_TCL -if test "$PERL" = perl -a "$RUNTEST" = runtest -a "$TCL_LIBS" != ""; then - DO_TEST=ok -fi -AC_SUBST(DO_TEST) -dnl -KRB5_BUILD_PROGRAM -V5_AC_OUTPUT_MAKEFILE