blob: 378c086e26bc9a981dc6f0df43acd222776fcf5e (
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
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- nmap-4.76.orig/configure 2008-09-09 01:37:03.000000000 +0200
+++ nmap-4.76/configure 2008-12-14 18:54:23.000000000 +0100
@@ -4035,7 +4035,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA=
if test -n "$GXX"; then
- CXXFLAGS="$CXXFLAGS -Wall "
+ CXXFLAGS="$CXXFLAGS "
fi
{ echo "$as_me:$LINENO: checking whether the compiler is gcc 4 or greater" >&5
@@ -6656,86 +6656,6 @@ if test $needs_cpp_precomp = yes; then
CXXFLAGS="-no-cpp-precomp $CXXFLAGS"
fi
-if test $have_libpcap = yes; then
- if test "${LIBPCAP_INC+set}" = "set"; then
- _cflags=$CXXFLAGS
- _ldflags=$LDFLAGS
-
- CPPFLAGS="-I$LIBPCAP_INC $CPPFLAGS"
- LDFLAGS="-L$LIBPCAP_LIB $LDFLAGS"
- fi
-
- # link with -lpcap for the purposes of this test
- LIBS_OLD="$LIBS"
- LIBS="$LIBS -lpcap"
- { echo "$as_me:$LINENO: checking if libpcap version is recent enough" >&5
-echo $ECHO_N "checking if libpcap version is recent enough... $ECHO_C" >&6; }
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <stdio.h>
-extern char pcap_version[];
-int main() {
- int major, minor1, minor2;
- sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
- if (major > 0)
- exit(0);
- if (minor1 < 9)
- exit(1);
- if (minor2 < 4)
- exit(1);
- exit(0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }; have_libpcap=yes
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }; have_libpcap=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-LIBS="$LIBS_OLD"
-fi
-
LIBPCAP_LIBS="-lpcap"
if test $have_libpcap = yes; then
PCAP_DEPENDS=""
|
