Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ooo-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1352811 - /incubator/ooo/trunk/main/configure.in
Date: Fri, 22 Jun 2012 09:02:07 -0000
To: ooo-commits@incubator.apache.org
From: hdu@apache.org
Message-Id: <20120622090207.8794E2388978@eris.apache.org>

Author: hdu
Date: Fri Jun 22 09:02:06 2012
New Revision: 1352811

URL: http://svn.apache.org/viewvc?rev=1352811&view=rev
Log:
Increase configure verbosity for MSVC version detection

The version string as reported by the compiler becomes
important when the automatism to extract the version
number failed. Dump this string into the configure log.

MSVC compilers older than 2008 are no longer supported
in the AOO build system. Other than the "too old"
error they are no longer handled in detail.

Modified:
    incubator/ooo/trunk/main/configure.in

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1352811&r1=1352810&r2=1352811&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Fri Jun 22 09:02:06 2012
@@ -2028,7 +2028,8 @@ if test "$_os" = "WINNT"; then
 			dnl  Check which Microsoft C/C++ compiler is found
 			AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler])
 dnl      The following find microsoft, matches nn.nn.nnnn then pulls numbers out.         
-			CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ {
+			CCTXTVER=`$CC 2>&1 | head -n1`
+			CCNUMVER=`echo $CCTXTVER | $AWK "/Microsoft/ && /..\\...\\...../ {
 							x = match( \\\$0, /..\\...\\...../ )
 							CCversion = substr( \\\$0, RSTART, RLENGTH)
 							tokencount = split (CCversion,vertoken,\".\")
@@ -2036,21 +2037,13 @@ dnl      The following find microsoft, m
 								printf (\"%04d\",vertoken[[i]] )
 							}
 							}"`
-			AC_MSG_RESULT([found Compiler version $CCNUMVER.])
+			AC_MSG_RESULT([found Compiler version $CCNUMVER in \"$CCTXTVER\"])
 			if test "$CCNUMVER" -ge "001500000000"; then
 				COMEX=12
 				MSVSVER=2008
 				AC_MSG_RESULT([found .NET 2008 / VS 9.0.])
-			elif test "$CCNUMVER" -ge "001400000000"; then
-				COMEX=11
-				MSVSVER=2005
-				AC_MSG_RESULT([found .NET 2005.])
-			elif test "$CCNUMVER" -ge "001300102240"; then
-				COMEX=10
-				MSVSVER=2003
-				AC_MSG_RESULT([found .NET 2003.])
 			else
-				AC_MSG_ERROR([Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler.])
+				AC_MSG_ERROR([Compiler too old. Use Microsoft C/C++ .NET 2008.])
 			fi
 		else
 			AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe.])