Commit 6655b928 authored by Jonathan Jenkins's avatar Jonathan Jenkins

while we're at it, properly pkg-check darshan

parent 085d9878
...@@ -70,23 +70,20 @@ AC_TRY_COMPILE([#include <mpi.h>], [int ret = MPI_Init(0, (void*)0)], ...@@ -70,23 +70,20 @@ AC_TRY_COMPILE([#include <mpi.h>], [int ret = MPI_Init(0, (void*)0)],
AC_MSG_ERROR(CC doesnt appear to be a valid MPI compiler. See INSTALL document or try adding CC=mpicc to your configure command line.) AC_MSG_ERROR(CC doesnt appear to be a valid MPI compiler. See INSTALL document or try adding CC=mpicc to your configure command line.)
) )
PKG_CHECK_MODULES([ROSS], [ross], [], # check for ROSS
[AC_MSG_ERROR([Could not find working ross installation])]) PKG_CHECK_MODULES_STATIC([ROSS], [ross], [],
[AC_MSG_ERROR([Could not find working ross installation via pkg-config])])
# check for Darshan # check for Darshan
AC_ARG_WITH([darshan],[AS_HELP_STRING([--with-darshan@<:@=DIR@:>@], AC_ARG_WITH([darshan],[AS_HELP_STRING([--with-darshan],
[location of Darshan installation])]) [Build with the darshan workload support])],
if test "x${with_darshan}" != "x" ; then [use_darshan=yes],[use_darshan=no])
AC_CHECK_FILE([${with_darshan}/lib/pkgconfig/darshan-util.pc], if test "x${use_darshan}" = xyes ; then
AM_CONDITIONAL(USE_DARSHAN, true), PKG_CHECK_MODULES_STATIC([DARSHAN], [darshan-util], [],
AC_MSG_ERROR(Could not find darshan-util.pc)) [AC_MSG_ERROR([Could not find working darshan installation via pkg-config])])
DARSHAN_LIBS+=`PKG_CONFIG_PATH=${with_darshan}/lib/pkgconfig pkg-config darshan-util --static --libs`
DARSHAN_CFLAGS=`PKG_CONFIG_PATH=${with_darshan}/lib/pkgconfig pkg-config darshan-util --cflags`
AC_SUBST(DARSHAN_LIBS)
AC_SUBST(DARSHAN_CFLAGS)
else
AM_CONDITIONAL(USE_DARSHAN, false)
fi fi
AM_CONDITIONAL(USE_DARSHAN, [test "x${use_darshan}" = xyes])
# check for Recorder # check for Recorder
AM_CONDITIONAL(USE_RECORDER, true) AM_CONDITIONAL(USE_RECORDER, true)
......
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