]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Remove reliance on DEAL_II_METIS_INC_DIR.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 6 Jul 2009 17:53:08 +0000 (17:53 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 6 Jul 2009 17:53:08 +0000 (17:53 +0000)
git-svn-id: https://svn.dealii.org/trunk@19028 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4
deal.II/common/Make.global_options.in
deal.II/configure
deal.II/configure.in

index 703af127254df17c110b97cd51b8773dc6dea8b5..e9b39d5a849dd67221b2d4123ba9681fb6230fdc 100644 (file)
@@ -6272,7 +6272,6 @@ AC_DEFUN(DEAL_II_CONFIGURE_METIS, dnl
        fi
        
        DEAL_II_METIS_LIBDIR="$DEAL_II_METIS_DIR"
-       DEAL_II_METIS_INCDIR="$DEAL_II_METIS_DIR/Lib"
      ],
      [
         dnl Take something from the environment variables, if it is there
@@ -6288,7 +6287,6 @@ AC_DEFUN(DEAL_II_CONFIGURE_METIS, dnl
                          point to a complete Metis installation])
          fi
          DEAL_II_METIS_LIBDIR="$DEAL_II_METIS_DIR"
-         DEAL_II_METIS_INCDIR="$DEAL_II_METIS_DIR/Lib"
         else
          USE_CONTRIB_METIS=no
           DEAL_II_METIS_DIR=""
@@ -6301,8 +6299,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_METIS, dnl
                           if you want to override the METIS_INCLUDE_DIR
                          environment variable.],
      [
-        METIS_INCLUDE_DIR="$withval"
-       DEAL_II_METIS_INCDIR="$METIS_INCLUDE_DIR"
+        AC_MSG_ERROR([The --with-metis-include directive is no longer supported])
      ])
      
   AC_ARG_WITH(metis-libs,
index c7a277526a05c0c2102c11ce5296c86ab0538391..71a88470dbda35dce51bc6d9db419a4f427c1add 100644 (file)
@@ -66,7 +66,6 @@ DEAL_II_TRILINOS_SHARED = @DEAL_II_TRILINOS_SHARED@
 DEAL_II_TRILINOS_STATIC = @DEAL_II_TRILINOS_STATIC@
 
 USE_CONTRIB_METIS    = @USE_CONTRIB_METIS@
-DEAL_II_METIS_INCDIR    = @DEAL_II_METIS_INCDIR@
 DEAL_II_METIS_LIBDIR    = @DEAL_II_METIS_LIBDIR@
 
 USE_CONTRIB_HSL      = @USE_CONTRIB_HSL@
@@ -264,7 +263,6 @@ endif
 include-path-slepc           = $(DEAL_II_SLEPC_DIR)/include
 include-path-slepc-conf      = $(DEAL_II_SLEPC_DIR)/$(DEAL_II_PETSC_ARCH)/conf
 include-path-trilinos        = $(DEAL_II_TRILINOS_INCDIR)
-include-path-metis           = $(DEAL_II_METIS_INCDIR)
 
 # include paths as command line flags. while compilers allow a space between
 # the '-I' and the actual path, we also send these flags to the 
@@ -274,7 +272,7 @@ INCLUDE = -I$D/base/include -I$D/lac/include -I$D/deal.II/include \
           @UMFPACK_INCLUDE_DIR@ @HSL_INCLUDE_DIR@ \
          -I$D/contrib
 
-# add PETSc, SLEPSc, Trilinos and METIS include path if necessary. this rule
+# add PETSc, SLEPSc, and Trilinos include paths if necessary. this rule
 # (and the one further down below to get correct flags) should eventually
 # be replaced by something where we do not blindly include PETSc make files
 # (and thus import all of its variables), but rather set up a scheme to
@@ -297,10 +295,6 @@ ifeq ($(USE_CONTRIB_TRILINOS),yes)
   INCLUDE += -I$(include-path-trilinos)
 endif
 
-ifeq ($(USE_CONTRIB_METIS),yes)
-  INCLUDE += -I$(include-path-metis)
-endif
-
 ifeq ($(enable-threads),yes)
   INCLUDE += -I$(shell echo $D/contrib/tbb/tbb*/include)
 endif
index 636e0dd51f59d35f42bed8ab5e127e9f13ff3cff..05b5fb8e1c14d93d0bc72347eb63dc68e2e491d1 100755 (executable)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 18883 .
+# From configure.in Revision: 18943 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.63 for deal.II 6.3.pre.
 #
@@ -654,7 +654,6 @@ USE_CONTRIB_UMFPACK
 UMFPACK_INCLUDE_DIR
 UMFPACK_LIB
 DEAL_II_METIS_LIBDIR
-DEAL_II_METIS_INCDIR
 USE_CONTRIB_METIS
 TECPLOT_INCLUDE_DIR
 USE_CONTRIB_HSL
@@ -675,7 +674,6 @@ DEAL_II_DEFINE_DEAL_II_USE_SLEPC
 DEAL_II_SLEPC_VERSION_SUBMINOR
 DEAL_II_SLEPC_VERSION_MINOR
 DEAL_II_SLEPC_VERSION_MAJOR
-DEAL_II_SLEPC_ARCH
 DEAL_II_SLEPC_DIR
 USE_CONTRIB_SLEPC
 DEAL_II_DEFINE_DEAL_II_USE_PETSC
@@ -792,7 +790,6 @@ enable_compat_blocker
 with_petsc
 with_petsc_arch
 with_slepc
-with_slepc_arch
 with_trilinos
 with_trilinos_include
 with_trilinos_libs
@@ -1478,10 +1475,6 @@ Optional Packages:
                           Specify the path to the SLEPc installation, for which
                           the include directory is a subdir; 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
@@ -4069,7 +4062,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 
     if test "$GXX" = yes ; then
     CXXFLAGSO="$CXXFLAGS -O2 -Wuninitialized -felide-constructors -ftemplate-depth-128"
-    CXXFLAGSG="$CXXFLAGS -DDEBUG -pedantic -Wall -W -Wpointer-arith -Wwrite-strings -Woverloaded-virtual -Wsign-compare -Wswitch -ftemplate-depth-128"
+    CXXFLAGSG="$CXXFLAGS -DDEBUG -pedantic -Wall -W -Wpointer-arith -Wwrite-strings -Woverloaded-virtual -Wsynth -Wsign-compare -Wswitch -ftemplate-depth-128"
 
         CXXFLAGSG="$CXXFLAGSG -Wno-long-long"
 
@@ -8446,6 +8439,73 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   esac
 
 
+  if test "x$GXX" = "xyes" ; then
+    { $as_echo "$as_me:$LINENO: checking for problem with -Wsynth and std::complex" >&5
+$as_echo_n "checking for problem with -Wsynth and std::complex... " >&6; }
+    ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+    CXXFLAGS="-Wsynth -Werror"
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#       include <complex>
+
+int
+main ()
+{
+
+       std::complex<double> x;
+       x = std::complex<double>(1,0);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+
+        { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+       CXXFLAGSG="`echo $CXXFLAGSG | perl -pi -e 's/-Wsynth\s*//g;'`"
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  fi
+
+
   if test "x$GXX" = "xyes" ; then
     { $as_echo "$as_me:$LINENO: checking for problem with -Wctor-dtor-privacy" >&5
 $as_echo_n "checking for problem with -Wctor-dtor-privacy... " >&6; }
 
 
 
+  if test "x$GXX" = "xyes" ; then
+    { $as_echo "$as_me:$LINENO: checking for boost::shared_ptr assignment operator= template buglet" >&5
+$as_echo_n "checking for boost::shared_ptr assignment operator= template buglet... " >&6; }
+    ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+    CXXFLAGS="-Wsynth -Werror"
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#       include <boost/shared_ptr.hpp>
+
+int
+main ()
+{
+
+        boost::shared_ptr<int> a,b;
+        a = b;
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+
+        { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+       CXXFLAGSG="`echo $CXXFLAGSG | perl -pi -e 's/-Wsynth\s*//g;'`"
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  fi
+
+
 
 
 
@@ -13103,6 +13230,14 @@ $as_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
+
+         if test ! -d $DEAL_II_SLEPC_DIR/$DEAL_II_PETSC_ARCH \
+               -o ! -d $DEAL_II_SLEPC_DIR/$DEAL_II_PETSC_ARCH/lib \
+               ; then
+           { { $as_echo "$as_me:$LINENO: error: SLEPc has not been compiled for the PETSc architecture" >&5
+$as_echo "$as_me: error: SLEPc has not been compiled for the PETSc architecture" >&2;}
+   { (exit 1); exit 1; }; }
+          fi
         fi
 
 else
@@ -13146,62 +13281,6 @@ _ACEOF
     if test "$USE_CONTRIB_SLEPC" = "yes" \
        ; then
 
-  { $as_echo "$as_me:$LINENO: checking for SLEPc library architecture" >&5
-$as_echo_n "checking for SLEPc library architecture... " >&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"
-       { $as_echo "$as_me:$LINENO: result: $DEAL_II_SLEPC_ARCH" >&5
-$as_echo "$DEAL_II_SLEPC_ARCH" >&6; }
-
-else
-
-                if test "x$SLEPC_ARCH" != "x" ; then
-          DEAL_II_SLEPC_ARCH="$SLEPC_ARCH"
-         { $as_echo "$as_me:$LINENO: result: $DEAL_II_SLEPC_ARCH" >&5
-$as_echo "$DEAL_II_SLEPC_ARCH" >&6; }
-        else
-         { { $as_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
-$as_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/$DEAL_II_SLEPC_ARCH \
-         -o ! -d $DEAL_II_SLEPC_DIR/$DEAL_II_SLEPC_ARCH/lib \
-         ; then
-      { { $as_echo "$as_me:$LINENO: error: SLEPc has not been compiled for the architecture
-                    specified with --with-slepc-arch" >&5
-$as_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
-         { { $as_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
-$as_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
-
-
   { $as_echo "$as_me:$LINENO: checking for SLEPc version" >&5
 $as_echo_n "checking for SLEPc version... " >&6; }
 
@@ -13241,7 +13320,6 @@ $as_echo "$as_me: error: If SLEPc is used, you must use the same version
 
 
 
-
  { $as_echo "$as_me:$LINENO: checking for Trilinos directory" >&5
 $as_echo_n "checking for Trilinos directory... " >&6; }
 
@@ -14926,7 +15004,6 @@ $as_echo "$as_me: error: Path to Metis specified with --with-metis does not
        fi
 
        DEAL_II_METIS_LIBDIR="$DEAL_II_METIS_DIR"
-       DEAL_II_METIS_INCDIR="$DEAL_II_METIS_DIR/Lib"
 
 else
 
@@ -14946,7 +15023,6 @@ $as_echo "$as_me: error: The path to Metis specified in the METIS_DIR
    { (exit 1); exit 1; }; }
          fi
          DEAL_II_METIS_LIBDIR="$DEAL_II_METIS_DIR"
-         DEAL_II_METIS_INCDIR="$DEAL_II_METIS_DIR/Lib"
         else
          USE_CONTRIB_METIS=no
           DEAL_II_METIS_DIR=""
@@ -14959,8 +15035,9 @@ fi
 # Check whether --with-metis-include was given.
 if test "${with_metis_include+set}" = set; then
   withval=$with_metis_include;
-        METIS_INCLUDE_DIR="$withval"
-       DEAL_II_METIS_INCDIR="$METIS_INCLUDE_DIR"
+        { { $as_echo "$as_me:$LINENO: error: The --with-metis-include directive is no longer supported" >&5
+$as_echo "$as_me: error: The --with-metis-include directive is no longer supported" >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
 
@@ -15024,7 +15101,6 @@ _ACEOF
 
 
 
-
 # Check whether --with-umfpack was given.
 if test "${with_umfpack+set}" = set; then
   withval=$with_umfpack;
index 499fabb33b2aa83adeea6664fca1cd011195d4ed..47d22d720113994995b317327d00ae1f99d87938 100644 (file)
@@ -522,7 +522,6 @@ DEAL_II_CONFIGURE_NETCDF
 
 DEAL_II_CONFIGURE_METIS
 AC_SUBST(USE_CONTRIB_METIS)
-AC_SUBST(DEAL_II_METIS_INCDIR)
 AC_SUBST(DEAL_II_METIS_LIBDIR)
 
 dnl Check for UMFPack

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.