[Xfce4-commits] <tumbler:master> Fix build when using -Wl,-z,defs

[Nick Schermer]

Updating branch refs/heads/master
         to f2dba5074031aa2faa447ec30ac107debdda7f26 (commit)
       from 089c57799b024cd3e5ccb0eff38d793776938840 (commit)

commit f2dba5074031aa2faa447ec30ac107debdda7f26
Author: Yves-Alexis Perez <corsac at debian.org>
Date:   Tue Dec 11 21:37:00 2012 +0100

    Fix build when using -Wl,-z,defs
    
    GStreamer thumbnailers should be linked against libmath and
    libgsttags.
    
    Do the first directly from Makefile.am, and implement the second in the
    AC macros for GSTREAMER support.
    
    Signed-off-by: Yves-Alexis Perez <corsac at debian.org>

 acinclude.m4                        |    7 +++++--
 plugins/gst-thumbnailer/Makefile.am |    5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index e84b8c3..4105e37 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -157,8 +157,11 @@ if test x"$ac_tumbler_gstreamer_thumbnailer" = x"yes"; then
   dnl Check for gdk-pixbuf
   PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 >= 2.14],
   [
-    dnl Check for libgstreamerthumbnailer
-    PKG_CHECK_MODULES([GSTREAMER], [gstreamer-1.0], [], [ac_tumbler_gstreamer_thumbnailer=no])
+    dnl Check for libgstreamer
+    PKG_CHECK_MODULES([GSTREAMER], [gstreamer-1.0], [
+      dnl Check for libgstreamertag
+      PKG_CHECK_MODULES([GSTREAMER_TAG], [gstreamer-tag-1.0], [], [ac_tumbler_gstreamer_thumbnailer=no])
+    ], [ac_tumbler_gstreamer_thumbnailer=no])
   ], [ac_tumbler_gstreamer_thumbnailer=no])
 fi
 
diff --git a/plugins/gst-thumbnailer/Makefile.am b/plugins/gst-thumbnailer/Makefile.am
index 87c33c3..5a0cda3 100644
--- a/plugins/gst-thumbnailer/Makefile.am
+++ b/plugins/gst-thumbnailer/Makefile.am
@@ -39,6 +39,7 @@ tumbler_gst_thumbnailer_la_CFLAGS =					\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	$(GDK_PIXBUF_CFLAGS)						\
 	$(GSTREAMER_CFLAGS)						\
+	$(GSTREAMER_TAG_CFLAGS)						\
 	$(GIO_CFLAGS)							\
 	$(GLIB_CFLAGS)							\
 	$(PLATFORM_CFLAGS)						\
@@ -54,8 +55,10 @@ tumbler_gst_thumbnailer_la_LIBADD =					\
 	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la	\
 	$(GDK_PIXBUF_LIBS)						\
 	$(GSTREAMER_LIBS)						\
+	$(GSTREAMER_TAG_LIBS)						\
 	$(GIO_LIBS)							\
-	$(GLIB_LIBS)
+	$(GLIB_LIBS)							\
+	-lm
 
 tumbler_gst_thumbnailer_la_DEPENDENCIES =				\
 	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la