Add check for Ant version >= 1.5.

diff --git a/configure b/configure
index b60015c743e272cde4950541fe32585c462a9d4d..7cd6847ac3892c1ae0e1e5fa88579bce87bf0544 100755 (executable)
--- a/configure
+++ b/configure
@@ -3134,6 +3134,11 @@ if test -z "$ANT"; then
   { { echo "$as_me:$LINENO: error: Ant is required to build Java components" >&5
 echo "$as_me: error: Ant is required to build Java components" >&2;}
    { (exit 1); exit 1; }; }
+fi
+if "$ANT" -version | sed q | egrep -v ' 1\.[5-9]| [2-9]\.' >/dev/null ; then
+  { { echo "$as_me:$LINENO: error: Ant version >= 1.5 is required to build Java components" >&5
+echo "$as_me: error: Ant version >= 1.5 is required to build Java components" >&2;}
+   { (exit 1); exit 1; }; }
 fi
       ;;
     no)
@@ -10470,7 +10475,7 @@ esac
 HPUXMATHLIB=""
 case $host_cpu in
   hppa1.1)
-   if [ -r /lib/pa1.1/libm.a ] ; then
+   if test -r /lib/pa1.1/libm.a ; then
        HPUXMATHLIB="-L /lib/pa1.1 -lm"
    fi ;;
 esac
@@ -11744,7 +11749,7 @@ fi
 
 
 
-if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then
+if test x"$HAVE_LONG_LONG_INT_64" = xyes ; then
   cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 #include "confdefs.h"

diff --git a/configure.in b/configure.in
index cafc2d05425d81ec9808397add7c3de857f81d0e..e503c4b7b32d3a4c00080d6b911e450e693f36f8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Header: /cvsroot/pgsql/configure.in,v 1.200 2002/08/30 17:14:30 momjian Exp $
+dnl $Header: /cvsroot/pgsql/configure.in,v 1.201 2002/09/02 16:14:01 momjian Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -381,6 +381,9 @@ PGAC_ARG_BOOL(with, java, no, [  --with-java             build JDBC interface an
 PGAC_PATH_ANT
 if test -z "$ANT"; then
   AC_MSG_ERROR([Ant is required to build Java components])
+fi
+if "$ANT" -version | sed q | egrep -v ' 1\.[[5-9]]| [[2-9]]\.' >/dev/null ; then
+  AC_MSG_ERROR([Ant version >= 1.5 is required to build Java components])
 fi],
 [AC_MSG_RESULT(no)])
 AC_SUBST(with_java)
@@ -835,7 +838,7 @@ esac
 HPUXMATHLIB=""
 case $host_cpu in
   hppa1.1) 
-   if [[ -r /lib/pa1.1/libm.a ]] ; then
+   if test -r /lib/pa1.1/libm.a ; then
        HPUXMATHLIB="-L /lib/pa1.1 -lm"
    fi ;;
 esac
@@ -931,7 +934,7 @@ fi
 
 dnl If we need to use "long long int", figure out whether nnnLL notation works.
 
-if [[ x"$HAVE_LONG_LONG_INT_64" = xyes ]] ; then
+if test x"$HAVE_LONG_LONG_INT_64" = xyes ; then
   AC_TRY_COMPILE([
 #define INT64CONST(x)  x##LL
 long long int foo = INT64CONST(0x1234567890123456);