From 9beff541dd10f3bd31bca94dd6887a2c51a1e028 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Fri, 14 Sep 2007 19:04:24 +0000 Subject: 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 --- embed/xulrunner/embed/Makefile.am | 1 + embed/xulrunner/embed/mozilla-embed-single.cpp | 3 +++ 2 files changed, 4 insertions(+) (limited to 'embed') 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 -- cgit v1.2.3