INTEGRATION: CWS ooo64bit01 (1.62.2); FILE MERGED

2004/03/19 08:20:08 waratah 1.62.2.1: Merge from ant01 to make compiles with ant 1.6 work correctly
This commit is contained in:
Rüdiger Timm 2004-06-17 10:58:30 +00:00
parent 9e1b8635a3
commit c0a4ce3649

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: 2004-06-16 10:48:18 $ dnl * Date: $Date: 2004-06-17 11:58:30 $
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.64 $ ) AC_REVISION( $Revision: 1.65 $ )
AC_PREREQ(2.50) AC_PREREQ(2.50)
AC_INIT() AC_INIT()
echo "$@" >config.parms echo "$@" >config.parms
@ -1934,7 +1934,6 @@ else
ANT="`pwd`"/"`basename "$a_script"`" ANT="`pwd`"/"`basename "$a_script"`"
cd "$a_cwd" cd "$a_cwd"
done done
AC_MSG_CHECKING([if $ANT works]) AC_MSG_CHECKING([if $ANT works])
cat > conftest.java << EOF cat > conftest.java << EOF
public class conftest { public class conftest {