You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by dr...@apache.org on 2009/02/17 21:28:31 UTC

svn commit: r745240 - in /incubator/thrift/trunk: compiler/cpp/Makefile.am configure.ac

Author: dreiss
Date: Tue Feb 17 20:28:30 2009
New Revision: 745240

URL: http://svn.apache.org/viewvc?rev=745240&view=rev
Log:
Allow the Thrift compiler to be built without the PHP generator.

- Use AX_THRIFT_GEN to make configure support --disable-gen-php
- Update the compiler Makefile.am to exclude the generator.

Modified:
    incubator/thrift/trunk/compiler/cpp/Makefile.am
    incubator/thrift/trunk/configure.ac

Modified: incubator/thrift/trunk/compiler/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/Makefile.am?rev=745240&r1=745239&r2=745240&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/Makefile.am (original)
+++ incubator/thrift/trunk/compiler/cpp/Makefile.am Tue Feb 17 20:28:30 2009
@@ -10,7 +10,6 @@
                  src/main.cc \
                  src/md5.c \
                  src/generate/t_generator.cc \
-                 src/generate/t_php_generator.cc \
                  src/globals.h \
                  src/main.h \
                  src/platform.h \
@@ -54,6 +53,9 @@
 if THRIFT_GEN_perl
 thrift_SOURCES += src/generate/t_perl_generator.cc
 endif
+if THRIFT_GEN_php
+thrift_SOURCES += src/generate/t_php_generator.cc
+endif
 if THRIFT_GEN_erl
 thrift_SOURCES += src/generate/t_erl_generator.cc
 endif

Modified: incubator/thrift/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/configure.ac?rev=745240&r1=745239&r2=745240&view=diff
==============================================================================
--- incubator/thrift/trunk/configure.ac (original)
+++ incubator/thrift/trunk/configure.ac Tue Feb 17 20:28:30 2009
@@ -162,6 +162,8 @@
 AM_CONDITIONAL([THRIFT_GEN_rb], [test "$ax_thrift_gen_rb" = "yes"])
 AX_THRIFT_GEN(perl, [Perl], yes)
 AM_CONDITIONAL([THRIFT_GEN_perl], [test "$ax_thrift_gen_perl" = "yes"])
+AX_THRIFT_GEN(php, [PHP], yes)
+AM_CONDITIONAL([THRIFT_GEN_php], [test "$ax_thrift_gen_php" = "yes"])
 AX_THRIFT_GEN(erl, [Erlang], yes)
 AM_CONDITIONAL([THRIFT_GEN_erl], [test "$ax_thrift_gen_erl" = "yes"])
 AX_THRIFT_GEN(cocoa, [Cocoa], yes)