Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac12
-rw-r--r--lib/python/Makefile.am1
-rw-r--r--lib/src/Makefile.am1
3 files changed, 14 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 9163a6a..0b2de6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,18 @@ AC_SUBST(GECKO_CFLAGS)
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
# xulrunner 1.8
diff --git a/lib/python/Makefile.am b/lib/python/Makefile.am
index 7d24950..a95299d 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
diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am
index 407b469..4fb3431 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 \