From d3362ef2db267bead22268c75811e6e994dd91f8 Mon Sep 17 00:00:00 2001 From: wolf Date: Tue, 14 Jan 2003 21:07:37 +0000 Subject: [PATCH] . git-svn-id: https://svn.dealii.org/trunk@6918 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/configure | 92 ++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 50 deletions(-) diff --git a/deal.II/configure b/deal.II/configure index 4099ec3dcf..52772556f9 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.138 . +# From configure.in Revision: 1.139 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57. # @@ -2747,7 +2747,8 @@ echo "${ECHO_T}C++ compiler is MIPSpro C++ compiler" >&6 is_intel_icc1="`($CXX -V 2>&1) | grep 'Intel(R) C++ Compiler'`" is_intel_icc2="`($CXX -help 2>&1) | grep 'Intel(R) C++ Compiler'`" - is_intel_icc="$is_intel_icc1$is_intel_icc2" + is_intel_ecc="`($CXX -V 2>&1) | grep 'Intel(R) C++ Itanium(TM) Compiler'`" + is_intel_icc="$is_intel_icc1$is_intel_icc2$is_intel_ecc" if test "x$is_intel_icc" != "x" ; then version5="`echo $is_intel_icc | grep 'Version 5'`" version6="`echo $is_intel_icc | grep 'Version 6'`" @@ -2771,61 +2772,53 @@ echo "${ECHO_T}C++ compiler is Intel ICC" >&6 fi fi fi else - is_intel_ecc="`($CXX -V 2>&1) | grep 'Intel(R) C++ Itanium(TM) Compiler'`" - if test "x$is_intel_ecc" != "x" ; then - echo "$as_me:$LINENO: result: C++ compiler is Intel Itanium ECC" >&5 -echo "${ECHO_T}C++ compiler is Intel Itanium ECC" >&6 - GXX_VERSION=intel_ecc - else - - is_dec_cxx="`($CXX -V 2>&1) | grep 'Compaq C++'`" - if test "x$is_dec_cxx" != "x" ; then - echo "$as_me:$LINENO: result: C++ compiler is Compaq cxx" >&5 + is_dec_cxx="`($CXX -V 2>&1) | grep 'Compaq C++'`" + if test "x$is_dec_cxx" != "x" ; then + echo "$as_me:$LINENO: result: C++ compiler is Compaq cxx" >&5 echo "${ECHO_T}C++ compiler is Compaq cxx" >&6 - GXX_VERSION=compaq_cxx - else + GXX_VERSION=compaq_cxx + else - is_sun_cc="`($CXX -V 2>&1) | grep 'Sun WorkShop'`" - if test "x$is_sun_cc" != "x" ; then - echo "$as_me:$LINENO: result: C++ compiler is Sun Workshop compiler" >&5 + is_sun_cc="`($CXX -V 2>&1) | grep 'Sun WorkShop'`" + if test "x$is_sun_cc" != "x" ; then + echo "$as_me:$LINENO: result: C++ compiler is Sun Workshop compiler" >&5 echo "${ECHO_T}C++ compiler is Sun Workshop compiler" >&6 - GXX_VERSION=sun_workshop - else + GXX_VERSION=sun_workshop + else - is_sun_forte_cc="`($CXX -V 2>&1) | grep 'Forte'`" - if test "x$is_sun_forte_cc" != "x" ; then - echo "$as_me:$LINENO: result: C++ compiler is Sun Forte compiler" >&5 + is_sun_forte_cc="`($CXX -V 2>&1) | grep 'Forte'`" + if test "x$is_sun_forte_cc" != "x" ; then + echo "$as_me:$LINENO: result: C++ compiler is Sun Forte compiler" >&5 echo "${ECHO_T}C++ compiler is Sun Forte compiler" >&6 - GXX_VERSION=sun_forte - else + GXX_VERSION=sun_forte + else - is_pgcc="`($CXX -V 2>&1) | grep 'Portland Group'`" - if test "x$is_pgcc" != "x" ; then - echo "$as_me:$LINENO: result: C++ compiler is Portland Group C++" >&5 + is_pgcc="`($CXX -V 2>&1) | grep 'Portland Group'`" + if test "x$is_pgcc" != "x" ; then + echo "$as_me:$LINENO: result: C++ compiler is Portland Group C++" >&5 echo "${ECHO_T}C++ compiler is Portland Group C++" >&6 - GXX_VERSION=portland_group - else + GXX_VERSION=portland_group + else - is_aCC="`($CXX -V 2>&1) | grep 'aCC'`" - if test "x$is_aCC" != "x" ; then - echo "$as_me:$LINENO: result: C++ compiler is HP aCC" >&5 + is_aCC="`($CXX -V 2>&1) | grep 'aCC'`" + if test "x$is_aCC" != "x" ; then + echo "$as_me:$LINENO: result: C++ compiler is HP aCC" >&5 echo "${ECHO_T}C++ compiler is HP aCC" >&6 - GXX_VERSION=hp_aCC - else + GXX_VERSION=hp_aCC + else - is_kai_cc="`($CXX --version 2>&1) | grep 'KAI C++'`" - is_kai_cc="$is_kai_cc`($CXX -v 2>&1) | grep /KCC/`" - if test "x$is_kai_cc" != "x" ; then - echo "$as_me:$LINENO: result: C++ compiler is KAI C++" >&5 + is_kai_cc="`($CXX --version 2>&1) | grep 'KAI C++'`" + is_kai_cc="$is_kai_cc`($CXX -v 2>&1) | grep /KCC/`" + if test "x$is_kai_cc" != "x" ; then + echo "$as_me:$LINENO: result: C++ compiler is KAI C++" >&5 echo "${ECHO_T}C++ compiler is KAI C++" >&6 - GXX_VERSION=kai_cc - else + GXX_VERSION=kai_cc + else - { { echo "$as_me:$LINENO: error: Unrecognized compiler -- sorry" >&5 + { { echo "$as_me:$LINENO: error: Unrecognized compiler -- sorry" >&5 echo "$as_me: error: Unrecognized compiler -- sorry" >&2;} { (exit 1); exit 1; }; } - exit 1 - fi + exit 1 fi fi fi @@ -2974,7 +2967,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext intel_icc*) CXXFLAGSG="$CXXFLAGS -Kc++eh -Krtti -w1 -wd175 -wd525 -wd327 -wd424 -DDEBUG -inline_debug_info" - CXXFLAGSO="$CXXFLAGS -Kc++eh -Krtti -O2 -tpp6 -axiMK -ip -unroll -w0 -wd424" + CXXFLAGSO="$CXXFLAGS -Kc++eh -Krtti -O2 -ip -unroll -w0 -wd424" CXXFLAGSPIC="-KPIC" LDFLAGSPIC="-KPIC -shared" @@ -2987,13 +2980,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext CXXFLAGSG="$CXXFLAGSG -Xc -ansi" CXXFLAGSO="$CXXFLAGSO -ansi_alias" fi - ;; - intel_ecc) - CXXFLAGSG="$CXXFLAGS -Kc++eh -Krtti -w1 -wd175 -wd525 -wd327 -wd424 -DDEBUG -inline_debug_info" - CXXFLAGSO="$CXXFLAGS -Kc++eh -Krtti -O2 -ip -unroll -w0 -wd424" - CXXFLAGSPIC="-KPIC" - LDFLAGSPIC="-KPIC -shared" + case "$target" in + *86*) + CXXFLAGSO="$CXXFLAGSO -tpp6 -axiMK" + ;; + esac ;; compaq_cxx) -- 2.39.5