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.
diff --git a/configure.ac b/configure.ac
index 49d704e..065ac68 100755
--- a/configure.ac
+++ b/configure.ac
@@ -265,10 +265,12 @@
AX_THRIFT_LIB(php_extension, [PHP_EXTENSION], yes)
if test "$with_php_extension" = "yes"; then
- AC_PATH_PROG([PHP_CONFIG], [php-config])
- if test -n "$PHP_CONFIG" ; then
- AC_CONFIG_SUBDIRS([lib/php/src/ext/thrift_protocol])
- have_php_extension="yes"
+ if test -f "lib/php/src/ext/thrift_protocol/configure"; then
+ AC_PATH_PROG([PHP_CONFIG], [php-config])
+ if test -n "$PHP_CONFIG" ; then
+ AC_CONFIG_SUBDIRS([lib/php/src/ext/thrift_protocol])
+ have_php_extension="yes"
+ fi
fi
fi
AM_CONDITIONAL(WITH_PHP_EXTENSION, [test "$have_php_extension" = "yes"])