From e8e6b613b4e81f47007ffcf9237b88c35330b56b Mon Sep 17 00:00:00 2001
From: Aaron Viets <aaron.viets@ligo.org>
Date: Fri, 13 Apr 2018 12:43:26 -0700
Subject: [PATCH] gstlal-calibration: adjust gstreamer plugin .so filenames on
gstreamer 1.14+ to work around changes to name mangling used by the plugin
scanner
---
gstlal-calibration/configure.ac | 9 +++++++++
gstlal-calibration/gst/lal/Makefile.am | 10 +++++-----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/gstlal-calibration/configure.ac b/gstlal-calibration/configure.ac
index 4b7ac7d38a..b0185a06b8 100644
--- a/gstlal-calibration/configure.ac
+++ b/gstlal-calibration/configure.ac
@@ -160,6 +160,15 @@ AC_MSG_NOTICE([If you have chosen to install the software in a location not incl
to your GST_PLUGIN_PATH environment variable.])
AC_SUBST([GSTLAL_PLUGIN_LDFLAGS], ["-module -avoid-version -export-symbols-regex [_]*\(gst_\|Gst\|GST_\|gstlal_\|GstLAL_\|GSTLAL_\).*"])
+gstreamer_VERSION=`$PKG_CONFIG --modversion gstreamer-${GSTREAMER_RELEASE}`
+AX_COMPARE_VERSION([$gstreamer_VERSION], [ge], [1.14.0], [
+ GSTPLUGINPREFIX="gst"
+], [
+ GSTPLUGINPREFIX=""
+])
+AC_SUBST([GSTPLUGINPREFIX])
+
+
# Check for availability of GstBaseParse class (starting in 0.10.33)
CFLAGS_saved="$CFLAGS"
CFLAGS="$gstreamer_CFLAGS"
diff --git a/gstlal-calibration/gst/lal/Makefile.am b/gstlal-calibration/gst/lal/Makefile.am
index f477046450..180e52ffbd 100644
--- a/gstlal-calibration/gst/lal/Makefile.am
+++ b/gstlal-calibration/gst/lal/Makefile.am
@@ -1,6 +1,6 @@
-plugin_LTLIBRARIES = libgstlalcalibration.la
+plugin_LTLIBRARIES = lib@GSTPLUGINPREFIX@gstlalcalibration.la
-libgstlalcalibration_la_SOURCES = \
+lib@GSTPLUGINPREFIX@gstlalcalibration_la_SOURCES = \
gstlalcalibration.c \
gstlal_add_constant.c gstlal_add_constant.h \
gstlal_pyfuncsrc.c gstlal_pyfuncsrc.h \
@@ -15,6 +15,6 @@ libgstlalcalibration_la_SOURCES = \
gstlal_insertgap.c gstlal_insertgap.h \
gstlal_fccupdate.c gstlal_fccupdate.h \
gstlal_transferfunction.c gstlal_transferfunction.h
-libgstlalcalibration_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_CPPFLAGS)
-libgstlalcalibration_la_CFLAGS = $(AM_CFLAGS) $(LAL_CFLAGS) $(GSTLAL_CFLAGS) $(gstreamer_CFLAGS) $(gstreamer_audio_CFLAGS)
-libgstlalcalibration_la_LDFLAGS = $(AM_LDFLAGS) $(LAL_LIBS) $(GSTLAL_LIBS) $(PYTHON_LIBS) $(gstreamer_LIBS) $(gstreamer_audio_LIBS) $(GSTLAL_PLUGIN_LDFLAGS)
+lib@GSTPLUGINPREFIX@gstlalcalibration_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_CPPFLAGS)
+lib@GSTPLUGINPREFIX@gstlalcalibration_la_CFLAGS = $(AM_CFLAGS) $(LAL_CFLAGS) $(GSTLAL_CFLAGS) $(gstreamer_CFLAGS) $(gstreamer_audio_CFLAGS)
+lib@GSTPLUGINPREFIX@gstlalcalibration_la_LDFLAGS = $(AM_LDFLAGS) $(LAL_LIBS) $(GSTLAL_LIBS) $(PYTHON_LIBS) $(gstreamer_LIBS) $(gstreamer_audio_LIBS) $(GSTLAL_PLUGIN_LDFLAGS)
--
GitLab