From 1b7a55f9870bb38221432d51d3fecb6bb9c8bc9e Mon Sep 17 00:00:00 2001
From: "monty@hundin.mysql.fi" <>
Date: Mon, 25 Mar 2002 21:23:30 +0200
Subject: [PATCH] Print compiler version Optimize for pentiumpro for RPM's.

---
 Build-tools/Do-rpm |  4 ++--
 configure.in       | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Build-tools/Do-rpm b/Build-tools/Do-rpm
index 4072d575088..62c7536570a 100755
--- a/Build-tools/Do-rpm
+++ b/Build-tools/Do-rpm
@@ -153,9 +153,9 @@ set -x
 
 # Check environment
 export MYSQL_BUILD_PATH="/usr/local/bin:/my/gnu/bin:/usr/bin:/bin"
-export MYSQL_BUILD_CFLAGS="-O6 -fno-omit-frame-pointer -mpentium"
+export MYSQL_BUILD_CFLAGS="-O6 -fno-omit-frame-pointer -mcpu=pentiumpro"
 export MYSQL_BUILD_CXXFLAGS="-O6 -fno-omit-frame-pointer \
-	          -felide-constructors -fno-exceptions -fno-rtti -mpentium"
+	          -felide-constructors -fno-exceptions -fno-rtti -mcpu=pentiumpro"
 gcc -v
 
 # Make RPM
diff --git a/configure.in b/configure.in
index 48c12d3b471..03f0d1b16d5 100644
--- a/configure.in
+++ b/configure.in
@@ -126,6 +126,20 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_CPP
 
+# Print version of CC and CXX compiler (if they support --version)
+CC_VERSION=`$CC --version`
+if test $? -eq "0"
+then
+  AC_MSG_CHECKING("C Compiler version of $CC");
+  AC_MSG_RESULT($CC_VERSION)
+fi
+CXX_VERSION=`$CXX --version`
+if test $? -eq "0"
+then
+  AC_MSG_CHECKING("C++ compiler version of $CXX");
+  AC_MSG_RESULT($CXX_VERSION)
+fi
+
 # Fix for sgi gcc / sgiCC which tries to emulate gcc
 if test "$CC" = "sgicc"
 then