Makefile.in, configure.in, aclocal.m4: Use AC_CONFIG_FILES instead of

arguments to AC_OUTPUT. This allows for generation of a single Makefile.

config/post.in: When regenerating Makefiles, invoke config.status with
only the Makefile to generate.

This completes the changes.

ticket: 1188

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14898 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index 9166f1ba3c938d895c91307a068fddd81f79f17d..424c1438ce55e037dcec316bc2edb41c92ea0f51 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2002-09-24  Ezra Peisach  <epeisach@bu.edu>
+
+       * Makefile.in (krb5-config): Add argument to invocation of
+       config.status to only generate krb5-config and not any other
+       Makefiles.
+
+       * configure.in (krb5-config): Use AC_CONFIG_FILES to better
+       generate and chmod krb5-config file.
+
+       * aclocal.m4 (V5_AC_OUTPUT_MAKEFILE): Rewrite to use AC_CONFIG_FILES. 
+       krb5_append_frags is now a define instead of a shell variable.
+       
 2002-09-23  Ezra Peisach  <epeisach@bu.edu>
 
        * aclocal.m4 (V5_SET_TOPDIR): When determining the location of the

diff --git a/src/Makefile.in b/src/Makefile.in
index fc841735e1a32916fcdba60e1ecce1f69af4254f..cdc33ae0b009dfc6e0721e64a7c4a707219368bc 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -560,5 +560,5 @@ install-unix::
                $(DESTDIR)$(CLIENT_BINDIR)/krb5-config
 
 krb5-config: $(srcdir)/krb5-config.in $(thisconfigdir)/config.status
-       cd $(thisconfigdir) && $(SHELL) config.status
+       cd $(thisconfigdir) && $(SHELL) config.status krb5-config
 

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index f7d8a145b4caa099f90ed4eb04f5f9e194be13ff..2d9f326c8b3f285cbd6382fef4ad89317d58b813 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -35,8 +35,8 @@ ac_topdir=$srcdir/$ac_reltopdir
 ac_config_fragdir=$ac_reltopdir/config
 krb5_pre_in=$ac_config_fragdir/pre.in
 krb5_post_in=$ac_config_fragdir/post.in
-krb5_prepend_frags=$krb5_pre_in
-krb5_append_frags=$krb5_post_in
+define([krb5_append_frags],[$krb5_post_in])
+echo "Looking for $srcdir/$ac_config_fragdir"
 if test -d "$srcdir/$ac_config_fragdir"; then
   AC_CONFIG_AUX_DIR($ac_config_fragdir)
 else
@@ -563,12 +563,13 @@ dnl
 dnl V5_AC_OUTPUT_MAKEFILE
 dnl
 define(V5_AC_OUTPUT_MAKEFILE,
-[ifelse($1, , ac_v5_makefile_dirs=., ac_v5_makefile_dirs="$1")
-ifelse($2, , filelist="", filelist="$2")
-for x in $ac_v5_makefile_dirs; do
-  filelist="$filelist $x/Makefile:$krb5_prepend_frags:$x/Makefile.in:$krb5_append_frags"
-done
-AC_OUTPUT($filelist)])dnl
+[ifelse($1, , [_V5_AC_OUTPUT_MAKEFILE(.,$2)],[_V5_AC_OUTPUT_MAKEFILE($1,$2)])])
+dnl
+define(_V5_AC_OUTPUT_MAKEFILE,
+[ifelse($2, , ,AC_CONFIG_FILES($2))
+AC_FOREACH([DIR], [$1],dnl
+ [AC_CONFIG_FILES(DIR[/Makefile:$krb5_pre_in:]DIR[/Makefile.in:]krb5_append_frags)])
+K5_AC_OUTPUT])dnl
 dnl
 dnl
 dnl KRB5_SOCKADDR_SA_LEN: define HAVE_SA_LEN if sockaddr contains the sa_len
@@ -968,7 +969,7 @@ AC_REQUIRE([AC_PROG_LN_S])
 AC_REQUIRE([AC_PROG_RANLIB])
 AC_CHECK_PROG(AR, ar, ar, false)
 # add frag for building libraries
