--- nmap-5.21/configure.~1~	Thu Nov  5 11:50:33 2009

+++ nmap-5.21/configure	Mon Mar 21 16:56:04 2011

@@ -1,4 +1,4 @@

-#! /bin/sh

+#! /bin/bash

 # Guess values for system-dependent variables and create Makefiles.

 # Generated by GNU Autoconf 2.63.

 #

@@ -589,7 +589,7 @@

 subdirs=

 MFLAGS=

 MAKEFLAGS=

-SHELL=${CONFIG_SHELL-/bin/sh}

+SHELL=${CONFIG_SHELL-/bin/bash}

 # Identity of this package.

 PACKAGE_NAME=

@@ -832,7 +832,7 @@

 datadir='${datarootdir}'

 sysconfdir='${prefix}/etc'

 sharedstatedir='${prefix}/com'

-localstatedir='${prefix}/var'

+localstatedir=

 includedir='${prefix}/include'

 oldincludedir='/usr/include'

 docdir='${datarootdir}/doc/${PACKAGE}'

@@ -3973,7 +3973,7 @@

   ac_save_cxx_werror_flag=$ac_cxx_werror_flag

    ac_cxx_werror_flag=yes

    ac_cv_prog_cxx_g=no

-   CXXFLAGS="-g"

+   CXXFLAGS="$CXXFLAGS"

    cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */

 _ACEOF

@@ -4012,7 +4012,7 @@

   $as_echo "$as_me: failed program was:" >&5

 sed 's/^/| /' conftest.$ac_ext >&5

-	CXXFLAGS=""

+	CXXFLAGS="$CXXFLAGS"

       cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */

 _ACEOF

@@ -4052,7 +4052,7 @@

 sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag

-	 CXXFLAGS="-g"

+	 CXXFLAGS="$CXXFLAGS"

 	 cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */

 _ACEOF

@@ -4109,15 +4109,15 @@

   CXXFLAGS=$ac_save_CXXFLAGS

 elif test $ac_cv_prog_cxx_g = yes; then

   if test "$GXX" = yes; then

-    CXXFLAGS="-g -O2"

+    CXXFLAGS="$CXXFLAGS"

   else

-    CXXFLAGS="-g"

+    CXXFLAGS="$CXXFLAGS"

   fi

 else

   if test "$GXX" = yes; then

-    CXXFLAGS="-O2"

+    CXXFLAGS="$CXXFLAGS"

   else

-    CXXFLAGS=

+    CXXFLAGS="$CXXFLAGS"

   fi

 fi

 ac_ext=c

@@ -4223,7 +4223,7 @@

 if test -n "$GXX"; then

   # -fno-strict-aliasing disables strict-aliasing optimizations that assume

   # that pointers of different types never point to the same object.

-  CXXFLAGS="$CXXFLAGS -Wall -fno-strict-aliasing"

+  CXXFLAGS="$CXXFLAGS"

 fi

 # Remember that all following tests will run with this CXXFLAGS by default

@@ -6024,8 +6024,7 @@

      else

        am_py_prefix=$prefix

      fi

-     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||

-     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`

+     am_cv_python_pythondir="$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"

      case $am_cv_python_pythondir in

      $am_py_prefix*)

        am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`

@@ -6054,8 +6053,7 @@

      else

        am_py_exec_prefix=$exec_prefix

      fi

-     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||

-     echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`

+     am_cv_python_pyexecdir="$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"

      case $am_cv_python_pyexecdir in

      $am_py_exec_prefix*)

        am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`

@@ -6723,7 +6721,7 @@

 cat >>conftest.$ac_ext <<_ACEOF

 /* end confdefs.h.  */

 $ac_includes_default

-#include <pcap.h>

+#include <pcap/pcap.h>

 _ACEOF

 rm -f conftest.$ac_objext

 if { (ac_try="$ac_compile"

@@ -6764,7 +6762,7 @@

 cat confdefs.h >>conftest.$ac_ext

 cat >>conftest.$ac_ext <<_ACEOF

 /* end confdefs.h.  */

-#include <pcap.h>

+#include <pcap/pcap.h>

 _ACEOF

 if { (ac_try="$ac_cpp conftest.$ac_ext"

 case "(($ac_try" in