* doc/autoconf.texi (Input): Clarify role of AC_CONFIG_MACRO_DIR.

* lib/autoconf/general.m4 (AC_CONFIG_MACRO_DIR): Do not check
for the existence of the directory at configure-time.  That's
too late, anyway, and possibly the directory isn't part of the
distribution.  Problem reported by Stefan Seefeld.
This commit is contained in:
Paul Eggert 2006-09-12 18:16:34 +00:00
parent 5816c144c5
commit 2bb44c7941
3 changed files with 12 additions and 9 deletions

View File

@ -1,5 +1,11 @@
2006-09-12 Paul Eggert <eggert@cs.ucla.edu>
* doc/autoconf.texi (Input): Clarify role of AC_CONFIG_MACRO_DIR.
* lib/autoconf/general.m4 (AC_CONFIG_MACRO_DIR): Do not check
for the existence of the directory at configure-time. That's
too late, anyway, and possibly the directory isn't part of the
distribution. Problem reported by Stefan Seefeld.
* lib/m4sugar/m4sh.m4 (_AS_TEST_PREPARE): Avoid bug in UnixWare
7.1.4 /usr/bin/posix/sh described by Tim Rice in
<http://lists.gnu.org/archive/html/bug-autoconf/2006-09/msg00017.html>.

View File

@ -1901,12 +1901,11 @@ local macros can be found using @code{AC_CONFIG_MACRO_DIR}.
@defmac AC_CONFIG_MACRO_DIR (@var{dir})
@acindex{CONFIG_MACRO_DIR}
Future versions of @command{autopoint}, @command{libtoolize},
@command{aclocal} and @command{autoreconf} will use directory
@var{dir} as the location of additional local Autoconf macros. Be
sure to call this macro directly from @file{configure.ac} so that
tools that install macros for @command{aclocal} can find the
declaration before @option{--trace} can be called safely.
Specify @var{dir} as the location of additional local Autoconf macros.
This macro is intended for use by future versions of commands like
@command{autoreconf} that trace macro calls. It should be called
directly from @file{configure.ac} so that tools that install macros for
@command{aclocal} can find the macros' declarations.
@end defmac

View File

@ -1632,9 +1632,7 @@ AC_DEFUN([AC_CONFIG_MACRO_DIR],
[case $1 in
[[\\/]]* | ?:[[\\/]]* ) ac_macro_dir=$1 ;;
*) ac_macro_dir=$srcdir/$1 ;;
esac
test -d "$ac_macro_dir" ||
AC_MSG_ERROR([cannot find macro directory `$1'])
esac[]dnl
])# AC_CONFIG_MACRO_DIR