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

* lib/autoconf/general.m4 (AC_SITE_LOAD): Do not overwrite "$@"

Browse Source 
here, this macro is expanded by AC_INIT.  Fixes 2.60 regression.
* tests/base.at (configure arguments): New test.
* THANKS: Update.
Report by Olaf Lenz.
This commit is contained in:
Ralf Wildenhues 2007-08-21 20:23:16 +00:00
parent 220d051d92
commit 673d7738a4
4 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2007-08-21 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* lib/autoconf/general.m4 (AC_SITE_LOAD): Do not overwrite "$@"
here, this macro is expanded by AC_INIT. Fixes 2.60 regression.
* tests/base.at (configure arguments): New test.
* THANKS: Update.
Report by Olaf Lenz.
* lib/autoconf/general.m4 (_AC_ENABLE_IF): Expand macro
arguments in comment.
Report by Vincent Torri <vtorri at univ minus evry dot fr>.

1
THANKS
View File

@ -159,6 +159,7 @@ Nishio Futoshi fut_nis@d3.dion.ne.jp
Noah Elliott elliott@hera.llnl.gov
Noah Friedman friedman@gnu.ai.mit.edu
Noah Misch noah@cs.caltech.edu
Olaf Lenz olenz@fias.uni-frankfurt.de
Oliver Kiddle opk@zsh.org
Olly Betts olly@survex.com
Ossama Othman ossama@debian.org

19
lib/autoconf/general.m4
View File

@ -1805,20 +1805,23 @@ AU_DEFUN([AC_VALIDATE_CACHED_SYSTEM_TUPLE], [])
# AC_SITE_LOAD
# ------------
# Look for site or system specific initialization scripts.
# Look for site- or system-specific initialization scripts.
m4_define([AC_SITE_LOAD],
[# Prefer explicitly selected file to automatically selected ones.
[# Prefer an explicitly selected file to automatically selected ones.
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
set x "$CONFIG_SITE"
ac_site_file1=$CONFIG_SITE
elif test "x$prefix" != xNONE; then
set x "$prefix/share/config.site" "$prefix/etc/config.site"
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
else
set x "$ac_default_prefix/share/config.site" \
"$ac_default_prefix/etc/config.site"
ac_site_file1=$ac_default_prefix/share/config.site
ac_site_file2=$ac_default_prefix/etc/config.site
fi
shift
for ac_site_file
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "$ac_site_file" = NONE && continue
if test -r "$ac_site_file"; then
AC_MSG_NOTICE([loading site script $ac_site_file])
sed 's/^/| /' "$ac_site_file" >&AS_MESSAGE_LOG_FD

18
tests/base.at
View File

@ -289,3 +289,21 @@ AT_CHECK([echo Hello | top_srcdir=$abs_top_srcdir ./configure | grep -v 'configu
AT_CHECK([echo Hello | top_srcdir=$abs_top_srcdir ./configure --silent])
AT_CLEANUP
## ------------------- ##
## configure arguments ##
## ------------------- ##
AT_SETUP([configure arguments])
AT_DATA([configure.ac],
[[AC_INIT
echo "$@"
]])
AT_CHECK_AUTOCONF
AT_CHECK_CONFIGURE([FOO=bar --enable-baz --without-zork --silent], [0], [stdout], [ignore])
AT_CHECK([grep 'FOO=bar --enable-baz --without-zork --silent' stdout], [0], [ignore], [ignore])
AT_CLEANUP