From 71590b5e731a4fb633c6f9b46fd943cd93a545b0 Mon Sep 17 00:00:00 2001 From: "Toby D. Young" Date: Thu, 23 Aug 2012 08:23:26 +0000 Subject: [PATCH] Remove unusable --with-metis-libs configure flag. git-svn-id: https://svn.dealii.org/trunk@26097 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 36 ------------------------------------ deal.II/configure | 42 ------------------------------------------ 2 files changed, 78 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index ebc256fc5c..3fd286855f 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -7221,42 +7221,6 @@ AC_DEFUN(DEAL_II_CONFIGURE_METIS, dnl fi ]) - AC_ARG_WITH(metis-libs, - [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) - - dnl Make sure that what was specified is actually correct - if test ! -d $DEAL_II_METIS_LIBDIR ; then - AC_MSG_ERROR([Path to Metis specified with --with-metis does not point to a complete Metis installation]) - fi - ], - [ - dnl Take something from the environment variables, if it is there - if test "x$METIS_LIBDIR" != "x" ; then - USE_CONTRIB_METIS=yes - DEAL_II_METIS_LIBDIR="$METIS_LIBDIR" - AC_MSG_RESULT($DEAL_II_METIS_LIBDIR) - - dnl Make sure that what this is actually correct - if test ! -d $DEAL_II_METIS_LIBDIR ; then - AC_MSG_ERROR([The path to Metis specified in the METIS_DIR environment variable does not point to a complete Metis installation]) - fi - else - dnl Unless --with-metis has been set before, declare that METIS - dnl is not desired. - if test "x$USE_CONTRIB_METIS" != "xyes" ; then - USE_CONTRIB_METIS=no - DEAL_II_METIS_LIBDIR="" - fi - fi - ]) - if test "x$USE_CONTRIB_METIS" = "xyes" ; then AC_DEFINE(DEAL_II_USE_METIS, 1, [Defined if a Metis installation was found and is going diff --git a/deal.II/configure b/deal.II/configure index 6932459f54..6cbe57e52a 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -805,7 +805,6 @@ with_netcdf with_netcdf_include with_netcdf_libs with_metis -with_metis_libs with_umfpack with_umfpack_include with_umfpack_libs @@ -1538,10 +1537,6 @@ Optional Packages: the include and library directories are subdirs; use this if you want to override the METIS_DIR environment variable. - --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. --with-umfpack=umfpack-root-directory Use installed UMFPack version. 'umfpack-root-directory' should be the directory @@ -12696,43 +12691,6 @@ $as_echo "$DEAL_II_METIS_DIR" >&6; } 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 -$as_echo "$DEAL_II_METIS_LIBDIR" >&6; } - - if test ! -d $DEAL_II_METIS_LIBDIR ; then - as_fn_error $? "Path to Metis specified with --with-metis does not point to a complete Metis installation" "$LINENO" 5 - fi - -else - - if test "x$METIS_LIBDIR" != "x" ; then - USE_CONTRIB_METIS=yes - DEAL_II_METIS_LIBDIR="$METIS_LIBDIR" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_METIS_LIBDIR" >&5 -$as_echo "$DEAL_II_METIS_LIBDIR" >&6; } - - if test ! -d $DEAL_II_METIS_LIBDIR ; 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 - else - if test "x$USE_CONTRIB_METIS" != "xyes" ; then - USE_CONTRIB_METIS=no - DEAL_II_METIS_LIBDIR="" - fi - fi - -fi - - if test "x$USE_CONTRIB_METIS" = "xyes" ; then $as_echo "#define DEAL_II_USE_METIS 1" >>confdefs.h -- 2.39.5