(_AS_ECHO_LOG): New macro

diff --git a/ChangeLog b/ChangeLog
index 4acb849d55ccafceb7149c9986902b8ecc5af67c..7a1be9226eb869b147dc6d6bf070e2cceadf4c5a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-24  Stepan Kasal  <kasal@ucw.cz>
+
+       * lib/m4sugar/m4sh.m4 (_AS_ECHO_LOG): New macro to factor out
+         common code; used in many places in the tree.
+
 2005-05-24  Stepan Kasal  <kasal@ucw.cz>
 
        * lib/m4sugar/m4sh.m4 (AS_ESCAPE): Make the pattern a bit simpler;

diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index 7ed40a04ca7a201cca924f117307307cb580f793..4612019e202b3faa003966d175d207fc91fc1966 100644 (file)
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -479,8 +479,7 @@ fi
 test -z "$CC" && AC_MSG_FAILURE([no acceptable C compiler found in \$PATH])
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for _AC_LANG compiler version" >&AS_MESSAGE_LOG_FD
+_AS_ECHO_LOG([checking for _AC_LANG compiler version])
 ac_compiler=`set X $ac_compile; echo $[2]`
 _AC_EVAL([$ac_compiler --version >&AS_MESSAGE_LOG_FD])
 _AC_EVAL([$ac_compiler -v >&AS_MESSAGE_LOG_FD])
@@ -714,8 +713,7 @@ if test -z "$CXX"; then
   fi
 fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for _AC_LANG compiler version" >&AS_MESSAGE_LOG_FD
+_AS_ECHO_LOG([checking for _AC_LANG compiler version])
 ac_compiler=`set X $ac_compile; echo $[2]`
 _AC_EVAL([$ac_compiler --version >&AS_MESSAGE_LOG_FD])
 _AC_EVAL([$ac_compiler -v >&AS_MESSAGE_LOG_FD])

diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index e4192efa36c7de08b0fcc93bd0a71184f5eaa937..f4354d24dc00300332d3dba1e0f29c8cd47df04c 100644 (file)
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -361,8 +361,7 @@ AC_CHECK_TOOLS([]_AC_FC[],
                [_AC_F95_FC _AC_F90_FC _AC_F77_FC])))
 
 # Provide some information about the compiler.
-echo "$as_me:__oline__:" \
-     "checking for _AC_LANG compiler version" >&AS_MESSAGE_LOG_FD
+_AS_ECHO_LOG([checking for _AC_LANG compiler version])
 ac_compiler=`set X $ac_compile; echo $[2]`
 _AC_EVAL([$ac_compiler --version >&AS_MESSAGE_LOG_FD])
 _AC_EVAL([$ac_compiler -v >&AS_MESSAGE_LOG_FD])
@@ -526,7 +525,8 @@ AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
 # flags.
 ac_save_FFLAGS=$[]_AC_LANG_PREFIX[]FLAGS
 _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS m4_default([$1], [$ac_cv_prog_[]_AC_LANG_ABBREV[]_v])"
