Define XPCOM_GLUE_USE_NSPR, link against nspr (closes: #611389).

Patch by Nobuhiro Iwamatsu.

diff --git a/Makefile b/Makefile
index b9b794e98d71f5feee19a39f6304a441c21a627f..c2504909dda5fb253024b6b09370970adcb9edf5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,9 @@ 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
 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_unstable_cppflags_extra :=

-    moz_ldflags_extra :=
+    moz_ldflags_extra := $(shell pkg-config --libs xulrunner-nspr)

 else
     ifeq ($(shell pkg-config --exists xulrunner-gtkmozembed && echo yes),yes)
     moz_name := xulrunner
 else
     ifeq ($(shell pkg-config --exists xulrunner-gtkmozembed && echo yes),yes)
     moz_name := xulrunner

diff --git a/debian/changelog b/debian/changelog
index f767978944c67838b622343a0030852f1faeedf4..9714072c826d7773c6c7623a97022d51c7eb12bd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+videolink (1.2.9-2.1) UNRELEASED; urgency=high
+
+  * Define XPCOM_GLUE_USE_NSPR, link against nspr (closes: #611389).  Patch by
+    Nobuhiro Iwamatsu.
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 02 Feb 2011 15:19:38 +0100
+

 videolink (1.2.9-2) unstable; urgency=low
 
   * Use dh_xulrunner to determine xulrunner dependency
 videolink (1.2.9-2) unstable; urgency=low
 
   * Use dh_xulrunner to determine xulrunner dependency