diff options
author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2008-06-20 17:32:09 +0000 |
---|---|---|
committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2008-06-20 17:32:09 +0000 |
commit | becfb86a606960dd867080a5ea0cc2b66228459f (patch) | |
tree | c8114c365318cf5d5fbbd25a930fa096be3f68ef | |
parent | 79b5455874a02c22433e17a0e5a4d73ef7911b6d (diff) | |
download | libapr-becfb86a606960dd867080a5ea0cc2b66228459f.tar.gz |
Back out the 2.60 requirement, adopt conditional handling for the
new AC_USE_SYSTEM_EXTENSIONS as of 2.60.
Submitted by: Arfrever Frehtes Taifersar Arahesis <arfrever.fta gmail.com>
Backport: r670000
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.3.x@670001 13f79535-47bb-0310-9956-ffa450edef68
-rwxr-xr-x | build/buildcheck.sh | 8 | ||||
-rw-r--r-- | configure.in | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/build/buildcheck.sh b/build/buildcheck.sh index 637ef140a..62fe931ae 100755 --- a/build/buildcheck.sh +++ b/build/buildcheck.sh @@ -14,18 +14,18 @@ py_version=`python -c 'import sys; print sys.version' 2>&1|sed 's/ .*//;q'` echo "buildconf: python version $py_version (ok)" fi -# autoconf 2.60 or newer +# autoconf 2.50 or newer ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;q'` if test -z "$ac_version"; then echo "buildconf: autoconf not found." -echo " You need autoconf version 2.60 or newer installed" +echo " You need autoconf version 2.50 or newer installed" echo " to build APR from SVN." exit 1 fi IFS=.; set $ac_version; IFS=' ' -if test "$1" = "2" -a "$2" -lt "60" || test "$1" -lt "2"; then +if test "$1" = "2" -a "$2" -lt "50" || test "$1" -lt "2"; then echo "buildconf: autoconf version $ac_version found." -echo " You need autoconf version 2.60 or newer installed" +echo " You need autoconf version 2.50 or newer installed" echo " to build APR from SVN." exit 1 else diff --git a/configure.in b/configure.in index 0d16d0e31..6b7ce59cf 100644 --- a/configure.in +++ b/configure.in @@ -139,9 +139,14 @@ AC_CHECK_PROG(ASCPP, cpp, cpp) AC_CHECK_TOOL(AR, ar, ar) dnl Various OS checks that apparently set required flags +ifdef([AC_USE_SYSTEM_EXTENSIONS], [ AC_USE_SYSTEM_EXTENSIONS -AC_ISC_POSIX +], [ +AC_AIX +AC_MINIX +]) +AC_ISC_POSIX APR_EBCDIC dnl this is our library name |