From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 29 Oct 2019 14:43:42 +0000 (+0100)
Subject: Merge pull request #3325 from ffontaine/master
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=43282e32b42b1c7e7739a4cb73728d3ecbc2af9a;hp=b5b5d43f302e0b9290d3e247ea29699814d46abb

Merge pull request #3325 from ffontaine/master

configure.ac: fix protobuf/util/time_util.h detection
---

diff --git a/configure.ac b/configure.ac
index 34386d06..59a7f355 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2722,6 +2722,7 @@ if test "x$withval" != "xno"; then
   else
     AC_MSG_RESULT([no])
     with_libgrpcpp="no (requires C++11 support)"
+    with_libprotobuf="no (<google/protobuf/util/time_util.h> requires C++11 support)"
   fi
 fi
 
@@ -4568,7 +4569,7 @@ if test "x$withval" != "xno"; then
   AC_CHECK_LIB([protobuf], [main],
     [
       SAVE_CPPFLAGS="$CPPFLAGS"
-      CPPFLAGS="$with_libprotobuf_cppflags $PROTOBUF_CFLAGS"
+      CPPFLAGS="-std=c++11 $with_libprotobuf_cppflags $PROTOBUF_CFLAGS"
       if test "x$PROTOBUF_LIBS" = "x"
       then
         PROTOBUF_LIBS="-lprotobuf"