summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEzra Peisach <epeisach@mit.edu>2000-10-27 14:53:36 +0000
committerEzra Peisach <epeisach@mit.edu>2000-10-27 14:53:36 +0000
commit8a69681f9773927e82e9c4e4f49d6eee1fc35e15 (patch)
tree66b2c1b6c0203ab1e78759810b63a26b07904f1b /src
parent34a780ee71f16a69c94c6cfc3de52174f9c25581 (diff)
downloadkrb5-8a69681f9773927e82e9c4e4f49d6eee1fc35e15.tar.gz
krb5-8a69681f9773927e82e9c4e4f49d6eee1fc35e15.tar.xz
krb5-8a69681f9773927e82e9c4e4f49d6eee1fc35e15.zip
* 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
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/aclocal.m43
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f216f6eef7..98bfe262dc 100644
--- 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 f00792c7be..267ea43b9c 100644
--- 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.