Commitf3b2118

committed

Add JAVA_HOME test for Ant.

1 parent847f8b3 commitf3b2118Copy full SHA for f3b2118

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3020,6 +3020,11 @@ if test "${with_java+set}" = set; then`
`3020`	`3020`	`yes)`
`3021`	`3021`	`echo"$as_me:$LINENO: result: yes">&5`
`3022`	`3022`	`echo"${ECHO_T}yes">&6`
	`3023`	`+iftest!"$JAVA_HOME" -o! -d"$JAVA_HOME";then`
	`3024`	`+ { {echo"$as_me:$LINENO: error: Set the JAVA_HOME environment variable to build Java components">&5`
	`3025`	`+echo"$as_me: error: Set the JAVA_HOME environment variable to build Java components">&2;}`
	`3026`	`+ { (exit 1);exit 1; }; }`
	`3027`	`+fi`
`3023`	`3028`
`3024`	`3029`	`forac_progin jakarta-ant ant ant.sh ant.bat`
`3025`	`3030`	`do`

Lines changed: 4 additions & 1 deletion

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.206 2002/09/05 18:28:45 petere Exp $`
	`2`	`+dnl $Header: /cvsroot/pgsql/configure.in,v 1.207 2002/09/06 14:31:16 momjian Exp $`
`3`	`3`	`dnl`
`4`	`4`	`dnl Developers, please strive to achieve this order:`
`5`	`5`	`dnl`
`@@ -371,6 +371,9 @@ AC_SUBST(with_python)`
`371`	`371`	`AC_MSG_CHECKING([whether to build Java/JDBC tools])`
`372`	`372`	`PGAC_ARG_BOOL(with, java, no, [ --with-java build JDBC interface and Java tools],`
`373`	`373`	`[AC_MSG_RESULT(yes)`
	`374`	`+if test ! "$JAVA_HOME" -o ! -d "$JAVA_HOME" ; then`
	`375`	`+ AC_MSG_ERROR([Set the JAVA_HOME environment variable to build Java components])`
	`376`	`+fi`
`374`	`377`	`PGAC_PATH_ANT`
`375`	`378`	`if test -z "$ANT"; then`
`376`	`379`	`AC_MSG_ERROR([Ant is required to build Java components])`

Comments

(0)