summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-07-21 16:03:11 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-07-21 16:03:11 +0000
commit7f21077a802f3d3c144b086c969d54a36775992e (patch)
tree5b44fd804510b4868126383784a8344972c1bf3f
parent7b80cad30fd2912dd6a50507a77296d00d66add4 (diff)
Link the ladspa plugin with -ldl. It's needed for dlopen() and friends for loading the ladspa plugins and previously ...
Original commit message from CVS: * configure.ac: * ext/ladspa/Makefile.am: Link the ladspa plugin with -ldl. It's needed for dlopen() and friends for loading the ladspa plugins and previously was linked in by gmodule. Fixes bug #543848.
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac8
-rw-r--r--ext/ladspa/Makefile.am2
3 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b90bfcfa..faa327035 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2008-07-21 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ * configure.ac:
+ * ext/ladspa/Makefile.am:
+ Link the ladspa plugin with -ldl. It's needed for dlopen() and friends
+ for loading the ladspa plugins and previously was linked in by
+ gmodule. Fixes bug #543848.
+
+2008-07-21 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
* gst/modplug/libmodplug/Makefile.am:
Use GST_CXXFLAGS instead of GST_CFLAGS for CXXFLAGS. GST_CFLAGS
can contain compiler parameters that are invalid for C++.
diff --git a/configure.ac b/configure.ac
index 4abcf5ca2..50ebcb743 100644
--- a/configure.ac
+++ b/configure.ac
@@ -660,7 +660,15 @@ dnl *** ladspa ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LADSPA, true)
AG_GST_CHECK_FEATURE(LADSPA, [ladspa], ladspa, [
AC_CHECK_HEADER(ladspa.h, HAVE_LADSPA="yes", HAVE_LADSPA="no")
+ save_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS -D_GNU_SOURCE"
+
+ AC_CHECK_LIB(dl, dlopen,
+ LADSPA_LIBS="-ldl",
+ HAVE_LADSPA="no")
+ CFLAGS="$save_cflags"
])
+AC_SUBST(LADSPA_LIBS)
dnl *** libmms ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBMMS, true)
diff --git a/ext/ladspa/Makefile.am b/ext/ladspa/Makefile.am
index c3ded10a4..b00996332 100644
--- a/ext/ladspa/Makefile.am
+++ b/ext/ladspa/Makefile.am
@@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstladspa.la
libgstladspa_la_SOURCES = gstsignalprocessor.c gstladspa.c search.c load.c
libgstladspa_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS)
-libgstladspa_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LIBM)
+libgstladspa_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LIBM) $(LADSPA_LIBS)
libgstladspa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstsignalprocessor.h gstladspa.h utils.h