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

diff --git a/ChangeLog b/ChangeLog
index dffaad73c7e8c5383c6b942adce01868d0bf324b..4b1bb2f1552883ede2c0bb0cdfd3f8f86d6e9911 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+videolink (1.2.10) UNRELEASED; urgency=low
+
+  * 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
+
+ -- 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 b9b794e98d71f5feee19a39f6304a441c21a627f..72ce8390958b463dc5a16a04b2a6e5faa9494ec5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,9 @@ ifeq ($(shell pkg-config --atleast-version 1.9 mozilla-gtkmozembed-embedding &&
     moz_pc := mozilla-gtkmozembed-embedding
     moz_cppflags_extra := $(shell pkg-config --cflags xulrunner-nspr)
     moz_unstable_cppflags_extra :=
-    moz_ldflags_extra :=
+    # 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 +42,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