Commit 564819dd authored by Karl Wette's avatar Karl Wette Committed by Adam Mercer
Browse files

Make LALSUITE_BUILD and LALSUITE_TOP_SRCDIR "precious" throughout LALSuite

- Previously these variables were marked as "precious" only in LALApps.
  In particular the value of LALSUITE_BUILD was lost when re-configuring
  any of the LAL libraries, which caused the re-configuring to fail.
- Defines a new macro LALSUITE_ARG_VAR in lalsuite_build.m4 which declared
  LALSUITE_BUILD and LALSUITE_TOP_SRCDIR "precious", can be used to add
  other variables in future.
- LALSUITE_ARG_VAR now called at the start of every ./configure.ac, apart
  from the top-level one.
Original: b5375c31475f086266a9ca90bf6b6a4eec344553
parent a65642e9
# lalsuite_build.m4 - top level build macros
#
# serial 13
# serial 14
AC_DEFUN([LALSUITE_USE_LIBTOOL],
[## $0: Generate a libtool script for use in configure tests
......@@ -17,6 +17,11 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
AC_LANG(_AC_LANG)[]dnl
]) # LALSUITE_USE_LIBTOOL
AC_DEFUN([LALSUITE_ARG_VAR],[
AC_ARG_VAR(LALSUITE_BUILD,[Set if part of lalsuite build])
AC_ARG_VAR(LALSUITE_TOP_SRCDIR,[Set to top source directory of lalsuite])
])
AC_DEFUN([LALSUITE_ENABLE_MODULE],[
AM_CONDITIONAL([$1],[test x$$2 = xtrue])
eval $1_ENABLE_VAL="`eval test "$$2" = "true" && echo "ENABLED" || echo "DISABLED"`"
......
......@@ -94,6 +94,8 @@ AH_BOTTOM([
AC_CANONICAL_HOST
LALSUITE_ARG_VAR
# set library api info - liblal
# 1. start with version information of "0:0:0" for each libtool library
# 2. update the version information only immediately before a public
......
......@@ -47,8 +47,6 @@ AC_CONFIG_FILES([\
src/online/Makefile \
])
AM_INIT_AUTOMAKE([foreign])
AC_ARG_VAR(LALSUITE_BUILD,[Set if part of lalsuite build])
AC_ARG_VAR(LALSUITE_TOP_SRCDIR,[Set to top source directory of lalsuite])
AH_TOP([
#ifndef CONFIG_H
#define CONFIG_H])
......@@ -58,6 +56,8 @@ AH_BOTTOM([
AC_CANONICAL_HOST
LALSUITE_ARG_VAR
LALAPPS_WITH_CC
LALAPPS_WITH_LAL_PREFIX
LALAPPS_WITH_EXTRA_CPPFLAGS
......
......@@ -18,6 +18,8 @@ AM_INIT_AUTOMAKE([foreign])
AC_CANONICAL_HOST
LALSUITE_ARG_VAR
# set library api info
# 1. start with version information of "0:0:0" for each libtool library
# 2. update the version information only immediately before a public
......
......@@ -18,6 +18,8 @@ AM_INIT_AUTOMAKE([foreign])
AC_CANONICAL_HOST
LALSUITE_ARG_VAR
# set library api info
# 1. start with version information of "0:0:0" for each libtool library
# 2. update the version information only immediately before a public
......
......@@ -18,6 +18,8 @@ AM_INIT_AUTOMAKE([foreign])
AC_CANONICAL_HOST
LALSUITE_ARG_VAR
# set library api info
# 1. start with version information of "0:0:0" for each libtool library
# 2. update the version information only immediately before a public
......
......@@ -17,6 +17,8 @@ AM_INIT_AUTOMAKE([foreign])
AC_CANONICAL_HOST
LALSUITE_ARG_VAR
# set library api info
# 1. start with version information of "0:0:0" for each libtool library
# 2. update the version information only immediately before a public
......
......@@ -18,6 +18,8 @@ AM_INIT_AUTOMAKE([foreign])
AC_CANONICAL_HOST
LALSUITE_ARG_VAR
# set library api info
# 1. start with version information of "0:0:0" for each libtool library
# 2. update the version information only immediately before a public
......
......@@ -18,6 +18,8 @@ AM_INIT_AUTOMAKE([foreign])
AC_CANONICAL_HOST
LALSUITE_ARG_VAR
# set library api info
# 1. start with version information of "0:0:0" for each libtool library
# 2. update the version information only immediately before a public
......
......@@ -18,6 +18,8 @@ AM_INIT_AUTOMAKE([foreign])
AC_CANONICAL_HOST
LALSUITE_ARG_VAR
# set library api info
# 1. start with version information of "0:0:0" for each libtool library
# 2. update the version information only immediately before a public
......
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