blob: b6ec19388b948ea776ead38841b182f948454b50 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
diff -Nur libnids-1.18/configure libnids-1.18.patched/configure
--- libnids-1.18.orig/configure 2003-10-15 01:40:09.000000000 +0200
+++ libnids-1.18/configure 2007-01-23 00:18:43.000000000 +0100
@@ -3253,7 +3253,7 @@ presetting ac_cv_c_bigendian=no (or yes)
esac
-CFLAGS="$CFLAGS -D_BSD_SOURCE"
+CFLAGS="$CFLAGS"
for ac_func in gettimeofday
do
@@ -3489,17 +3489,21 @@ if test "${with_libpcap+set}" = set; the
echo "${ECHO_T}no" >&6
;;
*)
- echo "$as_me:$LINENO: result: $withval" >&5
-echo "${ECHO_T}$withval" >&6
+ echo "$ac_t""$withval" 1>&6
if test -f $withval/pcap.h -a -f $withval/libpcap.a; then
owd=`pwd`
if cd $withval; then withval=`pwd`; cd $owd; fi
- PCAP_CFLAGS="-I$withval -I$withval/bpf"
+ PCAPINC="-I$withval -I$withval/bpf"
PCAPLIB="-L$withval -lpcap"
+ elif test -f $withval/include/pcap.h -a \
+ -f $withval/include/pcap-bpf.h -a \
+ -f $withval/lib/libpcap.a; then
+ owd=`pwd`
+ if cd $withval; then withval=`pwd`; cd $owd; fi
+ PCAPINC="-I$withval/include"
+ PCAPLIB="-L$withval/lib -lpcap"
else
- { { echo "$as_me:$LINENO: error: pcap.h or libpcap.a not found in $withval" >&5
-echo "$as_me: error: pcap.h or libpcap.a not found in $withval" >&2;}
- { (exit 1); exit 1; }; }
+ { echo "configure: error: pcap.h" 1>&2; exit 1; }
fi
;;
esac
@@ -3605,18 +3609,18 @@ echo "${ECHO_T}no" >&6
*)
echo "$as_me:$LINENO: result: $withval" >&5
echo "${ECHO_T}$withval" >&6
- if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.a -a -f $withval/libnet-config ; then
+ if test -f $withval/include/libnet.h -a -f $withval/bin/libnet-config ; then
owd=`pwd`
if cd $withval; then withval=`pwd`; cd $owd; fi
- LNET_CFLAGS="-I$withval/include `$withval/libnet-config --defines`"
+ LNET_CFLAGS="-I$withval/include `$withval/bin/libnet-config --defines`"
LNETLIB="-L$withval/lib -lnet"
- elif test -f $withval/include/libnet.h -a -f $withval/src/libnet.a; then
+ elif test -f $withval/include/libnet.h; then
owd=`pwd`
if cd $withval; then withval=`pwd`; cd $owd; fi
LNET_CFLAGS="-I$withval/include"
- LNETLIB="-L$withval/src -lnet"
+ LNETLIB="-L$withval/lib -lnet"
else
- echo "A working combination of libnet.h, libnet.a and libnet-config not found in $withval; get libnet from www.packetfactory.net/projects/libnet and reinstall"
+ echo "A working combination of libnet.h and libnet-config not found in $withval; get libnet from www.packetfactory.net/projects/libnet and reinstall"
{ { echo "$as_me:$LINENO: error: libnet" >&5
echo "$as_me: error: libnet" >&2;}
{ (exit 1); exit 1; }; }
@@ -3861,7 +3865,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-HAVE_BSD_UDPHDR=0
+HAVE_BSD_UDPHDR=1
fi
rm -f conftest.$ac_objext conftest.$ac_ext
|
