Commit 27bd5eaa authored by Yi Pan's avatar Yi Pan
Browse files

Merge branch 'master' of ligo-vcs.phys.uwm.edu:/usr/local/git/lalsuite

Original: 20f48f8c2a8d9b821cbdb1c0560b863486e542fa
parents 3fddd0de 25b225b2
*.swp
*.trs
*~
*.egg-info
.DS_Store
.dirstamp
/Makefile
......
......@@ -1265,7 +1265,7 @@
adsnote = {Provided by the SAO/NASA Astrophysics Data System}
}
@ARTICLE{Wette.Prix.2013a,
@ARTICLE{WettePrix2013a,
author = {Wette, K. and Prix, R.},
title = {{Flat parameter-space metric for all-sky searches for
gravitational-wave pulsars}},
......@@ -1278,6 +1278,7 @@
eid = 123005,
archiveprefix ={arXiv},
doi = {10.1103/PhysRevD.88.123005},
url = {http://link.aps.org/doi/10.1103/PhysRevD.88.123005},
eprint = {1310.5587},
keywords = {Gravitational wave detectors and experiments,
Gravitational radiation detectors, mass spectrometers,
......
#!/bin/sh
default_git_path=git
default_am_v_gen=
git_path=$default_git_path
am_v_gen=$default_am_v_gen
# print usage message and exit
usage() {
cat <<EOF
usage: $0 [options] package_name output_file source_file
options [defaults in brackets]:
-h, --help display this help and exit
--git-path=GIT path to git program [$default_git_path]
--am-v-gen=\$(AM_V_GEN) generation message [${default_am_v_gen:-"none"}]
EOF
exit $1
}
# parse options
prev=
for option; do
if test -n "$prev" ; then
eval $prev=\$option
prev=
shift
continue
fi
case $option in
*=?*) optarg=`expr "X$option" : '[^=]*=\(.*\)'` ;;
*=) optarg= ;;
*) optarg=yes ;;
esac
case $option in
-help | --help | --hel | --he | -h) usage 0;;
--git-path) prev=git_path;;
--git-path=*) git_path=$optarg;;
--am-v-gen) prev=am_v_gen;;
--am-v-gen=*) am_v_gen=$optarg;;
-*) echo "unrecognized option \`$option'" 1>&2; usage 1;;
*) break;; # a non-option: done with option parsing
esac
shift
done
if test -n "$prev"; then
option=--`echo $prev | sed 's/_/-/g'`
echo "missing argument to $option" 1>&2
exit 1
fi
# make sure there the right number of remaining arguments
if test $# != 3; then
echo "wrong number of arguments" 1>&2
usage 1
fi
# set argument variables
am_v_gen="`expr "X$am_v_gen" : 'X\([ ]*GEN[ ]*\)'`"
package="${1?"package_name not set"}"
output="${2?"output_file not set"}"
source="${3?"input_file not set"}"
srcdir="`dirname "$source"`"
# use git log to get the important fields
git_id="`cd "$srcdir" && $git_path log -1 --pretty=format:%H`"
git_date="`cd "$srcdir" && env LC_TIME=C TZ=GMT0 $git_path log -1 --date=local --pretty=format:%cd`"
git_author="`cd "$srcdir" && $git_path log -1 --pretty=format:"%an <%ae>"`"
git_committer="`cd "$srcdir" && $git_path log -1 --pretty=format:"%cn <%ce>"`"
# extract relevant fields of %c date format
git_date_mon=`echo "$git_date" | cut -d " " -f2`
git_date_day=`echo "$git_date" | cut -d " " -f3`
git_date_hms=`echo "$git_date" | cut -d " " -f4`
git_date_year=`echo "$git_date" | cut -d " " -f5`
# convert month name to number
case "$git_date_mon" in
Jan) git_date_mon=01;; Feb) git_date_mon=02;; Mar) git_date_mon=03;;
Apr) git_date_mon=04;; May) git_date_mon=05;; Jun) git_date_mon=06;;
Jul) git_date_mon=07;; Aug) git_date_mon=08;; Sep) git_date_mon=09;;
Oct) git_date_mon=10;; Nov) git_date_mon=11;; Dec) git_date_mon=12;;
esac
# ISO-8601 representation of date in UTC
git_date="$git_date_year-$git_date_mon-$git_date_day $git_date_hms +0000"
# determine git tag, if present
git_tag="`cd "$srcdir" && $git_path describe --exact-match --tags $git_id 2>/dev/null || echo "None"`"
# determine git branch
git_branch="`cd "$srcdir" && $git_path rev-parse --symbolic-full-name HEAD 2>/dev/null`"
case "$git_branch" in
HEAD) git_branch="None";;
*) git_branch="`basename "$git_branch"`";;
esac
# update index
(cd "$srcdir" && $git_path update-index -q --refresh)
# determine state of git repository
if ! eval "(cd \"$srcdir\" && $git_path diff-files --quiet)"; then
git_status="UNCLEAN: Modified working tree"
elif ! eval "(cd \"$srcdir\" && $git_path diff-index --cached --quiet HEAD)"; then
git_status="UNCLEAN: Modified index"
else
git_status="CLEAN: All modifications committed"
fi
# determine builder
git_builder_name="`cd "$srcdir" && $git_path config user.name 2>/dev/null || echo "Unknown User"`"
git_builder_email="`cd "$srcdir" && $git_path config user.email 2>/dev/null`"
git_builder="$git_builder_name <$git_builder_email>"
# transliterate package name
LALPackage=$package
LALPACKAGE=`echo $package | sed 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
lalpackage=`echo $package | sed 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
package=`echo $package | sed 's/^LAL//'`
# determine appropriate header files
if test "$lalpackage" = "lalapps"; then
pkg_vcs_info_header="${LALPackage}VCSInfo.h"
pkg_config_header="config.h"
else
pkg_vcs_info_header="lal/${LALPackage}VCSInfo.h"
pkg_config_header="lal/${LALPackage}Config.h"
fi
# sed command to apply to source file
sedcmd=":t
s%@PACKAGE_NAME@%$LALPackage%;t t
s%@PACKAGE_NAME_UCASE@%$LALPACKAGE%;t t
s%@PACKAGE_NAME_LCASE@%$lalpackage%;t t
s%@PACKAGE_NAME_NOLAL@%$package%;t t
s%@PACKAGE_VCS_INFO_HEADER@%$pkg_vcs_info_header%;t t
s%@PACKAGE_CONFIG_HEADER@%$pkg_config_header%;t t
s%@ID@%$git_id%;t t
s%@DATE@%$git_date%;t t
s%@BRANCH@%$git_branch%;t t
s%@TAG@%$git_tag%;t t
s%@AUTHOR@%$git_author%;t t
s%@COMMITTER@%$git_committer%;t t
s%@STATUS@%$git_status%;t t
s%@BUILDER@%$git_builder%;t t
"
# use sed to perform substitutions; store in a temporary file
test -f "$output.tmp" && rm -f "$output.tmp"
sed "$sedcmd" "$source" > "$output.tmp"
# determine if output file needs to be modified
if test -r "$output" && cmp "$output" "$output.tmp" >/dev/null; then
rm -f "$output.tmp"
else
mv -f "$output.tmp" "$output"
test -n "$am_v_gen" && echo "$am_v_gen $output"
fi
exit 0
# -*- mode: autoconf; -*-
# lalsuite_build.m4 - top level build macros
#
# serial 87
# serial 88
# not present in older versions of pkg.m4
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
......@@ -182,7 +182,7 @@ AC_DEFUN([LALSUITE_ADD_PATH],[
AC_DEFUN([LALSUITE_CHECK_GIT_REPO],[
# $0: check for git
AC_PATH_PROGS(GIT,[git],[false])
AC_PATH_PROGS([GIT],[git],[false])
# check whether building from a git repository
have_git_repo=no
AS_IF([test "x${GIT}" != xfalse],[
......@@ -196,7 +196,7 @@ AC_DEFUN([LALSUITE_CHECK_GIT_REPO],[
AC_MSG_RESULT([${have_git_repo}])
])
# conditional for git and building from a git repository
AM_CONDITIONAL(HAVE_GIT_REPO,[test "x${have_git_repo}" = xyes])
AM_CONDITIONAL([HAVE_GIT_REPO],[test "x${have_git_repo}" = xyes])
# end $0
])
......@@ -325,6 +325,46 @@ AC_DEFUN([LALSUITE_PROG_COMPILERS],[
# end $0
])
AC_DEFUN([LALSUITE_REQUIRE_PYTHON],[
# $0: require Python version $1 or later
AS_IF([test "x${lalsuite_require_pyvers}" = x],[
lalsuite_require_pyvers="$1"
],[
AS_VERSION_COMPARE([${lalsuite_require_pyvers}],[$1],[
lalsuite_require_pyvers="$1"
])
])
# end $0
])
AC_DEFUN([LALSUITE_CHECK_PYTHON],[
# $0: check for Python
lalsuite_pyvers="$1"
AS_IF([test "x${lalsuite_require_pyvers}" != x],[
AS_VERSION_COMPARE([${lalsuite_pyvers}],[${lalsuite_require_pyvers}],[
lalsuite_pyvers="${lalsuite_require_pyvers}"
])
])
AS_IF([test "x${PYTHON}" != xfalse],[
AM_PATH_PYTHON([${lalsuite_pyvers}],,[
AS_IF([test "x${lalsuite_require_pyvers}" = x],[
PYTHON=false
],[
AC_MSG_ERROR([Python version ${lalsuite_pyvers} or higher is required])
])
])
])
AM_CONDITIONAL([HAVE_PYTHON],[test "x${PYTHON}" != xfalse])
AM_COND_IF([HAVE_PYTHON],[
AC_SUBST([python_prefix], [`${PYTHON} -c 'import sys; print(sys.prefix)' 2>/dev/null`])
AC_SUBST([python_exec_prefix], [`${PYTHON} -c 'import sys; print(sys.exec_prefix)' 2>/dev/null`])
PYTHON_ENABLE_VAL=ENABLED
],[
PYTHON_ENABLE_VAL=DISABLED
])
# end $0
])
AC_DEFUN([LALSUITE_USE_LIBTOOL],[
# $0: Generate a libtool script for use in configure tests
AC_REQUIRE([LT_INIT])
......
SUFFIXES = .py
.PHONY: pymodule-all-local
.PHONY: pymodule-mostlyclean-local
.PHONY: pybin-install-data-hook
.PHONY: pybin-uninstall-local
.PHONY: pybin-dist-hook
if HAVE_PYTHON
pybindir = $(bindir)
BUILT_SOURCES += $(pymodule_PYTHON) $(pybin_SCRIPTS)
MOSTLYCLEANFILES += $(pybin_SCRIPTS)
lalsuite_python_wrapper = $(top_srcdir)/gnuscripts/lalsuite_python_wrapper.sh.in
python_install_script = $(top_srcdir)/gnuscripts/lalsuite_python_install_script
INSTALL_SCRIPT = $(python_install_script) $(INSTALL)
EXTRA_DIST += $(python_install_script)
BUILT_SOURCES += $(pymodule_PYTHON) $(pybin_SCRIPTS)
MOSTLYCLEANFILES += .python_wrapper.sh $(pybin_SCRIPTS)
EXTRA_DIST += $(lalsuite_python_wrapper)
.PHONY: pymodule-all-local
all-local: pymodule-all-local
pymodule-all-local: pymodule-mostlyclean-local
$(AM_V_at)if test "x$(builddir)" != "x$(srcdir)"; then \
......@@ -19,7 +25,6 @@ pymodule-all-local: pymodule-mostlyclean-local
done; \
fi
.PHONY: pymodule-mostlyclean-local
mostlyclean-local: pymodule-mostlyclean-local
pymodule-mostlyclean-local:
$(AM_V_at)if test "x$(builddir)" != "x$(srcdir)"; then \
......@@ -30,40 +35,87 @@ pymodule-mostlyclean-local:
done; \
fi
$(pybin_SCRIPTS): Makefile
.python_wrapper.sh: $(lalsuite_python_wrapper)
$(AM_V_at)pywrapregex='s|[@]SED[@]|$(SED)|g;s|[@]PYTHON[@]|$(PYTHON)|g;s|[@]lalsuite_pythonpath[@]'; \
pypath="$(abs_builddir):$(abs_srcdir):$(LAL_PYTHON_PATH)"; \
if $(SED) "$${pywrapregex}|$${pypath}|g" $< > $@; then \
: ; \
else \
rm -f $@; \
exit 1; \
fi
$(pybin_SCRIPTS): Makefile .python_wrapper.sh
.py:
$(AM_V_GEN)if test -x $<; then \
echo "" >&2; \
echo "ERROR: $< must not be executable" >&2; \
echo "" >&2; \
$(AM_V_GEN)shebang='#!'; \
rm -f $@ $@.tmp || exit 1; \
if test -x $<; then \
printf "\nERROR: $< must not be executable\n\n" >&2; \
exit 1; \
fi; \
$(MKDIR_P) .pybin/ || exit 1; \
rm -f $@ $@.tmp .pybin/$@ || exit 1; \
echo "#!/bin/sh" > $@.tmp; \
echo "### SHELL SELF-EXECUTING HEADER SCRIPT" >> $@.tmp; \
echo "''':'" >> $@.tmp; \
echo "PYTHONPATH=\"$(abs_builddir):$(abs_srcdir):$(LAL_PYTHON_PATH):\$${PYTHONPATH}\"" >> $@.tmp; \
echo "export PYTHONPATH" >> $@.tmp; \
echo "exec $(PYTHON) \"\$$0\" \"\$$@\"" >> $@.tmp; \
echo "exit \$$?" >> $@.tmp; \
echo "fi" >> $@.tmp; \
echo "'''" >> $@.tmp; \
echo "### PYTHON SCRIPT" >> $@.tmp; \
$(SED) -e "s|^PYTHONPATH=.*|PYTHONPATH=\"$(pyexecdir):$(pythondir):\$${PYTHONPATH}\"|" $@.tmp > .pybin/$@ || exit 1; \
cat $< >> .pybin/$@ || exit 1; \
if test x`$(SED) -n -e "/^$${shebang}/p" $<` != x; then \
printf "\nERROR: $< must not contain a $${shebang} command line\n\n" >&2; \
exit 1; \
fi; \
echo "$${shebang}/bin/sh $(abs_builddir)/.python_wrapper.sh" > $@.tmp; \
cat $< >> $@.tmp || exit 1; \
chmod +x $@.tmp || exit 1; \
mv -f $@.tmp $@
.PHONY: pybin-clean-local
clean-local: pybin-clean-local
pybin-clean-local:
-rm -rf .pybin/
install-data-hook: pybin-install-data-hook
pybin-install-data-hook:
$(AM_V_GEN)shebang='#!'; \
pywrapregex='s|[@]SED[@]|$(SED)|g;s|[@]PYTHON[@]|$(PYTHON)|g;s|[@]lalsuite_pythonpath[@]'; \
if test "x$(pybin_SCRIPTS)" != x; then \
if test "x$(prefix)" = "x$(python_exec_prefix)"; then \
shebang_command="$${shebang}$(PYTHON)"; \
else \
python_wrapper="$(pkglibexecdir)/python_wrapper.sh"; \
echo " $(MKDIR_P) $(DESTDIR)$(pkglibexecdir)"; \
$(MKDIR_P) $(DESTDIR)$(pkglibexecdir) || exit 1; \
echo "Generating $(DESTDIR)$${python_wrapper}..."; \
pypath="$(pyexecdir)"; \
if test "$(pythondir)" != "$(pyexecdir)"; then \
pypath="$${pypath}:$(pythondir)"; \
fi; \
if $(SED) "$${pywrapregex}|$${pypath}|g" $(lalsuite_python_wrapper) > $(DESTDIR)$${python_wrapper}; then \
: ; \
else \
rm -f $(DESTDIR)$${python_wrapper}; \
printf "\nERROR: failed to generate $(DESTDIR)$${python_wrapper}\n\n" >&2; \
exit 1; \
fi; \
shebang_command="$${shebang}/bin/sh $${python_wrapper}"; \
fi; \
echo "Fixing shebangs commands in $(DESTDIR)$(pybindir)..."; \
for file in $(pybin_SCRIPTS); do \
printf " $${file}"; \
if $(SED) -i.tmp "s|^$${shebang}.*$$|$${shebang_command}|" $(DESTDIR)$(pybindir)/$${file}; then \
rm -f $(DESTDIR)$(pybindir)/$${file}.tmp; \
else \
printf "\n\nERROR: failed to fix shebang command of $(DESTDIR)$(pybindir)/$${file}\n\n" >&2; \
exit 1; \
fi; \
done; \
printf "\n"; \
fi
uninstall-local: pybin-uninstall-local
pybin-uninstall-local:
-rm -f "$(DESTDIR)$(pkglibexecdir)/python_wrapper.sh"
.PHONY: pybin-dist-hook
dist-hook: pybin-dist-hook
pybin-dist-hook:
for file in $(pybin_SCRIPTS); do \
cp "$(srcdir)/$${file}.py" "$(distdir)"; \
done
else # !HAVE_PYTHON
pkgpython_PYTHON =
pymoduledir =
pymodule_PYTHON =
pybindir =
pybin_SCRIPTS =
endif # HAVE_PYTHON
#!/bin/sh
# Install Python scripts from .pybin/, which have the correct PYTHONPATH
# Author: Karl Wette, 2014
# first command line argument is 'install' command
cmd="$1"
if test "x${cmd}" = x; then
echo "$0: insufficient arguments" >&2
exit 1
fi
shift
# iterate over 'install' arguments
while test "x$1" != x; do
arg="$1"
if test -f "${arg}" && test -f ".pybin/${arg}"; then
arg=".pybin/${arg}"
fi
cmd="${cmd} '${arg}'"
shift
done
# print and execute 'install' command
echo " ${cmd}"
eval "${cmd}"
exit $?
lalsuite_pythonpath="@lalsuite_pythonpath@"
PYTHONPATH=`echo "${PYTHONPATH}" | "@SED@" -e "s|${lalsuite_pythonpath}:||g;"`
PYTHONPATH="${lalsuite_pythonpath}:${PYTHONPATH}"
export PYTHONPATH
exec "@PYTHON@" "$@"
exit $?
......@@ -19,7 +19,7 @@ include $(top_srcdir)/gnuscripts/lalsuite_test.am
swig_iface = swig$(PACKAGE).i
swig_preproc_flags = -MP -MD -Wextra -Werror -I$(top_builddir)/include -includeall -ignoremissing -xml -xmllite
swig_flags = -MP -MD -Wextra -Werror -I$(top_builddir)/include $(SWIG_CPPFLAGS) $(LAL_SYSTEM_INCLUDES)
swig_cppflags = -shared -I$(top_builddir)/include $(SWIG_CPPFLAGS)
swig_cppflags = -shared -I. -I$(top_builddir)/include $(SWIG_CPPFLAGS)
swig_ldflags = -module -avoid-version -version-info 0:0:0 $(SWIG_LDFLAGS)
swig_libtoolflags = --tag=disable-static
swig_deps_filter = $(SED) -e '/^ *swiglal[a-z0-9_]*\.[a-z0-9][a-z0-9]* *\\$$/d'
......@@ -28,6 +28,7 @@ swig_python_flags = $(swig_flags) -python -O -builtin -globals globalvar
BUILT_SOURCES =
CLEANFILES =
DEFAULT_INCLUDES =
EXTRA_HEADERS =
nodist_pkginclude_HEADERS =
......@@ -61,7 +62,7 @@ if SWIG_BUILD_OCTAVE
octexec_LTLIBRARIES = swiglal_octave.la
nodist_swiglal_octave_la_SOURCES = swiglal_octave.cpp
swiglal_octave_la_CPPFLAGS = $(swig_cppflags) $(SWIG_OCTAVE_CPPFLAGS)
swiglal_octave_la_CPPFLAGS = $(SWIG_OCTAVE_CPPFLAGS_IOCTAVE) $(swig_cppflags) $(SWIG_OCTAVE_CPPFLAGS)
swiglal_octave_la_CXXFLAGS = $(SWIG_OCTAVE_CXXFLAGS)
swiglal_octave_la_LDFLAGS = $(swig_ldflags) $(SWIG_OCTAVE_LDFLAGS)
swiglal_octave_la_LIBADD = $(LDADD)
......@@ -256,13 +257,10 @@ swig-distclean-generate-local:
else # !SWIG_GENERATE
swiglal_octave.cpp swiglal_python.c:
@echo "" >&2; \
echo "ERROR: you are trying to re-create the SWIG-generated source file" >&2; \
echo " $@" >&2; \
echo "but $(PACKAGE_NAME) was not configured with SWIG generation enabled." >&2; \
echo "Please ensure SWIG is installed and re-run ./configure with either" >&2; \
echo "--enable-swig=generate or --enable-swig-<lang>=generate options." >&2; \
echo "" >&2; \
@printf "\nERROR: you are trying to re-create the SWIG-generated source file" >&2; \
printf "\n $@\nbut $(PACKAGE_NAME) was not configured with SWIG generation enabled." >&2; \
printf "\nPlease ensure SWIG is installed and re-run ./configure with either" >&2; \
printf "\nthe --enable-swig=generate or --enable-swig-<lang>=generate options.\n\n" >&2; \
exit 1
endif # SWIG_GENERATE
......
......@@ -2,7 +2,7 @@
# lalsuite_swig.m4 - SWIG configuration
# Author: Karl Wette, 2011--2014
#
# serial 64
# serial 67
AC_DEFUN([_LALSUITE_CHECK_SWIG_VERSION],[
# $0: check the version of $1, and store it in ${swig_version}
......@@ -60,9 +60,12 @@ AC_DEFUN([LALSUITE_ENABLE_SWIG],[
]
)
swig_build_any=false
python_min_version=
LALSUITE_ENABLE_SWIG_LANGUAGE([Octave],[false],[LALSUITE_REQUIRE_CXX])
LALSUITE_ENABLE_SWIG_LANGUAGE([Python],[false])
LALSUITE_ENABLE_SWIG_LANGUAGE([Python],[false],[LALSUITE_REQUIRE_PYTHON([2.6])])
AS_IF([test "${swig_generate}" = true],[
# require Python for running generate_swig_iface.py
LALSUITE_REQUIRE_PYTHON([2.6])
SWIG_GENERATE_ENABLE_VAL=ENABLED
],[
SWIG_GENERATE_ENABLE_VAL=DISABLED
......@@ -299,16 +302,25 @@ AC_DEFUN([LALSUITE_USE_SWIG_OCTAVE],[
AC_MSG_CHECKING([C++ compiler used for building ${OCTAVE}])
octave_CXX=`${mkoctfile} -p CXX 2>/dev/null`
AC_MSG_RESULT([${octave_CXX}])
octave_CXX_version=`${octave_CXX} --version 2>/dev/null | ${SED} -n -e '1p'`
lalsuite_CXX_version=`${CXX} --version 2>/dev/null | ${SED} -n -e '1p'`
CXX_version_regex=['s|([^)]*) *||g;s|^ *||g;s| *$||g']
octave_CXX_version=`${octave_CXX} --version 2>/dev/null | ${SED} -n -e '1p' | ${SED} -e "${CXX_version_regex}"`
_AS_ECHO_LOG([octave_CXX_version: '${octave_CXX_version}'])
lalsuite_CXX_version=`${CXX} --version 2>/dev/null | ${SED} -n -e '1p' | ${SED} -e "${CXX_version_regex}"`
_AS_ECHO_LOG([lalsuite_CXX_version: '${lalsuite_CXX_version}'])
AS_IF([test "x${lalsuite_CXX_version}" != "x${octave_CXX_version}"],[
AC_MSG_ERROR([configured C++ compiler "${CXX}" differs from ${OCTAVE} C++ compiler "${octave_CXX}"])
])
# determine Octave preprocessor flags
AC_SUBST([SWIG_OCTAVE_CPPFLAGS],[])
AC_SUBST([SWIG_OCTAVE_CPPFLAGS_IOCTAVE],[])
for arg in CPPFLAGS INCFLAGS; do
SWIG_OCTAVE_CPPFLAGS="${SWIG_OCTAVE_CPPFLAGS} "`${mkoctfile} -p ${arg} 2>/dev/null`
for flag in `${mkoctfile} -p ${arg} 2>/dev/null`; do
AS_CASE([${flag}],
[-I*/octave],[SWIG_OCTAVE_CPPFLAGS_IOCTAVE="${flag}"],
[SWIG_OCTAVE_CPPFLAGS="${SWIG_OCTAVE_CPPFLAGS} ${flag}"]
)
done
done
# determine Octave compiler flags
......@@ -332,7 +344,7 @@ AC_DEFUN([LALSUITE_USE_SWIG_OCTAVE],[
# check for Octave headers
AC_LANG_PUSH([C++])
LALSUITE_PUSH_UVARS
CPPFLAGS="${SWIG_OCTAVE_CPPFLAGS}"
CPPFLAGS="${SWIG_OCTAVE_CPPFLAGS_IOCTAVE} ${SWIG_OCTAVE_CPPFLAGS}"
AC_CHECK_HEADERS([octave/oct.h],[],[
AC_MSG_ERROR([could not find the header "octave/oct.h"])
],[
......@@ -349,10 +361,6 @@ AC_DEFUN([LALSUITE_USE_SWIG_PYTHON],[
# $0: configure SWIG Python bindings
LALSUITE_USE_SWIG_LANGUAGE([Python],[
# check for Python
python_min_version=2.5
AM_PATH_PYTHON([${python_min_version}])
# check for distutils
AC_MSG_CHECKING([for distutils])
cat <<EOD | ${PYTHON} - 2>/dev/null
......
......@@ -6,7 +6,7 @@ BUILT_SOURCES += $(vcs_info_sources)
MOSTLYCLEANFILES += $(vcs_info_sources)
$(vcs_info_sources): force-vcs-info-generation
$(AM_V_at)$(PYTHON) $(top_srcdir)/../gnuscripts/generate_vcs_info.py --git-path='$(GIT)' --am-v-gen='$(AM_V_GEN)' '$(PACKAGE_NAME)' $@ $(srcdir)/$@.git
$(AM_V_at)$(top_srcdir)/../gnuscripts/generate_vcs_info.sh --git-path='$(GIT)' --am-v-gen='$(AM_V_GEN)' '$(PACKAGE_NAME)' $@ $(srcdir)/$@.git
endif # HAVE_GIT_REPO
......
......@@ -11,7 +11,7 @@
.deps
.dvi-dep
.libs
.pybin
.python_wrapper.sh
/_build/
/_inst/
/lal-*/
......
......@@ -181,7 +181,7 @@ AC_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])])
LALSUITE_CHECK_PYTHON([2.6])
# check for supported mac os x version
LALSUITE_OSX_VERSION_CHECK
......@@ -364,6 +364,7 @@ AC_MSG_NOTICE([
==================================================
LAL has now been successfully configured:
* Python support is $PYTHON_ENABLE_VAL
* CUDA support is $CUDA_ENABLE_VAL
* BOINC support is $BOINC_ENABLE_VAL
* SWIG binding generation is $SWIG_GENERATE_ENABLE_VAL
......
../../gnuscripts/lalsuite_python_install_script
\ No newline at end of file
../../gnuscripts/lalsuite_python_wrapper.sh.in
\ No newline at end of file
......@@ -11,6 +11,8 @@ SUBDIRS = \
vcs_info_sources = git_version.py