aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2007-09-15 03:04:24 +0800
committerChristian Persch <chpe@src.gnome.org>2007-09-15 03:04:24 +0800
commit9beff541dd10f3bd31bca94dd6887a2c51a1e028 (patch)
tree317b6413c4dd97512fef04f8e26be2e1b96dfb1f /embed
parenta0dfce74bd24097c0f12dee6f403e82c45fa6ca6 (diff)
downloadgsoc2013-epiphany-9beff541dd10f3bd31bca94dd6887a2c51a1e028.tar
gsoc2013-epiphany-9beff541dd10f3bd31bca94dd6887a2c51a1e028.tar.gz
gsoc2013-epiphany-9beff541dd10f3bd31bca94dd6887a2c51a1e028.tar.bz2
gsoc2013-epiphany-9beff541dd10f3bd31bca94dd6887a2c51a1e028.tar.lz
gsoc2013-epiphany-9beff541dd10f3bd31bca94dd6887a2c51a1e028.tar.xz
gsoc2013-epiphany-9beff541dd10f3bd31bca94dd6887a2c51a1e028.tar.zst
gsoc2013-epiphany-9beff541dd10f3bd31bca94dd6887a2c51a1e028.zip
Link to the XPCOM glue and set GRE_HOME on startup, until I can figure out
what's our linking story wrt. XPCOM glue. svn path=/trunk/; revision=7440
Diffstat (limited to 'embed')
-rw-r--r--embed/xulrunner/embed/Makefile.am1
-rw-r--r--embed/xulrunner/embed/mozilla-embed-single.cpp3
2 files changed, 4 insertions, 0 deletions
diff --git a/embed/xulrunner/embed/Makefile.am b/embed/xulrunner/embed/Makefile.am
index 30295708a..4e6375ee0 100644
--- a/embed/xulrunner/embed/Makefile.am
+++ b/embed/xulrunner/embed/Makefile.am
@@ -48,6 +48,7 @@ libephyxulrunnerembed_la_CPPFLAGS = \
-DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
-DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\" \
-DALLOW_PRIVATE_API \
+ -DLIBXUL_LIBDIR="\"$(LIBXUL_LIBDIR)\"" \
$(LIBXUL_CXXCPPFLAGS) \
$(LIBXUL_INCLUDES) \
$(AM_CPPFLAGS)
diff --git a/embed/xulrunner/embed/mozilla-embed-single.cpp b/embed/xulrunner/embed/mozilla-embed-single.cpp
index 7b2d5ce47..ad8448be8 100644
--- a/embed/xulrunner/embed/mozilla-embed-single.cpp
+++ b/embed/xulrunner/embed/mozilla-embed-single.cpp
@@ -590,6 +590,9 @@ impl_init (EphyEmbedSingle *esingle)
// gecko_embed_set_comp_path (MOZILLA_HOME);
+ /* FIXMEchpe remove this hack! */
+ g_setenv ("GRE_HOME", LIBXUL_LIBDIR, TRUE);
+
static const GREVersionRange greVersion = {
"1.9a", PR_TRUE,
"2", PR_TRUE