rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Peter Eisentraut 2001-03-11 11:24:59 +00:00
parent 671be61916
commit 0d5407e6e0
3 changed files with 406 additions and 506 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/java.m4
View File

@ -1,16 +1,12 @@
# #
# Autoconf macros for configuring the build of Java JDBC Tools # 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' # Look for the ANT tool and set the output variable 'ANT' to 'ant'
# if found, empty otherwise # if found, empty otherwise
AC_DEFUN([PGAC_PROG_ANT], AC_DEFUN([PGAC_PATH_ANT],
[AC_PATH_PROGS(ANT, [ant ant.sh ant.bat])]) [AC_PATH_PROGS(ANT, [ant ant.sh ant.bat])])
AC_SUBST(ANT)
#AC_DEFUN([PGAC_PROG_ANT],[AC_CHECK_PROG(ANT, ant, ant)
#])

895
configure vendored
View File

File diff suppressed because it is too large Load Diff

7
configure.in
View File

@ -405,9 +405,12 @@ AC_SUBST(with_python)
# Optionally build the Java/JDBC tools # Optionally build the Java/JDBC tools
# #
AC_MSG_CHECKING([whether to build 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) [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_MSG_RESULT(no)])
AC_SUBST(with_java) AC_SUBST(with_java)