Kaydet (Commit) 33a6f881 authored tarafından Matúš Kukan's avatar Matúš Kukan

bin --enable-oxygenoffice; it does nothing

Change-Id: Ibac9b92f5833253d6485009e0ea8ea11f2b8ed91
üst 4db2a6f6
......@@ -179,7 +179,6 @@ $(fetch_LOGFILE): $(SRCDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)/Make
$(OOOP_GALLERY_PACK) \
$(OOOP_SAMPLES_PACK) \
$(OOOP_TEMPLATES_PACK) \
$(OXYGENOFFICE_PACK) \
$(SUNTEMPLATES_DE_PACK) \
$(SUNTEMPLATES_EN_US_PACK) \
$(SUNTEMPLATES_ES_PACK) \
......
......@@ -151,7 +151,6 @@ export ENABLE_NPAPI_FROM_BROWSER=@ENABLE_NPAPI_FROM_BROWSER@
export ENABLE_NPAPI_INTO_BROWSER=@ENABLE_NPAPI_INTO_BROWSER@
export ENABLE_ONLINE_UPDATE=@ENABLE_ONLINE_UPDATE@
export ENABLE_OPENGL=@ENABLE_OPENGL@
export ENABLE_OXYGENOFFICE=@ENABLE_OXYGENOFFICE@
export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
export ENABLE_QUICKSTART_LIBPNG=@ENABLE_QUICKSTART_LIBPNG@
export ENABLE_RANDR=@ENABLE_RANDR@
......@@ -432,7 +431,6 @@ export OUTDIR=@OUTDIR@
export OUTDIR_FOR_BUILD=@OUTDIR_FOR_BUILD@
export OUTPATH=@OUTPATH@
export OUTPATH_FOR_BUILD=@OUTPATH_FOR_BUILD@
export OXYGENOFFICE_PACK=@OXYGENOFFICE_PACK@
export PATH=@LO_PATH@
export PATH_SEPERATOR=@P_SEP@
export PERL=@PERL@
......
......@@ -1057,11 +1057,6 @@ AC_ARG_ENABLE(extra-font,
[Add extra font content.]),
,)
AC_ARG_ENABLE(oxygenoffice,
AS_HELP_STRING([--enable-oxygenoffice],
[Download OxygenOffice branding and set custom settings.]),
,)
AC_ARG_ENABLE(lomenubar,
AS_HELP_STRING([--enable-lomenubar],
[Enable global menu support.]),
......@@ -11128,22 +11123,6 @@ fi
AC_SUBST(WITH_EXTRA_FONT)
AC_SUBST(OOOP_FONTS_PACK)
dnl ===================================================================
dnl Test whether to download OxygenOffice branding and set custom settings
dnl ===================================================================
AC_MSG_CHECKING([whether to download OxygenOffice branding and set custom settings])
if test "$enable_oxygenoffice" = "" -o "$enable_oxygenoffice" = "no"; then
AC_MSG_RESULT([no])
ENABLE_OXYGENOFFICE=NO
else
AC_MSG_RESULT([yes])
ENABLE_OXYGENOFFICE=YES
OXYGENOFFICE_PACK="18bf204479ff641d99a88cd71f6f25f7-oxygenoffice-001.zip"
BUILD_TYPE="$BUILD_TYPE OXYGENOFFICE"
fi
AC_SUBST(ENABLE_OXYGENOFFICE)
AC_SUBST(OXYGENOFFICE_PACK)
dnl ===================================================================
dnl Test whether to enable online update service
dnl ===================================================================
......
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