From 0e021fd6ebc33a01b6b3b1fefd58238711b64921 Mon Sep 17 00:00:00 2001
From: Kipp Cannon <kipp.cannon@ligo.org>
Date: Thu, 9 Jan 2014 12:45:01 -0500
Subject: [PATCH] patch gstlal-calibration build scripts
---
gstlal-calibration/.gitignore | 1 +
gstlal-calibration/Makefile.am | 4 ++--
gstlal-calibration/bin/Makefile.am | 0
gstlal-calibration/configure.ac | 7 +++++--
gstlal-calibration/gnuscripts/ax_python_glue.m4 | 17 +++++++++++++++++
.../gnuscripts/ax_python_pylal.m4 | 17 +++++++++++++++++
gstlal-calibration/gst/Makefile.am | 0
gstlal-calibration/python/Makefile.am | 0
8 files changed, 42 insertions(+), 4 deletions(-)
create mode 100644 gstlal-calibration/.gitignore
create mode 100644 gstlal-calibration/bin/Makefile.am
create mode 100644 gstlal-calibration/gnuscripts/ax_python_glue.m4
create mode 100644 gstlal-calibration/gnuscripts/ax_python_pylal.m4
create mode 100644 gstlal-calibration/gst/Makefile.am
create mode 100644 gstlal-calibration/python/Makefile.am
diff --git a/gstlal-calibration/.gitignore b/gstlal-calibration/.gitignore
new file mode 100644
index 0000000000..6030eba4ba
--- /dev/null
+++ b/gstlal-calibration/.gitignore
@@ -0,0 +1 @@
+gstlal-calibration.spec
diff --git a/gstlal-calibration/Makefile.am b/gstlal-calibration/Makefile.am
index 385d763ba4..9245f4c45c 100644
--- a/gstlal-calibration/Makefile.am
+++ b/gstlal-calibration/Makefile.am
@@ -1,6 +1,6 @@
ACLOCAL_AMFLAGS = -I gnuscripts
-EXTRA_DIST = gstlal-ugly.spec
-SUBDIRS = debian lib gst python bin share tests examples
+EXTRA_DIST = gstlal-calibration.spec
+SUBDIRS = debian gst python bin
# check that the most recent changelog entry's version matches the package
# version
diff --git a/gstlal-calibration/bin/Makefile.am b/gstlal-calibration/bin/Makefile.am
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/gstlal-calibration/configure.ac b/gstlal-calibration/configure.ac
index 73a062ff00..ac9b463b5c 100644
--- a/gstlal-calibration/configure.ac
+++ b/gstlal-calibration/configure.ac
@@ -13,9 +13,12 @@ AC_CONFIG_MACRO_DIR([gnuscripts])
AM_INIT_AUTOMAKE([1.9 tar-ustar foreign])
AC_CONFIG_FILES([ \
Makefile \
- gstlal-ugly.spec \
+ gstlal-calibration.spec \
+ bin/Makefile \
debian/control \
- debian/Makefile
+ debian/Makefile \
+ gst/Makefile \
+ python/Makefile \
])
diff --git a/gstlal-calibration/gnuscripts/ax_python_glue.m4 b/gstlal-calibration/gnuscripts/ax_python_glue.m4
new file mode 100644
index 0000000000..1ac53bcc28
--- /dev/null
+++ b/gstlal-calibration/gnuscripts/ax_python_glue.m4
@@ -0,0 +1,17 @@
+AC_DEFUN([AX_PYTHON_GLUE],[
+ if test -z $PYTHON ; then
+ PYTHON="python"
+ fi
+ PYTHON_NAME=`basename $PYTHON`
+ AX_PYTHON_MODULE([glue])
+ if test "x$HAVE_PYMOD_GLUE" == "xyes" ; then
+ AC_MSG_CHECKING(glue version)
+ GLUE_VERSION=`$PYTHON -c "from glue import git_version ; print '%s.%s' % tuple((git_version.tag or '0-0').replace('glue-release-', '').split('-')[[:2]])"`
+ if test "x${GLUE_VERSION}" == "x0.0" ; then
+ GLUE_VERSION=
+ AC_MSG_RESULT([unknown])
+ else
+ AC_MSG_RESULT($GLUE_VERSION)
+ fi
+ fi
+])
diff --git a/gstlal-calibration/gnuscripts/ax_python_pylal.m4 b/gstlal-calibration/gnuscripts/ax_python_pylal.m4
new file mode 100644
index 0000000000..2265e5cece
--- /dev/null
+++ b/gstlal-calibration/gnuscripts/ax_python_pylal.m4
@@ -0,0 +1,17 @@
+AC_DEFUN([AX_PYTHON_PYLAL],[
+ if test -z $PYTHON ; then
+ PYTHON="python"
+ fi
+ PYTHON_NAME=`basename $PYTHON`
+ AX_PYTHON_MODULE([pylal])
+ if test "x$HAVE_PYMOD_PYLAL" == "xyes" ; then
+ AC_MSG_CHECKING(pylal version)
+ PYLAL_VERSION=`$PYTHON -c "from pylal import git_version ; print '%s.%s' % tuple((git_version.tag or '0-0').replace('pylal-', '').split('-')[[:2]])"`
+ if test "x${PYLAL_VERSION}" == "x0.0" ; then
+ PYLAL_VERSION=
+ AC_MSG_RESULT([unknown])
+ else
+ AC_MSG_RESULT($PYLAL_VERSION)
+ fi
+ fi
+])
diff --git a/gstlal-calibration/gst/Makefile.am b/gstlal-calibration/gst/Makefile.am
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/gstlal-calibration/python/Makefile.am b/gstlal-calibration/python/Makefile.am
new file mode 100644
index 0000000000..e69de29bb2
--
GitLab