Den 2010-08-16 20:45 skrev Ralf Wildenhues:
> Hi Peter,
> 
> * Peter Rosin wrote on Mon, Aug 16, 2010 at 08:14:50PM CEST:
>> The logo of my version of MSVC is:
>>
>> ----8<----
>> Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 14.00.50727.762 for 
>> 80x86
>> Copyright (C) Microsoft Corporation.  All rights reserved.
>>
>> ----8<----
> 
> Without having looked at the patch or your post any further at all:
> what about other versions of this compiler?  What about localized
> versions of it?

Good catch, I knew they were very similar and assumed my matching was just
about wide enough. But since I didn't check, Murphy made sure that it wasn't
working for everybody, see below...

Other versions:
MSVC 6 (I don't have access to anything older than that)
----8<----
Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8804 for 80x86
Copyright (C) Microsoft Corp 1984-1998. All rights reserved.

----8<----

MSVC++ Toolkit 2003
----8<----
Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 13.10.3077 for 80x86
Copyright (C) Microsoft Corporation 1984-2002. All rights reserved.

----8<----

MSVC 2008 (snipped from Internet, not 100% certain)
----8<----
Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 15.00.30729.01 for 80x86
Copyright (C) Microsoft Corporation.  All rights reserved.

----8<----

MSVC 2010 (snipped from Internet, not 100% certain)
----8<----
Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00 for 80x86
Copyright (C) Microsoft Corporation.  All rights reserved.

----8<----

Don't know about localization, sorry... Someone else?

So, I've updated to also match MSVC 6 (Corp instead of Corporation).

Cheers,
Peter
>From 0a904fd9ff37b706d9fff93268651a9f54c43f01 Mon Sep 17 00:00:00 2001
From: Peter Rosin <[email protected]>
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 <[email protected]>
---
 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  <[email protected]>
+
+       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  <[email protected]>
 
        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

Reply via email to