From: wolf Date: Mon, 2 Jul 2001 13:40:12 +0000 (+0000) Subject: Recognize Compaq's/DEC's cxx compiler. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc898f698ac5e1062ffffb9ff4540b99cd7a1645;p=dealii-svn.git Recognize Compaq's/DEC's cxx compiler. git-svn-id: https://svn.dealii.org/trunk@4783 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/configure b/deal.II/configure index f658dc3d9c..9c4b5887f1 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.71 +# From configure.in Revision: 1.73 @@ -1202,14 +1202,23 @@ else GXX_VERSION=MIPSpro else + # Intel's ICC C++ compiler? is_intel_icc="`($CXX -V 2>&1) | grep 'Intel(R) C++ Compiler'`" if test "x$is_intel_icc" != "x" ; then echo "$ac_t""compiler is Intel ICC" 1>&6 GXX_VERSION=intel_icc else - { echo "configure: error: Unrecognized compiler" 1>&2; exit 1; } - exit 1 + # Or DEC's cxx compiler? + is_dec_cxx="`($CXX -V 2>&1) | grep 'Compaq C++'`" + if test "x$is_dec_cxx" != "x" ; then + echo "$ac_t""compiler is Compaq cxx" 1>&6 + GXX_VERSION=compaq_cxx + else + + { echo "configure: error: Unrecognized compiler" 1>&2; exit 1; } + exit 1 + fi fi fi fi @@ -1301,15 +1310,19 @@ else if test "x$GXX_VERSION" = "xintel_icc" ; then CXXFLAGSG="$CXXFLAGS -Kc++eh -Krtti -w1 -wd175 -wd525 -wd327 -DDEBUG -inline_debug_info" - CXXFLAGSO="$CXXFLAGS -Kc++eh -Krtti -O3 -tpp6 -xiMK -unroll -w0" + CXXFLAGSO="$CXXFLAGS -Kc++eh -Krtti -O2 -tpp6 -axiMK -unroll -w0" else - - - { echo "configure: error: No compiler options for this C++ compiler - specified at present" 1>&2; exit 1; } - exit 1 + if test "x$GXX_VERSION" = "xcompaq_cxx" ; then + CXXFLAGSG="$CXXFLAGS -model ansi -std strict_ansi_errors -w0 -DDEBUG" + CXXFLAGSO="$CXXFLAGS -model ansi -accept restrict_keyword -fast" + else + + { echo "configure: error: No compiler options for this C++ compiler + specified at present" 1>&2; exit 1; } + exit 1 + fi fi fi fi @@ -1324,12 +1337,12 @@ fi for ac_func in gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1328: checking for $ac_func" >&5 +echo "configure:1341: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1384,12 +1397,12 @@ done if test "$GXX" = yes ; then echo $ac_n "checking whether -ggdb works for long symbols""... $ac_c" 1>&6 -echo "configure:1388: checking whether -ggdb works for long symbols" >&5 +echo "configure:1401: checking whether -ggdb works for long symbols" >&5 case "$target" in alpha*-osf*) CXXFLAGS="-ggdb $CXXFLAGSG" cat > conftest.$ac_ext < @@ -1410,7 +1423,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* CXXFLAGSG="-ggdb $CXXFLAGSG" @@ -1461,6 +1474,13 @@ if test $enableshared = yes ; then LDFLAGS="$LDFLAGS -KPIC" ;; + compaq_cxx) + CFLAGS="$CFLAGS -shared" + CXXFLAGSG="$CXXFLAGSG -shared" + CXXFLAGSO="$CXXFLAGSO -shared" + LDFLAGS="$LDFLAGS -shared" + ;; + *) { echo "configure: error: No shared lib options for this compiler specified" 1>&2; exit 1; } exit 1 @@ -1488,7 +1508,7 @@ if test "$enablemultithreading" = yes ; then if test "$GXX" = yes ; then echo $ac_n "checking for platform specific thread flags""... $ac_c" 1>&6 -echo "configure:1492: checking for platform specific thread flags" >&5 +echo "configure:1512: checking for platform specific thread flags" >&5 for i in threads mt pthread pthreads mthreads Kthread kthread invalid_last_entry; do CXXFLAGS="$CXXFLAGSG -$i" @@ -1524,7 +1544,7 @@ echo "configure:1492: checking for platform specific thread flags" >&5 echo $ac_n "checking for platform specific multi-threading defines""... $ac_c" 1>&6 -echo "configure:1528: checking for platform specific multi-threading defines" >&5 +echo "configure:1548: checking for platform specific multi-threading defines" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1533,7 +1553,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""not necessary"" 1>&6 @@ -1598,7 +1618,7 @@ fi if test "$withmultithreading" != no ; then echo $ac_n "checking for ACE""... $ac_c" 1>&6 -echo "configure:1602: checking for ACE" >&5 +echo "configure:1622: checking for ACE" >&5 if test -d "$withmultithreading" ; then echo "$ac_t""found" 1>&6 else @@ -1619,7 +1639,7 @@ fi if test "$enablemultithreading" = yes ; then if test "$GXX" = yes ; then echo $ac_n "checking whether compilation with ACE disallows flags""... $ac_c" 1>&6 -echo "configure:1623: checking whether compilation with ACE disallows flags" >&5 +echo "configure:1643: checking whether compilation with ACE disallows flags" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1629,7 +1649,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS="-ansi -I$withmultithreading" cat > conftest.$ac_ext < @@ -1639,7 +1659,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* deal_II_ace_remove_ansi="no" @@ -1655,7 +1675,7 @@ fi rm -f conftest* CXXFLAGS="-pedantic -Werror -I$withmultithreading" cat > conftest.$ac_ext < @@ -1665,7 +1685,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* deal_II_ace_remove_pedantic="no" @@ -1747,7 +1767,7 @@ done echo $ac_n "checking whether AssertThrow works with debug flags""... $ac_c" 1>&6 -echo "configure:1751: checking whether AssertThrow works with debug flags" >&5 +echo "configure:1771: checking whether AssertThrow works with debug flags" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1757,7 +1777,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS=$CXXFLAGSG cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""yes"" 1>&6 @@ -1785,7 +1805,7 @@ fi rm -f conftest* echo $ac_n "checking whether AssertThrow works with optimized flags""... $ac_c" 1>&6 -echo "configure:1789: checking whether AssertThrow works with optimized flags" >&5 +echo "configure:1809: checking whether AssertThrow works with optimized flags" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1795,7 +1815,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS=$CXXFLAGSO cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""yes"" 1>&6 @@ -1824,7 +1844,7 @@ rm -f conftest* echo $ac_n "checking for std::vector bug""... $ac_c" 1>&6 -echo "configure:1828: checking for std::vector bug" >&5 +echo "configure:1848: checking for std::vector bug" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1834,7 +1854,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS="$CXXFLAGSG" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 @@ -1875,7 +1895,7 @@ rm -f conftest* echo $ac_n "checking for std::iterator class""... $ac_c" 1>&6 -echo "configure:1879: checking for std::iterator class" >&5 +echo "configure:1899: checking for std::iterator class" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1885,7 +1905,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS="$CXXFLAGSG" cat > conftest.$ac_ext < @@ -1896,7 +1916,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 @@ -1917,7 +1937,7 @@ rm -f conftest* echo $ac_n "checking whether lrand48 needs to be declared with -ansi""... $ac_c" 1>&6 -echo "configure:1921: checking whether lrand48 needs to be declared with -ansi" >&5 +echo "configure:1941: checking whether lrand48 needs to be declared with -ansi" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1927,7 +1947,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS="$CXXFLAGSG" cat > conftest.$ac_ext < @@ -1943,7 +1963,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1947: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 @@ -1964,7 +1984,7 @@ rm -f conftest* echo $ac_n "checking whether getrusage is properly declared""... $ac_c" 1>&6 -echo "configure:1968: checking whether getrusage is properly declared" >&5 +echo "configure:1988: checking whether getrusage is properly declared" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1973,7 +1993,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -1985,7 +2005,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""yes"" 1>&6 @@ -2004,7 +2024,7 @@ rm -f conftest* echo $ac_n "checking whether isnan is declared with debug flags""... $ac_c" 1>&6 -echo "configure:2008: checking whether isnan is declared with debug flags" >&5 +echo "configure:2028: checking whether isnan is declared with debug flags" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -2015,7 +2035,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS=$CXXFLAGSG deal_II_isnan_flag="" cat > conftest.$ac_ext < @@ -2027,7 +2047,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""yes"" 1>&6 @@ -2043,7 +2063,7 @@ rm -f conftest* if test "x$deal_II_isnan_flag" = "x" ; then cat > conftest.$ac_ext < @@ -2055,7 +2075,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""yes"" 1>&6 @@ -2075,7 +2095,7 @@ rm -f conftest* for testflag in -D_ISOC99_SOURCE -D__EXTENSIONS__ ; do CXXFLAGS="$CXXFLAGSG $testflag" cat > conftest.$ac_ext < @@ -2087,7 +2107,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* deal_II_isnan_flag="-DHAVE_ISNAN $testflag" @@ -2100,7 +2120,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < @@ -2112,7 +2132,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN $testflag" @@ -2134,7 +2154,7 @@ rm -f conftest* fi echo $ac_n "checking whether isnan is declared with optimized flags""... $ac_c" 1>&6 -echo "configure:2138: checking whether isnan is declared with optimized flags" >&5 +echo "configure:2158: checking whether isnan is declared with optimized flags" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -2145,7 +2165,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS=$CXXFLAGSO deal_II_isnan_flag="" cat > conftest.$ac_ext < @@ -2157,7 +2177,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""yes"" 1>&6 @@ -2173,7 +2193,7 @@ rm -f conftest* if test "x$deal_II_isnan_flag" = "x" ; then cat > conftest.$ac_ext < @@ -2185,7 +2205,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""yes"" 1>&6 @@ -2205,7 +2225,7 @@ rm -f conftest* for testflag in -D_ISOC99_SOURCE -D__EXTENSIONS__ ; do CXXFLAGS="$CXXFLAGSO $testflag" cat > conftest.$ac_ext < @@ -2217,7 +2237,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* deal_II_isnan_flag="-DHAVE_ISNAN $testflag" @@ -2230,7 +2250,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < @@ -2242,7 +2262,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN $testflag" @@ -2272,7 +2292,7 @@ rm -f conftest* # Extract the first word of "f77", so it can be a program name with args. set dummy f77; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2276: checking for $ac_word" >&5 +echo "configure:2296: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_F77'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2308,7 +2328,7 @@ if test "x$F77" = "x" ; then # Extract the first word of "g77", so it can be a program name with args. set dummy g77; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2312: checking for $ac_word" >&5 +echo "configure:2332: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_F77'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2454,7 +2474,7 @@ fi # 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:2458: checking for $ac_word" >&5 +echo "configure:2478: 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 @@ -2492,7 +2512,7 @@ fi echo $ac_n "checking for HSL subroutines""... $ac_c" 1>&6 -echo "configure:2496: checking for HSL subroutines" >&5 +echo "configure:2516: checking for HSL subroutines" >&5 hsl_subroutines="" if test -r contrib/hsl/source/ma27.f ; then hsl_subroutines="$hsl_subroutines MA27" @@ -2557,7 +2577,7 @@ else fi echo $ac_n "checking for kdoc""... $ac_c" 1>&6 -echo "configure:2561: checking for kdoc" >&5 +echo "configure:2581: checking for kdoc" >&5 if test "$kdocdir" != ${DEAL2_DIR}/contrib/kdoc/bin ; then if test -r $kdocdir/kdoc ; then echo "$ac_t""found" 1>&6 @@ -2593,7 +2613,7 @@ if test "$docxx" = to-be-determined ; then # Extract the first word of ""doc++"", so it can be a program name with args. set dummy "doc++"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2597: checking for $ac_word" >&5 +echo "configure:2617: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_docxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2627,7 +2647,7 @@ fi else echo $ac_n "checking for doc++""... $ac_c" 1>&6 -echo "configure:2631: checking for doc++" >&5 +echo "configure:2651: checking for doc++" >&5 if test -x "$docxx" ; then echo "$ac_t""yes" 1>&6 else @@ -2650,16 +2670,16 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS="$CXXFLAGSG" echo $ac_n "checking for consistency of CXXFLAGSG flags""... $ac_c" 1>&6 -echo "configure:2654: checking for consistency of CXXFLAGSG flags" >&5 +echo "configure:2674: checking for consistency of CXXFLAGSG flags" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 @@ -2677,16 +2697,16 @@ rm -f conftest* CXXFLAGS="$CXXFLAGSO" echo $ac_n "checking for consistency of CXXFLAGSO flags""... $ac_c" 1>&6 -echo "configure:2681: checking for consistency of CXXFLAGSO flags" >&5 +echo "configure:2701: checking for consistency of CXXFLAGSO flags" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 diff --git a/deal.II/configure.in b/deal.II/configure.in index cade990cf7..f756c88511 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -126,15 +126,24 @@ else GXX_VERSION=MIPSpro else + # Intel's ICC C++ compiler? is_intel_icc="`($CXX -V 2>&1) | grep 'Intel(R) C++ Compiler'`" if test "x$is_intel_icc" != "x" ; then AC_MSG_RESULT(compiler is Intel ICC) GXX_VERSION=intel_icc else - dnl Aw, nothing suitable found... - AC_MSG_ERROR(Unrecognized compiler, sorry) - exit 1 + # Or DEC's cxx compiler? + is_dec_cxx="`($CXX -V 2>&1) | grep 'Compaq C++'`" + if test "x$is_dec_cxx" != "x" ; then + AC_MSG_RESULT(compiler is Compaq cxx) + GXX_VERSION=compaq_cxx + else + + dnl Aw, nothing suitable found... + AC_MSG_ERROR(Unrecognized compiler, sorry) + exit 1 + fi fi fi fi @@ -271,18 +280,19 @@ else else - dnl Other compiler - - dnl For DECs cxx we should use the following options: - dnl CXXFLAGSO: -ansi_alias -O3 - dnl CXXFLAGSG: -std strict_ansi_errors -w0 - dnl if necessary: -shared, -pthread - dnl Should one use -compress? -distinguish_nested_enums? -nousing_std? - dnl -pch? -noimplicit_include? + if test "x$GXX_VERSION" = "xcompaq_cxx" ; then + CXXFLAGSG="$CXXFLAGS -model ansi -std strict_ansi_errors -w0 -DDEBUG" + CXXFLAGSO="$CXXFLAGS -model ansi -accept restrict_keyword -fast" + dnl if necessary: -shared, -pthread + dnl Should one use -compress? -distinguish_nested_enums? -nousing_std? + dnl -pch? -noimplicit_include? + else - AC_MSG_ERROR(No compiler options for this C++ compiler - specified at present) - exit 1 + dnl Other compiler + AC_MSG_ERROR(No compiler options for this C++ compiler + specified at present) + exit 1 + fi fi fi fi @@ -383,6 +393,13 @@ if test $enableshared = yes ; then LDFLAGS="$LDFLAGS -KPIC" ;; + compaq_cxx) + CFLAGS="$CFLAGS -shared" + CXXFLAGSG="$CXXFLAGSG -shared" + CXXFLAGSO="$CXXFLAGSO -shared" + LDFLAGS="$LDFLAGS -shared" + ;; + *) AC_MSG_ERROR(No shared lib options for this compiler specified) exit 1 diff --git a/deal.II/doc/development/makefiles.1.html b/deal.II/doc/development/makefiles.1.html index 903b2b16f2..9ddbf190b3 100644 --- a/deal.II/doc/development/makefiles.1.html +++ b/deal.II/doc/development/makefiles.1.html @@ -65,7 +65,7 @@ gcc2.95, gcc2.96, gcc2.97, gcc3.0, ibm_xlc, MIPSpro, - intel_icc. Not all of + intel_icc, compaq_cxx. Not all of these compilers are actually supported (see the ReadMe file for a list of supported compilers and platforms), it is only a list of