diff options
| author | Tom Yu <tlyu@mit.edu> | 1995-06-16 09:08:15 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1995-06-16 09:08:15 +0000 |
| commit | b725d689606914234616c8d1e480e5fd2f2d2fb1 (patch) | |
| tree | 87b62c4007a6c216120af16cbed6064a248d59d3 /src/aclocal.m4 | |
| parent | e1e481440a639be5bc2aff936c99d3ed60173be2 (diff) | |
| download | krb5-b725d689606914234616c8d1e480e5fd2f2d2fb1.tar.gz krb5-b725d689606914234616c8d1e480e5fd2f2d2fb1.tar.xz krb5-b725d689606914234616c8d1e480e5fd2f2d2fb1.zip | |
* aclocal.m4: Fix new append.out stuff to work with config.status
properly; previously append.out was not getting sucked
into the body of config.status. The EXTRA_RULES macros
are deprecated and should not be used anymore.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6073 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/aclocal.m4')
| -rw-r--r-- | src/aclocal.m4 | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 5e099f9d1..c8dcf5465 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -90,7 +90,7 @@ dnl AC_PUSH_MAKEFILE(): dnl allow stuff to get tacked on to the end of the makefile dnl define(AC_PUSH_MAKEFILE,[dnl -cat>>append.out<<'PUSHEOF' +cat>>append.out<<\PUSHEOF ])dnl define(AC_POP_MAKEFILE,[dnl PUSHEOF @@ -98,7 +98,7 @@ PUSHEOF dnl dnl append subdir rule -- MAKE_SUBDIRS("making",all) dnl -define(_MAKE_SUBDIRS,[ +define(_MAKE_SUBDIRS,[dnl AC_PUSH_MAKEFILE()dnl changequote(<<<,>>>)dnl @@ -113,7 +113,7 @@ $2::<<< changequote([,])dnl AC_POP_MAKEFILE()dnl ])dnl -define(MAKE_SUBDIRS,[ +define(MAKE_SUBDIRS,[dnl _MAKE_SUBDIRS($1, $2, $2)])dnl dnl dnl take saved makefile stuff and put it in the Makefile @@ -145,7 +145,7 @@ SUBDIREOF dnl dnl drop in standard subdirectory rules dnl -define(DO_SUBDIRS,[ +define(DO_SUBDIRS,[dnl MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) MAKE_SUBDIRS("installing",install) @@ -154,7 +154,7 @@ MAKE_SUBDIRS("checking",check) dnl dnl drop in standard rules for all configure files -- CONFIG_RULES dnl -define(CONFIG_RULES,[ +define(CONFIG_RULES,[dnl AC_SET_BUILDTOP dnl WITH_CC dnl WITH_CCOPTS dnl @@ -235,7 +235,7 @@ AC_POP_MAKEFILE()dnl dnl dnl drop in rules for building command tables -- SS_RULES dnl -define(SS_RULES,[ +define(SS_RULES,[dnl AC_PUSH_MAKEFILE()dnl changequote({,})dnl { @@ -591,10 +591,25 @@ dnl V5_OUTPUT_MAKEFILE dnl define(V5_AC_OUTPUT_MAKEFILE, [AC_OUTPUT(pre.out:[$]ac_prepend Makefile.out:Makefile.in post.out:[$]ac_postpend, -cat pre.out Makefile.out post.out > Makefile -[EXTRA_RULES] +[cat pre.out Makefile.out post.out > Makefile +EOF +dnl This should be fixed so that the here document produced gets broken up +dnl into chunks that are the "right" size, in case we run across shells that +dnl are broken WRT large here documents. +>> append.out +cat - append.out >> $CONFIG_STATUS <<\EOF +cat >> Makefile <<\CEOF +# +# rules appended by configure + +EOF +rm append.out +dnl now back to regular config.status generation +cat >> $CONFIG_STATUS <<\EOF +CEOF # sed -f $CONF_FRAGDIR/mac-mf.sed < Makefile > MakeFile -rm pre.out Makefile.out post.out append.out, +rm pre.out Makefile.out post.out +], CONF_FRAGDIR=$srcdir/${ac_config_fragdir} )])dnl dnl dnl CHECK_UTMP: check utmp structure and functions |