Commit573f8c0

committed

Guard against Ant versions that print CLASSPATH before the version number

in -version output. Per report from Johann Uhrmann.

1 parent50cb974 commit573f8c0Copy full SHA for 573f8c0

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3252,7 +3252,7 @@ echo "$as_me: error: Ant is required to build Java components`
`3252`	`3252`	`If you have Ant already installed, see config.log for details on the failure." >&2;}`
`3253`	`3253`	`{ (exit 1); exit 1; }; }`
`3254`	`3254`	`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`
`3256`	`3256`	`{ { echo "$as_me:$LINENO: error: Ant version >= 1.5 is required to build Java components" >&5`
`3257`	`3257`	`echo "$as_me: error: Ant version >= 1.5 is required to build Java components" >&2;}`
`3258`	`3258`	`{ (exit 1); exit 1; }; }`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`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 $`
`3`	`3`	`dnl`
`4`	`4`	`dnl Developers, please strive to achieve this order:`
`5`	`5`	`dnl`
`@@ -409,7 +409,7 @@ if test -z "$ANT"; then`
`409`	`409`	`AC_MSG_ERROR([Ant is required to build Java components`
`410`	`410`	`If you have Ant already installed, see config.log for details on the failure.])`
`411`	`411`	`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`
`413`	`413`	`AC_MSG_ERROR([Ant version >= 1.5 is required to build Java components])`
`414`	`414`	`fi],`
`415`	`415`	`[AC_MSG_RESULT(no)])`

Comments

(0)