Repository: thrift Updated Branches: refs/heads/master c2145725e -> 4aa95df38
THRIFT-3071 check minimum required version of automake in bootstrap.sh Client: Build process Patch: James E. King, III <[email protected]> This closes #421 - check minimum required version of automake in bootstrap.sh - remove a warning from bootstrap processing Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/4aa95df3 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/4aa95df3 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/4aa95df3 Branch: refs/heads/master Commit: 4aa95df383bfa13c46a4dc0b41672ec29d476300 Parents: c214572 Author: Jens Geyer <[email protected]> Authored: Fri Apr 3 12:37:03 2015 +0200 Committer: Jens Geyer <[email protected]> Committed: Fri Apr 3 12:38:17 2015 +0200 ---------------------------------------------------------------------- bootstrap.sh | 8 ++++++++ configure.ac | 2 ++ 2 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/4aa95df3/bootstrap.sh ---------------------------------------------------------------------- diff --git a/bootstrap.sh b/bootstrap.sh index 0c2b886..1a161c8 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -38,6 +38,14 @@ else exit 1 fi +# we require automake 1.13 or later +# check must happen externally due to use of newer macro +AUTOMAKE_VERSION=`automake --version | head -n1 | rev | sed -e 's/\s.*$//' | rev` +if [ "$AUTOMAKE_VERSION" \< "1.13" ]; then + echo >&2 "automake version $AUTOMAKE_VERSION is too old (need 1.13 or later)" + exit 1 +fi + autoscan $LIBTOOLIZE --copy --automake aclocal -I ./aclocal http://git-wip-us.apache.org/repos/asf/thrift/blob/4aa95df3/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 1eaa359..0032354 100755 --- a/configure.ac +++ b/configure.ac @@ -18,6 +18,7 @@ # AC_PREREQ(2.65) +AC_CONFIG_MACRO_DIR([./aclocal]) AC_INIT([thrift], [1.0.0-dev]) @@ -595,6 +596,7 @@ AC_CHECK_FUNCS([memset]) AC_CHECK_FUNCS([mkdir]) AC_CHECK_FUNCS([realpath]) AC_CHECK_FUNCS([select]) +AC_CHECK_FUNCS([setlocale]) AC_CHECK_FUNCS([socket]) AC_CHECK_FUNCS([strchr]) AC_CHECK_FUNCS([strdup])
