Commit ab38cd13 authored by Karl Wette's avatar Karl Wette

Various ./configure changes

- add subdir-objects to AM_INIT_AUTOMAKE
- remove AH_TOP and AH_BOTTOM fragments in lal/lalapps
- use ..._VERSION as an include guard in ...Config.h.in,
  prevents conflict with config.h.in
- remove AC_PROG_MAKE_SET, already called by Automake
- remove HAVE_PYTHON conditional in lalinference, since
  Python is already required
Original: ec376ab2cecdc1e4a4ddf92a7e673d1c30abced2
parent c43edaa1
......@@ -2,6 +2,7 @@
*.trs
*~
.DS_Store
.dirstamp
/_inst/
/lalsuite-*.tar.gz
Makefile
......
......@@ -89,18 +89,12 @@ AC_CONFIG_FILES([ \
packages/noisemodels/src/Makefile \
packages/noisemodels/test/Makefile
])
AM_INIT_AUTOMAKE([1.11 foreign color-tests parallel-tests])
AH_TOP([
#ifndef CONFIG_H__LAL
#define CONFIG_H__LAL
])
AH_BOTTOM([
#endif /* CONFIG_H__LAL */
])
AM_INIT_AUTOMAKE([1.11 foreign subdir-objects color-tests parallel-tests])
AC_CANONICAL_HOST
LALSUITE_ARG_VAR
LALSUITE_CHECK_GIT_REPO
LALSUITE_DISTCHECK_CONFIGURE_FLAGS
LALSUITE_WITH_CFLAGS_LIBS
......@@ -142,9 +136,6 @@ AC_SUBST([LIBREVISION_SUPPORT],[0])
AC_SUBST([LIBAGE_SUPPORT],[0])
AC_SUBST([LIBVERSION_SUPPORT],[${LIBCURRENT_SUPPORT}:${LIBREVISION_SUPPORT}:${LIBAGE_SUPPORT}])
# check for git repo
LALSUITE_CHECK_GIT_REPO
LAL_ENABLE_INTELFFT
LALSUITE_WITH_CUDA
......@@ -205,7 +196,6 @@ AC_PROG_LN_S
AC_PROG_AWK
AC_PROG_SED
AM_PATH_PYTHON([2.6],,[AC_MSG_ERROR([Python-2.6, or higher, is required])])
AC_CHECK_PROGS([M4],[gm4 m4], m4)
# check for supported mac os x version
LALSUITE_OSX_VERSION_CHECK
......
/* only include this file if LAL's config.h has not been included */
#ifndef CONFIG_H__LAL
#ifndef _LALCONFIG_H
#define _LALCONFIG_H
#ifndef LAL_VERSION
/* LAL Version */
#undef LAL_VERSION
......@@ -46,6 +43,4 @@
/* Define if using qthread library */
#undef LAL_QTHREAD
#endif /* _LALCONFIG_H */
#endif /* CONFIG_H__LAL */
#endif /* LAL_VERSION */
......@@ -53,21 +53,13 @@ AC_CONFIG_FILES([\
# subdir-objects in automake-1.14+. this will be the default, and only,
# behaviour in automake-2.0+ so this is only a temporary measure
AM_INIT_AUTOMAKE([1.11 foreign color-tests parallel-tests -Wno-unsupported])
AH_TOP([
#ifndef CONFIG_H
#define CONFIG_H])
AH_BOTTOM([
#endif /* CONFIG_H */
])
AC_CANONICAL_HOST
LALSUITE_ARG_VAR
LALSUITE_DISTCHECK_CONFIGURE_FLAGS
LALSUITE_WITH_CFLAGS_LIBS
# check for git repo
LALSUITE_CHECK_GIT_REPO
LALSUITE_DISTCHECK_CONFIGURE_FLAGS
LALSUITE_ENABLE_DEBUG
......@@ -166,6 +158,8 @@ LALSUITE_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_AWK
AC_PROG_SED
AM_PATH_PYTHON([2.6],,[:])
AM_CONDITIONAL([HAVE_PYTHON],[test "$PYTHON" != :])
# check for condor_compile
AC_ENABLE_SHARED
......@@ -188,13 +182,10 @@ CONDOR_ENABLE_VAL="`eval test x$condor = xtrue && echo "ENABLED" || echo "DISABL
AM_CONDITIONAL([CONDOR_ENABLED],[test "$CONDOR_ENABLE_VAL" = "ENABLED"])
# further program checks
LT_INIT
AC_CHECK_PROGS([LATEX],[pdflatex latex],[echo])
AC_CHECK_PROGS([MKIND],[makeindex],[echo])
AC_CHECK_PROGS([DVIPS],[dvips],[echo])
AC_CHECK_PROGS([BIBTEX],[bibtex],[echo])
AM_PATH_PYTHON([2.6],,[:])
AM_CONDITIONAL([HAVE_PYTHON],[test "$PYTHON" != :])
# check for supported mac os x version
LALSUITE_OSX_VERSION_CHECK
......
......@@ -20,11 +20,12 @@ AC_CONFIG_FILES([ \
swig/python/Makefile \
test/Makefile
])
AM_INIT_AUTOMAKE([1.11 foreign color-tests parallel-tests])
AM_INIT_AUTOMAKE([1.11 foreign subdir-objects color-tests parallel-tests])
AC_CANONICAL_HOST
LALSUITE_ARG_VAR
LALSUITE_CHECK_GIT_REPO
LALSUITE_DISTCHECK_CONFIGURE_FLAGS
LALSUITE_WITH_CFLAGS_LIBS
......@@ -47,9 +48,6 @@ AC_SUBST([LIBREVISION],[1])
AC_SUBST([LIBAGE],[0])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
# check for git repo
LALSUITE_CHECK_GIT_REPO
# nightly build
LALSUITE_ENABLE_NIGHTLY
......@@ -98,6 +96,7 @@ LALSUITE_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_AWK
AC_PROG_SED
AM_PATH_PYTHON([2.6],,[AC_MSG_ERROR([Python-2.6, or higher, is required])])
# check for supported mac os x version
LALSUITE_OSX_VERSION_CHECK
......@@ -112,7 +111,6 @@ AC_HEADER_STDC
AC_CHECK_LIB([m],[main],,[AC_MSG_ERROR([could not find the math library])])
# check for Python
AM_PATH_PYTHON([2.6],,[AC_MSG_ERROR([Python-2.6, or higher, is required])])
#AX_PYTHON_DEVEL()
# hack to remove default lib dirs from PYTHON_LDFLAGS. only tested on
# Debian and SL6. FIXME: find a way to do this properly
......@@ -173,7 +171,6 @@ LALSUITE_ADD_LIBS()
# output
LAL_HEADER_LINK=${ac_aux_dir}/header-link.mk
AC_SUBST_FILE(LAL_HEADER_LINK)
AC_PROG_MAKE_SET
AC_OUTPUT
echo "
==================================================
......
/* only include this file if LALBurst's config.h has not been included */
#ifndef _LALBURSTCONFIG_H
#define _LALBURSTCONFIG_H
#ifndef LALBURST_VERSION
/* LALBurst Version */
#undef LALBURST_VERSION
......@@ -24,4 +22,4 @@
/* LALBurst Configure Date */
#undef LALBURST_CONFIGURE_DATE
#endif /* _LALBURSTCONFIG_H */
#endif /* LALBURST_VERSION */
......@@ -23,11 +23,12 @@ AC_CONFIG_FILES([ \
bin/Makefile \
test/Makefile
])
AM_INIT_AUTOMAKE([1.11 foreign color-tests parallel-tests])
AM_INIT_AUTOMAKE([1.11 foreign subdir-objects color-tests parallel-tests])
AC_CANONICAL_HOST
LALSUITE_ARG_VAR
LALSUITE_CHECK_GIT_REPO
LALSUITE_DISTCHECK_CONFIGURE_FLAGS
LALSUITE_WITH_CFLAGS_LIBS
......@@ -50,9 +51,6 @@ AC_SUBST([LIBREVISION],[0])
AC_SUBST([LIBAGE],[0])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
# check for git repo
LALSUITE_CHECK_GIT_REPO
# nightly build
LALSUITE_ENABLE_NIGHTLY
......@@ -160,7 +158,6 @@ LALSUITE_ADD_LIBS()
# output
LAL_HEADER_LINK=${ac_aux_dir}/header-link.mk
AC_SUBST_FILE([LAL_HEADER_LINK])
AC_PROG_MAKE_SET
AC_OUTPUT
echo "
==================================================
......
/* only include this file if LALDetChar's config.h has not been included */
#ifndef _LALDETCHARCONFIG_H
#define _LALDETCHARCONFIG_H
#ifndef LALDETCHAR_VERSION
/* LALDetChar Version */
#undef LALDETCHAR_VERSION
......@@ -24,4 +22,4 @@
/* LALDetChar Configure Date */
#undef LALDETCHAR_CONFIGURE_DATE
#endif /* _LALDETCHARCONFIG_H */
#endif /* LALDETCHAR_VERSION */
......@@ -21,11 +21,12 @@ AC_CONFIG_FILES([ \
swig/python/Makefile \
test/Makefile
])
AM_INIT_AUTOMAKE([1.11 foreign color-tests parallel-tests])
AM_INIT_AUTOMAKE([1.11 foreign subdir-objects color-tests parallel-tests])
AC_CANONICAL_HOST
LALSUITE_ARG_VAR
LALSUITE_CHECK_GIT_REPO
LALSUITE_DISTCHECK_CONFIGURE_FLAGS
LALSUITE_WITH_CFLAGS_LIBS
......@@ -48,9 +49,6 @@ AC_SUBST([LIBREVISION],[0])
AC_SUBST([LIBAGE],[0])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
# check for git repo
LALSUITE_CHECK_GIT_REPO
# nightly build
LALSUITE_ENABLE_NIGHTLY
......
/* only include this file if LALFrame's config.h has not been included */
#ifndef _LALFRAMECONFIG_H
#define _LALFRAMECONFIG_H
#ifndef LALFRAME_VERSION
/* LALFrame Version */
#undef LALFRAME_VERSION
......@@ -33,4 +31,4 @@
/* Define to use FrameL */
#undef USE_FRAMEL
#endif /* _LALFRAMECONFIG_H */
#endif /* LALFRAME_VERSION */
......@@ -21,11 +21,12 @@ AC_CONFIG_FILES([ \
swig/python/Makefile \
test/Makefile
])
AM_INIT_AUTOMAKE([1.11 foreign color-tests parallel-tests])
AM_INIT_AUTOMAKE([1.11 foreign subdir-objects color-tests parallel-tests])
AC_CANONICAL_HOST
LALSUITE_ARG_VAR
LALSUITE_CHECK_GIT_REPO
LALSUITE_DISTCHECK_CONFIGURE_FLAGS
LALSUITE_WITH_CFLAGS_LIBS
......@@ -48,9 +49,6 @@ AC_SUBST([LIBREVISION],[0])
AC_SUBST([LIBAGE],[0])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
# check for git repo
LALSUITE_CHECK_GIT_REPO
# nightly build
LALSUITE_ENABLE_NIGHTLY
......@@ -107,7 +105,6 @@ AC_PROG_LN_S
AC_PROG_AWK
AC_PROG_SED
AM_PATH_PYTHON([2.6],,[AC_MSG_ERROR([Python-2.6, or higher, is required])])
AM_CONDITIONAL([HAVE_PYTHON],[test "$PYTHON" != :])
# check for supported mac os x version
LALSUITE_OSX_VERSION_CHECK
......@@ -233,7 +230,6 @@ LALSUITE_ADD_LIBS()
# output
LAL_HEADER_LINK=${ac_aux_dir}/header-link.mk
AC_SUBST_FILE([LAL_HEADER_LINK])
AC_PROG_MAKE_SET
AC_OUTPUT
echo "
==================================================
......
......@@ -5,7 +5,6 @@ AM_CPPFLAGS = -I$(top_builddir)/include
# as errors) flag, for just targets declared in this file.
CFLAGS += -Wno-error
if HAVE_PYTHON
bayestardir = $(pkgpythondir)/bayestar
bayestar_PYTHON = \
......@@ -32,5 +31,3 @@ sky_map_la_LDFLAGS = $(AM_LDFLAGS) -shared -module -avoid-version
sky_map_la_LIBADD = $(LALSUPPORT_LIBS) $(top_builddir)/src/liblalinference.la
endif
endif
endif
/* only include this file if LALInference's config.h has not been included */
#ifndef _LALINFERENCECONFIG_H
#define _LALINFERENCECONFIG_H
#ifndef LALINFERENCE_VERSION
/* LALInference Version */
#undef LALINFERENCE_VERSION
......@@ -24,4 +22,4 @@
/* LALInference Configure Date */
#undef LALINFERENCE_CONFIGURE_DATE
#endif /* _LALINFERENCECONFIG_H */
#endif /* LALINFERENCE_VERSION */
......@@ -21,11 +21,12 @@ AC_CONFIG_FILES([ \
swig/python/Makefile \
test/Makefile
])
AM_INIT_AUTOMAKE([1.11 foreign color-tests parallel-tests])
AM_INIT_AUTOMAKE([1.11 foreign subdir-objects color-tests parallel-tests])
AC_CANONICAL_HOST
LALSUITE_ARG_VAR
LALSUITE_CHECK_GIT_REPO
LALSUITE_DISTCHECK_CONFIGURE_FLAGS
LALSUITE_WITH_CFLAGS_LIBS
......@@ -48,9 +49,6 @@ AC_SUBST([LIBREVISION],[1])
AC_SUBST([LIBAGE],[0])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
# check for git repo
LALSUITE_CHECK_GIT_REPO
# nightly build
LALSUITE_ENABLE_NIGHTLY
......@@ -178,7 +176,6 @@ LALSUITE_ADD_LIBS()
# output
LAL_HEADER_LINK=${ac_aux_dir}/header-link.mk
AC_SUBST_FILE([LAL_HEADER_LINK])
AC_PROG_MAKE_SET
AC_OUTPUT
echo "
==================================================
......
/* only include this file if LALInspiral's config.h has not been included */
#ifndef _LALINSPIRALCONFIG_H
#define _LALINSPIRALCONFIG_H
#ifndef LALINSPIRAL_VERSION
/* LALInspiral Version */
#undef LALINSPIRAL_VERSION
......@@ -27,4 +25,4 @@
/* Define if using CUDA library */
#undef LALINSPIRAL_CUDA_ENABLED
#endif /* _LALINSPIRALCONFIG_H */
#endif /* LALINSPIRAL_VERSION */
......@@ -19,11 +19,12 @@ AC_CONFIG_FILES([ \
swig/octave/Makefile \
swig/python/Makefile
])
AM_INIT_AUTOMAKE([1.11 foreign color-tests parallel-tests])
AM_INIT_AUTOMAKE([1.11 foreign subdir-objects color-tests parallel-tests])
AC_CANONICAL_HOST
LALSUITE_ARG_VAR
LALSUITE_CHECK_GIT_REPO
LALSUITE_DISTCHECK_CONFIGURE_FLAGS
LALSUITE_WITH_CFLAGS_LIBS
......@@ -46,9 +47,6 @@ AC_SUBST([LIBREVISION],[1])
AC_SUBST([LIBAGE],[0])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
# check for git repo
LALSUITE_CHECK_GIT_REPO
# nightly build
LALSUITE_ENABLE_NIGHTLY
......@@ -144,7 +142,6 @@ LALSUITE_ADD_LIBS()
# output
LAL_HEADER_LINK=${ac_aux_dir}/header-link.mk
AC_SUBST_FILE(LAL_HEADER_LINK)
AC_PROG_MAKE_SET
AC_OUTPUT
echo "
==================================================
......
/* only include this file if LALMetaIO's config.h has not been included */
#ifndef _LALMETAIOCONFIG_H
#define _LALMETAIOCONFIG_H
#ifndef LALMETAIO_VERSION
/* LALMetaIO Version */
#undef LALMETAIO_VERSION
......@@ -24,4 +22,4 @@
/* LALMetaIO Configure Date */
#undef LALMETAIO_CONFIGURE_DATE
#endif /* _LALMETAIOCONFIG_H */
#endif /* LALMETAIO_VERSION */
......@@ -20,11 +20,12 @@ AC_CONFIG_FILES([ \
swig/python/Makefile \
test/Makefile
])
AM_INIT_AUTOMAKE([1.11 foreign color-tests parallel-tests])
AM_INIT_AUTOMAKE([1.11 foreign subdir-objects color-tests parallel-tests])
AC_CANONICAL_HOST
LALSUITE_ARG_VAR
LALSUITE_CHECK_GIT_REPO
LALSUITE_DISTCHECK_CONFIGURE_FLAGS
LALSUITE_WITH_CFLAGS_LIBS
......@@ -47,9 +48,6 @@ AC_SUBST([LIBREVISION],[0])
AC_SUBST([LIBAGE],[0])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
# check for git repo
LALSUITE_CHECK_GIT_REPO
# nightly build
LALSUITE_ENABLE_NIGHTLY
......
/* only include this file if LALPulsar's config.h has not been included */
#ifndef _LALPULSARCONFIG_H
#define _LALPULSARCONFIG_H
#ifndef LALPULSAR_VERSION
/* LALPulsar Version */
#undef LALPULSAR_VERSION
......@@ -24,4 +22,4 @@
/* LALPulsar Configure Date */
#undef LALPULSAR_CONFIGURE_DATE
#endif /* _LALPULSARCONFIG_H */
#endif /* LALPULSAR_VERSION */
......@@ -20,11 +20,12 @@ AC_CONFIG_FILES([ \
swig/python/Makefile \
test/Makefile
])
AM_INIT_AUTOMAKE([1.11 foreign color-tests parallel-tests])
AM_INIT_AUTOMAKE([1.11 foreign subdir-objects color-tests parallel-tests])
AC_CANONICAL_HOST
LALSUITE_ARG_VAR
LALSUITE_CHECK_GIT_REPO
LALSUITE_DISTCHECK_CONFIGURE_FLAGS
LALSUITE_WITH_CFLAGS_LIBS
......@@ -47,9 +48,6 @@ AC_SUBST([LIBREVISION],[0])
AC_SUBST([LIBAGE],[0])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
# check for git repo
LALSUITE_CHECK_GIT_REPO
# nightly build
LALSUITE_ENABLE_NIGHTLY
......@@ -99,7 +97,6 @@ AC_PROG_LN_S
AC_PROG_AWK
AC_PROG_SED
AM_PATH_PYTHON([2.6],,[AC_MSG_ERROR([Python-2.6, or higher, is required])])
AC_CHECK_PROGS([M4],[gm4 m4],[m4])
# check for supported mac os x version
LALSUITE_OSX_VERSION_CHECK
......@@ -152,7 +149,6 @@ LALSUITE_ADD_LIBS()
# output
LAL_HEADER_LINK=${ac_aux_dir}/header-link.mk
AC_SUBST_FILE([LAL_HEADER_LINK])
AC_PROG_MAKE_SET
AC_OUTPUT
echo "
==================================================
......
/* only include this file if LALSimulation's config.h has not been included */
#ifndef _LALSIMULATIONCONFIG_H
#define _LALSIMULATIONCONFIG_H
#ifndef LALSIMULATION_VERSION
/* LALFrame Version */
#undef LALSIMULATION_VERSION
......@@ -24,4 +22,4 @@
/* LALFrame Configure Date */
#undef LALSIMULATION_CONFIGURE_DATE
#endif /* _LALSIMULATIONCONFIG_H */
#endif /* LALSIMULATION_VERSION */
......@@ -18,11 +18,12 @@ AC_CONFIG_FILES([ \
swig/python/Makefile \
test/Makefile
])
AM_INIT_AUTOMAKE([1.11 foreign color-tests parallel-tests])
AM_INIT_AUTOMAKE([1.11 foreign subdir-objects color-tests parallel-tests])
AC_CANONICAL_HOST
LALSUITE_ARG_VAR
LALSUITE_CHECK_GIT_REPO
LALSUITE_DISTCHECK_CONFIGURE_FLAGS
LALSUITE_WITH_CFLAGS_LIBS
......@@ -45,9 +46,6 @@ AC_SUBST([LIBREVISION],[5])
AC_SUBST([LIBAGE],[2])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
# check for git repo
LALSUITE_CHECK_GIT_REPO
# nightly build
LALSUITE_ENABLE_NIGHTLY
......@@ -142,7 +140,6 @@ LALSUITE_ADD_LIBS()
# output
LAL_HEADER_LINK=${ac_aux_dir}/header-link.mk
AC_SUBST_FILE([LAL_HEADER_LINK])
AC_PROG_MAKE_SET
AC_OUTPUT
echo "
==================================================
......
/* only include this file if LALStochastic's config.h has not been included */
#ifndef _LALSTOCHASTICCONFIG_H
#define _LALSTOCHASTICCONFIG_H
#ifndef LALSTOCHASTIC_VERSION
/* LALStochastic Version */
#undef LALSTOCHASTIC_VERSION
......@@ -24,4 +22,4 @@
/* LALStochastic Configure Date */
#undef LALSTOCHASTIC_CONFIGURE_DATE
#endif /* _LALSTOCHASTICCONFIG_H */
#endif /* LALSTOCHASTIC_VERSION */
......@@ -20,11 +20,12 @@ AC_CONFIG_FILES([ \
swig/python/Makefile \
test/Makefile
])
AM_INIT_AUTOMAKE([1.11 foreign color-tests parallel-tests])
AM_INIT_AUTOMAKE([1.11 foreign subdir-objects color-tests parallel-tests])
AC_CANONICAL_HOST
LALSUITE_ARG_VAR
LALSUITE_CHECK_GIT_REPO
LALSUITE_DISTCHECK_CONFIGURE_FLAGS
LALSUITE_WITH_CFLAGS_LIBS
......@@ -47,9 +48,6 @@ AC_SUBST([LIBREVISION],[6])
AC_SUBST([LIBAGE],[0])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
# check for git repo
LALSUITE_CHECK_GIT_REPO
# nightly build
LALSUITE_ENABLE_NIGHTLY
......@@ -154,7 +152,6 @@ LALSUITE_ADD_LIBS()
# output
LAL_HEADER_LINK=${ac_aux_dir}/header-link.mk
AC_SUBST_FILE([LAL_HEADER_LINK])
AC_PROG_MAKE_SET
AC_OUTPUT
echo "
==================================================
......
/* only include this file if LALXML's config.h has not been included */
#ifndef _LALXMLCONFIG_H
#define _LALXMLCONFIG_H
#ifndef LALXML_VERSION
/* LALXML Version */
#undef LALXML_VERSION
......@@ -24,4 +22,4 @@
/* LALXML Configure Date */
#undef LALXML_CONFIGURE_DATE
#endif /* _LALXMLCONFIG_H */
#endif /* LALXML_VERSION */
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