Commit 0b9979f2 authored by Shane Snyder's avatar Shane Snyder

Update autoconf/automake to include darshan dependencies

Modifications to autotools to include necessary info for building
the darshan workload API. This API compiles fine, but the mpi replay
test is not linking properly with darshan library.
parent 8ee15339
......@@ -22,7 +22,7 @@ $(pkgconfig_DATA): config.status
EXTRA_DIST += prepare.sh
AM_CPPFLAGS = -I$(top_srcdir)/src ${ROSS_CPPFLAGS} ${DARSHAN_CPPFLAGS}
AM_CPPFLAGS = -I$(top_srcdir)/src ${ROSS_CPPFLAGS}
AM_CFLAGS = ${ROSS_CFLAGS}
......@@ -37,4 +37,7 @@ include $(top_srcdir)/tests/Makefile.subdir
if USE_DARSHAN
src_libcodes_base_a_SOURCES += src/workload/codes-darshan-io-wrkld.c
AM_CPPFLAGS += ${DARSHAN_CPPFLAGS}
AM_LDFLAGS = ${DARSHAN_LDFLAGS}
AM_LIBS += ${DARSHAN_LIBS}
endif
......@@ -16,6 +16,7 @@
#define MAX_NAME_LENGTH_WKLD 512
typedef struct bgp_params bgp_params;
typedef struct darshan_params darshan_params;
typedef struct codes_workload_info codes_workload_info;
struct bgp_params
......@@ -30,6 +31,11 @@ struct bgp_params
char io_kernel_def_path[MAX_NAME_LENGTH_WKLD];
};
struct darshan_params
{
char log_file_path[MAX_NAME_LENGTH_WKLD];
};
struct codes_workload_info
{
int group_id; /* group id */
......
......@@ -94,11 +94,15 @@ AC_ARG_WITH([darshan],[AS_HELP_STRING([--with-darshan@<:@=DIR@:>@],
[location of Darshan installation])])
if test "x${with_darshan}" != "x" ; then
darshan_headers="${with_darshan}/include"
AC_CHECK_FILE([$darshan_headers/darshan-io-events.h],
AC_CHECK_FILE([$darshan_headers/darshan-logutils.h],
AM_CONDITIONAL(USE_DARSHAN, true),
AC_MSG_ERROR(Could not find darshan-io-events.h at: $darshan_headers))
DARSHAN_CPPFLAGS="-DUSE_DARSHAN=1 -I${with_darshan}/include"
AC_MSG_ERROR(Could not find darshan-logutils.h at: $darshan_headers))
DARSHAN_CPPFLAGS="-DUSE_DARSHAN=1 -DDARSHAN_CONFIG_H=\\\"${with_darshan}/include/darshan-util-config.h\\\" -I${with_darshan}/include"
DARSHAN_LDFLAGS="-L${with_darshan}/lib"
DARSHAN_LIBS="darshan-util"
AC_SUBST(DARSHAN_CPPFLAGS)
AC_SUBST(DARSHAN_LDFLAGS)
AC_SUBST(DARSHAN_LIBS)
else
AM_CONDITIONAL(USE_DARSHAN, false)
fi
......
This diff is collapsed.
......@@ -24,6 +24,5 @@ tests_workload_codes_workload_test_SOURCES = \
tests/workload/codes-workload-test-cn-lp.c \
tests/workload/codes-workload-test-cn-lp.h
tests_workload_codes_workload_mpi_replay_LDADD = $(testlib) ${ROSS_LIBS}
tests_workload_codes_workload_mpi_replay_LDFLAGS = ${ROSS_LDFLAGS}
tests_workload_codes_workload_mpi_replay_LDADD = $(testlib)
tests_workload_codes_workload_mpi_replay_SOURCES = tests/workload/codes-workload-mpi-replay.c
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