-(eval echo $as_me:__oline__: \"$ac_link\") >&AS_MESSAGE_LOG_FD
+eval ac_link_cmd=\"$ac_link\"
+_AS_ECHO_LOG([$ac_link_cmd])
 ac_[]_AC_LANG_ABBREV[]_v_output=`eval $ac_link AS_MESSAGE_LOG_FD>&1 2>&1 | grep -v 'Driving:'`
 echo "$ac_[]_AC_LANG_ABBREV[]_v_output" >&AS_MESSAGE_LOG_FD
 _AC_LANG_PREFIX[]FLAGS=$ac_save_FFLAGS

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index c3db68fa119810ae0270608b82db6b1d4950c439..54736ac2351dc8b87ee7345a4da097ceaa53960a 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2019,7 +2019,7 @@ m4_define([AC_WARNING],
 # AC_MSG_CHECKING(FEATURE)
 # ------------------------
 m4_define([AC_MSG_CHECKING],
-[_AS_ECHO([$as_me:$LINENO: checking $1], AS_MESSAGE_LOG_FD)
+[_AS_ECHO_LOG([checking $1])
 _AS_ECHO_N([checking $1... ])[]dnl
 ])
 
@@ -2027,7 +2027,7 @@ _AS_ECHO_N([checking $1... ])[]dnl
 # AC_MSG_RESULT(RESULT)
 # ---------------------
 m4_define([AC_MSG_RESULT],
-[_AS_ECHO([$as_me:$LINENO: result: $1], AS_MESSAGE_LOG_FD)
+[_AS_ECHO_LOG([result: $1])
 _AS_ECHO([${ECHO_T}$1])[]dnl
 ])
 
@@ -2089,7 +2089,7 @@ AC_DEFUN([_AC_RUN_LOG],
 [{ ($2) >&AS_MESSAGE_LOG_FD
   ($1) 2>&AS_MESSAGE_LOG_FD
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+  _AS_ECHO_LOG([\$? = $ac_status])
   (exit $ac_status); }])
 
 
@@ -2107,7 +2107,7 @@ AC_DEFUN([_AC_RUN_LOG_STDERR],
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&AS_MESSAGE_LOG_FD
-  echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+  _AS_ECHO_LOG([\$? = $ac_status])
   (exit $ac_status); }])
 
 

diff --git a/lib/autoconf/programs.m4 b/lib/autoconf/programs.m4
index 4ec48d6ae3365330c4bd035526862e2c56c429c1..68e3e79b9b69bc207f61d2a71675b25f35e38efd 100644 (file)
--- a/lib/autoconf/programs.m4
+++ b/lib/autoconf/programs.m4
@@ -79,7 +79,7 @@ m4_ifvaln([$6],
        continue
      fi])dnl
     ac_cv_prog_$1="$3"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&AS_MESSAGE_LOG_FD
+    _AS_ECHO_LOG([found $as_dir/$ac_word$ac_exec_ext])
     break 2
   fi
 done])
@@ -145,7 +145,7 @@ AC_CACHE_VAL([ac_cv_path_$1],
 [for ac_exec_ext in '' $ac_executable_extensions; do
   if AS_EXECUTABLE_P(["$as_dir/$ac_word$ac_exec_ext"]); then
     ac_cv_path_$1="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&AS_MESSAGE_LOG_FD
+    _AS_ECHO_LOG([found $as_dir/$ac_word$ac_exec_ext])
     break 2
   fi
 done])

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 0eb6d3bb3a559d56d436116dcc69223043850855..ccd295a65186c1aaae190c89db994555659a25e9 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -547,6 +547,13 @@ m4_define([_AS_ECHO],
 [_AS_ECHO_UNQUOTED([_AS_QUOTE([$1])], [$2])])
 
 
+# _AS_ECHO_LOG(STRING)
+# --------------------
+# Log the string to AS_MESSAGE_LOG_FD.
+m4_define([_AS_ECHO_LOG],
+[_AS_ECHO([$as_me:$LINENO: $1], [AS_MESSAGE_LOG_FD])])
+
+
 # _AS_ECHO_N_PREPARE
 # ------------------
 # Check whether to use -n, \c, or newline-tab to separate
@@ -583,7 +590,7 @@ echo $ECHO_N "_AS_QUOTE([$1])$ECHO_C" >&m4_default([$2],
 # ----------------------------------------
 m4_define([AS_MESSAGE],
 [m4_ifset([AS_MESSAGE_LOG_FD],
-         [{ _AS_ECHO([$as_me:$LINENO: $1], [AS_MESSAGE_LOG_FD])
+         [{ _AS_ECHO_LOG([$1])
 _AS_ECHO([$as_me: $1], [$2]);}],
          [_AS_ECHO([$as_me: $1], [$2])])[]dnl
 ])