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

Fix for mozilla built with system nspr

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2007-02-08 13:00:12 +01:00
parent 26d3be7b6c
commit 7034e1d36f
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -52,6 +52,18 @@ AC_SUBST(GECKO_CFLAGS)
AC_DEFINE([HAVE_GECKO_1_9],[1],[Define if we have gecko 1.9]) AC_DEFINE([HAVE_GECKO_1_9],[1],[Define if we have gecko 1.9])
PKG_CHECK_MODULES(NSPR, [nspr],
[have_nspr=true],
[
PKG_CHECK_MODULES(NSPR, [mozilla-nspr],
[have_nspr=true],
have_nspr=false)
])
if test "x$have_nspr" = xfalse; then
AC_MSG_ERROR([Could not find nspr])
fi
else else
# xulrunner 1.8 # xulrunner 1.8

1
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

1
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 \