* aclocal.m4 (CONFIG_RULES): Don't set AUTOCONF, AUTOCONFFLAGS, AUTOHEADER,

AUTOHEADERFLAGS, AUTOCONFINCFLAGS.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 77501629a247a91604b6bfa919fa3cf483764444..39efad33b8435e7fd00d3d784a79f825ff840aa2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * aclocal.m4 (CONFIG_RULES): Don't set AUTOCONF, AUTOCONFFLAGS,
+       AUTOHEADER, AUTOHEADERFLAGS, AUTOCONFINCFLAGS.
+
 2004-06-04  Ken Raeburn  <raeburn@mit.edu>
 
        * aclocal.m4 (KRB5_LIB_AUX): Use $(LIBBASE) instead of $(LIB).

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 010f3d8006d969a15a727e2585958e81691ed60c..85a1e0297e6228e26bc07d995547eaa5b478307d 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -67,30 +67,6 @@ WITH_HESIOD dnl
 KRB5_AC_MAINTAINER_MODE dnl
 AC_ARG_PROGRAM dnl
 dnl
-dnl This selects the correct autoconf file; either the one in our source tree,
-dnl or the one found in the user's path.  $srcdir may be relative, and if so,
-dnl it's relative to the directory of the configure script.  Since the 
-dnl automatic makefile rules to rerun autoconf cd into that directory, the
-dnl right thing happens.
-dnl
-dnl if test -f $srcdir/$ac_reltopdir/util/autoconf/autoconf ; then
-dnl    AUTOCONF=$ac_reltopdir/util/autoconf/autoconf
-dnl    AUTOCONFFLAGS='--macrodir=$(CONFIG_RELTOPDIR)/util/autoconf'
-dnl    AUTOHEADER=$ac_reltopdir/util/autoconf/autoheader
-dnl    AUTOHEADERFLAGS='--macrodir=$(CONFIG_RELTOPDIR)/util/autoconf'
-dnl else
-       AUTOCONF=autoconf
-       AUTOCONFFLAGS=
-       AUTOHEADER=autoheader
-       AUTOHEADERFLAGS=
-       AUTOCONFINCFLAGS="--include"
-dnl fi
-AC_SUBST(AUTOCONF)
-AC_SUBST(AUTOCONFFLAGS)
-AC_SUBST(AUTOCONFINCFLAGS)
-AC_SUBST(AUTOHEADER)
-AC_SUBST(AUTOHEADERFLAGS)
-dnl
 dnl This identifies the top of the source tree relative to the directory 
 dnl in which the configure file lives.
 dnl