diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2007-01-10 10:27:18 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2007-01-10 10:27:18 +0000 |
commit | 1f2a4e537a8cb25cf42f1649c1c830ad18005aa7 (patch) | |
tree | 29cef8d5153e340455f72158b77d4a4b7a823517 /config_office | |
parent | 1edcef5ffe31fe94ccd56f6a4498ee1926bd08f7 (diff) |
INTEGRATION: CWS pj70 (1.190.6); FILE MERGED
2007/01/09 11:19:38 pjanik 1.190.6.2: RESYNC: (1.190-1.192); FILE MERGED
2007/01/05 09:06:14 pjanik 1.190.6.1: #i73127#: Fix system ICU usage.
Diffstat (limited to 'config_office')
-rw-r--r-- | config_office/configure.in | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/config_office/configure.in b/config_office/configure.in index 6052df5d15b1..2bca9174a6df 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-01-03 11:33:33 $ +dnl * Date: $Date: 2007-01-10 11:27:18 $ 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.192 $ ) +AC_REVISION( $Revision: 1.193 $ ) AC_PREREQ(2.50) AC_INIT() echo "$@" >config.parms @@ -3593,6 +3593,10 @@ if test -n "$with_system_icu" -o -n "$with_system_libs" && \ if test -z "$SYSTEM_GENCCODE"; then AC_MSG_ERROR([\"genccode\" not found in \$PATH, install the icu development tool \"genccode"\]) fi + AC_PATH_PROG(SYSTEM_GENCMN, gencmn) + if test -z "$SYSTEM_GENCMN"; then + AC_MSG_ERROR([\"gencmn\" not found in \$PATH, install the icu development tool \"gencmn"\]) + fi AC_MSG_CHECKING([ICU version]) AC_TRY_RUN([ #include <unicode/uversion.h> @@ -3610,6 +3614,7 @@ fi AC_SUBST(SYSTEM_ICU) AC_SUBST(SYSTEM_GENBRK) AC_SUBST(SYSTEM_GENCCODE) +AC_SUBST(SYSTEM_GENCMN) dnl =================================================================== dnl Checks for libraries. |