|
Subject: PATCH: allow another subdirectory level from toplevel Newsgroups: gmane.comp.sysutils.autoconf.patches Date: 2003-05-30 14:54:13 GMT (5 years, 13 weeks, 10 hours and 51 minutes ago) 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 <kelleycook <at> wideopenwest.com>
* 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 @file{@var{srcdir}}. The default is
- <at> file{@var{srcdir}} or @file{@var{srcdir}/..} or
- <at> file{@var{srcdir}/../..}, whichever is the first that contains
+@file{@var{srcdir}}, @file{@var{srcdir}/..}, @file{@var{srcdir}/../..},
+or @file{@var{srcdir}/../../..} 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 ...)
|
|
|