Commit 0c09b902 authored by Adam Mercer's avatar Adam Mercer 🛌

integrate lalxml into top-level build

Original: 834e2b6e48465e13356ec4fe3b8e16f104ea3222
parent fce660af
......@@ -8,7 +8,7 @@ fail () {
}
## Run 00boot in subdirs
for d in lal lalstochastic lalapps; do
for d in lal lalxml lalstochastic lalapps; do
echo "00boot: running 00boot in $d"
(cd "$d" && ./00boot 1>/dev/null) || fail "00boot in $d"
done
......
......@@ -25,6 +25,9 @@ export LALSUPPORT_LIBS
LALSTOCHASTIC_LIBS="${lalsuite_top_builddir}/lalstochastic/src/liblalstochastic.la"
LALSTOCHASTIC_CFLAGS="-I${lalsuite_top_builddir}/lalstochastic/include"
export LALSTOCHASTIC_LIBS LALSTOCHASTIC_CFLAGS
LALXML_LIBS="${lalsuite_top_builddir}/lalxml/src/liblalxml.la"
LALXML_CFLAGS="-I${lalsuite_top_builddir}/lalxml/include"
export LALXML_LIBS LALXML_CFLAGS
if test "$frame" = "true" ; then
LIBS_save="$LIBS"
......@@ -75,6 +78,7 @@ if test "$xml" = "true" ; then
fi
AC_CONFIG_SUBDIRS([lal])
AC_CONFIG_SUBDIRS([lalxml])
AC_CONFIG_SUBDIRS([lalstochastic])
AC_CONFIG_SUBDIRS([lalapps])
......
......@@ -100,11 +100,17 @@ AC_CHECK_LIB([gsl],[gsl_strerror],,[AC_MSG_ERROR(could not find GSL library)])
PKG_CHECK_MODULES([LAL],[lal >= 6.4],[true],[false])
CPPFLAGS="$CPPFLAGS $LAL_CFLAGS"
LIBS="$LIBS $LAL_LIBS"
AC_CHECK_LIB([lal],[main],,[AC_MSG_ERROR(cannot find lal library)])
# check for lalsupport, needed for test suite
PKG_CHECK_MODULES([LALSUPPORT],[lalsupport],[true],[false])
AC_CHECK_LIB([lalsupport],[LALOpenDataFile],[lalsupport=true],[lalsupport=false])
# check libraries if not a top-level build
if test "$LALSUITE_BUILD" = "true" ; then
test -n "$LALSUPPORT_LIBS" && lalsupport="true"
else
AC_CHECK_LIB([lal],[main],,[AC_MSG_ERROR(cannot find lal library)])
AC_CHECK_LIB([lalsupport],[LALOpenDataFile],[lalsupport=true],[lalsupport=false])
fi
AM_CONDITIONAL([LALSUPPORT],[test x$lalsupport = xtrue])
# add gcc specific flags
......
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