sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make sure to compile against system nspr too

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2007-02-03 15:41:19 -05:00
parent 7813ea318a
commit 15c4843bbb
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -56,6 +56,8 @@ else
# xulrunner 1.8 # xulrunner 1.8
PKG_CHECK_MODULES(NSPR, nspr)
PKG_CHECK_MODULES(GECKO, [xulrunner-gtkmozembed >= 1.8], PKG_CHECK_MODULES(GECKO, [xulrunner-gtkmozembed >= 1.8],
[have_gecko=true; mozpackage=xulrunner], [have_gecko=true; mozpackage=xulrunner],
[ [

2
lib/python/Makefile.am
View File

@ -4,6 +4,7 @@ INCLUDES = \
$(PYCAIRO_CFLAGS) \ $(PYCAIRO_CFLAGS) \
$(LIB_CFLAGS) \ $(LIB_CFLAGS) \
$(GECKO_CFLAGS) \ $(GECKO_CFLAGS) \
$(NSPR_CFLAGS) \
-I$(MOZILLA_INCLUDE_DIR)/gtkembedmoz \ -I$(MOZILLA_INCLUDE_DIR)/gtkembedmoz \
-I$(top_srcdir)/lib/src -I$(top_srcdir)/lib/src
@ -16,6 +17,7 @@ _sugar_la_LIBADD = \
$(LIB_LIBS) \ $(LIB_LIBS) \
$(PYCAIRO_LIBS) \ $(PYCAIRO_LIBS) \
$(GECKO_LIBS) \ $(GECKO_LIBS) \
$(NSPR_LIBS) \
$(XPCOMGLUE_LIBS) \ $(XPCOMGLUE_LIBS) \
$(top_builddir)/lib/src/libsugarprivate.la $(top_builddir)/lib/src/libsugarprivate.la

2
lib/src/Makefile.am
View File

@ -2,6 +2,7 @@ libsugarprivate_la_CPPFLAGS = \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(LIB_CFLAGS) \ $(LIB_CFLAGS) \
$(GECKO_CFLAGS) \ $(GECKO_CFLAGS) \
$(NSPR_CFLAGS) \
-I$(MOZILLA_INCLUDE_DIR)/dom \ -I$(MOZILLA_INCLUDE_DIR)/dom \
-I$(MOZILLA_INCLUDE_DIR)/exthandler \ -I$(MOZILLA_INCLUDE_DIR)/exthandler \
-I$(MOZILLA_INCLUDE_DIR)/gtkembedmoz \ -I$(MOZILLA_INCLUDE_DIR)/gtkembedmoz \
@ -18,6 +19,7 @@ noinst_LTLIBRARIES = libsugarprivate.la
libsugarprivate_la_LIBADD = \ libsugarprivate_la_LIBADD = \
$(LIB_LIBS) \ $(LIB_LIBS) \
$(GECKO_LIBS) \ $(GECKO_LIBS) \
$(NSPR_LIBS) \
-lgstinterfaces-0.10 \ -lgstinterfaces-0.10 \
-lgstaudio-0.10 -lgstaudio-0.10