diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-12-12 14:36:54 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-12-12 14:36:54 +0000 |
| commit | b8aee6514ddb3870606c518cc826499b8a35a5d1 (patch) | |
| tree | 24d7eda597e3f0959aeb3701a5995889b4cdc30d /config_office/configure.in | |
| parent | 0a094474def6fb22c19e2672b7e9b93e861c8105 (diff) | |
INTEGRATION: CWS nowrapcmd1 (1.220.10); FILE MERGED
2007/11/30 20:22:49 vq 1.220.10.4: RESYNC: (1.227-1.232); FILE MERGED
2007/11/18 15:23:02 vq 1.220.10.3: #i82202# Make the build without guw the default, but provide a configure
switch --enable-wrapcmd to enable its use until it is completely removed.
2007/11/08 20:49:19 vq 1.220.10.2: RESYNC: (1.220-1.227); FILE MERGED
2007/10/07 15:37:18 vq 1.220.10.1: #i82202# Add --disable-wrapcmd switch to configure to disable the use of
guw.exe (WRAPCMD). Change set_soenv to generate the environment file
according to the settings of --disable-wrapcmd and --with-use-shell.
Diffstat (limited to 'config_office/configure.in')
| -rw-r--r-- | config_office/configure.in | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/config_office/configure.in b/config_office/configure.in index bd1fad0ad90b..797b02d4f5d5 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-12-12 15:35:15 $ +dnl * Date: $Date: 2007-12-12 15:36:54 $ 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.236 $ ) +AC_REVISION( $Revision: 1.237 $ ) AC_PREREQ(2.50) AC_INIT() echo "$@" >config.parms @@ -37,6 +37,12 @@ AC_ARG_WITH(openldap, [ --with-openldap Enables the use of the OpenLDAP LDAP SDK instead of the Netscape/Mozilla one ],,) +AC_ARG_ENABLE(wrapcmd, +[ --enable-wrapcmd Enables the use of the WRAPCMD macro again. Use this to work around + build issues only. Report problems immediately! + This option will be removed in the near future. +],if test x$enable_wrapcmd = xno; then NOWRAPCMD=yes; fi, NOWRAPCMD=yes) +AC_SUBST(NOWRAPCMD) AC_ARG_ENABLE(lockdown, [ --enable-lockdown Enables the gconf integration work in OOo ],,) |