strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS neonupdate (1.208.4); FILE MERGED

Browse source 
2007/06/22 12:30:11 kso 1.208.4.2: RESYNC: (1.208-1.209); FILE MERGED
2007/06/22 10:59:44 kso 1.208.4.1: #i77023# - dropped support for neon < 0.26.0
This commit is contained in:
Rüdiger Timm 2007-07-03 11:15:43 +00:00
parent 3ea698b17d
commit 6096429da4
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
config_office/configure.in
View file

@ -3,7 +3,7 @@ dnl * vi:set sw=3 ts=3 et:
dnl * dnl *
dnl * Name: configure.in dnl * Name: configure.in
dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
dnl * Date: $Date: 2007-06-27 13:59:09 $ dnl * Date: $Date: 2007-07-03 12:15:43 $
dnl * dnl *
dnl * Desc: This file serves as input for the GNU autoconf package dnl * Desc: This file serves as input for the GNU autoconf package
dnl * in order to create a configure script. dnl * in order to create a configure script.
@ -12,7 +12,7 @@ dnl * necessary to build OpenOffice.org
dnl * dnl *
dnl * dnl *
dnl ******************************************************************/ dnl ******************************************************************/
AC_REVISION( $Revision: 1.212 $ ) AC_REVISION( $Revision: 1.213 $ )
AC_PREREQ(2.50) AC_PREREQ(2.50)
AC_INIT() AC_INIT()
echo "$@" >config.parms echo "$@" >config.parms
@ -4007,8 +4007,8 @@ AC_MSG_CHECKING([which neon to use])
if test -n "$with_system_neon" -o -n "$with_system_libs" && \ if test -n "$with_system_neon" -o -n "$with_system_libs" && \
test "$with_system_neon" != "no"; then test "$with_system_neon" != "no"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
PKG_CHECK_MODULES(NEON, neon >= 0.24.0) PKG_CHECK_MODULES(NEON, neon >= 0.26.0)
PKG_CHECK_MODULES(NEON, neon < 0.27.0, , AC_MSG_ERROR([you need neon 0.24.x to 0.26.x for system-neon])) PKG_CHECK_MODULES(NEON, neon < 0.27.0, , AC_MSG_ERROR([you need neon 0.26.x for system-neon]))
NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`" NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1" NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
SYSTEM_NEON=YES SYSTEM_NEON=YES