From 4b349aabc946289a200e5691140e7000b33b9583 Mon Sep 17 00:00:00 2001 From: David Reiss Date: Thu, 27 Mar 2008 21:41:02 +0000 Subject: [PATCH] Allow the Thrift compiler to be built without the Cocoa generator. - Use AX_THRIFT_GEN to make configure support --disable-gen-cocoa - Update the compiler Makefile.am to exclude the generator. git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665605 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 eb8a2fcc..ae53d4be 100644 --- a/compiler/cpp/Makefile.am +++ b/compiler/cpp/Makefile.am @@ -15,7 +15,6 @@ thrift_SOURCES = src/thrifty.yy \ src/generate/t_xsd_generator.cc \ src/generate/t_perl_generator.cc \ src/generate/t_erl_generator.cc \ - src/generate/t_cocoa_generator.cc \ src/generate/t_csharp_generator.cc \ src/globals.h \ src/main.h \ @@ -55,6 +54,9 @@ endif if THRIFT_GEN_java thrift_SOURCES += src/generate/t_java_generator.cc endif +if THRIFT_GEN_cocoa +thrift_SOURCES += src/generate/t_cocoa_generator.cc +endif if THRIFT_GEN_st thrift_SOURCES += src/generate/t_st_generator.cc endif diff --git a/configure.ac b/configure.ac index 8e90092b..6d41505c 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(cocoa, [Cocoa], yes) +AM_CONDITIONAL([THRIFT_GEN_cocoa], [test "$ax_thrift_gen_cocoa" = "yes"]) AX_THRIFT_GEN(st, [Smalltalk], yes) AM_CONDITIONAL([THRIFT_GEN_st], [test "$ax_thrift_gen_st" = "yes"]) AX_THRIFT_GEN(ocaml, [OCaml], yes) -- 2.17.1