提交 75803a01 编写于 作者: B Bruce Momjian

Add check for Ant version >= 1.5.

上级 12e5b8db
...@@ -3134,6 +3134,11 @@ if test -z "$ANT"; then ...@@ -3134,6 +3134,11 @@ if test -z "$ANT"; then
{ { echo "$as_me:$LINENO: error: Ant is required to build Java components" >&5 { { echo "$as_me:$LINENO: error: Ant is required to build Java components" >&5
echo "$as_me: error: Ant is required to build Java components" >&2;} echo "$as_me: error: Ant is required to build Java components" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi
if "$ANT" -version | sed q | egrep -v ' 1\.[5-9]| [2-9]\.' >/dev/null ; then
{ { echo "$as_me:$LINENO: error: Ant version >= 1.5 is required to build Java components" >&5
echo "$as_me: error: Ant version >= 1.5 is required to build Java components" >&2;}
{ (exit 1); exit 1; }; }
fi fi
;; ;;
no) no)
...@@ -10470,7 +10475,7 @@ esac ...@@ -10470,7 +10475,7 @@ esac
HPUXMATHLIB="" HPUXMATHLIB=""
case $host_cpu in case $host_cpu in
hppa1.1) hppa1.1)
if [ -r /lib/pa1.1/libm.a ] ; then if test -r /lib/pa1.1/libm.a ; then
HPUXMATHLIB="-L /lib/pa1.1 -lm" HPUXMATHLIB="-L /lib/pa1.1 -lm"
fi ;; fi ;;
esac esac
...@@ -11744,7 +11749,7 @@ fi ...@@ -11744,7 +11749,7 @@ fi
if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then if test x"$HAVE_LONG_LONG_INT_64" = xyes ; then
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
......
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl $Header: /cvsroot/pgsql/configure.in,v 1.200 2002/08/30 17:14:30 momjian Exp $ dnl $Header: /cvsroot/pgsql/configure.in,v 1.201 2002/09/02 16:14:01 momjian Exp $
dnl dnl
dnl Developers, please strive to achieve this order: dnl Developers, please strive to achieve this order:
dnl dnl
...@@ -381,6 +381,9 @@ PGAC_ARG_BOOL(with, java, no, [ --with-java build JDBC interface an ...@@ -381,6 +381,9 @@ PGAC_ARG_BOOL(with, java, no, [ --with-java build JDBC interface an
PGAC_PATH_ANT PGAC_PATH_ANT
if test -z "$ANT"; then if test -z "$ANT"; then
AC_MSG_ERROR([Ant is required to build Java components]) AC_MSG_ERROR([Ant is required to build Java components])
fi
if "$ANT" -version | sed q | egrep -v ' 1\.[[5-9]]| [[2-9]]\.' >/dev/null ; then
AC_MSG_ERROR([Ant version >= 1.5 is required to build Java components])
fi], fi],
[AC_MSG_RESULT(no)]) [AC_MSG_RESULT(no)])
AC_SUBST(with_java) AC_SUBST(with_java)
...@@ -835,7 +838,7 @@ esac ...@@ -835,7 +838,7 @@ esac
HPUXMATHLIB="" HPUXMATHLIB=""
case $host_cpu in case $host_cpu in
hppa1.1) hppa1.1)
if [[ -r /lib/pa1.1/libm.a ]] ; then if test -r /lib/pa1.1/libm.a ; then
HPUXMATHLIB="-L /lib/pa1.1 -lm" HPUXMATHLIB="-L /lib/pa1.1 -lm"
fi ;; fi ;;
esac esac
...@@ -931,7 +934,7 @@ fi ...@@ -931,7 +934,7 @@ fi
dnl If we need to use "long long int", figure out whether nnnLL notation works. dnl If we need to use "long long int", figure out whether nnnLL notation works.
if [[ x"$HAVE_LONG_LONG_INT_64" = xyes ]] ; then if test x"$HAVE_LONG_LONG_INT_64" = xyes ; then
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#define INT64CONST(x) x##LL #define INT64CONST(x) x##LL
long long int foo = INT64CONST(0x1234567890123456); long long int foo = INT64CONST(0x1234567890123456);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册