X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.in;h=88cdb50f17d3549cd48092523dd833a5c22e0c21;hb=61a1fa91ba73e4fe3a34949f77c5f017056f2b7a;hp=89c870b4aeaa5feaafa46eaa8be2b9aa0e9b53d6;hpb=dbcb0610ae7dfa0155b04aa4174ec35a1058d18e;p=collectd.git

diff --git a/configure.in b/configure.in
index 89c870b4..88cdb50f 100644
--- a/configure.in
+++ b/configure.in
@@ -2556,19 +2556,13 @@ 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
-	collect_libpcap=1
-else
-	collect_libpcap=0
+	AC_CHECK_HEADERS(pcap-bpf.h)
 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")
 # }}}
 
@@ -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)"])
+	AC_CHECK_HEADERS(yajl/yajl_version.h)
 
 	CPPFLAGS="$SAVE_CPPFLAGS"
 fi