Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc18bb99

Browse files
author
Peter Mount
committed
Ok, I've split todays commit into three, the first two already done had somebits in JDBC & the first set of tools into contrib.This is the third, and deals with enabling JDBC to be compiled with the mainsource.What it does is add a new option to configure: --with-javaThis option tells configure to look for ant (our build tool of choice) andif found, it then compiles both the JDBC driver and the new tools as partof the normal make.Also, when the postgresql install is done, all the .jar files are alsoinstalled into the ${PGLIB}/java directory (thought best to keep then separate)Now I had some conflicts when this applied so could someone please double checkthat everything is ok?Peter
1 parent9142ca2 commitc18bb99

File tree

10 files changed

+643
-833
lines changed

10 files changed

+643
-833
lines changed

‎aclocal.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
dnl $Header: /cvsroot/pgsql/aclocal.m4,v 1.11 2000/11/0521:04:05 petere Exp $
1+
dnl $Header: /cvsroot/pgsql/aclocal.m4,v 1.12 2001/03/0509:38:54 peter Exp $
22
builtin([include],[config/ac_func_accept_argtypes.m4])
33
builtin([include],[config/c-compiler.m4])
44
builtin([include],[config/c-library.m4])
55
builtin([include],[config/cxx.m4])
66
builtin([include],[config/docbook.m4])
77
builtin([include],[config/general.m4])
8+
builtin([include],[config/java.m4])
89
builtin([include],[config/libtool.m4])
910
builtin([include],[config/programs.m4])
1011
builtin([include],[config/python.m4])

‎build.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
detect the presence of both the JDK and ANT, and if both are found
1313
to build the jdbc driver and utils with the rest of postgresql.
1414
15-
$Id: build.xml,v 1.1 2001/01/18 14:50:14 peter Exp $
15+
$Id: build.xml,v 1.2 2001/03/05 09:38:54 peter Exp $
1616
1717
-->
1818

@@ -90,5 +90,6 @@ e.g.
9090
<antdir="src/interfaces/jdbc"target="${target}" />
9191
<antdir="contrib/retep"target="${target}" />
9292
</target>
93+
9394
</project>
9495

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp