From 30a472e04f26312f93cee0faaaa80a99bb3ed776 Mon Sep 17 00:00:00 2001
From: jfarrell <jfarrell@apache.org>
Date: Thu, 10 Jul 2014 18:42:30 -0400
Subject: 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.
---
 aclocal/ac_prog_bison.m4 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'aclocal')

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
-- 
cgit v1.2.1