[SCM] gmerlin/master: link against libxml/libm when needed

[zmoelnig-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 93004ea8a6c29619d48fb623f5787e9490dbcc5d
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Tue Jan 11 14:35:51 2011 +0100

    link against libxml/libm when needed

diff --git a/debian/patches/series b/debian/patches/series
index d6ccf4c..ea14f08 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,5 @@ fix_manpages.patch
 replace_bg_sem_h.patch
 png_set_gray.patch
 function_param_type.patch
+underlinking.patch
 fix_typos.patch
diff --git a/debian/patches/underlinking.patch b/debian/patches/underlinking.patch
new file mode 100644
index 0000000..ff31718
--- /dev/null
+++ b/debian/patches/underlinking.patch
@@ -0,0 +1,24 @@
+Author: Cristian Morales Vega <reddwarf at opensuse.org>
+Description: link libgmerlin against libxml and libm
+as these are needed and obviously forgotten by upstream
+--- gmerlin.orig/configure.ac
++++ gmerlin/configure.ac
+@@ -139,6 +139,8 @@
+ 
+ dnl Required
+ 
++LT_LIB_M
++
+ XML2_REQUIRED="2.4.0"
+ PKG_CHECK_MODULES(XML2, libxml-2.0 >= $XML2_REQUIRED, , AC_MSG_ERROR("libxml2 not found"))
+ AC_SUBST(XML2_REQUIRED)
+--- gmerlin.orig/lib/gtk/Makefile.am
++++ gmerlin/lib/gtk/Makefile.am
+@@ -64,5 +64,5 @@
+ urlselect.c \
+ vumeter.c
+ 
+-libgmerlin_gtk_la_LIBADD = @GTK_LIBS@ $(top_builddir)/lib/libgmerlin.la
++libgmerlin_gtk_la_LIBADD = @GTK_LIBS@ $(top_builddir)/lib/libgmerlin.la @XML2_LIBS@ @LIBM@
+ 
+Binary files gmerlin.orig/.git/index and gmerlin/.git/index differ

-- 
gmerlin packaging