From: bangerth Date: Tue, 9 Dec 2008 04:01:32 +0000 (+0000) Subject: Fix a problem where we overwrite things we've figured out before when TRILINOS_DIR... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=086e2bcb70d854bef57b05d8924358b8720ca2fc;p=dealii-svn.git Fix a problem where we overwrite things we've figured out before when TRILINOS_DIR is given through an environment variable. git-svn-id: https://svn.dealii.org/trunk@17900 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index e10212eecb..c38ac11016 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -5737,9 +5737,9 @@ AC_DEFUN(DEAL_II_CONFIGURE_TRILINOS, dnl ], [ dnl Take something from the environment variables, if it is there - if test "x$TRILINOS_DIR" != "x" ; then + if test "x$TRILINOS_LIBDIR" != "x" ; then USE_CONTRIB_TRILINOS=yes - DEAL_II_TRILINOS_LIBDIR="$TRILINOS_DIR" + DEAL_II_TRILINOS_LIBDIR="$TRILINOS_LIBDIR" AC_MSG_RESULT($DEAL_II_TRILINOS_LIBDIR) dnl Make sure that what this is actually correct @@ -5749,7 +5749,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_TRILINOS, dnl point to a complete Trilinos installation]) fi else - dnl --with-trilinos-include not explicitly specified. do + dnl --with-trilinos-libs not explicitly specified. do dnl nothing if --with-trilinos has previously been specified, dnl otherwise say no to trilinos if test "x${USE_CONTRIB_TRILINOS}" != "xyes" ; then diff --git a/deal.II/configure b/deal.II/configure index 8adaaed733..cd1674298d 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,9 +1,9 @@ #! /bin/sh -# From configure.in Revision: 17480 . +# From configure.in Revision: 17758 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for deal.II 6.2.pre. +# Generated by GNU Autoconf 2.61 for projekt 6.2.pre. # -# Report bugs to . +# Report bugs to . # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -573,11 +573,11 @@ MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. -PACKAGE_NAME='deal.II' -PACKAGE_TARNAME='deal.II' +PACKAGE_NAME='projekt' +PACKAGE_TARNAME='projekt' PACKAGE_VERSION='6.2.pre' -PACKAGE_STRING='deal.II 6.2.pre' -PACKAGE_BUGREPORT='dealii@dealii.org' +PACKAGE_STRING='projekt 6.2.pre' +PACKAGE_BUGREPORT='tyoung@ippt.gov.pl' ac_default_prefix=`pwd` ac_func_list= @@ -722,6 +722,13 @@ DEAL_II_PETSC_VERSION_MINOR DEAL_II_PETSC_VERSION_SUBMINOR DEAL_II_PETSC_MPIUNI_LIB DEAL_II_DEFINE_DEAL_II_USE_PETSC +USE_CONTRIB_SLEPC +DEAL_II_SLEPC_DIR +DEAL_II_SLEPC_ARCH +DEAL_II_SLEPC_VERSION_MAJOR +DEAL_II_SLEPC_VERSION_MINOR +DEAL_II_SLEPC_VERSION_SUBMINOR +DEAL_II_DEFINE_DEAL_II_USE_SLEPC DEAL_II_EXPAND_TRILINOS_VECTOR DEAL_II_EXPAND_TRILINOS_MPI_VECTOR DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR @@ -1265,7 +1272,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures deal.II 6.2.pre to adapt to many kinds of systems. +\`configure' configures projekt 6.2.pre to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1313,7 +1320,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/deal.II] + --docdir=DIR documentation root [DATAROOTDIR/doc/projekt] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1331,7 +1338,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of deal.II 6.2.pre:";; + short | recursive ) echo "Configuration of projekt 6.2.pre:";; esac cat <<\_ACEOF @@ -1362,6 +1369,13 @@ Optional Packages: --with-petsc-arch=architecture Specify the architecture for your PETSc installation; use this if you want to override the PETSC_ARCH environment variable. + --with-slepc=/path/to/slepc Specify the path to the SLEPc installation, + of which the include and library directories + are subdirs; use this if you want to override + the SLEPC_DIR environment variable. + --with-slepc-arch=architecture Specify the architecture for your SLEPc + installation; use this if you want to override + the SLEPC_ARCH environment variable. --with-trilinos=/path/to/trilinos Specify the path to the Trilinos installation, of which the include and lib directories are subdirs; use this if you want to override @@ -1436,7 +1450,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -1497,7 +1511,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -deal.II configure 6.2.pre +projekt configure 6.2.pre generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1511,7 +1525,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by deal.II $as_me 6.2.pre, which was +It was created by projekt $as_me 6.2.pre, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -10336,9 +10350,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to dealii@dealii.org ## -## -------------------------------- ## +## --------------------------------- ## +## Report this to tyoung@ippt.gov.pl ## +## --------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -10595,9 +10609,9 @@ echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to dealii@dealii.org ## -## -------------------------------- ## +## --------------------------------- ## +## Report this to tyoung@ippt.gov.pl ## +## --------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -10734,9 +10748,9 @@ echo "$as_me: WARNING: boost/type_traits.hpp: proceeding with the preprocessor's { echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: boost/type_traits.hpp: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to dealii@dealii.org ## -## -------------------------------- ## +## --------------------------------- ## +## Report this to tyoung@ippt.gov.pl ## +## --------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -10873,9 +10887,9 @@ echo "$as_me: WARNING: boost/tuple/tuple.hpp: proceeding with the preprocessor's { echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: boost/tuple/tuple.hpp: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to dealii@dealii.org ## -## -------------------------------- ## +## --------------------------------- ## +## Report this to tyoung@ippt.gov.pl ## +## --------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -12131,6 +12145,170 @@ echo "${ECHO_T}$DEAL_II_PETSC_MPIUNI_LIB" >&6; } + { echo "$as_me:$LINENO: checking for SLEPc library directory" >&5 +echo $ECHO_N "checking for SLEPc library directory... $ECHO_C" >&6; } + + +# Check whether --with-slepc was given. +if test "${with_slepc+set}" = set; then + withval=$with_slepc; + if test "x$withval" = "xno" ; then + { echo "$as_me:$LINENO: result: explicitly disabled" >&5 +echo "${ECHO_T}explicitly disabled" >&6; } + USE_CONTRIB_SLEPC=no + else + USE_CONTRIB_SLEPC=yes + DEAL_II_SLEPC_DIR=$withval + { echo "$as_me:$LINENO: result: $DEAL_II_SLEPC_DIR" >&5 +echo "${ECHO_T}$DEAL_II_SLEPC_DIR" >&6; } + + if test ! -d $DEAL_II_SLEPC_DIR/include \ + -o ! -d $DEAL_II_SLEPC_DIR/lib ; then + { { echo "$as_me:$LINENO: error: Path to SLEPc specified with --with-slepc does not + point to a complete SLEPc installation" >&5 +echo "$as_me: error: Path to SLEPc specified with --with-slepc does not + point to a complete SLEPc installation" >&2;} + { (exit 1); exit 1; }; } + fi + fi + +else + + if test "x$SLEPC_DIR" != "x" ; then + USE_CONTRIB_SLEPC=yes + DEAL_II_SLEPC_DIR="$SLEPC_DIR" + { echo "$as_me:$LINENO: result: $DEAL_II_SLEPC_DIR" >&5 +echo "${ECHO_T}$DEAL_II_SLEPC_DIR" >&6; } + + if test ! -d $DEAL_II_SLEPC_DIR/include \ + -o ! -d $DEAL_II_SLEPC_DIR/lib ; then + { { echo "$as_me:$LINENO: error: The path to SLEPc specified in the SLEPC_DIR + environment variable does not + point to a complete SLEPc installation" >&5 +echo "$as_me: error: The path to SLEPc specified in the SLEPC_DIR + environment variable does not + point to a complete SLEPc installation" >&2;} + { (exit 1); exit 1; }; } + fi + else + USE_CONTRIB_SLEPC=no + DEAL_II_SLEPC_DIR="" + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + fi + +fi + + if test "$USE_CONTRIB_SLEPC" = "yes" ; then + +cat >>confdefs.h <<\_ACEOF +#define DEAL_II_USE_SLEPC 1 +_ACEOF + + + DEAL_II_DEFINE_DEAL_II_USE_SLEPC=DEAL_II_USE_SLEPC + + fi + + + if test "$USE_CONTRIB_SLEPC" = "yes" ; then + + { echo "$as_me:$LINENO: checking for SLEPc version" >&5 +echo $ECHO_N "checking for SLEPc version... $ECHO_C" >&6; } + + DEAL_II_SLEPC_VERSION_MAJOR=`cat $DEAL_II_SLEPC_DIR/include/slepcversion.h \ + | grep "#define SLEPC_VERSION_MAJOR" \ + | perl -pi -e 's/.*MAJOR\s+//g;'` + DEAL_II_SLEPC_VERSION_MINOR=`cat $DEAL_II_SLEPC_DIR/include/slepcversion.h \ + | grep "#define SLEPC_VERSION_MINOR" \ + | perl -pi -e 's/.*MINOR\s+//g;'` + DEAL_II_SLEPC_VERSION_SUBMINOR=`cat $DEAL_II_SLEPC_DIR/include/slepcversion.h \ + | grep "#define SLEPC_VERSION_SUBMINOR" \ + | perl -pi -e 's/.*MINOR\s+//g;'` + SLEPC_VERSION="$DEAL_II_SLEPC_VERSION_MAJOR.$DEAL_II_SLEPC_VERSION_MINOR.$DEAL_II_SLEPC_VERSION_SUBMINOR" + { echo "$as_me:$LINENO: result: $SLEPC_VERSION" >&5 +echo "${ECHO_T}$SLEPC_VERSION" >&6; } + + if test "${DEAL_II_PETSC_VERSION_MAJOR}" != "${DEAL_II_SLEPC_VERSION_MAJOR}" \ + -o "${DEAL_II_PETSC_VERSION_MINOR}" != "${DEAL_II_SLEPC_VERSION_MINOR}" \ + -o "${DEAL_II_PETSC_VERSION_SUBMINOR}" != "${DEAL_II_SLEPC_VERSION_SUBMINOR}" ; then + { { echo "$as_me:$LINENO: error: If SLEPc is used, you must use the same version + number as your PETSc Installation" >&5 +echo "$as_me: error: If SLEPc is used, you must use the same version + number as your PETSc Installation" >&2;} + { (exit 1); exit 1; }; } + fi + + + { echo "$as_me:$LINENO: checking for SLEPc library architecture" >&5 +echo $ECHO_N "checking for SLEPc library architecture... $ECHO_C" >&6; } + + +# Check whether --with-slepc-arch was given. +if test "${with_slepc_arch+set}" = set; then + withval=$with_slepc_arch; + DEAL_II_SLEPC_ARCH=$withval + { echo "$as_me:$LINENO: result: $DEAL_II_SLEPC_ARCH" >&5 +echo "${ECHO_T}$DEAL_II_SLEPC_ARCH" >&6; } + +else + + if test "x$SLEPC_ARCH" != "x" ; then + DEAL_II_SLEPC_ARCH="$SLEPC_ARCH" + { echo "$as_me:$LINENO: result: $DEAL_II_SLEPC_ARCH" >&5 +echo "${ECHO_T}$DEAL_II_SLEPC_ARCH" >&6; } + else + { { echo "$as_me:$LINENO: error: If SLEPc is used, you must specify the architecture + either through the SLEPC_ARCH environment variable, + or through the --with-slepc-arch flag" >&5 +echo "$as_me: error: If SLEPc is used, you must specify the architecture + either through the SLEPC_ARCH environment variable, + or through the --with-slepc-arch flag" >&2;} + { (exit 1); exit 1; }; } + fi + +fi + + + + if test "x$SLEPC_ARCH" != "x" ; then + if test ! -d $DEAL_II_SLEPC_DIR/lib/$DEAL_II_SLEPC_ARCH \ + ; then + { { echo "$as_me:$LINENO: error: SLEPc has not been compiled for the architecture + specified with --with-slepc-arch" >&5 +echo "$as_me: error: SLEPc has not been compiled for the architecture + specified with --with-slepc-arch" >&2;} + { (exit 1); exit 1; }; } + fi + fi + + if test "$DEAL_II_SLEPC_ARCH" != "$DEAL_II_PETSC_ARCH" ; then + { { echo "$as_me:$LINENO: error: If SLEPc is used, you must specify the same + architecture as your PETSc Installation either + through the SLEPC_ARCH environment variable, + or through the --with-slepc-arch flag" >&5 +echo "$as_me: error: If SLEPc is used, you must specify the same + architecture as your PETSc Installation either + through the SLEPC_ARCH environment variable, + or through the --with-slepc-arch flag" >&2;} + { (exit 1); exit 1; }; } + fi + + + if test "x$with_slepc" = "x" ; then + with_slepc="yes" + fi + fi + + + + + + + + + + { echo "$as_me:$LINENO: checking for Trilinos directory" >&5 echo $ECHO_N "checking for Trilinos directory... $ECHO_C" >&6; } @@ -12272,9 +12450,9 @@ echo "$as_me: error: Path to Trilinos libraries with --with-trilinos-libs does n else - if test "x$TRILINOS_DIR" != "x" ; then + if test "x$TRILINOS_LIBDIR" != "x" ; then USE_CONTRIB_TRILINOS=yes - DEAL_II_TRILINOS_LIBDIR="$TRILINOS_DIR" + DEAL_II_TRILINOS_LIBDIR="$TRILINOS_LIBDIR" { echo "$as_me:$LINENO: result: $DEAL_II_TRILINOS_LIBDIR" >&5 echo "${ECHO_T}$DEAL_II_TRILINOS_LIBDIR" >&6; } @@ -12716,9 +12894,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to dealii@dealii.org ## -## -------------------------------- ## +## --------------------------------- ## +## Report this to tyoung@ippt.gov.pl ## +## --------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -13579,9 +13757,9 @@ echo "$as_me: WARNING: netcdfcpp.h: proceeding with the preprocessor's result" > { echo "$as_me:$LINENO: WARNING: netcdfcpp.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: netcdfcpp.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to dealii@dealii.org ## -## -------------------------------- ## +## --------------------------------- ## +## Report this to tyoung@ippt.gov.pl ## +## --------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -14511,9 +14689,9 @@ echo "$as_me: WARNING: umfpack.h: proceeding with the preprocessor's result" >&2 { echo "$as_me:$LINENO: WARNING: umfpack.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: umfpack.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to dealii@dealii.org ## -## -------------------------------- ## +## --------------------------------- ## +## Report this to tyoung@ippt.gov.pl ## +## --------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -14651,9 +14829,9 @@ echo "$as_me: WARNING: amd.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: amd.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: amd.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to dealii@dealii.org ## -## -------------------------------- ## +## --------------------------------- ## +## Report this to tyoung@ippt.gov.pl ## +## --------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -14790,9 +14968,9 @@ echo "$as_me: WARNING: UFconfig.h: proceeding with the preprocessor's result" >& { echo "$as_me:$LINENO: WARNING: UFconfig.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: UFconfig.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to dealii@dealii.org ## -## -------------------------------- ## +## --------------------------------- ## +## Report this to tyoung@ippt.gov.pl ## +## --------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -15420,6 +15598,8 @@ done + + for ac_func in dgetrf_ sgetrf_ dgetri_ sgetri_ dgetrs_ sgetrs_ dstev_ sstev_ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -16252,7 +16432,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by deal.II $as_me 6.2.pre, which was +This file was extended by projekt $as_me 6.2.pre, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16301,7 +16481,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -deal.II config.status 6.2.pre +projekt config.status 6.2.pre configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -16616,6 +16796,13 @@ DEAL_II_PETSC_VERSION_MINOR!$DEAL_II_PETSC_VERSION_MINOR$ac_delim DEAL_II_PETSC_VERSION_SUBMINOR!$DEAL_II_PETSC_VERSION_SUBMINOR$ac_delim DEAL_II_PETSC_MPIUNI_LIB!$DEAL_II_PETSC_MPIUNI_LIB$ac_delim DEAL_II_DEFINE_DEAL_II_USE_PETSC!$DEAL_II_DEFINE_DEAL_II_USE_PETSC$ac_delim +USE_CONTRIB_SLEPC!$USE_CONTRIB_SLEPC$ac_delim +DEAL_II_SLEPC_DIR!$DEAL_II_SLEPC_DIR$ac_delim +DEAL_II_SLEPC_ARCH!$DEAL_II_SLEPC_ARCH$ac_delim +DEAL_II_SLEPC_VERSION_MAJOR!$DEAL_II_SLEPC_VERSION_MAJOR$ac_delim +DEAL_II_SLEPC_VERSION_MINOR!$DEAL_II_SLEPC_VERSION_MINOR$ac_delim +DEAL_II_SLEPC_VERSION_SUBMINOR!$DEAL_II_SLEPC_VERSION_SUBMINOR$ac_delim +DEAL_II_DEFINE_DEAL_II_USE_SLEPC!$DEAL_II_DEFINE_DEAL_II_USE_SLEPC$ac_delim DEAL_II_EXPAND_TRILINOS_VECTOR!$DEAL_II_EXPAND_TRILINOS_VECTOR$ac_delim DEAL_II_EXPAND_TRILINOS_MPI_VECTOR!$DEAL_II_EXPAND_TRILINOS_MPI_VECTOR$ac_delim DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR!$DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR$ac_delim @@ -16646,7 +16833,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 42; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5