-krb5_append_frags=$ac_config_fragdir/lib.in:$krb5_append_frags
+define([krb5_append_frags],[$ac_config_fragdir/lib.in:]krb5_append_frags)
 # null out SHLIB_EXPFLAGS because we lack any dependencies
 SHLIB_EXPFLAGS=
 AC_SUBST(LIBLIST)
@@ -1009,7 +1010,7 @@ AC_REQUIRE([AC_PROG_LN_S])
 AC_REQUIRE([AC_PROG_RANLIB])
 AC_CHECK_PROG(AR, ar, ar, false)
 # add frag for building libraries
-krb5_append_frags=$ac_config_fragdir/lib.in:$krb5_append_frags
+define([krb5_append_frags],[$ac_config_fragdir/lib.in:]krb5_append_frags)
 AC_SUBST(LIBLIST)
 AC_SUBST(LIBLINKS)
 AC_SUBST(LDCOMBINE)
@@ -1031,7 +1032,7 @@ dnl Pull in the necessary stuff to build library objects.
 AC_DEFUN(KRB5_BUILD_LIBOBJS,
 [AC_REQUIRE([KRB5_LIB_AUX])
 # add frag for building library objects
-krb5_append_frags=$ac_config_fragdir/libobj.in:$krb5_append_frags
+define([krb5_append_frags],[$ac_config_fragdir/libobj.in:]krb5_append_frags)
 AC_SUBST(OBJLISTS)
 AC_SUBST(STOBJEXT)
 AC_SUBST(SHOBJEXT)

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 1ff8bd01293a4a86006edb78537189fa703b24f9..44a85667adb8935ab95705ebd9c583d05c600727 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-24  Ezra Peisach  <epeisach@bu.edu>
+
+       * post.in (Makefile): Run config.status to generate only the
+       specific makefile that changed.
+
 2002-09-24  Ken Raeburn  <raeburn@mit.edu>
 
        * pre.in (.et.c, .et.h): Change rules to only update the desired

diff --git a/src/config/post.in b/src/config/post.in
index ddd2e6661c38cc06e02dbd45dfd811a8bdcb0088..c364da62d11a014799fef8d331f0363dd4d9e56d 100644 (file)
--- a/src/config/post.in
+++ b/src/config/post.in
@@ -89,7 +89,7 @@ Makefiles-prerecurse:: Makefile
 
 Makefile: $(srcdir)/Makefile.in $(thisconfigdir)/config.status \
                $(SRCTOP)/config/pre.in $(SRCTOP)/config/post.in
-       cd $(thisconfigdir) && $(SHELL) config.status
+       cd $(thisconfigdir) && $(SHELL) config.status $(mydir)/Makefile
 $(thisconfigdir)/config.status: $(srcdir)/$(thisconfigdir)/configure
        cd $(thisconfigdir) && $(SHELL) config.status --recheck
 $(srcdir)/$(thisconfigdir)/configure: $(srcdir)/$(thisconfigdir)/configure.in \

diff --git a/src/configure.in b/src/configure.in
index 3802ad340ba09a5635f501948c1188733758545c..233ec1d02138fa4a6ffa8b928bbfb6c253330ae3 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,5 @@
-AC_INIT(aclocal.m4)
+AC_INIT
+AC_CONFIG_SRCDIR([aclocal.m4])
 dnl
 dnl autoconf 2.49 defaults to a /dev/null cache file, which is what we
 dnl do not want for performance reasons. 
@@ -78,9 +79,7 @@ if test -n "$KRB4_LIB"; then
   AC_CONFIG_SUBDIRS(krb524)
 fi
 AC_CONFIG_SUBDIRS(kdc kadmin slave clients appl tests)
-AC_OUTPUT_COMMANDS([chmod +x krb5-config])
-AC_OUTPUT_COMMANDS([echo timestamp > krb5-stamp-h])
-K5_GEN_FILE(krb5-config)
+AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config])
 K5_GEN_MAKEFILE(.)
 K5_GEN_MAKEFILE(util)
 K5_GEN_MAKEFILE(util/send-pr)