summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--extensions/Library_pl.mk6
-rw-r--r--extensions/StaticLibrary_plugcon.mk6
-rw-r--r--extensions/source/plugin/inc/plugin/unx/plugcon.hxx6
-rwxr-xr-xsolenv/bin/ooinstall5
4 files changed, 0 insertions, 23 deletions
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index 680877ca4556..82a71d6bcdbe 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -32,12 +32,6 @@ $(eval $(call gb_Library_add_defs,pl,\
endif # ENABLE_JAVA=YES
-ifeq ($(SYSTEM_MOZILLA),YES)
-$(eval $(call gb_Library_add_defs,pl,\
- -DSYSTEM_MOZILLA \
-))
-endif # SYSTEM_MOZILLA=YES
-
ifeq ($(OS),SOLARIS)
$(eval $(call gb_Library_add_libs,pl,\
-lsocket \
diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk
index 4992309c62cc..149e86b05925 100644
--- a/extensions/StaticLibrary_plugcon.mk
+++ b/extensions/StaticLibrary_plugcon.mk
@@ -36,12 +36,6 @@ $(eval $(call gb_StaticLibrary_add_defs,plugcon,\
endif # ENABLE_JAVA=YES
-ifeq ($(SYSTEM_MOZILLA),YES)
-$(eval $(call gb_StaticLibrary_add_defs,plugcon,\
- -DSYSTEM_MOZILLA \
-))
-endif # SYSTEM_MOZILLA=YES
-
ifeq ($(ENABLE_GTK),TRUE)
$(eval $(call gb_StaticLibrary_add_defs,plugcon,\
-DENABLE_GTK \
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index 07932960f91f..ad3fc67d7126 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -55,12 +55,6 @@ extern "C" {
#endif
#define MOZ_X11
#include <stdio.h>
-#ifdef SYSTEM_MOZILLA
-#ifndef OJI
-# define OJI
-#endif
-#define MOZ_X11
-#endif
#if ! defined ( _NPAPI_H_) && ! defined (npapi_h_)
extern "C" {
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 04de7abbccbb..f9034cdc6c78 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -35,11 +35,6 @@ if (defined($ENV{TMPDIR})) {
}
if (!-d $tmp_dir) {die "Set TMPDIR!\n";}
-# Workaround for system Mozilla
-if ($ENV{'SYSTEM_MOZILLA'} eq 'YES') {
- $ENV{'LD_LIBRARY_PATH'} = "$ENV{'MOZ_LIB'}:$ENV{'LD_LIBRARY_PATH'}";
-}
-
for $arg (@ARGV) {
if ($arg eq '-s' || $arg eq '--strip') {
$strip = "-strip";