diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-26 16:48:38 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-26 16:48:38 +0000 |
| commit | 59e575d3ea15f823a147f748176ccc69d3d59cd3 (patch) | |
| tree | 48edf5100c54e12fe4ebd3d55b0ae04c62ca4caa | |
| parent | b7dc9e0ff896a05b238e06fefb31c47d25d1d5b1 (diff) | |
INTEGRATION: CWS ause081 (1.206.8); FILE MERGED
2007/06/14 15:20:56 hjs 1.206.8.1: #i78439# - remove remains of jam pilot
| -rw-r--r-- | config_office/configure.in | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/config_office/configure.in b/config_office/configure.in index 1d2b145cb248..69cb3ec84cd5 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-06-18 16:36:20 $ +dnl * Date: $Date: 2007-06-26 17:48:38 $ 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.209 $ ) +AC_REVISION( $Revision: 1.210 $ ) AC_PREREQ(2.50) AC_INIT() echo "$@" >config.parms @@ -644,10 +644,6 @@ AC_ARG_WITH(alloc, (choices are oo, system, tcmalloc) ],,) -AC_ARG_ENABLE(jam-build, -[ --enable-jam EXPERIMENTAL: Enables the prototype jam build system -],,) - BUILD_TYPE="OOo EXT" dnl =================================================================== @@ -5279,24 +5275,6 @@ fi AC_SUBST(ENABLE_STATIC_GTK) dnl =================================================================== -dnl Test if we should enable the experimental jam build -dnl =================================================================== - -AC_MSG_CHECKING([whether to enable prototype jam build]) -ENABLE_JAM="" -if test -n "$enable_jam"; then - if test "$enable_jam" = "no"; then - AC_MSG_RESULT([no]) - else - AC_MSG_RESULT([yes]) - ENABLE_JAM="TRUE" - fi -else - AC_MSG_RESULT([no]) -fi -AC_SUBST(ENABLE_JAM) - -dnl =================================================================== dnl Setting up the environment. dnl =================================================================== echo "********************************************************************" |