[PATCH] remove zenity configure option

[Matúš Kukan (via_Code_Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2174

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/74/2174/1

remove zenity configure option

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

Change-Id: I7769528af7987e43fee8707ce5b4e2214d43c5b4
---
M README.cross
M config_host.mk.in
M configure.ac
3 files changed, 0 insertions(+), 29 deletions(-)



diff --git a/README.cross b/README.cross
index 474b65c..793b316 100644
--- a/README.cross
+++ b/README.cross
@@ -150,7 +150,6 @@
 --disable-mozilla
 --disable-nss-module
 --disable-pdfimport
---disable-zenity
 --enable-python=system
 --with-system-altlinuxhyph
 --with-system-boost
@@ -338,7 +337,6 @@
 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 @@
 --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 b24ea7b..e2a0bef 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -169,7 +169,6 @@
 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 e5a7e5d..8e7fde6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1042,11 +1042,6 @@
          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 @@
     ./configure \
         --disable-graphite \
         --disable-postgresql-sdbc \
-        --disable-zenity \
         --with-parallelism="$with_parallelism" \
         --without-doxygen \
         ENABLE_PDFIMPORT=FALSE \
@@ -12133,25 +12127,6 @@
     AC_MSG_RESULT([not set])
 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

-- 
To view, visit https://gerrit.libreoffice.org/2174
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7769528af7987e43fee8707ce5b4e2214d43c5b4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan <matus.kukan at gmail.com>