Put back in the V5_OUTPUT_MAKEFILE. Revert the config.status invocation

until this code can be rewriten to use AC_CONFIG_FILES.

ticket: 1188
state: open

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

diff --git a/src/ChangeLog b/src/ChangeLog
index fbbffa6b940efc2c3d3bd9d8a8c8c4cab027781e..579a926b6ca498b3dcd89ff45e3dc189d994e32e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-19  Ezra Peisach  <epeisach@bu.edu>
+
+       * aclocal.m4: Put V5_OUTPUT_MAKEFILE back - still in use. Needs to
+       be rewritten.
+
 2002-09-19  Ezra Peisach  <epeisach@bu.edu>
 
        * aclocal.m4 (K5_AC_OUTPUT, K5_GEN_MAKEFILE, K5_GEN_FILE): Rewrite

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 07b28dd052f82bc57c1f53b641ad1453a389311e..71f6b44600dc2c2b7fb3df13e2243d86e8df0027 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -560,6 +560,16 @@ AC_CONFIG_COMMANDS([krb5_config_prefix], [], dnl
  krb5_post_in=$krb5_post_in])
 AC_OUTPUT])dnl
 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
+dnl
 dnl
 dnl KRB5_SOCKADDR_SA_LEN: define HAVE_SA_LEN if sockaddr contains the sa_len
 dnl component

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index afca5f39f372cb7959863aa275f1210f0ed14339..9da9700d87caef53ca3fa99c13cfb62423536595 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-19  Ezra Peisach  <epeisach@bu.edu>
+
+       * post.in (Makefile): Revert change until aclocal.m4 fixed.
+
 2002-09-19  Ezra Peisach  <epeisach@bu.edu>
 
        * post.in (Makefile): Run config.status to generate only the

diff --git a/src/config/post.in b/src/config/post.in
index c364da62d11a014799fef8d331f0363dd4d9e56d..ddd2e6661c38cc06e02dbd45dfd811a8bdcb0088 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 $(mydir)/Makefile
+       cd $(thisconfigdir) && $(SHELL) config.status
 $(thisconfigdir)/config.status: $(srcdir)/$(thisconfigdir)/configure
        cd $(thisconfigdir) && $(SHELL) config.status --recheck
 $(srcdir)/$(thisconfigdir)/configure: $(srcdir)/$(thisconfigdir)/configure.in \