]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Small fixes and improvements.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 16 Dec 1999 16:44:06 +0000 (16:44 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 16 Dec 1999 16:44:06 +0000 (16:44 +0000)
git-svn-id: https://svn.dealii.org/trunk@2077 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/configure
deal.II/configure.in

index 3a278beac479a6b65f781f2b34abda99f77a0f22..77d867ddf133d91ef52de2f6855cfe109e5857d9 100755 (executable)
@@ -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
index c0afc6852fb49d7fcbb780abf04cb0b9b30a378d..f0e4ceb8ae42d39844d8054c95adc77e7b8fc328 100644 (file)
@@ -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

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.