Throw error if Ant is not found and Java is requested. Remove redundant

AC_SUBST that messed up the diversions and thus the configure output.

config/java.m4

@@ -1,16 +1,12 @@
 #
 # Autoconf macros for configuring the build of Java JDBC Tools
 #
-# $Header: /cvsroot/pgsql/config/Attic/java.m4,v 1.1 2001/03/05 10:02:35 peter Exp $
+# $Header: /cvsroot/pgsql/config/Attic/java.m4,v 1.2 2001/03/11 11:24:59 petere Exp $
 #
 
-# PGAC_PROG_ANT
+# PGAC_PATH_ANT
 # -------------
 # Look for the ANT tool and set the output variable 'ANT' to 'ant'
 # if found, empty otherwise
-AC_DEFUN([PGAC_PROG_ANT],
+AC_DEFUN([PGAC_PATH_ANT],
          [AC_PATH_PROGS(ANT, [ant ant.sh ant.bat])])
-AC_SUBST(ANT)
-#AC_DEFUN([PGAC_PROG_ANT],[AC_CHECK_PROG(ANT, ant, ant)
-#])
-

configure.in

@@ -405,9 +405,12 @@ AC_SUBST(with_python)
 # Optionally build the Java/JDBC tools
 #
 AC_MSG_CHECKING([whether to build Java/JDBC tools])
-PGAC_ARG_BOOL(with, java, no, [  --with-java             build JDBC interface & Java tools],
+PGAC_ARG_BOOL(with, java, no, [  --with-java             build JDBC interface and Java tools],
 [AC_MSG_RESULT(yes)
-PGAC_PROG_ANT],
+PGAC_PATH_ANT
+if test -z "$ANT"; then
+  AC_MSG_ERROR([Ant is required to build Java components])
+fi],
 [AC_MSG_RESULT(no)])
 AC_SUBST(with_java)