From 91edd219e3e228dfaa559d524401aceed31329c7 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Thu, 6 Oct 2005 14:58:07 +0000 Subject: Add out private plugin directory to MOZ_PLUGIN_PATH too. 2005-10-06 Christian Persch * configure.ac: * embed/mozilla/Makefile.am: * embed/mozilla/mozilla-embed-single.cpp: Add out private plugin directory to MOZ_PLUGIN_PATH too. --- ChangeLog | 8 ++++++++ configure.ac | 4 ++++ embed/mozilla/Makefile.am | 1 + embed/mozilla/mozilla-embed-single.cpp | 7 +++++-- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 52d0bb348..b1f20a3eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-10-06 Christian Persch + + * 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 * Makefile.am: 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); -- cgit v1.2.3