You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by mo...@apache.org on 2010/10/05 18:45:50 UTC
svn commit: r1004707 - /incubator/thrift/trunk/configure.ac
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"
Re: svn commit: r1004707 - /incubator/thrift/trunk/configure.ac
Posted by Anthony Molinaro <an...@alumni.caltech.edu>.
Hi David,
Yeah, sorry about that, I just happen to forget with that first
patch (the other 2 I commited right after had the THRIFT-### in the
commit messages).
I'll +1 and let you next time.
Also sorry I didn't get to it sooner, just been slammed at work the
last couple weeks.
-Anthony
On Tue, Oct 05, 2010 at 09:51:41AM -0700, David Reiss wrote:
> Hey Anthony,
>
> It's best to include the issue name in the commit message so that JIRA
> automatically includes the commit information in the "all" tab and
> people looking at the commit history can find the issue with the
> description of the problem.
>
> I almost always include my commit message with the patches I upload, so
> if it's a patch from me, you can just give it a +1 and I'll commit it
> myself.
>
> --David
>
> On 10/05/2010 09:45 AM, molinaro@apache.org wrote:
> > 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"
> >
> >
--
------------------------------------------------------------------------
Anthony Molinaro <an...@alumni.caltech.edu>
Re: svn commit: r1004707 - /incubator/thrift/trunk/configure.ac
Posted by David Reiss <dr...@facebook.com>.
Hey Anthony,
It's best to include the issue name in the commit message so that JIRA
automatically includes the commit information in the "all" tab and
people looking at the commit history can find the issue with the
description of the problem.
I almost always include my commit message with the patches I upload, so
if it's a patch from me, you can just give it a +1 and I'll commit it
myself.
--David
On 10/05/2010 09:45 AM, molinaro@apache.org wrote:
> 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"
>
>