Commit a48a9359 authored by incardon's avatar incardon
Browse files

Fixing PETSC installation

parent 4e569e3b
...@@ -127,7 +127,6 @@ fi ...@@ -127,7 +127,6 @@ fi
## Check for PETSC ## Check for PETSC
AX_LIB_PETSC()
######### #########
...@@ -320,6 +319,10 @@ AX_EIGEN([],[]) ...@@ -320,6 +319,10 @@ AX_EIGEN([],[])
###### Checking for libquadmath and libifcore ###### Checking for libquadmath and libifcore
AX_LIB_PETSC()
AC_CHECK_LIB(ifcore, for_cpystr, [ LIBIFCORE=-lifcore ], [ LIBIFCORE= ]) AC_CHECK_LIB(ifcore, for_cpystr, [ LIBIFCORE=-lifcore ], [ LIBIFCORE= ])
AC_CHECK_LIB(quadmath, sinq, [ LIBQUADMATH=-lquadmath ], [ LIBQUADMATH= ]) AC_CHECK_LIB(quadmath, sinq, [ LIBQUADMATH=-lquadmath ], [ LIBQUADMATH= ])
AC_SUBST(LIBQUADMATH) AC_SUBST(LIBQUADMATH)
......
...@@ -101,11 +101,11 @@ AC_DEFUN([AX_LIB_PETSC], [ ...@@ -101,11 +101,11 @@ AC_DEFUN([AX_LIB_PETSC], [
if test -n "$with_petsc" ; then if test -n "$with_petsc" ; then
old_CC=$CC old_CC=$CC
old_CFLAGS=$CFLAGS old_CFLAGS=$CFLAGS
old_LDFLAGS=$LDFLAGS old_LIBS=$LIBS
AX_OPENMP([CFLAGS="$OPENMP_CFLAGS" AX_OPENMP([CFLAGS="$OPENMP_CFLAGS"
LDFLAGS="$OPENMP_LDFLAGS"],[]) LDFLAGS="$OPENMP_LDFLAGS"],[])
CFLAGS="$CFLAGS -I$with_petsc/include $HDF5_INCLUDE $METIS_INCLUDE " CFLAGS="$CFLAGS -I$with_petsc/include $HDF5_INCLUDE $METIS_INCLUDE "
LDFLAGS="$LDFLAGS -L$with_petsc/lib $HDF5_LDFLAGS $HDF5_LIBS $METIS_LIB -lmetis " LIBS="$LDFLAGS -L$with_petsc/lib $HDF5_LDFLAGS $SUITESPARSE_LIBS $HDF5_LIBS $METIS_LIB -lmetis "
CC=$CXX CC=$CXX
AC_LANG_SAVE AC_LANG_SAVE
...@@ -118,7 +118,7 @@ AC_MSG_WARN([could not find header file petsc.h])) ...@@ -118,7 +118,7 @@ AC_MSG_WARN([could not find header file petsc.h]))
AC_LANG_RESTORE AC_LANG_RESTORE
CFLAGS=$old_CFLAGS CFLAGS=$old_CFLAGS
LDFLAGS=$old_LDFLAGS LIBS=$old_LIBS
CC=$old_CC CC=$old_CC
AC_MSG_CHECKING(PETSC in $with_petsc) AC_MSG_CHECKING(PETSC in $with_petsc)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment