aclocal.m4: Remove unused variables BUILDTOP and SRCTOP (now defined

	in the individual Makefile.in file.  Define @AUTOCONF@ to have the
	appropriate pathname (either internal to our source tree, or in the
	user's path).  Set @CONFIG_RELTOPDIR@ to contain the relative path to
	the top of the build directory from the directory containing the
	configure script.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 4a84275e45261c1a5d501c3cef1803b25d8a83c6..53d7017aaddcde32b08d56b340795bb7556a089d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+Sun Mar  1 22:22:50 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * aclocal.m4: Remove unused variables BUILDTOP and SRCTOP (now
+               defined in the individual Makefile.in file.  Define
+               @AUTOCONF@ to have the appropriate pathname (either
+               internal to our source tree, or in the user's path).  Set
+               @CONFIG_RELTOPDIR@ to contain the relative path to the top
+               of the build directory from the directory containing the
+               configure script.
+
 Fri Feb 27 21:43:41 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * aclocal.m4 (KRB5_AC_REGEX_FUNCS): Take the regular expression

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 853e593ad9b98014eca6e48096cf7a8bc2de5d4e..003028fb3a74c36fc55aa270160a8c2758c12dfe 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -21,8 +21,6 @@ krb5_pre_in=$ac_config_fragdir/pre.in
 krb5_post_in=$ac_config_fragdir/post.in
 krb5_prepend_frags=$krb5_pre_in
 krb5_append_frags=$krb5_post_in
-BUILDTOP=$ac_reltopdir
-SRCTOP=$srcdir/$ac_reltopdir
 if test -d "$srcdir/$ac_config_fragdir"; then
   AC_CONFIG_AUX_DIR($ac_config_fragdir)
 else
@@ -45,6 +43,25 @@ WITH_NETLIB dnl
 WITH_HESIOD dnl
 KRB_INCLUDE 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
+if test -f $srcdir/$ac_reltopdir/util/autoconf/autoconf ; then
+       AUTOCONF=$ac_reltopdir/util/autoconf/autoconf
+else
+       AUTOCONF=autoconf
+fi
+AC_SUBST(AUTOCONF)
+dnl
+dnl This identifies the top of the source tree relative to the directory 
+dnl in which the configure file lives.
+dnl
+CONFIG_RELTOPDIR=$ac_reltopdir
+AC_SUBST(CONFIG_RELTOPDIR)
 AC_SUBST(subdirs)
 ])dnl