projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.9' into collectd-4.10
[collectd.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
804cdfc
..
75ac706
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-484,6
+484,13
@@
AC_CHECK_FUNCS(gettimeofday select strdup strtol getaddrinfo getnameinfo strchr
AC_FUNC_STRERROR_R
AC_FUNC_STRERROR_R
+SAVE_CFLAGS="$CFLAGS"
+# Emulate behavior of src/Makefile.am
+if test "x$GCC" = "xyes"
+then
+ CFLAGS="$CFLAGS -Wall -Werror"
+fi
+
AC_CACHE_CHECK([for strtok_r],
[c_cv_have_strtok_r_default],
AC_LINK_IFELSE(
AC_CACHE_CHECK([for strtok_r],
[c_cv_have_strtok_r_default],
AC_LINK_IFELSE(
@@
-514,7
+521,6
@@
AC_CACHE_CHECK([for strtok_r],
if test "x$c_cv_have_strtok_r_default" = "xno"
then
if test "x$c_cv_have_strtok_r_default" = "xno"
then
- SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -D_REENTRANT=1"
AC_CACHE_CHECK([if strtok_r needs _REENTRANT],
CFLAGS="$CFLAGS -D_REENTRANT=1"
AC_CACHE_CHECK([if strtok_r needs _REENTRANT],
@@
-546,6
+552,12
@@
then
)
fi
)
fi
+CFLAGS="$SAVE_CFLAGS"
+if test "x$c_cv_have_strtok_r_reentrant" = "xyes"
+then
+ CFLAGS="$CFLAGS -D_REENTRANT=1"
+fi
+
AC_CHECK_FUNCS(getpwnam_r getgrnam_r setgroups regcomp regerror regexec regfree)
socket_needs_socket="no"
AC_CHECK_FUNCS(getpwnam_r getgrnam_r setgroups regcomp regerror regexec regfree)
socket_needs_socket="no"
@@
-955,7
+967,7
@@
fi
AC_MSG_CHECKING([if have htonll defined])
have_htonll="no"
AC_MSG_CHECKING([if have htonll defined])
have_htonll="no"
- AC_
RUN
_IFELSE([
+ AC_
LINK
_IFELSE([
AC_LANG_PROGRAM([
#include <sys/types.h>
#include <netinet/in.h>
AC_LANG_PROGRAM([
#include <sys/types.h>
#include <netinet/in.h>
@@
-4018,7
+4030,7
@@
then
plugin_vserver="yes"
plugin_wireless="yes"
plugin_vserver="yes"
plugin_wireless="yes"
- if test "x$have_net_ip_vs_h" = "xyes"
-o
"x$have_ip_vs_h" = "xyes"
+ if test "x$have_net_ip_vs_h" = "xyes"
|| test
"x$have_ip_vs_h" = "xyes"
then
plugin_ipvs="yes"
fi
then
plugin_ipvs="yes"
fi
@@
-4488,7
+4500,7
@@
then
with_librrd="yes (warning: librrd is not thread-safe)"
fi
with_librrd="yes (warning: librrd is not thread-safe)"
fi
-if test "x$with_libiptc" = "xyes"
-a
"x$with_own_libiptc" = "xyes"
+if test "x$with_libiptc" = "xyes"
&& test
"x$with_own_libiptc" = "xyes"
then
with_libiptc="yes (shipped version)"
fi
then
with_libiptc="yes (shipped version)"
fi