diff options
| author | jfarrell <jfarrell@apache.org> | 2014-07-10 18:42:30 -0400 |
|---|---|---|
| committer | jfarrell <jfarrell@apache.org> | 2014-07-10 18:42:30 -0400 |
| commit | 30a472e04f26312f93cee0faaaa80a99bb3ed776 (patch) | |
| tree | 3251ca126de28a13be95518eea1a0c1bd7b8d056 /aclocal | |
| parent | 4c8506e30d2eee616ea62b79fc6c3e523a03f294 (diff) | |
| download | thrift-30a472e04f26312f93cee0faaaa80a99bb3ed776.tar.gz | |
THRIFT-2602: Fix missing dist files
Client: build process
Patch: jfarrell
Add check for php extension to not build if phpize has not been run,
update Vagrantfile to update package list for haskell test deps, and
change bison min version to 2.4 to work with the current versions of
debian, ubuntu and centos.
Diffstat (limited to 'aclocal')
| -rw-r--r-- | aclocal/ac_prog_bison.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/aclocal/ac_prog_bison.m4 b/aclocal/ac_prog_bison.m4 index 1e2d200c7..c74b4f18b 100644 --- a/aclocal/ac_prog_bison.m4 +++ b/aclocal/ac_prog_bison.m4 @@ -1,6 +1,6 @@ dnl dnl Check Bison version -dnl AC_PROG_BISON([MIN_VERSION=2.6]) +dnl AC_PROG_BISON([MIN_VERSION=2.4]) dnl dnl Will define BISON_USE_PARSER_H_EXTENSION if Automake is < 1.11 dnl for use with .h includes. @@ -8,7 +8,7 @@ dnl AC_DEFUN([AC_PROG_BISON], [ if test "x$1" = "x" ; then - bison_required_version="2.6" + bison_required_version="2.4" else bison_required_version="$1" fi @@ -27,7 +27,7 @@ if test "$have_prog_bison" = "yes" ; then if test "$bison_version" \< "$bison_required_version" ; then BISON=: AC_MSG_RESULT([no]) - AC_MSG_ERROR([Bison version 2.6 or higher must be installed on the system!]) + AC_MSG_ERROR([Bison version 2.4 or higher must be installed on the system!]) else AC_MSG_RESULT([yes]) BISON=bison |