diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | embed/mozilla/Makefile.am | 1 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 7 |
4 files changed, 18 insertions, 2 deletions
@@ -1,5 +1,13 @@ 2005-10-06 Christian Persch <chpe@cvs.gnome.org> + * configure.ac: + * embed/mozilla/Makefile.am: + * embed/mozilla/mozilla-embed-single.cpp: + + Add out private plugin directory to MOZ_PLUGIN_PATH too. + +2005-10-06 Christian Persch <chpe@cvs.gnome.org> + * Makefile.am: * configure.ac: * plugins/.cvsignore: diff --git a/configure.ac b/configure.ac index 44d38648c..878fd209f 100644 --- a/configure.ac +++ b/configure.ac @@ -664,6 +664,10 @@ if test "x$enable_desktop_file_plugin" = "xyes"; then AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_LIBS]) fi +if test "x$enable_desktop_file_plugin" = "xyes"; then + AC_DEFINE([HAVE_PRIVATE_PLUGINS],[1],[Define if any private plugins are enabled]) +fi + dnl ******************* dnl Additional features dnl ******************* diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am index ae1585ca2..fd10910fe 100644 --- a/embed/mozilla/Makefile.am +++ b/embed/mozilla/Makefile.am @@ -116,6 +116,7 @@ libephymozillaembed_la_CPPFLAGS = \ -I$(MOZILLA_INCLUDE_ROOT) \ $(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \ -DSHARE_DIR=\"$(pkgdatadir)\" \ + -DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \ -DMOZILLA_HOME=\"$(MOZILLA_HOME)\" \ -DMOZILLA_PREFIX=\"$(MOZILLA_PREFIX)\" \ -DALLOW_PRIVATE_API \ diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index 34cc1f0d5..f01fbcab3 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -356,8 +356,11 @@ mozilla_init_plugin_path () user_path = g_getenv ("MOZ_PLUGIN_PATH"); new_path = g_strconcat (user_path ? user_path : "", user_path ? ":" : "", - MOZILLA_PREFIX "/lib/mozilla/plugins:" - MOZILLA_HOME "/plugins", + MOZILLA_PREFIX "/lib/mozilla/plugins" + ":" MOZILLA_HOME "/plugins", +#ifdef HAVE_PRIVATE_PLUGINS + ":" PLUGINDIR, +#endif NULL); g_setenv ("MOZ_PLUGIN_PATH", new_path, TRUE); |