Ok, I've split todays commit into three, the first two already done had some

bits in JDBC & the first set of tools into contrib.

This is the third, and deals with enabling JDBC to be compiled with the main
source.

What it does is add a new option to configure: --with-java

This option tells configure to look for ant (our build tool of choice) and
if found, it then compiles both the JDBC driver and the new tools as part
of the normal make.

Also, when the postgresql install is done, all the .jar files are also
installed into the ${PGLIB}/java directory (thought best to keep then separate)

Now I had some conflicts when this applied so could someone please double check
that everything is ok?

Peter

1 files changed, 23 insertions, 1 deletions

diff --git a/configure.in b/configure.in
index d9511ffdc2f..e57571957d8 100644
--- a/configure.in
+++ b/configure.in
@@ -401,6 +401,15 @@ PGAC_PATH_PYTHONDIR],
 [AC_MSG_RESULT(no)])
 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],
+[AC_MSG_RESULT(yes)
+PGAC_PROG_ANT],
+[AC_MSG_RESULT(no)])
+AC_SUBST(with_java)
 
 dnl A note on the Kerberos and OpenSSL options:
 dnl
@@ -1136,6 +1145,10 @@ if test -n "$NSGMLS"; then
   AC_CHECK_PROGS(SGMLSPL, sgmlspl)
 fi
 
+<<<<<<< configure.in
+
+# Finally ready to produce output files ...
+=======
 
 # check whether 'test -ef' works
 if (test "$srcdir" -ef "$srcdir") >/dev/null 2>&1 ; then
@@ -1143,7 +1156,15 @@ if (test "$srcdir" -ef "$srcdir") >/dev/null 2>&1 ; then
 else
   test_ef_works=no
 fi
-
+>>>>>>> 1.104
+
+<<<<<<< configure.in
+if test x"$abs_top_srcdir" != x"$abs_top_builddir"; then
+  echo $ac_n "preparing build tree... $ac_c" 1>&6
+  /bin/sh "$srcdir/config/prep_buildtree" "$abs_top_srcdir" "$abs_top_builddir" \
+    || AC_MSG_ERROR(failed)
+  AC_MSG_RESULT(done)
+=======
 abs_top_srcdir=
 AC_SUBST(abs_top_srcdir)
 
@@ -1156,6 +1177,7 @@ if test "$test_ef_works" = yes ; then
       || AC_MSG_ERROR(failed)
     AC_MSG_RESULT(done)
   fi
+>>>>>>> 1.104
 fi
 
 AC_OUTPUT(