From: Ezra Peisach <epeisach@mit.edu>
Date: Mon, 23 Sep 2002 17:56:36 +0000 (+0000)
Subject: configure fails (autoconf 2.52) if aclocal.m4 located in directory above source tree
X-Git-Tag: krb5-1.3-alpha1~358
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=15552078ad57c9ab05eb02c7283390dfad6460fc;p=krb5.git

configure fails (autoconf 2.52) if aclocal.m4 located in directory above source tree

        * aclocal.m4 (V5_SET_TOPDIR): When determining the location of the
        top of the source tree, stop when reach the top and aclocal.m4
        file is located instead of continuing up and out of the tree.

ticket: new

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 579a926b6..9166f1ba3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-23  Ezra Peisach  <epeisach@bu.edu>
+
+	* aclocal.m4 (V5_SET_TOPDIR): When determining the location of the
+	top of the source tree, stop when reach the top and aclocal.m4
+	file is located instead of continuing up and out of the tree.
+
 2002-09-19  Ezra Peisach  <epeisach@bu.edu>
 
 	* aclocal.m4: Put V5_OUTPUT_MAKEFILE back - still in use. Needs to
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 71f6b4460..f7d8a145b 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -22,7 +22,7 @@ esac
 ],[
 ac_reltopdir=
 for x in . .. ../.. ../../.. ../../../..; do
-	if test -r $srcdir/$x/aclocal.m4; then
+	if test "x$ac_reltopdir" = "x" -a -r "$srcdir/$x/aclocal.m4" ; then
 		ac_reltopdir=$x
 	fi
 done