Commit fda65e55 authored by gsell's avatar gsell

bugfixes in autotool configuration

parent 5d6a9a9a
AC_INIT([H5hut], [1.99.11], [h5part@lists.psi.ch], H5hut) AC_INIT([H5hut], [1.99.12], [h5part@lists.psi.ch], H5hut)
AC_PREREQ(2.60) AC_PREREQ(2.60)
AC_CONFIG_HEADERS(config.h) AC_CONFIG_HEADERS(config.h)
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
...@@ -62,7 +62,7 @@ AC_ARG_WITH( ...@@ -62,7 +62,7 @@ AC_ARG_WITH(
[hdf5], [hdf5],
[AS_HELP_STRING([--with-hdf5], [AS_HELP_STRING([--with-hdf5],
[path to HDF5 installation [default=""]])], [path to HDF5 installation [default=""]])],
[HDF5_PREFIX=$withval], [HDF5_PREFIX=""]) [HDF5_PREFIX=$withval], [])
AC_ARG_WITH( AC_ARG_WITH(
[mpi], [mpi],
...@@ -259,13 +259,13 @@ fi ...@@ -259,13 +259,13 @@ fi
AC_MSG_CHECKING([if parallel interface enabled]) AC_MSG_CHECKING([if parallel interface enabled])
if test "X$ENABLE_PARALLEL" = "Xyes"; then if test "X$ENABLE_PARALLEL" = "Xyes"; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
AM_CPPFLAGS="${AM_CPPFLAGS} -DPARALLEL_IO -DMPICH_IGNORE_CXX_SEEK" CPPFLAGS="${CPPFLAGS} -DPARALLEL_IO -DMPICH_IGNORE_CXX_SEEK"
if test "X$ENABLE_EXPERIMENTAL" = "Xyes"; then if test "X$ENABLE_EXPERIMENTAL" = "Xyes"; then
AC_MSG_CHECKING([for ParMETIS]) AC_MSG_CHECKING([for ParMETIS])
if test "X$PARMETISPATH" != "X"; then if test "X$PARMETISPATH" != "X"; then
AM_CPPFLAGS="$AM_CPPFLAGS -I$PARMETISPATH/include" CPPFLAGS="$CPPFLAGS -I$PARMETISPATH/include"
AM_LDFLAGS="$AM_LDFLAGS -L$PARMETISPATH/lib" LDFLAGS="$LDFLAGS -L$PARMETISPATH/lib"
fi fi
LIBS="$LIBS -lparmetis -lmetis" LIBS="$LIBS -lparmetis -lmetis"
...@@ -284,9 +284,15 @@ fi ...@@ -284,9 +284,15 @@ fi
############################################################################### ###############################################################################
# LIBRARY PATHS # LIBRARY PATHS
if test -n "${HDF5_PREFIX}" ; then if test -z "${HDF5_PREFIX}"; then
AM_CPPFLAGS="$AM_CPPFLAGS -I$HDF5_PREFIX/include" # alternatives to HDF5_PREFIX
AM_LDFLAGS="$AM_LDFLAGS -L$HDF5_PREFIX/lib" if test -n "${HDF5_DIR}"; then
HDF5_PREFIX=${HDF5_DIR}
fi
fi
if test -n "${HDF5_PREFIX}"; then
CPPFLAGS="$CPPFLAGS -I$HDF5_PREFIX/include"
LDFLAGS="$LDFLAGS -L$HDF5_PREFIX/lib"
fi fi
AC_CHECK_LIB([z], [compress2]) AC_CHECK_LIB([z], [compress2])
AC_CHECK_LIB([hdf5], [H5open]) AC_CHECK_LIB([hdf5], [H5open])
...@@ -317,8 +323,8 @@ if test -z "$LUSTREROOT"; then ...@@ -317,8 +323,8 @@ if test -z "$LUSTREROOT"; then
AC_MSG_WARN([Couldn't locate the lustre API... building without support for lustre striping!]) AC_MSG_WARN([Couldn't locate the lustre API... building without support for lustre striping!])
else else
CFLAGS="$CFLAGS -DH5_USE_LUSTRE" CFLAGS="$CFLAGS -DH5_USE_LUSTRE"
AM_CPPFLAGS="$AM_CPPFLAGS -I$LUSTREROOT/usr/include" CPPFLAGS="$CPPFLAGS -I$LUSTREROOT/usr/include"
AM_LDFLAGS="$AM_LDFLAGS -L$LUSTREROOT/usr/lib" LDFLAGS="$LDFLAGS -L$LUSTREROOT/usr/lib"
LIBS="$LIBS -llustreapi" LIBS="$LIBS -llustreapi"
fi fi
...@@ -336,6 +342,9 @@ fi ...@@ -336,6 +342,9 @@ fi
############################################################################### ###############################################################################
# EXPORTING VARIABLES & CREATING OUTPUT FILES # EXPORTING VARIABLES & CREATING OUTPUT FILES
AM_CPPFLAGS=$CPPFLAGS
AM_LDFLAGS=$LDFLAGS
AC_SUBST(HDF5_PREFIX) AC_SUBST(HDF5_PREFIX)
AC_SUBST(CFLAGS) AC_SUBST(CFLAGS)
AC_SUBST(FFLAGS) AC_SUBST(FFLAGS)
......
AM_CPPFLAGS = -I${abs_top_builddir}/src/include -Wno-deprecated AM_CPPFLAGS = -I${abs_top_srcdir}/src/include -Wno-deprecated
FFLAGS += -cpp $(AM_CPPFLAGS) FFLAGS += -cpp $(AM_CPPFLAGS)
LDFLAGS += -L${abs_top_builddir}/src/lib LDFLAGS += -L${abs_top_builddir}/src/lib
......
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