projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
statsd, utils_latency: allow to reduce bin width
[collectd.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
1bacddd
..
4435193
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-2376,7
+2376,7
@@
if test "x$with_libgrpcpp" = "xyes"
then
AC_LANG_PUSH(C++)
SAVE_CPPFLAGS="$CPPFLAGS"
then
AC_LANG_PUSH(C++)
SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="
$with_libgrpcpp_cppflags $GRPCPP_CFLAGS $CPPFLAGS -std=c++11
"
+ CPPFLAGS="
-std=c++11 $with_libgrpcpp_cppflags $GRPCPP_CFLAGS $CPPFLAGS
"
AC_CHECK_HEADERS([grpc++/grpc++.h], [],
[with_libgrpcpp="no (<grpc++/grpc++.h> not found)"]
)
AC_CHECK_HEADERS([grpc++/grpc++.h], [],
[with_libgrpcpp="no (<grpc++/grpc++.h> not found)"]
)
@@
-2386,8
+2386,10
@@
fi
if test "x$with_libgrpcpp" = "xyes"
then
AC_LANG_PUSH(C++)
if test "x$with_libgrpcpp" = "xyes"
then
AC_LANG_PUSH(C++)
+ SAVE_CPPFLAGS="$CPPFLAGS"
SAVE_LDFLAGS="$LDFLAGS"
SAVE_LIBS="$LIBS"
SAVE_LDFLAGS="$LDFLAGS"
SAVE_LIBS="$LIBS"
+ CPPFLAGS="-std=c++11 $with_libgrpcpp_cppflags $GRPCPP_CFLAGS $CPPFLAGS"
LDFLAGS="$with_libgrpcpp_ldflags"
if test "x$GRPCPP_LIBS" = "x"
then
LDFLAGS="$with_libgrpcpp_ldflags"
if test "x$GRPCPP_LIBS" = "x"
then
@@
-2409,6
+2411,7
@@
then
],
[with_libgrpcpp="no (libgrpc++ not found)"]
)
],
[with_libgrpcpp="no (libgrpc++ not found)"]
)
+ CPPFLAGS="$SAVE_CPPFLAGS"
LDFLAGS="$SAVE_LDFLAGS"
LIBS="$SAVE_LIBS"
AC_LANG_POP(C++)
LDFLAGS="$SAVE_LDFLAGS"
LIBS="$SAVE_LIBS"
AC_LANG_POP(C++)