summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2005-09-23 12:48:01 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2005-09-23 12:48:01 +0000
commit782a14148cc291a846b16340562f47801014fb4f (patch)
tree46be3276dd850287a97b3543dffc304c0c992aed
parentcbcee58117fbec71d6d30d6ef281698331fe34d9 (diff)
INTEGRATION: CWS cmcfixes18 (1.135.4); FILE MERGED
2005/09/05 09:48:48 cmc 1.135.4.3: #i54220# add SABLOT build types 2005/09/05 09:41:49 cmc 1.135.4.2: #i54220# add BERKELEYDB build types 2005/09/05 09:29:42 cmc 1.135.4.1: #i54220# add CRASHREP build types
-rw-r--r--config_office/configure.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/config_office/configure.in b/config_office/configure.in
index 150a28790677..bdee10c77121 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: 2005-08-30 09:34:09 $
+dnl * Date: $Date: 2005-09-23 13:48:01 $
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.135 $ )
+AC_REVISION( $Revision: 1.136 $ )
AC_PREREQ(2.50)
AC_INIT()
echo "$@" >config.parms
@@ -714,6 +714,7 @@ if test "$enable_crashdump" = "yes" -o "$enable_crashdump" = "TRUE"; then
enable_symbols="yes"
fi
AC_MSG_RESULT([yes])
+ BUILD_TYPE="$BUILD_TYPE CRASHREP"
else
if test "$enable_crashdump" = "STATIC"; then
ENABLE_CRASHDUMP="STATIC"
@@ -721,6 +722,7 @@ else
enable_symbols="yes"
fi
AC_MSG_RESULT([yes, STATIC])
+ BUILD_TYPE="$BUILD_TYPE CRASHREP"
else
if test "$enable_crashdump" = "" -o "$enable_crashdump" = "no"; then
ENABLE_CRASHDUMP=""
@@ -2603,6 +2605,7 @@ int main(int argc, char **argv) {
else
AC_MSG_RESULT([internal])
SYSTEM_DB=NO
+ BUILD_TYPE="$BUILD_TYPE BERKELEYDB"
fi
AC_SUBST(SYSTEM_DB)
AC_SUBST(DB_VERSION)
@@ -2628,6 +2631,7 @@ if test -n "$with_system_sablot" -o -n "$with_system_libs" && \
else
AC_MSG_RESULT([internal])
SYSTEM_SABLOT=NO
+ BUILD_TYPE="$BUILD_TYPE SABLOT"
fi
AC_SUBST(SYSTEM_SABLOT)
AC_SUBST(SABLOT_LIBS)