INTEGRATION: CWS dbaantversion (1.216.6); FILE MERGED

2007/08/10 14:55:56 rene 1.216.6.2: fix accidentiall commit
2007/08/10 14:42:02 rene 1.216.6.1: #i80583# we need ant >= 1.6.0 for jfreereport

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-02 15:55:25 $
+dnl * Date: $Date: 2007-08-20 13:46:15 $
 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.216 $ )
+AC_REVISION( $Revision: 1.217 $ )
 AC_PREREQ(2.50)
 AC_INIT()
 echo "$@" >config.parms
@@ -5130,6 +5130,17 @@ else
      ANT="`pwd`"/"`basename "$a_script"`"
      cd "$a_cwd"
   done
+  AC_MSG_CHECKING([whether ant is >= 1.6.0])
+  ant_version=`$ANT -version | $AWK '{ print $4; }'`
+  ant_version_major=`echo $ant_version | cut -d. -f1`
+  ant_version_minor=`echo $ant_version | cut -d. -f2`
+  if test "$ant_version_major" -ge "2"; then
+  	AC_MSG_RESULT([yes, $ant_version])
+  elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "6"; then
+  	AC_MSG_RESULT([yes, $ant_version])
+  else
+  	AC_MSG_ERROR([no, you need at least ant >= 1.6.0])
+  fi
   AC_MSG_CHECKING([if $ANT works])
 cat > conftest.java << EOF
     public class conftest {