| blob | a2d475a6a2b22bfe655c1a1202049491f46a4b28 |
1 diff -rdup tcpdump-3.9.8.orig/config.h.in tcpdump-3.9.8/config.h.in
2 --- tcpdump-3.9.8.orig/config.h.in 2007-09-26 03:59:52.000000000 +0200
3 +++ tcpdump-3.9.8/config.h.in 2008-01-21 13:02:09.000000000 +0100
4 @@ -163,6 +163,9 @@
5 /* Define to 1 if you have the `crypto' library (-lcrypto). */
6 #undef HAVE_LIBCRYPTO
8 +/* Define to 1 if you have the `pcap' library (-lpcap). */
9 +#undef HAVE_LIBPCAP
10 +
11 /* Define to 1 if you have the `rpc' library (-lrpc). */
12 #undef HAVE_LIBRPC
14 @@ -187,9 +190,6 @@
15 /* Define to 1 if you have the <openssl/evp.h> header file. */
16 #undef HAVE_OPENSSL_EVP_H
18 -/* Define to 1 if you have the `pcap_breakloop' function. */
19 -#undef HAVE_PCAP_BREAKLOOP
20 -
21 /* Define to 1 if you have the `pcap_dump_flush' function. */
22 #undef HAVE_PCAP_DUMP_FLUSH
24 @@ -202,9 +202,6 @@
25 /* Define to 1 if you have the `pcap_lib_version' function. */
26 #undef HAVE_PCAP_LIB_VERSION
28 -/* Define to 1 if you have the `pfopen' function. */
29 -#undef HAVE_PFOPEN
30 -
31 /* Define to 1 if you have the <rpc/rpcent.h> header file. */
32 #undef HAVE_RPC_RPCENT_H
34 diff -rdup tcpdump-3.9.8.orig/configure tcpdump-3.9.8/configure
35 --- tcpdump-3.9.8.orig/configure 2008-01-21 12:54:17.000000000 +0100
36 +++ tcpdump-3.9.8/configure 2008-01-21 13:02:08.000000000 +0100
37 @@ -8783,522 +8783,7 @@ fi
41 - # Most operating systems have gethostbyname() in the default searched
42 - # libraries (i.e. libc):
43 - # Some OSes (eg. Solaris) place it in libnsl
44 - # Some strange OSes (SINIX) have it in libsocket:
45 - { echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
46 -echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6; }
47 -if test "${ac_cv_search_gethostbyname+set}" = set; then
48 - echo $ECHO_N "(cached) $ECHO_C" >&6
49 -else
50 - ac_func_search_save_LIBS=$LIBS
51 -cat >conftest.$ac_ext <<_ACEOF
52 -/* confdefs.h. */
53 -_ACEOF
54 -cat confdefs.h >>conftest.$ac_ext
55 -cat >>conftest.$ac_ext <<_ACEOF
56 -/* end confdefs.h. */
57 -
58 -/* Override any GCC internal prototype to avoid an error.
59 - Use char because int might match the return type of a GCC
60 - builtin and then its argument prototype would still apply. */
61 -#ifdef __cplusplus
62 -extern "C"
63 -#endif
64 -char gethostbyname ();
65 -int
66 -main ()
67 -{
68 -return gethostbyname ();
69 - ;
70 - return 0;
71 -}
72 -_ACEOF
73 -for ac_lib in '' nsl socket resolv; do
74 - if test -z "$ac_lib"; then
75 - ac_res="none required"
76 - else
77 - ac_res=-l$ac_lib
78 - LIBS="-l$ac_lib $ac_func_search_save_LIBS"
79 - fi
80 - rm -f conftest.$ac_objext conftest$ac_exeext
81 -if { (ac_try="$ac_link"
82 -case "(($ac_try" in
83 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
84 - *) ac_try_echo=$ac_try;;
85 -esac
86 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
87 - (eval "$ac_link") 2>conftest.er1
88 - ac_status=$?
89 - grep -v '^ *+' conftest.er1 >conftest.err
90 - rm -f conftest.er1
91 - cat conftest.err >&5
92 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
93 - (exit $ac_status); } && {
94 - test -z "$ac_c_werror_flag" ||
95 - test ! -s conftest.err
96 - } && test -s conftest$ac_exeext &&
97 - $as_test_x conftest$ac_exeext; then
98 - ac_cv_search_gethostbyname=$ac_res
99 -else
100 - echo "$as_me: failed program was:" >&5
101 -sed 's/^/| /' conftest.$ac_ext >&5
102 -
103 -
104 -fi
105 -
106 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
107 - conftest$ac_exeext
108 - if test "${ac_cv_search_gethostbyname+set}" = set; then
109 - break
110 -fi
111 -done
112 -if test "${ac_cv_search_gethostbyname+set}" = set; then
113 - :
114 -else
115 - ac_cv_search_gethostbyname=no
116 -fi
117 -rm conftest.$ac_ext
118 -LIBS=$ac_func_search_save_LIBS
119 -fi
120 -{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5
121 -echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6; }
122 -ac_res=$ac_cv_search_gethostbyname
123 -if test "$ac_res" != no; then
124 - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
125 -
126 -fi
127 -
128 - # Unfortunately libsocket sometimes depends on libnsl and
129 - # AC_SEARCH_LIBS isn't up to the task of handling dependencies like this.
130 - if test "$ac_cv_search_gethostbyname" = "no"
131 - then
132 - { echo "$as_me:$LINENO: checking for gethostbyname in -lsocket" >&5
133 -echo $ECHO_N "checking for gethostbyname in -lsocket... $ECHO_C" >&6; }
134 -if test "${ac_cv_lib_socket_gethostbyname+set}" = set; then
135 - echo $ECHO_N "(cached) $ECHO_C" >&6
136 -else
137 - ac_check_lib_save_LIBS=$LIBS
138 -LIBS="-lsocket -lnsl $LIBS"
139 -cat >conftest.$ac_ext <<_ACEOF
140 -/* confdefs.h. */
141 -_ACEOF
142 -cat confdefs.h >>conftest.$ac_ext
143 -cat >>conftest.$ac_ext <<_ACEOF
144 -/* end confdefs.h. */
145 -
146 -/* Override any GCC internal prototype to avoid an error.
147 - Use char because int might match the return type of a GCC
148 - builtin and then its argument prototype would still apply. */
149 -#ifdef __cplusplus
150 -extern "C"
151 -#endif
152 -char gethostbyname ();
153 -int
154 -main ()
155 -{
156 -return gethostbyname ();
157 - ;
158 - return 0;
159 -}
160 -_ACEOF
161 -rm -f conftest.$ac_objext conftest$ac_exeext
162 -if { (ac_try="$ac_link"
163 -case "(($ac_try" in
164 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
165 - *) ac_try_echo=$ac_try;;
166 -esac
167 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
168 - (eval "$ac_link") 2>conftest.er1
169 - ac_status=$?
170 - grep -v '^ *+' conftest.er1 >conftest.err
171 - rm -f conftest.er1
172 - cat conftest.err >&5
173 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
174 - (exit $ac_status); } && {
175 - test -z "$ac_c_werror_flag" ||
176 - test ! -s conftest.err
177 - } && test -s conftest$ac_exeext &&
178 - $as_test_x conftest$ac_exeext; then
179 - ac_cv_lib_socket_gethostbyname=yes
180 -else
181 - echo "$as_me: failed program was:" >&5
182 -sed 's/^/| /' conftest.$ac_ext >&5
183 -
184 - ac_cv_lib_socket_gethostbyname=no
185 -fi
186 -
187 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
188 - conftest$ac_exeext conftest.$ac_ext
189 -LIBS=$ac_check_lib_save_LIBS
190 -fi
191 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_gethostbyname" >&5
192 -echo "${ECHO_T}$ac_cv_lib_socket_gethostbyname" >&6; }
193 -if test $ac_cv_lib_socket_gethostbyname = yes; then
194 - LIBS="-lsocket -lnsl $LIBS"
195 -fi
196 -
197 - fi
198 - { echo "$as_me:$LINENO: checking for library containing socket" >&5
199 -echo $ECHO_N "checking for library containing socket... $ECHO_C" >&6; }
200 -if test "${ac_cv_search_socket+set}" = set; then
201 - echo $ECHO_N "(cached) $ECHO_C" >&6
202 -else
203 - ac_func_search_save_LIBS=$LIBS
204 -cat >conftest.$ac_ext <<_ACEOF
205 -/* confdefs.h. */
206 -_ACEOF
207 -cat confdefs.h >>conftest.$ac_ext
208 -cat >>conftest.$ac_ext <<_ACEOF
209 -/* end confdefs.h. */
210 -
211 -/* Override any GCC internal prototype to avoid an error.
212 - Use char because int might match the return type of a GCC
213 - builtin and then its argument prototype would still apply. */
214 -#ifdef __cplusplus
215 -extern "C"
216 -#endif
217 -char socket ();
218 -int
219 -main ()
220 -{
221 -return socket ();
222 - ;
223 - return 0;
224 -}
225 -_ACEOF
226 -for ac_lib in '' socket; do
227 - if test -z "$ac_lib"; then
228 - ac_res="none required"
229 - else
230 - ac_res=-l$ac_lib
231 - LIBS="-l$ac_lib $ac_func_search_save_LIBS"
232 - fi
233 - rm -f conftest.$ac_objext conftest$ac_exeext
234 -if { (ac_try="$ac_link"
235 -case "(($ac_try" in
236 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
237 - *) ac_try_echo=$ac_try;;
238 -esac
239 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
240 - (eval "$ac_link") 2>conftest.er1
241 - ac_status=$?
242 - grep -v '^ *+' conftest.er1 >conftest.err
243 - rm -f conftest.er1
244 - cat conftest.err >&5
245 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
246 - (exit $ac_status); } && {
247 - test -z "$ac_c_werror_flag" ||
248 - test ! -s conftest.err
249 - } && test -s conftest$ac_exeext &&
250 - $as_test_x conftest$ac_exeext; then
251 - ac_cv_search_socket=$ac_res
252 -else
253 - echo "$as_me: failed program was:" >&5
254 -sed 's/^/| /' conftest.$ac_ext >&5
255 -
256 -
257 -fi
258 -
259 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
260 - conftest$ac_exeext
261 - if test "${ac_cv_search_socket+set}" = set; then
262 - break
263 -fi
264 -done
265 -if test "${ac_cv_search_socket+set}" = set; then
266 - :
267 -else
268 - ac_cv_search_socket=no
269 -fi
270 -rm conftest.$ac_ext
271 -LIBS=$ac_func_search_save_LIBS
272 -fi
273 -{ echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5
274 -echo "${ECHO_T}$ac_cv_search_socket" >&6; }
275 -ac_res=$ac_cv_search_socket
276 -if test "$ac_res" != no; then
277 - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
278 -
279 -else
280 - { echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
281 -echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6; }
282 -if test "${ac_cv_lib_socket_socket+set}" = set; then
283 - echo $ECHO_N "(cached) $ECHO_C" >&6
284 -else
285 - ac_check_lib_save_LIBS=$LIBS
286 -LIBS="-lsocket -lnsl $LIBS"
287 -cat >conftest.$ac_ext <<_ACEOF
288 -/* confdefs.h. */
289 -_ACEOF
290 -cat confdefs.h >>conftest.$ac_ext
291 -cat >>conftest.$ac_ext <<_ACEOF
292 -/* end confdefs.h. */
293 -
294 -/* Override any GCC internal prototype to avoid an error.
295 - Use char because int might match the return type of a GCC
296 - builtin and then its argument prototype would still apply. */
297 -#ifdef __cplusplus
298 -extern "C"
299 -#endif
300 -char socket ();
301 -int
302 -main ()
303 -{
304 -return socket ();
305 - ;
306 - return 0;
307 -}
308 -_ACEOF
309 -rm -f conftest.$ac_objext conftest$ac_exeext
310 -if { (ac_try="$ac_link"
311 -case "(($ac_try" in
312 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
313 - *) ac_try_echo=$ac_try;;
314 -esac
315 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
316 - (eval "$ac_link") 2>conftest.er1
317 - ac_status=$?
318 - grep -v '^ *+' conftest.er1 >conftest.err
319 - rm -f conftest.er1
320 - cat conftest.err >&5
321 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
322 - (exit $ac_status); } && {
323 - test -z "$ac_c_werror_flag" ||
324 - test ! -s conftest.err
325 - } && test -s conftest$ac_exeext &&
326 - $as_test_x conftest$ac_exeext; then
327 - ac_cv_lib_socket_socket=yes
328 -else
329 - echo "$as_me: failed program was:" >&5
330 -sed 's/^/| /' conftest.$ac_ext >&5
331 -
332 - ac_cv_lib_socket_socket=no
333 -fi
334 -
335 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
336 - conftest$ac_exeext conftest.$ac_ext
337 -LIBS=$ac_check_lib_save_LIBS
338 -fi
339 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
340 -echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6; }
341 -if test $ac_cv_lib_socket_socket = yes; then
342 - LIBS="-lsocket -lnsl $LIBS"
343 -fi
344 -
345 -fi
346 -
347 - # DLPI needs putmsg under HPUX so test for -lstr while we're at it
348 - { echo "$as_me:$LINENO: checking for library containing putmsg" >&5
349 -echo $ECHO_N "checking for library containing putmsg... $ECHO_C" >&6; }
350 -if test "${ac_cv_search_putmsg+set}" = set; then
351 - echo $ECHO_N "(cached) $ECHO_C" >&6
352 -else
353 - ac_func_search_save_LIBS=$LIBS
354 -cat >conftest.$ac_ext <<_ACEOF
355 -/* confdefs.h. */
356 -_ACEOF
357 -cat confdefs.h >>conftest.$ac_ext
358 -cat >>conftest.$ac_ext <<_ACEOF
359 -/* end confdefs.h. */
360 -
361 -/* Override any GCC internal prototype to avoid an error.
362 - Use char because int might match the return type of a GCC
363 - builtin and then its argument prototype would still apply. */
364 -#ifdef __cplusplus
365 -extern "C"
366 -#endif
367 -char putmsg ();
368 -int
369 -main ()
370 -{
371 -return putmsg ();
372 - ;
373 - return 0;
374 -}
375 -_ACEOF
376 -for ac_lib in '' str; do
377 - if test -z "$ac_lib"; then
378 - ac_res="none required"
379 - else
380 - ac_res=-l$ac_lib
381 - LIBS="-l$ac_lib $ac_func_search_save_LIBS"
382 - fi
383 - rm -f conftest.$ac_objext conftest$ac_exeext
384 -if { (ac_try="$ac_link"
385 -case "(($ac_try" in
386 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
387 - *) ac_try_echo=$ac_try;;
388 -esac
389 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
390 - (eval "$ac_link") 2>conftest.er1
391 - ac_status=$?
392 - grep -v '^ *+' conftest.er1 >conftest.err
393 - rm -f conftest.er1
394 - cat conftest.err >&5
395 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
396 - (exit $ac_status); } && {
397 - test -z "$ac_c_werror_flag" ||
398 - test ! -s conftest.err
399 - } && test -s conftest$ac_exeext &&
400 - $as_test_x conftest$ac_exeext; then
401 - ac_cv_search_putmsg=$ac_res
402 -else
403 - echo "$as_me: failed program was:" >&5
404 -sed 's/^/| /' conftest.$ac_ext >&5
405 -
406 -
407 -fi
408 -
409 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
410 - conftest$ac_exeext
411 - if test "${ac_cv_search_putmsg+set}" = set; then
412 - break
413 -fi
414 -done
415 -if test "${ac_cv_search_putmsg+set}" = set; then
416 - :
417 -else
418 - ac_cv_search_putmsg=no
419 -fi
420 -rm conftest.$ac_ext
421 -LIBS=$ac_func_search_save_LIBS
422 -fi
423 -{ echo "$as_me:$LINENO: result: $ac_cv_search_putmsg" >&5
424 -echo "${ECHO_T}$ac_cv_search_putmsg" >&6; }
425 -ac_res=$ac_cv_search_putmsg
426 -if test "$ac_res" != no; then
427 - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
428 -
429 -fi
430 -
431 -
432 -
433 - LBL_LIBS="$LIBS"
434 - pfopen=/usr/examples/packetfilter/pfopen.c
435 - if test -f $pfopen ; then
436 -
437 -for ac_func in pfopen
438 -do
439 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
440 -{ echo "$as_me:$LINENO: checking for $ac_func" >&5
441 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
442 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
443 - echo $ECHO_N "(cached) $ECHO_C" >&6
444 -else
445 - cat >conftest.$ac_ext <<_ACEOF
446 -/* confdefs.h. */
447 -_ACEOF
448 -cat confdefs.h >>conftest.$ac_ext
449 -cat >>conftest.$ac_ext <<_ACEOF
450 -/* end confdefs.h. */
451 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
452 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
453 -#define $ac_func innocuous_$ac_func
454 -
455 -/* System header to define __stub macros and hopefully few prototypes,
456 - which can conflict with char $ac_func (); below.
457 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
458 - <limits.h> exists even on freestanding compilers. */
459 -
460 -#ifdef __STDC__
461 -# include <limits.h>
462 -#else
463 -# include <assert.h>
464 -#endif
465 -
466 -#undef $ac_func
467 -
468 -/* Override any GCC internal prototype to avoid an error.
469 - Use char because int might match the return type of a GCC
470 - builtin and then its argument prototype would still apply. */
471 -#ifdef __cplusplus
472 -extern "C"
473 -#endif
474 -char $ac_func ();
475 -/* The GNU C library defines this for functions which it implements
476 - to always fail with ENOSYS. Some functions are actually named
477 - something starting with __ and the normal name is an alias. */
478 -#if defined __stub_$ac_func || defined __stub___$ac_func
479 -choke me
480 -#endif
481 -
482 -int
483 -main ()
484 -{
485 -return $ac_func ();
486 - ;
487 - return 0;
488 -}
489 -_ACEOF
490 -rm -f conftest.$ac_objext conftest$ac_exeext
491 -if { (ac_try="$ac_link"
492 -case "(($ac_try" in
493 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
494 - *) ac_try_echo=$ac_try;;
495 -esac
496 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
497 - (eval "$ac_link") 2>conftest.er1
498 - ac_status=$?
499 - grep -v '^ *+' conftest.er1 >conftest.err
500 - rm -f conftest.er1
501 - cat conftest.err >&5
502 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
503 - (exit $ac_status); } && {
504 - test -z "$ac_c_werror_flag" ||
505 - test ! -s conftest.err
506 - } && test -s conftest$ac_exeext &&
507 - $as_test_x conftest$ac_exeext; then
508 - eval "$as_ac_var=yes"
509 -else
510 - echo "$as_me: failed program was:" >&5
511 -sed 's/^/| /' conftest.$ac_ext >&5
512 -
513 - eval "$as_ac_var=no"
514 -fi
515 -
516 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
517 - conftest$ac_exeext conftest.$ac_ext
518 -fi
519 -ac_res=`eval echo '${'$as_ac_var'}'`
520 - { echo "$as_me:$LINENO: result: $ac_res" >&5
521 -echo "${ECHO_T}$ac_res" >&6; }
522 -if test `eval echo '${'$as_ac_var'}'` = yes; then
523 - cat >>confdefs.h <<_ACEOF
524 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
525 -_ACEOF
526 -
527 -fi
528 -done
529 -
530 - if test $ac_cv_func_pfopen = "no" ; then
531 - { echo "$as_me:$LINENO: result: Using $pfopen" >&5
532 -echo "${ECHO_T}Using $pfopen" >&6; }
533 - LIBS="$LIBS $pfopen"
534 - fi
535 - fi
536 - { echo "$as_me:$LINENO: checking for local pcap library" >&5
537 -echo $ECHO_N "checking for local pcap library... $ECHO_C" >&6; }
538 - libpcap=FAIL
539 - lastdir=FAIL
540 - places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
541 - egrep '/libpcap-[0-9]*.[0-9]*(.[0-9]*)?([ab][0-9]*)?$'`
542 - for dir in $places $srcdir/../libpcap $srcdir/libpcap ; do
543 - basedir=`echo $dir | sed -e 's/[ab][0-9]*$//'`
544 - if test $lastdir = $basedir ; then
545 - continue;
546 - fi
547 - lastdir=$dir
548 - if test -r $dir/libpcap.a ; then
549 - libpcap=$dir/libpcap.a
550 - d=$dir
551 - fi
552 - done
553 - if test $libpcap = FAIL ; then
554 - { echo "$as_me:$LINENO: result: not found" >&5
555 -echo "${ECHO_T}not found" >&6; }
556 - { echo "$as_me:$LINENO: checking for main in -lpcap" >&5
557 +{ echo "$as_me:$LINENO: checking for main in -lpcap" >&5
558 echo $ECHO_N "checking for main in -lpcap... $ECHO_C" >&6; }
559 if test "${ac_cv_lib_pcap_main+set}" = set; then
560 echo $ECHO_N "(cached) $ECHO_C" >&6
561 @@ -9354,646 +8839,14 @@ fi
562 { echo "$as_me:$LINENO: result: $ac_cv_lib_pcap_main" >&5
563 echo "${ECHO_T}$ac_cv_lib_pcap_main" >&6; }
564 if test $ac_cv_lib_pcap_main = yes; then
565 - libpcap="-lpcap"
566 -fi
567 -
568 - if test $libpcap = FAIL ; then
569 - { { echo "$as_me:$LINENO: error: see the INSTALL doc for more info" >&5
570 -echo "$as_me: error: see the INSTALL doc for more info" >&2;}
571 - { (exit 1); exit 1; }; }
572 - fi
573 - { echo "$as_me:$LINENO: checking for extraneous pcap header directories" >&5
574 -echo $ECHO_N "checking for extraneous pcap header directories... $ECHO_C" >&6; }
575 - if test \( ! -r /usr/local/include/pcap.h \) -a \
576 - \( ! -r /usr/include/pcap.h \); then
577 - if test -r /usr/local/include/pcap/pcap.h; then
578 - d="/usr/local/include/pcap"
579 - elif test -r /usr/include/pcap/pcap.h; then
580 - d="/usr/include/pcap"
581 - fi
582 - fi
583 - if test -z "$d" ; then
584 - { echo "$as_me:$LINENO: result: not found" >&5
585 -echo "${ECHO_T}not found" >&6; }
586 - else
587 - V_INCLS="-I$d $V_INCLS"
588 - { echo "$as_me:$LINENO: result: found -- -I$d added" >&5
589 -echo "${ECHO_T}found -- -I$d added" >&6; }
590 - fi
591 - else
592 - V_PCAPDEP=$libpcap
593 - places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
594 - egrep '/libpcap-[0-9]*.[0-9]*(.[0-9]*)?([ab][0-9]*)?$'`
595 - if test -r $d/pcap.h; then
596 - V_INCLS="-I$d $V_INCLS"
597 - elif test -r $places/pcap.h; then
598 - V_INCLS="-I$places $V_INCLS"
599 - else
600 - { { echo "$as_me:$LINENO: error: cannot find pcap.h" >&5
601 -echo "$as_me: error: cannot find pcap.h" >&2;}
602 - { (exit see INSTALL); exit see INSTALL; }; }
603 - fi
604 - { echo "$as_me:$LINENO: result: $libpcap" >&5
605 -echo "${ECHO_T}$libpcap" >&6; }
606 - fi
607 - LIBS="$libpcap $LIBS"
608 - case "$host_os" in
609 -
610 - aix*)
611 - pseexe="/lib/pse.exp"
612 - { echo "$as_me:$LINENO: checking for $pseexe" >&5
613 -echo $ECHO_N "checking for $pseexe... $ECHO_C" >&6; }
614 - if test -f $pseexe ; then
615 - { echo "$as_me:$LINENO: result: yes" >&5
616 -echo "${ECHO_T}yes" >&6; }
617 - LIBS="$LIBS -I:$pseexe"
618 - fi
619 - #
620 - # We need "-lodm" and "-lcfg", as libpcap requires them on
621 - # AIX, and we just build a static libpcap.a and thus can't
622 - # arrange that when you link with libpcap you automatically
623 - # link with those libraries.
624 - #
625 - LIBS="$LIBS -lodm -lcfg"
626 - ;;
627 - esac
628 -
629 - { echo "$as_me:$LINENO: checking for pcap_list_datalinks" >&5
630 -echo $ECHO_N "checking for pcap_list_datalinks... $ECHO_C" >&6; }
631 -if test "${ac_cv_func_pcap_list_datalinks+set}" = set; then
632 - echo $ECHO_N "(cached) $ECHO_C" >&6
633 -else
634 - cat >conftest.$ac_ext <<_ACEOF
635 -/* confdefs.h. */
636 -_ACEOF
637 -cat confdefs.h >>conftest.$ac_ext
638 -cat >>conftest.$ac_ext <<_ACEOF
639 -/* end confdefs.h. */
640 -/* Define pcap_list_datalinks to an innocuous variant, in case <limits.h> declares pcap_list_datalinks.
641 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
642 -#define pcap_list_datalinks innocuous_pcap_list_datalinks
643 -
644 -/* System header to define __stub macros and hopefully few prototypes,
645 - which can conflict with char pcap_list_datalinks (); below.
646 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
647 - <limits.h> exists even on freestanding compilers. */
648 -
649 -#ifdef __STDC__
650 -# include <limits.h>
651 -#else
652 -# include <assert.h>
653 -#endif
654 -
655 -#undef pcap_list_datalinks
656 -
657 -/* Override any GCC internal prototype to avoid an error.
658 - Use char because int might match the return type of a GCC
659 - builtin and then its argument prototype would still apply. */
660 -#ifdef __cplusplus
661 -extern "C"
662 -#endif
663 -char pcap_list_datalinks ();
664 -/* The GNU C library defines this for functions which it implements
665 - to always fail with ENOSYS. Some functions are actually named
666 - something starting with __ and the normal name is an alias. */
667 -#if defined __stub_pcap_list_datalinks || defined __stub___pcap_list_datalinks
668 -choke me
669 -#endif
670 -
671 -int
672 -main ()
673 -{
674 -return pcap_list_datalinks ();
675 - ;
676 - return 0;
677 -}
678 -_ACEOF
679 -rm -f conftest.$ac_objext conftest$ac_exeext
680 -if { (ac_try="$ac_link"
681 -case "(($ac_try" in
682 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
683 - *) ac_try_echo=$ac_try;;
684 -esac
685 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
686 - (eval "$ac_link") 2>conftest.er1
687 - ac_status=$?
688 - grep -v '^ *+' conftest.er1 >conftest.err
689 - rm -f conftest.er1
690 - cat conftest.err >&5
691 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
692 - (exit $ac_status); } && {
693 - test -z "$ac_c_werror_flag" ||
694 - test ! -s conftest.err
695 - } && test -s conftest$ac_exeext &&
696 - $as_test_x conftest$ac_exeext; then
697 - ac_cv_func_pcap_list_datalinks=yes
698 -else
699 - echo "$as_me: failed program was:" >&5
700 -sed 's/^/| /' conftest.$ac_ext >&5
701 -
702 - ac_cv_func_pcap_list_datalinks=no
703 -fi
704 -
705 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
706 - conftest$ac_exeext conftest.$ac_ext
707 -fi
708 -{ echo "$as_me:$LINENO: result: $ac_cv_func_pcap_list_datalinks" >&5
709 -echo "${ECHO_T}$ac_cv_func_pcap_list_datalinks" >&6; }
710 -if test $ac_cv_func_pcap_list_datalinks = yes; then
711 - cat >>confdefs.h <<\_ACEOF
712 -#define HAVE_PCAP_LIST_DATALINKS 1
713 -_ACEOF
714 -
715 -else
716 -
717 - case " $LIBOBJS " in
718 - *" datalinks.$ac_objext "* ) ;;
719 - *) LIBOBJS="$LIBOBJS datalinks.$ac_objext"
720 - ;;
721 -esac
722 -
723 -
724 -fi
725 -
726 - { echo "$as_me:$LINENO: checking for pcap_set_datalink" >&5
727 -echo $ECHO_N "checking for pcap_set_datalink... $ECHO_C" >&6; }
728 -if test "${ac_cv_func_pcap_set_datalink+set}" = set; then
729 - echo $ECHO_N "(cached) $ECHO_C" >&6
730 -else
731 - cat >conftest.$ac_ext <<_ACEOF
732 -/* confdefs.h. */
733 -_ACEOF
734 -cat confdefs.h >>conftest.$ac_ext
735 -cat >>conftest.$ac_ext <<_ACEOF
736 -/* end confdefs.h. */
737 -/* Define pcap_set_datalink to an innocuous variant, in case <limits.h> declares pcap_set_datalink.
738 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
739 -#define pcap_set_datalink innocuous_pcap_set_datalink
740 -
741 -/* System header to define __stub macros and hopefully few prototypes,
742 - which can conflict with char pcap_set_datalink (); below.
743 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
744 - <limits.h> exists even on freestanding compilers. */
745 -
746 -#ifdef __STDC__
747 -# include <limits.h>
748 -#else
749 -# include <assert.h>
750 -#endif
751 -
752 -#undef pcap_set_datalink
753 -
754 -/* Override any GCC internal prototype to avoid an error.
755 - Use char because int might match the return type of a GCC
756 - builtin and then its argument prototype would still apply. */
757 -#ifdef __cplusplus
758 -extern "C"
759 -#endif
760 -char pcap_set_datalink ();
761 -/* The GNU C library defines this for functions which it implements
762 - to always fail with ENOSYS. Some functions are actually named
763 - something starting with __ and the normal name is an alias. */
764 -#if defined __stub_pcap_set_datalink || defined __stub___pcap_set_datalink
765 -choke me
766 -#endif
767 -
768 -int
769 -main ()
770 -{
771 -return pcap_set_datalink ();
772 - ;
773 - return 0;
774 -}
775 -_ACEOF
776 -rm -f conftest.$ac_objext conftest$ac_exeext
777 -if { (ac_try="$ac_link"
778 -case "(($ac_try" in
779 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
780 - *) ac_try_echo=$ac_try;;
781 -esac
782 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
783 - (eval "$ac_link") 2>conftest.er1
784 - ac_status=$?
785 - grep -v '^ *+' conftest.er1 >conftest.err
786 - rm -f conftest.er1
787 - cat conftest.err >&5
788 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
789 - (exit $ac_status); } && {
790 - test -z "$ac_c_werror_flag" ||
791 - test ! -s conftest.err
792 - } && test -s conftest$ac_exeext &&
793 - $as_test_x conftest$ac_exeext; then
794 - ac_cv_func_pcap_set_datalink=yes
795 -else
796 - echo "$as_me: failed program was:" >&5
797 -sed 's/^/| /' conftest.$ac_ext >&5
798 -
799 - ac_cv_func_pcap_set_datalink=no
800 -fi
801 -
802 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
803 - conftest$ac_exeext conftest.$ac_ext
804 -fi
805 -{ echo "$as_me:$LINENO: result: $ac_cv_func_pcap_set_datalink" >&5
806 -echo "${ECHO_T}$ac_cv_func_pcap_set_datalink" >&6; }
807 -if test $ac_cv_func_pcap_set_datalink = yes; then
808 - cat >>confdefs.h <<\_ACEOF
809 -#define HAVE_PCAP_SET_DATALINK 1
810 -_ACEOF
811 -
812 -fi
813 -
814 - { echo "$as_me:$LINENO: checking for pcap_datalink_name_to_val" >&5
815 -echo $ECHO_N "checking for pcap_datalink_name_to_val... $ECHO_C" >&6; }
816 -if test "${ac_cv_func_pcap_datalink_name_to_val+set}" = set; then
817 - echo $ECHO_N "(cached) $ECHO_C" >&6
818 -else
819 - cat >conftest.$ac_ext <<_ACEOF
820 -/* confdefs.h. */
821 -_ACEOF
822 -cat confdefs.h >>conftest.$ac_ext
823 -cat >>conftest.$ac_ext <<_ACEOF
824 -/* end confdefs.h. */
825 -/* Define pcap_datalink_name_to_val to an innocuous variant, in case <limits.h> declares pcap_datalink_name_to_val.
826 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
827 -#define pcap_datalink_name_to_val innocuous_pcap_datalink_name_to_val
828 -
829 -/* System header to define __stub macros and hopefully few prototypes,
830 - which can conflict with char pcap_datalink_name_to_val (); below.
831 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
832 - <limits.h> exists even on freestanding compilers. */
833 -
834 -#ifdef __STDC__
835 -# include <limits.h>
836 -#else
837 -# include <assert.h>
838 -#endif
839 -
840 -#undef pcap_datalink_name_to_val
841 -
842 -/* Override any GCC internal prototype to avoid an error.
843 - Use char because int might match the return type of a GCC
844 - builtin and then its argument prototype would still apply. */
845 -#ifdef __cplusplus
846 -extern "C"
847 -#endif
848 -char pcap_datalink_name_to_val ();
849 -/* The GNU C library defines this for functions which it implements
850 - to always fail with ENOSYS. Some functions are actually named
851 - something starting with __ and the normal name is an alias. */
852 -#if defined __stub_pcap_datalink_name_to_val || defined __stub___pcap_datalink_name_to_val
853 -choke me
854 -#endif
855 -
856 -int
857 -main ()
858 -{
859 -return pcap_datalink_name_to_val ();
860 - ;
861 - return 0;
862 -}
863 -_ACEOF
864 -rm -f conftest.$ac_objext conftest$ac_exeext
865 -if { (ac_try="$ac_link"
866 -case "(($ac_try" in
867 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
868 - *) ac_try_echo=$ac_try;;
869 -esac
870 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
871 - (eval "$ac_link") 2>conftest.er1
872 - ac_status=$?
873 - grep -v '^ *+' conftest.er1 >conftest.err
874 - rm -f conftest.er1
875 - cat conftest.err >&5
876 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
877 - (exit $ac_status); } && {
878 - test -z "$ac_c_werror_flag" ||
879 - test ! -s conftest.err
880 - } && test -s conftest$ac_exeext &&
881 - $as_test_x conftest$ac_exeext; then
882 - ac_cv_func_pcap_datalink_name_to_val=yes
883 -else
884 - echo "$as_me: failed program was:" >&5
885 -sed 's/^/| /' conftest.$ac_ext >&5
886 -
887 - ac_cv_func_pcap_datalink_name_to_val=no
888 -fi
889 -
890 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
891 - conftest$ac_exeext conftest.$ac_ext
892 -fi
893 -{ echo "$as_me:$LINENO: result: $ac_cv_func_pcap_datalink_name_to_val" >&5
894 -echo "${ECHO_T}$ac_cv_func_pcap_datalink_name_to_val" >&6; }
895 -if test $ac_cv_func_pcap_datalink_name_to_val = yes; then
896 -
897 - cat >>confdefs.h <<\_ACEOF
898 -#define HAVE_PCAP_DATALINK_NAME_TO_VAL 1
899 -_ACEOF
900 -
901 - { echo "$as_me:$LINENO: checking for pcap_datalink_val_to_description" >&5
902 -echo $ECHO_N "checking for pcap_datalink_val_to_description... $ECHO_C" >&6; }
903 -if test "${ac_cv_func_pcap_datalink_val_to_description+set}" = set; then
904 - echo $ECHO_N "(cached) $ECHO_C" >&6
905 -else
906 - cat >conftest.$ac_ext <<_ACEOF
907 -/* confdefs.h. */
908 -_ACEOF
909 -cat confdefs.h >>conftest.$ac_ext
910 -cat >>conftest.$ac_ext <<_ACEOF
911 -/* end confdefs.h. */
912 -/* Define pcap_datalink_val_to_description to an innocuous variant, in case <limits.h> declares pcap_datalink_val_to_description.
913 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
914 -#define pcap_datalink_val_to_description innocuous_pcap_datalink_val_to_description
915 -
916 -/* System header to define __stub macros and hopefully few prototypes,
917 - which can conflict with char pcap_datalink_val_to_description (); below.
918 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
919 - <limits.h> exists even on freestanding compilers. */
920 -
921 -#ifdef __STDC__
922 -# include <limits.h>
923 -#else
924 -# include <assert.h>
925 -#endif
926 -
927 -#undef pcap_datalink_val_to_description
928 -
929 -/* Override any GCC internal prototype to avoid an error.
930 - Use char because int might match the return type of a GCC
931 - builtin and then its argument prototype would still apply. */
932 -#ifdef __cplusplus
933 -extern "C"
934 -#endif
935 -char pcap_datalink_val_to_description ();
936 -/* The GNU C library defines this for functions which it implements
937 - to always fail with ENOSYS. Some functions are actually named
938 - something starting with __ and the normal name is an alias. */
939 -#if defined __stub_pcap_datalink_val_to_description || defined __stub___pcap_datalink_val_to_description
940 -choke me
941 -#endif
942 -
943 -int
944 -main ()
945 -{
946 -return pcap_datalink_val_to_description ();
947 - ;
948 - return 0;
949 -}
950 -_ACEOF
951 -rm -f conftest.$ac_objext conftest$ac_exeext
952 -if { (ac_try="$ac_link"
953 -case "(($ac_try" in
954 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
955 - *) ac_try_echo=$ac_try;;
956 -esac
957 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
958 - (eval "$ac_link") 2>conftest.er1
959 - ac_status=$?
960 - grep -v '^ *+' conftest.er1 >conftest.err
961 - rm -f conftest.er1
962 - cat conftest.err >&5
963 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
964 - (exit $ac_status); } && {
965 - test -z "$ac_c_werror_flag" ||
966 - test ! -s conftest.err
967 - } && test -s conftest$ac_exeext &&
968 - $as_test_x conftest$ac_exeext; then
969 - ac_cv_func_pcap_datalink_val_to_description=yes
970 -else
971 - echo "$as_me: failed program was:" >&5
972 -sed 's/^/| /' conftest.$ac_ext >&5
973 -
974 - ac_cv_func_pcap_datalink_val_to_description=no
975 -fi
976 -
977 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
978 - conftest$ac_exeext conftest.$ac_ext
979 -fi
980 -{ echo "$as_me:$LINENO: result: $ac_cv_func_pcap_datalink_val_to_description" >&5
981 -echo "${ECHO_T}$ac_cv_func_pcap_datalink_val_to_description" >&6; }
982 -if test $ac_cv_func_pcap_datalink_val_to_description = yes; then
983 - cat >>confdefs.h <<\_ACEOF
984 -#define HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION 1
985 -_ACEOF
986 -
987 -else
988 -
989 - case " $LIBOBJS " in
990 - *" dlnames.$ac_objext "* ) ;;
991 - *) LIBOBJS="$LIBOBJS dlnames.$ac_objext"
992 - ;;
993 -esac
994 -
995 -
996 -fi
997 -
998 -
999 -else
1000 -
1001 - case " $LIBOBJS " in
1002 - *" dlnames.$ac_objext "* ) ;;
1003 - *) LIBOBJS="$LIBOBJS dlnames.$ac_objext"
1004 - ;;
1005 -esac
1006 -
1007 -
1008 -fi
1009 -
1010 -
1011 -
1012 -for ac_func in pcap_breakloop
1013 -do
1014 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
1015 -{ echo "$as_me:$LINENO: checking for $ac_func" >&5
1016 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
1017 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
1018 - echo $ECHO_N "(cached) $ECHO_C" >&6
1019 -else
1020 - cat >conftest.$ac_ext <<_ACEOF
1021 -/* confdefs.h. */
1022 -_ACEOF
1023 -cat confdefs.h >>conftest.$ac_ext
1024 -cat >>conftest.$ac_ext <<_ACEOF
1025 -/* end confdefs.h. */
1026 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
1027 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
1028 -#define $ac_func innocuous_$ac_func
1029 -
1030 -/* System header to define __stub macros and hopefully few prototypes,
1031 - which can conflict with char $ac_func (); below.
1032 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1033 - <limits.h> exists even on freestanding compilers. */
1034 -
1035 -#ifdef __STDC__
1036 -# include <limits.h>
1037 -#else
1038 -# include <assert.h>
1039 -#endif
1040 -
1041 -#undef $ac_func
1042 -
1043 -/* Override any GCC internal prototype to avoid an error.
1044 - Use char because int might match the return type of a GCC
1045 - builtin and then its argument prototype would still apply. */
1046 -#ifdef __cplusplus
1047 -extern "C"
1048 -#endif
1049 -char $ac_func ();
1050 -/* The GNU C library defines this for functions which it implements
1051 - to always fail with ENOSYS. Some functions are actually named
1052 - something starting with __ and the normal name is an alias. */
1053 -#if defined __stub_$ac_func || defined __stub___$ac_func
1054 -choke me
1055 -#endif
1056 -
1057 -int
1058 -main ()
1059 -{
1060 -return $ac_func ();
1061 - ;
1062 - return 0;
1063 -}
1064 -_ACEOF
1065 -rm -f conftest.$ac_objext conftest$ac_exeext
1066 -if { (ac_try="$ac_link"
1067 -case "(($ac_try" in
1068 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1069 - *) ac_try_echo=$ac_try;;
1070 -esac
1071 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1072 - (eval "$ac_link") 2>conftest.er1
1073 - ac_status=$?
1074 - grep -v '^ *+' conftest.er1 >conftest.err
1075 - rm -f conftest.er1
1076 - cat conftest.err >&5
1077 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1078 - (exit $ac_status); } && {
1079 - test -z "$ac_c_werror_flag" ||
1080 - test ! -s conftest.err
1081 - } && test -s conftest$ac_exeext &&
1082 - $as_test_x conftest$ac_exeext; then
1083 - eval "$as_ac_var=yes"
1084 -else
1085 - echo "$as_me: failed program was:" >&5
1086 -sed 's/^/| /' conftest.$ac_ext >&5
1087 -
1088 - eval "$as_ac_var=no"
1089 -fi
1090 -
1091 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1092 - conftest$ac_exeext conftest.$ac_ext
1093 -fi
1094 -ac_res=`eval echo '${'$as_ac_var'}'`
1095 - { echo "$as_me:$LINENO: result: $ac_res" >&5
1096 -echo "${ECHO_T}$ac_res" >&6; }
1097 -if test `eval echo '${'$as_ac_var'}'` = yes; then
1098 cat >>confdefs.h <<_ACEOF
1099 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
1100 -_ACEOF
1101 -
1102 -fi
1103 -done
1104 -
1105 -
1106 - { echo "$as_me:$LINENO: checking for pcap_dump_ftell" >&5
1107 -echo $ECHO_N "checking for pcap_dump_ftell... $ECHO_C" >&6; }
1108 -if test "${ac_cv_func_pcap_dump_ftell+set}" = set; then
1109 - echo $ECHO_N "(cached) $ECHO_C" >&6
1110 -else
1111 - cat >conftest.$ac_ext <<_ACEOF
1112 -/* confdefs.h. */
1113 -_ACEOF
1114 -cat confdefs.h >>conftest.$ac_ext
1115 -cat >>conftest.$ac_ext <<_ACEOF
1116 -/* end confdefs.h. */
1117 -/* Define pcap_dump_ftell to an innocuous variant, in case <limits.h> declares pcap_dump_ftell.
1118 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
1119 -#define pcap_dump_ftell innocuous_pcap_dump_ftell
1120 -
1121 -/* System header to define __stub macros and hopefully few prototypes,
1122 - which can conflict with char pcap_dump_ftell (); below.
1123 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1124 - <limits.h> exists even on freestanding compilers. */
1125 -
1126 -#ifdef __STDC__
1127 -# include <limits.h>
1128 -#else
1129 -# include <assert.h>
1130 -#endif
1131 -
1132 -#undef pcap_dump_ftell
1133 -
1134 -/* Override any GCC internal prototype to avoid an error.
1135 - Use char because int might match the return type of a GCC
1136 - builtin and then its argument prototype would still apply. */
1137 -#ifdef __cplusplus
1138 -extern "C"
1139 -#endif
1140 -char pcap_dump_ftell ();
1141 -/* The GNU C library defines this for functions which it implements
1142 - to always fail with ENOSYS. Some functions are actually named
1143 - something starting with __ and the normal name is an alias. */
1144 -#if defined __stub_pcap_dump_ftell || defined __stub___pcap_dump_ftell
1145 -choke me
1146 -#endif
1147 -
1148 -int
1149 -main ()
1150 -{
1151 -return pcap_dump_ftell ();
1152 - ;
1153 - return 0;
1154 -}
1155 -_ACEOF
1156 -rm -f conftest.$ac_objext conftest$ac_exeext
1157 -if { (ac_try="$ac_link"
1158 -case "(($ac_try" in
1159 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1160 - *) ac_try_echo=$ac_try;;
1161 -esac
1162 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1163 - (eval "$ac_link") 2>conftest.er1
1164 - ac_status=$?
1165 - grep -v '^ *+' conftest.er1 >conftest.err
1166 - rm -f conftest.er1
1167 - cat conftest.err >&5
1168 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1169 - (exit $ac_status); } && {
1170 - test -z "$ac_c_werror_flag" ||
1171 - test ! -s conftest.err
1172 - } && test -s conftest$ac_exeext &&
1173 - $as_test_x conftest$ac_exeext; then
1174 - ac_cv_func_pcap_dump_ftell=yes
1175 -else
1176 - echo "$as_me: failed program was:" >&5
1177 -sed 's/^/| /' conftest.$ac_ext >&5
1178 -
1179 - ac_cv_func_pcap_dump_ftell=no
1180 -fi
1181 -
1182 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1183 - conftest$ac_exeext conftest.$ac_ext
1184 -fi
1185 -{ echo "$as_me:$LINENO: result: $ac_cv_func_pcap_dump_ftell" >&5
1186 -echo "${ECHO_T}$ac_cv_func_pcap_dump_ftell" >&6; }
1187 -if test $ac_cv_func_pcap_dump_ftell = yes; then
1188 - cat >>confdefs.h <<\_ACEOF
1189 -#define HAVE_PCAP_DUMP_FTELL 1
1190 +#define HAVE_LIBPCAP 1
1191 _ACEOF
1193 -else
1194 -
1195 - case " $LIBOBJS " in
1196 - *" pcap_dump_ftell.$ac_objext "* ) ;;
1197 - *) LIBOBJS="$LIBOBJS pcap_dump_ftell.$ac_objext"
1198 - ;;
1199 -esac
1200 -
1201 + LIBS="-lpcap $LIBS"
1203 fi
1205 -
1206 -
1207 #
1208 # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate
1209 # libraries (e.g., "-lsocket -lnsl" on Solaris).
1210 diff -rdup tcpdump-3.9.8.orig/configure.in tcpdump-3.9.8/configure.in
1211 --- tcpdump-3.9.8.orig/configure.in 2007-09-26 04:08:25.000000000 +0200
1212 +++ tcpdump-3.9.8/configure.in 2008-01-21 13:02:03.000000000 +0100
1213 @@ -539,8 +539,8 @@ AC_SEARCH_LIBS(getrpcbynumber, nsl, AC_D
1214 dnl AC_CHECK_LIB(z, uncompress)
1215 dnl AC_CHECK_HEADERS(zlib.h)
1217 -AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS)
1218 -
1219 +dnl AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS)
1220 +AC_CHECK_LIB(pcap, main)
1221 #
1222 # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate
1223 # libraries (e.g., "-lsocket -lnsl" on Solaris).