1
0

002-remove_static_libpcap_check.patch 3.3 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192
  1. --- a/configure
  2. +++ b/configure
  3. @@ -5471,37 +5471,6 @@ $as_echo "Using $pfopen" >&6; }
  4. LIBS="$LIBS $pfopen"
  5. fi
  6. fi
  7. - libpcap=FAIL
  8. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for local pcap library" >&5
  9. -$as_echo_n "checking for local pcap library... " >&6; }
  10. -
  11. -# Check whether --with-system-libpcap was given.
  12. -if test "${with_system_libpcap+set}" = set; then :
  13. - withval=$with_system_libpcap;
  14. -fi
  15. -
  16. - if test "x$with_system_libpcap" != xyes ; then
  17. - lastdir=FAIL
  18. - places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
  19. - egrep '/libpcap-[0-9]+\.[0-9]+(\.[0-9]*)?([ab][0-9]*|-PRE-GIT)?$'`
  20. - places2=`ls .. | sed -e 's,/$,,' -e "s,^,../," | \
  21. - egrep '/libpcap-[0-9]+\.[0-9]+(\.[0-9]*)?([ab][0-9]*|-PRE-GIT)?$'`
  22. - for dir in $places $srcdir/../libpcap ../libpcap $srcdir/libpcap $places2 ; do
  23. - basedir=`echo $dir | sed -e 's/[ab][0-9]*$//' | \
  24. - sed -e 's/-PRE-GIT$//' `
  25. - if test $lastdir = $basedir ; then
  26. - continue;
  27. - fi
  28. - lastdir=$dir
  29. - if test -r $dir/libpcap.a ; then
  30. - libpcap=$dir/libpcap.a
  31. - d=$dir
  32. - fi
  33. - done
  34. - fi
  35. - if test $libpcap = FAIL ; then
  36. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  37. -$as_echo "not found" >&6; }
  38. #
  39. # Look for pcap-config.
  40. @@ -5657,51 +5626,6 @@ if test "x$ac_cv_lib_pcap_main" = xyes;
  41. libpcap="-lpcap"
  42. fi
  43. - if test $libpcap = FAIL ; then
  44. - as_fn_error $? "see the INSTALL doc for more info" "$LINENO" 5
  45. - fi
  46. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extraneous pcap header directories" >&5
  47. -$as_echo_n "checking for extraneous pcap header directories... " >&6; }
  48. - if test \( ! -r /usr/local/include/pcap.h \) -a \
  49. - \( ! -r /usr/include/pcap.h \); then
  50. - if test -r /usr/local/include/pcap/pcap.h; then
  51. - d="/usr/local/include/pcap"
  52. - elif test -r /usr/include/pcap/pcap.h; then
  53. - d="/usr/include/pcap"
  54. - fi
  55. - fi
  56. - if test -z "$d" ; then
  57. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  58. -$as_echo "not found" >&6; }
  59. - else
  60. - V_INCLS="-I$d $V_INCLS"
  61. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found -- -I$d added" >&5
  62. -$as_echo "found -- -I$d added" >&6; }
  63. - fi
  64. - fi
  65. - else
  66. - V_PCAPDEP=$libpcap
  67. - places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
  68. - egrep '/libpcap-[0-9]*.[0-9]*(.[0-9]*)?([ab][0-9]*)?$'`
  69. - places2=`ls .. | sed -e 's,/$,,' -e "s,^,../," | \
  70. - egrep '/libpcap-[0-9]*.[0-9]*(.[0-9]*)?([ab][0-9]*)?$'`
  71. - pcapH=FAIL
  72. - if test -r $d/pcap.h; then
  73. - pcapH=$d
  74. - else
  75. - for dir in $places $srcdir/../libpcap ../libpcap $srcdir/libpcap $places2 ; do
  76. - if test -r $dir/pcap.h ; then
  77. - pcapH=$dir
  78. - fi
  79. - done
  80. - fi
  81. -
  82. - if test $pcapH = FAIL ; then
  83. - as_fn_error $? "cannot find pcap.h: see INSTALL" "$LINENO" 5
  84. - fi
  85. - V_INCLS="-I$pcapH $V_INCLS"
  86. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libpcap" >&5
  87. -$as_echo "$libpcap" >&6; }
  88. # Extract the first word of "pcap-config", so it can be a program name with args.
  89. set dummy pcap-config; ac_word=$2
  90. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5