Commit 573f8c01 authored by Tom Lane's avatar Tom Lane

Guard against Ant versions that print CLASSPATH before the version number

in -version output.  Per report from Johann Uhrmann.
parent 50cb9740
......@@ -3252,7 +3252,7 @@ echo "$as_me: error: Ant is required to build Java components
If you have Ant already installed, see config.log for details on the failure." >&2;}
{ (exit 1); exit 1; }; }
fi
if "$ANT" -version | sed q | egrep -v ' 1\.[5-9]| [2-9]\.' >/dev/null ; then
if "$ANT" -version | egrep -i '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; }; }
......
dnl Process this file with autoconf to produce a configure script.
dnl $Header: /cvsroot/pgsql/configure.in,v 1.298 2003/10/25 15:32:11 petere Exp $
dnl $Header: /cvsroot/pgsql/configure.in,v 1.299 2003/10/28 20:26:45 tgl Exp $
dnl
dnl Developers, please strive to achieve this order:
dnl
......@@ -409,7 +409,7 @@ if test -z "$ANT"; then
AC_MSG_ERROR([Ant is required to build Java components
If you have Ant already installed, see config.log for details on the failure.])
fi
if "$ANT" -version | sed q | egrep -v ' 1\.[[5-9]]| [[2-9]]\.' >/dev/null ; then
if "$ANT" -version | egrep -i '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)])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment