diff options
| author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-02-03 20:41:19 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-02-03 20:41:19 (GMT) |
| commit | 15c4843bbb2ceea9a875dcb7ee6f4041ed66c666 (patch) | |
| tree | d872bd947d9b651e123866b24612338f96776b56 | |
| parent | 7813ea318a54782a388450f08ed856a13c01429f (diff) | |
Make sure to compile against system nspr too
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | lib/python/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/src/Makefile.am | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 9163a6a..4dccd58 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 7d24950..584d8f1 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 407b469..0e60ee8 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 |