mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-01-18 10:45:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

* lib/autoconf/general.m4 (AC_REQUIRE_AUX_FILE): New empty macro.

Browse Source 
(AC_CANONICAL_BUILD): Call it to require config.sub and config.guess.
* lib/autoconf/programs.m4 (AC_PROG_INSTALL): Likewise for install-sh.
* doc/autoconf.texi (Input): Document AC_REQUIRE_AUX_FILE.
* lib/autom4te.in (Automake-preselections): Preselect
AC_REQUIRE_AUX_FILE.  Automake 1.10 will trace it.
This commit is contained in:
Alexandre Duret-Lutz 2004-08-03 22:06:09 +00:00
parent a86400c06f
commit cc27a4753f
6 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2004-08-04 Alexandre Duret-Lutz <adl@gnu.org>
* lib/autoconf/general.m4 (AC_REQUIRE_AUX_FILE): New empty macro.
(AC_CANONICAL_BUILD): Call it to require config.sub and config.guess.
* lib/autoconf/programs.m4 (AC_PROG_INSTALL): Likewise for install-sh.
* doc/autoconf.texi (Input): Document AC_REQUIRE_AUX_FILE.
* lib/autom4te.in (Automake-preselections): Preselect
AC_REQUIRE_AUX_FILE. Automake 1.10 will trace it.
2004-08-02 Alexandre Duret-Lutz <adl@gnu.org>
* lib/autom4te.in (Automake-preselections): Preselect

3
NEWS
View File

@ -13,6 +13,9 @@
New macros that detect programs whose name is prefixed with the
target type, if the build type and target type are different.
** AC_REQUIRE_AUX_FILE
New trace macro that declares expected auxiliary files.
* Major changes in Autoconf 2.59a
** AC_PROG_GREP

10
doc/autoconf.texi
View File

@ -1765,6 +1765,16 @@ The auxiliary directory should not be named @file{aux} for portability
to MS-DOS, because the filename @file{aux} is reserved under MS-DOS.
@end defmac
@defmac AC_REQUIRE_AUX_FILE (@var{file})
@acindex{REQUIRE_AUX_FILE}
Declares that @var{file} is expected in the directory defined above. In
Autoconf proper, this macro does nothing: its sole purpose is to be
traced by third-party tools to produce a list of expected auxiliary
files. For instance it is called by macros like @code{AC_PROG_INSTALL}
(@pxref{Particular Programs}) or @code{AC_CANONICAL_BUILD}
(@pxref{Canonicalizing}) to register the auxiliary files they need.
@end defmac
Similarly, packages that use @command{aclocal} should declare where
local macros can be found using @code{AC_CONFIG_MACRO_DIR}.

15
lib/autoconf/general.m4
View File

@ -1563,6 +1563,19 @@ fi
## --------------------- ##
## Requiring aux files. ##
## --------------------- ##
# AC_REQUIRE_AUX_FILE(FILE)
# -------------------------
# This macro does nothing, it's a hook to be read with `autoconf --trace'.
# It announces FILE is required in the auxdir.
m4_define([AC_REQUIRE_AUX_FILE],
[AS_LITERAL_IF([$1], [],
[AC_FATAL([$0: requires a literal argument])])])
## ----------------------------------- ##
## Getting the canonical system type. ##
@ -1596,6 +1609,8 @@ AC_SUBST([$1_os],
# ------------------
AC_DEFUN_ONCE([AC_CANONICAL_BUILD],
[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
AC_REQUIRE_AUX_FILE([config.sub])dnl
AC_REQUIRE_AUX_FILE([config.guess])dnl
m4_divert_text([HELP_CANON],
[[
System types:

1
lib/autoconf/programs.m4
View File

@ -512,6 +512,7 @@ AN_MAKEVAR([INSTALL], [AC_PROG_INSTALL])
AN_PROGRAM([install], [AC_PROG_INSTALL])
AC_DEFUN([AC_PROG_INSTALL],
[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
AC_REQUIRE_AUX_FILE([install-sh])dnl
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:

1
lib/autom4te.in
View File

@ -48,6 +48,7 @@ args: --preselect AC_CONFIG_LIBOBJ_DIR
args: --preselect AC_CONFIG_LINKS
args: --preselect AC_INIT
args: --preselect AC_LIBSOURCE
args: --preselect AC_REQUIRE_AUX_FILE
args: --preselect AC_SUBST
args: --preselect AM_AUTOMAKE_VERSION
args: --preselect AM_CONDITIONAL