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

Commit75803a0

Browse files
committed
Add check for Ant version >= 1.5.
1 parent12e5b8d commit75803a0

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

‎configure‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3134,6 +3134,11 @@ if test -z "$ANT"; then
31343134
{ {echo"$as_me:$LINENO: error: Ant is required to build Java components">&5
31353135
echo"$as_me: error: Ant is required to build Java components">&2;}
31363136
{ (exit 1);exit 1; }; }
3137+
fi
3138+
if"$ANT" -version| sed q| egrep -v' 1\.[5-9]| [2-9]\.'>/dev/null;then
3139+
{ {echo"$as_me:$LINENO: error: Ant version >= 1.5 is required to build Java components">&5
3140+
echo"$as_me: error: Ant version >= 1.5 is required to build Java components">&2;}
3141+
{ (exit 1);exit 1; }; }
31373142
fi
31383143
;;
31393144
no)
@@ -10470,7 +10475,7 @@ esac
1047010475
HPUXMATHLIB=""
1047110476
case$host_cpuin
1047210477
hppa1.1)
10473-
if[-r /lib/pa1.1/libm.a ];then
10478+
iftest -r /lib/pa1.1/libm.a;then
1047410479
HPUXMATHLIB="-L /lib/pa1.1 -lm"
1047510480
fi ;;
1047610481
esac
@@ -11744,7 +11749,7 @@ fi
1174411749
1174511750
1174611751
11747-
if[ x"$HAVE_LONG_LONG_INT_64"= xyes ];then
11752+
iftest x"$HAVE_LONG_LONG_INT_64" = xyes;then
1174811753
cat>conftest.$ac_ext<<_ACEOF
1174911754
#line$LINENO "configure"
1175011755
#include "confdefs.h"

‎configure.in‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $Header: /cvsroot/pgsql/configure.in,v 1.200 2002/08/30 17:14:30 momjian Exp $
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.201 2002/09/02 16:14:01 momjian Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -381,6 +381,9 @@ PGAC_ARG_BOOL(with, java, no, [ --with-java build JDBC interface an
381381
PGAC_PATH_ANT
382382
if test -z "$ANT"; then
383383
AC_MSG_ERROR([Ant is required to build Java components])
384+
fi
385+
if "$ANT" -version | sed q | egrep -v ' 1\.[[5-9]]| [[2-9]]\.' >/dev/null ; then
386+
AC_MSG_ERROR([Ant version >= 1.5 is required to build Java components])
384387
fi],
385388
[AC_MSG_RESULT(no)])
386389
AC_SUBST(with_java)
@@ -835,7 +838,7 @@ esac
835838
HPUXMATHLIB=""
836839
case $host_cpu in
837840
hppa1.1)
838-
if[[ -r /lib/pa1.1/libm.a ]] ; then
841+
iftest -r /lib/pa1.1/libm.a ; then
839842
HPUXMATHLIB="-L /lib/pa1.1 -lm"
840843
fi ;;
841844
esac
@@ -931,7 +934,7 @@ fi
931934

932935
dnl If we need to use "long long int", figure out whether nnnLL notation works.
933936

934-
if[[ x"$HAVE_LONG_LONG_INT_64" = xyes ]] ; then
937+
iftest x"$HAVE_LONG_LONG_INT_64" = xyes ; then
935938
AC_TRY_COMPILE([
936939
#define INT64CONST(x) x##LL
937940
long long int foo = INT64CONST(0x1234567890123456);

0 commit comments

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