More autoconf changes to support darshan

c49d786a · Shane Snyder · e58af845 · c49d786a · c49d786a
Commit c49d786a authored Feb 19, 2014 by Shane Snyder
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Makefile.am Makefile.am +1 -1

configure.ac configure.ac +1 -1

No files found.
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ include $(top_srcdir)/src/Makefile.subdir
 include $(top_srcdir)/tests/Makefile.subdir

 if USE_DARSHAN
-AM_CPPFLAGS += ${DARSHAN_CFLAGS} "-DUSE_DARSHAN=1"
+AM_CPPFLAGS += ${DARSHAN_CFLAGS} -DUSE_DARSHAN=1
 src_libcodes_base_a_SOURCES += src/workload/codes-darshan-io-wrkld.c
 tests_workload_codes_workload_test_LDADD += ${DARSHAN_LIBS}
 tests_workload_codes_workload_mpi_replay_LDADD += ${DARSHAN_LIBS}

--- a/configure.ac
+++ b/configure.ac
@@ -96,7 +96,7 @@ if test "x${with_darshan}" != "x" ; then
    AC_CHECK_FILE([${with_darshan}/lib/pkgconfig/darshan-util.pc],
                  AM_CONDITIONAL(USE_DARSHAN, true),
                  AC_MSG_ERROR(Could not find darshan-util.pc))
-    DARSHAN_LIBS=`PKG_CONFIG_PATH=${with_darshan}/lib/pkgconfig pkg-config darshan-util --libs`
+    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)