]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Detect recent SunCC compilers. Make warning sound less drastic.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 29 Dec 2006 19:00:55 +0000 (19:00 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 29 Dec 2006 19:00:55 +0000 (19:00 +0000)
git-svn-id: https://svn.dealii.org/trunk@14286 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4

index 5c0ed9aa4afd36383679463e8836411194e966ce..e8fd24508b164831def8736062cac43b12e174b3 100644 (file)
@@ -262,9 +262,10 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl
             GXX_VERSION_DETAILED=$GXX_VERSION
           else
   
-           dnl Sun Workshop?
-            is_sun_cc="`($CXX -V 2>&1) | grep 'Sun WorkShop'`"
-            if test "x$is_sun_cc" != "x" ; then
+           dnl Sun Workshop/Studio?
+            is_sun_cc_1="`($CXX -V 2>&1) | grep 'Sun WorkShop'`"
+            is_sun_cc_2="`($CXX -V 2>&1) | grep 'Sun C++'`"
+            if test "x$is_sun_cc_1$is_sun_cc_2" != "x" ; then
               AC_MSG_RESULT(C++ compiler is Sun Workshop compiler)
               GXX_VERSION=sun_workshop
               GXX_VERSION_DETAILED=$GXX_VERSION
@@ -692,10 +693,9 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl
           CXXFLAGSO="$CXXFLAGS -w"
           CXXFLAGSPIC="-KPIC"
           LDFLAGSPIC="-G"
-          AC_MSG_ERROR(Attention! deal.II is not known to work with SUN Compilers!
+          AC_MSG_ERROR([deal.II is known not to work with SUN Compilers!
        If you intend to port it, please remove this message
-       from aclocal.m4 and call autoconf and configure. If you do not understand
-       this, you will NOT want to do it!)
+       from aclocal.m4 and call autoconf and configure.])
           ;;
   
       portland_group)

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.