From 3d671b5e537482e40e4869dbe0235edf496b3184 Mon Sep 17 00:00:00 2001 From: David Reiss Date: Thu, 27 Mar 2008 21:40:11 +0000 Subject: [PATCH] Allow the Thrift compiler to be built without the OCaml generator. - Use AX_THRIFT_GEN to make configure support --disable-gen-ocaml - Update the compiler Makefile.am to exclude the generator. git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665593 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 eed2043d..bb78b1ef 100644 --- a/compiler/cpp/Makefile.am +++ b/compiler/cpp/Makefile.am @@ -14,7 +14,6 @@ thrift_SOURCES = src/thrifty.yy \ src/generate/t_rb_generator.cc \ src/generate/t_xsd_generator.cc \ src/generate/t_perl_generator.cc \ - src/generate/t_ocaml_generator.cc \ src/generate/t_erl_generator.cc \ src/generate/t_hs_generator.cc \ src/generate/t_cocoa_generator.cc \ @@ -61,6 +60,9 @@ endif if THRIFT_GEN_java thrift_SOURCES += src/generate/t_java_generator.cc endif +if THRIFT_GEN_ocaml +thrift_SOURCES += src/generate/t_ocaml_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 76d12bfb..db682591 100644 --- a/configure.ac +++ b/configure.ac @@ -130,6 +130,8 @@ 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"]) +AX_THRIFT_GEN(ocaml, [OCaml], yes) +AM_CONDITIONAL([THRIFT_GEN_ocaml], [test "$ax_thrift_gen_ocaml" = "yes"]) AC_CONFIG_HEADERS(config.h:config.hin) -- 2.17.1