Kaydet (Commit) 11fc708e authored tarafından David Ostrovsky's avatar David Ostrovsky Kaydeden (comit) Michael Stahl

Remove left over references to SYSTEM_MOZILLA

In a0c53a96 SYSTEM_MOZILLA was removed.

Change-Id: I421a293c7611dd5ed0d810c9c8a80f19faf1689a
Reviewed-on: https://gerrit.libreoffice.org/19580Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
Tested-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 4fc31c15
......@@ -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 \
......
......@@ -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 \
......
......@@ -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" {
......
......@@ -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";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment