From 15c4843bbb2ceea9a875dcb7ee6f4041ed66c666 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sat, 3 Feb 2007 15:41:19 -0500 Subject: [PATCH] Make sure to compile against system nspr too --- configure.ac | 2 ++ lib/python/Makefile.am | 2 ++ lib/src/Makefile.am | 2 ++ 3 files changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac index 9163a6a6..4dccd580 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,8 @@ else # xulrunner 1.8 +PKG_CHECK_MODULES(NSPR, nspr) + PKG_CHECK_MODULES(GECKO, [xulrunner-gtkmozembed >= 1.8], [have_gecko=true; mozpackage=xulrunner], [ diff --git a/lib/python/Makefile.am b/lib/python/Makefile.am index 7d249501..584d8f17 100644 --- a/lib/python/Makefile.am +++ b/lib/python/Makefile.am @@ -4,6 +4,7 @@ INCLUDES = \ $(PYCAIRO_CFLAGS) \ $(LIB_CFLAGS) \ $(GECKO_CFLAGS) \ + $(NSPR_CFLAGS) \ -I$(MOZILLA_INCLUDE_DIR)/gtkembedmoz \ -I$(top_srcdir)/lib/src @@ -16,6 +17,7 @@ _sugar_la_LIBADD = \ $(LIB_LIBS) \ $(PYCAIRO_LIBS) \ $(GECKO_LIBS) \ + $(NSPR_LIBS) \ $(XPCOMGLUE_LIBS) \ $(top_builddir)/lib/src/libsugarprivate.la diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am index 407b4690..0e60ee81 100644 --- a/lib/src/Makefile.am +++ b/lib/src/Makefile.am @@ -2,6 +2,7 @@ libsugarprivate_la_CPPFLAGS = \ $(WARN_CFLAGS) \ $(LIB_CFLAGS) \ $(GECKO_CFLAGS) \ + $(NSPR_CFLAGS) \ -I$(MOZILLA_INCLUDE_DIR)/dom \ -I$(MOZILLA_INCLUDE_DIR)/exthandler \ -I$(MOZILLA_INCLUDE_DIR)/gtkembedmoz \ @@ -18,6 +19,7 @@ noinst_LTLIBRARIES = libsugarprivate.la libsugarprivate_la_LIBADD = \ $(LIB_LIBS) \ $(GECKO_LIBS) \ + $(NSPR_LIBS) \ -lgstinterfaces-0.10 \ -lgstaudio-0.10