* lib/autoconf/general.m4 (_AC_MSG_LOG_CONFTEST): New.

(_AC_PREPROC_IFELSE, _AC_COMPILE_IFELSE, _AC_LINK_IFELSE)
(_AC_RUN_IFELSE): Use it.
* lib/autoconf/lang.m4 (_AC_COMPILER_OBJEXT):
(_AC_COMPILER_EXEEXT_DEFAULT): Likewise.
* lib/autoconf/c.m4 (AC_LANG_SOURCE): Don't include confdefs.h,
inline it.

diff --git a/ChangeLog b/ChangeLog
index d6fc35e18ca579c5892c9b532f2c8331920fa9aa..ce8b944da516dafb5640dbc76eeec6430c2f2e26 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-10-31  Akim Demaille  <akim@epita.fr>
+
+       * lib/autoconf/general.m4 (_AC_MSG_LOG_CONFTEST): New.
+       (_AC_PREPROC_IFELSE, _AC_COMPILE_IFELSE, _AC_LINK_IFELSE)
+       (_AC_RUN_IFELSE): Use it.
+       * lib/autoconf/lang.m4 (_AC_COMPILER_OBJEXT):
+       (_AC_COMPILER_EXEEXT_DEFAULT): Likewise.
+       * lib/autoconf/c.m4 (AC_LANG_SOURCE): Don't include confdefs.h,
+       inline it.
+
 2002-10-30  Akim Demaille  <akim@epita.fr>
 
        * bin/autom4te.in (&parse_args, $help): Support --no-cache.

diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index 99059011e580a41937b2cd7908132424f63c8736..b5b63ba833e249a8eb156f97cb5ee8303c3b3b52 100644 (file)
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -121,7 +121,11 @@ m4_define([_AC_LANG_ABBREV(C++)], [cxx])
 # #line $LINENO "$[0]"
 m4_define([AC_LANG_SOURCE(C)],
 [#line $LINENO "configure"
-#include "confdefs.h"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 $1])
 
 

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 1b2244c3cd034aaa0267e10090144e3950b4cec9..864b85e0f6442b43ef0be19e74e1c8d1e17d67ba 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1972,6 +1972,15 @@ m4_define([AC_MSG_FAILURE],
 [AC_MSG_ERROR([$1
 See `config.log' for more details.], [$2])])
 
+
+# _AC_MSG_LOG_CONFTEST
+# --------------------
+m4_define([_AC_MSG_LOG_CONFTEST],
+[echo "$as_me: failed program was:" >&AS_MESSAGE_LOG_FD
+sed 's/^/| /' conftest.$ac_ext >&AS_MESSAGE_LOG_FD
+])
+
+
 # AU::AC_CHECKING(FEATURE)
 # ------------------------
 AU_DEFUN([AC_CHECKING],
@@ -2090,8 +2099,7 @@ fi
 if test -z "$ac_cpp_err"; then
   m4_default([$2], :)
 else
-  echo "$as_me: failed program was:" >&AS_MESSAGE_LOG_FD
-  cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD
+  _AC_MSG_LOG_CONFTEST
   $3
 fi
 rm -f conftest.err m4_ifval([$1], [conftest.$ac_ext])[]dnl
@@ -2166,8 +2174,7 @@ rm -f conftest.$ac_objext
 AS_IF([AC_TRY_EVAL(ac_compile) &&
          AC_TRY_COMMAND([test -s conftest.$ac_objext])],
       [$2],
-      [echo "$as_me: failed program was:" >&AS_MESSAGE_LOG_FD
-cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD
+      [_AC_MSG_LOG_CONFTEST
 m4_ifvaln([$3],[$3])dnl])dnl
 rm -f conftest.$ac_objext m4_ifval([$1], [conftest.$ac_ext])[]dnl
 ])# _AC_COMPILE_IFELSE
@@ -2206,8 +2213,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext
 AS_IF([AC_TRY_EVAL(ac_link) &&
          AC_TRY_COMMAND([test -s conftest$ac_exeext])],
       [$2],
-      [echo "$as_me: failed program was:" >&AS_MESSAGE_LOG_FD
-cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD
+      [_AC_MSG_LOG_CONFTEST
 m4_ifvaln([$3], [$3])dnl])[]dnl
 rm -f conftest.$ac_objext conftest$ac_exeext m4_ifval([$1], [conftest.$ac_ext])[]dnl
 ])# _AC_LINK_IFELSE
@@ -2260,8 +2266,7 @@ rm -f conftest$ac_exeext
 AS_IF([AC_TRY_EVAL(ac_link) && AC_TRY_COMMAND(./conftest$ac_exeext)],
       [$2],
       [echo "$as_me: program exited with status $ac_status" >&AS_MESSAGE_LOG_FD
-echo "$as_me: failed program was:" >&AS_MESSAGE_LOG_FD
-cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD
+_AC_MSG_LOG_CONFTEST
 m4_ifvaln([$3],
           [( exit $ac_status )
 $3])dnl])[]dnl

diff --git a/lib/autoconf/lang.m4 b/lib/autoconf/lang.m4
index ba728a0972a205cc28a65010c6be1022aa765a67..72ac4cfa11d39c60dd42c57197524f1a5ebd4d9e 100644 (file)
--- a/lib/autoconf/lang.m4
+++ b/lib/autoconf/lang.m4
@@ -478,8 +478,7 @@ do
         break;;
   esac
 done],
-      [echo "$as_me: failed program was:" >&AS_MESSAGE_LOG_FD
-cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD
+      [_AC_MSG_LOG_CONFTEST
 AC_MSG_FAILURE([_AC_LANG compiler cannot create executables], 77)])
 ac_exeext=$ac_cv_exeext
 AC_MSG_RESULT([$ac_file])
@@ -597,8 +596,7 @@ AS_IF([AC_TRY_EVAL(ac_compile)],
        break;;
   esac
 done],
-      [echo "$as_me: failed program was:" >&AS_MESSAGE_LOG_FD
-cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD
+      [_AC_MSG_LOG_CONFTEST
 AC_MSG_FAILURE([cannot compute suffix of object files: cannot compile])])
 rm -f conftest.$ac_cv_objext conftest.$ac_ext])
 AC_SUBST([OBJEXT], [$ac_cv_objext])dnl