Commit 2044b3bf authored by Karl Wette's avatar Karl Wette
Browse files

Merge remote-tracking branch 'origin/master' into Unified-Fstat-API-1000

Conflicts:
	lalapps/configure.ac
	lalapps/src/pulsar/FDS_isolated/Makefile.am
	lalapps/src/pulsar/FDS_isolated/OptimizedCFS/LocalComputeFstat.c
	lalapps/src/pulsar/hough/src2/HierarchicalSearch.c
	lalapps/src/pulsar/hough/src2/RecalcHSCandidates.c
	lalinference/configure.ac
	lalpulsar/src/LFTandTSutils.c
Original: 55f7d7e32352dacf49dd4c37f2e20d47b5f3f8aa
parents 7a660bda d6de294b
......@@ -3,10 +3,9 @@
*~
.DS_Store
.dirstamp
/Makefile
/Makefile.in
/_inst/
/lalsuite-*.tar.gz
Makefile
Makefile.in
TAGS
aclocal.m4
auto/
......@@ -15,3 +14,4 @@ config.cache
config.log
config.status
configure
lalsuite-*.tar.gz
AC_PREREQ([2.63])
AC_INIT([LALSuite],[6.20.1],[lal-discuss@ligo.org])
AC_INIT([LALSuite],[6.21.1],[lal-discuss@ligo.org])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR([gnuscripts])
AC_CONFIG_MACRO_DIR([gnuscripts])
......@@ -9,10 +9,6 @@ AM_INIT_AUTOMAKE([1.11 foreign subdir-objects color-tests parallel-tests])
LALSUITE_DISTCHECK_CONFIGURE_FLAGS
# always prefer uninstalled LAL libraries
LALSUITE_PKG_SUFFIX="-uninstalled"
export LALSUITE_PKG_SUFFIX
# provide LAL library enable/disable options
LALSUITE_ENABLE_ALL_LAL
doxygen=true
......@@ -69,7 +65,7 @@ lalsuite_config_subdir([lalapps])
AC_SUBST([ac_configure_args])
AC_OUTPUT
echo "
AC_MSG_NOTICE([
==================================================
LALSuite has now been successfully configured:
......@@ -92,4 +88,4 @@ ${prefix}
Now run 'make' to build LALSuite,
and run 'make install' to install LALSuite.
==================================================
"
])
AC_PREREQ([2.63])
AC_INIT([lalsuite-doxygen],[6.20.1],[lal-discuss@ligo.org])
AC_INIT([lalsuite-doxygen],[6.21.1],[lal-discuss@ligo.org])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR([gnuscripts])
AC_CONFIG_MACRO_DIR([gnuscripts])
......
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
scriptversion=2012-06-26.16; # UTC
scriptversion=2013-10-28.13; # UTC
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
......@@ -160,7 +160,7 @@ give_advice ()
;;
autom4te*)
echo "You might have modified some maintainer files that require"
echo "the 'automa4te' program to be rebuilt."
echo "the 'autom4te' program to be rebuilt."
program_details 'autom4te'
;;
bison*|yacc*)
......
# Empty variable used to end multi-line file lists
EOL =
# Automake variables which may be added to later
BUILT_SOURCES =
CLEANFILES =
DISTCLEANFILES =
EXTRA_DIST =
LDADD =
MOSTLYCLEANFILES =
SUFFIXES =
TESTS =
bin_PROGRAMS =
check_PROGRAMS =
lib_LTLIBRARIES =
man_MANS =
noinst_DATA =
pkgconfig_DATA =
pkgdata_DATA =
pkginclude_HEADERS =
pkgpython_PYTHON =
sysconf_DATA =
# Force package include directory to 'lal'
pkgincludedir = $(includedir)/lal
# For installed headers which are not part of the SWIG interface
noswig_pkgincludedir = $(pkgincludedir)
noswig_pkginclude_HEADERS =
# Set install directory for pkg-config files
pkgconfigdir = $(libdir)/pkgconfig
# Add data files and manuals to distribution
EXTRA_DIST += $(DATA) $(MANS)
# Ensure that not-installed data files are built
BUILT_SOURCES += $(noinst_DATA)
# Default include directories
DEFAULT_INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src
# Always run tests with LAL_DATA_PATH as set by ./configure,
# with memory debugging, and with error/warning printing
TESTS_ENVIRONMENT = \
LAL_DATA_PATH="$(LAL_DATA_PATH)"; export LAL_DATA_PATH; \
LAL_DEBUG_LEVEL=memdbg,msglvl2; export LAL_DEBUG_LEVEL; \
$(EOL)
......@@ -132,14 +132,14 @@ END {
}
# output prepend/append variables
for (name in pathvars) {
sed_script = ""
sed_script = "s|::|:!@%COLON%@!:|;"
split(pathvars[name], pathvar, ":")
for (i in pathvar) {
if (substr(pathvar[i], 1, 1) != "$") {
sed_script = sed_script "s|:" pathvar[i] ":|:|;"
}
}
sed_script = sed_script "s|::*|:|g;s|^:||;s|:$||"
sed_script = sed_script "s|::*|:|g;s|^:||;s|:$||;s|!@%COLON%@!||g;"
if (csh) {
print "if ( ! ${?" name "} ) setenv " name >>output
print "setenv " name " `echo \":${" name "}:\" | " SED " '" sed_script "'`" >>output
......
# -*- mode: autoconf; -*-
# lalsuite_build.m4 - top level build macros
#
# serial 75
# serial 80
# not present in older versions of pkg.m4
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
......@@ -9,8 +9,6 @@ m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
# forbid LALSUITE_... from appearing in output (./configure)
m4_pattern_forbid([^_?LALSUITE_[A-Z_]+$])
# apart from LALSUITE_PKG_SUFFIX
m4_pattern_allow([^LALSUITE_PKG_SUFFIX$])
# list of user variables; see section 4.8.1 of the Autoconf manual
m4_define([uvar_list],[CPPFLAGS CFLAGS CXXFLAGS FCFLAGS FFLAGS LDFLAGS])
......@@ -62,7 +60,7 @@ AC_DEFUN([AC_OUTPUT],[
# prepend compiler configuration e.g. CFLAGS to AM_CFLAGS,
# then restore original user-supplied values of user variables
m4_foreach_w([uvar],uvar_list,[
AM_[]uvar="${lalsuite_compiler_[]uvar} ${AM_[]uvar}"
AC_SUBST(AM_[]uvar,"${lalsuite_compiler_[]uvar} ${AM_[]uvar} ${sys_[]uvar}")
uvar="${uvar_prefix[]uvar}"
])
# call original AC_OUTPUT
......@@ -101,45 +99,83 @@ AC_DEFUN([LALSUITE_ADD_FLAGS],[
# $0: prepend flags to AM_CPPFLAGS/AM_$1FLAGS/AM_LDFLAGS/LIBS,
# and update values of CPPFLAGS/$1FLAGS/LDFLAGS for Autoconf tests
m4_ifval([$1],[m4_ifval([$2],[
prepend_CPPFLAGS=
prepend_$1FLAGS=
pre_AM_CPPFLAGS=
pre_sys_CPPFLAGS=
pre_AM_$1FLAGS=
for flag in $2; do
# AM_CPPFLAGS gets -I and -D flags, AM_$1FLAGS gets everything else from $2
# AM_CPPFLAGS gets unique -I, -D and -U flags
# sys_CPPFLAGS gets unique system -I flags
# AM_$1FLAGS gets everything else
AS_CASE([${flag}],
[-I*|-D*],[prepend_CPPFLAGS="${prepend_CPPFLAGS} ${flag}"],
[prepend_$1FLAGS="${prepend_$1FLAGS} ${flag}"]
[-I/opt/*|-I/usr/*],[
AS_CASE([" ${sys_CPPFLAGS} "],
[*" ${flag} "*],[:],
[pre_sys_CPPFLAGS="${pre_sys_CPPFLAGS} ${flag}"]
)
],
[-I*],[
AS_CASE([" ${AM_CPPFLAGS} "],
[*" ${flag} "*],[:],
[pre_AM_CPPFLAGS="${pre_AM_CPPFLAGS} ${flag}"]
)
],
[-D*|-U*],[pre_AM_CPPFLAGS="${pre_AM_CPPFLAGS} ${flag}"],
[pre_AM_$1FLAGS="${pre_AM_$1FLAGS} ${flag}"]
)
done
AS_IF([test "x${prepend_CPPFLAGS}" != x],[
AC_SUBST([AM_CPPFLAGS],["${prepend_CPPFLAGS} ${AM_CPPFLAGS}"])
_AS_ECHO_LOG([prepended ${prepend_CPPFLAGS} to AM_CPPFLAGS])
CPPFLAGS="${AM_CPPFLAGS} ${uvar_orig_prefix[]CPPFLAGS}"
AS_IF([test "x${pre_AM_CPPFLAGS}" != x],[
AM_CPPFLAGS="${pre_AM_CPPFLAGS} ${AM_CPPFLAGS}"
_AS_ECHO_LOG([prepended ${pre_AM_CPPFLAGS} to AM_CPPFLAGS])
])
AS_IF([test "x${prepend_$1FLAGS}" != x],[
AC_SUBST([AM_$1FLAGS],["${prepend_$1FLAGS} ${AM_$1FLAGS}"])
_AS_ECHO_LOG([prepended ${prepend_$1FLAGS} to AM_$1FLAGS])
$1FLAGS="${AM_$1FLAGS} ${uvar_orig_prefix[]$1FLAGS}"
AS_IF([test "x${pre_sys_CPPFLAGS}" != x],[
sys_CPPFLAGS="${pre_sys_CPPFLAGS} ${sys_CPPFLAGS}"
_AS_ECHO_LOG([prepended ${pre_sys_CPPFLAGS} to system AM_CPPFLAGS])
])
AS_IF([test "x${pre_AM_$1FLAGS}" != x],[
AM_$1FLAGS="${pre_AM_$1FLAGS} ${AM_$1FLAGS}"
_AS_ECHO_LOG([prepended ${pre_AM_$1FLAGS} to AM_$1FLAGS])
])
CPPFLAGS="${AM_CPPFLAGS} ${sys_CPPFLAGS} ${uvar_orig_prefix[]CPPFLAGS}"
$1FLAGS="${AM_$1FLAGS} ${uvar_orig_prefix[]$1FLAGS}"
])])
m4_ifval([$3],[
prepend_LDFLAGS=
prepend_LIBS=
pre_AM_LDFLAGS=
pre_sys_LDFLAGS=
pre_LIBS=
for flag in $3; do
# LIBS gets -l flags and .la files, AM_LDFLAGS gets everything else from $3
# LIBS gets -l flags and .la files
# sys_LDFLAGS gets unique system -L flags
# AM_LDFLAGS gets unique -L flags and everything else
AS_CASE([${flag}],
[-l*|*.la],[prepend_LIBS="${prepend_LIBS} ${flag}"],
[prepend_LDFLAGS="${prepend_LDFLAGS} ${flag}"]
[-L/opt/*|-L/usr/*],[
AS_CASE([" ${sys_LDFLAGS} "],
[*" ${flag} "*],[:],
[pre_sys_LDFLAGS="${pre_sys_LDFLAGS} ${flag}"]
)
],
[-L*],[
AS_CASE([" ${AM_LDFLAGS} "],
[*" ${flag} "*],[:],
[pre_AM_LDFLAGS="${pre_AM_LDFLAGS} ${flag}"]
)
],
[-l*|*.la],[pre_LIBS="${pre_LIBS} ${flag}"],
[pre_AM_LDFLAGS="${pre_AM_LDFLAGS} ${flag}"]
)
done
AS_IF([test "x${prepend_LDFLAGS}" != x],[
AC_SUBST([AM_LDFLAGS],["${prepend_LDFLAGS} ${AM_LDFLAGS}"])
_AS_ECHO_LOG([prepended ${prepend_LDFLAGS} to AM_LDFLAGS])
LDFLAGS="${AM_LDFLAGS} ${uvar_orig_prefix[]LDFLAGS}"
AS_IF([test "x${pre_AM_LDFLAGS}" != x],[
AM_LDFLAGS="${pre_AM_LDFLAGS} ${AM_LDFLAGS}"
_AS_ECHO_LOG([prepended ${pre_AM_LDFLAGS} to AM_LDFLAGS])
])
AS_IF([test "x${pre_sys_LDFLAGS}" != x],[
sys_LDFLAGS="${pre_sys_LDFLAGS} ${sys_LDFLAGS}"
_AS_ECHO_LOG([prepended ${pre_sys_LDFLAGS} to system AM_LDFLAGS])
])
AS_IF([test "x${prepend_LIBS}" != x],[
LIBS="${prepend_LIBS} ${LIBS}"
_AS_ECHO_LOG([prepended ${prepend_LIBS} to LIBS])
AS_IF([test "x${pre_LIBS}" != x],[
LIBS="${pre_LIBS} ${LIBS}"
_AS_ECHO_LOG([prepended ${pre_LIBS} to LIBS])
])
LDFLAGS="${AM_LDFLAGS} ${sys_LDFLAGS} ${uvar_orig_prefix[]LDFLAGS}"
])
# end $0
])
......@@ -191,6 +227,27 @@ AC_DEFUN([LALSUITE_CHECK_GIT_REPO],[
AC_SUBST(GENERATE_VCS_INFO)
])
AC_DEFUN([LALSUITE_VERSION_CONFIGURE_INFO],[
# $0: define version/configure info
m4_pushdef([uppercase],m4_translit(AC_PACKAGE_NAME, [a-z], [A-Z]))
version_major=`echo "$VERSION" | cut -d. -f1`
version_minor=`echo "$VERSION" | cut -d. -f2`
version_micro=`echo "$VERSION" | cut -d. -f3`
version_devel=`echo "$VERSION" | cut -d. -f4-`
test -z "$version_micro" && version_micro=0
test -z "$version_devel" && version_devel=0
configure_date=`date +"%Y-%m-%dT%H:%M:%S%z"`
AC_DEFINE_UNQUOTED(uppercase[_VERSION],["$VERSION"],AC_PACKAGE_NAME[ Version])
AC_DEFINE_UNQUOTED(uppercase[_VERSION_MAJOR],[$version_major],AC_PACKAGE_NAME[ Version Major Number])
AC_DEFINE_UNQUOTED(uppercase[_VERSION_MINOR],[$version_minor],AC_PACKAGE_NAME[ Version Minor Number])
AC_DEFINE_UNQUOTED(uppercase[_VERSION_MICRO],[$version_micro],AC_PACKAGE_NAME[ Version Micro Number])
AC_DEFINE_UNQUOTED(uppercase[_VERSION_DEVEL],[$version_devel],AC_PACKAGE_NAME[ Version Devel Number])
AC_SUBST([ac_configure_args])
AC_SUBST([configure_date])
m4_popdef([uppercase])
# end $0
])
AC_DEFUN([LALSUITE_REQUIRE_CXX],[
# require a C++ compiler
lalsuite_require_cxx=true
......@@ -238,7 +295,7 @@ AC_DEFUN([LALSUITE_PROG_COMPILERS],[
AC_SUBST(CLANG_CXX)
# define C99 constant and limit macros for C++ sources
LALSUITE_ADD_FLAGS([CXX],[-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS],[])
CXXFLAGS="${CXXFLAGS} -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS"
],[
CXX=
......@@ -333,8 +390,7 @@ AC_DEFUN([LALSUITE_CHECK_LIB],[
m4_pushdef([uppercase],m4_translit([[$1]], [a-z], [A-Z]))
# build pkg-config library name and version
AC_ARG_VAR([LALSUITE_PKG_SUFFIX],[suffix to add to LALSuite pkg-config library names])
lal_pkg="lowercase[]${LALSUITE_PKG_SUFFIX} >= $2"
lal_pkg="lowercase[] >= $2"
# substitute required library version in pkg-config files
AC_SUBST(uppercase[]_VERSION,[$2])
......@@ -361,12 +417,18 @@ AC_DEFUN([LALSUITE_CHECK_LIB],[
# add $1 compiler and linker flags to CPPFLAGS/CFLAGS/LDFLAGS/LIBS
LALSUITE_ADD_FLAGS([C],[`${PKG_CONFIG} --cflags "${lal_pkg}"`],[`${PKG_CONFIG} --libs "${lal_pkg}"`])
# add $1 include flags, including system directories, to LAL_INCLUDES_WITH_SYS_DIRS
# add system include flags to LAL_SYSTEM_INCLUDES: get $1 include flags with system flags,
# then add any flags not already in CPPFLAGS or LAL_SYSTEM_INCLUDES to LAL_SYSTEM_INCLUDES
PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
LAL_INCLUDES_WITH_SYS_DIRS=`${PKG_CONFIG} --cflags-only-I "${lal_pkg}"`" ${LAL_INCLUDES_WITH_SYS_DIRS}"
for flag in `${PKG_CONFIG} --cflags-only-I "${lal_pkg}"`; do
AS_CASE([" ${CPPFLAGS} ${LAL_SYSTEM_INCLUDES} "],
[*" ${flag} "*],[:],
[LAL_SYSTEM_INCLUDES="${LAL_SYSTEM_INCLUDES} ${flag}"]
)
done
AS_UNSET([PKG_CONFIG_ALLOW_SYSTEM_CFLAGS])
AC_SUBST([LAL_INCLUDES_WITH_SYS_DIRS])
AC_SUBST([LAL_SYSTEM_INCLUDES])
# add $1 data path to LAL_DATA_PATH
LALSUITE_ADD_PATH(LAL_DATA_PATH,`${PKG_CONFIG} --variable=LAL_DATA_PATH "${lal_pkg}"`)
......@@ -384,7 +446,7 @@ AC_DEFUN([LALSUITE_CHECK_LIB],[
# if $1 is not installed, add .pc.in file to ./config.status dependencies
lal_pkg_pcin_dir=`${PKG_CONFIG} --variable=abs_top_srcdir "${lal_pkg}"`
lal_pkg_pcin_file="${lal_pkg_pcin_dir}/lowercase[]${LALSUITE_PKG_SUFFIX}.pc.in"
lal_pkg_pcin_file="${lal_pkg_pcin_dir}/lowercase[]-uninstalled.pc.in"
AS_IF([test ! -f "${lal_pkg_pcin_file}"],[
AC_MSG_ERROR([could not find file ${lal_pkg_pcin_file}])
])
......@@ -503,17 +565,6 @@ AC_DEFUN([LALSUITE_ENABLE_NIGHTLY],
AC_SUBST(NIGHTLY_VERSION)
])
AC_DEFUN([LALSUITE_ENABLE_DEBUG],
[AC_ARG_ENABLE(
[debug],
AC_HELP_STRING([--enable-debug],[include standard LAL debugging code [default=yes]]),
[AS_CASE(["${enableval}"],
[yes],,
[no],AC_DEFINE(LAL_NDEBUG, 1, Suppress debugging code),
AC_MSG_ERROR(bad value for ${enableval} for --enable-debug))
], )
])
AC_DEFUN([LALSUITE_ENABLE_ALL_LAL],
[AC_ARG_ENABLE(
[all_lal],
......
# -*- mode: autoconf; -*-
# lalsuite_gccflags.m4 - macros to set strict gcc flags
#
# serial 17
# serial 19
AC_DEFUN([LALSUITE_ENABLE_GCC_FLAGS],[
# $0: enable GCC warning flags
......@@ -21,7 +21,7 @@ AC_DEFUN([LALSUITE_ADD_GCC_FLAGS],[
# $0: add GCC warning flags
AS_IF([test "x${GCC}" = xyes && test "x${enable_gcc_flags}" = xyes],[
gcc_flags="-g3 -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common -Wnested-externs -Wno-format-zero-length -fno-strict-aliasing"
gcc_flags="-g3 -Wall -W -Werror -Wmissing-prototypes -Wstrict-prototypes -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common -Wnested-externs -Wno-format-zero-length -fno-strict-aliasing"
# check if compiler supports -Wno-unused-result
LALSUITE_PUSH_UVARS
......@@ -38,12 +38,6 @@ AC_DEFUN([LALSUITE_ADD_GCC_FLAGS],[
])
LALSUITE_POP_UVARS
# don't use -Werror in LALApps
AS_CASE([${PACKAGE}],
[lalapps],[:],
[gcc_flags="${gcc_flags} -Werror"]
)
# comment out usage of -pedantic flag due to gcc bug 7263
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=7263
#
......@@ -55,6 +49,20 @@ AC_DEFUN([LALSUITE_ADD_GCC_FLAGS],[
# add mac os x specific flags
AS_IF([test "x${MACOSX_VERSION}" != "x"],[
gcc_flags="${gcc_flags} -mmacosx-version-min=10.4"
# check if compiler supports -Wl,-no_compact_unwind
LALSUITE_PUSH_UVARS
LALSUITE_CLEAR_UVARS
LDFLAGS="-Wl,-no_compact_unwind"
AC_MSG_CHECKING([whether linker supports -Wl,-no_compact_unwind])
AC_LINK_IFELSE([
AC_LANG_PROGRAM([])
],[
AC_MSG_RESULT([yes])
gcc_ldflags="-Wl,-no_compact_unwind"
],[
AC_MSG_RESULT([no])
])
LALSUITE_POP_UVARS
])
gcc_cflags="${gcc_flags}"
......@@ -74,6 +82,7 @@ AC_DEFUN([LALSUITE_ADD_GCC_FLAGS],[
],[
LALSUITE_ADD_FLAGS([C],[${gcc_cflags}],[])
LALSUITE_ADD_FLAGS([CXX],[${gcc_cxxflags}],[])
LALSUITE_ADD_FLAGS([LD],[${gcc_ldflags}],[])
])
])
......
......@@ -2,7 +2,7 @@
# lalsuite_swig.m4 - SWIG configuration
# Author: Karl Wette, 2011, 2012
#
# serial 50
# serial 58
# enable SWIG wrapping modules
AC_DEFUN([LALSUITE_ENABLE_SWIG],[
......@@ -27,8 +27,8 @@ AC_DEFUN([LALSUITE_ENABLE_SWIG],[
# options to enable/disable languages
swig_build_any=false
swig_min_version=0.0
LALSUITE_ENABLE_SWIG_LANGUAGE([Octave],[false],[2.0.7],[LALSUITE_REQUIRE_CXX])
LALSUITE_ENABLE_SWIG_LANGUAGE([Python],[false],[2.0.7])
LALSUITE_ENABLE_SWIG_LANGUAGE([Octave],[false],[2.0.11],[LALSUITE_REQUIRE_CXX])
LALSUITE_ENABLE_SWIG_LANGUAGE([Python],[false],[2.0.11])
])
......@@ -139,31 +139,17 @@ AC_DEFUN([LALSUITE_USE_SWIG],[
AC_SUBST(SWIG_SYMBOL_PREFIXES,["$1"])
# flags for preprocessing/generating SWIG wrapping module sources
AC_SUBST(SWIG_SWIGFLAGS,["-Wextra -Werror -I\$(abs_top_builddir)/include"])
AC_SUBST(SWIG_SWIGFLAGS,["-Wextra -Werror -I\$(top_srcdir)/include -I\$(top_srcdir)/src -I\$(top_builddir)/include -I\$(top_builddir)/src"])
# add -MP option if SWIG is greater than version 2.0.9
AS_VERSION_COMPARE([${swig_version}],[2.0.9],[],[],[
SWIG_SWIGFLAGS="${SWIG_SWIGFLAGS} -MP"
])
# add -MP option
SWIG_SWIGFLAGS="${SWIG_SWIGFLAGS} -MP"
# send language-specific SWIG output files to libtool directory
AC_SUBST(SWIG_OUTDIR,["\$(abs_builddir)/${objdir}"])
SWIG_SWIGFLAGS="${SWIG_SWIGFLAGS} -outdir \$(SWIG_OUTDIR)"
# flags for generating/compiling SWIG wrapping module sources
AC_SUBST(SWIG_CPPFLAGS,["-I\$(abs_top_builddir)/include -I\$(abs_top_builddir)/src ${swig_save_CPPFLAGS} ${LAL_INCLUDES_WITH_SYS_DIRS}"])
# are we (not) in debugging mode?
AS_IF([test "x${enable_debug}" = xno],[
SWIG_SWIGFLAGS="${SWIG_SWIGFLAGS} -DNDEBUG"
SWIG_CPPFLAGS="${SWIG_CPPFLAGS} -DNDEBUG"
])
# is GSL available?
AS_IF([test "x${GSL_LIBS}" != x],[
SWIG_SWIGFLAGS="${SWIG_SWIGFLAGS} -DHAVE_LIBGSL"
SWIG_CPPFLAGS="${SWIG_CPPFLAGS} -DHAVE_LIBGSL"
])
AC_SUBST(SWIG_CPPFLAGS,["-I\$(top_srcdir)/include -I\$(top_srcdir)/src -I\$(top_builddir)/include -I\$(top_builddir)/src ${swig_save_CPPFLAGS} ${LAL_SYSTEM_INCLUDES}"])
# flags for compiling SWIG wrapping module sources
AC_SUBST(SWIG_CFLAGS,[])
......@@ -179,9 +165,6 @@ AC_DEFUN([LALSUITE_USE_SWIG],[
)
done
# define C99 constant and limit macros for C++ sources
SWIG_CXXFLAGS="${SWIG_CXXFLAGS} -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS"
# make SWIG use C++ casts in typemaps in C++ mode
SWIG_CXXFLAGS="${SWIG_CXXFLAGS} -DSWIG_CPLUSPLUS_CAST"
......@@ -463,5 +446,19 @@ EOD`]
CPPFLAGS=
AC_LANG_POP([C])
# remove deprecated code in NumPy API >= 1.7
PYTHON_CPPFLAGS="${PYTHON_CPPFLAGS} -DNPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION"
# check for declarations which may need compatibility code for NumPy API < 1.7
CPPFLAGS=${PYTHON_CPPFLAGS}
AC_LANG_PUSH([C])
AC_CHECK_DECLS([NPY_ARRAY_WRITEABLE,PyArray_SetBaseObject],,,[
AC_INCLUDES_DEFAULT
#include <Python.h>
#include <numpy/arrayobject.h>
])
CPPFLAGS=
AC_LANG_POP([C])
])
])
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
scriptversion=2012-06-26.16; # UTC
scriptversion=2013-10-28.13; # UTC
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
......@@ -160,7 +160,7 @@ give_advice ()
;;
autom4te*)
echo "You might have modified some maintainer files that require"
echo "the 'automa4te' program to be rebuilt."
echo "the 'autom4te' program to be rebuilt."
program_details 'autom4te'
;;
bison*|yacc*)
......
SUBDIRS = . swig
if SWIG_BUILD
swig_headers = $(pkginclude_HEADERS)
swig_iface_headers = $(top_builddir)/swig/@PACKAGE@swig_headers.list
all install .PHONY : swig-iface-headers
swig-iface-headers :
@modified=false; \
newfile="src/lal: `echo $(swig_headers) | $(SED) 's|src/lal/||g'`"; \
if test -f $(swig_iface_headers); then \
oldfile=`cat $(swig_iface_headers)`; \
if test "x$${oldfile}" != "x$${newfile}"; then \
echo "$${newfile}" > $(swig_iface_headers); \
modified=true; \
fi; \
else \
echo "$${newfile}" > $(swig_iface_headers); \
modified=true; \
fi; \
if test "x$$modified" = xtrue; then \
for file in `find $(top_builddir)/swig -type f -name '*swig*.deps'`; do \
echo '#erased' > $$file; \
done; \
fi
endif
include $(top_srcdir)/gnuscripts/build_common.am
# Override automake's default rule for rebuilding aclocal.m4, to ensure
# that ./configure is successfully recreated after certain build system
# changes which require other autotools (e.g. autoheader) to be
# re-run. See Redmine issue #728.
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__cd) $(top_srcdir) && $(SHELL) ./00boot
# Build user environment scripts
EXTRA_DIST += $(top_srcdir)/gnuscripts/generate_user_env.awk
sysconf_DATA += $(PACKAGE)-user-env.sh $(PACKAGE)-user-env.csh
BUILT_SOURCES += $(PACKAGE)-user-env.sh $(PACKAGE)-user-env.csh
MOSTLYCLEANFILES += $(PACKAGE)-user-env.sh $(PACKAGE)-user-env.csh $(PACKAGE)-user-env.shell
$(PACKAGE)-user-env.shell: Makefile
$(AM_V_GEN)echo "# source this file to access $(PACKAGE_NAME)" >$@; \
echo "prepend PATH $(bindir)" >>$@; \
echo "prepend MANPATH $(mandir)" >>$@; \
echo "prepend PKG_CONFIG_PATH $(libdir)/pkgconfig" >>$@; \
echo "prepend PYTHONPATH $(pyexecdir)" >>$@; \
echo "prepend LAL_DATA_PATH $(pkgdatadir)" >>$@; \
echo "prepend OCTAVE_PATH $(octexecdir)" >>$@; \
package_ucase=`echo $(PACKAGE) | LC_ALL=C tr '[a-z]' '[A-Z]'`; \
echo "set $${package_ucase}_PREFIX $(prefix)" >>$@
$(PACKAGE)-user-env.sh $(PACKAGE)-user-env.csh: $(PACKAGE)-user-env.shell $(top_srcdir)/gnuscripts/generate_user_env.awk
$(AM_V_GEN)$(AWK) -f $(top_srcdir)/gnuscripts/generate_user_env.awk -v SED="$(SED)" -v output="$@" $<
# Build Git-generated sources
git_generated_sources =
.PHONY : force-git-source-generation
if HAVE_GIT_REPO
BUILT_SOURCES += $(git_generated_sources)
MOSTLYCLEANFILES += $(git_generated_sources)
$(git_generated_sources): force-git-source-generation
$(AM_V_at)$(GENERATE_VCS_INFO) $@ $(top_srcdir)/$@.git
endif
# Build build information source
MOSTLYCLEANFILES += src/build_info.c
src/build_info.c: Makefile $(DIST_SOURCES)
$(AM_V_GEN)echo '/* $(PACKAGE_NAME) $@: generated by Makefile */' >$@; \
var_prefix=`echo $(PACKAGE_NAME) | $(SED) 's/^LAL/lal/'`; \
echo "const char *const $${var_prefix}ConfigureArgs = \"$(ac_configure_args)\";" >>$@; \
echo "const char *const $${var_prefix}ConfigureDate = \"$(configure_date)\";" >>$@; \
echo "const char *const $${var_prefix}BuildDate = \"`date +'%Y-%m-%dT%H:%M:%S%z'`\";" >>$@
# Print messages at build/install completion
all-local: make-all-msg
install-data-hook: make-install-msg
.PHONY: make-all-msg make install-msg
make-all-msg:
@echo "";\
echo "==================================================";\
echo "$(PACKAGE_NAME) has now been successfully built.";\
echo "Now run 'make install' to install $(PACKAGE_NAME).";\
echo "==================================================";\
echo ""
make-install-msg:
@echo "";\
echo "==================================================";\
echo "$(PACKAGE_NAME) has now been successfully installed.";\