From ab58dbecc6e4ff15e7e75e8222e955af6b2491a3 Mon Sep 17 00:00:00 2001 From: Guido Kanschat Date: Tue, 1 Feb 2005 15:26:46 +0000 Subject: [PATCH] some corrections of last checkin git-svn-id: https://svn.dealii.org/trunk@9886 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 10 ++- deal.II/base/include/base/config.h.in | 96 +++++++++++++-------------- deal.II/configure | 14 ++-- deal.II/configure.in | 1 + 4 files changed, 67 insertions(+), 54 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index d8429b4a88..fc38478bb3 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -4466,7 +4466,10 @@ dnl -------------------------------------------------- AC_DEFUN(DEAL_II_WITH_LAPACK, dnl [ if test "x$1" != "xyes" ; then - AC_CHECK_LIB($1, dgbsv_,[LIBS="-l$1 $LIBS"; AC_DEFINE(HAVE_LIBLAPACK)]) + AC_CHECK_LIB($1, dgbsv_, + [ LIBS="-l$1 $LIBS" + AC_DEFINE(HAVE_LIBLAPACK) + ]) dnl fi else AC_CHECK_LIB(lapack, dgbsv_) @@ -4479,7 +4482,10 @@ dnl -------------------------------------------------- AC_DEFUN(DEAL_II_WITH_BLAS, dnl [ if test "x$1" != "xyes" ; then - AC_CHECK_LIB($1, daxpy_,[LIBS="-l$1 $LIBS"; AC_DEFINE(HAVE_LIBBLAS)],,$F77LIBS) + AC_CHECK_LIB($1, daxpy_, + [ LIBS="-l$1 $LIBS" + AC_DEFINE(HAVE_LIBBLAS)] + ,,$F77LIBS) else AC_CHECK_LIB(blas, daxpy_,,,$F77LIBS) fi diff --git a/deal.II/base/include/base/config.h.in b/deal.II/base/include/base/config.h.in index d97387e914..a435525319 100644 --- a/deal.II/base/include/base/config.h.in +++ b/deal.II/base/include/base/config.h.in @@ -29,98 +29,92 @@ // In case of problems in autodetection of features of your build // environment, contact the authors of the library. -/** - * @file - * - * This file is generated by configure in the main - * deal.II directory. It lists all configuration - * variables available in C++ programs. - */ -/** Defined if the prototype of abort() has a no-throw exception specification. + +/* Defined if the prototype of abort() has a no-throw exception specification. */ #undef DEAL_II_ABORT_NOTHROW_EXCEPTION -/** Flag indicating whether there is a bug in the compiler that leads to bogus +/* Flag indicating whether there is a bug in the compiler that leads to bogus warnings for inline class members in anonymous namespaces */ #undef DEAL_II_ANON_NAMESPACE_BOGUS_WARNING -/** Defined if the compiler needs to see the static keyword even for functions +/* Defined if the compiler needs to see the static keyword even for functions in anonymous namespaces, to avoid duplicate symbol errors when linking. For the details, look at aclocal.m4 in the top-level directory. */ #undef DEAL_II_ANON_NAMESPACE_BUG -/** Another test if the compiler needs to see the static keyword even for +/* Another test if the compiler needs to see the static keyword even for functions in anonymous namespaces, to avoid duplicate symbol errors when linking. For the details, look at aclocal.m4 in the top-level directory. */ #undef DEAL_II_ANON_NAMESPACE_LINKAGE_BUG -/** Defined if the compiler has a problem with assigning arrays in conditionals +/* Defined if the compiler has a problem with assigning arrays in conditionals */ #undef DEAL_II_ARRAY_CONDITIONAL_DECAY_BUG -/** Backward compatibility support for functions and classes that do not take +/* Backward compatibility support for functions and classes that do not take an explicit mapping variable, but rather use a default Q1 mapping instead */ #undef DEAL_II_COMPAT_MAPPING -/** Defined if the compiler does not honor the explicit keyword on template +/* Defined if the compiler does not honor the explicit keyword on template constructors. */ #undef DEAL_II_EXPLICIT_CONSTRUCTOR_BUG -/** Defined if the compiler needs a workaround for certain problems with taking +/* Defined if the compiler needs a workaround for certain problems with taking the address of template template functions. For the details, look at aclocal.m4 in the top-level directory. */ #undef DEAL_II_FUNPTR_TEMPLATE_TEMPLATE_BUG -/** Flag indicating whether the library shall be compiled to use the Tecplot +/* Flag indicating whether the library shall be compiled to use the Tecplot interface */ #undef DEAL_II_HAVE_TECPLOT -/** Defined if the compiler refuses to compile the definition of a function +/* Defined if the compiler refuses to compile the definition of a function that was previously declared abstract. */ #undef DEAL_II_IMPLEMENTED_PURE_FUNCTION_BUG -/** Define if we have to work around a bug in Sun's Forte compiler. See the +/* Define if we have to work around a bug in Sun's Forte compiler. See the aclocal.m4 file in the top-level directory for a description of this bug. */ #undef DEAL_II_LOCAL_TYPEDEF_COMP_WORKAROUND -/** Defined if the compiler gets an internal compiler upon some code involving +/* Defined if the compiler gets an internal compiler upon some code involving long doubles, and with optimization. For the details, look at aclocal.m4 in the top-level directory. */ #undef DEAL_II_LONG_DOUBLE_LOOP_BUG -/** Major version number of deal.II */ +/* Major version number of deal.II */ #undef DEAL_II_MAJOR -/** Define if we have to work around a bug in gcc with explicitly instantiating +/* Define if we have to work around a bug in gcc with explicitly instantiating template member operators. See the aclocal.m4 file in the top-level directory for a description of this bug. */ #undef DEAL_II_MEMBER_OP_TEMPLATE_INST -/** Defined if the compiler refuses to specialize an outer class template while +/* Defined if the compiler refuses to specialize an outer class template while keeping a member as a template. For the exact failure mode, look at aclocal.m4 in the top-level directory. */ #undef DEAL_II_MEMBER_TEMPLATE_SPECIALIZATION_BUG -/** Defined if the compiler refuses to allow the explicit specialization of +/* Defined if the compiler refuses to allow the explicit specialization of static member variables. For the exact failure mode, look at aclocal.m4 in the top-level directory. */ #undef DEAL_II_MEMBER_VAR_SPECIALIZATION_BUG -/** Minor version number of deal.II */ +/* Minor version number of deal.II */ #undef DEAL_II_MINOR -/** Set to the minimal number of elements a std::vector can always hold, +/* Set to the minimal number of elements a std::vector can always hold, i.e. its minimal capacity. */ #undef DEAL_II_MIN_BOOL_VECTOR_CAPACITY -/** Set to the minimal number of elements a std::vector can always hold, +/* Set to the minimal number of elements a std::vector can always hold, i.e. its minimal capacity. */ #undef DEAL_II_MIN_VECTOR_CAPACITY -/** Define if we have to work around a bug in gcc with marking all instances of +/* Define if we have to work around a bug in gcc with marking all instances of a template class as friends to this class if the class is inside a namespace. See the aclocal.m4 file in the top-level directory for a description of this bug. */ @@ -141,7 +135,7 @@ member classes when giving a full class specification. */ #undef DEAL_II_NESTED_CLASS_TEMPL_FRIEND_BUG -/** Path to the deal.II directory */ +/* Path to the deal.II directory */ #undef DEAL_II_PATH /* Defined if the compiler does not support the @@ -194,55 +188,61 @@ functionality is available. */ #undef DEAL_II_USE_MT_POSIX_NO_BARRIERS -/** Defined if a PETSc installation was found and is going to be used */ +/* Defined if a PETSc installation was found and is going to be used */ #undef DEAL_II_USE_PETSC -/** Define if the compiler provides __builtin_expect */ +/* Define if the compiler provides __builtin_expect */ #undef HAVE_BUILTIN_EXPECT -/** Define to 1 if you have the `gethostname' function. */ +/* Define to 1 if you have the `gethostname' function. */ #undef HAVE_GETHOSTNAME -/** Availability of the MA27 algorithm from HSL */ +/* Availability of the MA27 algorithm from HSL */ #undef HAVE_HSL_MA27 -/** Availability of the MA47 algorithm from HSL */ +/* Availability of the MA47 algorithm from HSL */ #undef HAVE_HSL_MA47 -/** Use the UMFPack library? */ -#undef HAVE_UMFPACK +/* Define to 1 if you have the `amd' library (-lamd). */ +#undef HAVE_LIBAMD + +/* Define to 1 if you have the `blas' library (-lblas). */ +#undef HAVE_LIBBLAS -/** Have LAPACK library? */ -#undef HAVE_LAPACK +/* Define to 1 if you have the `lapack' library (-llapack). */ +#undef HAVE_LIBLAPACK -/** Have BLAS library? */ -#undef HAVE_BLAS +/* Define to 1 if you have the `umfpack' library (-lumfpack). */ +#undef HAVE_LIBUMFPACK -/** Define if you have the rand_r function */ +/* Define if you have the rand_r function */ #undef HAVE_RAND_R -/** Define if the compiler provides an iosfwd header file */ +/* Define if the compiler provides an header file */ #undef HAVE_STD_IOSFWD_HEADER -/** Define if the compiler's library in use provides a std::iterator class +/* Define if the compiler's library in use provides a std::iterator class (early gcc versions did not) */ #undef HAVE_STD_ITERATOR_CLASS -/** Define if the compiler's library in use provides std::numeric_limits +/* Define if the compiler's library in use provides std::numeric_limits classes in the appropriate header file */ #undef HAVE_STD_NUMERIC_LIMITS -/** Define if the compiler provides an ostream header file */ +/* Define if the compiler provides an header file */ #undef HAVE_STD_OSTREAM_HEADER -/** Define if the compiler's library in use provides std::i/ostringstream +/* Define if the compiler's library in use provides std::i/ostringstream classes (early gcc versions did not) */ #undef HAVE_STD_STRINGSTREAM -/** Define if the compiler provides __verbose_terminate_handler */ +/* UMFPACK is $withval */ +#undef HAVE_UMFPACK + +/* Define if the compiler provides __verbose_terminate_handler */ #undef HAVE_VERBOSE_TERMINATE -/** On SunOS 4.x, the getrusage() function exists, but is not declared in the +/* On SunOS 4.x, the getrusage() function exists, but is not declared in the respective header file , as one would think when reading the man pages. Then we have to declare this function ourselves in those files that use this function. The question whether we have to do so is controlled @@ -264,7 +264,7 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/** If already available, do not define at all. Otherwise, define to __func__ +/* If already available, do not define at all. Otherwise, define to __func__ if that is available. In all other cases, indicate that no information about the present function is available for this compiler. */ #undef __PRETTY_FUNCTION__ diff --git a/deal.II/configure b/deal.II/configure index 5c1b64c291..2ec9d206ad 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.182 . +# From configure.in Revision: 1.183 . # 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_LIB 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 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_LIB HSL_INCLUDE_DIR USE_CONTRIB_HSL TECPLOT_INCLUDE_DIR TECPLOT_LIB 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. @@ -8868,10 +8868,12 @@ fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 if test `eval echo '${'$as_ac_Lib'}'` = yes; then - LIBS="-l$withval $LIBS"; cat >>confdefs.h <<\_ACEOF + LIBS="-l$withval $LIBS" + cat >>confdefs.h <<\_ACEOF #define HAVE_LIBBLAS 1 _ACEOF + fi else @@ -9068,6 +9070,7 @@ _ACEOF + echo "$as_me:$LINENO: checking for PETSc library directory" >&5 echo $ECHO_N "checking for PETSc library directory... $ECHO_C" >&6 @@ -9556,10 +9559,12 @@ fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 if test `eval echo '${'$as_ac_Lib'}'` = yes; then - LIBS="-l$withval $LIBS"; cat >>confdefs.h <<\_ACEOF + LIBS="-l$withval $LIBS" + cat >>confdefs.h <<\_ACEOF #define HAVE_LIBLAPACK 1 _ACEOF + fi else @@ -10621,6 +10626,7 @@ s,@HSL_LIB@,$HSL_LIB,;t t s,@HSL_INCLUDE_DIR@,$HSL_INCLUDE_DIR,;t t s,@USE_CONTRIB_HSL@,$USE_CONTRIB_HSL,;t t s,@TECPLOT_INCLUDE_DIR@,$TECPLOT_INCLUDE_DIR,;t t +s,@TECPLOT_LIB@,$TECPLOT_LIB,;t t s,@USE_CONTRIB_PETSC@,$USE_CONTRIB_PETSC,;t t s,@DEAL_II_PETSC_DIR@,$DEAL_II_PETSC_DIR,;t t s,@DEAL_II_PETSC_ARCH@,$DEAL_II_PETSC_ARCH,;t t diff --git a/deal.II/configure.in b/deal.II/configure.in index c507095d47..f3106342a3 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -374,6 +374,7 @@ dnl ------------------------------------------------------------- DEAL_II_CONFIGURE_TECPLOT AC_SUBST(TECPLOT_INCLUDE_DIR) +AC_SUBST(TECPLOT_LIB) DEAL_II_CONFIGURE_PETSC AC_SUBST(USE_CONTRIB_PETSC) -- 2.39.5