Skip to content

Commit f3b2118

Browse files
committed
Add JAVA_HOME test for Ant.
1 parent 847f8b3 commit f3b2118

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

configure

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3020,6 +3020,11 @@ if test "${with_java+set}" = set; then
30203020
yes)
30213021
echo "$as_me:$LINENO: result: yes" >&5
30223022
echo "${ECHO_T}yes" >&6
3023+
if test ! "$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
30233028
30243029
for ac_prog in jakarta-ant ant ant.sh ant.bat
30253030
do

configure.in

Lines changed: 4 additions & 1 deletion
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.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 $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -371,6 +371,9 @@ AC_SUBST(with_python)
371371
AC_MSG_CHECKING([whether to build Java/JDBC tools])
372372
PGAC_ARG_BOOL(with, java, no, [ --with-java build JDBC interface and Java tools],
373373
[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
374377
PGAC_PATH_ANT
375378
if test -z "$ANT"; then
376379
AC_MSG_ERROR([Ant is required to build Java components])

0 commit comments

Comments
 (0)