* post.in (Makefile): When running autoconf, use AUTOCONFFLAGS

	instead of always specificying the trees macrodir.

	* pre.in (AUTOCONFFLAGS): Add as flags to pass to autoconf.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index f216f6eef72b5c43e9c6e4ba2c5e0eb70a5802b9..98bfe262dc3e29af1734b8c08e3a97dc3eb6d0a9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-27  Ezra Peisach  <epeisach@mit.edu>
+
+       * aclocal.m4 (ac_config_fragdir): Set AUTOCONFFLAGS to use the
+       local util/autoconf macrodir if we are using the shipped autoconf.
+
 2000-08-30  Tom Yu  <tlyu@mit.edu>
 
        * aclocal.m4 (LIBLINKS): Fix appending of $EXTRA_LIB_TARGETS to

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index f00792c7be8753da63975abdc08d842de93ec3d4..267ea43b9c4f50e21ae6d5738a1b07b6660eac9d 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -52,10 +52,13 @@ dnl right thing happens.
 dnl
 if test -f $srcdir/$ac_reltopdir/util/autoconf/autoconf ; then
        AUTOCONF=$ac_reltopdir/util/autoconf/autoconf
+       AUTOCONFFLAGS="--macrodir=$(CONFIG_RELTOPDIR)/util/autoconf"
 else
        AUTOCONF=autoconf
+       AUTOCONFFLAGS=
 fi
 AC_SUBST(AUTOCONF)
+AC_SUBST(AUTOCONFFLAGS)
 dnl
 dnl This identifies the top of the source tree relative to the directory 
 dnl in which the configure file lives.