Commit 2f076e7a authored by Miroslav Shaltev's avatar Miroslav Shaltev
Browse files

Compile against lalpulsar 1.16.0.1 and NOMAD 3.8.1.

parent 79cc2546
......@@ -174,12 +174,25 @@ CPPFLAGS="$CPPFLAGS $LAL_CFLAGS $LALPULSAR_CFLAGS"
# check for nomad
if test "${nomad}" = "true" ; then
PKG_CHECK_MODULES([SGTELIB],[sgtelib],[true],[false])
# do compilation checks with c++
AC_LANG_PUSH([C++])
lal_pre_sgtelib_LIBS="$LIBS"
LIBS="$LIBS $SGTELIB_LIBS"
CPPFLAGS="$CPPFLAGS $SGTELIB_CFLAGS"
lal_pre_sgtelib_VERSION="$VERSION"
AC_CHECK_HEADER([sgtelib.hpp],,[sgtelib="false"][CPPFLAGS="$lal_pre_sgtelib_CPPFLAGS" LIBS="$lal_pre_sgtelib_LIBS"],[#undef VERSION])
AC_LANG_POP([C++])
CPPFLAGS="$lal_pre_sgtelib_CPPFLAGS"
LIBS="$lal_pre_sgtelib_LIBS"
PKG_CHECK_MODULES([NOMAD],[nomad],[true],[false])
# do compilation checks with c++
AC_LANG_PUSH([C++])
lal_pre_nomad_LIBS="$LIBS"
LIBS="$LIBS $NOMAD_LIBS"
CPPFLAGS="$CPPFLAGS $NOMAD_CFLAGS"
LIBS="$LIBS $NOMAD_LIBS $SGTELIB_LIBS"
CPPFLAGS="$CPPFLAGS $NOMAD_CFLAGS $SGTELIB_CFLAGS"
lal_pre_nomad_VERSION="$VERSION"
AC_CHECK_HEADER([nomad.hpp],,[nomad="false"][CPPFLAGS="$lal_pre_nomad_CPPFLAGS" LIBS="$lal_pre_nomad_LIBS"],[#undef VERSION])
AC_LANG_POP([C++])
......
......@@ -2,7 +2,7 @@
# $Id$
# for using lalapps-defines + functions
AM_CPPFLAGS += -I$(top_srcdir)/src/lalapps $(NOMAD_CFLAGS)
AM_CPPFLAGS += -I$(top_srcdir)/src/lalapps $(NOMAD_CFLAGS) $(SGTELIB_CFLAGS)
LDADD = $(top_builddir)/src/lalapps/liblalapps.la
bin_PROGRAMS = test_nomad cwsof_FStatNomad
......
......@@ -3,8 +3,8 @@
# for using lalapps-defines + functions
AM_CPPFLAGS += -I$(top_srcdir)/src/lalapps $(NOMAD_CFLAGS)
LDADD = $(top_builddir)/src/lalapps/liblalapps.la
AM_CPPFLAGS += -I$(top_srcdir)/src/lalapps $(SGTELIB_CFLAGS) $(NOMAD_CFLAGS)
LDADD = $(top_builddir)/src/lalapps/liblalapps.la
bin_PROGRAMS = cwsof_SSDOptimizeEDS cwsof_SSDOptimize
......
Supports Markdown
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