[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
PATCH: allow another subdirectory level from toplevel
From: |
Kelley Cook |
Subject: |
PATCH: allow another subdirectory level from toplevel |
Date: |
Fri, 30 May 2003 10:54:13 -0400 |
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4b) Gecko/20030507 |
Hello,
In the combined tree there are directories like ./winsup/mingw/mingwex
are three levels removed from the toplevel yet do have configure.in.
Autoconf's AC_CONFIG_AUX_DIRS currently only look's two directories
underneath to check for install.sh to discover the toplevel. This tiny
patch allows it to look three levels beneath.
I am also sending the obvious followup patch to m4/auxdir.m4 to the
automake list so the aclocal.m4 comments about AC_CONFIG_AUX_DIRSget
updated with this new functionality.
Kelley Cook
2003-05-30 Kelley Cook <address@hidden>
* lib/autoconf/general.m4 (AC_CONFIG_AUX_DIR_DEFAULT): Allow
$srcdir/../../.. also.
* doc/autoconf.texi: Document it.
diff -ur autoconf-2.57.orig/doc/autoconf.texi autoconf-2.57/doc/autoconf.texi
--- autoconf-2.57.orig/doc/autoconf.texi 2002-12-03 02:16:32.000000000
-0500
+++ autoconf-2.57/doc/autoconf.texi 2003-05-30 09:07:50.000000000 -0400
@@ -1647,8 +1647,8 @@
Automake and Libtool scripts etc.) that are in directory @var{dir}.
These are auxiliary files used in configuration. @var{dir} can be
either absolute or relative to @address@hidden The default is
address@hidden@var{srcdir}} or @address@hidden/..} or
address@hidden@var{srcdir}/../..}, whichever is the first that contains
address@hidden@var{srcdir}}, @address@hidden/..}, @address@hidden/../..},
+or @address@hidden/../../..} whichever is the first that contains
@file{install-sh}. The other files are not checked for, so that using
@code{AC_PROG_INSTALL} does not automatically require distributing the
other auxiliary files. It checks for @file{install.sh} also, but that
diff -ur autoconf-2.57.orig/lib/autoconf/general.m4
autoconf-2.57/lib/autoconf/general.m4
--- autoconf-2.57.orig/lib/autoconf/general.m4 2002-11-12 05:54:46.000000000
-0500
+++ autoconf-2.57/lib/autoconf/general.m4 2003-05-30 09:07:51.000000000
-0400
@@ -1545,10 +1545,11 @@
# AC_CONFIG_AUX_DIR_DEFAULT
# -------------------------
-# The default is `$srcdir' or `$srcdir/..' or `$srcdir/../..'.
+# The default is `$srcdir' or `$srcdir/..' or `$srcdir/../..'
+# or `$srcdir/../../..'.
# There's no need to call this macro explicitly; just AC_REQUIRE it.
AC_DEFUN([AC_CONFIG_AUX_DIR_DEFAULT],
-[AC_CONFIG_AUX_DIRS($srcdir $srcdir/.. $srcdir/../..)])
+[AC_CONFIG_AUX_DIRS($srcdir $srcdir/.. $srcdir/../.. $srcdir/../../..)])
# AC_CONFIG_AUX_DIRS(DIR ...)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- PATCH: allow another subdirectory level from toplevel,
Kelley Cook <=