Merge remote branch 'jcristau/master'

[videolink.git] / Makefile

diff --git a/Makefile b/Makefile
index b9b794e98d71f5feee19a39f6304a441c21a627f..7238b7b3739ca5aa4ec7fdf4cd8f2d499713bf65 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,12 @@ mandir := $(sharedir)/man
 ifeq ($(shell pkg-config --atleast-version 1.9 mozilla-gtkmozembed-embedding && echo yes),yes)
     moz_name := xulrunner-1.9
     moz_pc := mozilla-gtkmozembed-embedding
-    moz_cppflags_extra := $(shell pkg-config --cflags xulrunner-nspr)
+    moz_cppflags_extra := $(shell pkg-config --cflags xulrunner-nspr) -DXPCOM_GLUE_USE_NSPR
     moz_unstable_cppflags_extra :=
-    moz_ldflags_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