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.
This commit is contained in:
Stepan Kasal 2006-04-06 11:24:00 +00:00
parent 1ea9c4e1a7
commit d10fd094fa
4 changed files with 18 additions and 34 deletions

View File

@ -131,18 +131,6 @@
* lib/autoconf/types.m4 (AC_TYPE_GETGROUPS): Likewise. * lib/autoconf/types.m4 (AC_TYPE_GETGROUPS): Likewise.
* tests/compile.at: 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> 2006-04-02 Pavel Roskin <proski@gnu.org>
* doc/autoconf.texi (AC_PATH_X): Update per 2005-08-26 change. * doc/autoconf.texi (AC_PATH_X): Update per 2005-08-26 change.

View File

@ -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_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 _AC_LANG_COMPILER_GNU
GCC=`test $ac_compiler_gnu = yes && echo yes` GCC=`test $ac_compiler_gnu = yes && echo yes`
_AC_PROG_CC_G _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_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 _AC_LANG_COMPILER_GNU
GXX=`test $ac_compiler_gnu = yes && echo yes` GXX=`test $ac_compiler_gnu = yes && echo yes`
_AC_PROG_CXX_G _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_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 _AC_LANG_COMPILER_GNU
GOBJC=`test $ac_compiler_gnu = yes && echo yes` GOBJC=`test $ac_compiler_gnu = yes && echo yes`
_AC_PROG_OBJC_G _AC_PROG_OBJC_G

View File

@ -369,7 +369,7 @@ _AC_EVAL([$ac_compiler -v >&AS_MESSAGE_LOG_FD])
_AC_EVAL([$ac_compiler -V >&AS_MESSAGE_LOG_FD]) _AC_EVAL([$ac_compiler -V >&AS_MESSAGE_LOG_FD])
rm -f a.out 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 # 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.) # input file. (Note that this only needs to work for GNU compilers.)
ac_save_ext=$ac_ext ac_save_ext=$ac_ext

View File

@ -379,25 +379,22 @@ AC_BEFORE([$0], [_AC_COMPILER_EXEEXT])
AC_BEFORE([$0], [AC_LINK_IFELSE]) AC_BEFORE([$0], [AC_LINK_IFELSE])
m4_define([_AC_COMPILER_EXEEXT_TESTS], m4_define([_AC_COMPILER_EXEEXT_TESTS],
[m4_expand_once([ [if AC_TRY_EVAL(ac_link); then
if AC_TRY_EVAL(ac_link); then ac_no_link=no
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
]m4_defn([_AC_COMPILER_EXEEXT_TESTS])[ ]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 fi
]) ])
m4_define([AC_LINK_IFELSE], 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.]) AC_MSG_ERROR([Link tests are not allowed after AC@&t@_NO_EXECUTABLES.])
fi fi
]m4_defn([AC_LINK_IFELSE])) ]m4_defn([AC_LINK_IFELSE]))
@ -569,9 +566,8 @@ ac_exeext=$EXEEXT
# This macro is modified by the AC_NO_EXECUTABLES hack. # This macro is modified by the AC_NO_EXECUTABLES hack.
m4_define([_AC_COMPILER_EXEEXT_TESTS], m4_define([_AC_COMPILER_EXEEXT_TESTS],
[_AC_COMPILER_EXEEXT_DEFAULT [_AC_COMPILER_EXEEXT_DEFAULT
m4_expand_once([_AC_COMPILER_EXEEXT_CROSS _AC_COMPILER_EXEEXT_CROSS
_AC_COMPILER_EXEEXT_O]) _AC_COMPILER_EXEEXT_O])
])
# _AC_COMPILER_EXEEXT # _AC_COMPILER_EXEEXT
@ -611,7 +607,7 @@ _AC_COMPILER_EXEEXT_TESTS
ac_clean_files=$ac_clean_files_save ac_clean_files=$ac_clean_files_save
m4_expand_once([_AC_COMPILER_OBJEXT]) _AC_COMPILER_OBJEXT
rm -f conftest.* rm -f conftest.*
])# _AC_COMPILER_EXEEXT ])# _AC_COMPILER_EXEEXT