From a2fb294a22b0970d434cf93a56ddd097a2548f8e Mon Sep 17 00:00:00 2001
From: Robert Edmonds <edmonds@fsi.io>
Date: Mon, 13 Jan 2014 17:25:29 -0500
Subject: [PATCH] build system: add back the --disable-protoc option to
 configure

---
 Makefile.am  |  4 ++++
 configure.ac | 18 +++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 2d2c393..0c558ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,6 +52,8 @@ EXTRA_DIST += protobuf-c/libprotobuf-c.pc.in
 # protoc-c
 #
 
+if BUILD_COMPILER
+
 bin_PROGRAMS += protoc-c/protoc-c
 protoc_c_protoc_c_SOURCES = \
 	protoc-c/c_bytes_field.cc \
@@ -143,6 +145,8 @@ BUILT_SOURCES += \
 	t/test-full.pb.cc t/test-full.pb.h \
 	t/generated-code2/test-full-cxx-output.inc
 
+endif # BUILD_COMPILER
+
 EXTRA_DIST += \
 	t/test.proto \
 	t/test-full.proto \
diff --git a/configure.ac b/configure.ac
index a9fb324..6011308 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,12 +26,20 @@ else
     AC_MSG_ERROR([pkg-config is required!])
 fi
 
-PKG_CHECK_MODULES([protobuf], [protobuf])
-AC_LANG_PUSH([C++])
-AC_PATH_PROG(PROTOC, protoc)
-if test -z "$PROTOC"; then
+AC_ARG_ENABLE([protoc],
+  AS_HELP_STRING([--disable-protoc], [Disable building protoc_c (also disables tests)]))
+if test "x$enable_protoc" != "xno"; then
+  PKG_CHECK_MODULES([protobuf], [protobuf])
+  AC_LANG_PUSH([C++])
+  AC_PATH_PROG(PROTOC, protoc)
+  if test -z "$PROTOC"; then
     AC_MSG_ERROR([Please install the protobuf compiler from https://code.google.com/p/protobuf/.])
+  fi
+  PROTOBUF_VERSION="$($PROTOC --version)"
+else
+  PROTOBUF_VERSION="not required, not building compiler"
 fi
+AM_CONDITIONAL([BUILD_COMPILER], [test "x$enable_protoc" != "xno"])
 
 AC_C_BIGENDIAN
 
@@ -53,5 +61,5 @@ AC_MSG_RESULT([
         pkgconfigdir:           ${pkgconfigdir}
 
         bigendian:              ${ac_cv_c_bigendian}
-        protobuf version:       $($PROTOC --version)
+        protobuf version:       ${PROTOBUF_VERSION}
 ])