Commit 590d8149 authored by Jonathan Jenkins's avatar Jonathan Jenkins

revert pkg-config "Requires:" additions

would require specifying every dependency path for every thing dependent on
codes-base (pkg-config could really use a method to extend PKG_CONFIG_PATH
within .pc files)
parent 3f7aa3d8
...@@ -78,14 +78,12 @@ PKG_CHECK_MODULES_STATIC([ROSS], [ross], [], ...@@ -78,14 +78,12 @@ PKG_CHECK_MODULES_STATIC([ROSS], [ross], [],
AC_ARG_WITH([darshan],[AS_HELP_STRING([--with-darshan], AC_ARG_WITH([darshan],[AS_HELP_STRING([--with-darshan],
[Build with the darshan workload support])], [Build with the darshan workload support])],
[use_darshan=yes],[use_darshan=no]) [use_darshan=yes],[use_darshan=no])
DARSHAN_PKG=
if test "x${use_darshan}" = xyes ; then if test "x${use_darshan}" = xyes ; then
PKG_CHECK_MODULES_STATIC([DARSHAN], [darshan-util], [], PKG_CHECK_MODULES_STATIC([DARSHAN], [darshan-util], [],
[AC_MSG_ERROR([Could not find working darshan installation via pkg-config])]) [AC_MSG_ERROR([Could not find working darshan installation via pkg-config])])
DARSHAN_PKG=darshan-util
fi fi
AM_CONDITIONAL(USE_DARSHAN, [test "x${use_darshan}" = xyes]) AM_CONDITIONAL(USE_DARSHAN, [test "x${use_darshan}" = xyes])
AC_SUBST(DARSHAN_PKG)
# check for Recorder # check for Recorder
AM_CONDITIONAL(USE_RECORDER, true) AM_CONDITIONAL(USE_RECORDER, true)
......
...@@ -2,6 +2,11 @@ prefix = @prefix@ ...@@ -2,6 +2,11 @@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ 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_cflags=@DUMPI_CFLAGS@
dumpi_libs=@DUMPI_LIBS@ dumpi_libs=@DUMPI_LIBS@
...@@ -9,7 +14,6 @@ Name: codes-base ...@@ -9,7 +14,6 @@ Name: codes-base
Description: Base functionality for CODES storage simulation Description: Base functionality for CODES storage simulation
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
URL: http://trac.mcs.anl.gov/projects/CODES URL: http://trac.mcs.anl.gov/projects/CODES
Requires: ross Requires:
Requires.private: @DARSHAN_PKG@ Libs: -L${libdir} -lcodes-base ${ross_ldflags} ${ross_libs} ${darshan_libs} ${dumpi_libs}
Libs: -L${libdir} -lcodes-base ${dumpi_libs} Cflags: -I${includedir} ${ross_cflags} ${darshan_cflags} ${dumpi_cflags}
Cflags: -I${includedir} ${dumpi_cflags}
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