INTEGRATION: CWS nojava3 (1.128.6); FILE MERGED
2005/08/09 15:25:22 rene 1.128.6.2: RESYNC: (1.128-1.129); FILE MERGED 2005/08/05 09:36:33 rene 1.128.6.1: #i40239# use system-libxml when we build with xsltproc (--without-java and --enable-xsltproc)
This commit is contained in:
parent
ed6e21fac7
commit
53a39889c0
1 changed files with 6 additions and 2 deletions
|
@ -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-16 09:27:11 $
|
||||
dnl * Date: $Date: 2005-08-18 07:24:10 $
|
||||
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.130 $ )
|
||||
AC_REVISION( $Revision: 1.131 $ )
|
||||
AC_PREREQ(2.50)
|
||||
AC_INIT()
|
||||
echo "$@" >config.parms
|
||||
|
@ -2004,6 +2004,10 @@ else
|
|||
if test "$XSLTPROC" = "no"; then
|
||||
AC_MSG_ERROR([xsltproc is required])
|
||||
fi
|
||||
# somehow AC_MSG_WARN won't work...
|
||||
echo "to prevent incompatibilities between internal libxml2 and xsltproc, the office will be build with system-libxml"
|
||||
echo "to prevent incompatibilities between internal libxml2 and xsltproc, the office will be build with system-libxml" >> warn
|
||||
with_system_libxml=yes
|
||||
fi
|
||||
AC_SUBST(XSLTPROC)
|
||||
|
||||
|
|
Loading…
Reference in a new issue