diff options
| -rw-r--r-- | embed/xulrunner/embed/Makefile.am | 1 | ||||
| -rw-r--r-- | embed/xulrunner/embed/mozilla-embed-single.cpp | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 5 insertions, 1 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 diff --git a/src/Makefile.am b/src/Makefile.am index 59d822b9c..50ef94c1b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -240,7 +240,7 @@ epiphany_LDADD += \ if WITH_XULRUNNER_ENGINE epiphany_LDFLAGS += -R$(LIBXUL_LIBDIR) -epiphany_LDADD += $(LIBXUL_LIBS) +epiphany_LDADD += $(LIBXUL_LIBS) -lxpcomglue endif if WITH_GECKO_ENGINE |