Lines 1-35
Link Here
|
1 |
|
1 |
--- configure.orig Wed Jun 23 07:39:15 2004 |
2 |
$FreeBSD: ports/net/poptop/files/patch-ab,v 1.5 2003/10/18 18:22:42 krion Exp $ |
2 |
+++ configure Thu Oct 20 22:33:48 2005 |
3 |
|
3 |
@@ -958,7 +958,7 @@ |
4 |
--- Makefile.in.orig Fri Feb 28 00:41:21 2003 |
4 |
else |
5 |
+++ Makefile.in Sat Oct 18 21:51:01 2003 |
5 |
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 |
6 |
@@ -75,7 +75,7 @@ |
6 |
fi |
7 |
AUTOMAKE_OPTIONS = no-dependencies foreign |
7 |
- cd "$ac_popdir" |
|
|
8 |
+ cd $ac_popdir |
9 |
done |
10 |
fi |
8 |
|
11 |
|
9 |
INCLUDES = -I. |
12 |
@@ -2301,7 +2301,8 @@ |
10 |
-CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' |
13 |
cat conftest.err >&5 |
11 |
+CFLAGS= @CFLAGS@ -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"' |
14 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
12 |
#CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' |
15 |
(exit $ac_status); } && |
13 |
#CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"' |
16 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
|
|
17 |
+ { ac_try='test -z "$ac_c_werror_flag" |
18 |
+ || test ! -s conftest.err' |
19 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
20 |
(eval $ac_try) 2>&5 |
21 |
ac_status=$? |
22 |
@@ -2359,7 +2360,8 @@ |
23 |
cat conftest.err >&5 |
24 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
25 |
(exit $ac_status); } && |
26 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
27 |
+ { ac_try='test -z "$ac_c_werror_flag" |
28 |
+ || test ! -s conftest.err' |
29 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
30 |
(eval $ac_try) 2>&5 |
31 |
ac_status=$? |
32 |
@@ -2475,7 +2477,8 @@ |
33 |
cat conftest.err >&5 |
34 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
35 |
(exit $ac_status); } && |
36 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
37 |
+ { ac_try='test -z "$ac_c_werror_flag" |
38 |
+ || test ! -s conftest.err' |
39 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
40 |
(eval $ac_try) 2>&5 |
41 |
ac_status=$? |
42 |
@@ -2529,7 +2532,8 @@ |
43 |
cat conftest.err >&5 |
44 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
45 |
(exit $ac_status); } && |
46 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
47 |
+ { ac_try='test -z "$ac_c_werror_flag" |
48 |
+ || test ! -s conftest.err' |
49 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
50 |
(eval $ac_try) 2>&5 |
51 |
ac_status=$? |
52 |
@@ -2574,7 +2578,8 @@ |
53 |
cat conftest.err >&5 |
54 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
55 |
(exit $ac_status); } && |
56 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
57 |
+ { ac_try='test -z "$ac_c_werror_flag" |
58 |
+ || test ! -s conftest.err' |
59 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
60 |
(eval $ac_try) 2>&5 |
61 |
ac_status=$? |
62 |
@@ -2618,7 +2623,8 @@ |
63 |
cat conftest.err >&5 |
64 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
65 |
(exit $ac_status); } && |
66 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
67 |
+ { ac_try='test -z "$ac_c_werror_flag" |
68 |
+ || test ! -s conftest.err' |
69 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
70 |
(eval $ac_try) 2>&5 |
71 |
ac_status=$? |
72 |
@@ -3107,7 +3113,8 @@ |
73 |
cat conftest.err >&5 |
74 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
75 |
(exit $ac_status); } && |
76 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
77 |
+ { ac_try='test -z "$ac_c_werror_flag" |
78 |
+ || test ! -s conftest.err' |
79 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
80 |
(eval $ac_try) 2>&5 |
81 |
ac_status=$? |
82 |
@@ -3167,7 +3174,8 @@ |
83 |
cat conftest.err >&5 |
84 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
85 |
(exit $ac_status); } && |
86 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
87 |
+ { ac_try='test -z "$ac_c_werror_flag" |
88 |
+ || test ! -s conftest.err' |
89 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
90 |
(eval $ac_try) 2>&5 |
91 |
ac_status=$? |
92 |
@@ -3309,7 +3317,8 @@ |
93 |
cat conftest.err >&5 |
94 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
95 |
(exit $ac_status); } && |
96 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
97 |
+ { ac_try='test -z "$ac_c_werror_flag" |
98 |
+ || test ! -s conftest.err' |
99 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
100 |
(eval $ac_try) 2>&5 |
101 |
ac_status=$? |
102 |
@@ -3625,7 +3634,8 @@ |
103 |
cat conftest.err >&5 |
104 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
105 |
(exit $ac_status); } && |
106 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
107 |
+ { ac_try='test -z "$ac_c_werror_flag" |
108 |
+ || test ! -s conftest.err' |
109 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
110 |
(eval $ac_try) 2>&5 |
111 |
ac_status=$? |
112 |
@@ -3795,7 +3805,8 @@ |
113 |
cat conftest.err >&5 |
114 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
115 |
(exit $ac_status); } && |
116 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
117 |
+ { ac_try='test -z "$ac_c_werror_flag" |
118 |
+ || test ! -s conftest.err' |
119 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
120 |
(eval $ac_try) 2>&5 |
121 |
ac_status=$? |
122 |
@@ -3862,7 +3873,8 @@ |
123 |
cat conftest.err >&5 |
124 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
125 |
(exit $ac_status); } && |
126 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
127 |
+ { ac_try='test -z "$ac_c_werror_flag" |
128 |
+ || test ! -s conftest.err' |
129 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
130 |
(eval $ac_try) 2>&5 |
131 |
ac_status=$? |
132 |
@@ -4011,7 +4023,8 @@ |
133 |
cat conftest.err >&5 |
134 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
135 |
(exit $ac_status); } && |
136 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
137 |
+ { ac_try='test -z "$ac_c_werror_flag" |
138 |
+ || test ! -s conftest.err' |
139 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
140 |
(eval $ac_try) 2>&5 |
141 |
ac_status=$? |
142 |
@@ -4160,7 +4173,8 @@ |
143 |
cat conftest.err >&5 |
144 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
145 |
(exit $ac_status); } && |
146 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
147 |
+ { ac_try='test -z "$ac_c_werror_flag" |
148 |
+ || test ! -s conftest.err' |
149 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
150 |
(eval $ac_try) 2>&5 |
151 |
ac_status=$? |
152 |
@@ -4309,7 +4323,8 @@ |
153 |
cat conftest.err >&5 |
154 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
155 |
(exit $ac_status); } && |
156 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
157 |
+ { ac_try='test -z "$ac_c_werror_flag" |
158 |
+ || test ! -s conftest.err' |
159 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
160 |
(eval $ac_try) 2>&5 |
161 |
ac_status=$? |
162 |
@@ -4458,7 +4473,8 @@ |
163 |
cat conftest.err >&5 |
164 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
165 |
(exit $ac_status); } && |
166 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
167 |
+ { ac_try='test -z "$ac_c_werror_flag" |
168 |
+ || test ! -s conftest.err' |
169 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
170 |
(eval $ac_try) 2>&5 |
171 |
ac_status=$? |
172 |
@@ -4606,7 +4622,8 @@ |
173 |
cat conftest.err >&5 |
174 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
175 |
(exit $ac_status); } && |
176 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
177 |
+ { ac_try='test -z "$ac_c_werror_flag" |
178 |
+ || test ! -s conftest.err' |
179 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
180 |
(eval $ac_try) 2>&5 |
181 |
ac_status=$? |
182 |
@@ -4671,7 +4688,8 @@ |
183 |
cat conftest.err >&5 |
184 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
185 |
(exit $ac_status); } && |
186 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
187 |
+ { ac_try='test -z "$ac_c_werror_flag" |
188 |
+ || test ! -s conftest.err' |
189 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
190 |
(eval $ac_try) 2>&5 |
191 |
ac_status=$? |
192 |
@@ -4736,7 +4754,8 @@ |
193 |
cat conftest.err >&5 |
194 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
195 |
(exit $ac_status); } && |
196 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
197 |
+ { ac_try='test -z "$ac_c_werror_flag" |
198 |
+ || test ! -s conftest.err' |
199 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
200 |
(eval $ac_try) 2>&5 |
201 |
ac_status=$? |
202 |
@@ -4801,7 +4820,8 @@ |
203 |
cat conftest.err >&5 |
204 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
205 |
(exit $ac_status); } && |
206 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
207 |
+ { ac_try='test -z "$ac_c_werror_flag" |
208 |
+ || test ! -s conftest.err' |
209 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
210 |
(eval $ac_try) 2>&5 |
211 |
ac_status=$? |
212 |
@@ -4866,7 +4886,8 @@ |
213 |
cat conftest.err >&5 |
214 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
215 |
(exit $ac_status); } && |
216 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
217 |
+ { ac_try='test -z "$ac_c_werror_flag" |
218 |
+ || test ! -s conftest.err' |
219 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
220 |
(eval $ac_try) 2>&5 |
221 |
ac_status=$? |
222 |
@@ -4971,7 +4992,8 @@ |
223 |
cat conftest.err >&5 |
224 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
225 |
(exit $ac_status); } && |
226 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
227 |
+ { ac_try='test -z "$ac_c_werror_flag" |
228 |
+ || test ! -s conftest.err' |
229 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
230 |
(eval $ac_try) 2>&5 |
231 |
ac_status=$? |
232 |
@@ -5024,7 +5046,8 @@ |
233 |
cat conftest.err >&5 |
234 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
235 |
(exit $ac_status); } && |
236 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
237 |
+ { ac_try='test -z "$ac_c_werror_flag" |
238 |
+ || test ! -s conftest.err' |
239 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
240 |
(eval $ac_try) 2>&5 |
241 |
ac_status=$? |
242 |
@@ -5101,7 +5124,8 @@ |
243 |
cat conftest.err >&5 |
244 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
245 |
(exit $ac_status); } && |
246 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
247 |
+ { ac_try='test -z "$ac_c_werror_flag" |
248 |
+ || test ! -s conftest.err' |
249 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
250 |
(eval $ac_try) 2>&5 |
251 |
ac_status=$? |
252 |
@@ -5174,7 +5198,8 @@ |
253 |
cat conftest.err >&5 |
254 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
255 |
(exit $ac_status); } && |
256 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
257 |
+ { ac_try='test -z "$ac_c_werror_flag" |
258 |
+ || test ! -s conftest.err' |
259 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
260 |
(eval $ac_try) 2>&5 |
261 |
ac_status=$? |
262 |
@@ -5247,7 +5272,8 @@ |
263 |
cat conftest.err >&5 |
264 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
265 |
(exit $ac_status); } && |
266 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
267 |
+ { ac_try='test -z "$ac_c_werror_flag" |
268 |
+ || test ! -s conftest.err' |
269 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
270 |
(eval $ac_try) 2>&5 |
271 |
ac_status=$? |
272 |
@@ -5320,7 +5346,8 @@ |
273 |
cat conftest.err >&5 |
274 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
275 |
(exit $ac_status); } && |
276 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
277 |
+ { ac_try='test -z "$ac_c_werror_flag" |
278 |
+ || test ! -s conftest.err' |
279 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
280 |
(eval $ac_try) 2>&5 |
281 |
ac_status=$? |
282 |
@@ -5393,7 +5420,8 @@ |
283 |
cat conftest.err >&5 |
284 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
285 |
(exit $ac_status); } && |
286 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
287 |
+ { ac_try='test -z "$ac_c_werror_flag" |
288 |
+ || test ! -s conftest.err' |
289 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
290 |
(eval $ac_try) 2>&5 |
291 |
ac_status=$? |
292 |
@@ -5466,7 +5494,8 @@ |
293 |
cat conftest.err >&5 |
294 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
295 |
(exit $ac_status); } && |
296 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
297 |
+ { ac_try='test -z "$ac_c_werror_flag" |
298 |
+ || test ! -s conftest.err' |
299 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
300 |
(eval $ac_try) 2>&5 |
301 |
ac_status=$? |
302 |
@@ -5539,7 +5568,8 @@ |
303 |
cat conftest.err >&5 |
304 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
305 |
(exit $ac_status); } && |
306 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
307 |
+ { ac_try='test -z "$ac_c_werror_flag" |
308 |
+ || test ! -s conftest.err' |
309 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
310 |
(eval $ac_try) 2>&5 |
311 |
ac_status=$? |
312 |
@@ -5612,7 +5642,8 @@ |
313 |
cat conftest.err >&5 |
314 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
315 |
(exit $ac_status); } && |
316 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
317 |
+ { ac_try='test -z "$ac_c_werror_flag" |
318 |
+ || test ! -s conftest.err' |
319 |
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
320 |
(eval $ac_try) 2>&5 |
321 |
ac_status=$? |
322 |
@@ -5683,7 +5714,7 @@ |
323 |
if test "$ac_cv_header_libintl_h" = yes; then |
324 |
if test "$ac_cv_lib_c_gettext" = no; then |
325 |
if test "$ac_cv_lib_intl_gettext" = yes; then |
326 |
- XTRALIBS_MGR = "$XTRALIBS_MGR -lintl" |
327 |
+ XTRALIBS_MGR="$XTRALIBS_MGR -lintl" |
328 |
else |
329 |
echo "Have libintl.h but no usable gettext!" 1>&2 |
330 |
exit 1 |
331 |
@@ -6712,6 +6743,11 @@ |
332 |
*) ac_INSTALL=$ac_top_builddir$INSTALL ;; |
333 |
esac |
14 |
|
334 |
|
15 |
@@ -93,8 +93,8 @@ |
335 |
+ if test x"$ac_file" != x-; then |
16 |
# for dependencies, so just attribute them all to pptpd. |
336 |
+ { echo "$as_me:$LINENO: creating $ac_file" >&5 |
17 |
|
337 |
+echo "$as_me: creating $ac_file" >&6;} |
18 |
pptpd_SOURCES = \ |
338 |
+ rm -f "$ac_file" |
19 |
- pptpd.c configfile.c pptpmanager.c compat.c inststr.c getopt.c getopt1.c \ |
339 |
+ fi |
20 |
- compat.h configfile.h ctrlpacket.h defaults.h inststr.h our_getopt.h \ |
340 |
# Let's still pretend it is `configure' which instantiates (i.e., don't |
21 |
+ pptpd.c configfile.c pptpmanager.c compat.c inststr.c \ |
341 |
# use $as_me), people would be surprised to read: |
22 |
+ compat.h configfile.h ctrlpacket.h defaults.h inststr.h out_getopt.h \ |
342 |
# /* config.h. Generated by config.status. */ |
23 |
our_syslog.h ppphdlc.h pptpctrl.h pptpdefs.h pptpgre.h pptpmanager.h |
343 |
@@ -6750,12 +6786,6 @@ |
24 |
|
344 |
fi;; |
25 |
|
345 |
esac |
26 |
@@ -118,8 +118,7 @@ |
346 |
done` || { (exit 1); exit 1; } |
27 |
LDFLAGS = @LDFLAGS@ |
347 |
- |
28 |
LIBS = @LIBS@ |
348 |
- if test x"$ac_file" != x-; then |
29 |
pptpd_OBJECTS = pptpd.$(OBJEXT) configfile.$(OBJEXT) \ |
349 |
- { echo "$as_me:$LINENO: creating $ac_file" >&5 |
30 |
-pptpmanager.$(OBJEXT) compat.$(OBJEXT) inststr.$(OBJEXT) \ |
350 |
-echo "$as_me: creating $ac_file" >&6;} |
31 |
-getopt.$(OBJEXT) getopt1.$(OBJEXT) |
351 |
- rm -f "$ac_file" |
32 |
+pptpmanager.$(OBJEXT) compat.$(OBJEXT) inststr.$(OBJEXT) |
352 |
- fi |
33 |
pptpd_DEPENDENCIES = |
353 |
_ACEOF |
34 |
pptpd_LDFLAGS = |
354 |
cat >>$CONFIG_STATUS <<_ACEOF |
35 |
pptpctrl_OBJECTS = pptpctrl.$(OBJEXT) ctrlpacket.$(OBJEXT) \ |
355 |
sed "$ac_vpsub |