From 6e61e641a84cd9ad5c1588806527f5146a828505 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Tue, 21 Jul 2020 11:45:19 +0200 Subject: [PATCH] Check index size of METIS add to DEFINES --- configure | 8 +++++--- configure.ac | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/configure b/configure index ea270b0d..cfba49ad 100755 --- a/configure +++ b/configure @@ -9149,9 +9149,11 @@ fi LIBS="$SAVE_LIBS"; CPPFLAGS="$SAVE_CPPFLAGS"; -if test "x$psblas_cv_have_metis" == "xyes" ; then - FDEFINES="$psblas_cv_define_prepend-DHAVE_METIS $FDEFINES" - CDEFINES="-DHAVE_METIS_ $psblas_cv_metis_includes $CDEFINES" +if test "x$pac_cv_metis_idx" == "xunknown" ; then + true ; # do nothing +elif test "x$psblas_cv_have_metis" == "xyes" ; then + FDEFINES="$psblas_cv_define_prepend-DHAVE_METIS $psblas_cv_define_prepend-DMETIS_$pac_cv_metis_idx $FDEFINES" + CDEFINES="-DHAVE_METIS_ $psblas_cv_metis_includes $CDEFINES -DMETIS_$pac_cv_metis_idx" fi diff --git a/configure.ac b/configure.ac index 304abf99..64fbe596 100755 --- a/configure.ac +++ b/configure.ac @@ -689,9 +689,11 @@ LIBS="$RSB_LIBS ${LIBS}" dnl AC_CHECK_HEADERS([rsb.h], [ LIBS="${LIBS} $want_rsb_libs"], []) PAC_CHECK_METIS -if test "x$psblas_cv_have_metis" == "xyes" ; then - FDEFINES="$psblas_cv_define_prepend-DHAVE_METIS $FDEFINES" - CDEFINES="-DHAVE_METIS_ $psblas_cv_metis_includes $CDEFINES" +if test "x$pac_cv_metis_idx" == "xunknown" ; then + true ; # do nothing +elif test "x$psblas_cv_have_metis" == "xyes" ; then + FDEFINES="$psblas_cv_define_prepend-DHAVE_METIS $psblas_cv_define_prepend-DMETIS_$pac_cv_metis_idx $FDEFINES" + CDEFINES="-DHAVE_METIS_ $psblas_cv_metis_includes $CDEFINES -DMETIS_$pac_cv_metis_idx" fi PAC_CHECK_AMD