diff options
| author | Bruce Momjian | 2002-09-02 16:14:01 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2002-09-02 16:14:01 +0000 |
| commit | 75803a01634a778b0f0efe11364cbf453a981e6a (patch) | |
| tree | fedbf5c217733452c04b048affbcf04d08e4b815 | |
| parent | 12e5b8dbcb90f2365ed3b18326e027b739e251eb (diff) | |
Add check for Ant version >= 1.5.
| -rwxr-xr-x | configure | 9 | ||||
| -rw-r--r-- | configure.in | 9 |
2 files changed, 13 insertions, 5 deletions
diff --git a/configure b/configure index b60015c743e..7cd6847ac38 100755 --- a/configure +++ b/configure @@ -3135,6 +3135,11 @@ if test -z "$ANT"; then echo "$as_me: error: Ant is required to build Java components" >&2;} { (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 ;; no) echo "$as_me:$LINENO: result: no" >&5 @@ -10470,7 +10475,7 @@ esac HPUXMATHLIB="" case $host_cpu in 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" fi ;; esac @@ -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 #line $LINENO "configure" #include "confdefs.h" diff --git a/configure.in b/configure.in index cafc2d05425..e503c4b7b32 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ 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 Developers, please strive to achieve this order: dnl @@ -381,6 +381,9 @@ PGAC_ARG_BOOL(with, java, no, [ --with-java build JDBC interface an PGAC_PATH_ANT if test -z "$ANT"; then 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], [AC_MSG_RESULT(no)]) AC_SUBST(with_java) @@ -835,7 +838,7 @@ esac HPUXMATHLIB="" case $host_cpu in 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" fi ;; esac @@ -931,7 +934,7 @@ fi 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([ #define INT64CONST(x) x##LL long long int foo = INT64CONST(0x1234567890123456); |