diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-11-07 14:29:05 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-11-07 14:29:05 +0000 |
| commit | f949b3b5b3994cc851122f86069599412a86a6c2 (patch) | |
| tree | 04d8c0e244e0fbcad369d1b5eefc91d0bbf068d6 /config_office | |
| parent | 272acde86b0b0c31779d60b5d296ba6a03acdba7 (diff) | |
INTEGRATION: CWS gtkquickstart2 (1.181.6); FILE MERGED
2006/10/31 16:21:24 pmladek 1.181.6.3: #i70644#
build libegg only when systray quickstarter is enabled
2006/10/24 18:18:12 pmladek 1.181.6.2: #i70644#
fix typo; ENABLE_SYSTRAY_UNX was used instead of ENABLE_SYSTRAY_GTK on two locations
2006/10/20 11:02:19 mmeeks 1.181.6.1: Issue: i#70644#
Disable quickstarter by default (Sun build), and add configure option to disable it too
Diffstat (limited to 'config_office')
| -rw-r--r-- | config_office/configure.in | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/config_office/configure.in b/config_office/configure.in index 22a0c2479db0..89c8111c5649 100644 --- a/config_office/configure.in +++ b/config_office/configure.in @@ -3,7 +3,7 @@ dnl * vi:set sw=3 ts=3 et: dnl * dnl * Name: configure.in dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland -dnl * Date: $Date: 2006-11-01 13:49:31 $ +dnl * Date: $Date: 2006-11-07 15:29:05 $ dnl * dnl * Desc: This file serves as input for the GNU autoconf package dnl * in order to create a configure script. @@ -12,7 +12,7 @@ dnl * necessary to build OpenOffice.org dnl * dnl * dnl ******************************************************************/ -AC_REVISION( $Revision: 1.186 $ ) +AC_REVISION( $Revision: 1.187 $ ) AC_PREREQ(2.50) AC_INIT() echo "$@" >config.parms @@ -179,6 +179,9 @@ AC_ARG_ENABLE(gtk, [ --disable-gtk Determines whether to use Gtk+ vclplug on platforms where Gtk+ is available. ],,enable_gtk=yes) +AC_ARG_ENABLE(systray, +[ --disable-systray Determines whether to build the systray quickstarter. +],,enable_systray=yes) AC_ARG_ENABLE(cairo, [ --enable-cairo Determines whether to use Cairo canvas backend on platforms where Cairo is available. @@ -4479,6 +4482,7 @@ dnl =================================================================== GTK_CFLAGS="" GTK_LIBS="" +ENABLE_SYSTRAY_GTK="" if test "$test_gtk" = "yes"; then if test "$ENABLE_GTK" = "TRUE" ; then @@ -4487,9 +4491,15 @@ if test "$test_gtk" = "yes"; then GTK_CFLAGS="$GTK_CFLAGS $GDKPIXBUF_CFLAGS" GTK_LIBS="$GTK_LIBS $GDKPIXBUF_LIBS" BUILD_TYPE="$BUILD_TYPE GTK" + + if test "x$enable_systray" = "xyes"; then + ENABLE_SYSTRAY_GTK="TRUE" + BUILD_TYPE="$BUILD_TYPE SYSTRAY_GTK" + fi fi fi +AC_SUBST(ENABLE_SYSTRAY_GTK) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) |