Revert this (for now):

| * lib/autoconf/c.m4 (AC_PROG_CC, AC_PROG_CXX, AC_PROG_OBJC): Call
|   _AC_COMPILER_EXEEXT instead of m4_expand_once([_AC_COMPILER_EXEEXT])
| * lib/autoconf/fortran.m4 (_AC_PROG_FC): Likewise.
| * lib/autoconf/lang.m4 (_AC_COMPILER_EXEEXT_TESTS): On subsequent
|   calls, for a new language, only check that the compiler works.
| (AC_NO_EXECUTABLES): Change the redefinition of
|   _AC_COMPILER_EXEEXT_TESTS so that on subsequent calls, it checks
|   that the new language's compiler works if ac_no_link=no, and
|   does nothing otherwise.

diff --git a/ChangeLog b/ChangeLog
index 072d3ca86059f080295eb832185c072d57345ba8..936a510200acd3c238bb5a004bd9f75cd72c7041 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -131,18 +131,6 @@
        * lib/autoconf/types.m4 (AC_TYPE_GETGROUPS): Likewise.
        * tests/compile.at: Likewise.
 
-2006-04-02  Stepan Kasal  <kasal@ucw.cz>
-
-       * lib/autoconf/c.m4 (AC_PROG_CC, AC_PROG_CXX, AC_PROG_OBJC): Call
-         _AC_COMPILER_EXEEXT instead of m4_expand_once([_AC_COMPILER_EXEEXT])
-       * lib/autoconf/fortran.m4 (_AC_PROG_FC): Likewise.
-       * lib/autoconf/lang.m4 (_AC_COMPILER_EXEEXT_TESTS): On subsequent
-         calls, for a new language, only check that the compiler works.
-       (AC_NO_EXECUTABLES): Change the redefinition of
-         _AC_COMPILER_EXEEXT_TESTS so that on subsequent calls, it checks
-         that the new language's compiler works if ac_no_link=no, and
-         does nothing otherwise.
-
 2006-04-02  Pavel Roskin  <proski@gnu.org>
 
        * doc/autoconf.texi (AC_PATH_X): Update per 2005-08-26 change.

diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index 425f695f421552d7d75b8110a6a903e6311e6e1b..526d28eb3b5b937f15bf7966b67836cf3025ccdb 100644 (file)
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -547,7 +547,7 @@ _AC_EVAL([$ac_compiler --version >&AS_MESSAGE_LOG_FD])
 _AC_EVAL([$ac_compiler -v >&AS_MESSAGE_LOG_FD])
 _AC_EVAL([$ac_compiler -V >&AS_MESSAGE_LOG_FD])
 
-_AC_COMPILER_EXEEXT
+m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
 _AC_LANG_COMPILER_GNU
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 _AC_PROG_CC_G
@@ -774,7 +774,7 @@ _AC_EVAL([$ac_compiler --version >&AS_MESSAGE_LOG_FD])
 _AC_EVAL([$ac_compiler -v >&AS_MESSAGE_LOG_FD])
 _AC_EVAL([$ac_compiler -V >&AS_MESSAGE_LOG_FD])
 
-_AC_COMPILER_EXEEXT
+m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
 _AC_LANG_COMPILER_GNU
 GXX=`test $ac_compiler_gnu = yes && echo yes`
 _AC_PROG_CXX_G
@@ -905,7 +905,7 @@ _AC_EVAL([$ac_compiler --version >&AS_MESSAGE_LOG_FD])
 _AC_EVAL([$ac_compiler -v >&AS_MESSAGE_LOG_FD])
 _AC_EVAL([$ac_compiler -V >&AS_MESSAGE_LOG_FD])
 
-_AC_COMPILER_EXEEXT
+m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
 _AC_LANG_COMPILER_GNU
 GOBJC=`test $ac_compiler_gnu = yes && echo yes`
 _AC_PROG_OBJC_G

diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index e809176942e014be9d81ce154f8082ce73529365..37e447bb33498180c7b2b236c2a6649935432440 100644 (file)
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -369,7 +369,7 @@ _AC_EVAL([$ac_compiler -v >&AS_MESSAGE_LOG_FD])
 _AC_EVAL([$ac_compiler -V >&AS_MESSAGE_LOG_FD])
 rm -f a.out
 
-_AC_COMPILER_EXEEXT
+m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
 # If we don't use `.F' as extension, the preprocessor is not run on the
 # input file.  (Note that this only needs to work for GNU compilers.)
 ac_save_ext=$ac_ext

diff --git a/lib/autoconf/lang.m4 b/lib/autoconf/lang.m4
index 7739aa4552cb43b9563579c0b5128ad5f4860ae4..dd76a11cde079cad52b4ae253cc2c0afb360d667 100644 (file)
--- a/lib/autoconf/lang.m4
+++ b/lib/autoconf/lang.m4
@@ -379,25 +379,22 @@ AC_BEFORE([$0], [_AC_COMPILER_EXEEXT])
 AC_BEFORE([$0], [AC_LINK_IFELSE])
 
 m4_define([_AC_COMPILER_EXEEXT_TESTS],
-[m4_expand_once([
-   if AC_TRY_EVAL(ac_link); then
-     ac_no_link=no
-   else
-     ac_no_link=yes
-     # Setting cross_compile will disable run tests; it will
-     # also disable AC_CHECK_FILE but that's generally
-     # correct if we can't link.
-     cross_compiling=yes
-     EXEEXT=
-     _AC_COMPILER_EXEEXT_CROSS
-   fi])
-if test $ac_no_link = no; then
+[if AC_TRY_EVAL(ac_link); then
+  ac_no_link=no
   ]m4_defn([_AC_COMPILER_EXEEXT_TESTS])[
+else
+  ac_no_link=yes
+  # Setting cross_compile will disable run tests; it will
+  # also disable AC_CHECK_FILE but that's generally
+  # correct if we can't link.
+  cross_compiling=yes
+  EXEEXT=
+  _AC_COMPILER_EXEEXT_CROSS
 fi
 ])
 
 m4_define([AC_LINK_IFELSE],
-[if test $ac_no_link = yes; then
+[if test x$ac_no_link = xyes; then
   AC_MSG_ERROR([Link tests are not allowed after AC@&t@_NO_EXECUTABLES.])
 fi
 ]m4_defn([AC_LINK_IFELSE]))
@@ -569,9 +566,8 @@ ac_exeext=$EXEEXT
 # This macro is modified by the AC_NO_EXECUTABLES hack.
 m4_define([_AC_COMPILER_EXEEXT_TESTS],
 [_AC_COMPILER_EXEEXT_DEFAULT
- m4_expand_once([_AC_COMPILER_EXEEXT_CROSS
-   _AC_COMPILER_EXEEXT_O])
-])
+_AC_COMPILER_EXEEXT_CROSS
+_AC_COMPILER_EXEEXT_O])
 
 
 # _AC_COMPILER_EXEEXT
@@ -611,7 +607,7 @@ _AC_COMPILER_EXEEXT_TESTS
 
 ac_clean_files=$ac_clean_files_save
 
-m4_expand_once([_AC_COMPILER_OBJEXT])
+_AC_COMPILER_OBJEXT
 
 rm -f conftest.*
 ])# _AC_COMPILER_EXEEXT