mirror of
https://github.com/openwrt/packages.git
synced 2025-07-20 14:49:13 +00:00
104fa7a6ff
The second patch, which addresses a problem where the build would include -I/usr/include, made the first patch obsolete. The first patch had fixed the detection of pthreads, but this was a red herring caused by the circumstances surrounding the second. Signed-off-by: W. Michael Petullo <mike@flyn.org>
25 lines
676 B
Diff
25 lines
676 B
Diff
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -364,8 +364,6 @@ AM_COND_IF([BUILDNFPCAPD],
|
|
[AM_CONDITIONAL(BSDBPF, false) AM_CONDITIONAL(TPACKETV3, false) AM_CONDITIONAL(PLAINPCAP, false)],
|
|
)
|
|
|
|
-AX_CHECK_ZLIB([AM_CONDITIONAL(HAVEZLIB, true) readzpcap="yes"], [AM_CONDITIONAL(HAVEZLIB, false) readzpcap="no"])
|
|
-
|
|
OVS_CHECK_ATOMIC_LIBS
|
|
AX_PTHREAD([],AC_MSG_ERROR(No valid pthread configuration found))
|
|
|
|
--- a/src/nfpcapd/Makefile.am
|
|
+++ b/src/nfpcapd/Makefile.am
|
|
@@ -29,10 +29,4 @@ if HAVEPCAPAPPEND
|
|
AM_CPPFLAGS += -DHAVEPCAPAPPEND
|
|
endif
|
|
|
|
-if HAVEZLIB
|
|
-AM_CPPFLAGS += -DHAVEZLIB
|
|
-nfpcapd_SOURCES += pcap_gzip.c pcap_gzip.h
|
|
-nfpcapd_LDADD += -lz
|
|
-endif
|
|
-
|
|
CLEANFILES = *.gch
|