Commit d5011da1 authored by Adam Mercer's avatar Adam Mercer

lalframe: enable framec support by default

Original: 8de79de3c2e9856a6b8bca79dc849eeae089a353
parent e92e9e29
......@@ -38,7 +38,9 @@ AM_INIT_AUTOMAKE([ \
# version requirements
MIN_LAL_VERSION="6.18.0"
MIN_FRAMECPPC_VERSION="2.5.5"
AC_SUBST([MIN_LAL_VERSION])
AC_SUBST([MIN_FRAMECPPC_VERSION])
AC_CANONICAL_HOST
......@@ -137,7 +139,7 @@ FRAMEL_AVAILABLE="no"
AS_IF([test "${framec}" = "true"], [
FRAMEC_AVAILABLE="yes"
PKG_CHECK_MODULES([FRAMECPPC],[framecppc >= 2.0.0],[true],[false])
PKG_CHECK_MODULES([FRAMECPPC],[framecppc >= ${MIN_FRAMECPPC_VERSION}],[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"])
......@@ -157,7 +159,7 @@ AS_IF([test "${FRAMEC_AVAILABLE}" = "no" -a "${FRAMEL_AVAILABLE}" = "no"], [
])
AS_IF([test "${FRAMEC_AVAILABLE}" = "yes"],
[AC_SUBST([PC_REQUIRES_FRAMEC], [", framecppc >= 2.0.0"])],
[AC_SUBST([PC_REQUIRES_FRAMEC], [", framecppc >= ${MIN_FRAMECPPC_VERSION}"])],
[AC_SUBST([PC_REQUIRES_FRAMEC], [""])]
)
......@@ -204,7 +206,6 @@ AC_MSG_NOTICE([
LALFrame has now been successfully configured:
* Python support is $PYTHON_ENABLE_VAL
* using the $FRAME_LIBRARY frame library
* FrameC availability... ${FRAMEC_AVAILABLE}
* FrameL availability... ${FRAMEL_AVAILABLE}
* SWIG bindings for Octave are $SWIG_BUILD_OCTAVE_ENABLE_VAL
......
......@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Adam Mercer <adam.mercer@ligo.org>
Build-Depends: debhelper (>= 9),
dh-python,
ldas-tools-framecpp-c-dev,
ldas-tools-framecpp-c-dev (>= @MIN_FRAMECPPC_VERSION@),
libframe-dev (>= 8.0),
liboctave-dev,
pkg-config,
......@@ -26,7 +26,7 @@ Package: lalframe
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
ldas-tools-framecpp-c,
ldas-tools-framecpp-c (>= @MIN_FRAMECPPC_VERSION@),
libframe1 (>= 8.0),
lal (>= @MIN_LAL_VERSION@~)
Description: LSC Algorithm Library Frame
......@@ -39,7 +39,7 @@ Section: libdevel
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
ldas-tools-framecpp-c-dev,
ldas-tools-framecpp-c-dev (>= @MIN_FRAMECPPC_VERSION@),
libframe-dev (>= 8.0),
zlib1g-dev,
lal-dev (>= @MIN_LAL_VERSION@~),
......
# lalframe.m4 - lalframe specific macros
#
# serial 7
# serial 8
AC_DEFUN([LALFRAME_ENABLE_FRAMEC],
[AC_ARG_ENABLE(
......@@ -10,7 +10,7 @@ AC_DEFUN([LALFRAME_ENABLE_FRAMEC],
[yes],[framec="true"],
[no],[framec="false"],
[AC_MSG_ERROR([bad value ${enableval} for --enable-framec])])
],[framec="false"])
],[framec="true"])
])
AC_DEFUN([LALFRAME_ENABLE_FRAMEL],
......
......@@ -12,7 +12,7 @@ Source: %{name}-%{version}.tar.xz
URL: https://wiki.ligo.org/DASWG/LALSuite
Packager: Adam Mercer <adam.mercer@ligo.org>
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: ldas-tools-framecpp-c-devel
BuildRequires: ldas-tools-framecpp-c-devel >= @MIN_FRAMECPPC_VERSION@
BuildRequires: libframe-devel
BuildRequires: numpy
BuildRequires: octave-devel
......@@ -21,7 +21,7 @@ BuildRequires: swig >= 3.0.7
BuildRequires: lal-devel >= @MIN_LAL_VERSION@
BuildRequires: lal-octave >= @MIN_LAL_VERSION@
BuildRequires: lal-python >= @MIN_LAL_VERSION@
Requires: ldas-tools-framecpp-c
Requires: ldas-tools-framecpp-c >= @MIN_FRAMECPPC_VERSION@
Requires: libframe
Requires: lal >= @MIN_LAL_VERSION@
Prefix: %{_prefix}
......@@ -35,7 +35,7 @@ that use the LAL Frame library.
Summary: Files and documentation needed for compiling programs that use LAL Frame
Group: LAL
Requires: %{name} = %{version}
Requires: ldas-tools-framecpp-c-devel
Requires: ldas-tools-framecpp-c-devel >= @MIN_FRAMECPPC_VERSION@
Requires: libframe-devel
Requires: lal-devel >= @MIN_LAL_VERSION@
%description devel
......
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