002-remove_static_libpcap_check.patch 2.7 KB

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