1 --- nmap-5.21/libdnet-stripped/configure.~1~ Thu Jan 14 08:47:28 2010 |
|
2 +++ nmap-5.21/libdnet-stripped/configure Mon Mar 21 15:33:21 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 @@ -573,7 +573,7 @@ |
|
10 |
|
11 |
|
12 # Check that we are running under the correct shell. |
|
13 -SHELL=${CONFIG_SHELL-/bin/sh} |
|
14 +SHELL=${CONFIG_SHELL-/bin/bash} |
|
15 |
|
16 case X$lt_ECHO in |
|
17 X*--fallback-echo) |
|
18 @@ -657,7 +657,7 @@ |
|
19 elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && |
|
20 test "X$CONFIG_SHELL" != X/bin/ksh; then |
|
21 # If we have ksh, try running configure again with it. |
|
22 - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} |
|
23 + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/bash} |
|
24 export ORIGINAL_CONFIG_SHELL |
|
25 CONFIG_SHELL=/bin/ksh |
|
26 export CONFIG_SHELL |
|
27 @@ -699,7 +699,7 @@ |
|
28 if test "$prev" != 'sed 50q "$0"'; then |
|
29 echo_test_string=`eval $prev` |
|
30 export echo_test_string |
|
31 - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} |
|
32 + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/bash}} "$0" ${1+"$@"} |
|
33 else |
|
34 # Oops. We lost completely, so just stick with echo. |
|
35 ECHO=echo |
|
36 @@ -738,7 +738,7 @@ |
|
37 subdirs= |
|
38 MFLAGS= |
|
39 MAKEFLAGS= |
|
40 -SHELL=${CONFIG_SHELL-/bin/sh} |
|
41 +SHELL=${CONFIG_SHELL-/bin/bash} |
|
42 |
|
43 # Identity of this package. |
|
44 PACKAGE_NAME= |
|
45 @@ -965,7 +965,7 @@ |
|
46 datadir='${datarootdir}' |
|
47 sysconfdir='${prefix}/etc' |
|
48 sharedstatedir='${prefix}/com' |
|
49 -localstatedir='${prefix}/var' |
|
50 +localstateir= |
|
51 includedir='${prefix}/include' |
|
52 oldincludedir='/usr/include' |
|
53 docdir='${datarootdir}/doc/${PACKAGE}' |
|
54 @@ -2318,7 +2318,7 @@ |
|
55 $as_echo_n "(cached) " >&6 |
|
56 else |
|
57 cat >conftest.make <<\_ACEOF |
|
58 -SHELL = /bin/sh |
|
59 +SHELL = /bin/bash |
|
60 all: |
|
61 @echo '@@@%%%=$(MAKE)=@@@%%%' |
|
62 _ACEOF |
|
63 @@ -3298,7 +3298,7 @@ |
|
64 ac_save_c_werror_flag=$ac_c_werror_flag |
|
65 ac_c_werror_flag=yes |
|
66 ac_cv_prog_cc_g=no |
|
67 - CFLAGS="-g" |
|
68 + CFLAGS="$CFLAGS" |
|
69 cat >conftest.$ac_ext <<_ACEOF |
|
70 /* confdefs.h. */ |
|
71 _ACEOF |
|
72 @@ -3337,7 +3337,7 @@ |
|
73 $as_echo "$as_me: failed program was:" >&5 |
|
74 sed 's/^/| /' conftest.$ac_ext >&5 |
|
75 |
|
76 - CFLAGS="" |
|
77 + CFLAGS="$CFLAGS" |
|
78 cat >conftest.$ac_ext <<_ACEOF |
|
79 /* confdefs.h. */ |
|
80 _ACEOF |
|
81 @@ -3377,7 +3377,7 @@ |
|
82 sed 's/^/| /' conftest.$ac_ext >&5 |
|
83 |
|
84 ac_c_werror_flag=$ac_save_c_werror_flag |
|
85 - CFLAGS="-g" |
|
86 + CFLAGS="$CFLAGS" |
|
87 cat >conftest.$ac_ext <<_ACEOF |
|
88 /* confdefs.h. */ |
|
89 _ACEOF |
|
90 @@ -3434,15 +3434,15 @@ |
|
91 CFLAGS=$ac_save_CFLAGS |
|
92 elif test $ac_cv_prog_cc_g = yes; then |
|
93 if test "$GCC" = yes; then |
|
94 - CFLAGS="-g -O2" |
|
95 + CFLAGS="$CFLAGS" |
|
96 else |
|
97 - CFLAGS="-g" |
|
98 + CFLAGS="$CFLAGS" |
|
99 fi |
|
100 else |
|
101 if test "$GCC" = yes; then |
|
102 - CFLAGS="-O2" |
|
103 + CFLAGS="$CFLAGS" |
|
104 else |
|
105 - CFLAGS= |
|
106 + CFLAGS="$CFLAGS" |
|
107 fi |
|
108 fi |
|
109 { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 |
|
110 @@ -3671,7 +3671,7 @@ |
|
111 for i in 1 2 3 4 5 6; do |
|
112 echo '#include "conftst'$i'.h"' >> sub/conftest.c |
|
113 # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with |
|
114 - # Solaris 8's {/usr,}/bin/sh. |
|
115 + # Solaris 8's {/usr,}/bin/bash. |
|
116 touch sub/conftst$i.h |
|
117 done |
|
118 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
|
119 @@ -4576,7 +4576,7 @@ |
|
120 for i in 1 2 3 4 5 6 7 8 ; do |
|
121 teststring=$teststring$teststring |
|
122 done |
|
123 - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} |
|
124 + SHELL=${SHELL-${CONFIG_SHELL-/bin/bash}} |
|
125 # If test is not a shell built-in, we'll probably end up computing a |
|
126 # maximum length that is only half of the actual maximum length, but |
|
127 # we can't tell. |
|
128 @@ -12025,13 +12025,13 @@ |
|
129 |
|
130 # DLPI needs putmsg under HPUX so test for -lstr while we're at it |
|
131 |
|
132 -{ $as_echo "$as_me:$LINENO: checking for putmsg in -lstr" >&5 |
|
133 -$as_echo_n "checking for putmsg in -lstr... " >&6; } |
|
134 +{ $as_echo "$as_me:$LINENO: checking for putmsg in -lc" >&5 |
|
135 +$as_echo_n "checking for putmsg in -lc... " >&6; } |
|
136 if test "${ac_cv_lib_str_putmsg+set}" = set; then |
|
137 $as_echo_n "(cached) " >&6 |
|
138 else |
|
139 ac_check_lib_save_LIBS=$LIBS |
|
140 -LIBS="-lstr $LIBS" |
|
141 +LIBS=" -lc -lsocket -lresolv -lnsl -lgen $LIBS" |
|
142 cat >conftest.$ac_ext <<_ACEOF |
|
143 /* confdefs.h. */ |
|
144 _ACEOF |
|
145 @@ -12039,13 +12039,12 @@ |
|
146 cat >>conftest.$ac_ext <<_ACEOF |
|
147 /* end confdefs.h. */ |
|
148 |
|
149 -/* Override any GCC internal prototype to avoid an error. |
|
150 - Use char because int might match the return type of a GCC |
|
151 - builtin and then its argument prototype would still apply. */ |
|
152 -#ifdef __cplusplus |
|
153 -extern "C" |
|
154 -#endif |
|
155 -char putmsg (); |
|
156 +#include <stropts.h> |
|
157 +#include <sys/types.h> |
|
158 +#include <net/if.h> |
|
159 +#include <sys/socket.h> |
|
160 +#include <sys/filio.h> |
|
161 + |
|
162 int |
|
163 main () |
|
164 { |
|
165 @@ -12095,7 +12094,7 @@ |
|
166 #define HAVE_LIBSTR 1 |
|
167 _ACEOF |
|
168 |
|
169 - LIBS="-lstr $LIBS" |
|
170 + LIBS=" -lc -lsocket -lresolv -lnsl -lgen $LIBS" |
|
171 |
|
172 fi |
|
173 |
|
174 @@ -14380,15 +14379,8 @@ |
|
175 fi |
|
176 { $as_echo "$as_me:$LINENO: checking for Linux PF_PACKET sockets" >&5 |
|
177 $as_echo_n "checking for Linux PF_PACKET sockets... " >&6; } |
|
178 - if test "${ac_cv_dnet_linux_pf_packet+set}" = set; then |
|
179 - $as_echo_n "(cached) " >&6 |
|
180 -else |
|
181 - if test -f /usr/include/netpacket/packet.h ; then |
|
182 - ac_cv_dnet_linux_pf_packet=yes |
|
183 - else |
|
184 + |
|
185 ac_cv_dnet_linux_pf_packet=no |
|
186 - fi |
|
187 -fi |
|
188 |
|
189 { $as_echo "$as_me:$LINENO: result: $ac_cv_dnet_linux_pf_packet" >&5 |
|
190 $as_echo "$ac_cv_dnet_linux_pf_packet" >&6; } |
|