From: young Date: Mon, 13 Aug 2012 13:44:12 +0000 (+0000) Subject: Work in configuration for Metis 5.x X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1deda9c6720e5d63c1584ac26b23e352dda24061;p=dealii-svn.git Work in configuration for Metis 5.x git-svn-id: https://svn.dealii.org/trunk@25933 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index be5682fe56..ec40569f33 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -7195,18 +7195,25 @@ AC_DEFUN(DEAL_II_CONFIGURE_METIS, dnl AC_ARG_WITH(metis, [AS_HELP_STRING([--with-metis=/path/to/metis], - [Specify the path to the Metis installation, of which the include and library directories are subdirs; use this if you want to override the METIS_DIR environment variable.])], + [Specify the path to the Metis installation, of which the include and library directories are subdirs; use this if you want to override the METIS_DIR environment variable.])], [ + AC_MSG_CHECKING([for METIS library directory]) USE_CONTRIB_METIS=yes DEAL_II_METIS_DIR="$withval" AC_MSG_RESULT($DEAL_II_METIS_DIR) dnl Make sure that what was specified is actually correct - if test ! -d $DEAL_II_METIS_DIR/Lib ; then + if test ! -d $DEAL_II_METIS_DIR/lib ; then AC_MSG_ERROR([Path to Metis specified with --with-metis does not point to a complete Metis installation]) fi - DEAL_II_METIS_LIBDIR="$DEAL_II_METIS_DIR" + DEAL_II_METIS_LIBDIR="$DEAL_II_METIS_DIR/lib" + + if test ! -d $DEAL_II_METIS_DIR/include ; then + AC_MSG_ERROR([Path to Metis specified with --with-metis does not point to a complete Metis installation]) + fi + + DEAL_II_METIS_INCDIR="$DEAL_II_METIS_DIR/include" ], [ dnl Take something from the environment variables, if it is there @@ -7216,7 +7223,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_METIS, dnl AC_MSG_RESULT($DEAL_II_METIS_DIR) dnl Make sure that what this is actually correct - if test ! -d $DEAL_II_METIS_DIR/Lib ; then + if test ! -d $DEAL_II_METIS_DIR/lib ; then AC_MSG_ERROR([The path to Metis specified in the METIS_DIR environment variable does not point to a complete Metis installation]) fi DEAL_II_METIS_LIBDIR="$DEAL_II_METIS_DIR" @@ -7230,6 +7237,8 @@ AC_DEFUN(DEAL_II_CONFIGURE_METIS, dnl [AS_HELP_STRING([--with-metis-libs=/path/to/metis], [Specify the path to the METIS libraries; use this if you want to override the METIS_LIBDIR environment variable.])], [ + + AC_MSG_CHECKING([for METIS library directory]) USE_CONTRIB_METIS=yes DEAL_II_METIS_LIBDIR="$withval" AC_MSG_RESULT($DEAL_II_METIS_LIBDIR) diff --git a/deal.II/configure b/deal.II/configure index 791c48dcad..4e9f311922 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -620,7 +620,9 @@ DEAL_II_USE_LAPACK USE_CONTRIB_UMFPACK UMFPACK_INCLUDE_DIR UMFPACK_LIB +DEAL_II_METIS_INCDIR DEAL_II_METIS_LIBDIR +DEAL_II_METIS_DIR USE_CONTRIB_METIS TECPLOT_INCLUDE_DIR USE_CONTRIB_HSL @@ -12693,16 +12695,24 @@ fi # Check whether --with-metis was given. if test "${with_metis+set}" = set; then : withval=$with_metis; + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for METIS library directory" >&5 +$as_echo_n "checking for METIS library directory... " >&6; } USE_CONTRIB_METIS=yes DEAL_II_METIS_DIR="$withval" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_METIS_DIR" >&5 $as_echo "$DEAL_II_METIS_DIR" >&6; } - if test ! -d $DEAL_II_METIS_DIR/Lib ; then + if test ! -d $DEAL_II_METIS_DIR/lib ; then as_fn_error $? "Path to Metis specified with --with-metis does not point to a complete Metis installation" "$LINENO" 5 fi - DEAL_II_METIS_LIBDIR="$DEAL_II_METIS_DIR" + DEAL_II_METIS_LIBDIR="$DEAL_II_METIS_DIR/lib" + + if test ! -d $DEAL_II_METIS_DIR/include ; then + as_fn_error $? "Path to Metis specified with --with-metis does not point to a complete Metis installation" "$LINENO" 5 + fi + + DEAL_II_METIS_INCDIR="$DEAL_II_METIS_DIR/include" else @@ -12712,7 +12722,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_METIS_DIR" >&5 $as_echo "$DEAL_II_METIS_DIR" >&6; } - if test ! -d $DEAL_II_METIS_DIR/Lib ; then + if test ! -d $DEAL_II_METIS_DIR/lib ; then as_fn_error $? "The path to Metis specified in the METIS_DIR environment variable does not point to a complete Metis installation" "$LINENO" 5 fi DEAL_II_METIS_LIBDIR="$DEAL_II_METIS_DIR" @@ -12728,6 +12738,9 @@ fi # Check whether --with-metis-libs was given. if test "${with_metis_libs+set}" = set; then : withval=$with_metis_libs; + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for METIS library directory" >&5 +$as_echo_n "checking for METIS library directory... " >&6; } USE_CONTRIB_METIS=yes DEAL_II_METIS_LIBDIR="$withval" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_METIS_LIBDIR" >&5 @@ -12771,6 +12784,8 @@ $as_echo "#define DEAL_II_USE_METIS 1" >>confdefs.h + + # Check whether --with-umfpack was given. if test "${with_umfpack+set}" = set; then : withval=$with_umfpack;