|
1 --- nmap-5.21/configure.~1~ Thu Nov 5 11:50:33 2009 |
|
2 +++ nmap-5.21/configure Mon Mar 21 16:56:04 2011 |
|
3 @@ -1,4 +1,4 @@ |
|
4 -#! /bin/sh |
|
5 +#! /bin/bash |
|
6 # Guess values for system-dependent variables and create Makefiles. |
|
7 # Generated by GNU Autoconf 2.63. |
|
8 # |
|
9 @@ -589,7 +589,7 @@ |
|
10 subdirs= |
|
11 MFLAGS= |
|
12 MAKEFLAGS= |
|
13 -SHELL=${CONFIG_SHELL-/bin/sh} |
|
14 +SHELL=${CONFIG_SHELL-/bin/bash} |
|
15 |
|
16 # Identity of this package. |
|
17 PACKAGE_NAME= |
|
18 @@ -832,7 +832,7 @@ |
|
19 datadir='${datarootdir}' |
|
20 sysconfdir='${prefix}/etc' |
|
21 sharedstatedir='${prefix}/com' |
|
22 -localstatedir='${prefix}/var' |
|
23 +localstatedir= |
|
24 includedir='${prefix}/include' |
|
25 oldincludedir='/usr/include' |
|
26 docdir='${datarootdir}/doc/${PACKAGE}' |
|
27 @@ -3973,7 +3973,7 @@ |
|
28 ac_save_cxx_werror_flag=$ac_cxx_werror_flag |
|
29 ac_cxx_werror_flag=yes |
|
30 ac_cv_prog_cxx_g=no |
|
31 - CXXFLAGS="-g" |
|
32 + CXXFLAGS="$CXXFLAGS" |
|
33 cat >conftest.$ac_ext <<_ACEOF |
|
34 /* confdefs.h. */ |
|
35 _ACEOF |
|
36 @@ -4012,7 +4012,7 @@ |
|
37 $as_echo "$as_me: failed program was:" >&5 |
|
38 sed 's/^/| /' conftest.$ac_ext >&5 |
|
39 |
|
40 - CXXFLAGS="" |
|
41 + CXXFLAGS="$CXXFLAGS" |
|
42 cat >conftest.$ac_ext <<_ACEOF |
|
43 /* confdefs.h. */ |
|
44 _ACEOF |
|
45 @@ -4052,7 +4052,7 @@ |
|
46 sed 's/^/| /' conftest.$ac_ext >&5 |
|
47 |
|
48 ac_cxx_werror_flag=$ac_save_cxx_werror_flag |
|
49 - CXXFLAGS="-g" |
|
50 + CXXFLAGS="$CXXFLAGS" |
|
51 cat >conftest.$ac_ext <<_ACEOF |
|
52 /* confdefs.h. */ |
|
53 _ACEOF |
|
54 @@ -4109,15 +4109,15 @@ |
|
55 CXXFLAGS=$ac_save_CXXFLAGS |
|
56 elif test $ac_cv_prog_cxx_g = yes; then |
|
57 if test "$GXX" = yes; then |
|
58 - CXXFLAGS="-g -O2" |
|
59 + CXXFLAGS="$CXXFLAGS" |
|
60 else |
|
61 - CXXFLAGS="-g" |
|
62 + CXXFLAGS="$CXXFLAGS" |
|
63 fi |
|
64 else |
|
65 if test "$GXX" = yes; then |
|
66 - CXXFLAGS="-O2" |
|
67 + CXXFLAGS="$CXXFLAGS" |
|
68 else |
|
69 - CXXFLAGS= |
|
70 + CXXFLAGS="$CXXFLAGS" |
|
71 fi |
|
72 fi |
|
73 ac_ext=c |
|
74 @@ -4223,7 +4223,7 @@ |
|
75 if test -n "$GXX"; then |
|
76 # -fno-strict-aliasing disables strict-aliasing optimizations that assume |
|
77 # that pointers of different types never point to the same object. |
|
78 - CXXFLAGS="$CXXFLAGS -Wall -fno-strict-aliasing" |
|
79 + CXXFLAGS="$CXXFLAGS" |
|
80 fi |
|
81 |
|
82 # Remember that all following tests will run with this CXXFLAGS by default |
|
83 @@ -6024,8 +6024,7 @@ |
|
84 else |
|
85 am_py_prefix=$prefix |
|
86 fi |
|
87 - 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 || |
|
88 - echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` |
|
89 + am_cv_python_pythondir="$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages" |
|
90 case $am_cv_python_pythondir in |
|
91 $am_py_prefix*) |
|
92 am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` |
|
93 @@ -6054,8 +6053,7 @@ |
|
94 else |
|
95 am_py_exec_prefix=$exec_prefix |
|
96 fi |
|
97 - 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 || |
|
98 - echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` |
|
99 + am_cv_python_pyexecdir="$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages" |
|
100 case $am_cv_python_pyexecdir in |
|
101 $am_py_exec_prefix*) |
|
102 am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` |
|
103 @@ -6723,7 +6721,7 @@ |
|
104 cat >>conftest.$ac_ext <<_ACEOF |
|
105 /* end confdefs.h. */ |
|
106 $ac_includes_default |
|
107 -#include <pcap.h> |
|
108 +#include <pcap/pcap.h> |
|
109 _ACEOF |
|
110 rm -f conftest.$ac_objext |
|
111 if { (ac_try="$ac_compile" |
|
112 @@ -6764,7 +6762,7 @@ |
|
113 cat confdefs.h >>conftest.$ac_ext |
|
114 cat >>conftest.$ac_ext <<_ACEOF |
|
115 /* end confdefs.h. */ |
|
116 -#include <pcap.h> |
|
117 +#include <pcap/pcap.h> |
|
118 _ACEOF |
|
119 if { (ac_try="$ac_cpp conftest.$ac_ext" |
|
120 case "(($ac_try" in |