diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-02-15 21:47:35 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-02-16 09:36:48 +0000 |
| commit | 3717bbf31d299a23f0753f01a6bad56656cfbe74 (patch) | |
| tree | 0f2dd5f9b47d5c416c8d45bb202f3d2c04a8587a | |
| parent | 1cc6db3c6014b36c2452b6e382559119c8093884 (diff) | |
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/2174
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
| -rw-r--r-- | README.cross | 3 | ||||
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 25 |
3 files changed, 0 insertions, 29 deletions
diff --git a/README.cross b/README.cross index 474b65cda181..793b316fdffc 100644 --- a/README.cross +++ b/README.cross @@ -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 diff --git a/config_host.mk.in b/config_host.mk.in index b24ea7be601e..e2a0befe8548 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -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@ diff --git a/configure.ac b/configure.ac index e5a7e5dbba4d..8e7fde699180 100644 --- a/configure.ac +++ b/configure.ac @@ -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 \ @@ -12135,25 +12129,6 @@ 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 dnl =================================================================== |