diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 13:35:07 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 13:35:07 +0000 |
| commit | 2a6e7c173c30437957b16564f1950bf01fd8552f (patch) | |
| tree | c9cbaeed8d72f1308e1d0f0dd411673f19175a3f /config_office | |
| parent | 50b6d277297201e32f0fc60aeb3eabacf1cb7ab4 (diff) | |
INTEGRATION: CWS headless01 (1.201.4); FILE MERGED
2007/05/09 07:09:59 cmc 1.201.4.2: #i76958# add unix headless vcl plug
2007/05/08 12:25:55 cmc 1.201.4.1: #i76958# add configure support for unix headless vcl plug
Diffstat (limited to 'config_office')
| -rw-r--r-- | config_office/configure.in | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/config_office/configure.in b/config_office/configure.in index d059442e7326..af381f6dd67b 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: 2007-05-25 11:09:50 $ +dnl * Date: $Date: 2007-05-25 14:35:07 $ 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.205 $ ) +AC_REVISION( $Revision: 1.206 $ ) AC_PREREQ(2.50) AC_INIT() echo "$@" >config.parms @@ -197,6 +197,10 @@ AC_ARG_ENABLE(gtk, [ --disable-gtk Determines whether to use Gtk+ vclplug on platforms where Gtk+ is available. ],,enable_gtk=yes) +AC_ARG_ENABLE(headless, +[ --disable-headless Determines whether to use headless vclplug on + platforms where Glib is available. +],,enable_headless=yes) AC_ARG_ENABLE(systray, [ --disable-systray Determines whether to build the systray quickstarter. ],,enable_systray=yes) @@ -4624,6 +4628,13 @@ if test "x$enable_gtk" = "xyes"; then fi AC_SUBST(ENABLE_GTK) +ENABLE_HEADLESS="" +if test "x$enable_headless" = "xyes"; then + ENABLE_HEADLESS="TRUE" + R="$R svp" +fi +AC_SUBST(ENABLE_HEADLESS) + ENABLE_KDE="" if test "x$enable_kde" = "xyes"; then ENABLE_KDE="TRUE" @@ -4672,6 +4683,10 @@ if test "$test_gtk" = "yes"; then fi fi + if test "$ENABLE_HEADLESS" = "TRUE" ; then + PKG_CHECK_MODULES(GLIB, glib-2.0 ,,AC_MSG_ERROR([requirements to build the headless-plugin not met. Use --disable-headless or install the missing packages])) + fi + fi AC_SUBST(ENABLE_SYSTRAY_GTK) AC_SUBST(GTK_CFLAGS) |