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 dffaad73c7e8c5383c6b942adce01868d0bf324b..7d3e9bace2153a844ce7578b4e8444d5065bf9ca 100644 (file)
--- 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 c2504909dda5fb253024b6b09370970adcb9edf5..7238b7b3739ca5aa4ec7fdf4cd8f2d499713bf65 100644 (file)
--- 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