projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3329 from efuss/fix-3311
[collectd.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
3ef087d
..
40ccafe
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-743,10
+743,10
@@
test_cxx_flags() {
#
AC_CHECK_FUNCS_ONCE([ \
asprintf \
#
AC_CHECK_FUNCS_ONCE([ \
asprintf \
+ execvpe \
getpwnam \
getpwnam_r \
if_indextoname \
getpwnam \
getpwnam_r \
if_indextoname \
- setenv \
setgroups \
setlocale
]
setgroups \
setlocale
]
@@
-2722,6
+2722,7
@@
if test "x$withval" != "xno"; then
else
AC_MSG_RESULT([no])
with_libgrpcpp="no (requires C++11 support)"
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
fi
fi
@@
-4568,7
+4569,7
@@
if test "x$withval" != "xno"; then
AC_CHECK_LIB([protobuf], [main],
[
SAVE_CPPFLAGS="$CPPFLAGS"
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"
if test "x$PROTOBUF_LIBS" = "x"
then
PROTOBUF_LIBS="-lprotobuf"
@@
-5398,7
+5399,7
@@
AC_ARG_WITH([libtokyotyrant],
with_libtokyotyrant="$withval"
else
with_libtokyotyrant_cppflags="-I$withval/include"
with_libtokyotyrant="$withval"
else
with_libtokyotyrant_cppflags="-I$withval/include"
- with_libtokyotyrant_ldflags="-L$withval/
include
"
+ with_libtokyotyrant_ldflags="-L$withval/
lib
"
with_libtokyotyrant_libs="-ltokyotyrant"
with_libtokyotyrant="yes"
fi
with_libtokyotyrant_libs="-ltokyotyrant"
with_libtokyotyrant="yes"
fi