diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2003-10-28 20:26:47 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2003-10-28 20:26:47 +0000 |
| commit | 573f8c01169f13b2eb7fb10232cac63f0eaa02e1 (patch) | |
| tree | 5c3493630d737672c35a477cdc017ca7cbe14ea4 | |
| parent | 50cb974068ea778a170942c3183b08ff60ff9761 (diff) | |
| download | postgresql-573f8c01169f13b2eb7fb10232cac63f0eaa02e1.tar.gz | |
Guard against Ant versions that print CLASSPATH before the version number
in -version output. Per report from Johann Uhrmann.
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.in | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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; }; } diff --git a/configure.in b/configure.in index 67c23b638f..46ee9d05c0 100644 --- 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.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)]) |