diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-01-05 11:09:48 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-01-05 11:09:48 +0000 |
| commit | 3ef5cf07cc4a80be42b2fdea105db76bc0288d8f (patch) | |
| tree | d60be5760ea91cd865c55059cdfa970506ad1fff /config_office | |
| parent | f92899035169c29b942c48b93f18878ea3be892a (diff) | |
INTEGRATION: CWS fooobuild (1.75.6); FILE MERGED
2004/12/21 21:57:09 vq 1.75.6.4: #i32814# Fix configure switch description and regenrate configure.
2004/12/21 00:43:16 vq 1.75.6.3: RESYNC: (1.75-1.80); FILE MERGED
2004/12/02 15:26:01 rene 1.75.6.2: enhance system mspack check test to work like the others already in 680
2004/11/26 13:10:07 rene 1.75.6.1: #i32814#
fix incomplete conditional msfontextrat/FontOOo merge
Diffstat (limited to 'config_office')
| -rw-r--r-- | config_office/configure.in | 52 |
1 files changed, 49 insertions, 3 deletions
diff --git a/config_office/configure.in b/config_office/configure.in index bb58a13de643..38157d3ba2e8 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-01-05 10:41:55 $ +dnl * Date: $Date: 2005-01-05 12:09:48 $ 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.81 $ ) +AC_REVISION( $Revision: 1.82 $ ) AC_PREREQ(2.50) AC_INIT() echo "$@" >config.parms @@ -54,7 +54,13 @@ AC_ARG_ENABLE(mozilla, Usage: --disable-mozilla ],,enable_mozilla="yes") - +AC_ARG_ENABLE(fontooo, +[ --disable-fontooo disable FontOOo + (useful for distributions using fontconfig for OOo) +],,enable_fontooo="yes") +AC_ARG_WITH(system-mspack, +[ --with-system-mspack use libmspack already installed on system +],,) AC_ARG_ENABLE(cups, [ --enable-cups enable cups support in the psprint project ],,) @@ -2618,6 +2624,46 @@ fi AC_SUBST(WITH_OPENLDAP) dnl =================================================================== +dnl Test whether to include FontOOo +dnl =================================================================== +AC_MSG_CHECKING([whether to include FontOOo]) +if test -n "$enable_fontooo"; then + if test "$enable_fontooo" = "no"; then + AC_MSG_RESULT([no]) + WITH_FONTOOO=NO + SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO" + else + AC_MSG_RESULT([yes]) + WITH_FONTOOO=YES + fi +else + AC_MSG_RESULT([no]) + WITH_FONTOOO=NO + SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO" +fi +AC_SUBST(WITH_FONTOOO) + +if test "$WITH_FONTOOO" = "YES"; then + dnl =============================================================== + dnl Check whether to use libmspack from system + dnl =============================================================== + AC_MSG_CHECKING([whether to use system libmspack]) + if test -n "$with_system_mspack" -o -n "$with_system_libs" && \ + test "$with_system_mspack" != "no"; then + AC_MSG_RESULT([yes]) + SYSTEM_MSPACK=YES + AC_CHECK_HEADER(mspack.h, [], + [AC_MSG_ERROR(mspack.h not found, install libmspack)], []) + AC_CHECK_LIB(mspack, mspack_create_cab_decompressor, [], + [AC_MSG_ERROR(libmspack not installed or functional)], []) + else + AC_MSG_RESULT([no]) + SYSTEM_MSPACK=NO + fi +fi +AC_SUBST(SYSTEM_MSPACK) + +dnl =================================================================== dnl Test whether to include fonts dnl =================================================================== AC_MSG_CHECKING([whether to include Bitstream Vera fonts]) |