Update codes-base build to use darshan-util.pc

configure.ac

@@ -100,16 +100,6 @@ if test "x${with_darshan}" != "x" ; then
     DARSHAN_CFLAGS=`PKG_CONFIG_PATH=${with_darshan}/lib/pkgconfig pkg-config darshan-util --cflags`
     AC_SUBST(DARSHAN_LIBS)
     AC_SUBST(DARSHAN_CFLAGS) 
-#    darshan_headers="${with_darshan}/include"
-#    AC_CHECK_FILE([$darshan_headers/darshan-logutils.h],
-#                  AM_CONDITIONAL(USE_DARSHAN, true),
-#                  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="-ldarshan-util -lz"
-#    AC_SUBST(DARSHAN_CPPFLAGS)
-#    AC_SUBST(DARSHAN_LDFLAGS)
-#    AC_SUBST(DARSHAN_LIBS)
 else
     AM_CONDITIONAL(USE_DARSHAN, false)
 fi

maint/codes-base.pc.in

@@ -6,13 +6,12 @@ ross_cflags=@ROSS_CFLAGS@
 ross_ldflags=@ROSS_LDFLAGS@
 ross_libs=@ROSS_LIBS@
 darshan_libs=@DARSHAN_LIBS@
-darshan_cflags=@DARSHAN_CPPFLAGS@
-darshan_ldflags=@DARSHAN_LDFLAGS@
+darshan_cflags=@DARSHAN_CFLAGS@
 
 Name: codes-base
 Description: Base functionality for CODES storage simulation
 Version: @CODES_BASE_VERSION@
 URL: http://trac.mcs.anl.gov/projects/CODES
 Requires:
-Libs: -L${libdir} -lcodes-base ${ross_ldflags} ${ross_libs} ${darshan_ldflags} ${darshan_libs}
+Libs: -L${libdir} -lcodes-base ${ross_ldflags} ${ross_libs} ${darshan_libs}
 Cflags: -I${includedir} ${ross_cflags} ${darshan_cflags}