summaryrefslogtreecommitdiff
path: root/aclocal.m4
diff options
context:
space:
mode:
authorPeter Mount <peter@retep.org.uk>2001-03-05 09:40:02 +0000
committerPeter Mount <peter@retep.org.uk>2001-03-05 09:40:02 +0000
commitc18bb990d3172b9e11671633975d2505b49aa661 (patch)
tree8996b3fd7ef7773916c905212b2221e1ef774e55 /aclocal.m4
parent9142ca2faf25ad6d3b96bde65ed687612de51d97 (diff)
downloadpostgresql-c18bb990d3172b9e11671633975d2505b49aa661.tar.gz
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
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m43
1 files changed, 2 insertions, 1 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 7708287781..f5523dd86a 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,10 +1,11 @@
-dnl $Header: /cvsroot/pgsql/aclocal.m4,v 1.11 2000/11/05 21:04:05 petere Exp $
+dnl $Header: /cvsroot/pgsql/aclocal.m4,v 1.12 2001/03/05 09:38:54 peter Exp $
builtin([include], [config/ac_func_accept_argtypes.m4])
builtin([include], [config/c-compiler.m4])
builtin([include], [config/c-library.m4])
builtin([include], [config/cxx.m4])
builtin([include], [config/docbook.m4])
builtin([include], [config/general.m4])
+builtin([include], [config/java.m4])
builtin([include], [config/libtool.m4])
builtin([include], [config/programs.m4])
builtin([include], [config/python.m4])