2005-05-24  Stepan Kasal  <address@hidden>

	* lib/m4sugar/m4sh.m4 (_AS_ECHO_LOG): New macro to factor out
	  common code; used in many places in the tree.

Index: lib/autoconf/c.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/c.m4,v
retrieving revision 1.200
diff -u -r1.200 c.m4
--- lib/autoconf/c.m4	14 May 2005 07:00:39 -0000	1.200
+++ lib/autoconf/c.m4	24 May 2005 06:02:12 -0000
@@ -479,8 +479,7 @@
 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 @@
   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])
Index: lib/autoconf/fortran.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/fortran.m4,v
retrieving revision 1.190
diff -u -r1.190 fortran.m4
--- lib/autoconf/fortran.m4	14 May 2005 07:00:39 -0000	1.190
+++ lib/autoconf/fortran.m4	24 May 2005 06:02:12 -0000
@@ -361,8 +361,7 @@
 		[_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 @@
 # 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
Index: lib/autoconf/general.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/general.m4,v
retrieving revision 1.857
diff -u -r1.857 general.m4
--- lib/autoconf/general.m4	20 May 2005 07:58:43 -0000	1.857
+++ lib/autoconf/general.m4	24 May 2005 06:02:12 -0000
@@ -2020,7 +2020,7 @@
 # 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
 ])
 
@@ -2028,7 +2028,7 @@
 # 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
 ])
 
@@ -2090,7 +2090,7 @@
 [{ ($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); }])
 
 
@@ -2108,7 +2108,7 @@
   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); }])
 
 
Index: lib/autoconf/programs.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/programs.m4,v
retrieving revision 1.44
diff -u -r1.44 programs.m4
--- lib/autoconf/programs.m4	14 May 2005 07:00:40 -0000	1.44
+++ lib/autoconf/programs.m4	24 May 2005 06:02:13 -0000
@@ -79,7 +79,7 @@
        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 @@
 [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])
Index: lib/m4sugar/m4sh.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/m4sugar/m4sh.m4,v
retrieving revision 1.140
diff -u -r1.140 m4sh.m4
--- lib/m4sugar/m4sh.m4	20 May 2005 12:08:19 -0000	1.140
+++ lib/m4sugar/m4sh.m4	24 May 2005 06:02:13 -0000
@@ -547,6 +547,13 @@
 [_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 @@
 # ----------------------------------------
 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
 ])