47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
From 7dca1c382c2096ac1324b001cea53c39052843da Mon Sep 17 00:00:00 2001
|
|
From: Robert Edmonds <edmonds@users.noreply.github.com>
|
|
Date: Sat, 8 Jul 2023 23:11:03 -0400
|
|
Subject: [PATCH 1/5] configure.ac: Remove `proto3_supported`, `BUILD_PROTO3`
|
|
|
|
Since we require protobuf >= 3.0.0 now, the proto3 syntax is always
|
|
supported.
|
|
---
|
|
configure.ac | 7 +------
|
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 586ac3c..f03198a 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -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
|
|
--
|
|
2.33.0
|
|
|