--- nmap-5.00.orig/configure 2009-06-24 23:35:54.000000000 +0200 +++ nmap-5.00/configure 2009-07-20 20:36:51.023261444 +0200 @@ -7074,90 +7074,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" - { $as_echo "$as_me:$LINENO: checking if libpcap version is recent enough" >&5 -$as_echo_n "checking if libpcap version is recent enough... " >&6; } - if test "$cross_compiling" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -$as_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 -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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; }; have_libpcap=yes -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -{ $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; }; have_libpcap=no -fi -rm -rf conftest.dSYM -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