Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 573f8c0

Browse files
committed
Guard against Ant versions that print CLASSPATH before the version number
in -version output. Per report from Johann Uhrmann.
1 parent 50cb974 commit 573f8c0

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3252,7 +3252,7 @@ echo "$as_me: error: Ant is required to build Java components
32523252
If you have Ant already installed, see config.log for details on the failure." >&2;}
32533253
{ (exit 1); exit 1; }; }
32543254
fi
3255-
if "$ANT" -version | sed q | egrep -v ' 1\.[5-9]| [2-9]\.' >/dev/null ; then
3255+
if "$ANT" -version | egrep -i 'ant version' | sed q | egrep -v ' 1\.[5-9]| [2-9]\.' >/dev/null ; then
32563256
{ { echo "$as_me:$LINENO: error: Ant version >= 1.5 is required to build Java components" >&5
32573257
echo "$as_me: error: Ant version >= 1.5 is required to build Java components" >&2;}
32583258
{ (exit 1); exit 1; }; }

configure.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $Header: /cvsroot/pgsql/configure.in,v 1.298 2003/10/25 15:32:11 petere Exp $
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.299 2003/10/28 20:26:45 tgl Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -409,7 +409,7 @@ if test -z "$ANT"; then
409409
AC_MSG_ERROR([Ant is required to build Java components
410410
If you have Ant already installed, see config.log for details on the failure.])
411411
fi
412-
if "$ANT" -version | sed q | egrep -v ' 1\.[[5-9]]| [[2-9]]\.' >/dev/null ; then
412+
if "$ANT" -version | egrep -i 'ant version' | sed q | egrep -v ' 1\.[[5-9]]| [[2-9]]\.' >/dev/null ; then
413413
AC_MSG_ERROR([Ant version >= 1.5 is required to build Java components])
414414
fi],
415415
[AC_MSG_RESULT(no)])

0 commit comments

Comments
 (0)