projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Many build fixes that turned up with GCC 4.6.
[collectd.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
89c870b
..
88cdb50
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-2556,19
+2556,13
@@
then
fi
if test "x$with_libpcap" = "xyes"
then
fi
if test "x$with_libpcap" = "xyes"
then
- AC_CHECK_HEADERS(pcap.h,
- [
- AC_DEFINE(HAVE_PCAP_H, 1, [Define to 1 if you have the <pcap.h> header file.])
- ], [with_libpcap="no (pcap.h not found)"])
+ AC_CHECK_HEADERS(pcap.h,,
+ [with_libpcap="no (pcap.h not found)"])
fi
if test "x$with_libpcap" = "xyes"
then
fi
if test "x$with_libpcap" = "xyes"
then
- collect_libpcap=1
-else
- collect_libpcap=0
+ AC_CHECK_HEADERS(pcap-bpf.h)
fi
fi
-AC_DEFINE_UNQUOTED(COLLECT_LIBPCAP, [$collect_libpcap],
- [Wether or not to use the pcap library])
AM_CONDITIONAL(BUILD_WITH_LIBPCAP, test "x$with_libpcap" = "xyes")
# }}}
AM_CONDITIONAL(BUILD_WITH_LIBPCAP, test "x$with_libpcap" = "xyes")
# }}}
@@
-3613,6
+3607,7
@@
then
CPPFLAGS="$CPPFLAGS $with_libyajl_cppflags"
AC_CHECK_HEADERS(yajl/yajl_parse.h, [with_libyajl="yes"], [with_libyajl="no (yajl/yajl_parse.h not found)"])
CPPFLAGS="$CPPFLAGS $with_libyajl_cppflags"
AC_CHECK_HEADERS(yajl/yajl_parse.h, [with_libyajl="yes"], [with_libyajl="no (yajl/yajl_parse.h not found)"])
+ AC_CHECK_HEADERS(yajl/yajl_version.h)
CPPFLAGS="$SAVE_CPPFLAGS"
fi
CPPFLAGS="$SAVE_CPPFLAGS"
fi