>From 0a904fd9ff37b706d9fff93268651a9f54c43f01 Mon Sep 17 00:00:00 2001 From: Peter Rosin Date: Mon, 16 Aug 2010 21:15:03 +0200 Subject: [PATCH] Ignore boilerplate logo from MSVC on stderr. * lib/autoconf/general.m4 (_AC_RUN_LOG_STDERR): Unless you pass the -NOLOGO option to MSVC, it will always output a boilerplate logo on stderr. This foils the -g check, since it sees stderr output both with and without -g and assumes -g is not the cause. So, carefully cut out the boilerplate logo from stderr. Signed-off-by: Peter Rosin --- ChangeLog | 9 +++++++++ lib/autoconf/general.m4 | 5 ++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 356d78f..11187ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-08-16 Peter Rosin + + Ignore boilerplate logo from MSVC on stderr. + * lib/autoconf/general.m4 (_AC_RUN_LOG_STDERR): Unless you pass + the -NOLOGO option to MSVC, it will always output a boilerplate + logo on stderr. This foils the -g check, since it sees stderr + output both with and without -g and assumes -g is not the cause. + So, carefully cut out the boilerplate logo from stderr. + 2010-08-14 Eric Blake AC_INIT: allow bugreport to contain '?' diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 99cc326..c27d03e 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -2305,7 +2305,10 @@ AC_DEFUN([_AC_RUN_LOG_STDERR], ($1) 2>conftest.err ac_status=$? if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 + sed -e '/^ *+/d + 1N;2N + /Microsoft.*Optimizing Compiler.*\nCopyright.*Microsoft Corp.*\n.\{0,1\}$/d' \ + conftest.err >conftest.er1 cat conftest.er1 >&AS_MESSAGE_LOG_FD mv -f conftest.er1 conftest.err fi -- 1.6.4.2