From 35b6dd2d042a4d419828657cca18e2f2120e9160 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Wed, 23 Nov 2005 16:22:17 +0000 Subject: [PATCH] gcc 4.1 has branches. git-svn-id: https://svn.dealii.org/trunk@11784 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/configure | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/deal.II/configure b/deal.II/configure index 8f015c4379..8912f1bafe 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -274,7 +274,6 @@ PACKAGE_VERSION='5.3.pre' PACKAGE_STRING='deal.II 5.3.pre' PACKAGE_BUGREPORT='dealii@dealii.org' -ac_default_prefix=`pwd` 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_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 SHLIBFLAGS CC_VERSION CFLAGSPIC enablemultithreading withmultithreading F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared static_lib_suffix shared_lib_suffix AR RANLIB ac_ct_RANLIB enableparser DEAL_II_DISABLE_PARSER 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 NEEDS_F77LIBS HSL_INCLUDE_DIR USE_CONTRIB_HSL TECPLOT_INCLUDE_DIR NETCDF_INCLUDE_DIR 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='' @@ -1348,7 +1347,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. - DEAL_II_PATH=`pwd` DEAL_II_MAJOR=`echo $PACKAGE_VERSION | perl -pi -e 's/^(\d+)\..*/$1/;'` @@ -2959,6 +2957,14 @@ echo "${ECHO_T}C++ compiler is gcc-2.97" >&6 *) GXX_VERSION_DETAILED=gcc4.1.x ;; esac ;; + *version\ 4.2*) + GXX_VERSION=gcc4.2 + case "$GXX_VERSION_STRING" in + *version\ 4.2.0*) GXX_VERSION_DETAILED=gcc4.2.0 ;; + *version\ 4.2.1*) GXX_VERSION_DETAILED=gcc4.2.1 ;; + *) GXX_VERSION_DETAILED=gcc4.2.x ;; + esac + ;; *2.4* | *2.5* | *2.6* | *2.7* | *2.8*) echo "$as_me:$LINENO: result: C++ compiler is $GXX_VERSION_STRING" >&5 echo "${ECHO_T}C++ compiler is $GXX_VERSION_STRING" >&6 @@ -3787,6 +3793,11 @@ echo "${ECHO_T}C compiler is gcc-4.0" >&6 echo "${ECHO_T}C compiler is gcc-4.1" >&6 CC_VERSION=gcc4.1 ;; + *version\ 4.2*) + echo "$as_me:$LINENO: result: C compiler is gcc-4.2" >&5 +echo "${ECHO_T}C compiler is gcc-4.2" >&6 + CC_VERSION=gcc4.2 + ;; *2.4* | *2.5* | *2.6* | *2.7* | *2.8*) echo "$as_me:$LINENO: result: C compiler is $CC_VERSION_STRING" >&5 echo "${ECHO_T}C compiler is $CC_VERSION_STRING" >&6 -- 2.39.5