mirror of
https://github.com/protobuf-c/protobuf-c.git
synced 2024-12-26 21:04:23 +08:00
configure.ac: Remove proto3_supported
, BUILD_PROTO3
Since we require protobuf >= 3.0.0 now, the proto3 syntax is always supported.
This commit is contained in:
parent
f46c1fd603
commit
7dca1c382c
@ -69,14 +69,12 @@ if test -n "$PKG_CONFIG"; then
|
||||
fi
|
||||
fi
|
||||
|
||||
proto3_supported="no"
|
||||
|
||||
AC_ARG_ENABLE([protoc],
|
||||
AS_HELP_STRING([--disable-protoc], [Disable building protoc_c (also disables tests)]))
|
||||
if test "x$enable_protoc" != "xno"; then
|
||||
AC_LANG_PUSH([C++])
|
||||
AX_CXX_COMPILE_STDCXX(17, noext, mandatory)
|
||||
PKG_CHECK_MODULES([protobuf], [protobuf >= 3.0.0], [proto3_supported=yes])
|
||||
PKG_CHECK_MODULES([protobuf], [protobuf >= 3.0.0])
|
||||
|
||||
save_CPPFLAGS="$CPPFLAGS"
|
||||
CPPFLAGS="$save_CPPFLAGS $protobuf_CFLAGS"
|
||||
@ -99,11 +97,8 @@ else
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL([BUILD_COMPILER], [test "x$enable_protoc" != "xno"])
|
||||
AM_CONDITIONAL([BUILD_PROTO3], [test "x$proto3_supported" != "xno"])
|
||||
AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" != "xno"])
|
||||
|
||||
AM_COND_IF([BUILD_PROTO3], [AC_DEFINE([HAVE_PROTO3], [1], [Support proto3 syntax])])
|
||||
|
||||
gl_LD_VERSION_SCRIPT
|
||||
|
||||
gl_VALGRIND_TESTS
|
||||
|
Loading…
x
Reference in New Issue
Block a user