[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
M4 syntax $11 vs. ${11}
|
From: |
Eric Blake |
|
Subject: |
M4 syntax $11 vs. ${11} |
|
Date: |
Thu, 18 Jan 2007 07:50:09 -0700 |
|
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.0.9) Gecko/20061207 Thunderbird/1.5.0.9 Mnenhy/0.7.4.666 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
This email describes an issue that affects multiple software releases; I
have some patches, but they are not in a finalized state. Rather, I am
inviting some feedback to see if I am moving in the correct direction.
First, some background. The Austin Group approved XCU ERN 111 for
inclusion into the next revision of POSIX
(http://www.opengroup.org/austin/aardvark/latest/xcubug2.txt). I
originally filed ERN 111 because GNU M4 was not POSIX compliant (M4 1.4.x
treats $11 in a macro definition as the eleventh parameter, but POSIX 2001
requires it to treat it as the first parameter concatenated with 1), but I
did not have to perpetually maintain yet one more POSIXLY_CORRECT bit of
code in M4. The Austin Group agreed that the GNU extension of supporting
more than nine parameters is, in abstract, worth supporting, but asked for
a change in syntax:
Add to the Extended Description at line 22420:
"The string "${" produces unspecified behavior."
Add a paragraph to Rationale, after line 22607:
"Historic System V based behavior treated "${" in a macro definition as
two literal characters. However, this sequence is left unspecified so
that implementations may offer extensions such as ${11} meaning the
eleventh positional parameter. Macros can still be defined with
appropriate uses of nested quoting to result in a literal ${ in the output
after rescanning removes the nested quotes."
Now, for the explanation of the patches. I am hoping to release M4 1.4.9
(stable) and 1.9b (beta quality, with known bugs and dependent on
unreleased libtool, a precursor to a stable 2.0) in the next month.
With 1.9b, I would like to implement the resolution of XCU ERN 111. That
is, I plan on adding support for ${11}, so that the GNU extension of more
than 9 parameters is still alive (and in fact, I hope to borrow from shell
syntax for other extensions such as ${1-default}). I also plan on making
$11 obey POSIX semantics if POSIXLY_CORRECT, else obey 1.4.x semantics but
issue a warning that obsolete syntax was encountered. Then, after a
deprecation period, M4 2.1 could remove the POSIXLY_CORRECT check and
always treat $11 the way POSIX requires.
On the other hand, since 1.4.9 is stable, I can't break the existing
definition of $11, nor introduce ${11} as an extension. I can, however,
add warnings where we know the current syntax is in conflict with POSIX,
and that a future M4 release (1.9b or 2.0) will change semantics, so long
as those warnings don't interfere with existing M4 scripts.
Now for the problem - there are a number of existing M4 users that
currently have raw '${' in their macro definitions. If a user installs
autoconf 2.61 and then upgrades to M4 1.9b, things that used to work will
be silently broken because M4 will be trying to parse that as a parameter
expansion where it used to output literal characters. So we need a way to
help users detect these problems before they happen. Furthermore,
autom4te invokes 'm4 -E', which generally means if M4 prints a warning, it
will also exit immediately with a failure status.
My attached patches are a starting point. First, for M4 1.4.9, I added a
patch that adds a non-fatal warning, one that even 'm4 -E' won't choke on,
to see where the problem spots are, while still producing the same output
on stdout as 1.4.8:
$ m4-1.4.8a
define(`foo', `${1}')foo
- -> ${1}
=> m4:stdin:1: Warning: raw `${' in defn of foo will change semantics
Then I ran this patch with CVS automake and autoconf, and corrected all
the warnings that appeared until I could run the autoconf testsuite
without errors. These fixes to the autotools are critical before the next
release - if they are not fixed, then we still have the problem that a
user who installs autoconf 2.62, then upgrades to m4 1.9b, will have a
broken autoconf because the uses of raw ${ are interpreted differently.
Now for my questions. As it stands, the attached M4 patch is incomplete:
it makes the warning invariant, and always prints without changing exit
status, regardless of -E (make warnings fatal) or -Q (don't warn). That
is unacceptable, because of the number of warnings produced by autoconf
2.61 and automake 1.10, so I need some sort of compromise. I could add a
new option --warn-syntax to M4, but that seems a bit weak, since you would
then have to configure autoconf with M4='m4 --warn-syntax' to enable the
warning message to spot the potential pitfalls that would occur by
upgrading to M4 1.9b. I could also make M4 1.4.9 start parsing the
WARNINGS environment variable, and if it sees 'all' or 'syntax', then emit
the warning. This would be less likely to trip up ordinary users, but
slightly easier to exercise when testing a set of .m4 files for portability.
My other thought is that we can use m4sugar to our advantage. Basically,
until M4 2.0 is in wide use, and autoconf 3.0 is released which requires
M4 2.0 (and no longer supports 1.4.x), the syntax change in 1.9b means
that the use of raw ${ in autoconf macro definitions is no longer legal.
So would it be worth trying to change the m4sugar definition of m4_define
to something like the following:
define([m4_define], [regexp([$2], [\$][\{],
[m4_warning([syntax: raw [$]{ in [$1] will change semantics])])builtin(
[define], address@hidden)])
that lets autoconf 2.62 warn the user about the portability pitfall, even
if they are still using M4 1.4.8? Or even one step fancier:
define([m4_define], [regexp([$2], [\$][\{],
[m4_warning([syntax: raw [$]{ in [$1] will change semantics])])builtin(
[define], [$1], patsubst([[$2]], [\$\{], [[$]{]))])
Although the latter may lead to the occasional overquoted $ in output, at
least the warning points the user in the correct location to fix it.
Anyways, here are the patches in their current state:
m4:
2007-01-18 Eric Blake <address@hidden>
* src/builtin.c (define_user_macro): Warn on raw ${ in macro
definitions.
autoconf:
2007-01-18 Eric Blake <address@hidden>
* lib/m4sugar/m4sh.m4 (_AS_BOURNE_COMPATIBLE)
(_AS_DETECT_BETTER_SHELL, AS_UNSET, _AS_PATH_SEPARATOR_PREPARE)
(AS_TMPDIR, AS_VAR_GET, AS_VAR_TEST_SET): Avoid ${ in macro
definitions, since POSIX changed to allow M4 2.0 to give it new
semantics.
* lib/autoconf/general.m4 (_AC_INIT_DEFAULTS)
(_AC_INIT_PARSE_ARGS, _AC_ENABLE_IF_ACTION, _AC_ARG_VAR_STORE)
(_AC_ARG_VAR_VALIDATE, AC_CANONICAL_TARGET, _AC_CACHE_DUMP)
(_AC_LIBOBJS_NORMALIZE): Likewise.
* lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE)
(_AC_OUTPUT_FILE, _AC_OUTPUT_CONFIG_STATUS)
(_AC_OUTPUT_MAIN_LOOP, AC_OUTPUT_MAKE_DEFS): Likewise.
* lib/autoconf/autotest.m4 (AC_CONFIG_TESTDIR): Likewise.
* lib/autoconf/programs.m4 (_AC_CHECK_PROG, AC_PATH_TOOL)
(AC_CHECK_TOOL, _AC_FEATURE_CHECK_LENGTH, AC_PROG_INSTALL)
(AC_PROG_MKDIR_P, _AC_PROG_LEX_YYTEXT_DECL, AC_PROG_MAKE_SET):
Likewise.
* lib/autoconf/lang.m4 (_AC_COMPILER_EXEEXT_DEFAULT): Likewise.
* lib/autoconf/c.m4 (AC_PROG_CC, _AC_PROG_CC_G, AC_PROG_CC_C_O)
(_AC_PROG_CXX_G, _AC_PROG_OBJC_G): Likewise.
* lib/autoconf/erlang.m4 (AC_ERLANG_SUBST_INSTALL_LIB_DIR)
(AC_ERLANG_SUBST_INSTALL_LIB_SUBDIR): Likewise.
* lib/autoconf/fortran.m4 (AC_LANG, _AC_PROG_FC_G): Likewise.
* lib/autoconf/functions.m4 (_AC_LIBOBJ_ALLOCA)
(AC_FUNC_SELECT_ARGTYPES): Likewise.
* lib/autoconf/libs.m4 (_AC_PATH_X_XMKMF): Likewise.
* lib/autoconf/specific.m4 (AC_SYS_LONG_FILE_NAMES): Likewise.
* lib/autotest/general.m4 (_AT_CREATE_DEBUGGING_SCRIPT)
(AT_INIT, _AT_DECIDE_TRACEABLE): Likewise.
* doc/autoconf.texi (Quoting and Parameters): New section.
automake:
2007-01-18 Eric Blake <address@hidden>
* m4/cond.m4 (AM_CONDITIONAL): Avoid raw ${ in M4 macros, for
compatibility with M4 2.0.
* m4/depend.m4 (_AM_DEPENDENCIES, AM_SET_DEPDIR): Likewise.
* m4/init.m4 (AM_INIT_AUTOMAKE): Likewise.
* m4/install-sh.m4 (AM_PROG_INSTALL_SH): Likewise.
* m4/make.m4 (AM_MAKE_INCLUDE): Likewise.
* m4/missing.m4 (AM_MISSING_PROG, AM_MISSING_HAS_RUN): Likewise.
* m4/tar.m4 (_AM_PROG_TAR): Likewise.
- --
Don't work too hard, make some time for fun as well!
Eric Blake address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFFr4kh84KuGfSFAYARAmRDAJ9d+Ou6I0PgQ//E+Kpj6/bVHXqC4QCbBqti
3gIPqzWLZ7CvbAMxvHcA+WU=
=aQ9B
-----END PGP SIGNATURE-----
Index: src/builtin.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/builtin.c,v
retrieving revision 1.1.1.1.2.54
diff -u -r1.1.1.1.2.54 builtin.c
--- src/builtin.c 15 Jan 2007 13:51:33 -0000 1.1.1.1.2.54
+++ src/builtin.c 18 Jan 2007 00:31:28 -0000
@@ -239,6 +239,10 @@
SYMBOL_TYPE (s) = TOKEN_TEXT;
SYMBOL_TEXT (s) = xstrdup (text ? text : "");
+ /* This warning must not kill m4 -E, or it will break autoconf. */
+ if (text && strstr (text, "${"))
+ M4ERROR ((0, 0, "Warning: raw `${' in defn of %s will change semantics",
+ name));
}
/*-----------------------------------------------.
Index: doc/autoconf.texi
===================================================================
RCS file: /sources/autoconf/autoconf/doc/autoconf.texi,v
retrieving revision 1.1126
diff -u -r1.1126 autoconf.texi
--- doc/autoconf.texi 16 Jan 2007 16:22:04 -0000 1.1126
+++ doc/autoconf.texi 18 Jan 2007 00:31:53 -0000
@@ -434,6 +434,7 @@
* Active Characters:: Characters that change the behavior of M4
* One Macro Call:: Quotation and one macro call
+* Quoting and Parameters:: M4 vs. shell parameters
* Quotation and Nested Macros:: Macros calling macros
* Changequote is Evil:: Worse than INTERCAL: M4 + changequote
* Quadrigraphs:: Another way to escape special characters
@@ -8859,10 +8860,6 @@
@cindex M4 quotation
@cindex quotation
-@c FIXME: Grmph, yet another quoting myth: quotation has *never*
-@c prevented `expansion' of $1. Unless it refers to the expansion
-@c of the value of $1? Anyway, we need a rewrite here@enddots{}
-
The most common problem with existing macros is an improper quotation.
This section, which users of Autoconf can skip, but which macro writers
@emph{must} read, first justifies the quotation scheme that was chosen
@@ -8872,6 +8869,7 @@
@menu
* Active Characters:: Characters that change the behavior of M4
* One Macro Call:: Quotation and one macro call
+* Quoting and Parameters:: M4 vs. shell parameters
* Quotation and Nested Macros:: Macros calling macros
* Changequote is Evil:: Worse than INTERCAL: M4 + changequote
* Quadrigraphs:: Another way to escape special characters
@@ -8885,8 +8883,8 @@
to know what the special characters are in Autoconf: @samp{#} introduces
a comment inside which no macro expansion is performed, @samp{,}
separates arguments, @samp{[} and @samp{]} are the quotes themselves,
-and finally @samp{(} and @samp{)} (which M4 tries to match by
-pairs).
+@samp{(} and @samp{)} (which M4 tries to match by pairs), and finally
+@samp{$} inside a macro definition.
In order to understand the delicate case of macro calls, we first have
to present some obvious failures. Below they are ``obvious-ified'',
@@ -9007,10 +9005,74 @@
@result{}[a]
@end example
+@node Quoting and Parameters
+@subsection
+
+When M4 encounters @samp{$} within a macro definition, followed
+immediately by a character it recognizes, it will perform M4 parameter
+expansion. This happens regardless of how many layers of quotes the
+parameter expansion is nested within, or even if it occurs in text that
+will be rescanned as a comment.
+
+@example
+define([none], [$1])
+@result{}
+define([one], [[$1]])
+@result{}
+define([two], [[[$1]]])
+@result{}
+define([comment], [# $1])
+@result{}
+define([active], [ACTIVE])
+@result{}
+none([active])
+@result{}ACTIVE
+one([active])
+@result{}active
+two([active])
+@result{}[active]
+comment([active])
+@result{}# active
+@end example
+
+On the other hand, since autoconf generates shell code, you often want
+to output shell variable expansion, rather than performing M4 parameter
+expansion. To do this, you must use M4 quoting to separate the @samp{$}
+from the next character in the definition of your macro. If the macro
+definition occurs in single-quoted text, then insert another level of
+quoting; if the usage is already inside a double-quoted string, then
+split it into concatenated strings.
+
+@example
+define([single], [a single-quoted $[]1 definition])
+@result{}
+define([double], [[a double-quoted $][1 definition]])
+@result{}
+single
+@result{}a single-quoted $1 definition
+double
+@result{}a double-quoted $1 definition
+@end example
+
+@acronym{POSIX} states that M4 implementations are free to use
+@samp{$@{} in macro definitions however they like. @acronym{GNU} M4
+1.4.x outputs those two characters literally, but @acronym{GNU} M4 2.0
+uses an extension modeled after shell variable expansion semantics.
+This is in part due to the fact that M4 1.4.x violates @acronym{POSIX}
+by treating @samp{$11} as the eleventh parameter, rather than the first
+parameter concatenated with the string @samp{1}. To comply with
+@acronym{POSIX}, M4 2.0 prefers @samp{$@{11@}} rather than @samp{$11}
+when referring to the eleventh parameter.
+
+Therefore, for your autoconf script to be portable, regardless of
+whether the user has M4 1.4.x or 2.0 installed, you must use M4 quoting
+to separate @samp{$} from any of these characters --- @samp{@{},
+@samp{0}@dots{}@samp{9}, @samp{*}, or @samp{@@} --- if you want the pair
+to make it to the output.
+
With this in mind, we can explore the cases where macros invoke
macros@enddots{}
-
@node Quotation and Nested Macros
@subsection Quotation and Nested Macros
@@ -9104,17 +9166,20 @@
@noindent
Ahhh! That's much better.
-But note what you've done: now that the arguments are literal strings,
-if the user wants to use the results of expansions as arguments, she has
-to use an @emph{unquoted} macro call:
+But note what you've done: now that the result of @code{qar} is always
+a literal string, the only time a user can use the results of
+expansions is with an @emph{unquoted} macro call:
@example
qar(active)
@result{}ACT
+qar([active])
+@result{}active
@end example
@noindent
-where she wanted to reproduce what she used to do with @code{car}:
+leaving no way for the user to reproduce what she used to do with
+@code{car}:
@example
car([active])
Index: lib/autoconf/autotest.m4
===================================================================
RCS file: /sources/autoconf/autoconf/lib/autoconf/autotest.m4,v
retrieving revision 1.19
diff -u -r1.19 autotest.m4
--- lib/autoconf/autotest.m4 5 Jul 2005 11:08:42 -0000 1.19
+++ lib/autoconf/autotest.m4 18 Jan 2007 00:31:53 -0000
@@ -1,7 +1,7 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Interface with Autotest.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -66,7 +66,7 @@
[cat >$1/atconfig <<ATEOF
@%:@ Configurable variable values for building test suites.
@%:@ Generated by $[0].
-@%:@ Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+@%:@ Copyright (C) 2000, 2001, 2003, 2004, 2007 Free Software Foundation, Inc.
# The test suite will define top_srcdir=$at_top_srcdir/../.. etc.
at_testdir='$1'
@@ -83,7 +83,7 @@
AUTOTEST_PATH='m4_default([$2], [$1])'
-SHELL=\${CONFIG_SHELL-'$SHELL'}
+SHELL=\$[{]CONFIG_SHELL-'$SHELL'}
ATEOF
])
])# AC_CONFIG_TESTDIR
Index: lib/autoconf/c.m4
===================================================================
RCS file: /sources/autoconf/autoconf/lib/autoconf/c.m4,v
retrieving revision 1.242
diff -u -r1.242 c.m4
--- lib/autoconf/c.m4 7 Dec 2006 06:39:40 -0000 1.242
+++ lib/autoconf/c.m4 18 Jan 2007 00:31:53 -0000
@@ -1,6 +1,6 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Programming languages support.
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
# Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
@@ -537,7 +537,7 @@
dnl but without the check for a tool without the prefix.
dnl Until the check is removed from there, copy the code:
if test -n "$ac_tool_prefix"; then
- AC_CHECK_PROG(CC, [${ac_tool_prefix}cc], [${ac_tool_prefix}cc])
+ AC_CHECK_PROG(CC, [$][{ac_tool_prefix}cc], [$][{ac_tool_prefix}cc])
fi
fi
if test -z "$CC"; then
@@ -579,7 +579,7 @@
# versions of a library), tasteless as that idea is.
# Don't consider -g to work if it generates warnings when plain compiles don't.
m4_define([_AC_PROG_CC_G],
-[ac_test_CFLAGS=${CFLAGS+set}
+[ac_test_CFLAGS=$[]{CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
AC_CACHE_CHECK(whether $CC accepts -g, ac_cv_prog_cc_g,
[ac_save_c_werror_flag=$ac_c_werror_flag
@@ -649,7 +649,7 @@
fi
set dummy $CC; ac_cc=`AS_ECHO(["$[2]"]) |
sed 's/[[^a-zA-Z0-9_]]/_/g;s/^[[0-9]]/_/'`
-AC_CACHE_VAL(ac_cv_prog_cc_${ac_cc}_c_o,
+AC_CACHE_VAL(ac_cv_prog_cc_$[]{ac_cc}_c_o,
[AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
# Make sure it works both with $CC and with simple cc.
# We do the test twice because some compilers refuse to overwrite an
@@ -659,7 +659,7 @@
if _AC_DO_VAR(ac_try) &&
test -f conftest2.$ac_objext && _AC_DO_VAR(ac_try);
then
- eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+ eval ac_cv_prog_cc_[$]{ac_cc}_c_o=yes
if test "x$CC" != xcc; then
# Test first that cc exists at all.
if _AC_DO_TOKENS(cc -c conftest.$ac_ext >&AS_MESSAGE_LOG_FD); then
@@ -672,16 +672,16 @@
:
else
# cc exists but doesn't like -o.
- eval ac_cv_prog_cc_${ac_cc}_c_o=no
+ eval ac_cv_prog_cc_[$]{ac_cc}_c_o=no
fi
fi
fi
else
- eval ac_cv_prog_cc_${ac_cc}_c_o=no
+ eval ac_cv_prog_cc_[$]{ac_cc}_c_o=no
fi
rm -f core conftest*
])dnl
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+if eval test \$ac_cv_prog_cc_[$]{ac_cc}_c_o = yes; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
@@ -812,7 +812,7 @@
# normal versions of a library), tasteless as that idea is.
# Don't consider -g to work if it generates warnings when plain compiles don't.
m4_define([_AC_PROG_CXX_G],
-[ac_test_CXXFLAGS=${CXXFLAGS+set}
+[ac_test_CXXFLAGS=$[]{CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
AC_CACHE_CHECK(whether $CXX accepts -g, ac_cv_prog_cxx_g,
[ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -855,7 +855,7 @@
[AC_REQUIRE([AC_PROG_CXX])dnl
AC_LANG_PUSH([C++])dnl
AC_CACHE_CHECK([whether $CXX understands -c and -o together],
- [ac_cv_prog_cxx_c_o],
+ [ac_cv_prog_cxx_c_o],
[AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
# We test twice because some compilers refuse to overwrite an existing
# `.o' file with `-o', although they will create one.
@@ -871,8 +871,8 @@
rm -f conftest*])
if test $ac_cv_prog_cxx_c_o = no; then
AC_DEFINE(CXX_NO_MINUS_C_MINUS_O, 1,
- [Define to 1 if your C++ compiler doesn't accept
- -c and -o together.])
+ [Define to 1 if your C++ compiler doesn't accept
+ -c and -o together.])
fi
AC_LANG_POP([C++])dnl
])# AC_PROG_CXX_C_O
@@ -981,7 +981,7 @@
# normal versions of a library), tasteless as that idea is.
# Don't consider -g to work if it generates warnings when plain compiles don't.
m4_define([_AC_PROG_OBJC_G],
-[ac_test_OBJCFLAGS=${OBJCFLAGS+set}
+[ac_test_OBJCFLAGS=$[]{OBJCFLAGS+set}
ac_save_OBJCFLAGS=$OBJCFLAGS
AC_CACHE_CHECK(whether $OBJC accepts -g, ac_cv_prog_objc_g,
[ac_save_objc_werror_flag=$ac_objc_werror_flag
@@ -1316,7 +1316,7 @@
AS_CASE([$ac_cv_prog_cc_stdc],
[no], [AC_MSG_RESULT([unsupported])],
[''], [AC_MSG_RESULT([none needed])],
- [AC_MSG_RESULT([$ac_cv_prog_cc_stdc])])
+ [AC_MSG_RESULT([$ac_cv_prog_cc_stdc])])
])
@@ -1572,13 +1572,13 @@
for ac_kw in restrict __restrict __restrict__ _Restrict; do
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[[typedef int * int_ptr;
- int foo (int_ptr $ac_kw ip) {
- return ip[0];
+ int foo (int_ptr $ac_kw ip) {
+ return ip[0];
}]],
[[int s[1];
- int * $ac_kw t = s;
- t[0] = 0;
- return foo(t)]])],
+ int * $ac_kw t = s;
+ t[0] = 0;
+ return foo(t)]])],
[ac_cv_c_restrict=$ac_kw])
test "$ac_cv_c_restrict" != no && break
done
Index: lib/autoconf/erlang.m4
===================================================================
RCS file: /sources/autoconf/autoconf/lib/autoconf/erlang.m4,v
retrieving revision 1.4
diff -u -r1.4 erlang.m4
--- lib/autoconf/erlang.m4 17 Nov 2006 21:04:54 -0000 1.4
+++ lib/autoconf/erlang.m4 18 Jan 2007 00:31:53 -0000
@@ -169,7 +169,7 @@
# Find the Erlang preprocessor. Must be AC_DEFUN'd to be AC_REQUIRE'able.
AC_DEFUN([AC_LANG_PREPROC(Erlang)],
[m4_warn([syntax],
- [$0: No preprocessor defined for ]_AC_LANG)])
+ [$0: No preprocessor defined for ]_AC_LANG)])
# AC_LANG_COMPILER(Erlang)
# ----------------------------
@@ -193,29 +193,29 @@
[erlang_cv_lib_dir_$1],
[AC_LANG_PUSH(Erlang)[]dnl
AC_RUN_IFELSE(
- [AC_LANG_PROGRAM([], [dnl
- ReturnValue = case code:lib_dir("[$1]") of
- {error, bad_name} ->
- file:write_file("conftest.out", "not found\n"),
- 1;
- LibDir ->
- file:write_file("conftest.out", LibDir),
- 0
- end,
- halt(ReturnValue)])],
- [erlang_cv_lib_dir_$1=`cat conftest.out`],
- [if test ! -f conftest.out; then
- AC_MSG_FAILURE([test Erlang program execution failed])
- else
- erlang_cv_lib_dir_$1="not found"
- fi])
+ [AC_LANG_PROGRAM([], [dnl
+ ReturnValue = case code:lib_dir("[$1]") of
+ {error, bad_name} ->
+ file:write_file("conftest.out", "not found\n"),
+ 1;
+ LibDir ->
+ file:write_file("conftest.out", LibDir),
+ 0
+ end,
+ halt(ReturnValue)])],
+ [erlang_cv_lib_dir_$1=`cat conftest.out`],
+ [if test ! -f conftest.out; then
+ AC_MSG_FAILURE([test Erlang program execution failed])
+ else
+ erlang_cv_lib_dir_$1="not found"
+ fi])
AC_LANG_POP(Erlang)[]dnl
])
AC_CACHE_CHECK([for Erlang/OTP '$1' library version],
[erlang_cv_lib_ver_$1],
[AS_IF([test "$erlang_cv_lib_dir_$1" = "not found"],
- [erlang_cv_lib_ver_$1="not found"],
- [erlang_cv_lib_ver_$1=`AS_ECHO(["$erlang_cv_lib_dir_$1"]) | sed -n -e
's,^.*-\([[^/-]]*\)$,\1,p'`])[]dnl
+ [erlang_cv_lib_ver_$1="not found"],
+ [erlang_cv_lib_ver_$1=`AS_ECHO(["$erlang_cv_lib_dir_$1"]) | sed -n -e
's,^.*-\([[^/-]]*\)$,\1,p'`])[]dnl
])
AC_SUBST([ERLANG_LIB_DIR_$1], [$erlang_cv_lib_dir_$1])
AC_SUBST([ERLANG_LIB_VER_$1], [$erlang_cv_lib_ver_$1])
@@ -235,13 +235,13 @@
[erlang_cv_root_dir],
[AC_LANG_PUSH(Erlang)[]dnl
AC_RUN_IFELSE(
- [AC_LANG_PROGRAM([], [dnl
- RootDir = code:root_dir(),
- file:write_file("conftest.out", RootDir),
- ReturnValue = 0,
- halt(ReturnValue)])],
- [erlang_cv_root_dir=`cat conftest.out`],
- [AC_MSG_FAILURE([test Erlang program execution failed])])
+ [AC_LANG_PROGRAM([], [dnl
+ RootDir = code:root_dir(),
+ file:write_file("conftest.out", RootDir),
+ ReturnValue = 0,
+ halt(ReturnValue)])],
+ [erlang_cv_root_dir=`cat conftest.out`],
+ [AC_MSG_FAILURE([test Erlang program execution failed])])
AC_LANG_POP(Erlang)[]dnl
])
AC_SUBST([ERLANG_ROOT_DIR], [$erlang_cv_root_dir])
@@ -256,13 +256,13 @@
[erlang_cv_lib_dir],
[AC_LANG_PUSH(Erlang)[]dnl
AC_RUN_IFELSE(
- [AC_LANG_PROGRAM([], [dnl
- LibDir = code:lib_dir(),
- file:write_file("conftest.out", LibDir),
- ReturnValue = 0,
- halt(ReturnValue)])],
- [erlang_cv_lib_dir=`cat conftest.out`],
- [AC_MSG_FAILURE([test Erlang program execution failed])])
+ [AC_LANG_PROGRAM([], [dnl
+ LibDir = code:lib_dir(),
+ file:write_file("conftest.out", LibDir),
+ ReturnValue = 0,
+ halt(ReturnValue)])],
+ [erlang_cv_lib_dir=`cat conftest.out`],
+ [AC_MSG_FAILURE([test Erlang program execution failed])])
AC_LANG_POP(Erlang)[]dnl
])
AC_SUBST([ERLANG_LIB_DIR], [$erlang_cv_lib_dir])
@@ -283,7 +283,7 @@
if test -n "$ERLANG_INSTALL_LIB_DIR"; then
AC_MSG_RESULT([$ERLANG_INSTALL_LIB_DIR])
else
- AC_SUBST([ERLANG_INSTALL_LIB_DIR], ['${libdir}/erlang/lib'])
+ AC_SUBST([ERLANG_INSTALL_LIB_DIR], ['$[]{libdir}/erlang/lib'])
AC_MSG_RESULT([$libdir/erlang/lib])
fi
])# AC_ERLANG_SUBST_INSTALL_LIB_DIR
@@ -299,7 +299,7 @@
if test -n "$ERLANG_INSTALL_LIB_DIR_$1"; then
AC_MSG_RESULT([$ERLANG_INSTALL_LIB_DIR_$1])
else
- AC_SUBST([ERLANG_INSTALL_LIB_DIR_$1], ['${ERLANG_INSTALL_LIB_DIR}/$1-$2'])
+ AC_SUBST([ERLANG_INSTALL_LIB_DIR_$1],
['$[]{ERLANG_INSTALL_LIB_DIR}/$1-$2'])
AC_MSG_RESULT([$ERLANG_INSTALL_LIB_DIR/$1-$2])
fi
])# AC_ERLANG_SUBST_INSTALL_LIB_SUBDIR
Index: lib/autoconf/fortran.m4
===================================================================
RCS file: /sources/autoconf/autoconf/lib/autoconf/fortran.m4,v
retrieving revision 1.217
diff -u -r1.217 fortran.m4
--- lib/autoconf/fortran.m4 29 Dec 2006 06:44:42 -0000 1.217
+++ lib/autoconf/fortran.m4 18 Jan 2007 00:31:53 -0000
@@ -1,6 +1,6 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Fortran languages support.
-# Copyright (C) 2001, 2003, 2004, 2005, 2006
+# Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007
# Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
@@ -149,7 +149,7 @@
# AC_LANG(Fortran)
# ----------------
m4_define([AC_LANG(Fortran)],
-[ac_ext=${ac_fc_srcext-f}
+[ac_ext=$[]{ac_fc_srcext-f}
ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext
>&AS_MESSAGE_LOG_FD'
ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext
conftest.$ac_ext $LIBS >&AS_MESSAGE_LOG_FD'
ac_compiler_gnu=$ac_cv_fc_compiler_gnu
@@ -166,7 +166,7 @@
m4_defun([_AC_FORTRAN_ASSERT],
[m4_if(_AC_LANG, [Fortran], [],
[m4_if(_AC_LANG, [Fortran 77], [],
- [m4_fatal([$0: current language is not Fortran: ] _AC_LANG)])])])
+ [m4_fatal([$0: current language is not Fortran: ] _AC_LANG)])])])
# _AC_LANG_ABBREV(Fortran 77)
@@ -193,7 +193,7 @@
AC_DEFUN([_AC_FC],
[_AC_FORTRAN_ASSERT()dnl
AC_LANG_CASE([Fortran 77], [F77],
- [Fortran], [FC])])
+ [Fortran], [FC])])
## ---------------------- ##
@@ -278,7 +278,7 @@
# Find the Fortran preprocessor. Must be AC_DEFUN'd to be AC_REQUIRE'able.
AC_DEFUN([AC_LANG_PREPROC(Fortran)],
[m4_warn([syntax],
- [$0: No preprocessor defined for ]_AC_LANG)])
+ [$0: No preprocessor defined for ]_AC_LANG)])
# AC_LANG_COMPILER(Fortran 77)
@@ -315,8 +315,8 @@
[90],[1990], [1990],[1990],
[95],[1995], [1995],[1995],
[2000],[2000],
- [],[],
- [m4_fatal([unknown Fortran dialect])])])
+ [],[],
+ [m4_fatal([unknown Fortran dialect])])])
# _AC_PROG_FC([DIALECT], [COMPILERS...])
@@ -426,7 +426,7 @@
# versions of a library), tasteless as that idea is.
m4_define([_AC_PROG_FC_G],
[_AC_FORTRAN_ASSERT()dnl
-ac_test_FFLAGS=${[]_AC_LANG_PREFIX[]FLAGS+set}
+ac_test_FFLAGS=$[{]_AC_LANG_PREFIX[]FLAGS+set}
ac_save_FFLAGS=$[]_AC_LANG_PREFIX[]FLAGS
_AC_LANG_PREFIX[]FLAGS=
AC_CACHE_CHECK(whether $[]_AC_FC[] accepts -g,
ac_cv_prog_[]_AC_LANG_ABBREV[]_g,
@@ -466,7 +466,7 @@
AC_DEFUN([_AC_PROG_FC_C_O],
[_AC_FORTRAN_ASSERT()dnl
AC_CACHE_CHECK([whether $[]_AC_FC[] understands -c and -o together],
- [ac_cv_prog_[]_AC_LANG_ABBREV[]_c_o],
+ [ac_cv_prog_[]_AC_LANG_ABBREV[]_c_o],
[AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
# We test twice because some compilers refuse to overwrite an existing
# `.o' file with `-o', although they will create one.
@@ -482,8 +482,8 @@
rm -f conftest*])
if test $ac_cv_prog_[]_AC_LANG_ABBREV[]_c_o = no; then
AC_DEFINE([]_AC_FC[]_NO_MINUS_C_MINUS_O, 1,
- [Define to 1 if your Fortran compiler doesn't accept
- -c and -o together.])
+ [Define to 1 if your Fortran compiler doesn't accept
+ -c and -o together.])
fi
])# _AC_PROG_FC_C_O
@@ -570,9 +570,9 @@
# Doubly-quoted arguments were reported for "PGF90/x86 Linux/x86 5.0-2".
*-cmdline\ * | *-ignore\ * | *-def\ *)
ac_[]_AC_LANG_ABBREV[]_v_output=`echo $ac_[]_AC_LANG_ABBREV[]_v_output |
sed "\
- s/-cmdline *'[[^']]*'/ /g; s/-cmdline *\"[[^\"]]*\"/ /g
- s/-ignore *'[[^']]*'/ /g; s/-ignore *\"[[^\"]]*\"/ /g
- s/-def *'[[^']]*'/ /g; s/-def *\"[[^\"]]*\"/ /g"` ;;
+ s/-cmdline *'[[^']]*'/ /g; s/-cmdline *\"[[^\"]]*\"/ /g
+ s/-ignore *'[[^']]*'/ /g; s/-ignore *\"[[^\"]]*\"/ /g
+ s/-def *'[[^']]*'/ /g; s/-def *\"[[^\"]]*\"/ /g"` ;;
# If we are using Cray Fortran then delete quotes.
*cft90*)
@@ -592,7 +592,7 @@
AC_DEFUN([_AC_PROG_FC_V],
[_AC_FORTRAN_ASSERT()dnl
AC_CACHE_CHECK([how to get verbose linking output from $[]_AC_FC[]],
- [ac_cv_prog_[]_AC_LANG_ABBREV[]_v],
+ [ac_cv_prog_[]_AC_LANG_ABBREV[]_v],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
[ac_cv_prog_[]_AC_LANG_ABBREV[]_v=
# Try some options frequently used verbose output
@@ -601,16 +601,16 @@
# look for -l* and *.a constructs in the output
for ac_arg in $ac_[]_AC_LANG_ABBREV[]_v_output; do
case $ac_arg in
- [[\\/]]*.a | ?:[[\\/]]*.a | -[[lLRu]]*)
- ac_cv_prog_[]_AC_LANG_ABBREV[]_v=$ac_verb
- break 2 ;;
+ [[\\/]]*.a | ?:[[\\/]]*.a | -[[lLRu]]*)
+ ac_cv_prog_[]_AC_LANG_ABBREV[]_v=$ac_verb
+ break 2 ;;
esac
done
done
if test -z "$ac_cv_prog_[]_AC_LANG_ABBREV[]_v"; then
AC_MSG_WARN([cannot determine how to obtain linking information from
$[]_AC_FC[]])
fi],
- [AC_MSG_WARN([compilation failed])])
+ [AC_MSG_WARN([compilation failed])])
])])# _AC_PROG_FC_V
@@ -662,24 +662,24 @@
shift
ac_arg=$[1]
case $ac_arg in
- [[\\/]]*.a | ?:[[\\/]]*.a)
- _AC_LIST_MEMBER_IF($ac_arg, $ac_cv_[]_AC_LANG_ABBREV[]_libs, ,
- ac_cv_[]_AC_LANG_ABBREV[]_libs="$ac_cv_[]_AC_LANG_ABBREV[]_libs
$ac_arg")
- ;;
- -bI:*)
- _AC_LIST_MEMBER_IF($ac_arg, $ac_cv_[]_AC_LANG_ABBREV[]_libs, ,
- [_AC_LINKER_OPTION([$ac_arg], ac_cv_[]_AC_LANG_ABBREV[]_libs)])
- ;;
- # Ignore these flags.
- -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* |
-LIST:* | -LNO:*)
- ;;
- -lkernel32)
- test x"$CYGWIN" != xyes &&
ac_cv_[]_AC_LANG_ABBREV[]_libs="$ac_cv_[]_AC_LANG_ABBREV[]_libs $ac_arg"
- ;;
- -[[LRuYz]])
- # These flags, when seen by themselves, take an argument.
- # We remove the space between option and argument and re-iterate
- # unless we find an empty arg or a new option (starting with -)
+ [[\\/]]*.a | ?:[[\\/]]*.a)
+ _AC_LIST_MEMBER_IF($ac_arg, $ac_cv_[]_AC_LANG_ABBREV[]_libs, ,
+ ac_cv_[]_AC_LANG_ABBREV[]_libs="$ac_cv_[]_AC_LANG_ABBREV[]_libs
$ac_arg")
+ ;;
+ -bI:*)
+ _AC_LIST_MEMBER_IF($ac_arg, $ac_cv_[]_AC_LANG_ABBREV[]_libs, ,
+ [_AC_LINKER_OPTION([$ac_arg], ac_cv_[]_AC_LANG_ABBREV[]_libs)])
+ ;;
+ # Ignore these flags.
+ -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* |
-LIST:* | -LNO:*)
+ ;;
+ -lkernel32)
+ test x"$CYGWIN" != xyes &&
ac_cv_[]_AC_LANG_ABBREV[]_libs="$ac_cv_[]_AC_LANG_ABBREV[]_libs $ac_arg"
+ ;;
+ -[[LRuYz]])
+ # These flags, when seen by themselves, take an argument.
+ # We remove the space between option and argument and re-iterate
+ # unless we find an empty arg or a new option (starting with -)
case $[2] in
"" | -*);;
*)
@@ -688,22 +688,22 @@
set X $ac_arg "$[@]"
;;
esac
- ;;
- -YP,*)
- for ac_j in `AS_ECHO(["$ac_arg"]) | sed -e 's/-YP,/-L/;s/:/ -L/g'`;
do
- _AC_LIST_MEMBER_IF($ac_j, $ac_cv_[]_AC_LANG_ABBREV[]_libs, ,
- [ac_arg="$ac_arg $ac_j"
-
ac_cv_[]_AC_LANG_ABBREV[]_libs="$ac_cv_[]_AC_LANG_ABBREV[]_libs $ac_j"])
- done
- ;;
- -[[lLR]]*)
- _AC_LIST_MEMBER_IF($ac_arg, $ac_cv_[]_AC_LANG_ABBREV[]_libs, ,
-
ac_cv_[]_AC_LANG_ABBREV[]_libs="$ac_cv_[]_AC_LANG_ABBREV[]_libs $ac_arg")
- ;;
+ ;;
+ -YP,*)
+ for ac_j in `AS_ECHO(["$ac_arg"]) | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do
+ _AC_LIST_MEMBER_IF($ac_j, $ac_cv_[]_AC_LANG_ABBREV[]_libs, ,
+ [ac_arg="$ac_arg $ac_j"
+
ac_cv_[]_AC_LANG_ABBREV[]_libs="$ac_cv_[]_AC_LANG_ABBREV[]_libs $ac_j"])
+ done
+ ;;
+ -[[lLR]]*)
+ _AC_LIST_MEMBER_IF($ac_arg, $ac_cv_[]_AC_LANG_ABBREV[]_libs, ,
+
ac_cv_[]_AC_LANG_ABBREV[]_libs="$ac_cv_[]_AC_LANG_ABBREV[]_libs $ac_arg")
+ ;;
-zallextract*| -zdefaultextract)
ac_cv_[]_AC_LANG_ABBREV[]_libs="$ac_cv_[]_AC_LANG_ABBREV[]_libs
$ac_arg"
;;
- # Ignore everything else.
+ # Ignore everything else.
esac
done
# restore positional arguments
@@ -715,9 +715,9 @@
case `(uname -sr) 2>/dev/null` in
"SunOS 5"*)
ac_ld_run_path=`AS_ECHO(["$ac_[]_AC_LANG_ABBREV[]_v_output"]) |
- sed -n 's,^.*LD_RUN_PATH *= *\(/[[^ ]]*\).*$,-R\1,p'`
+ sed -n 's,^.*LD_RUN_PATH *= *\(/[[^ ]]*\).*$,-R\1,p'`
test "x$ac_ld_run_path" != x &&
- _AC_LINKER_OPTION([$ac_ld_run_path], ac_cv_[]_AC_LANG_ABBREV[]_libs)
+ _AC_LINKER_OPTION([$ac_ld_run_path], ac_cv_[]_AC_LANG_ABBREV[]_libs)
;;
esac
fi # test "x$[]_AC_LANG_PREFIX[]LIBS" = "x"
@@ -794,7 +794,7 @@
[#endif
])
AC_CACHE_CHECK([for dummy main to link with _AC_LANG libraries],
- ac_cv_[]_AC_LANG_ABBREV[]_dummy_main,
+ ac_cv_[]_AC_LANG_ABBREV[]_dummy_main,
[ac_[]_AC_LANG_ABBREV[]_dm_save_LIBS=$LIBS
LIBS="$LIBS $[]_AC_LANG_PREFIX[]LIBS"
ac_fortran_dm_var=[]_AC_FC[]_DUMMY_MAIN
@@ -802,13 +802,13 @@
# First, try linking without a dummy main:
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
- [ac_cv_fortran_dummy_main=none],
- [ac_cv_fortran_dummy_main=unknown])
+ [ac_cv_fortran_dummy_main=none],
+ [ac_cv_fortran_dummy_main=unknown])
if test $ac_cv_fortran_dummy_main = unknown; then
for ac_func in MAIN__ MAIN_ __main MAIN _MAIN __MAIN main_ main__ _main; do
AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@define $ac_fortran_dm_var
$ac_func]])],
- [ac_cv_fortran_dummy_main=$ac_func; break])
+ [ac_cv_fortran_dummy_main=$ac_func; break])
done
fi
AC_LANG_POP(C)dnl
@@ -821,15 +821,15 @@
[m4_default([$1],
[if test $[]_AC_FC[]_DUMMY_MAIN != none; then
AC_DEFINE_UNQUOTED([]_AC_FC[]_DUMMY_MAIN, $[]_AC_FC[]_DUMMY_MAIN,
- [Define to dummy `main' function (if any) required to
- link to the Fortran libraries.])
+ [Define to dummy `main' function (if any) required to
+ link to the Fortran libraries.])
if test "x$ac_cv_fc_dummy_main" = "x$ac_cv_f77_dummy_main"; then
AC_DEFINE([FC_DUMMY_MAIN_EQ_F77], 1,
- [Define if F77 and FC dummy `main' functions are identical.])
+ [Define if F77 and FC dummy `main' functions are identical.])
fi
fi])],
[m4_default([$2],
- [AC_MSG_FAILURE([linking to Fortran libraries from C fails])])])
+ [AC_MSG_FAILURE([linking to Fortran libraries from C fails])])])
])# _AC_FC_DUMMY_MAIN
@@ -864,7 +864,7 @@
AC_DEFUN([_AC_FC_MAIN],
[_AC_FORTRAN_ASSERT()dnl
AC_CACHE_CHECK([for alternate main to link with _AC_LANG libraries],
- ac_cv_[]_AC_LANG_ABBREV[]_main,
+ ac_cv_[]_AC_LANG_ABBREV[]_main,
[ac_[]_AC_LANG_ABBREV[]_m_save_LIBS=$LIBS
LIBS="$LIBS $[]_AC_LANG_PREFIX[]LIBS"
ac_fortran_dm_var=[]_AC_FC[]_DUMMY_MAIN
@@ -878,7 +878,7 @@
@%:@ undef $ac_fortran_dm_var
@%:@endif
@%:@define main $ac_func])],
- [ac_cv_fortran_main=$ac_func; break])
+ [ac_cv_fortran_main=$ac_func; break])
done
AC_LANG_POP(C)dnl
ac_cv_[]_AC_LANG_ABBREV[]_main=$ac_cv_fortran_main
@@ -886,8 +886,8 @@
LIBS=$ac_[]_AC_LANG_ABBREV[]_m_save_LIBS
])
AC_DEFINE_UNQUOTED([]_AC_FC[]_MAIN, $ac_cv_[]_AC_LANG_ABBREV[]_main,
- [Define to alternate name for `main' routine that is
- called from a `main' in the Fortran libraries.])
+ [Define to alternate name for `main' routine that is
+ called from a `main' in the Fortran libraries.])
])# _AC_FC_MAIN
@@ -929,7 +929,7 @@
AC_DEFUN([__AC_FC_NAME_MANGLING],
[_AC_FORTRAN_ASSERT()dnl
AC_CACHE_CHECK([for _AC_LANG name-mangling scheme],
- ac_cv_[]_AC_LANG_ABBREV[]_mangling,
+ ac_cv_[]_AC_LANG_ABBREV[]_mangling,
[AC_COMPILE_IFELSE(
[ subroutine foobar()
return
@@ -976,16 +976,16 @@
if test "$ac_success_extra" = "yes"; then
ac_cv_[]_AC_LANG_ABBREV[]_mangling="$ac_case case"
- if test -z "$ac_underscore"; then
-
ac_cv_[]_AC_LANG_ABBREV[]_mangling="$ac_cv_[]_AC_LANG_ABBREV[]_mangling, no
underscore"
+ if test -z "$ac_underscore"; then
+
ac_cv_[]_AC_LANG_ABBREV[]_mangling="$ac_cv_[]_AC_LANG_ABBREV[]_mangling, no
underscore"
else
-
ac_cv_[]_AC_LANG_ABBREV[]_mangling="$ac_cv_[]_AC_LANG_ABBREV[]_mangling,
underscore"
- fi
- if test -z "$ac_extra"; then
-
ac_cv_[]_AC_LANG_ABBREV[]_mangling="$ac_cv_[]_AC_LANG_ABBREV[]_mangling, no
extra underscore"
+
ac_cv_[]_AC_LANG_ABBREV[]_mangling="$ac_cv_[]_AC_LANG_ABBREV[]_mangling,
underscore"
+ fi
+ if test -z "$ac_extra"; then
+
ac_cv_[]_AC_LANG_ABBREV[]_mangling="$ac_cv_[]_AC_LANG_ABBREV[]_mangling, no
extra underscore"
else
-
ac_cv_[]_AC_LANG_ABBREV[]_mangling="$ac_cv_[]_AC_LANG_ABBREV[]_mangling, extra
underscore"
- fi
+
ac_cv_[]_AC_LANG_ABBREV[]_mangling="$ac_cv_[]_AC_LANG_ABBREV[]_mangling, extra
underscore"
+ fi
else
ac_cv_[]_AC_LANG_ABBREV[]_mangling="unknown"
fi
@@ -1040,32 +1040,32 @@
[As ]_AC_FC[_FUNC, but for C identifiers containing underscores.])dnl
case $ac_cv_[]_AC_LANG_ABBREV[]_mangling in
"lower case, no underscore, no extra underscore")
- AC_DEFINE(_AC_FC[_FUNC(name,NAME)], [name])
- AC_DEFINE(_AC_FC[_FUNC_(name,NAME)], [name]) ;;
+ AC_DEFINE(_AC_FC[_FUNC(name,NAME)], [name])
+ AC_DEFINE(_AC_FC[_FUNC_(name,NAME)], [name]) ;;
"lower case, no underscore, extra underscore")
- AC_DEFINE(_AC_FC[_FUNC(name,NAME)], [name])
- AC_DEFINE(_AC_FC[_FUNC_(name,NAME)], [name ## _]) ;;
+ AC_DEFINE(_AC_FC[_FUNC(name,NAME)], [name])
+ AC_DEFINE(_AC_FC[_FUNC_(name,NAME)], [name ## _]) ;;
"lower case, underscore, no extra underscore")
- AC_DEFINE(_AC_FC[_FUNC(name,NAME)], [name ## _])
- AC_DEFINE(_AC_FC[_FUNC_(name,NAME)], [name ## _]) ;;
+ AC_DEFINE(_AC_FC[_FUNC(name,NAME)], [name ## _])
+ AC_DEFINE(_AC_FC[_FUNC_(name,NAME)], [name ## _]) ;;
"lower case, underscore, extra underscore")
- AC_DEFINE(_AC_FC[_FUNC(name,NAME)], [name ## _])
- AC_DEFINE(_AC_FC[_FUNC_(name,NAME)], [name ## __]) ;;
+ AC_DEFINE(_AC_FC[_FUNC(name,NAME)], [name ## _])
+ AC_DEFINE(_AC_FC[_FUNC_(name,NAME)], [name ## __]) ;;
"upper case, no underscore, no extra underscore")
- AC_DEFINE(_AC_FC[_FUNC(name,NAME)], [NAME])
- AC_DEFINE(_AC_FC[_FUNC_(name,NAME)], [NAME]) ;;
+ AC_DEFINE(_AC_FC[_FUNC(name,NAME)], [NAME])
+ AC_DEFINE(_AC_FC[_FUNC_(name,NAME)], [NAME]) ;;
"upper case, no underscore, extra underscore")
- AC_DEFINE(_AC_FC[_FUNC(name,NAME)], [NAME])
- AC_DEFINE(_AC_FC[_FUNC_(name,NAME)], [NAME ## _]) ;;
+ AC_DEFINE(_AC_FC[_FUNC(name,NAME)], [NAME])
+ AC_DEFINE(_AC_FC[_FUNC_(name,NAME)], [NAME ## _]) ;;
"upper case, underscore, no extra underscore")
- AC_DEFINE(_AC_FC[_FUNC(name,NAME)], [NAME ## _])
- AC_DEFINE(_AC_FC[_FUNC_(name,NAME)], [NAME ## _]) ;;
+ AC_DEFINE(_AC_FC[_FUNC(name,NAME)], [NAME ## _])
+ AC_DEFINE(_AC_FC[_FUNC_(name,NAME)], [NAME ## _]) ;;
"upper case, underscore, extra underscore")
- AC_DEFINE(_AC_FC[_FUNC(name,NAME)], [NAME ## _])
- AC_DEFINE(_AC_FC[_FUNC_(name,NAME)], [NAME ## __]) ;;
+ AC_DEFINE(_AC_FC[_FUNC(name,NAME)], [NAME ## _])
+ AC_DEFINE(_AC_FC[_FUNC_(name,NAME)], [NAME ## __]) ;;
*)
- AC_MSG_WARN([unknown Fortran name-mangling scheme])
- ;;
+ AC_MSG_WARN([unknown Fortran name-mangling scheme])
+ ;;
esac
])# _AC_FC_WRAPPERS
@@ -1156,7 +1156,7 @@
AC_DEFUN([AC_FC_SRCEXT],
[AC_LANG_PUSH(Fortran)dnl
AC_CACHE_CHECK([for Fortran flag to compile .$1 files],
- ac_cv_fc_srcext_$1,
+ ac_cv_fc_srcext_$1,
[ac_ext=$1
ac_fcflags_srcext_save=$ac_fcflags_srcext
ac_fcflags_srcext=
@@ -1208,27 +1208,27 @@
AC_DEFUN_ONCE([AC_FC_FREEFORM],
[AC_LANG_PUSH(Fortran)dnl
AC_CACHE_CHECK([for Fortran flag needed to allow free-form source],
- ac_cv_fc_freeform,
+ ac_cv_fc_freeform,
[ac_cv_fc_freeform=unknown
ac_fc_freeform_FCFLAGS_save=$FCFLAGS
for ac_flag in none -ffree-form -FR -free -qfree -Mfree -Mfreeform \
- -freeform "-f free"
+ -freeform "-f free"
do
test "x$ac_flag" != xnone && FCFLAGS="$ac_fc_freeform_FCFLAGS_save $ac_flag"
AC_COMPILE_IFELSE([
program freeform
! FIXME: how to best confuse non-freeform compilers?
print *, 'Hello ', &
- 'world.'
+ 'world.'
end],
- [ac_cv_fc_freeform=$ac_flag; break])
+ [ac_cv_fc_freeform=$ac_flag; break])
done
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
FCFLAGS=$ac_fc_freeform_FCFLAGS_save
])
if test "x$ac_cv_fc_freeform" = xunknown; then
m4_default([$2],
- [AC_MSG_ERROR([Fortran does not accept free-form source], 77)])
+ [AC_MSG_ERROR([Fortran does not accept free-form source], 77)])
else
if test "x$ac_cv_fc_freeform" != xnone; then
FCFLAGS="$FCFLAGS $ac_cv_fc_freeform"
Index: lib/autoconf/functions.m4
===================================================================
RCS file: /sources/autoconf/autoconf/lib/autoconf/functions.m4,v
retrieving revision 1.119
diff -u -r1.119 functions.m4
--- lib/autoconf/functions.m4 22 Dec 2006 08:42:17 -0000 1.119
+++ lib/autoconf/functions.m4 18 Jan 2007 00:31:53 -0000
@@ -1,6 +1,6 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Checking for functions.
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
# Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
@@ -280,7 +280,7 @@
# contain a buggy version. If you still want to use their alloca,
# use ar to extract alloca.o from them instead of compiling alloca.c.
AC_LIBSOURCES(alloca.c)
-AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.$ac_objext])dnl
+AC_SUBST([ALLOCA], [\$[]{LIBOBJDIR}alloca.$ac_objext])dnl
AC_DEFINE(C_ALLOCA, 1, [Define to 1 if using `alloca.c'.])
AC_CACHE_CHECK(whether `alloca.c' needs Cray hooks, ac_cv_os_cray,
@@ -1431,7 +1431,7 @@
done
done
# Provide a safe default value.
-: ${ac_cv_func_select_args='int,int *,struct timeval *'}
+: $[]{ac_cv_func_select_args='int,int *,struct timeval *'}
])
ac_save_IFS=$IFS; IFS=','
set dummy `echo "$ac_cv_func_select_args" | sed 's/\*/\*/g'`
Index: lib/autoconf/general.m4
===================================================================
RCS file: /sources/autoconf/autoconf/lib/autoconf/general.m4,v
retrieving revision 1.947
diff -u -r1.947 general.m4
--- lib/autoconf/general.m4 10 Jan 2007 17:59:57 -0000 1.947
+++ lib/autoconf/general.m4 18 Jan 2007 00:31:53 -0000
@@ -1,7 +1,7 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Parameterized macros.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -390,7 +390,7 @@
subdirs=
MFLAGS=
MAKEFLAGS=
-AC_SUBST([SHELL], [${CONFIG_SHELL-/bin/sh}])dnl
+AC_SUBST([SHELL], [$][{CONFIG_SHELL-/bin/sh}])dnl
AC_SUBST([PATH_SEPARATOR])dnl
# Identity of this package.
@@ -556,27 +556,27 @@
# by default will actually change.
# Use braces instead of parens because sh, perl, etc. also accept them.
# (The list follows the same order as the GNU Coding Standards.)
-AC_SUBST([bindir], ['${exec_prefix}/bin'])dnl
-AC_SUBST([sbindir], ['${exec_prefix}/sbin'])dnl
-AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])dnl
-AC_SUBST([datarootdir], ['${prefix}/share'])dnl
-AC_SUBST([datadir], ['${datarootdir}'])dnl
-AC_SUBST([sysconfdir], ['${prefix}/etc'])dnl
-AC_SUBST([sharedstatedir], ['${prefix}/com'])dnl
-AC_SUBST([localstatedir], ['${prefix}/var'])dnl
-AC_SUBST([includedir], ['${prefix}/include'])dnl
+AC_SUBST([bindir], ['$][{exec_prefix}/bin'])dnl
+AC_SUBST([sbindir], ['$][{exec_prefix}/sbin'])dnl
+AC_SUBST([libexecdir], ['$][{exec_prefix}/libexec'])dnl
+AC_SUBST([datarootdir], ['$][{prefix}/share'])dnl
+AC_SUBST([datadir], ['$][{datarootdir}'])dnl
+AC_SUBST([sysconfdir], ['$][{prefix}/etc'])dnl
+AC_SUBST([sharedstatedir], ['$][{prefix}/com'])dnl
+AC_SUBST([localstatedir], ['$][{prefix}/var'])dnl
+AC_SUBST([includedir], ['$][{prefix}/include'])dnl
AC_SUBST([oldincludedir], ['/usr/include'])dnl
AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
- ['${datarootdir}/doc/${PACKAGE_TARNAME}'],
- ['${datarootdir}/doc/${PACKAGE}'])])dnl
-AC_SUBST([infodir], ['${datarootdir}/info'])dnl
-AC_SUBST([htmldir], ['${docdir}'])dnl
-AC_SUBST([dvidir], ['${docdir}'])dnl
-AC_SUBST([pdfdir], ['${docdir}'])dnl
-AC_SUBST([psdir], ['${docdir}'])dnl
-AC_SUBST([libdir], ['${exec_prefix}/lib'])dnl
-AC_SUBST([localedir], ['${datarootdir}/locale'])dnl
-AC_SUBST([mandir], ['${datarootdir}/man'])dnl
+
['$][{datarootdir}/doc/$][{PACKAGE_TARNAME}'],
+ ['$][{datarootdir}/doc/$][{PACKAGE}'])])dnl
+AC_SUBST([infodir], ['$][{datarootdir}/info'])dnl
+AC_SUBST([htmldir], ['$][{docdir}'])dnl
+AC_SUBST([dvidir], ['$][{docdir}'])dnl
+AC_SUBST([pdfdir], ['$][{docdir}'])dnl
+AC_SUBST([psdir], ['$][{docdir}'])dnl
+AC_SUBST([libdir], ['$][{exec_prefix}/lib'])dnl
+AC_SUBST([localedir], ['$][{datarootdir}/locale'])dnl
+AC_SUBST([mandir], ['$][{datarootdir}/man'])dnl
ac_prev=
ac_dashdash=
@@ -873,7 +873,7 @@
AC_MSG_WARN([you should use --build, --host, --target])
expr "x$ac_option" : "[.*[^-._$as_cr_alnum]]" >/dev/null &&
AC_MSG_WARN([invalid host type: $ac_option])
- : ${build_alias=$ac_option} ${host_alias=$ac_option}
${target_alias=$ac_option}
+ : $[{]build_alias=$ac_option} $[{]host_alias=$ac_option}
$[{]target_alias=$ac_option}
;;
esac
@@ -967,7 +967,7 @@
"$2_$ac_useropt"
"*) ;;
*)
ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--$1-$ac_useropt_orig"
- ac_unrecognized_sep=', ';;
+ ac_unrecognized_sep=', ';;
esac
eval $2_$ac_useropt=m4_if([$1], [$2], [\$ac_optarg], [no]) ;;dnl
])
@@ -1398,7 +1398,7 @@
m4_define([_AC_ENABLE_IF_ACTION],
[m4_append_uniq([_AC_USER_OPTS], [$1_$2], [
])dnl
-AS_IF([test "${$1_$2+set}" = set], [$1val=$$1_$2; $3], [$4])dnl
+AS_IF([test "$][{$1_$2+set}" = set], [$1val=$$1_$2; $3], [$4])dnl
])
# AC_ARG_ENABLE(FEATURE, HELP-STRING, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
@@ -1490,10 +1490,10 @@
m4_define([_AC_ARG_VAR_STORE],
[m4_divert_text([PARSE_ARGS],
[for ac_var in $ac_precious_vars; do
- eval ac_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_env_${ac_var}_value=\$${ac_var}
- eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_cv_env_${ac_var}_value=\$${ac_var}
+ eval ac_env_$][{ac_var}_set=\$][{$][{ac_var}+set}
+ eval ac_env_$][{ac_var}_value=\$$][{ac_var}
+ eval ac_cv_env_$][{ac_var}_set=\$][{$][{ac_var}+set}
+ eval ac_cv_env_$][{ac_var}_value=\$$][{ac_var}
done])dnl
])
@@ -1517,10 +1517,10 @@
# value.
ac_cache_corrupted=false
for ac_var in $ac_precious_vars; do
- eval ac_old_set=\$ac_cv_env_${ac_var}_set
- eval ac_new_set=\$ac_env_${ac_var}_set
- eval ac_old_val=\$ac_cv_env_${ac_var}_value
- eval ac_new_val=\$ac_env_${ac_var}_value
+ eval ac_old_set=\$ac_cv_env_$][{ac_var}_set
+ eval ac_new_set=\$ac_env_$][{ac_var}_set
+ eval ac_old_val=\$ac_cv_env_$][{ac_var}_value
+ eval ac_new_val=\$ac_env_$][{ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
AS_MESSAGE([error: `$ac_var' was set to `$ac_old_val' in the previous
run], 2)
@@ -1785,7 +1785,7 @@
test -n "$target_alias" &&
test "$program_prefix$program_suffix$program_transform_name" = \
NONENONEs,x,x, &&
- program_prefix=${target_alias}-[]dnl
+ program_prefix=$[{]target_alias}-[]dnl
])# AC_CANONICAL_TARGET
@@ -1863,7 +1863,7 @@
for ac_var in `(set) 2>&1 | sed -n
['s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p']`; do
eval ac_val=\$$ac_var
case $ac_val in #(
- *${as_nl}*)
+ *$[{]as_nl}*)
case $ac_var in #(
*_cv_*) AC_MSG_WARN([Cache variable $ac_var contains a newline.]) ;;
esac
@@ -1877,7 +1877,7 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
+ *$[{]as_nl}ac_space=\ *)
# `set' does not quote correctly, so add quotes (double-quote
# substitution turns \\\\ into \\, and sed turns \\ into \).
sed -n \
@@ -1920,9 +1920,9 @@
/^ac_cv_env_/b end
t clear
:clear
- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+ s/^\([^=]*\)=\(.*[{}].*\)$/test "$][{\1+set}" = set || &/
t end
- s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+ s/^\([^=]*\)=\(.*\)$/\1=$][{\1=\2}/
:end'] >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
@@ -2189,7 +2189,7 @@
AC_DEFUN([_AC_DO_ECHO],
[m4_if([$1], [$ac_try], [], [ac_try="$1"
])dnl
-dnl If the string contains '"', '`', or '\', then just echo it rather
+dnl If the string contains '""', '`', or '\', then just echo it rather
dnl than expanding it. This is a hack, but it is safer, while also
dnl typically expanding simple substrings like '$CC', which is what we want.
dnl
@@ -2689,8 +2689,8 @@
ac_i=`AS_ECHO(["$ac_i"]) | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+ ac_libobjs="$ac_libobjs \$[{]LIBOBJDIR}$ac_i\$U.$ac_objext"
+ ac_ltlibobjs="$ac_ltlibobjs \$[{]LIBOBJDIR}$ac_i"'$U.lo'
done
AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
Index: lib/autoconf/lang.m4
===================================================================
RCS file: /sources/autoconf/autoconf/lib/autoconf/lang.m4,v
retrieving revision 1.186
diff -u -r1.186 lang.m4
--- lib/autoconf/lang.m4 17 Nov 2006 21:04:54 -0000 1.186
+++ lib/autoconf/lang.m4 18 Jan 2007 00:31:53 -0000
@@ -1,6 +1,6 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Programming languages support.
-# Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006 Free Software
+# Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007 Free Software
# Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
@@ -511,7 +511,7 @@
# certainly right.
break;;
*.* )
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ if test "[$]{ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
then :; else
ac_cv_exeext=`expr "$ac_file" : ['[^.]*\(\..*\)']`
fi
Index: lib/autoconf/libs.m4
===================================================================
RCS file: /sources/autoconf/autoconf/lib/autoconf/libs.m4,v
retrieving revision 1.25
diff -u -r1.25 libs.m4
--- lib/autoconf/libs.m4 17 Nov 2006 21:04:54 -0000 1.25
+++ lib/autoconf/libs.m4 18 Jan 2007 00:31:53 -0000
@@ -1,7 +1,7 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Checking for libraries.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -191,16 +191,16 @@
cd conftest.dir
cat >Imakefile <<'_ACEOF'
incroot:
- @echo incroot='${INCROOT}'
+ @echo incroot='$[]{INCROOT}'
usrlibdir:
- @echo usrlibdir='${USRLIBDIR}'
+ @echo usrlibdir='$[]{USRLIBDIR}'
libdir:
- @echo libdir='${LIBDIR}'
+ @echo libdir='$[]{LIBDIR}'
_ACEOF
- if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile;
then
+ if (export CC; $[]{XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile;
then
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
for ac_var in incroot usrlibdir libdir; do
- eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n
's/^$ac_var=//p'\`"
+ eval "ac_im_$ac_var=\`\$[]{MAKE-make} $ac_var 2>/dev/null | sed -n
's/^$ac_var=//p'\`"
done
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
for ac_extension in a so sl; do
Index: lib/autoconf/programs.m4
===================================================================
RCS file: /sources/autoconf/autoconf/lib/autoconf/programs.m4,v
retrieving revision 1.64
diff -u -r1.64 programs.m4
--- lib/autoconf/programs.m4 11 Jan 2007 21:17:37 -0000 1.64
+++ lib/autoconf/programs.m4 18 Jan 2007 00:31:53 -0000
@@ -2,7 +2,7 @@
# Checking for programs.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -93,7 +93,7 @@
# However, it has the same basename, so the bogon will be chosen
# first if we set $1 to just the basename; use the full file name.
shift
- ac_cv_prog_$1="$as_dir/$ac_word${1+' '}$[@]"
+ ac_cv_prog_$1="$as_dir/$ac_word$][{1+' '}$[@]"
m4_if([$2], [$4],
[ else
# Default is a loser.
@@ -222,7 +222,7 @@
# (Use different variables $1 and ac_pt_$1 so that cache vars don't conflict.)
AC_DEFUN([AC_PATH_TOOL],
[if test -n "$ac_tool_prefix"; then
- AC_PATH_PROG([$1], [${ac_tool_prefix}$2], , [$4])
+ AC_PATH_PROG([$1], [$][{ac_tool_prefix}$2], , [$4])
fi
if test -z "$ac_cv_path_$1"; then
ac_pt_$1=$$1
@@ -244,7 +244,7 @@
# (Use different variables $1 and ac_ct_$1 so that cache vars don't conflict.)
AC_DEFUN([AC_CHECK_TOOL],
[if test -n "$ac_tool_prefix"; then
- AC_CHECK_PROG([$1], [${ac_tool_prefix}$2], [${ac_tool_prefix}$2], , [$4])
+ AC_CHECK_PROG([$1], [$][{ac_tool_prefix}$2], [$][{ac_tool_prefix}$2], , [$4])
fi
if test -z "$ac_cv_prog_$1"; then
ac_ct_$1=$$1
@@ -494,7 +494,7 @@
$3 < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
- if test $ac_count -gt ${$1_max-0}; then
+ if test $ac_count -gt $][{$1_max-0}; then
# Best one so far, save it but keep looking for a better one
$2="$$1"
dnl # Using $1_max so that each tool feature checked gets its
@@ -578,7 +578,7 @@
;;
esac])
])dnl
- if test "${ac_cv_path_install+set}" = set; then
+ if test "[$]{ac_cv_path_install+set}" = set; then
INSTALL=$ac_cv_path_install
else
# As a last resort, use the slow shell script. Don't cache a
@@ -592,15 +592,15 @@
dnl relative names right.
AC_MSG_RESULT([$INSTALL])
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# Use test -z because SunOS4 sh mishandles braces in [$]{var-val}.
# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='[$]{INSTALL}'
AC_SUBST(INSTALL_PROGRAM)dnl
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='[$]{INSTALL}'
AC_SUBST(INSTALL_SCRIPT)dnl
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+test -z "$INSTALL_DATA" && INSTALL_DATA='[$]{INSTALL} -m 644'
AC_SUBST(INSTALL_DATA)dnl
])# AC_PROG_INSTALL
@@ -671,7 +671,7 @@
esac
done
done])])
- if test "${ac_cv_path_mkdir+set}" = set; then
+ if test "[$]{ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
# As a last resort, use the slow shell script. Don't cache a
@@ -737,7 +737,7 @@
fi])
AC_SUBST([LEX_OUTPUT_ROOT], [$ac_cv_prog_lex_root])dnl
-if test -z "${LEXLIB+set}"; then
+if test -z "[$]{LEXLIB+set}"; then
AC_CACHE_CHECK([lex library], [ac_cv_lib_lex], [
ac_save_LIBS=$LIBS
ac_cv_lib_lex='none needed'
@@ -803,29 +803,29 @@
AN_MAKEVAR([MAKE], [AC_PROG_MAKE_SET])
AN_PROGRAM([make], [AC_PROG_MAKE_SET])
AC_DEFUN([AC_PROG_MAKE_SET],
-[AC_MSG_CHECKING([whether ${MAKE-make} sets \$(MAKE)])
-set x ${MAKE-make}
+[AC_MSG_CHECKING([whether $][{MAKE-make} sets \$(MAKE)])
+set x [$]{MAKE-make}
ac_make=`AS_ECHO(["$[2]"]) | sed 's/+/p/g; s/[[^a-zA-Z0-9_]]/_/g'`
-AC_CACHE_VAL(ac_cv_prog_make_${ac_make}_set,
+AC_CACHE_VAL(ac_cv_prog_make_[$]{ac_make}_set,
[cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
+case `[$]{MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
- eval ac_cv_prog_make_${ac_make}_set=yes;;
+ eval ac_cv_prog_make_[$]{ac_make}_set=yes;;
*)
- eval ac_cv_prog_make_${ac_make}_set=no;;
+ eval ac_cv_prog_make_[$]{ac_make}_set=no;;
esac
rm -f conftest.make])dnl
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+if eval test \$ac_cv_prog_make_[$]{ac_make}_set = yes; then
AC_MSG_RESULT([yes])
SET_MAKE=
else
AC_MSG_RESULT([no])
- SET_MAKE="MAKE=${MAKE-make}"
+ SET_MAKE="MAKE=[$]{MAKE-make}"
fi
AC_SUBST([SET_MAKE])dnl
])# AC_PROG_MAKE_SET
Index: lib/autoconf/specific.m4
===================================================================
RCS file: /sources/autoconf/autoconf/lib/autoconf/specific.m4,v
retrieving revision 1.373
diff -u -r1.373 specific.m4
--- lib/autoconf/specific.m4 24 Oct 2006 19:34:09 -0000 1.373
+++ lib/autoconf/specific.m4 18 Jan 2007 00:31:53 -0000
@@ -2,7 +2,7 @@
# Macros that test for specific, unclassified, features.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -220,7 +220,7 @@
# /usr/tmp likewise
for ac_dir in . "$TMPDIR" /tmp /var/tmp /usr/tmp "$prefix/lib"
"$exec_prefix/lib"; do
# Skip $TMPDIR if it is empty or bogus, and skip $exec_prefix/lib
- # in the usual case where exec_prefix is '${prefix}'.
+ # in the usual case where exec_prefix is '[$]{prefix}'.
case $ac_dir in #(
. | /* | ?:[[\\/]]*) ;; #(
*) continue;;
Index: lib/autoconf/status.m4
===================================================================
RCS file: /sources/autoconf/autoconf/lib/autoconf/status.m4,v
retrieving revision 1.126
diff -u -r1.126 status.m4
--- lib/autoconf/status.m4 28 Dec 2006 23:20:18 -0000 1.126
+++ lib/autoconf/status.m4 18 Jan 2007 00:31:53 -0000
@@ -1,7 +1,7 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Parameterizing and creating config.status.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -523,16 +523,16 @@
[\$ac_cs_awk_pipe_fini])[
CEOF
_ACEOF
-]dnl end of double-quoted part
+]dnl end of double-quoted " part
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# [$]{srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
ac_vpsub=['/^[ ]*VPATH[ ]*=/{
s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
+s/:*\[$]{srcdir}:*/:/
s/:*@srcdir@:*/:/
s/^\([^=]*=[ ]*\):*/\1/
s/:*$//
@@ -580,13 +580,13 @@
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
m4_define([_AC_datarootdir_vars],
- [datadir, docdir, infodir, localedir, mandir])
+ [datadir, docdir, infodir, localedir, mandir])
case `sed -n '/datarootdir/ {
p
q
}
m4_foreach([_AC_Var], m4_defn([_AC_datarootdir_vars]),
- [/@_AC_Var@/p
+ [/@_AC_Var@/p
])' $ac_file_inputs` in
*datarootdir*) ac_datarootdir_seen=yes;;
*@[]m4_join([@*|*@], _AC_datarootdir_vars)@*)
@@ -595,9 +595,9 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_datarootdir_hack='
m4_foreach([_AC_Var], m4_defn([_AC_datarootdir_vars]),
- [s&@_AC_Var@&$_AC_Var&g
+ [s&@_AC_Var@&$_AC_Var&g
])dnl
- s&\\\${datarootdir}&$datarootdir&g' ;;
+ s&\\\[$]{datarootdir}&$datarootdir&g' ;;
esac
_ACEOF
])dnl
@@ -627,7 +627,7 @@
m4_ifndef([AC_DATAROOTDIR_CHECKED],
[test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/\$][{datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[[ ]]*datarootdir[[ ]]*:*=/p' "$tmp/out"`;
test -z "$ac_out"; } &&
AC_MSG_WARN([$ac_file contains a reference to the variable `datarootdir'
which seems to be undefined. Please make sure it is defined.])
@@ -727,7 +727,7 @@
d
:ok
s/[\\&,]/\\&/g
- s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/
'"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/
'"$ac_dA"'\1'"$ac_dB"'\2'"$][{ac_dC}"'\3'"$ac_dD"'/p
s/^\('"$ac_word_re"'\)[
]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
' >>conftest.defines
]
@@ -770,11 +770,11 @@
b
:def
_ACEOF]
- sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
+ sed $[{]ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
echo 'CEOF
sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
- sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
+ sed 1,$[{]ac_max_sed_lines}d conftest.defines >conftest.tail
grep . conftest.tail >/dev/null || break
rm -f conftest.defines
mv conftest.tail conftest.defines
@@ -1156,14 +1156,14 @@
test "x$prefix" = xNONE && prefix=$ac_default_prefix
# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+test "x$exec_prefix" = xNONE && exec_prefix='$[{]prefix}'
m4_ifdef([_AC_SEEN_CONFIG(HEADERS)], [DEFS=-DHAVE_CONFIG_H],
[AC_OUTPUT_MAKE_DEFS()])
dnl Commands to run before creating config.status.
AC_OUTPUT_COMMANDS_PRE()dnl
-: ${CONFIG_STATUS=./config.status}
+: $[{]CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
_AC_OUTPUT_CONFIG_STATUS()dnl
@@ -1219,7 +1219,7 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
+SHELL=\$[{]CONFIG_SHELL-$SHELL}
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -1469,16 +1469,16 @@
# bizarre bug on SunOS 4.1.3.
if $ac_need_defaults; then
m4_ifdef([_AC_SEEN_CONFIG(FILES)],
-[ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+[ test "$[{]CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
])dnl
m4_ifdef([_AC_SEEN_CONFIG(HEADERS)],
-[ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+[ test "$[{]CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
])dnl
m4_ifdef([_AC_SEEN_CONFIG(LINKS)],
-[ test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links
+[ test "$[{]CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links
])dnl
m4_ifdef([_AC_SEEN_CONFIG(COMMANDS)],
-[ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+[ test "$[{]CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
])dnl
fi
@@ -1612,7 +1612,7 @@
s/\$/$$/g
H
:any
-${
+$][{
g
s/^\n//
s/\n/ /g
Index: lib/autotest/general.m4
===================================================================
RCS file: /sources/autoconf/autoconf/lib/autotest/general.m4,v
retrieving revision 1.218
diff -u -r1.218 general.m4
--- lib/autotest/general.m4 25 Nov 2006 09:57:34 -0000 1.218
+++ lib/autotest/general.m4 18 Jan 2007 00:31:53 -0000
@@ -1,7 +1,7 @@
# This file is part of Autoconf. -*- Autoconf -*-
# M4 macros used in building test suites.
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
# Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@@ -169,9 +169,9 @@
m4_define([_AT_CREATE_DEBUGGING_SCRIPT],
[ {
echo "#! /bin/sh"
- echo 'test "${ZSH_VERSION+set}" = set && alias -g
'\''${1+"$[@]"}'\''='\''"$[@]"'\'''
+ echo 'test "$[]{ZSH_VERSION+set}" = set && alias -g
'\''$[]{1+"$[@]"}'\''='\''"$[@]"'\'''
AS_ECHO(["cd '$at_dir'"])
- AS_ECHO(["exec \${CONFIG_SHELL-$SHELL} $[0] -v -d $at_debug_args
$at_group \${1+\"\$[@]\"}"])
+ AS_ECHO(["exec \$[]{CONFIG_SHELL-$SHELL} $[0] -v -d $at_debug_args
$at_group \$[]{1+\"\$[@]\"}"])
echo 'exit 1'
} >$at_group_dir/run
chmod +x $at_group_dir/run
@@ -198,7 +198,7 @@
AS_PREPARE
m4_divert_push([DEFAULTS])dnl
-SHELL=${CONFIG_SHELL-/bin/sh}
+SHELL=$[]{CONFIG_SHELL-/bin/sh}
# How were we run?
at_cli_args="$[@]"
@@ -211,7 +211,7 @@
done
# Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix:
-: ${at_top_build_prefix=$at_top_builddir}
+: $[]{at_top_build_prefix=$at_top_builddir}
# atconfig delivers names relative to the directory the test suite is
# in, but the groups themselves are run in testsuite-dir/group-dir.
@@ -493,13 +493,13 @@
Execution tuning:
-k, --keywords=KEYWORDS
- select the tests matching all the comma-separated KEYWORDS
- multiple \`-k' accumulate; prefixed \`!' negates a KEYWORD
+ select the tests matching all the comma-separated KEYWORDS
+ multiple \`-k' accumulate; prefixed \`!' negates a KEYWORD
-e, --errexit abort as soon as a test fails; implies --debug
-v, --verbose force more detailed output
- default for debugging scripts
+ default for debugging scripts
-d, --debug inhibit clean up and top-level logging
- default for debugging scripts
+ default for debugging scripts
-x, --trace enable tests shell tracing
_ATEOF
m4_divert_pop([HELP_TUNING])dnl
@@ -586,8 +586,8 @@
[as_dir=`(cd "$as_dir" && pwd) 2>/dev/null`
test -d "$as_dir" || continue
case $PATH in
- $as_dir | \
- $as_dir$PATH_SEPARATOR* | \
+ $as_dir | \
+ $as_dir$PATH_SEPARATOR* | \
*$PATH_SEPARATOR$as_dir | \
*$PATH_SEPARATOR$as_dir$PATH_SEPARATOR* ) ;;
@@ -809,7 +809,7 @@
if test -f "$at_times_file"; then
at_log_msg="$at_log_msg ("`sed 1d "$at_times_file"`')'
rm -f "$at_times_file"
- fi
+ fi
AS_ECHO(["$at_log_msg"]) >> "$at_group_log"
AS_ECHO(["$at_log_msg"]) >&AS_MESSAGE_LOG_FD
@@ -851,7 +851,7 @@
at_duration_h=`expr $at_duration_m / 60`
at_duration_s=`expr $at_duration_s % 60`
at_duration_m=`expr $at_duration_m % 60`
- at_duration="${at_duration_h}h ${at_duration_m}m ${at_duration_s}s"
+ at_duration="$[]{at_duration_h}h $[]{at_duration_m}m $[]{at_duration_s}s"
AS_ECHO(["$as_me: test suite duration: $at_duration"]) >&AS_MESSAGE_LOG_FD
;;
esac
@@ -974,16 +974,16 @@
echo
for at_group in $at_fail_list
do
- at_group_normalized=$at_group
- _AT_NORMALIZE_TEST_GROUP_NUMBER(at_group_normalized)
- cat "$at_suite_dir/$at_group_normalized/$as_me.log"
- echo
+ at_group_normalized=$at_group
+ _AT_NORMALIZE_TEST_GROUP_NUMBER(at_group_normalized)
+ cat "$at_suite_dir/$at_group_normalized/$as_me.log"
+ echo
done
echo
fi
if test -n "$at_top_srcdir"; then
- AS_BOX([${at_top_build_prefix}config.log])
- sed 's/^/| /' ${at_top_build_prefix}config.log
+ AS_BOX([$[]{at_top_build_prefix}config.log])
+ sed 's/^/| /' $[]{at_top_build_prefix}config.log
echo
fi
} >&AS_MESSAGE_LOG_FD
@@ -991,18 +991,18 @@
AS_BOX([$as_me.log was created.])
echo
- AS_ECHO(["Please send \`${at_testdir+${at_testdir}/}$as_me.log' and all
information you think might help:
+ AS_ECHO(["Please send \`$[]{at_testdir+$[]{at_testdir}/}$as_me.log' and all
information you think might help:
To: <AT_PACKAGE_BUGREPORT>
Subject: @<:@AT_PACKAGE_STRING@:>@ $as_me:dnl
-$at_fail_list${at_fail_list:+ failed${at_xpass_list:+,}}dnl
-$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+$at_fail_list$[]{at_fail_list:+ failed$[]{at_xpass_list:+,}}dnl
+$at_xpass_list$[]{at_xpass_list:+ passed unexpectedly}
"])
if test $at_debug_p = false; then
echo
echo 'You may investigate any problem if you feel able to do so, in which'
echo 'case the test suite provides a good starting point. Its output may'
- AS_ECHO(["be found below \`${at_testdir+${at_testdir}/}$as_me.dir'."])
+ AS_ECHO(["be found below \`$[]{at_testdir+$[]{at_testdir}/}$as_me.dir'."])
echo
fi
exit 1
@@ -1179,7 +1179,7 @@
at_setup_line='m4_defn([AT_line])'
at_desc="AS_ESCAPE([$1])"
$at_quiet AS_ECHO_N(["m4_format([%3d: %-]m4_eval(47 - m4_qdelta([$1]))[s],
- AT_ordinal, AS_ESCAPE([[$1]]))[]"])
+ AT_ordinal, AS_ESCAPE([[$1]]))[]"])
m4_divert_push([TEST_SCRIPT])dnl
])
@@ -1412,10 +1412,10 @@
dnl Examine COMMANDS for a reason to never trace COMMANDS.
m4_pushdef([at_reason],
m4_bmatch([$1],
- [`.*`], [[a `...` command substitution]],
- [\$(], [[a $(...) command substitution]],
- [\${], [[a ${...} parameter expansion]],
- at_lf, [[an embedded newline]],
+ [`.*`], [[a `...` command substitution]],
+ [\$(], [[a $(...) command substitution]],
+ [\$][{], [[a [$]{...} parameter expansion]],
+ at_lf, [[an embedded newline]],
[[]]dnl No reason.
))dnl
dnl
@@ -1423,8 +1423,8 @@
[echo 'Not enabling shell tracing (command contains ]m4_defn([at_reason])[)'],
[m4_bmatch([$1], [\$],
dnl COMMANDS may contain parameter expansions; expand them at runtime.
-[case "AS_ESCAPE([$1], [`"\])" in
- *'
+[case "AS_ESCAPE([$1], [`\"])" in
+ *'
'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
*) at_trace_this=yes ;;
esac],
Index: lib/m4sugar/m4sh.m4
===================================================================
RCS file: /sources/autoconf/autoconf/lib/m4sugar/m4sh.m4,v
retrieving revision 1.204
diff -u -r1.204 m4sh.m4
--- lib/m4sugar/m4sh.m4 1 Dec 2006 18:32:35 -0000 1.204
+++ lib/m4sugar/m4sh.m4 18 Jan 2007 00:31:53 -0000
@@ -2,7 +2,7 @@
# M4 sugar for common shell constructs.
# Requires GNU M4 and M4sugar.
#
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
# Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
@@ -152,7 +152,7 @@
m4_define([AS_REQUIRE_SHELL_FN],
[_AS_DETECT_REQUIRED([_AS_SHELL_FN_WORK])dnl
m4_provide_if([AS_SHELL_FN_$1], [],
- [m4_provide([AS_SHELL_FN_$1])m4_divert_text([M4SH-INIT], [$1() {
+ [m4_provide([AS_SHELL_FN_$1])m4_divert_text([M4SH-INIT], [$1() {
$2
}])])])
@@ -177,12 +177,12 @@
# This is the part of AS_BOURNE_COMPATIBLE which has to be repeated inside
# each instance.
m4_define([_AS_BOURNE_COMPATIBLE],
-[AS_IF([test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1],
+[AS_IF([test -n "$][{ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1],
[emulate sh
NULLCMD=:
- [#] Zsh 3.x and 4.x performs word splitting on ${1+"$[@]"}, which
+ [#] Zsh 3.x and 4.x performs word splitting on $][{1+"$[@]"}, which
# is contrary to our usage. Disable this feature.
- alias -g '${1+"$[@]"}'='"$[@]"'
+ alias -g '$][{1+"$[@]"}'='"$[@]"'
setopt NO_GLOB_SUBST],
[AS_CASE([`(set -o) 2>/dev/null`], [*posix*], [set -o posix])])
])
@@ -243,7 +243,7 @@
AS_REQUIRE([_AS_UNSET_PREPARE])dnl
if test "x$CONFIG_SHELL" = x; then
AS_IF([_AS_RUN([_AS_DETECT_REQUIRED_BODY]) 2>/dev/null],
- [as_have_required=yes],
+ [as_have_required=yes],
[as_have_required=no])
AS_IF([test $as_have_required = yes && dnl
_AS_RUN([_AS_DETECT_SUGGESTED_BODY]) 2> /dev/null],
@@ -261,7 +261,7 @@
# Try only shells that exist, to save several forks.
AS_IF([{ test -f "$as_shell" || test -f "$as_shell.exe"; } &&
_AS_RUN([_AS_DETECT_REQUIRED_BODY],
- [("$as_shell") 2> /dev/null])],
+ [("$as_shell") 2> /dev/null])],
[CONFIG_SHELL=$as_shell
as_have_required=yes
AS_IF([_AS_RUN([_AS_DETECT_SUGGESTED_BODY], ["$as_shell" 2>
/dev/null])],
@@ -269,11 +269,11 @@
done
AS_IF([test "x$CONFIG_SHELL" != x],
- [for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$[@]"}])
+ [for as_var in BASH_ENV ENV
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ done
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" $][{1+"$[@]"}])
AS_IF([test $as_have_required = no],
[echo This script requires a shell more modern than all the
@@ -544,7 +544,7 @@
# VALUE-IF-UNSET-NOT-SUPPORTED. `as_unset' must have been computed.
m4_defun([AS_UNSET],
[AS_REQUIRE([_AS_UNSET_PREPARE])dnl
-$as_unset $1 || test "${$1+set}" != set || { $1=$2; export $1; }])
+$as_unset $1 || test "[$]{$1+set}" != set || { $1=$2; export $1; }])
@@ -1023,7 +1023,7 @@
# Compute the path separator.
m4_defun([_AS_PATH_SEPARATOR_PREPARE],
[# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if test "[$]{PATH_SEPARATOR+set}" != set; then
echo "#! /bin/sh" >conf$$.sh
echo "exit 0" >>conf$$.sh
chmod +x conf$$.sh
@@ -1105,10 +1105,10 @@
as_test_x='
eval sh -c '\''
if test -d "$[]1"; then
- test -d "$[]1/.";
+ test -d "$[]1/.";
else
case $[]1 in
- -*)set "./$[]1";;
+ -*)set "./$[]1";;
esac;
case `ls -ld'$as_ls_L_option' "$[]1" 2>/dev/null` in
???[[sx]]*):;;*)false;;esac;fi
@@ -1230,7 +1230,7 @@
# which name is inspired by PREFIX (should be 2-4 chars max).
m4_define([AS_TMPDIR],
[# Create a (secure) tmp directory for tmp files.
-m4_if([$2], [], [: ${TMPDIR=/tmp}])
+m4_if([$2], [], [: $][{TMPDIR=/tmp}])
{
tmp=`(umask 077 && mktemp -d "m4_default([$2], [$TMPDIR])/$1XXXXXX")
2>/dev/null` &&
test -n "$tmp" && test -d "$tmp"
@@ -1478,7 +1478,7 @@
m4_define([AS_VAR_GET],
[AS_LITERAL_IF([$1],
[$$1],
- [`eval 'as_val=${'m4_bpatsubst([$1], [[\\`]], [\\\&])'}
+ [`eval 'as_val=$][{'m4_bpatsubst([$1], [[\\`]], [\\\&])'}
AS_ECHO(["$as_val"])'`])])
@@ -1488,8 +1488,8 @@
# is set. Polymorphic. Should be dnl'ed.
m4_define([AS_VAR_TEST_SET],
[AS_LITERAL_IF([$1],
- [test "${$1+set}" = set],
- [{ as_var=$1; eval "test \"\${$as_var+set}\" = set"; }])])
+ [test "$][{$1+set}" = set],
+ [{ as_var=$1; eval "test \"\$][{$as_var+set}\" = set"; }])])
# AS_VAR_SET_IF(VARIABLE, IF-TRUE, IF-FALSE)
Index: m4/cond.m4
===================================================================
RCS file: /sources/automake/automake/m4/cond.m4,v
retrieving revision 1.14
diff -u -r1.14 cond.m4
--- m4/cond.m4 9 Apr 2006 07:46:55 -0000 1.14
+++ m4/cond.m4 18 Jan 2007 00:31:41 -0000
@@ -1,13 +1,13 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2007
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 8
+# serial 9
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@@ -28,7 +28,7 @@
$1_FALSE=
fi
AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+[if test -z "[$]{$1_TRUE}" && test -z "[$]{$1_FALSE}"; then
AC_MSG_ERROR([[conditional "$1" was never defined.
Usually this means the macro was only invoked conditionally.]])
fi])])
Index: m4/depend.m4
===================================================================
RCS file: /sources/automake/automake/m4/depend.m4,v
retrieving revision 1.38
diff -u -r1.38 depend.m4
--- m4/depend.m4 14 Aug 2006 20:38:39 -0000 1.38
+++ m4/depend.m4 18 Jan 2007 00:31:41 -0000
@@ -1,12 +1,12 @@
## -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 9
+# serial 10
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -36,10 +36,10 @@
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
[$1], UPC, [depcc="$UPC" am_compiler_list=],
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
+ [depcc="$$1" am_compiler_list=])
AC_CACHE_CHECK([dependency style of $depcc],
- [am_cv_$1_dependencies_compiler_type],
+ [am_cv_$1_dependencies_compiler_type],
[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
@@ -78,7 +78,7 @@
# Solaris 8's {/usr,}/bin/sh.
touch sub/conftst$i.h
done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ echo "[$]{am__include} [$]{am__quote}sub/conftest.Po[$]{am__quote}" >
confmf
case $depmode in
nosideeffect)
@@ -96,14 +96,14 @@
# mode. It turns out that the SunPro C++ compiler does not properly
# handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ source=sub/conftest.c object=sub/conftest.[$]{OBJEXT-o} \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
+ $SHELL ./depcomp $depcc -c -o sub/conftest.[$]{OBJEXT-o} sub/conftest.c
\
+ >/dev/null 2>conftest.err &&
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ grep sub/conftest.[$]{OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ [$]{MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
@@ -112,9 +112,9 @@
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_$1_dependencies_compiler_type=$depmode
- break
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_$1_dependencies_compiler_type=$depmode
+ break
fi
fi
done
@@ -138,7 +138,7 @@
# This macro is AC_REQUIREd in _AM_DEPENDENCIES
AC_DEFUN([AM_SET_DEPDIR],
[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+AC_SUBST([DEPDIR], ["[$]{am__leading_dot}deps"])dnl
])
Index: m4/init.m4
===================================================================
RCS file: /sources/automake/automake/m4/init.m4,v
retrieving revision 1.66
diff -u -r1.66 init.m4
--- m4/init.m4 30 Aug 2006 18:50:38 -0000 1.66
+++ m4/init.m4 18 Jan 2007 00:31:41 -0000
@@ -1,13 +1,13 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
+# serial 13
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -70,9 +70,9 @@
# Some tools Automake needs.
AC_REQUIRE([AM_SANITY_CHECK])dnl
AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(ACLOCAL, [aclocal-[$]{am__api_version}])
AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOMAKE, [automake-[$]{am__api_version}])
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
AM_PROG_INSTALL_SH
@@ -84,21 +84,21 @@
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
- [_AM_PROG_TAR([v7])])])
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+ [_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ [_AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_CC],
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
])
Index: m4/install-sh.m4
===================================================================
RCS file: /sources/automake/automake/m4/install-sh.m4,v
retrieving revision 1.5
diff -u -r1.5 install-sh.m4
--- m4/install-sh.m4 3 Oct 2005 20:48:59 -0000 1.5
+++ m4/install-sh.m4 18 Jan 2007 00:31:41 -0000
@@ -1,14 +1,16 @@
## -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2007 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 2
+
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+install_sh=[$]{install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
AC_SUBST(install_sh)])
Index: m4/make.m4
===================================================================
RCS file: /sources/automake/automake/m4/make.m4,v
retrieving revision 1.12
diff -u -r1.12 make.m4
--- m4/make.m4 9 Jan 2005 14:46:21 -0000 1.12
+++ m4/make.m4 18 Jan 2007 00:31:41 -0000
@@ -1,18 +1,18 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 3
+# serial 4
# AM_MAKE_INCLUDE()
# -----------------
# Check to see how make treats includes.
AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
+[am_make=[$]{MAKE-make}
cat > confinc << 'END'
am__doit:
@echo done
Index: m4/missing.m4
===================================================================
RCS file: /sources/automake/automake/m4/missing.m4,v
retrieving revision 1.25
diff -u -r1.25 missing.m4
--- m4/missing.m4 9 Jan 2005 14:46:21 -0000 1.25
+++ m4/missing.m4 18 Jan 2007 00:31:41 -0000
@@ -1,19 +1,19 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2007
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 5
+# serial 6
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
AC_DEFUN([AM_MISSING_PROG],
[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
+$1=[$]{$1-"[$]{am_missing_run}$2"}
AC_SUBST($1)])
@@ -24,7 +24,7 @@
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+test x"[$]{MISSING+set}" = xset || MISSING="\[$]{SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
Index: m4/tar.m4
===================================================================
RCS file: /sources/automake/automake/m4/tar.m4,v
retrieving revision 1.5
diff -u -r1.5 tar.m4
--- m4/tar.m4 9 Jan 2005 14:46:21 -0000 1.5
+++ m4/tar.m4 18 Jan 2007 00:31:41 -0000
@@ -1,12 +1,12 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
+# serial 3
# _AM_PROG_TAR(FORMAT)
# --------------------
@@ -25,13 +25,13 @@
[# Always define AMTAR for backward compatibility.
AM_MISSING_PROG([AMTAR], [tar])
m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+ [am__tar='[$]{AMTAR} chof - "$$tardir"'; am__untar='[$]{AMTAR} xf -'],
[m4_case([$1], [ustar],, [pax],,
- [m4_fatal([Unknown tar format])])
+ [m4_fatal([Unknown tar format])])
AC_MSG_CHECKING([how to create a $1 tar archive])
# Loop over all known methods to create a tar archive until one works.
_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+_am_tools=[$]{am_cv_prog_tar_$1-$_am_tools}
# Do not fold the above two line into one, because Tru64 sh and
# Solaris sh will not grok spaces in the rhs of `-'.
for _am_tool in $_am_tools
@@ -73,7 +73,7 @@
# If the value was cached, stop now. We just wanted to have am__tar
# and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
+ test -n "[$]{am_cv_prog_tar_$1}" && break
# tar/untar a dummy directory, and stop if the command works
rm -rf conftest.dir
- M4 syntax $11 vs. ${11},
Eric Blake <=