Commit 1131d93e authored by Karl Wette's avatar Karl Wette
Browse files

Move ENABLE macros togther at top of ./configure.ac

Original: 4af54e8d3bb120403ff78ce09e0ddee35274364a
parent 0beeaf34
...@@ -46,6 +46,9 @@ LALSUITE_ENABLE_NIGHTLY ...@@ -46,6 +46,9 @@ LALSUITE_ENABLE_NIGHTLY
# debug # debug
LALSUITE_ENABLE_DEBUG LALSUITE_ENABLE_DEBUG
# enable strict gcc flags
LALSUITE_ENABLE_GCC_FLAGS
# put version/configure info in config header # put version/configure info in config header
lalburst_version_major=`echo "$VERSION" | cut -d. -f1` lalburst_version_major=`echo "$VERSION" | cut -d. -f1`
lalburst_version_minor=`echo "$VERSION" | cut -d. -f2` lalburst_version_minor=`echo "$VERSION" | cut -d. -f2`
...@@ -68,9 +71,6 @@ AC_DEFINE_UNQUOTED([LALBURST_CONFIGURE_ARGS],["$ac_configure_args"], ...@@ -68,9 +71,6 @@ AC_DEFINE_UNQUOTED([LALBURST_CONFIGURE_ARGS],["$ac_configure_args"],
AC_DEFINE_UNQUOTED([LALBURST_CONFIGURE_DATE],["$lalburst_configure_date"], AC_DEFINE_UNQUOTED([LALBURST_CONFIGURE_DATE],["$lalburst_configure_date"],
[LALBurst Configure Date]) [LALBurst Configure Date])
# enable strict gcc flags
LALSUITE_ENABLE_GCC_FLAGS
# workaround broken libtool multilib support on sl6 # workaround broken libtool multilib support on sl6
LALSUITE_MULTILIB_LIBTOOL_HACK LALSUITE_MULTILIB_LIBTOOL_HACK
......
...@@ -52,6 +52,9 @@ LALSUITE_ENABLE_DEBUG ...@@ -52,6 +52,9 @@ LALSUITE_ENABLE_DEBUG
# enable check for inotify # enable check for inotify
LALFRAME_ENABLE_INOTIFY LALFRAME_ENABLE_INOTIFY
# enable strict gcc flags
LALSUITE_ENABLE_GCC_FLAGS
# put version/configure info in config header # put version/configure info in config header
lalframe_version_major=`echo "$VERSION" | cut -d. -f1` lalframe_version_major=`echo "$VERSION" | cut -d. -f1`
lalframe_version_minor=`echo "$VERSION" | cut -d. -f2` lalframe_version_minor=`echo "$VERSION" | cut -d. -f2`
...@@ -74,9 +77,6 @@ AC_DEFINE_UNQUOTED([LALFRAME_CONFIGURE_ARGS],["$ac_configure_args"], ...@@ -74,9 +77,6 @@ AC_DEFINE_UNQUOTED([LALFRAME_CONFIGURE_ARGS],["$ac_configure_args"],
AC_DEFINE_UNQUOTED([LALFRAME_CONFIGURE_DATE],["$lalframe_configure_date"], AC_DEFINE_UNQUOTED([LALFRAME_CONFIGURE_DATE],["$lalframe_configure_date"],
[LALFrame Configure Date]) [LALFrame Configure Date])
# enable strict gcc flags
LALSUITE_ENABLE_GCC_FLAGS
# workaround broken libtool multilib support on sl6 # workaround broken libtool multilib support on sl6
LALSUITE_MULTILIB_LIBTOOL_HACK LALSUITE_MULTILIB_LIBTOOL_HACK
......
...@@ -46,6 +46,16 @@ LALSUITE_ENABLE_NIGHTLY ...@@ -46,6 +46,16 @@ LALSUITE_ENABLE_NIGHTLY
# debug # debug
LALSUITE_ENABLE_DEBUG LALSUITE_ENABLE_DEBUG
# enable strict gcc flags
LALSUITE_ENABLE_GCC_FLAGS
# optional lal libraries
LALSUITE_ENABLE_LALFRAME
LALSUITE_ENABLE_LALMETAIO
LALSUITE_ENABLE_LALINSPIRAL
LALSUITE_ENABLE_LALPULSAR
LALSUITE_ENABLE_LALXML
# put version/configure info in config header # put version/configure info in config header
lalinference_version_major=`echo "$VERSION" | cut -d. -f1` lalinference_version_major=`echo "$VERSION" | cut -d. -f1`
lalinference_version_minor=`echo "$VERSION" | cut -d. -f2` lalinference_version_minor=`echo "$VERSION" | cut -d. -f2`
...@@ -68,16 +78,6 @@ AC_DEFINE_UNQUOTED([LALINFERENCE_CONFIGURE_ARGS],["$ac_configure_args"], ...@@ -68,16 +78,6 @@ AC_DEFINE_UNQUOTED([LALINFERENCE_CONFIGURE_ARGS],["$ac_configure_args"],
AC_DEFINE_UNQUOTED([LALINFERENCE_CONFIGURE_DATE],["$lalinspiral_configure_date"], AC_DEFINE_UNQUOTED([LALINFERENCE_CONFIGURE_DATE],["$lalinspiral_configure_date"],
[LALInference Configure Date]) [LALInference Configure Date])
# enable strict gcc flags
LALSUITE_ENABLE_GCC_FLAGS
# optional lal libraries
LALSUITE_ENABLE_LALFRAME
LALSUITE_ENABLE_LALMETAIO
LALSUITE_ENABLE_LALINSPIRAL
LALSUITE_ENABLE_LALPULSAR
LALSUITE_ENABLE_LALXML
# workaround broken libtool multilib support on sl6 # workaround broken libtool multilib support on sl6
LALSUITE_MULTILIB_LIBTOOL_HACK LALSUITE_MULTILIB_LIBTOOL_HACK
......
...@@ -46,6 +46,15 @@ LALSUITE_ENABLE_NIGHTLY ...@@ -46,6 +46,15 @@ LALSUITE_ENABLE_NIGHTLY
# debug # debug
LALSUITE_ENABLE_DEBUG LALSUITE_ENABLE_DEBUG
# enable CUDA support
LALSUITE_WITH_CUDA
# enable strict gcc flags
LALSUITE_ENABLE_GCC_FLAGS
# optional lal libraries
LALSUITE_ENABLE_LALFRAME
# put version/configure info in config header # put version/configure info in config header
lalinspiral_version_major=`echo "$VERSION" | cut -d. -f1` lalinspiral_version_major=`echo "$VERSION" | cut -d. -f1`
lalinspiral_version_minor=`echo "$VERSION" | cut -d. -f2` lalinspiral_version_minor=`echo "$VERSION" | cut -d. -f2`
...@@ -68,15 +77,6 @@ AC_DEFINE_UNQUOTED([LALINSPIRAL_CONFIGURE_ARGS],["$ac_configure_args"], ...@@ -68,15 +77,6 @@ AC_DEFINE_UNQUOTED([LALINSPIRAL_CONFIGURE_ARGS],["$ac_configure_args"],
AC_DEFINE_UNQUOTED([LALINSPIRAL_CONFIGURE_DATE],["$lalinspiral_configure_date"], AC_DEFINE_UNQUOTED([LALINSPIRAL_CONFIGURE_DATE],["$lalinspiral_configure_date"],
[LALInspiral Configure Date]) [LALInspiral Configure Date])
# enable CUDA support
LALSUITE_WITH_CUDA
# enable strict gcc flags
LALSUITE_ENABLE_GCC_FLAGS
# optional lal libraries
LALSUITE_ENABLE_LALFRAME
# workaround broken libtool multilib support on sl6 # workaround broken libtool multilib support on sl6
LALSUITE_MULTILIB_LIBTOOL_HACK LALSUITE_MULTILIB_LIBTOOL_HACK
......
...@@ -45,6 +45,9 @@ LALSUITE_ENABLE_NIGHTLY ...@@ -45,6 +45,9 @@ LALSUITE_ENABLE_NIGHTLY
# debug # debug
LALSUITE_ENABLE_DEBUG LALSUITE_ENABLE_DEBUG
# enable strict gcc flags
LALSUITE_ENABLE_GCC_FLAGS
# put version/configure info in config header # put version/configure info in config header
lalmetaio_version_major=`echo "$VERSION" | cut -d. -f1` lalmetaio_version_major=`echo "$VERSION" | cut -d. -f1`
lalmetaio_version_minor=`echo "$VERSION" | cut -d. -f2` lalmetaio_version_minor=`echo "$VERSION" | cut -d. -f2`
...@@ -67,9 +70,6 @@ AC_DEFINE_UNQUOTED([LALMETAIO_CONFIGURE_ARGS],["$ac_configure_args"], ...@@ -67,9 +70,6 @@ AC_DEFINE_UNQUOTED([LALMETAIO_CONFIGURE_ARGS],["$ac_configure_args"],
AC_DEFINE_UNQUOTED([LALMETAIO_CONFIGURE_DATE],["$lalmetaio_configure_date"], AC_DEFINE_UNQUOTED([LALMETAIO_CONFIGURE_DATE],["$lalmetaio_configure_date"],
[LALMetaIO Configure Date]) [LALMetaIO Configure Date])
# enable strict gcc flags
LALSUITE_ENABLE_GCC_FLAGS
# workaround broken libtool multilib support on sl6 # workaround broken libtool multilib support on sl6
LALSUITE_MULTILIB_LIBTOOL_HACK LALSUITE_MULTILIB_LIBTOOL_HACK
......
...@@ -52,6 +52,12 @@ LALSUITE_ENABLE_LALXML ...@@ -52,6 +52,12 @@ LALSUITE_ENABLE_LALXML
# debug # debug
LALSUITE_ENABLE_DEBUG LALSUITE_ENABLE_DEBUG
# boinc
LALSUITE_ENABLE_BOINC
# enable strict gcc flags
LALSUITE_ENABLE_GCC_FLAGS
# put version/configure info in config header # put version/configure info in config header
lalpulsar_version_major=`echo "$VERSION" | cut -d. -f1` lalpulsar_version_major=`echo "$VERSION" | cut -d. -f1`
lalpulsar_version_minor=`echo "$VERSION" | cut -d. -f2` lalpulsar_version_minor=`echo "$VERSION" | cut -d. -f2`
...@@ -74,12 +80,6 @@ AC_DEFINE_UNQUOTED([LALPULSAR_CONFIGURE_ARGS],["$ac_configure_args"], ...@@ -74,12 +80,6 @@ AC_DEFINE_UNQUOTED([LALPULSAR_CONFIGURE_ARGS],["$ac_configure_args"],
AC_DEFINE_UNQUOTED([LALPULSAR_CONFIGURE_DATE],["$lalpulsar_configure_date"], AC_DEFINE_UNQUOTED([LALPULSAR_CONFIGURE_DATE],["$lalpulsar_configure_date"],
[LALPulsar Configure Date]) [LALPulsar Configure Date])
# boinc
LALSUITE_ENABLE_BOINC
# enable strict gcc flags
LALSUITE_ENABLE_GCC_FLAGS
# workaround broken libtool multilib support on sl6 # workaround broken libtool multilib support on sl6
LALSUITE_MULTILIB_LIBTOOL_HACK LALSUITE_MULTILIB_LIBTOOL_HACK
......
...@@ -49,6 +49,9 @@ LALSUITE_ENABLE_NIGHTLY ...@@ -49,6 +49,9 @@ LALSUITE_ENABLE_NIGHTLY
# debug # debug
LALSUITE_ENABLE_DEBUG LALSUITE_ENABLE_DEBUG
# enable strict gcc flags
LALSUITE_ENABLE_GCC_FLAGS
# put version/configure info in config header # put version/configure info in config header
lalsimulation_version_major=`echo "$VERSION" | cut -d. -f1` lalsimulation_version_major=`echo "$VERSION" | cut -d. -f1`
lalsimulation_version_minor=`echo "$VERSION" | cut -d. -f2` lalsimulation_version_minor=`echo "$VERSION" | cut -d. -f2`
...@@ -71,9 +74,6 @@ AC_DEFINE_UNQUOTED([LALSIMULATION_CONFIGURE_ARGS],["$ac_configure_args"], ...@@ -71,9 +74,6 @@ AC_DEFINE_UNQUOTED([LALSIMULATION_CONFIGURE_ARGS],["$ac_configure_args"],
AC_DEFINE_UNQUOTED([LALSIMULATION_CONFIGURE_DATE],["$lalsimulation_configure_date"], AC_DEFINE_UNQUOTED([LALSIMULATION_CONFIGURE_DATE],["$lalsimulation_configure_date"],
[LALSimulation Configure Date]) [LALSimulation Configure Date])
# enable strict gcc flags
LALSUITE_ENABLE_GCC_FLAGS
# workaround broken libtool multilib support on sl6 # workaround broken libtool multilib support on sl6
LALSUITE_MULTILIB_LIBTOOL_HACK LALSUITE_MULTILIB_LIBTOOL_HACK
......
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