Commit 1e42a4f7 authored by Jolien Creighton's avatar Jolien Creighton Committed by Adam Mercer

updated lalframe.pc to have both FrameL and framecppc dependencies

Also bumped version requrement of framecppc to 2.0.0 following the
recommendation by Ed Maros.
Note: I think that the lalframe.pc should have these as
Requires.private rather than Requires.
Original: b9c7c4c614cbfa5010a899f680898726f9919c1a
parent abb37cfd
......@@ -125,7 +125,7 @@ FRAMEL_AVAILABLE="no"
AS_IF([test "${framec}" = "true"], [
FRAMEC_AVAILABLE="yes"
PKG_CHECK_MODULES([FRAMECPPC],[framecppc >= 1.19.32],[true],[false])
PKG_CHECK_MODULES([FRAMECPPC],[framecppc >= 2.0.0],[true],[false])
LALSUITE_ADD_FLAGS([C],[${FRAMECPPC_CFLAGS}],[${FRAMECPPC_LIBS}])
AC_CHECK_LIB([framecppc],[FrameCFileOpen],,[FRAMEC_AVAILABLE="no"])
AC_CHECK_HEADERS([framecppc/FrameC.h],,[FRAMEC_AVAILABLE="no"])
......@@ -144,6 +144,16 @@ AS_IF([test "${FRAMEC_AVAILABLE}" = "no" -a "${FRAMEL_AVAILABLE}" = "no"], [
AC_MSG_ERROR([no frame library available])
])
AS_IF([test "${FRAMEC_AVAILABLE}" = "yes"],
[AC_SUBST([PC_REQUIRES_FRAMEC], [", framecppc >= 2.0.0"])],
[AC_SUBST([PC_REQUIRES_FRAMEC], [""])]
)
AS_IF([test "${FRAMEL_AVAILABLE}" = "yes"],
[AC_SUBST([PC_REQUIRES_FRAMEL], [", libframe"])],
[AC_SUBST([PC_REQUIRES_FRAMEL], [""])]
)
AM_CONDITIONAL([FRAMEC],[test "${FRAMEC_AVAILABLE}" = "yes"])
AM_CONDITIONAL([FRAMEL],[test "${FRAMEL_AVAILABLE}" = "yes"])
......
......@@ -12,6 +12,6 @@ LALFRAME_PYTHON_PATH=@pyexecdir@
Name: LALFrame
Description: LAL Frame Library Support
Version: @VERSION@
Requires: lal >= @LAL_VERSION@, libframe
Requires: lal >= @LAL_VERSION@@PC_REQUIRES_FRAMEC@@PC_REQUIRES_FRAMEL@
Libs: -L${libdir} -llalframe
Cflags: -I${includedir}
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