From f3b211841ed28cbb9eb66adcad8eaa30d88ad009 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 6 Sep 2002 14:31:16 +0000
Subject: [PATCH] Add JAVA_HOME test for Ant.

---
 configure    | 5 +++++
 configure.in | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 4d2c5b377d..07a1436d3c 100755
--- a/configure
+++ b/configure
@@ -3020,6 +3020,11 @@ if test "${with_java+set}" = set; then
     yes)
       echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
+if test ! "$JAVA_HOME" -o ! -d "$JAVA_HOME" ; then
+  { { echo "$as_me:$LINENO: error: Set the JAVA_HOME environment variable to build Java components" >&5
+echo "$as_me: error: Set the JAVA_HOME environment variable to build Java components" >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
   for ac_prog in jakarta-ant ant ant.sh ant.bat
 do
diff --git a/configure.in b/configure.in
index fbaae6a541..76c70c8b9e 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.206 2002/09/05 18:28:45 petere Exp $
+dnl $Header: /cvsroot/pgsql/configure.in,v 1.207 2002/09/06 14:31:16 momjian Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -371,6 +371,9 @@ AC_SUBST(with_python)
 AC_MSG_CHECKING([whether to build Java/JDBC tools])
 PGAC_ARG_BOOL(with, java, no, [  --with-java             build JDBC interface and Java tools],
 [AC_MSG_RESULT(yes)
+if test ! "$JAVA_HOME" -o ! -d "$JAVA_HOME" ; then
+  AC_MSG_ERROR([Set the JAVA_HOME environment variable to build Java components])
+fi
 PGAC_PATH_ANT
 if test -z "$ANT"; then
   AC_MSG_ERROR([Ant is required to build Java components])