|
1 --- nmap-5.21/configure.~1~ 2011-01-21 13:00:04.000000000 -0800 |
|
2 +++ nmap-5.21/configure 2011-11-28 14:45:27.152150862 -0800 |
|
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.66. |
|
8 # |
|
9 @@ -237,7 +237,7 @@ |
|
10 fi |
|
11 fi |
|
12 fi |
|
13 -SHELL=${CONFIG_SHELL-/bin/sh} |
|
14 +SHELL=${CONFIG_SHELL-/bin/bash} |
|
15 export SHELL |
|
16 # Unset more variables known to interfere with behavior of common tools. |
|
17 CLICOLOR_FORCE= GREP_OPTIONS= |
|
18 @@ -800,7 +800,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 @@ -3985,7 +3985,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 confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
34 /* end confdefs.h. */ |
|
35 |
|
36 @@ -4000,7 +4000,7 @@ |
|
37 if ac_fn_cxx_try_compile "$LINENO"; then : |
|
38 ac_cv_prog_cxx_g=yes |
|
39 else |
|
40 - CXXFLAGS="" |
|
41 + CXXFLAGS="CXXFLAGS" |
|
42 cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
43 /* end confdefs.h. */ |
|
44 |
|
45 @@ -4016,7 +4016,7 @@ |
|
46 |
|
47 else |
|
48 ac_cxx_werror_flag=$ac_save_cxx_werror_flag |
|
49 - CXXFLAGS="-g" |
|
50 + CXXFLAGS="CXXFLAGS" |
|
51 cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
52 /* end confdefs.h. */ |
|
53 |
|
54 @@ -4044,15 +4044,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 @@ -4250,7 +4250,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 @@ -5687,8 +5687,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 @@ -5717,8 +5716,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 @@ -6193,7 +6191,7 @@ |
|
104 if test "${LIBPCAP_INC+set}" = "set"; then |
|
105 CPPFLAGS="$CPPFLAGS -I$LIBPCAP_INC" |
|
106 else |
|
107 - CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$libpcapdir" |
|
108 + CPPFLAGS="$CPPFLAGS -I$libpcapdir" |
|
109 fi |
|
110 LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a' |
|
111 PCAP_DEPENDS='$(LIBPCAPDIR)/libpcap.a' |
|
112 @@ -6341,7 +6339,7 @@ |
|
113 if test $have_pcre != yes ; then |
|
114 subdirs="$subdirs libpcre" |
|
115 |
|
116 - CPPFLAGS="-I\$(top_srcdir)/$LIBPCREDIR $CPPFLAGS" |
|
117 + CPPFLAGS="-I$LIBPCREDIR $CPPFLAGS" |
|
118 LIBPCRE_LIBS="$LIBPCREDIR/libpcre.a" |
|
119 PCRE_DEPENDS="$LIBPCREDIR/libpcre.a" |
|
120 PCRE_BUILD="pcre_build" |
|
121 @@ -6407,9 +6405,9 @@ |
|
122 if test $have_dnet != yes ; then |
|
123 subdirs="$subdirs libdnet-stripped" |
|
124 |
|
125 - CPPFLAGS="-I\$(top_srcdir)/$LIBDNETDIR/include $CPPFLAGS" |
|
126 - LIBDNET_LIBS="\$(top_srcdir)/$LIBDNETDIR/src/.libs/libdnet.a" |
|
127 - DNET_DEPENDS="\$(top_srcdir)/$LIBDNETDIR/src/.libs/libdnet.a" |
|
128 + CPPFLAGS="-I$LIBDNETDIR/include $CPPFLAGS" |
|
129 + LIBDNET_LIBS="$LIBDNETDIR/src/.libs/libdnet.a" |
|
130 + DNET_DEPENDS="$LIBDNETDIR/src/.libs/libdnet.a" |
|
131 DNET_BUILD="dnet_build" |
|
132 DNET_CLEAN="dnet_clean" |
|
133 DNET_DIST_CLEAN="dnet_dist_clean" |
|
134 @@ -6442,9 +6440,9 @@ |
|
135 yes) |
|
136 ;; |
|
137 included) |
|
138 - CPPFLAGS="-I\$(top_srcdir)/$LIBLUADIR $CPPFLAGS" |
|
139 - LIBLUA_LIBS="\$(top_srcdir)/$LIBLUADIR/liblua.a" |
|
140 - LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a" |
|
141 + CPPFLAGS="-I$LIBLUADIR $CPPFLAGS" |
|
142 + LIBLUA_LIBS="$LIBLUADIR/liblua.a" |
|
143 + LUA_DEPENDS="$LIBLUADIR/liblua.a" |
|
144 LUA_BUILD="lua_build" |
|
145 LUA_CLEAN="lua_clean" |
|
146 LUA_DIST_CLEAN="lua_dist_clean" |
|
147 @@ -6737,9 +6735,9 @@ |
|
148 if test $have_lua != yes; then |
|
149 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
|
150 $as_echo "no" >&6; } |
|
151 - CPPFLAGS="-I\$(top_srcdir)/$LIBLUADIR $CPPFLAGS" |
|
152 - LIBLUA_LIBS="\$(top_srcdir)/$LIBLUADIR/liblua.a" |
|
153 - LUA_DEPENDS="\$(top_srcdir)/$LIBLUADIR/liblua.a" |
|
154 + CPPFLAGS="-I$LIBLUADIR $CPPFLAGS" |
|
155 + LIBLUA_LIBS="\$LIBLUADIR/liblua.a" |
|
156 + LUA_DEPENDS="\$LIBLUADIR/liblua.a" |
|
157 LUA_BUILD="lua_build" |
|
158 LUA_CLEAN="lua_clean" |
|
159 LUA_DIST_CLEAN="lua_dist_clean" |
|
160 @@ -7270,7 +7268,7 @@ |
|
161 |
|
162 |
|
163 LDFLAGS="$LDFLAGS -L$NBASEDIR" |
|
164 -CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$NBASEDIR" |
|
165 +CPPFLAGS="$CPPFLAGS -I$NBASEDIR" |
|
166 LIBNBASE_LIBS="-lnbase" |
|
167 |
|
168 |
|
169 @@ -7298,7 +7296,7 @@ |
|
170 |
|
171 |
|
172 LDFLAGS="$LDFLAGS -L$NSOCKDIR/src/" |
|
173 -CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$NSOCKDIR/include" |
|
174 +CPPFLAGS="$CPPFLAGS -I$NSOCKDIR/include" |
|
175 LIBNSOCK_LIBS="-lnsock" |