3party/protobuf-c
0
0
Fork 0
mirror of https://github.com/protobuf-c/protobuf-c.git synced 2024-12-27 13:31:02 +08:00
Code Issues Projects Releases Wiki Activity

build system: add back the --disable-protoc option to configure

Browse Source
This commit is contained in:
Robert Edmonds 2014-01-13 17:25:29 -05:00
parent 4c7904fc13
commit a2fb294a22
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -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 \

18
configure.ac
View File

@ -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}
])