f052892015
- updated to libreoffice-3.4.2.5 (SUSE 3.4.2-rc2) OBS-URL: https://build.opensuse.org/request/show/80943 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=19
54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
--- extensions/source/plugin/unx/makefile.mk.old 2011-05-20 18:05:12.000000000 +0200
|
|
+++ extensions/source/plugin/unx/makefile.mk 2011-08-29 16:36:14.000000000 +0200
|
|
@@ -48,7 +48,7 @@ INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr
|
|
CDEFS+=-DOJI
|
|
.ENDIF
|
|
|
|
-.IF "$(WITH_MOZILLA)" != "NO"
|
|
+.IF "$(WITH_MOZILLA)" != "NO" && "$(WITH_MOZILLA_XUL)" != "NO"
|
|
|
|
.IF "$(DISABLE_XAW)" == "TRUE"
|
|
CDEFS+=-DDISABLE_XAW
|
|
--- extensions/source/plugin/base/makefile.mk.old 2011-05-20 18:05:12.000000000 +0200
|
|
+++ extensions/source/plugin/base/makefile.mk 2011-08-29 14:57:18.000000000 +0200
|
|
@@ -44,7 +44,7 @@ CDEFS+=-DOJI
|
|
CDEFS+=-DDISABLE_XAW
|
|
.ENDIF
|
|
|
|
-.IF "$(WITH_MOZILLA)" != "NO"
|
|
+.IF "$(WITH_MOZILLA)" != "NO" && "$(WITH_MOZILLA_XUL)" != "NO"
|
|
|
|
.IF "$(GUIBASE)"=="aqua"
|
|
CFLAGSCXX+=$(OBJCXXFLAGS)
|
|
--- extensions/source/plugin/util/makefile.pmk.old 2011-05-19 11:11:12.000000000 +0200
|
|
+++ extensions/source/plugin/util/makefile.pmk 2011-08-29 14:58:04.000000000 +0200
|
|
@@ -28,7 +28,7 @@ NOUNODOC=true
|
|
|
|
.INCLUDE : settings.mk
|
|
|
|
-.IF "$(SYSTEM_MOZILLA)" == "YES"
|
|
+.IF "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA_XUL)" != "NO"
|
|
CFLAGS+=-DSYSTEM_MOZILLA
|
|
PKGCONFIG_MODULES+=$(MOZ_FLAVOUR)-plugin
|
|
.ENDIF
|
|
--- extensions/source/plugin/util/makefile.mk.old 2011-05-19 11:11:12.000000000 +0200
|
|
+++ extensions/source/plugin/util/makefile.mk 2011-08-29 16:30:52.000000000 +0200
|
|
@@ -36,7 +36,7 @@ TARGETTYPE=GUI
|
|
|
|
# --- Files --------------------------------------------------------
|
|
|
|
-.IF "$(WITH_MOZILLA)" != "NO"
|
|
+.IF "$(WITH_MOZILLA)" != "NO" && "$(WITH_MOZILLA_XUL)" != "NO"
|
|
|
|
LIB1TARGET = $(SLB)$/plall.lib
|
|
LIB1FILES = \
|
|
@@ -91,7 +91,7 @@ SHL1STDLIBS+=$(X11LINK_DYNAMIC)
|
|
|
|
SHL1STDLIBS+=$(SHL1OWNLIBS)
|
|
|
|
-.ENDIF # $(WITH_MOZILLA) != "NO"
|
|
+.ENDIF # $(WITH_MOZILLA) != "NO" && "$(WITH_MOZILLA_XUL)" != "NO"
|
|
|
|
# --- Targets ------------------------------------------------------
|
|
|