From: Anthony F. Molinaro <molinaro@apache.org>
Date: Tue, 5 Oct 2010 16:45:50 +0000 (+0000)
Subject: disable php extension if php-config is missing
X-Git-Tag: 0.6.0~142
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=ddcf32ab9cb342de899f6c572b5ecb64be2a8fb1;p=common%2Fthrift.git

disable php extension if php-config is missing

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@1004707 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/configure.ac b/configure.ac
index 0b0a0958..dc083446 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,9 +181,12 @@ AM_CONDITIONAL(WITH_PHP, [test "$have_php" = "yes"])
 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"