From: Wolfgang Bangerth Date: Tue, 15 Mar 2005 00:10:07 +0000 (+0000) Subject: Also figure out the detailed version number of the compiler. X-Git-Tag: v8.0.0~14395 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d3f295f1602db406ebe6f77e6619414603d7abb;p=dealii.git Also figure out the detailed version number of the compiler. git-svn-id: https://svn.dealii.org/trunk@10141 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 0267781e8c..1920e8ff7c 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -41,8 +41,15 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "gcc version"` case "$GXX_VERSION_STRING" in *2.95*) - AC_MSG_RESULT(C++ compiler is gcc-2.95) GXX_VERSION=gcc2.95 + case "$GXX_VERSION_STRING" in + *version\ 2.95.0*) GXX_VERSION_DETAILED=gcc2.95.0 ;; + *version\ 2.95.1*) GXX_VERSION_DETAILED=gcc2.95.1 ;; + *version\ 2.95.2*) GXX_VERSION_DETAILED=gcc2.95.2 ;; + *version\ 2.95.3*) GXX_VERSION_DETAILED=gcc2.95.3 ;; + *version\ 2.95.4*) GXX_VERSION_DETAILED=gcc2.95.4 ;; + *) GXX_VERSION_DETAILED=gcc2.95.x ;; + esac ;; *2.96*) AC_MSG_ERROR(C++ compiler reports faulty gcc 2.96. Please install a new compiler) @@ -53,32 +60,63 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl GXX_VERSION=gcc2.97 ;; *version\ 3.0*) - AC_MSG_RESULT(C++ compiler is gcc-3.0) GXX_VERSION=gcc3.0 + case "$GXX_VERSION_STRING" in + *version\ 3.0.0*) GXX_VERSION_DETAILED=gcc3.0.0 ;; + *version\ 3.0.1*) GXX_VERSION_DETAILED=gcc3.0.1 ;; + *version\ 3.0.2*) GXX_VERSION_DETAILED=gcc3.0.2 ;; + *version\ 3.0.3*) GXX_VERSION_DETAILED=gcc3.0.3 ;; + *version\ 3.0.4*) GXX_VERSION_DETAILED=gcc3.0.4 ;; + *) GXX_VERSION_DETAILED=gcc3.0.x ;; + esac ;; *version\ 3.1*) - AC_MSG_RESULT(C++ compiler is gcc-3.1) GXX_VERSION=gcc3.1 + case "$GXX_VERSION_STRING" in + *version\ 3.1.0*) GXX_VERSION_DETAILED=gcc3.1.0 ;; + *version\ 3.1.1*) GXX_VERSION_DETAILED=gcc3.1.1 ;; + *) GXX_VERSION_DETAILED=gcc3.1.x ;; + esac ;; *version\ 3.2*) - AC_MSG_RESULT(C++ compiler is gcc-3.2) GXX_VERSION=gcc3.2 + case "$GXX_VERSION_STRING" in + *version\ 3.2.0*) GXX_VERSION_DETAILED=gcc3.2.0 ;; + *version\ 3.2.1*) GXX_VERSION_DETAILED=gcc3.2.1 ;; + *version\ 3.2.2*) GXX_VERSION_DETAILED=gcc3.2.2 ;; + *version\ 3.2.3*) GXX_VERSION_DETAILED=gcc3.2.3 ;; + *) GXX_VERSION_DETAILED=gcc3.2.x ;; + esac ;; *version\ 3.3*) - AC_MSG_RESULT(C++ compiler is gcc-3.3) GXX_VERSION=gcc3.3 + case "$GXX_VERSION_STRING" in + *version\ 3.3.0*) GXX_VERSION_DETAILED=gcc3.3.0 ;; + *version\ 3.3.1*) GXX_VERSION_DETAILED=gcc3.3.1 ;; + *version\ 3.3.2*) GXX_VERSION_DETAILED=gcc3.3.2 ;; + *version\ 3.3.3*) GXX_VERSION_DETAILED=gcc3.3.3 ;; + *version\ 3.3.4*) GXX_VERSION_DETAILED=gcc3.3.4 ;; + *) GXX_VERSION_DETAILED=gcc3.3.x ;; + esac ;; *version\ 3.4*) - AC_MSG_RESULT(C++ compiler is gcc-3.4) + case "$GXX_VERSION_STRING" in + *version\ 3.4.0*) GXX_VERSION_DETAILED=gcc3.4.0 ;; + *version\ 3.4.1*) GXX_VERSION_DETAILED=gcc3.4.1 ;; + *version\ 3.4.2*) GXX_VERSION_DETAILED=gcc3.4.2 ;; + *version\ 3.4.3*) GXX_VERSION_DETAILED=gcc3.4.3 ;; + *version\ 3.4.4*) GXX_VERSION_DETAILED=gcc3.4.4 ;; + *) GXX_VERSION_DETAILED=gcc3.4.x ;; + esac GXX_VERSION=gcc3.4 ;; - *version\ 3.5*) - AC_MSG_RESULT(C++ compiler is gcc-3.5) - GXX_VERSION=gcc3.5 - ;; *version\ 4.0*) - AC_MSG_RESULT(C++ compiler is gcc-4.0) GXX_VERSION=gcc4.0 + case "$GXX_VERSION_STRING" in + *version\ 4.0.0*) GXX_VERSION_DETAILED=gcc4.0.0 ;; + *version\ 4.0.1*) GXX_VERSION_DETAILED=gcc4.0.1 ;; + *) GXX_VERSION_DETAILED=gcc4.0.x ;; + esac ;; *2.4* | *2.5* | *2.6* | *2.7* | *2.8*) dnl These compilers are too old to support a useful subset @@ -91,6 +129,9 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl GXX_VERSION=gcc-other ;; esac + AC_MSG_RESULT([C++ compiler is $GXX_VERSION (subversion $GXX_VERSION_DETAILED)]) + + else dnl Check other (non-gcc) compilers @@ -105,6 +146,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl dnl high... AC_MSG_RESULT(C++ compiler is IBM xlC) GXX_VERSION=ibm_xlc + GXX_VERSION_DETAILED=$GXX_VERSION else dnl Check whether we are dealing with the MIPSpro C++ compiler @@ -117,24 +159,29 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl AC_MSG_RESULT(C++ compiler is $mips_pro) AC_MSG_ERROR(This compiler is not supported) GXX_VERSION=MIPSpro7.3 + GXX_VERSION_DETAILED=$GXX_VERSION ;; *7.4) AC_MSG_RESULT(C++ compiler is MIPSpro compiler 7.4) AC_MSG_ERROR(This compiler is not supported. Use MIPSPro compiler 7.4x) GXX_VERSION=MIPSpro7.4 + GXX_VERSION_DETAILED=$GXX_VERSION ;; *7.41* | *7.42* | *7.43* | *7.44*) AC_MSG_RESULT(C++ compiler is MIPSpro compiler 7.4x) GXX_VERSION=MIPSpro7.4x + GXX_VERSION_DETAILED=$GXX_VERSION ;; *"7.5"*) AC_MSG_RESULT(C++ compiler is MIPSpro compiler 7.5) GXX_VERSION=MIPSpro7.5 + GXX_VERSION_DETAILED=$GXX_VERSION ;; *) AC_MSG_RESULT(C++ compiler is unknown version but accepted MIPSpro compiler version) GXX_VERSION=MIPSpro-other - ;; + GXX_VERSION_DETAILED=$GXX_VERSION + ;; esac else @@ -170,6 +217,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl AC_MSG_RESULT(C++ compiler is Intel ICC) GXX_VERSION=intel_icc fi fi fi fi + GXX_VERSION_DETAILED=$GXX_VERSION else dnl Or DEC's cxx compiler? @@ -177,6 +225,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl if test "x$is_dec_cxx" != "x" ; then AC_MSG_RESULT(C++ compiler is Compaq cxx) GXX_VERSION=compaq_cxx + GXX_VERSION_DETAILED=$GXX_VERSION else dnl Sun Workshop? @@ -184,6 +233,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl if test "x$is_sun_cc" != "x" ; then AC_MSG_RESULT(C++ compiler is Sun Workshop compiler) GXX_VERSION=sun_workshop + GXX_VERSION_DETAILED=$GXX_VERSION else dnl Sun Forte? @@ -191,6 +241,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl if test "x$is_sun_forte_cc" != "x" ; then AC_MSG_RESULT(C++ compiler is Sun Forte compiler) GXX_VERSION=sun_forte + GXX_VERSION_DETAILED=$GXX_VERSION else dnl Portland Group C++? @@ -198,21 +249,24 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl if test "x$is_pgcc" != "x" ; then AC_MSG_RESULT(C++ compiler is Portland Group C++) GXX_VERSION=portland_group - else + GXX_VERSION_DETAILED=$GXX_VERSION + else dnl HP aCC? is_aCC="`($CXX -V 2>&1) | grep 'aCC'`" if test "x$is_aCC" != "x" ; then AC_MSG_RESULT(C++ compiler is HP aCC) GXX_VERSION=hp_aCC - else + GXX_VERSION_DETAILED=$GXX_VERSION + else dnl Borland C++ is_bcc="`($CXX -h 2>&1) | grep 'Borland'`" if test "x$is_bcc" != "x" ; then AC_MSG_RESULT(C++ compiler is Borland C++) GXX_VERSION=borland_bcc - else + GXX_VERSION_DETAILED=$GXX_VERSION + else dnl KAI C++? It seems as if the documented options dnl -V and --version are not always supported, so give @@ -228,11 +282,13 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl if test "x$is_kai_cc" != "x" ; then AC_MSG_RESULT(C++ compiler is KAI C++) GXX_VERSION=kai_cc - else + GXX_VERSION_DETAILED=$GXX_VERSION + else dnl Aw, nothing suitable found... AC_MSG_RESULT(Unrecognized C++ compiler -- Try to go ahead and get help from dealii@dealii.org) GXX_VERSION=unknown_cc + GXX_VERSION_DETAILED=$GXX_VERSION fi fi fi diff --git a/deal.II/configure b/deal.II/configure index 3df8112262..dcca7119cb 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.187 . +# From configure.in Revision: 1.189 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -274,7 +274,7 @@ PACKAGE_BUGREPORT= ac_unique_file="deal.II" ac_subdirs_all="$ac_subdirs_all contrib tests" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DEAL_II_VERSION DEAL_II_MAJOR DEAL_II_MINOR DEAL_II_PATH DEAL2_DIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GXX_VERSION CXXFLAGSG CXXFLAGSO CXXFLAGSPIC SHLIBLD CC_VERSION enablemultithreading withmultithreading F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared static_lib_suffix shared_lib_suffix AR RANLIB ac_ct_RANLIB NEEDS_F77LIBS HSL_INCLUDE_DIR USE_CONTRIB_HSL TECPLOT_INCLUDE_DIR USE_CONTRIB_PETSC DEAL_II_PETSC_DIR DEAL_II_PETSC_ARCH DEAL_II_PETSC_VERSION_MAJOR DEAL_II_PETSC_VERSION_MINOR DEAL_II_PETSC_VERSION_SUBMINOR DEAL_II_DEFINE_DEAL_II_USE_PETSC USE_CONTRIB_METIS DEAL_II_METIS_DIR UMFPACK_LIB UMFPACK_INCLUDE_DIR USE_CONTRIB_UMFPACK DOXYGEN DOT DEAL_II_HAVE_DOT PERL subdirs LDFLAGSPIC LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DEAL_II_VERSION DEAL_II_MAJOR DEAL_II_MINOR DEAL_II_PATH DEAL2_DIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GXX_VERSION GXX_VERSION_DETAILED CXXFLAGSG CXXFLAGSO CXXFLAGSPIC SHLIBLD CC_VERSION enablemultithreading withmultithreading F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared static_lib_suffix shared_lib_suffix AR RANLIB ac_ct_RANLIB NEEDS_F77LIBS HSL_INCLUDE_DIR USE_CONTRIB_HSL TECPLOT_INCLUDE_DIR USE_CONTRIB_PETSC DEAL_II_PETSC_DIR DEAL_II_PETSC_ARCH DEAL_II_PETSC_VERSION_MAJOR DEAL_II_PETSC_VERSION_MINOR DEAL_II_PETSC_VERSION_SUBMINOR DEAL_II_DEFINE_DEAL_II_USE_PETSC USE_CONTRIB_METIS DEAL_II_METIS_DIR UMFPACK_LIB UMFPACK_INCLUDE_DIR USE_CONTRIB_UMFPACK DOXYGEN DOT DEAL_II_HAVE_DOT PERL subdirs LDFLAGSPIC LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -2838,15 +2838,16 @@ fi if test "$GXX" = yes ; then GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "gcc version"` case "$GXX_VERSION_STRING" in - *"egcs-1.1"*) - echo "$as_me:$LINENO: result: C++ compiler is egcs-1.1" >&5 -echo "${ECHO_T}C++ compiler is egcs-1.1" >&6 - GXX_VERSION=egcs1.1 - ;; *2.95*) - echo "$as_me:$LINENO: result: C++ compiler is gcc-2.95" >&5 -echo "${ECHO_T}C++ compiler is gcc-2.95" >&6 GXX_VERSION=gcc2.95 + case "$GXX_VERSION_STRING" in + *version\ 2.95.0*) GXX_VERSION_DETAILED=gcc2.95.0 ;; + *version\ 2.95.1*) GXX_VERSION_DETAILED=gcc2.95.1 ;; + *version\ 2.95.2*) GXX_VERSION_DETAILED=gcc2.95.2 ;; + *version\ 2.95.3*) GXX_VERSION_DETAILED=gcc2.95.3 ;; + *version\ 2.95.4*) GXX_VERSION_DETAILED=gcc2.95.4 ;; + *) GXX_VERSION_DETAILED=gcc2.95.x ;; + esac ;; *2.96*) { { echo "$as_me:$LINENO: error: C++ compiler reports faulty gcc 2.96. Please install a new compiler" >&5 @@ -2860,39 +2861,63 @@ echo "${ECHO_T}C++ compiler is gcc-2.97" >&6 GXX_VERSION=gcc2.97 ;; *version\ 3.0*) - echo "$as_me:$LINENO: result: C++ compiler is gcc-3.0" >&5 -echo "${ECHO_T}C++ compiler is gcc-3.0" >&6 GXX_VERSION=gcc3.0 + case "$GXX_VERSION_STRING" in + *version\ 3.0.0*) GXX_VERSION_DETAILED=gcc3.0.0 ;; + *version\ 3.0.1*) GXX_VERSION_DETAILED=gcc3.0.1 ;; + *version\ 3.0.2*) GXX_VERSION_DETAILED=gcc3.0.2 ;; + *version\ 3.0.3*) GXX_VERSION_DETAILED=gcc3.0.3 ;; + *version\ 3.0.4*) GXX_VERSION_DETAILED=gcc3.0.4 ;; + *) GXX_VERSION_DETAILED=gcc3.0.x ;; + esac ;; *version\ 3.1*) - echo "$as_me:$LINENO: result: C++ compiler is gcc-3.1" >&5 -echo "${ECHO_T}C++ compiler is gcc-3.1" >&6 GXX_VERSION=gcc3.1 + case "$GXX_VERSION_STRING" in + *version\ 3.1.0*) GXX_VERSION_DETAILED=gcc3.1.0 ;; + *version\ 3.1.1*) GXX_VERSION_DETAILED=gcc3.1.1 ;; + *) GXX_VERSION_DETAILED=gcc3.1.x ;; + esac ;; *version\ 3.2*) - echo "$as_me:$LINENO: result: C++ compiler is gcc-3.2" >&5 -echo "${ECHO_T}C++ compiler is gcc-3.2" >&6 GXX_VERSION=gcc3.2 + case "$GXX_VERSION_STRING" in + *version\ 3.2.0*) GXX_VERSION_DETAILED=gcc3.2.0 ;; + *version\ 3.2.1*) GXX_VERSION_DETAILED=gcc3.2.1 ;; + *version\ 3.2.2*) GXX_VERSION_DETAILED=gcc3.2.2 ;; + *version\ 3.2.3*) GXX_VERSION_DETAILED=gcc3.2.3 ;; + *) GXX_VERSION_DETAILED=gcc3.2.x ;; + esac ;; *version\ 3.3*) - echo "$as_me:$LINENO: result: C++ compiler is gcc-3.3" >&5 -echo "${ECHO_T}C++ compiler is gcc-3.3" >&6 GXX_VERSION=gcc3.3 + case "$GXX_VERSION_STRING" in + *version\ 3.3.0*) GXX_VERSION_DETAILED=gcc3.3.0 ;; + *version\ 3.3.1*) GXX_VERSION_DETAILED=gcc3.3.1 ;; + *version\ 3.3.2*) GXX_VERSION_DETAILED=gcc3.3.2 ;; + *version\ 3.3.3*) GXX_VERSION_DETAILED=gcc3.3.3 ;; + *version\ 3.3.4*) GXX_VERSION_DETAILED=gcc3.3.4 ;; + *) GXX_VERSION_DETAILED=gcc3.3.x ;; + esac ;; *version\ 3.4*) - echo "$as_me:$LINENO: result: C++ compiler is gcc-3.4" >&5 -echo "${ECHO_T}C++ compiler is gcc-3.4" >&6 + case "$GXX_VERSION_STRING" in + *version\ 3.4.0*) GXX_VERSION_DETAILED=gcc3.4.0 ;; + *version\ 3.4.1*) GXX_VERSION_DETAILED=gcc3.4.1 ;; + *version\ 3.4.2*) GXX_VERSION_DETAILED=gcc3.4.2 ;; + *version\ 3.4.3*) GXX_VERSION_DETAILED=gcc3.4.3 ;; + *version\ 3.4.4*) GXX_VERSION_DETAILED=gcc3.4.4 ;; + *) GXX_VERSION_DETAILED=gcc3.4.x ;; + esac GXX_VERSION=gcc3.4 ;; - *version\ 3.5*) - echo "$as_me:$LINENO: result: C++ compiler is gcc-3.5" >&5 -echo "${ECHO_T}C++ compiler is gcc-3.5" >&6 - GXX_VERSION=gcc3.5 - ;; *version\ 4.0*) - echo "$as_me:$LINENO: result: C++ compiler is gcc-4.0" >&5 -echo "${ECHO_T}C++ compiler is gcc-4.0" >&6 GXX_VERSION=gcc4.0 + case "$GXX_VERSION_STRING" in + *version\ 4.0.0*) GXX_VERSION_DETAILED=gcc4.0.0 ;; + *version\ 4.0.1*) GXX_VERSION_DETAILED=gcc4.0.1 ;; + *) GXX_VERSION_DETAILED=gcc4.0.x ;; + esac ;; *2.4* | *2.5* | *2.6* | *2.7* | *2.8*) echo "$as_me:$LINENO: result: C++ compiler is $GXX_VERSION_STRING" >&5 @@ -2907,6 +2932,10 @@ echo "${ECHO_T}C++ compiler is unknown but accepted gcc version" >&6 GXX_VERSION=gcc-other ;; esac + echo "$as_me:$LINENO: result: C++ compiler is $GXX_VERSION (subversion $GXX_VERSION_DETAILED)" >&5 +echo "${ECHO_T}C++ compiler is $GXX_VERSION (subversion $GXX_VERSION_DETAILED)" >&6 + + else is_ibm_xlc="`($CXX 2>&1) | egrep 'VisualAge C++|C Set ++|C for AIX Compiler'`" @@ -2914,6 +2943,7 @@ echo "${ECHO_T}C++ compiler is unknown but accepted gcc version" >&6 echo "$as_me:$LINENO: result: C++ compiler is IBM xlC" >&5 echo "${ECHO_T}C++ compiler is IBM xlC" >&6 GXX_VERSION=ibm_xlc + GXX_VERSION_DETAILED=$GXX_VERSION else mips_pro="`($CXX -version 2>&1) | grep MIPSpro`" @@ -2926,6 +2956,7 @@ echo "${ECHO_T}C++ compiler is $mips_pro" >&6 echo "$as_me: error: This compiler is not supported" >&2;} { (exit 1); exit 1; }; } GXX_VERSION=MIPSpro7.3 + GXX_VERSION_DETAILED=$GXX_VERSION ;; *7.4) echo "$as_me:$LINENO: result: C++ compiler is MIPSpro compiler 7.4" >&5 @@ -2934,22 +2965,26 @@ echo "${ECHO_T}C++ compiler is MIPSpro compiler 7.4" >&6 echo "$as_me: error: This compiler is not supported. Use MIPSPro compiler 7.4x" >&2;} { (exit 1); exit 1; }; } GXX_VERSION=MIPSpro7.4 + GXX_VERSION_DETAILED=$GXX_VERSION ;; *7.41* | *7.42* | *7.43* | *7.44*) echo "$as_me:$LINENO: result: C++ compiler is MIPSpro compiler 7.4x" >&5 echo "${ECHO_T}C++ compiler is MIPSpro compiler 7.4x" >&6 GXX_VERSION=MIPSpro7.4x + GXX_VERSION_DETAILED=$GXX_VERSION ;; *"7.5"*) echo "$as_me:$LINENO: result: C++ compiler is MIPSpro compiler 7.5" >&5 echo "${ECHO_T}C++ compiler is MIPSpro compiler 7.5" >&6 GXX_VERSION=MIPSpro7.5 + GXX_VERSION_DETAILED=$GXX_VERSION ;; *) echo "$as_me:$LINENO: result: C++ compiler is unknown version but accepted MIPSpro compiler version" >&5 echo "${ECHO_T}C++ compiler is unknown version but accepted MIPSpro compiler version" >&6 GXX_VERSION=MIPSpro-other - ;; + GXX_VERSION_DETAILED=$GXX_VERSION + ;; esac else @@ -2983,6 +3018,7 @@ echo "${ECHO_T}C++ compiler is Intel ICC 8" >&6 echo "${ECHO_T}C++ compiler is Intel ICC" >&6 GXX_VERSION=intel_icc fi fi fi fi + GXX_VERSION_DETAILED=$GXX_VERSION else is_dec_cxx="`($CXX -V 2>&1) | grep 'Compaq C++'`" @@ -2990,6 +3026,7 @@ echo "${ECHO_T}C++ compiler is Intel ICC" >&6 echo "$as_me:$LINENO: result: C++ compiler is Compaq cxx" >&5 echo "${ECHO_T}C++ compiler is Compaq cxx" >&6 GXX_VERSION=compaq_cxx + GXX_VERSION_DETAILED=$GXX_VERSION else is_sun_cc="`($CXX -V 2>&1) | grep 'Sun WorkShop'`" @@ -2997,6 +3034,7 @@ echo "${ECHO_T}C++ compiler is Compaq cxx" >&6 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 + GXX_VERSION_DETAILED=$GXX_VERSION else is_sun_forte_cc="`($CXX -V 2>&1) | grep 'Forte'`" @@ -3004,6 +3042,7 @@ echo "${ECHO_T}C++ compiler is Sun Workshop compiler" >&6 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 + GXX_VERSION_DETAILED=$GXX_VERSION else is_pgcc="`($CXX -V 2>&1) | grep 'Portland Group'`" @@ -3011,21 +3050,24 @@ echo "${ECHO_T}C++ compiler is Sun Forte compiler" >&6 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_DETAILED=$GXX_VERSION + 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 echo "${ECHO_T}C++ compiler is HP aCC" >&6 GXX_VERSION=hp_aCC - else + GXX_VERSION_DETAILED=$GXX_VERSION + else is_bcc="`($CXX -h 2>&1) | grep 'Borland'`" if test "x$is_bcc" != "x" ; then echo "$as_me:$LINENO: result: C++ compiler is Borland C++" >&5 echo "${ECHO_T}C++ compiler is Borland C++" >&6 GXX_VERSION=borland_bcc - else + GXX_VERSION_DETAILED=$GXX_VERSION + else is_kai_cc="`($CXX --version 2>&1) | grep 'KAI C++'`" is_kai_cc="$is_kai_cc`($CXX -v 2>&1) | grep /KCC/`" @@ -3033,11 +3075,13 @@ echo "${ECHO_T}C++ compiler is Borland C++" >&6 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_DETAILED=$GXX_VERSION + else echo "$as_me:$LINENO: result: Unrecognized C++ compiler -- Try to go ahead and get help from dealii@dealii.org" >&5 echo "${ECHO_T}Unrecognized C++ compiler -- Try to go ahead and get help from dealii@dealii.org" >&6 GXX_VERSION=unknown_cc + GXX_VERSION_DETAILED=$GXX_VERSION fi fi fi @@ -3611,6 +3655,7 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + if test "$GCC" = "yes" ; then CC_VERSION_STRING=`($CC -v 2>&1) | grep "gcc version"` if test "x$CC_VERSION_STRING" = "x" ; then @@ -10701,6 +10746,7 @@ s,@CXX@,$CXX,;t t s,@CXXFLAGS@,$CXXFLAGS,;t t s,@ac_ct_CXX@,$ac_ct_CXX,;t t s,@GXX_VERSION@,$GXX_VERSION,;t t +s,@GXX_VERSION_DETAILED@,$GXX_VERSION_DETAILED,;t t s,@CXXFLAGSG@,$CXXFLAGSG,;t t s,@CXXFLAGSO@,$CXXFLAGSO,;t t s,@CXXFLAGSPIC@,$CXXFLAGSPIC,;t t diff --git a/deal.II/doc/development/Makefile b/deal.II/doc/development/Makefile index f4b92c6066..b659f70bb2 100644 --- a/deal.II/doc/development/Makefile +++ b/deal.II/doc/development/Makefile @@ -15,6 +15,7 @@ makefiles.html: Makefile makefiles.1.html $D/common/Make.global_options makefile @echo '
  • CC=$(CC)' >> $@ @echo '
  • F77=$(F77)' >> $@ @echo '
  • GXX-VERSION=$(GXX-VERSION)' >> $@ + @echo '
  • GXX-VERSION-DETAILED=$(GXX-VERSION-DETAILED)' >> $@ @echo '
  • CC-VERSION=$(CC-VERSION)' >> $@ @echo '
  • F77-VERSION=$(F77-VERSION)' >> $@ @echo '
  • SHLIBLD=$(SHLIBLD)' >> $@ diff --git a/deal.II/doc/development/makefiles.1.html b/deal.II/doc/development/makefiles.1.html index aa4c89c6f3..e0db275caf 100644 --- a/deal.II/doc/development/makefiles.1.html +++ b/deal.II/doc/development/makefiles.1.html @@ -65,7 +65,7 @@ gcc2.97, gcc3.0, gcc3.1, gcc3.2, gcc3.3, gcc3.4, - gcc3.5, + gcc4.0, ibm_xlc, MIPSpro, sun_workshop, sun_forte, intel_icc5, intel_icc6, @@ -83,6 +83,13 @@ +
    GXX-VERSION-DETAILED
    +

    + Like GXX-VERSION, just that it may also contain the dot version + number, for example gcc3.3.3. +

    +
    +
    CC-VERSION

    Name and version of the CC compiler. Possible names are