From: Theodore Tso <tytso@mit.edu>
Date: Mon, 2 Mar 1998 03:28:15 +0000 (+0000)
Subject: pre.in: Define AUTOCONF and CONFIG_RELTOPDIR from the autoconf
X-Git-Tag: krb5-1.1-beta1~782
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2957a895189b053a41ccc9821ec6d1ba4266f562;p=krb5.git

pre.in: Define AUTOCONF and CONFIG_RELTOPDIR from the autoconf
	substitution macros.

post.in: Fix the call to autoconf to use $(AUTOCONF) and
	$(CONFIG_RELTOPDIR), so that configure regeneration rule works
	even in a subdirectory below the configure script.

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

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index fca25b50c..2f5d63ab0 100644
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,12 @@
+Sun Mar  1 22:25:34 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* pre.in: Define AUTOCONF and CONFIG_RELTOPDIR from the autoconf
+ 		substitution macros.
+
+	* post.in: Fix the call to autoconf to use $(AUTOCONF) and
+	 	$(CONFIG_RELTOPDIR), so that configure regeneration rule
+	 	works even in a subdirectory below the configure script.
+
 Wed Feb 18 17:31:52 1998  Tom Yu  <tlyu@mit.edu>
 
 	* windows.in: Rewrite some of the directory syntax.
diff --git a/src/config/post.in b/src/config/post.in
index fef53e46e..88154b267 100644
--- a/src/config/post.in
+++ b/src/config/post.in
@@ -49,9 +49,8 @@ $(thisconfigdir)/config.status: $(srcdir)/$(thisconfigdir)/configure
 $(srcdir)/$(thisconfigdir)/configure: $(srcdir)/$(thisconfigdir)/configure.in \
 		$(SRCTOP)/aclocal.m4
 	cd $(srcdir)/$(thisconfigdir) && \
-		$(SHELL) $(SRCTOP)/util/autoconf/autoconf \
-			--localdir=$(BUILDTOP) \
-			--macrodir=$(BUILDTOP)/util/autoconf
+		$(SHELL) $(AUTOCONF) --localdir=$(CONFIG_RELTOPDIR) \
+			--macrodir=$(CONFIG_RELTOPDIR)/util/autoconf
 
 all-recurse clean-recurse distclean-recurse install-recurse check-recurse Makefiles-recurse:
 	@case "`echo 'x$(MFLAGS)'|sed -e 's/^x//' -e 's/ --.*$$//'`" \
diff --git a/src/config/pre.in b/src/config/pre.in
index c8fca5b08..1002ead15 100644
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -68,6 +68,7 @@ SUBDIRS = @subdirs@ $(LOCAL_SUBDIRS)
 srcdir = @srcdir@
 SRCTOP = @srcdir@/$(BUILDTOP)
 VPATH = @srcdir@
+CONFIG_RELTOPDIR = @CONFIG_RELTOPDIR@
 
 CPPFLAGS = @CPPFLAGS@
 DEFS = @DEFS@ $(CPPFLAGS)
@@ -161,6 +162,7 @@ AWK = @AWK@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 YACC = @YACC@
+AUTOCONF = @AUTOCONF@
 
 HOST_TYPE = @HOST_TYPE@
 SHEXT = @SHEXT@