diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2007-08-30 15:00:53 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2007-08-30 15:00:53 +0000 |
commit | 136257f6c45e273c090b0d1571c9608562fb57ed (patch) | |
tree | fba2acc86ee18c9aa9fd7edbc909fb2a0aeadd00 /config_office/configure.in | |
parent | 86ff039c9b12066ce813b3ee38dda63b5a5435c6 (diff) |
INTEGRATION: CWS tkr04 (1.217.2); FILE MERGED
2007/08/28 11:04:13 tkr 1.217.2.1: #i80967#: removes the unused code build
Diffstat (limited to 'config_office/configure.in')
-rw-r--r-- | config_office/configure.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/config_office/configure.in b/config_office/configure.in index d1fad62550fc..54f0ae1bd8f5 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-08-30 10:02:41 $ +dnl * Date: $Date: 2007-08-30 16:00:53 $ 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.219 $ ) +AC_REVISION( $Revision: 1.220 $ ) AC_PREREQ(2.50) AC_INIT() echo "$@" >config.parms @@ -4030,8 +4030,7 @@ AC_MSG_CHECKING([which neon to use]) if test -n "$with_system_neon" -o -n "$with_system_libs" && \ test "$with_system_neon" != "no"; then AC_MSG_RESULT([external]) - PKG_CHECK_MODULES(NEON, neon >= 0.26.0) - PKG_CHECK_MODULES(NEON, neon < 0.27.0, , AC_MSG_ERROR([you need neon 0.26.x for system-neon])) + PKG_CHECK_MODULES(NEON, neon >= 0.26.0, , AC_MSG_ERROR([you need neon >= 0.26.x for system-neon])) NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`" NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1" SYSTEM_NEON=YES |