From e8a87de8676cf8043dce97be59d03bef3b477299 Mon Sep 17 00:00:00 2001 From: David Reiss Date: Wed, 27 Feb 2008 02:39:25 +0000 Subject: [PATCH] Allow the Thrift compiler to be built without the Java generator. - Use AX_THRIFT_GEN to make configure support --disable-gen-java - Update the compiler Makefile.am to exclude the generator. git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665517 13f79535-47bb-0310-9956-ffa450edef68 --- compiler/cpp/Makefile.am | 4 +++- configure.ac | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am index 1c47657e..2c672553 100644 --- a/compiler/cpp/Makefile.am +++ b/compiler/cpp/Makefile.am @@ -9,7 +9,6 @@ thrift_SOURCES = src/thrifty.yy \ src/main.cc \ src/md5c.c \ src/generate/t_generator.cc \ - src/generate/t_java_generator.cc \ src/generate/t_php_generator.cc \ src/generate/t_py_generator.cc \ src/generate/t_rb_generator.cc \ @@ -60,6 +59,9 @@ thrift_SOURCES = src/thrifty.yy \ if THRIFT_GEN_cpp thrift_SOURCES += src/generate/t_cpp_generator.cc endif +if THRIFT_GEN_java +thrift_SOURCES += src/generate/t_java_generator.cc +endif thrift_CXXFLAGS = -Wall -I$(srcdir)/src $(BOOST_CPPFLAGS) thrift_LDFLAGS = -Wall $(BOOST_LDFLAGS) diff --git a/configure.ac b/configure.ac index 13f0d8ec..113ae9f8 100644 --- a/configure.ac +++ b/configure.ac @@ -115,6 +115,8 @@ AC_CHECK_FUNCS([sqrt]) AX_THRIFT_GEN(cpp, [C++], yes) AM_CONDITIONAL([THRIFT_GEN_cpp], [test "$ax_thrift_gen_cpp" = "yes"]) +AX_THRIFT_GEN(java, [Java], yes) +AM_CONDITIONAL([THRIFT_GEN_java], [test "$ax_thrift_gen_java" = "yes"]) AC_CONFIG_HEADERS(config.h:config.hin) -- 2.17.1