diff --git a/configure b/configure
index 27f821baca89836a9101c6e06adf6bec8f9eca09..c539becf5d2073bc2c144d2636bef18f5dfc1d81 100755
--- a/configure
+++ b/configure
@@ -1481,7 +1481,7 @@ else
   if { (eval echo configure:1482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.C | *.o | *.obj) ;;
+      *.c | *.o | *.obj) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1629,7 +1629,7 @@ fi
 
 # Create compiler version string
 if test x"$GCC" = x"yes" ; then
-  cc_string="GCC `${CC} --version`"
+  cc_string="GCC `${CC} --version | head -1`"
 else
   cc_string=$CC
 fi
diff --git a/configure.in b/configure.in
index 40be9ec52d1a49aa40ad6df51d825ff446425960..9d05ed31cbe784ca6bb0847a24a114815d572834 100644
--- a/configure.in
+++ b/configure.in
@@ -297,7 +297,7 @@ AC_SUBST(GCC)
 
 # Create compiler version string
 if test x"$GCC" = x"yes" ; then
-  cc_string="GCC `${CC} --version`"
+  cc_string="GCC `${CC} --version | head -1`"
 else
   cc_string=$CC
 fi