Allow the Thrift compiler to be built without the Ruby generator.

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

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

diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am
index 6f618ea..6061988 100644 (file)
--- a/compiler/cpp/Makefile.am
+++ b/compiler/cpp/Makefile.am
@@ -10,7 +10,6 @@ thrift_SOURCES = src/thrifty.yy \
                  src/md5c.c \
                  src/generate/t_generator.cc \
                  src/generate/t_php_generator.cc \
-                 src/generate/t_rb_generator.cc \
                  src/generate/t_xsd_generator.cc \
                  src/generate/t_perl_generator.cc \
                  src/generate/t_erl_generator.cc \
@@ -55,6 +54,9 @@ endif
 if THRIFT_GEN_py
 thrift_SOURCES += src/generate/t_py_generator.cc
 endif
+if THRIFT_GEN_rb
+thrift_SOURCES += src/generate/t_rb_generator.cc
+endif
 if THRIFT_GEN_cocoa
 thrift_SOURCES += src/generate/t_cocoa_generator.cc
 endif

diff --git a/configure.ac b/configure.ac
index 6c9e4a4..f56a276 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -134,6 +134,8 @@ AX_THRIFT_GEN(csharp, [C#], yes)
 AM_CONDITIONAL([THRIFT_GEN_csharp], [test "$ax_thrift_gen_csharp" = "yes"])
 AX_THRIFT_GEN(py, [Python], yes)
 AM_CONDITIONAL([THRIFT_GEN_py], [test "$ax_thrift_gen_py" = "yes"])
+AX_THRIFT_GEN(rb, [Ruby], yes)
+AM_CONDITIONAL([THRIFT_GEN_rb], [test "$ax_thrift_gen_rb" = "yes"])
 AX_THRIFT_GEN(cocoa, [Cocoa], yes)
 AM_CONDITIONAL([THRIFT_GEN_cocoa], [test "$ax_thrift_gen_cocoa" = "yes"])
 AX_THRIFT_GEN(st, [Smalltalk], yes)