From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 7 Feb 2011 12:31:12 +0000 (+0000)
Subject: Merge remote branch 'jcristau/master'
X-Git-Tag: 1.2.10~1
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=cd758c798d0c48f8161e5102faf8d862ba76aa2d;hp=18bbbeb1492d2776332f54a57b2a681eb45396ad;p=videolink.git

Merge remote branch 'jcristau/master'

Update ChangeLog based on debian/changelog entry 1.2.9-2.1.

Resolve conflict on setting of moz_ldflags_extra in Makefile.
---

diff --git a/ChangeLog b/ChangeLog
index dffaad7..7d3e9ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+videolink (1.2.10) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * List all needed libraries to the linker.  We were accidentally
+    depending on the behaviour of GNU ld, which treats 'needed' as
+    transitive by default - Debian bug #556760
+
+  [ Nobuhiro Iwamatsu ]
+  * Define XPCOM_GLUE_USE_NSPR, link against nspr - Debian bug #611389
+  * Include <cstdio> in xpcom_support.cpp - Debian bug #611427
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Wed, 18 Nov 2009 02:42:40 +0000
+
 videolink (1.2.9) unstable; urgency=low
 
   * Add support for XULRunner 1.9.1, requiring a version match down to
diff --git a/Makefile b/Makefile
index c250490..7238b7b 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,9 @@ ifeq ($(shell pkg-config --atleast-version 1.9 mozilla-gtkmozembed-embedding &&
     moz_cppflags_extra := $(shell pkg-config --cflags xulrunner-nspr) -DXPCOM_GLUE_USE_NSPR
     moz_unstable_cppflags_extra :=
     moz_ldflags_extra := $(shell pkg-config --libs xulrunner-nspr)
+    # libxpcomglue needs libdl, but mozilla-gtkmozembed-embedding.pc
+    # doesn't mention it.
+    moz_ldflags_extra += -ldl
 else
     ifeq ($(shell pkg-config --exists xulrunner-gtkmozembed && echo yes),yes)
     moz_name := xulrunner
@@ -40,7 +43,7 @@ CPPFLAGS := -D_REENTRANT
 CXXFLAGS := -ansi -Wall -Wunused
 LDFLAGS := -lpthread                                      	\
            $(shell pkg-config --libs gtkmm-2.4 $(moz_pc))	\
-           $(moz_ldflags_extra) -lexpat
+           $(moz_ldflags_extra) -lexpat -lX11
 
 ifdef NDEBUG
     CPPFLAGS += -DNDEBUG