From 6d7ddcfff3a276c48336340b8af8616f42b77bc5 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Thu, 12 May 2016 11:35:16 +0200
Subject: [PATCH] Fixing PETSC order
---
m4/ax_petsc_lib.m4 | 5 +++--
m4/immdx_lib_parmetis.m4 | 3 +++
src/Makefile.am | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/m4/ax_petsc_lib.m4 b/m4/ax_petsc_lib.m4
index b9832b04..1213bf30 100644
--- a/m4/ax_petsc_lib.m4
+++ b/m4/ax_petsc_lib.m4
@@ -97,12 +97,13 @@ AC_DEFUN([AX_LIB_PETSC], [
#
# locate PETSC library
#
+
if test -n "$with_petsc" ; then
old_CC=$CC
old_CFLAGS=$CFLAGS
old_LDFLAGS=$LDFLAGS
CFLAGS="-I$with_petsc/include"
- LDFLAGS="-L$with_petsc/lib"
+ LDFLAGS="-L$with_petsc/lib "
CC=$CXX
AC_LANG_SAVE
@@ -132,7 +133,7 @@ AC_MSG_WARN([could not find header file petsc.h]))
#
#
if test x = x"$PETSC_LIB" ; then
- ifelse([$2],,[AC_MSG_ERROR(Failed to find valid PETSC library)],[$2])
+ ifelse([$2],,[],[$2])
:
else
ifelse([$1],,[],[$1])
diff --git a/m4/immdx_lib_parmetis.m4 b/m4/immdx_lib_parmetis.m4
index aaf10125..e93b495c 100644
--- a/m4/immdx_lib_parmetis.m4
+++ b/m4/immdx_lib_parmetis.m4
@@ -45,9 +45,11 @@ AC_DEFUN([IMMDX_LIB_PARMETIS], [
old_CC=$CC
old_CFLAGS=$CFLAGS
old_LDFLAGS=$LDFLAGS
+ old_LIBS=$LIBS
CFLAGS="-I$with_parmetis/include -I$with_metis/include"
LDFLAGS="-L$with_parmetis/lib -L$with_metis/lib"
CC=$CXX
+ LIBS="-lmetis"
AC_LANG_SAVE
AC_LANG_C
@@ -62,6 +64,7 @@ AC_DEFUN([IMMDX_LIB_PARMETIS], [
CFLAGS=$old_CFLAGS
LDFLAGS=$old_LDFLAGS
CC=$old_CC
+ LIBS=$old_LIBS
AC_MSG_CHECKING(PARMETIS in $with_parmetis)
if test "$parmetis_lib" = "yes" -a "$parmetis_h" = "yes" ; then
diff --git a/src/Makefile.am b/src/Makefile.am
index 632707d7..867a536a 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
-LINKLIBS = $(SUITESPARSE_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(METIS_LIB) $(PARMETIS_LIB) $(DEFAULT_LIB) $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_IOSTREAMS_LIB) $(HDF5_LDFLAGS) $(HDF5_LIBS) $(LIBQUADMATH) $(PETSC_LIB)
+LINKLIBS = $(PETSC_LIB) $(SUITESPARSE_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(METIS_LIB) $(PARMETIS_LIB) $(DEFAULT_LIB) $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_IOSTREAMS_LIB) $(HDF5_LDFLAGS) $(HDF5_LIBS) $(LIBQUADMATH) $(PETSC_LIB)
noinst_PROGRAMS = numerics
numerics_SOURCES = main.cpp ../../openfpm_vcluster/src/VCluster.cpp ../../openfpm_devices/src/memory/HeapMemory.cpp ../../openfpm_devices/src/memory/PtrMemory.cpp ../../openfpm_devices/src/Memleak_check.cpp
--
GitLab