diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2002-09-19 20:58:51 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2002-09-19 20:58:51 +0000 |
| commit | d66cb42071adac7b7b595466a47f52bd9bfed163 (patch) | |
| tree | d893aa24b13bd58ef13b0d2371df2f4647364564 /src | |
| parent | 1ab9fc619272e0cda21c9e3dfe1b7abe7998d001 (diff) | |
| download | krb5-d66cb42071adac7b7b595466a47f52bd9bfed163.zip krb5-d66cb42071adac7b7b595466a47f52bd9bfed163.tar.gz krb5-d66cb42071adac7b7b595466a47f52bd9bfed163.tar.bz2 | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/aclocal.m4 | 10 | ||||
| -rw-r--r-- | src/config/ChangeLog | 4 | ||||
| -rw-r--r-- | src/config/post.in | 2 |
4 files changed, 20 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fbbffa6..579a926 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 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 to use AC_CONFIG_FILES. Remove unused V5_OUTPUT_MAKEFILE. diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 07b28dd..71f6b44 100644 --- 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 afca5f3..9da9700 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,5 +1,9 @@ 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 specific makefile that changed. diff --git a/src/config/post.in b/src/config/post.in index c364da6..ddd2e66 100644 --- 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 \ |