fix pkg-config usage

configure.ac

@@ -78,12 +78,14 @@ PKG_CHECK_MODULES_STATIC([ROSS], [ross], [],
 AC_ARG_WITH([darshan],[AS_HELP_STRING([--with-darshan],
                         [Build with the darshan workload support])],
                       [use_darshan=yes],[use_darshan=no])
+DARSHAN_PKG=
 if test "x${use_darshan}" = xyes ; then
     PKG_CHECK_MODULES_STATIC([DARSHAN], [darshan-util], [],
                       [AC_MSG_ERROR([Could not find working darshan installation via pkg-config])])
+    DARSHAN_PKG=darshan-util
 fi
 AM_CONDITIONAL(USE_DARSHAN, [test "x${use_darshan}" = xyes])
-
+AC_SUBST(DARSHAN_PKG)
 
 # check for Recorder
 AM_CONDITIONAL(USE_RECORDER, true)

maint/codes-base.pc.in

@@ -2,18 +2,14 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-ross_cflags=@ROSS_CFLAGS@
-ross_ldflags=@ROSS_LDFLAGS@
-ross_libs=@ROSS_LIBS@
-darshan_libs=@DARSHAN_LIBS@
-darshan_cflags=@DARSHAN_CFLAGS@
 dumpi_cflags=@DUMPI_CFLAGS@
 dumpi_libs=@DUMPI_LIBS@
 
 Name: codes-base
 Description: Base functionality for CODES storage simulation
-Version: @CODES_BASE_VERSION@
+Version: @PACKAGE_VERSION@
 URL: http://trac.mcs.anl.gov/projects/CODES
-Requires:
-Libs: -L${libdir} -lcodes-base ${ross_ldflags} ${ross_libs} ${darshan_libs} ${dumpi_libs} 
-Cflags: -I${includedir} ${ross_cflags} ${darshan_cflags} ${dumpi_cflags}
+Requires: ross
+Requires.private: @DARSHAN_PKG@
+Libs: -L${libdir} -lcodes-base ${dumpi_libs}
+Cflags: -I${includedir} ${dumpi_cflags}