Skip to content

GitLab

Commit 12604818 authored by Karl Wette's avatar Karl Wette
Browse files
Options

Top-level build: use pkg-config to determine inter-library dependencies 

- and paths to uninstalled data files, and Octave and Python modules
- use Automake AM_CFLAGS, etc. variables for compiler/linker flags,
  reserving CFLAGS, etc. for the user per GNU coding standards
- new macro LALSUITE_CHECK_LIBRARY_FOR_SUPPORT for checking config headers
- refs #1071
Original: 349a041f22bf68574ed37238c5fb205d71929706
parent 4d5ca304
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 549 additions and 934 deletions
Makefile.am
View file @ 12604818
ACLOCAL_AMFLAGS = -I gnuscripts ACLOCAL_AMFLAGS = -I gnuscripts
SUBDIRS = @subdirs@
# Override automake's default rule for rebuilding aclocal.m4, to ensure that # Override automake's default rule for rebuilding aclocal.m4, to ensure that
# ./configure is successfully recreated after certain build system changes which # ./configure is successfully recreated after certain build system changes which
# require other autotools (e.g. autoheader) to be re-run. See Redmine issue #728. # require other autotools (e.g. autoheader) to be re-run. See Redmine issue #728.
...@@ -11,7 +13,3 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) ...@@ -11,7 +13,3 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
# exports) are propagated to the library-level configurations. See Redmine issue #728. # exports) are propagated to the library-level configurations. See Redmine issue #728.
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) $(top_srcdir)/configure $(ac_configure_args) $(SHELL) $(top_srcdir)/configure $(ac_configure_args)
SUBDIRS = \
gnuscripts \
@subdirs@
build.in deleted 100644 → 0
View file @ 4d5ca304
#!/bin/bash
# top-level build script for LALSuite
# autoconf variables
MKDIR_P="@MKDIR_P@"
builddir="@abs_builddir@"
configure_args="@configure_args@"
prefix="@prefix@"
srcdir="@abs_srcdir@"
subdirs="@subdirs@"
# function to print a message
msg () {
echo "$0: $1"
}
# function to print an error message and exit
fail () {
echo "!!! $0: $1" >&2
exit 1
}
# function to clean up files if a command fails or is interrupted
cleanup() {
[ -n "${cleanup_files}" ] && rm -rf ${cleanup_files}
}
cleanup_files=""
trap cleanup 1 2 13 15
# function to run a command, or print an error message
run() {
msg "running (cd ${PWD} && $1)"
eval "( $1 ) ${mute_redirect}" || { cleanup; fail "(cd ${PWD} && $1) failed"; }
}
# function to check whether $1 is out of date relative to $2
outofdate() {
[ -f "$2" ] || fail "missing $2, required for building $1"
[ "$2" -nt "$1" ]
}
# function to remove duplicates from a list of words in variable $1
uniquify() {
local uniq arg
for arg in ${!1}; do
case " ${uniq} " in
(*${arg}*)
;;
(*)
uniq="${uniq} ${arg}"
;;
esac
done
eval "$1='${uniq}'"
}
# parse command line
make_cmd="${MAKE-make}"
mute_redirect=""
any_targets=no
make_targets=""
make_clean_targets=""
for arg in "$@"; do
case ${arg} in
# print help
(-h|--help)
cat <<EOF
$0: top-level build script for LALSuite
Usage:
$0 [--mute] [make-options...] [make-targets...]
Options:
--mute only print error messages from build processes
make-options options for make, e.g. -j<jobs>, -k, V=1, etc.
make-targets targets for make, e.g. all, check, distcheck, clean, etc.
EOF
exit 1
;;
# only print error messages from build processes
(--mute)
mute_redirect=">/dev/null"
;;
# pass all options and variable definitions to make
(-*|*=*)
make_cmd="${make_cmd} ${arg}"
;;
# pass any argument beginning with a digit to make
([0-9]*)
make_cmd="${make_cmd} ${arg}"
;;
# save list of make clean targets
(*clean*)
any_targets=yes
make_clean_targets="${make_clean_targets} ${arg}"
;;
# save list of other make targets
(*)
any_targets=yes
make_targets="${make_targets} ${arg}"
;;
esac
done
# if no targets were given, use 'all'
if [ ${any_targets} = no ]; then
make_targets="all"
fi
# always add 'all' and 'install' as make targets
if [ -n "${make_targets}" ]; then
make_targets="all ${make_targets} install"
fi
# remove duplicates from lists of make targets
uniquify make_targets
uniquify make_clean_targets
# save current directory
oldpwd="${PWD}"
# change to top-level build directory
cd "${builddir}"
# rebuild top-level ./configure, if out of date
if outofdate "${srcdir}/configure" "${srcdir}/configure.ac"; then
run "cd ${srcdir} && ./00boot"
fi
# rebuild top-level ./config.status, if out of date
if outofdate "./config.status" "${srcdir}/configure"; then
run "./config.status --recheck"
fi
# rebuild ./build and reload this script, if out of date
if outofdate "./build" "${srcdir}/build.in" || outofdate "./build" "./config.status"; then
run "./config.status"
msg "reloading ..."
cd "${oldpwd}"
exec "${SHELL}" "$0" "$@"
fi
# build make targets in subdirectories
if [ -n "${make_targets}" ]; then
for subdir in ${subdirs}; do
# build and source subdirectories
buildsubdir="${builddir}/${subdir}"
srcsubdir="${srcdir}/${subdir}"
# create build subdirectory, if it does not exist
if [ ! -d "${buildsubdir}" ]; then
run "${MKDIR_P} ${buildsubdir}"
fi
# change to build subdirectory
cd "${buildsubdir}"
# rebuild subdirectory ./configure, if out of date
if outofdate "${srcsubdir}/configure" "${srcsubdir}/configure.ac"; then
run "cd ${srcsubdir} && ./00boot"
fi
# rebuild subdirectory ./config.status, if out of date
if outofdate "./config.status" "${srcsubdir}/configure"; then
cleanup_files="${buildsubdir}/config.status"
run "${srcsubdir}/configure --disable-option-checking ${configure_args}"
cleanup_files=""
fi
# build each target
for target in ${make_targets}; do
run "${make_cmd} ${target}"
done
# change to top-level build directory
cd "${builddir}"
# source environment script for this subdirectory, if it exists
userenv="${prefix}/etc/${subdir}-user-env.sh"
if [ -f "${userenv}" ]; then
msg "sourcing ${userenv}"
source "${userenv}"
fi
done
fi
# perform top-level tasks for specific targets
for target in ${make_targets}; do
case ${target} in
# make top-level tags file
(tags)
msg "generating ${builddir}/TAGS"
rm -f "${builddir}/TAGS"
for subdir in ${subdirs}; do
buildsubdir="${builddir}/${subdir}"
if [ -f "${buildsubdir}/TAGS" ]; then
cat "${buildsubdir}/TAGS" >> "${builddir}/TAGS"
fi
done
;;
esac
done
# reverse list of subdirectories
reverse_subdirs=""
for subdir in ${subdirs}; do
reverse_subdirs="${subdir} ${reverse_subdirs}"
done
# iterate over subdirectories and make clean targets
if [ -n "${make_clean_targets}" ]; then
for subdir in ${reverse_subdirs}; do
# build and source subdirectories
buildsubdir="${builddir}/${subdir}"
srcsubdir="${srcdir}/${subdir}"
# change to build subdirectory
cd "${buildsubdir}"
# build each clean target
for target in ${make_clean_targets}; do
run "${make_cmd} ${target}"
done
# change to top-level build directory
cd "${builddir}"
done
fi
configure.ac
View file @ 12604818
AC_PREREQ([2.63]) AC_PREREQ([2.63])
AC_INIT([lalsuite],[6.20.1],[lal-discuss@ligo.org]) AC_INIT([LALSuite],[6.20.1],[lal-discuss@ligo.org])
AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR([gnuscripts]) AC_CONFIG_AUX_DIR([gnuscripts])
AC_CONFIG_MACRO_DIR([gnuscripts]) AC_CONFIG_MACRO_DIR([gnuscripts])
AC_PREFIX_DEFAULT(["${PWD}/_inst"]) AC_PREFIX_DEFAULT(["`pwd`/_inst"])
AC_DISABLE_OPTION_CHECKING AC_CONFIG_FILES([Makefile])
AM_INIT_AUTOMAKE([1.11 foreign subdir-objects color-tests parallel-tests])
AM_INIT_AUTOMAKE([1.11 foreign color-tests parallel-tests]) LALSUITE_DISTCHECK_CONFIGURE_FLAGS
AC_ARG_WITH(
[build-script],
AC_HELP_STRING(
[--with-build-script],
[use top-level build script instead of Makefile]
),[
AS_CASE([${withval}],
[no],[build_script=false],
[yes],[build_script=true],
AC_MSG_ERROR([bad value for --with-build-script: ${withval}])
)
],[
build_script=false
]
)
AS_IF([test "${build_script}" = true],[
##### using top-level build script #####
rm -f ./Makefile
AC_CONFIG_FILES([build],[chmod +x build])
# substitute these variables
AC_SUBST([configure_args])
AC_SUBST([subdirs])
# ensure ./configure arguments include a prefix
configure_args="${ac_configure_args}"
AS_IF([test "x${prefix}" = xNONE],[
configure_args="'--prefix=${ac_default_prefix}' ${configure_args}"
])
# check for required programs # always prefer uninstalled LAL libraries
AC_PROG_MKDIR_P LALSUITE_PKG_SUFFIX="-uninstalled"
export LALSUITE_PKG_SUFFIX
# provide LAL library enable/disable options # provide LAL library enable/disable options
LALSUITE_ENABLE_ALL_LAL LALSUITE_ENABLE_ALL_LAL
...@@ -61,19 +30,19 @@ LALSUITE_ENABLE_LALINFERENCE ...@@ -61,19 +30,19 @@ LALSUITE_ENABLE_LALINFERENCE
LALSUITE_ENABLE_LALAPPS LALSUITE_ENABLE_LALAPPS
# determine subdirectories to configure/build # determine subdirectories to configure/build
subdirs=""
AC_DEFUN([lalsuite_config_subdir],[ AC_DEFUN([lalsuite_config_subdir],[
m4_pushdef([lowercase],translit([[$1]], [A-Z], [a-z])) m4_pushdef([lowercase],m4_translit([[$1]], [A-Z], [a-z]))
m4_pushdef([uppercase],translit([[$1]], [a-z], [A-Z])) m4_pushdef([uppercase],m4_translit([[$1]], [a-z], [A-Z]))
# if subdirectory is enabled # if $1 is enabled
AS_IF([test "x${lowercase}" = xtrue],[ AS_IF([test "x${lowercase}" = xtrue],[
# add to list of subdirectories # add $1 build directory to PKG_CONFIG_PATH
subdirs="${subdirs} lowercase" LALSUITE_ADD_PATH(PKG_CONFIG_PATH,"`pwd`/lowercase")
export PKG_CONFIG_PATH
# ensure subdirectory is properly configured # configure $1
rm -f "lowercase/config.status" AC_CONFIG_SUBDIRS(lowercase)
# set enable/disable string # set enable/disable string
uppercase[]_ENABLE_VAL=ENABLED uppercase[]_ENABLE_VAL=ENABLED
...@@ -98,6 +67,7 @@ lalsuite_config_subdir([lalpulsar]) ...@@ -98,6 +67,7 @@ lalsuite_config_subdir([lalpulsar])
lalsuite_config_subdir([lalinference]) lalsuite_config_subdir([lalinference])
lalsuite_config_subdir([lalapps]) lalsuite_config_subdir([lalapps])
AC_SUBST([ac_configure_args])
AC_OUTPUT AC_OUTPUT
echo " echo "
================================================== ==================================================
...@@ -119,167 +89,7 @@ and will be installed under the directory: ...@@ -119,167 +89,7 @@ and will be installed under the directory:
${prefix} ${prefix}
Now run './build' to build and install LALSuite. Now run 'make' to build LALSuite,
and run 'make install' to install LALSuite.
================================================== ==================================================
" "
],[ dnl test "${build_script}" = true
##### using top-level Makefile #####
rm -f ./build
AC_CONFIG_FILES([Makefile gnuscripts/Makefile])
LALSUITE_DISTCHECK_CONFIGURE_FLAGS
LALSUITE_ENABLE_ALL_LAL
LALSUITE_ENABLE_LALFRAME
LALSUITE_ENABLE_LALMETAIO
LALSUITE_ENABLE_LALXML
LALSUITE_ENABLE_LALSIMULATION
LALSUITE_ENABLE_LALBURST
LALSUITE_ENABLE_LALDETCHAR
LALSUITE_ENABLE_LALINSPIRAL
LALSUITE_ENABLE_LALSTOCHASTIC
LALSUITE_ENABLE_LALPULSAR
LALSUITE_ENABLE_LALINFERENCE
LALSUITE_ENABLE_LALAPPS
lalsuite_top_builddir='$(top_builddir)/..'
lalsuite_top_srcdir='$(top_srcdir)/..'
LALSUITE_BUILD="true"
LALSUITE_SUBDIRS="`echo ${ac_subdirs_all}`"
export LALSUITE_BUILD LALSUITE_SUBDIRS
LAL_LIBS="-L${libdir} ${lalsuite_top_builddir}/lal/lib/lal/liblal.la"
LAL_CFLAGS="-I${lalsuite_top_builddir}/lal/include"
LAL_DATADIR="${lalsuite_top_srcdir}/lal/test"
export LAL_LIBS LAL_CFLAGS LAL_DATADIR
LALSUPPORT_LIBS="-L${libdir} ${lalsuite_top_builddir}/lal/lib/lalsupport/src/liblalsupport.la"
LALSUPPORT_CFLAGS="-I${lalsuite_top_builddir}/lal/include"
export LALSUPPORT_LIBS LALSUPPORT_CFLAGS
if test "$lalframe" = "true"; then
LALFRAME_LIBS="-L${libdir} ${lalsuite_top_builddir}/lalframe/src/liblalframe.la"
LALFRAME_CFLAGS="-I${lalsuite_top_builddir}/lalframe/include"
LALFRAME_DATADIR="${lalsuite_top_srcdir}/lalframe/test"
export LALFRAME_LIBS LALFRAME_CFLAGS LALFRAME_DATADIR
fi
if test "$lalmetaio" = "true"; then
LALMETAIO_LIBS="-L${libdir} ${lalsuite_top_builddir}/lalmetaio/src/liblalmetaio.la"
LALMETAIO_CFLAGS="-I${lalsuite_top_builddir}/lalmetaio/include"
LALMETAIO_DATADIR="${lalsuite_top_srcdir}/lalmetaio/test"
export LALMETAIO_LIBS LALMETAIO_CFLAGS LALMETAIO_DATADIR
fi
if test "$lalxml" = "true"; then
LALXML_LIBS="-L${libdir} ${lalsuite_top_builddir}/lalxml/src/liblalxml.la"
LALXML_CFLAGS="-I${lalsuite_top_builddir}/lalxml/include"
LALXML_DATADIR="${lalsuite_top_srcdir}/lalxml/test"
export LALXML_LIBS LALXML_CFLAGS LALXML_DATADIR
fi
if test "$lalsimulation" = "true"; then
LALSIMULATION_LIBS="-L${libdir} ${lalsuite_top_builddir}/lalsimulation/src/liblalsimulation.la"
LALSIMULATION_CFLAGS="-I${lalsuite_top_builddir}/lalsimulation/include"
LALSIMULATION_DATADIR="${lalsuite_top_srcdir}/lalsimulation/test"
export LALSIMULATION_LIBS LALSIMULATION_CFLAGS LALSIMULATION_DATADIR
fi
if test "$lalburst" = "true"; then
LALBURST_LIBS="-L${libdir} ${lalsuite_top_builddir}/lalburst/src/liblalburst.la"
LALBURST_CFLAGS="-I${lalsuite_top_builddir}/lalburst/include"
LALBURST_DATADIR="${lalsuite_top_srcdir}/lalburst/test"
export LALBURST_LIBS LALBURST_CFLAGS LALBURST_DATADIR
fi
if test "$laldetchar" = "true"; then
LALDETCHAR_LIBS="-L${libdir} ${lalsuite_top_builddir}/laldetchar/src/liblaldetchar.la"
LALDETCHAR_CFLAGS="-I${lalsuite_top_builddir}/laldetchar/include"
LALDETCHAR_DATADIR="${lalsuite_top_srcdir}/laldetchar/test"
export LALDETCHAR_LIBS LALDETCHAR_CFLAGS LALDETCHAR_DATADIR
fi
if test "$lalinspiral" = "true"; then
LALINSPIRAL_LIBS="-L${libdir} ${lalsuite_top_builddir}/lalinspiral/src/liblalinspiral.la"
LALINSPIRAL_CFLAGS="-I${lalsuite_top_builddir}/lalinspiral/include"
LALINSPIRAL_DATADIR="${lalsuite_top_srcdir}/lalinspiral/test"
export LALINSPIRAL_LIBS LALINSPIRAL_CFLAGS LALINSPIRAL_DATADIR
fi
if test "$lalstochastic" = "true"; then
LALSTOCHASTIC_LIBS="-L${libdir} ${lalsuite_top_builddir}/lalstochastic/src/liblalstochastic.la"
LALSTOCHASTIC_CFLAGS="-I${lalsuite_top_builddir}/lalstochastic/include"
LALSTOCHASTIC_DATADIR="${lalsuite_top_srcdir}/lalstochastic/test"
export LALSTOCHASTIC_LIBS LALSTOCHASTIC_CFLAGS LALSTOCHASTIC_DATADIR
fi
if test "$lalpulsar" = "true"; then
LALPULSAR_LIBS="-L${libdir} ${lalsuite_top_builddir}/lalpulsar/src/liblalpulsar.la"
LALPULSAR_CFLAGS="-I${lalsuite_top_builddir}/lalpulsar/include"
LALPULSAR_DATADIR="${lalsuite_top_srcdir}/lalpulsar/test"
export LALPULSAR_LIBS LALPULSAR_CFLAGS LALPULSAR_DATADIR
fi
if test "$lalinference" = "true"; then
LALINFERENCE_LIBS="-L${libdir} ${lalsuite_top_builddir}/lalinference/src/liblalinference.la"
LALINFERENCE_CFLAGS="-I${lalsuite_top_builddir}/lalinference/include"
LALINFERENCE_DATADIR="${lalsuite_top_srcdir}/lalinference/test"
export LALINFERENCE_LIBS LALINFERENCE_CFLAGS LALINFERENCE_DATADIR
fi
AC_CONFIG_SUBDIRS([doxygen])
AC_CONFIG_SUBDIRS([lal])
if test "$lalframe" = "true"; then
AC_CONFIG_SUBDIRS([lalframe])
fi
if test "$lalmetaio" = "true"; then
AC_CONFIG_SUBDIRS([lalmetaio])
fi
if test "$lalxml" = "true"; then
AC_CONFIG_SUBDIRS([lalxml])
fi
if test "$lalsimulation" = "true"; then
AC_CONFIG_SUBDIRS([lalsimulation])
fi
if test "$lalburst" = "true"; then
AC_CONFIG_SUBDIRS([lalburst])
fi
if test "$laldetchar" = "true"; then
AC_CONFIG_SUBDIRS([laldetchar])
fi
if test "$lalinspiral" = "true"; then
AC_CONFIG_SUBDIRS([lalinspiral])
fi
if test "$lalstochastic" = "true"; then
AC_CONFIG_SUBDIRS([lalstochastic])
fi
if test "$lalpulsar" = "true"; then
AC_CONFIG_SUBDIRS([lalpulsar])
fi
if test "$lalinference" = "true"; then
AC_CONFIG_SUBDIRS([lalinference])
fi
if test "$lalapps" = "true"; then
AC_CONFIG_SUBDIRS([lalapps])
fi
AC_SUBST([ac_configure_args])
AC_OUTPUT
]) dnl test "${build_script}" = true
gnuscripts/Makefile.am deleted 100644 → 0
View file @ 4d5ca304
EXTRA_DIST = \
ax_pthread.m4 \
cuda.common \
install-sh \
lalsuite_build.m4 \
lalsuite_gccflags.m4 \
missing
gnuscripts/lalsuite_build.m4
View file @ 12604818
This diff is collapsed.
gnuscripts/lalsuite_gccflags.m4
View file @ 12604818
# -*- mode: autoconf; -*-
# lalsuite_gccflags.m4 - macros to set strict gcc flags # lalsuite_gccflags.m4 - macros to set strict gcc flags
# #
# serial 16 # serial 17
AC_DEFUN([LALSUITE_ENABLE_GCC_FLAGS], AC_DEFUN([LALSUITE_ENABLE_GCC_FLAGS],[
[AC_ARG_ENABLE([gcc_flags], # $0: enable GCC warning flags
AC_HELP_STRING([--enable-gcc-flags],[turn on strict gcc warning flags (default=yes)]), AC_ARG_ENABLE([gcc_flags],
[AS_CASE(["${enableval}"], AC_HELP_STRING([--enable-gcc-flags],[turn on strict GCC warning flags [default=yes]]),
[yes], [DO_ENABLE_LALSUITE_GCC_FLAGS], AS_CASE(["${enableval}"],
[no],, [yes|no],[:],
[DO_ENABLE_LALSUITE_GCC_FLAGS])], AC_MSG_ERROR([bad value '${enableval}' for --enable-gcc-flags])
[DO_ENABLE_LALSUITE_GCC_FLAGS]) ),[
enable_gcc_flags=yes
]
)
# end $0
]) ])
AC_DEFUN([DO_ENABLE_LALSUITE_GCC_FLAGS], AC_DEFUN([LALSUITE_ADD_GCC_FLAGS],[
[ # $0: add GCC warning flags
lal_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" AS_IF([test "x${GCC}" = xyes && test "x${enable_gcc_flags}" = xyes],[
# check if compiler supports -Wno-unused-result 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"
my_save_cflags="$CFLAGS"
CFLAGS=-Wno-unused-result # check if compiler supports -Wno-unused-result
AC_MSG_CHECKING([whether compiler supports -Wno-unused-result]) LALSUITE_PUSH_UVARS
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], LALSUITE_CLEAR_UVARS
[AC_MSG_RESULT([yes])] CFLAGS="-Wno-unused-result"
[lal_gcc_flags="${lal_gcc_flags} -Wno-unused-result"], AC_MSG_CHECKING([whether compiler supports -Wno-unused-result])
[AC_MSG_RESULT([no])]) AC_COMPILE_IFELSE([
CFLAGS="$my_save_cflags" AC_LANG_PROGRAM([])
],[
# don't use -Werror in LALApps AC_MSG_RESULT([yes])
AS_CASE([${PACKAGE}], gcc_flags="${gcc_flags} -Wno-unused-result"
[lalapps],, ],[
[lal_gcc_flags="${lal_gcc_flags} -Werror"]) AC_MSG_RESULT([no])
])
LALSUITE_POP_UVARS
# don't use -Werror in LALApps
AS_CASE([${PACKAGE}],