Author: molinaro
Date: Tue Oct 5 16:45:50 2010
New Revision: 1004707
URL: http://svn.apache.org/viewvc?rev=1004707&view=rev
Log:
disable php extension if php-config is missing
Modified:
incubator/thrift/trunk/configure.ac
Modified: incubator/thrift/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/configure.ac?rev=1004707&r1=1004706&r2=1004707&view=diff
==============================================================================
--- incubator/thrift/trunk/configure.ac (original)
+++ incubator/thrift/trunk/configure.ac Tue Oct 5 16:45:50 2010
@@ -181,9 +181,12 @@ AM_CONDITIONAL(WITH_PHP, [test "$have_ph
AX_THRIFT_LIB(php_extension, [PHP_EXTENSION], yes)
if test "$with_php_extension" = "yes"; then
AC_PATH_PROG([PHP_CONFIG], [php-config])
- AC_CONFIG_SUBDIRS([lib/php/src/ext/thrift_protocol])
+ if test -n "$PHP_CONFIG" ; then
+ AC_CONFIG_SUBDIRS([lib/php/src/ext/thrift_protocol])
+ have_php_extension="yes"
+ fi
fi
-AM_CONDITIONAL(WITH_PHP_EXTENSION, [test -n "$PHP_CONFIG"])
+AM_CONDITIONAL(WITH_PHP_EXTENSION, [test "$have_php_extension" = "yes"])
AX_THRIFT_LIB(ruby, [Ruby], yes)
have_ruby=no
@@ -402,6 +405,10 @@ if test "$have_python" = "yes" ; then
echo
echo "Using Python ................. : $PYTHON"
fi
+if test "$have_php" = "yes" ; then
+ echo
+ echo "Using php-config ............. : $PHP_CONFIG"
+fi
if test "$have_ruby" = "yes" ; then
echo
echo "Using Ruby ................... : $RUBY"
