40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
From 5b0661f1e8a0e03f75cc6f53b8d42507e95403c9 Mon Sep 17 00:00:00 2001
|
|
From: Robert Edmonds <edmonds@users.noreply.github.com>
|
|
Date: Mon, 3 Jul 2023 01:10:28 -0400
|
|
Subject: [PATCH] configure.ac: Require C++17
|
|
|
|
There are some recent reports of strange build failures that might have
|
|
been fixed by compiling in C++17 mode, so it might be a good idea to use
|
|
C++17 in general, and not just when building against very recent
|
|
protobuf versions.
|
|
|
|
Since it looks like we've lost protobuf < 3.0.0 support, configure.ac
|
|
can be simplified a bit if we just use C++17 by default.
|
|
---
|
|
configure.ac | 23 ++---------------------
|
|
1 file changed, 2 insertions(+), 21 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index fa024b6..586ac3c 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -75,13 +75,8 @@ 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(11, noext, mandatory)
|
|
-
|
|
- PKG_CHECK_MODULES([protobuf], [protobuf >= 3.0.0],
|
|
- [proto3_supported=yes],
|
|
- [PKG_CHECK_MODULES([protobuf], [protobuf >= 2.6.0])]
|
|
- )
|
|
+ AX_CXX_COMPILE_STDCXX(17, noext, mandatory)
|
|
+ PKG_CHECK_MODULES([protobuf], [protobuf >= 3.0.0], [proto3_supported=yes])
|
|
|
|
save_CPPFLAGS="$CPPFLAGS"
|
|
CPPFLAGS="$save_CPPFLAGS $protobuf_CFLAGS"
|
|
--
|
|
2.33.0
|
|
|