1
0

patch-configure 2.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293
  1. --- nmap-5.00.orig/configure 2009-06-24 23:35:54.000000000 +0200
  2. +++ nmap-5.00/configure 2009-07-20 20:36:51.023261444 +0200
  3. @@ -7074,90 +7074,6 @@ if test $needs_cpp_precomp = yes; then
  4. CXXFLAGS="-no-cpp-precomp $CXXFLAGS"
  5. fi
  6. -if test $have_libpcap = yes; then
  7. - if test "${LIBPCAP_INC+set}" = "set"; then
  8. - _cflags=$CXXFLAGS
  9. - _ldflags=$LDFLAGS
  10. -
  11. - CPPFLAGS="-I$LIBPCAP_INC $CPPFLAGS"
  12. - LDFLAGS="-L$LIBPCAP_LIB $LDFLAGS"
  13. - fi
  14. -
  15. - # link with -lpcap for the purposes of this test
  16. - LIBS_OLD="$LIBS"
  17. - LIBS="$LIBS -lpcap"
  18. - { $as_echo "$as_me:$LINENO: checking if libpcap version is recent enough" >&5
  19. -$as_echo_n "checking if libpcap version is recent enough... " >&6; }
  20. - if test "$cross_compiling" = yes; then
  21. - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  22. -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  23. -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
  24. -See \`config.log' for more details." >&5
  25. -$as_echo "$as_me: error: cannot run test program while cross compiling
  26. -See \`config.log' for more details." >&2;}
  27. - { (exit 1); exit 1; }; }; }
  28. -else
  29. - cat >conftest.$ac_ext <<_ACEOF
  30. -/* confdefs.h. */
  31. -_ACEOF
  32. -cat confdefs.h >>conftest.$ac_ext
  33. -cat >>conftest.$ac_ext <<_ACEOF
  34. -/* end confdefs.h. */
  35. -
  36. -#include <stdio.h>
  37. -extern char pcap_version[];
  38. -int main() {
  39. - int major, minor1, minor2;
  40. - sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
  41. - if (major > 0)
  42. - exit(0);
  43. - if (minor1 < 9)
  44. - exit(1);
  45. - if (minor2 < 4)
  46. - exit(1);
  47. - exit(0);
  48. -}
  49. -_ACEOF
  50. -rm -f conftest$ac_exeext
  51. -if { (ac_try="$ac_link"
  52. -case "(($ac_try" in
  53. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  54. - *) ac_try_echo=$ac_try;;
  55. -esac
  56. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  57. -$as_echo "$ac_try_echo") >&5
  58. - (eval "$ac_link") 2>&5
  59. - ac_status=$?
  60. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  61. - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
  62. - { (case "(($ac_try" in
  63. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  64. - *) ac_try_echo=$ac_try;;
  65. -esac
  66. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  67. -$as_echo "$ac_try_echo") >&5
  68. - (eval "$ac_try") 2>&5
  69. - ac_status=$?
  70. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  71. - (exit $ac_status); }; }; then
  72. - { $as_echo "$as_me:$LINENO: result: yes" >&5
  73. -$as_echo "yes" >&6; }; have_libpcap=yes
  74. -else
  75. - $as_echo "$as_me: program exited with status $ac_status" >&5
  76. -$as_echo "$as_me: failed program was:" >&5
  77. -sed 's/^/| /' conftest.$ac_ext >&5
  78. -
  79. -( exit $ac_status )
  80. -{ $as_echo "$as_me:$LINENO: result: no" >&5
  81. -$as_echo "no" >&6; }; have_libpcap=no
  82. -fi
  83. -rm -rf conftest.dSYM
  84. -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  85. -fi
  86. -
  87. -
  88. -LIBS="$LIBS_OLD"
  89. -fi
  90. LIBPCAP_LIBS="-lpcap"
  91. if test $have_libpcap = yes; then