Kaydet (Commit) 3717bbf3 authored tarafından Matúš Kukan's avatar Matúš Kukan Kaydeden (comit) Tor Lillqvist

remove zenity configure option

It has served well but it's useless nowadays.
build.pl is going to die anyway.

Change-Id: I7769528af7987e43fee8707ce5b4e2214d43c5b4
Reviewed-on: https://gerrit.libreoffice.org/2174Reviewed-by: 's avatarTor Lillqvist <tml@iki.fi>
Tested-by: 's avatarTor Lillqvist <tml@iki.fi>
üst 1cc6db3c
......@@ -150,7 +150,6 @@ CXX_FOR_BUILD=ccache g++
--disable-mozilla
--disable-nss-module
--disable-pdfimport
--disable-zenity
--enable-python=system
--with-system-altlinuxhyph
--with-system-boost
......@@ -338,7 +337,6 @@ v7a System Image, and the Android Support Library.
Here is an autogen.lastrun for Android, when cross-compiling from Mac
OS X 10.8 with Xcode 4.4.1:
--disable-zenity
--enable-debug
--enable-werror
--with-android-ndk=/Users/tml/android-ndk-r8b
......@@ -364,7 +362,6 @@ And here is an autogen.lastrun for Android when cross-compiling to x86 from Linu
--with-android-sdk=/opt/libreoffice/android-sdk-linux
--build=i586-suse-linux
--enable-ccache
--disable-zenity
--with-distro=LibreOfficeAndroidX86
--with-num-cpus=6
--with-max-jobs=6
......
......@@ -169,7 +169,6 @@ export ENABLE_TDE=@ENABLE_TDE@
export ENABLE_TDEAB=@ENABLE_TDEAB@
export ENABLE_TELEPATHY=@ENABLE_TELEPATHY@
export ENABLE_VALGRIND=@ENABLE_VALGRIND@
export ENABLE_ZENITY=@ENABLE_ZENITY@
export EPM=@EPM@
export EPM_FLAGS=@EPM_FLAGS@
export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@
......
......@@ -1042,11 +1042,6 @@ AC_ARG_ENABLE(icecream,
wrappers, you can override that using --with-gcc-home=/the/path switch.]),
,)
AC_ARG_ENABLE(zenity,
AS_HELP_STRING([--disable-zenity],
[Do not display a build icon in the notification area (on unix) during build.]),
,enable_zenity=yes)
AC_ARG_ENABLE(cups,
AS_HELP_STRING([--disable-cups],
[Do not build cups support.])
......@@ -4250,7 +4245,6 @@ if test "$cross_compiling" = "yes"; then
./configure \
--disable-graphite \
--disable-postgresql-sdbc \
--disable-zenity \
--with-parallelism="$with_parallelism" \
--without-doxygen \
ENABLE_PDFIMPORT=FALSE \
......@@ -12134,25 +12128,6 @@ else
fi
AC_SUBST(VERBOSE)
dnl ===================================================================
dnl Use zenity during build
dnl ===================================================================
AC_MSG_CHECKING([whether to use zenity during build])
if test "$enable_zenity" = "yes"; then
AC_MSG_RESULT([yes])
AC_PATH_PROGS( ZNTY, zenity )
if test -z "$ZNTY"; then
ENABLE_ZENITY=FALSE
else
ENABLE_ZENITY=TRUE
fi
else
ENABLE_ZENITY=FALSE
AC_MSG_RESULT([no])
fi
AC_SUBST(ENABLE_ZENITY)
dnl ===================================================================
dnl Hook up LibreOffice's nodep environmental variable to automake's equivalent
dnl --enable-dependency-tracking configure option
......
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