Skip to content
Snippets Groups Projects
Commit f789c0eb authored by Markus Blatt's avatar Markus Blatt
Browse files

Slightly modified patch by Andreas Lauser. (requiring metis is an

error as it would have halted configure)

[[Imported from SVN: r6874]]
parent 0704f087
No related branches found
No related tags found
No related merge requests found
......@@ -78,7 +78,12 @@ AC_DEFUN([DUNE_PATH_PARMETIS],[
## do nothing if --without-parmetis is used
if test x"$with_mpi" != x"no" && test x"$with_parmetis" != x"no" ; then
# call IMDX_LIB_METIS directly and not via AC_REQUIRE
# because AC_REQUIRE support not allow parameters
# without any parameters a missing METIS would halt configure
IMMDX_LIB_METIS(,[true])
# defaultpath
PARMETIS_LIB_PATH="$with_parmetis/$lib_path"
PARMETIS_INCLUDE_PATH="$with_parmetis/$include_path"
......@@ -87,11 +92,11 @@ AC_DEFUN([DUNE_PATH_PARMETIS],[
PARMETIS_LDFLAGS="$DUNEMPILDFLAGS"
# set variables so that tests can use them
CPPFLAGS="$CPPFLAGS -I$PARMETIS_INCLUDE_PATH $DUNEMPICPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$PARMETIS_INCLUDE_PATH $METIS_INCLUDE $DUNEMPICPPFLAGS"
# check for central header
AC_CHECK_HEADER([parmetis.h],[
PARMETIS_CPPFLAGS="-I$PARMETIS_INCLUDE_PATH"
PARMETIS_CPPFLAGS="-I$PARMETIS_INCLUDE_PATH $METIS_INCLUDE"
HAVE_PARMETIS="1"],[
HAVE_PARMETIS="0"
AC_MSG_WARN([parmetis.h not found in $PARMETIS_INCLUDE_PATH with $CPPFLAGS])]
......@@ -108,7 +113,7 @@ AC_DEFUN([DUNE_PATH_PARMETIS],[
if test x$HAVE_PARMETIS = x1 ; then
DUNE_CHECK_LIB_EXT([$PARMETIS_LIB_PATH], [$with_metis_lib], [metis_partgraphkway],
[
PARMETIS_LIBS="-L$PARMETIS_LIB_PATH -l$with_metis_lib $DUNEMPILIBS -lm"
PARMETIS_LIBS="-L$PARMETIS_LIB_PATH -l$with_metis_lib $METIS_LDFLAGS $DUNEMPILIBS -lm"
LIBS="$PARMETIS_LIBS $ac_save_LIBS"
],[
HAVE_PARMETIS="0"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment