From: wolf Date: Thu, 16 Dec 1999 16:44:06 +0000 (+0000) Subject: Small fixes and improvements. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43d1947225ac235df09f7281b9a31f50d4c7d7a8;p=dealii-svn.git Small fixes and improvements. git-svn-id: https://svn.dealii.org/trunk@2077 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/configure b/deal.II/configure index 3a278beac4..77d867ddf1 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -670,11 +670,17 @@ fi if test $GXX = yes ; then # find out the right version GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "gcc version"` - if test -n `echo $GXX_VERSION_STRING | grep egcs-1.1` ; then - echo "$ac_t""Found egcs-1.1" 1>&6 + if test -n "`echo $GXX_VERSION_STRING | grep egcs-1.1`" ; then + echo "$ac_t""Compiler is egcs-1.1" 1>&6 GXX_VERSION=egcs1.1 else - GXX_VERSION=other + if test -n "`echo $GXX_VERSION_STRING | grep 'gcc version 2.95'`" ; then + echo "$ac_t""Compiler is gcc-2.95" 1>&6 + GXX_VERSION=gcc2.95 + else + echo "$ac_t""Compiler is unknown and accepted" 1>&6 + GXX_VERSION=other + fi fi else { echo "configure: error: No configuration options for this C++ compiler @@ -692,7 +698,7 @@ OS=`uname` # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:696: checking for $ac_word" >&5 +echo "configure:702: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -747,7 +753,7 @@ fi if test $withmultithreading != no ; then echo $ac_n "checking checking for ACE""... $ac_c" 1>&6 -echo "configure:751: checking checking for ACE" >&5 +echo "configure:757: checking checking for ACE" >&5 if test -d $withmultithreading ; then echo "$ac_t""found" 1>&6 else diff --git a/deal.II/configure.in b/deal.II/configure.in index c0afc6852f..f0e4ceb8ae 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -25,11 +25,17 @@ AC_PROG_CXX if test $GXX = yes ; then # find out the right version GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "gcc version"` - if test -n `echo $GXX_VERSION_STRING | grep egcs-1.1` ; then - AC_MSG_RESULT(Found egcs-1.1) + if test -n "`echo $GXX_VERSION_STRING | grep egcs-1.1`" ; then + AC_MSG_RESULT(Compiler is egcs-1.1) GXX_VERSION=egcs1.1 else - GXX_VERSION=other + if test -n "`echo $GXX_VERSION_STRING | grep 'gcc version 2.95'`" ; then + AC_MSG_RESULT(Compiler is gcc-2.95) + GXX_VERSION=gcc2.95 + else + AC_MSG_RESULT(Compiler is unknown but accepted) + GXX_VERSION=other + fi fi else AC_MSG_ERROR(No configuration options for this C++ compiler