Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac4
-rw-r--r--lib/python/Makefile.am3
2 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 4dab771..9fce985 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,8 +39,8 @@ if test "x$have_gecko" = xfalse; then
AC_MSG_ERROR([Could not find xulrunner, mozilla or firefox $mozilla_required_version])
fi
-MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
-AC_SUBST(MOZILLA_HOME)
+GECKO_LDFLAGS="-R`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
+AC_SUBST(GECKO_LDFLAGS)
MOZILLA_INCLUDE_DIR="`$PKG_CONFIG --variable=includedir $mozpackage-gtkmozembed`"
AC_SUBST(MOZILLA_INCLUDE_DIR)
diff --git a/lib/python/Makefile.am b/lib/python/Makefile.am
index 096d2d8..94cbfe2 100644
--- a/lib/python/Makefile.am
+++ b/lib/python/Makefile.am
@@ -10,11 +10,12 @@ pkgpyexecdir = $(pythondir)
pkgpyexec_LTLIBRARIES = _sugar.la
-_sugar_la_LDFLAGS = -module -avoid-version -R$(MOZILLA_HOME)
+_sugar_la_LDFLAGS = -module -avoid-version $(GECKO_LDFLAGS)
_sugar_la_LIBADD = \
$(LIB_LIBS) \
$(PYCAIRO_LIBS) \
$(GECKO_LIBS) \
+ $(XPCOMGLUE_LIBS) \
$(top_builddir)/lib/src/libsugarprivate.la
_sugar_la_SOURCES = \