Merge lp:~yolanda.robla/ubuntu/trusty/squid3/add_distribution into lp:ubuntu/trusty/squid3
- Trusty (14.04)
- add_distribution
- Merge into trusty
Status: | Merged |
---|---|
Merged at revision: | 55 |
Proposed branch: | lp:~yolanda.robla/ubuntu/trusty/squid3/add_distribution |
Merge into: | lp:ubuntu/trusty/squid3 |
Diff against target: |
1209 lines (+1177/-1) 4 files modified
debian/changelog (+7/-0) debian/control (+1/-1) debian/patches/fix-distribution.patch (+1168/-0) debian/patches/series (+1/-0) |
To merge this branch: | bzr merge lp:~yolanda.robla/ubuntu/trusty/squid3/add_distribution |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dimitri John Ledkov | Approve | ||
Review via email: mp+194641@code.launchpad.net |
Commit message
Description of the change
Show distribution on squid3 -v
Blueprint: https:/
Yolanda Robla (yolanda.robla) wrote : | # |
Dimitri John Ledkov (xnox) wrote : | # |
configure diff is huge due to version missmatch, if one uses matching autoconf (2.68 in this case) then the diff would be smaller. But it's ok.
I see:
941 ++# define distribution
942 ++if test -x /usr/bin/
943 ++ SQUID_DISTRIBUT
944 ++else
945 ++ SQUID_DISTRIBUT
946 ++fi
947 ++
948 ++cat >>confdefs.h <<_ACEOF
949 ++#define SQUID_DISTRIBUTION "$SQUID_
950 ++_ACEOF
Can you please still patch configure.ac none-the-less? Such that next time one does regenerate configure from configure.ac that change is not accidentally lost.
- 55. By Yolanda Robla
-
patching configure.ac file
Yolanda Robla (yolanda.robla) wrote : | # |
recheck
Yolanda Robla (yolanda.robla) wrote : | # |
Hi, still pending review on that. xnox, can you take a look at that again?
Dimitri John Ledkov (xnox) : | # |
Preview Diff
1 | === modified file 'debian/changelog' |
2 | --- debian/changelog 2013-11-04 02:17:30 +0000 |
3 | +++ debian/changelog 2013-11-11 09:06:53 +0000 |
4 | @@ -1,3 +1,10 @@ |
5 | +squid3 (3.3.8-1ubuntu5) UNRELEASED; urgency=low |
6 | + |
7 | + * debian/control: added lsb-release dependency |
8 | + * debian/patches/fix-distribution.patch: added patch to show distribution |
9 | + |
10 | + -- Yolanda Robla <yolanda.robla@canonical.com> Thu, 07 Nov 2013 08:47:51 +0100 |
11 | + |
12 | squid3 (3.3.8-1ubuntu4) trusty; urgency=low |
13 | |
14 | * Fix perl & pod2man config.tests. |
15 | |
16 | === modified file 'debian/control' |
17 | --- debian/control 2013-08-14 09:03:55 +0000 |
18 | +++ debian/control 2013-11-11 09:06:53 +0000 |
19 | @@ -5,7 +5,7 @@ |
20 | XSBC-Original-Maintainer: Luigi Gangitano <luigi@debian.org> |
21 | Homepage: http://www.squid-cache.org |
22 | Standards-Version: 3.9.4 |
23 | -Build-Depends: libldap2-dev, libpam0g-dev, libdb-dev, cdbs, libsasl2-dev, debhelper (>=5), libcppunit-dev, libkrb5-dev, comerr-dev, libcap2-dev [linux-any], libecap2-dev, libexpat1-dev, libxml2-dev, autotools-dev, libltdl-dev, dpkg-dev (>= 1.16.1~), pkg-config, libnetfilter-conntrack-dev [linux-any], dh-apparmor |
24 | +Build-Depends: libldap2-dev, libpam0g-dev, libdb-dev, cdbs, libsasl2-dev, debhelper (>=5), libcppunit-dev, libkrb5-dev, comerr-dev, libcap2-dev [linux-any], libecap2-dev, libexpat1-dev, libxml2-dev, autotools-dev, libltdl-dev, dpkg-dev (>= 1.16.1~), pkg-config, libnetfilter-conntrack-dev [linux-any], dh-apparmor, lsb-release |
25 | XS-Testsuite: autopkgtest |
26 | |
27 | Package: squid3 |
28 | |
29 | === added file 'debian/patches/fix-distribution.patch' |
30 | --- debian/patches/fix-distribution.patch 1970-01-01 00:00:00 +0000 |
31 | +++ debian/patches/fix-distribution.patch 2013-11-11 09:06:53 +0000 |
32 | @@ -0,0 +1,1168 @@ |
33 | +Author: Yolanda Robla <yolanda.robla@canonical.com> |
34 | +Description: Added patch to show distribution when using squid3 -v |
35 | +Last-Update: 2013-11-11 |
36 | + |
37 | +Index: squid3/configure.ac |
38 | +=================================================================== |
39 | +--- squid3.orig/configure.ac 2013-11-07 04:15:15.147895000 +0000 |
40 | ++++ squid3/configure.ac 2013-11-07 04:15:15.143895000 +0000 |
41 | +@@ -216,6 +216,14 @@ |
42 | + AC_DEFINE_UNQUOTED(SQUID_CONFIGURE_OPTIONS, "$ac_configure_args", |
43 | + [configure command line used to configure Squid]) |
44 | + |
45 | ++# define distribution |
46 | ++if test -x /usr/bin/lsb_release && lsb_release -si; then |
47 | ++ SQUID_DISTRIBUTION=" ($(lsb_release -si))" |
48 | ++else |
49 | ++ SQUID_DISTRIBUTION="" |
50 | ++fi |
51 | ++AC_DEFINE_UNQUOTED(SQUID_DISTRIBUTION, "$SQUID_DISTRIBUTION", Squid distribution) |
52 | ++ |
53 | + CACHE_EFFECTIVE_USER="nobody" |
54 | + AC_ARG_WITH(default-user, |
55 | + AS_HELP_STRING([--with-default-user=USER],[System user account for squid permissions. Default: nobody]), |
56 | +Index: squid3/include/autoconf.h.in |
57 | +=================================================================== |
58 | +--- squid3.orig/include/autoconf.h.in 2013-11-08 14:28:00.515895000 +0000 |
59 | ++++ squid3/include/autoconf.h.in 2013-11-08 14:28:00.415895000 +0000 |
60 | +@@ -1193,6 +1193,9 @@ |
61 | + /* Squid extended build info field for "squid -v" output */ |
62 | + #undef SQUID_BUILD_INFO |
63 | + |
64 | ++/* Squid distribution field for "squid -v" output */ |
65 | ++#undef SQUID_DISTRIBUTION |
66 | ++ |
67 | + /* configure command line used to configure Squid */ |
68 | + #undef SQUID_CONFIGURE_OPTIONS |
69 | + |
70 | +Index: squid3/src/main.cc |
71 | +=================================================================== |
72 | +--- squid3.orig/src/main.cc 2013-11-08 14:28:00.515895000 +0000 |
73 | ++++ squid3/src/main.cc 2013-11-08 14:28:00.427895000 +0000 |
74 | +@@ -169,6 +169,10 @@ |
75 | + #define SQUID_BUILD_INFO "" |
76 | + #endif |
77 | + |
78 | ++#if !defined(SQUID_DISTRIBUTION) |
79 | ++#define SQUID_DISTRIBUTION "" |
80 | ++#endif |
81 | ++ |
82 | + static char *opt_syslog_facility = NULL; |
83 | + static int icpPortNumOverride = 1; /* Want to detect "-u 0" */ |
84 | + static int configured_once = 0; |
85 | +@@ -577,6 +581,8 @@ |
86 | + /** \par v |
87 | + * Display squid version and build information. Then exit. */ |
88 | + printf("Squid Cache: Version %s\n" ,version_string); |
89 | ++ if (strlen(SQUID_DISTRIBUTION)) |
90 | ++ printf("%s\n", SQUID_DISTRIBUTION); |
91 | + if (strlen(SQUID_BUILD_INFO)) |
92 | + printf("%s\n",SQUID_BUILD_INFO); |
93 | + printf( "configure options: %s\n", SQUID_CONFIGURE_OPTIONS); |
94 | +Index: squid3/configure |
95 | +=================================================================== |
96 | +--- squid3.orig/configure 2013-11-08 14:28:00.515895000 +0000 |
97 | ++++ squid3/configure 2013-11-08 14:28:00.511895000 +0000 |
98 | +@@ -1,14 +1,12 @@ |
99 | + #! /bin/sh |
100 | + # From configure.ac Revision. |
101 | + # Guess values for system-dependent variables and create Makefiles. |
102 | +-# Generated by GNU Autoconf 2.68 for Squid Web Proxy 3.3.8. |
103 | ++# Generated by GNU Autoconf 2.69 for Squid Web Proxy 3.3.8. |
104 | + # |
105 | + # Report bugs to <http://bugs.squid-cache.org/>. |
106 | + # |
107 | + # |
108 | +-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
109 | +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software |
110 | +-# Foundation, Inc. |
111 | ++# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
112 | + # |
113 | + # |
114 | + # This configure script is free software; the Free Software Foundation |
115 | +@@ -137,6 +135,31 @@ |
116 | + # CDPATH. |
117 | + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
118 | + |
119 | ++# Use a proper internal environment variable to ensure we don't fall |
120 | ++ # into an infinite loop, continuously re-executing ourselves. |
121 | ++ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then |
122 | ++ _as_can_reexec=no; export _as_can_reexec; |
123 | ++ # We cannot yet assume a decent shell, so we have to provide a |
124 | ++# neutralization value for shells without unset; and this also |
125 | ++# works around shells that cannot unset nonexistent variables. |
126 | ++# Preserve -v and -x to the replacement shell. |
127 | ++BASH_ENV=/dev/null |
128 | ++ENV=/dev/null |
129 | ++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
130 | ++case $- in # (((( |
131 | ++ *v*x* | *x*v* ) as_opts=-vx ;; |
132 | ++ *v* ) as_opts=-v ;; |
133 | ++ *x* ) as_opts=-x ;; |
134 | ++ * ) as_opts= ;; |
135 | ++esac |
136 | ++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} |
137 | ++# Admittedly, this is quite paranoid, since all the known shells bail |
138 | ++# out after a failed `exec'. |
139 | ++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 |
140 | ++as_fn_exit 255 |
141 | ++ fi |
142 | ++ # We don't want this to propagate to other subprocesses. |
143 | ++ { _as_can_reexec=; unset _as_can_reexec;} |
144 | + if test "x$CONFIG_SHELL" = x; then |
145 | + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : |
146 | + emulate sh |
147 | +@@ -170,7 +193,8 @@ |
148 | + else |
149 | + exitcode=1; echo positional parameters were not saved. |
150 | + fi |
151 | +-test x\$exitcode = x0 || exit 1" |
152 | ++test x\$exitcode = x0 || exit 1 |
153 | ++test -x / || exit 1" |
154 | + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO |
155 | + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO |
156 | + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && |
157 | +@@ -223,21 +247,25 @@ |
158 | + |
159 | + |
160 | + if test "x$CONFIG_SHELL" != x; then : |
161 | +- # We cannot yet assume a decent shell, so we have to provide a |
162 | +- # neutralization value for shells without unset; and this also |
163 | +- # works around shells that cannot unset nonexistent variables. |
164 | +- # Preserve -v and -x to the replacement shell. |
165 | +- BASH_ENV=/dev/null |
166 | +- ENV=/dev/null |
167 | +- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
168 | +- export CONFIG_SHELL |
169 | +- case $- in # (((( |
170 | +- *v*x* | *x*v* ) as_opts=-vx ;; |
171 | +- *v* ) as_opts=-v ;; |
172 | +- *x* ) as_opts=-x ;; |
173 | +- * ) as_opts= ;; |
174 | +- esac |
175 | +- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} |
176 | ++ export CONFIG_SHELL |
177 | ++ # We cannot yet assume a decent shell, so we have to provide a |
178 | ++# neutralization value for shells without unset; and this also |
179 | ++# works around shells that cannot unset nonexistent variables. |
180 | ++# Preserve -v and -x to the replacement shell. |
181 | ++BASH_ENV=/dev/null |
182 | ++ENV=/dev/null |
183 | ++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
184 | ++case $- in # (((( |
185 | ++ *v*x* | *x*v* ) as_opts=-vx ;; |
186 | ++ *v* ) as_opts=-v ;; |
187 | ++ *x* ) as_opts=-x ;; |
188 | ++ * ) as_opts= ;; |
189 | ++esac |
190 | ++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} |
191 | ++# Admittedly, this is quite paranoid, since all the known shells bail |
192 | ++# out after a failed `exec'. |
193 | ++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 |
194 | ++exit 255 |
195 | + fi |
196 | + |
197 | + if test x$as_have_required = xno; then : |
198 | +@@ -340,6 +368,14 @@ |
199 | + |
200 | + |
201 | + } # as_fn_mkdir_p |
202 | ++ |
203 | ++# as_fn_executable_p FILE |
204 | ++# ----------------------- |
205 | ++# Test if FILE is an executable regular file. |
206 | ++as_fn_executable_p () |
207 | ++{ |
208 | ++ test -f "$1" && test -x "$1" |
209 | ++} # as_fn_executable_p |
210 | + # as_fn_append VAR VALUE |
211 | + # ---------------------- |
212 | + # Append the text in VALUE to the end of the definition contained in VAR. Take |
213 | +@@ -461,6 +497,10 @@ |
214 | + chmod +x "$as_me.lineno" || |
215 | + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } |
216 | + |
217 | ++ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have |
218 | ++ # already done that, so ensure we don't try to do so again and fall |
219 | ++ # in an infinite loop. This has already happened in practice. |
220 | ++ _as_can_reexec=no; export _as_can_reexec |
221 | + # Don't try to exec as it changes $[0], causing all sort of problems |
222 | + # (the dirname of $[0] is not the place where we might find the |
223 | + # original and so on. Autoconf is especially sensitive to this). |
224 | +@@ -495,16 +535,16 @@ |
225 | + # ... but there are two gotchas: |
226 | + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
227 | + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
228 | +- # In both cases, we have to default to `cp -p'. |
229 | ++ # In both cases, we have to default to `cp -pR'. |
230 | + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
231 | +- as_ln_s='cp -p' |
232 | ++ as_ln_s='cp -pR' |
233 | + elif ln conf$$.file conf$$ 2>/dev/null; then |
234 | + as_ln_s=ln |
235 | + else |
236 | +- as_ln_s='cp -p' |
237 | ++ as_ln_s='cp -pR' |
238 | + fi |
239 | + else |
240 | +- as_ln_s='cp -p' |
241 | ++ as_ln_s='cp -pR' |
242 | + fi |
243 | + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
244 | + rmdir conf$$.dir 2>/dev/null |
245 | +@@ -516,28 +556,8 @@ |
246 | + as_mkdir_p=false |
247 | + fi |
248 | + |
249 | +-if test -x / >/dev/null 2>&1; then |
250 | +- as_test_x='test -x' |
251 | +-else |
252 | +- if ls -dL / >/dev/null 2>&1; then |
253 | +- as_ls_L_option=L |
254 | +- else |
255 | +- as_ls_L_option= |
256 | +- fi |
257 | +- as_test_x=' |
258 | +- eval sh -c '\'' |
259 | +- if test -d "$1"; then |
260 | +- test -d "$1/."; |
261 | +- else |
262 | +- case $1 in #( |
263 | +- -*)set "./$1";; |
264 | +- esac; |
265 | +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( |
266 | +- ???[sx]*):;;*)false;;esac;fi |
267 | +- '\'' sh |
268 | +- ' |
269 | +-fi |
270 | +-as_executable_p=$as_test_x |
271 | ++as_test_x='test -x' |
272 | ++as_executable_p=as_fn_executable_p |
273 | + |
274 | + # Sed expression to map a string onto a valid CPP name. |
275 | + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
276 | +@@ -912,13 +932,11 @@ |
277 | + enable_strict_error_checking |
278 | + enable_loadable_modules |
279 | + enable_shared |
280 | +-enable_shared |
281 | + enable_static |
282 | + with_pic |
283 | + enable_fast_install |
284 | + with_gnu_ld |
285 | + enable_libtool_lock |
286 | +-with_gnu_ld |
287 | + with_included_ltdl |
288 | + with_ltdl_include |
289 | + with_ltdl_lib |
290 | +@@ -1014,9 +1032,6 @@ |
291 | + CPPFLAGS |
292 | + CXX |
293 | + CXXFLAGS |
294 | +-LDFLAGS |
295 | +-LIBS |
296 | +-CPPFLAGS |
297 | + CCC |
298 | + CXXCPP |
299 | + CPP |
300 | +@@ -1483,8 +1498,6 @@ |
301 | + if test "x$host_alias" != x; then |
302 | + if test "x$build_alias" = x; then |
303 | + cross_compiling=maybe |
304 | +- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. |
305 | +- If a cross compiler is detected then cross compile mode will be used" >&2 |
306 | + elif test "x$build_alias" != "x$host_alias"; then |
307 | + cross_compiling=yes |
308 | + fi |
309 | +@@ -2015,9 +2028,9 @@ |
310 | + if $ac_init_version; then |
311 | + cat <<\_ACEOF |
312 | + Squid Web Proxy configure 3.3.8 |
313 | +-generated by GNU Autoconf 2.68 |
314 | ++generated by GNU Autoconf 2.69 |
315 | + |
316 | +-Copyright (C) 2010 Free Software Foundation, Inc. |
317 | ++Copyright (C) 2012 Free Software Foundation, Inc. |
318 | + This configure script is free software; the Free Software Foundation |
319 | + gives unlimited permission to copy, distribute and modify it. |
320 | + _ACEOF |
321 | +@@ -2369,7 +2382,7 @@ |
322 | + test ! -s conftest.err |
323 | + } && test -s conftest$ac_exeext && { |
324 | + test "$cross_compiling" = yes || |
325 | +- $as_test_x conftest$ac_exeext |
326 | ++ test -x conftest$ac_exeext |
327 | + }; then : |
328 | + ac_retval=0 |
329 | + else |
330 | +@@ -2513,7 +2526,7 @@ |
331 | + test ! -s conftest.err |
332 | + } && test -s conftest$ac_exeext && { |
333 | + test "$cross_compiling" = yes || |
334 | +- $as_test_x conftest$ac_exeext |
335 | ++ test -x conftest$ac_exeext |
336 | + }; then : |
337 | + ac_retval=0 |
338 | + else |
339 | +@@ -2819,7 +2832,8 @@ |
340 | + main () |
341 | + { |
342 | + static int test_array [1 - 2 * !(($2) >= 0)]; |
343 | +-test_array [0] = 0 |
344 | ++test_array [0] = 0; |
345 | ++return test_array [0]; |
346 | + |
347 | + ; |
348 | + return 0; |
349 | +@@ -2835,7 +2849,8 @@ |
350 | + main () |
351 | + { |
352 | + static int test_array [1 - 2 * !(($2) <= $ac_mid)]; |
353 | +-test_array [0] = 0 |
354 | ++test_array [0] = 0; |
355 | ++return test_array [0]; |
356 | + |
357 | + ; |
358 | + return 0; |
359 | +@@ -2861,7 +2876,8 @@ |
360 | + main () |
361 | + { |
362 | + static int test_array [1 - 2 * !(($2) < 0)]; |
363 | +-test_array [0] = 0 |
364 | ++test_array [0] = 0; |
365 | ++return test_array [0]; |
366 | + |
367 | + ; |
368 | + return 0; |
369 | +@@ -2877,7 +2893,8 @@ |
370 | + main () |
371 | + { |
372 | + static int test_array [1 - 2 * !(($2) >= $ac_mid)]; |
373 | +-test_array [0] = 0 |
374 | ++test_array [0] = 0; |
375 | ++return test_array [0]; |
376 | + |
377 | + ; |
378 | + return 0; |
379 | +@@ -2911,7 +2928,8 @@ |
380 | + main () |
381 | + { |
382 | + static int test_array [1 - 2 * !(($2) <= $ac_mid)]; |
383 | +-test_array [0] = 0 |
384 | ++test_array [0] = 0; |
385 | ++return test_array [0]; |
386 | + |
387 | + ; |
388 | + return 0; |
389 | +@@ -3005,7 +3023,8 @@ |
390 | + main () |
391 | + { |
392 | + static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; |
393 | +-test_array [0] = 0 |
394 | ++test_array [0] = 0; |
395 | ++return test_array [0]; |
396 | + |
397 | + ; |
398 | + return 0; |
399 | +@@ -3021,7 +3040,8 @@ |
400 | + { |
401 | + static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) |
402 | + < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; |
403 | +-test_array [0] = 0 |
404 | ++test_array [0] = 0; |
405 | ++return test_array [0]; |
406 | + |
407 | + ; |
408 | + return 0; |
409 | +@@ -3078,7 +3098,8 @@ |
410 | + main () |
411 | + { |
412 | + static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; |
413 | +-test_array [0] = 0 |
414 | ++test_array [0] = 0; |
415 | ++return test_array [0]; |
416 | + |
417 | + ; |
418 | + return 0; |
419 | +@@ -3111,7 +3132,7 @@ |
420 | + running configure, to aid debugging if configure makes a mistake. |
421 | + |
422 | + It was created by Squid Web Proxy $as_me 3.3.8, which was |
423 | +-generated by GNU Autoconf 2.68. Invocation command line was |
424 | ++generated by GNU Autoconf 2.69. Invocation command line was |
425 | + |
426 | + $ $0 $@ |
427 | + |
428 | +@@ -3530,7 +3551,7 @@ |
429 | + # by default. |
430 | + for ac_prog in ginstall scoinst install; do |
431 | + for ac_exec_ext in '' $ac_executable_extensions; do |
432 | +- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then |
433 | ++ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then |
434 | + if test $ac_prog = install && |
435 | + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then |
436 | + # AIX install. It has an incompatible calling convention. |
437 | +@@ -3699,7 +3720,7 @@ |
438 | + IFS=$as_save_IFS |
439 | + test -z "$as_dir" && as_dir=. |
440 | + for ac_exec_ext in '' $ac_executable_extensions; do |
441 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
442 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
443 | + ac_cv_prog_STRIP="${ac_tool_prefix}strip" |
444 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
445 | + break 2 |
446 | +@@ -3739,7 +3760,7 @@ |
447 | + IFS=$as_save_IFS |
448 | + test -z "$as_dir" && as_dir=. |
449 | + for ac_exec_ext in '' $ac_executable_extensions; do |
450 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
451 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
452 | + ac_cv_prog_ac_ct_STRIP="strip" |
453 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
454 | + break 2 |
455 | +@@ -3790,7 +3811,7 @@ |
456 | + test -z "$as_dir" && as_dir=. |
457 | + for ac_prog in mkdir gmkdir; do |
458 | + for ac_exec_ext in '' $ac_executable_extensions; do |
459 | +- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue |
460 | ++ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue |
461 | + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( |
462 | + 'mkdir (GNU coreutils) '* | \ |
463 | + 'mkdir (coreutils) '* | \ |
464 | +@@ -3843,7 +3864,7 @@ |
465 | + IFS=$as_save_IFS |
466 | + test -z "$as_dir" && as_dir=. |
467 | + for ac_exec_ext in '' $ac_executable_extensions; do |
468 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
469 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
470 | + ac_cv_prog_AWK="$ac_prog" |
471 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
472 | + break 2 |
473 | +@@ -4422,7 +4443,7 @@ |
474 | + IFS=$as_save_IFS |
475 | + test -z "$as_dir" && as_dir=. |
476 | + for ac_exec_ext in '' $ac_executable_extensions; do |
477 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
478 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
479 | + ac_cv_prog_CC="${ac_tool_prefix}gcc" |
480 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
481 | + break 2 |
482 | +@@ -4462,7 +4483,7 @@ |
483 | + IFS=$as_save_IFS |
484 | + test -z "$as_dir" && as_dir=. |
485 | + for ac_exec_ext in '' $ac_executable_extensions; do |
486 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
487 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
488 | + ac_cv_prog_ac_ct_CC="gcc" |
489 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
490 | + break 2 |
491 | +@@ -4515,7 +4536,7 @@ |
492 | + IFS=$as_save_IFS |
493 | + test -z "$as_dir" && as_dir=. |
494 | + for ac_exec_ext in '' $ac_executable_extensions; do |
495 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
496 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
497 | + ac_cv_prog_CC="${ac_tool_prefix}cc" |
498 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
499 | + break 2 |
500 | +@@ -4556,7 +4577,7 @@ |
501 | + IFS=$as_save_IFS |
502 | + test -z "$as_dir" && as_dir=. |
503 | + for ac_exec_ext in '' $ac_executable_extensions; do |
504 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
505 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
506 | + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then |
507 | + ac_prog_rejected=yes |
508 | + continue |
509 | +@@ -4614,7 +4635,7 @@ |
510 | + IFS=$as_save_IFS |
511 | + test -z "$as_dir" && as_dir=. |
512 | + for ac_exec_ext in '' $ac_executable_extensions; do |
513 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
514 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
515 | + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" |
516 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
517 | + break 2 |
518 | +@@ -4658,7 +4679,7 @@ |
519 | + IFS=$as_save_IFS |
520 | + test -z "$as_dir" && as_dir=. |
521 | + for ac_exec_ext in '' $ac_executable_extensions; do |
522 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
523 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
524 | + ac_cv_prog_ac_ct_CC="$ac_prog" |
525 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
526 | + break 2 |
527 | +@@ -5104,8 +5125,7 @@ |
528 | + /* end confdefs.h. */ |
529 | + #include <stdarg.h> |
530 | + #include <stdio.h> |
531 | +-#include <sys/types.h> |
532 | +-#include <sys/stat.h> |
533 | ++struct stat; |
534 | + /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ |
535 | + struct buf { int x; }; |
536 | + FILE * (*rcsopen) (struct buf *, struct stat *, int); |
537 | +@@ -5533,7 +5553,7 @@ |
538 | + IFS=$as_save_IFS |
539 | + test -z "$as_dir" && as_dir=. |
540 | + for ac_exec_ext in '' $ac_executable_extensions; do |
541 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
542 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
543 | + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" |
544 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
545 | + break 2 |
546 | +@@ -5577,7 +5597,7 @@ |
547 | + IFS=$as_save_IFS |
548 | + test -z "$as_dir" && as_dir=. |
549 | + for ac_exec_ext in '' $ac_executable_extensions; do |
550 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
551 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
552 | + ac_cv_prog_ac_ct_CXX="$ac_prog" |
553 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
554 | + break 2 |
555 | +@@ -6140,7 +6160,7 @@ |
556 | + for ac_prog in grep ggrep; do |
557 | + for ac_exec_ext in '' $ac_executable_extensions; do |
558 | + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" |
559 | +- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue |
560 | ++ as_fn_executable_p "$ac_path_GREP" || continue |
561 | + # Check for GNU ac_path_GREP and select it if it is found. |
562 | + # Check for GNU $ac_path_GREP |
563 | + case `"$ac_path_GREP" --version 2>&1` in |
564 | +@@ -6206,7 +6226,7 @@ |
565 | + for ac_prog in egrep; do |
566 | + for ac_exec_ext in '' $ac_executable_extensions; do |
567 | + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" |
568 | +- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue |
569 | ++ as_fn_executable_p "$ac_path_EGREP" || continue |
570 | + # Check for GNU ac_path_EGREP and select it if it is found. |
571 | + # Check for GNU $ac_path_EGREP |
572 | + case `"$ac_path_EGREP" --version 2>&1` in |
573 | +@@ -6413,8 +6433,8 @@ |
574 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
575 | + /* end confdefs.h. */ |
576 | + |
577 | +-# define __EXTENSIONS__ 1 |
578 | +- $ac_includes_default |
579 | ++# define __EXTENSIONS__ 1 |
580 | ++ $ac_includes_default |
581 | + int |
582 | + main () |
583 | + { |
584 | +@@ -6653,7 +6673,7 @@ |
585 | + IFS=$as_save_IFS |
586 | + test -z "$as_dir" && as_dir=. |
587 | + for ac_exec_ext in '' $ac_executable_extensions; do |
588 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
589 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
590 | + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" |
591 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
592 | + break 2 |
593 | +@@ -6693,7 +6713,7 @@ |
594 | + IFS=$as_save_IFS |
595 | + test -z "$as_dir" && as_dir=. |
596 | + for ac_exec_ext in '' $ac_executable_extensions; do |
597 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
598 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
599 | + ac_cv_prog_ac_ct_RANLIB="ranlib" |
600 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
601 | + break 2 |
602 | +@@ -6896,7 +6916,7 @@ |
603 | + for ac_prog in egrep; do |
604 | + for ac_exec_ext in '' $ac_executable_extensions; do |
605 | + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" |
606 | +- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue |
607 | ++ as_fn_executable_p "$ac_path_EGREP" || continue |
608 | + # Check for GNU ac_path_EGREP and select it if it is found. |
609 | + # Check for GNU $ac_path_EGREP |
610 | + case `"$ac_path_EGREP" --version 2>&1` in |
611 | +@@ -6963,7 +6983,7 @@ |
612 | + IFS=$as_save_IFS |
613 | + test -z "$as_dir" && as_dir=. |
614 | + for ac_exec_ext in '' $ac_executable_extensions; do |
615 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
616 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
617 | + ac_cv_path_SH="$as_dir/$ac_word$ac_exec_ext" |
618 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
619 | + break 2 |
620 | +@@ -7004,7 +7024,7 @@ |
621 | + IFS=$as_save_IFS |
622 | + test -z "$as_dir" && as_dir=. |
623 | + for ac_exec_ext in '' $ac_executable_extensions; do |
624 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
625 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
626 | + ac_cv_path_FALSE="$as_dir/$ac_word$ac_exec_ext" |
627 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
628 | + break 2 |
629 | +@@ -7045,7 +7065,7 @@ |
630 | + IFS=$as_save_IFS |
631 | + test -z "$as_dir" && as_dir=. |
632 | + for ac_exec_ext in '' $ac_executable_extensions; do |
633 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
634 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
635 | + ac_cv_path_TRUE="$as_dir/$ac_word$ac_exec_ext" |
636 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
637 | + break 2 |
638 | +@@ -7086,7 +7106,7 @@ |
639 | + IFS=$as_save_IFS |
640 | + test -z "$as_dir" && as_dir=. |
641 | + for ac_exec_ext in '' $ac_executable_extensions; do |
642 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
643 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
644 | + ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext" |
645 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
646 | + break 2 |
647 | +@@ -7127,7 +7147,7 @@ |
648 | + IFS=$as_save_IFS |
649 | + test -z "$as_dir" && as_dir=. |
650 | + for ac_exec_ext in '' $ac_executable_extensions; do |
651 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
652 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
653 | + ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext" |
654 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
655 | + break 2 |
656 | +@@ -7168,7 +7188,7 @@ |
657 | + IFS=$as_save_IFS |
658 | + test -z "$as_dir" && as_dir=. |
659 | + for ac_exec_ext in '' $ac_executable_extensions; do |
660 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
661 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
662 | + ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext" |
663 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
664 | + break 2 |
665 | +@@ -7209,7 +7229,7 @@ |
666 | + IFS=$as_save_IFS |
667 | + test -z "$as_dir" && as_dir=. |
668 | + for ac_exec_ext in '' $ac_executable_extensions; do |
669 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
670 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
671 | + ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext" |
672 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
673 | + break 2 |
674 | +@@ -7250,7 +7270,7 @@ |
675 | + IFS=$as_save_IFS |
676 | + test -z "$as_dir" && as_dir=. |
677 | + for ac_exec_ext in '' $ac_executable_extensions; do |
678 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
679 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
680 | + ac_cv_path_TR="$as_dir/$ac_word$ac_exec_ext" |
681 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
682 | + break 2 |
683 | +@@ -7291,7 +7311,7 @@ |
684 | + IFS=$as_save_IFS |
685 | + test -z "$as_dir" && as_dir=. |
686 | + for ac_exec_ext in '' $ac_executable_extensions; do |
687 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
688 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
689 | + ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext" |
690 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
691 | + break 2 |
692 | +@@ -7332,7 +7352,7 @@ |
693 | + IFS=$as_save_IFS |
694 | + test -z "$as_dir" && as_dir=. |
695 | + for ac_exec_ext in '' $ac_executable_extensions; do |
696 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
697 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
698 | + ac_cv_path_CPPUNITCONFIG="$as_dir/$ac_word$ac_exec_ext" |
699 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
700 | + break 2 |
701 | +@@ -7375,7 +7395,7 @@ |
702 | + IFS=$as_save_IFS |
703 | + test -z "$as_dir" && as_dir=. |
704 | + for ac_exec_ext in '' $ac_executable_extensions; do |
705 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
706 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
707 | + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" |
708 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
709 | + break 2 |
710 | +@@ -7422,7 +7442,7 @@ |
711 | + IFS=$as_save_IFS |
712 | + test -z "$as_dir" && as_dir=. |
713 | + for ac_exec_ext in '' $ac_executable_extensions; do |
714 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
715 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
716 | + ac_cv_path_POD2MAN="$as_dir/$ac_word$ac_exec_ext" |
717 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
718 | + break 2 |
719 | +@@ -7465,7 +7485,7 @@ |
720 | + IFS=$as_save_IFS |
721 | + test -z "$as_dir" && as_dir=. |
722 | + for ac_exec_ext in '' $ac_executable_extensions; do |
723 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
724 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
725 | + ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext" |
726 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
727 | + break 2 |
728 | +@@ -7727,7 +7747,7 @@ |
729 | + for ac_prog in sed gsed; do |
730 | + for ac_exec_ext in '' $ac_executable_extensions; do |
731 | + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" |
732 | +- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue |
733 | ++ as_fn_executable_p "$ac_path_SED" || continue |
734 | + # Check for GNU ac_path_SED and select it if it is found. |
735 | + # Check for GNU $ac_path_SED |
736 | + case `"$ac_path_SED" --version 2>&1` in |
737 | +@@ -7806,7 +7826,7 @@ |
738 | + for ac_prog in fgrep; do |
739 | + for ac_exec_ext in '' $ac_executable_extensions; do |
740 | + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" |
741 | +- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue |
742 | ++ as_fn_executable_p "$ac_path_FGREP" || continue |
743 | + # Check for GNU ac_path_FGREP and select it if it is found. |
744 | + # Check for GNU $ac_path_FGREP |
745 | + case `"$ac_path_FGREP" --version 2>&1` in |
746 | +@@ -8062,7 +8082,7 @@ |
747 | + IFS=$as_save_IFS |
748 | + test -z "$as_dir" && as_dir=. |
749 | + for ac_exec_ext in '' $ac_executable_extensions; do |
750 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
751 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
752 | + ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" |
753 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
754 | + break 2 |
755 | +@@ -8106,7 +8126,7 @@ |
756 | + IFS=$as_save_IFS |
757 | + test -z "$as_dir" && as_dir=. |
758 | + for ac_exec_ext in '' $ac_executable_extensions; do |
759 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
760 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
761 | + ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" |
762 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
763 | + break 2 |
764 | +@@ -8435,7 +8455,7 @@ |
765 | + IFS=$as_save_IFS |
766 | + test -z "$as_dir" && as_dir=. |
767 | + for ac_exec_ext in '' $ac_executable_extensions; do |
768 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
769 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
770 | + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" |
771 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
772 | + break 2 |
773 | +@@ -8475,7 +8495,7 @@ |
774 | + IFS=$as_save_IFS |
775 | + test -z "$as_dir" && as_dir=. |
776 | + for ac_exec_ext in '' $ac_executable_extensions; do |
777 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
778 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
779 | + ac_cv_prog_ac_ct_OBJDUMP="objdump" |
780 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
781 | + break 2 |
782 | +@@ -8756,7 +8776,7 @@ |
783 | + IFS=$as_save_IFS |
784 | + test -z "$as_dir" && as_dir=. |
785 | + for ac_exec_ext in '' $ac_executable_extensions; do |
786 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
787 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
788 | + ac_cv_prog_AR="${ac_tool_prefix}ar" |
789 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
790 | + break 2 |
791 | +@@ -8796,7 +8816,7 @@ |
792 | + IFS=$as_save_IFS |
793 | + test -z "$as_dir" && as_dir=. |
794 | + for ac_exec_ext in '' $ac_executable_extensions; do |
795 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
796 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
797 | + ac_cv_prog_ac_ct_AR="ar" |
798 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
799 | + break 2 |
800 | +@@ -8861,7 +8881,7 @@ |
801 | + IFS=$as_save_IFS |
802 | + test -z "$as_dir" && as_dir=. |
803 | + for ac_exec_ext in '' $ac_executable_extensions; do |
804 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
805 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
806 | + ac_cv_prog_STRIP="${ac_tool_prefix}strip" |
807 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
808 | + break 2 |
809 | +@@ -8901,7 +8921,7 @@ |
810 | + IFS=$as_save_IFS |
811 | + test -z "$as_dir" && as_dir=. |
812 | + for ac_exec_ext in '' $ac_executable_extensions; do |
813 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
814 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
815 | + ac_cv_prog_ac_ct_STRIP="strip" |
816 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
817 | + break 2 |
818 | +@@ -8960,7 +8980,7 @@ |
819 | + IFS=$as_save_IFS |
820 | + test -z "$as_dir" && as_dir=. |
821 | + for ac_exec_ext in '' $ac_executable_extensions; do |
822 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
823 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
824 | + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" |
825 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
826 | + break 2 |
827 | +@@ -9000,7 +9020,7 @@ |
828 | + IFS=$as_save_IFS |
829 | + test -z "$as_dir" && as_dir=. |
830 | + for ac_exec_ext in '' $ac_executable_extensions; do |
831 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
832 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
833 | + ac_cv_prog_ac_ct_RANLIB="ranlib" |
834 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
835 | + break 2 |
836 | +@@ -9577,7 +9597,7 @@ |
837 | + IFS=$as_save_IFS |
838 | + test -z "$as_dir" && as_dir=. |
839 | + for ac_exec_ext in '' $ac_executable_extensions; do |
840 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
841 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
842 | + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" |
843 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
844 | + break 2 |
845 | +@@ -9617,7 +9637,7 @@ |
846 | + IFS=$as_save_IFS |
847 | + test -z "$as_dir" && as_dir=. |
848 | + for ac_exec_ext in '' $ac_executable_extensions; do |
849 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
850 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
851 | + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" |
852 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
853 | + break 2 |
854 | +@@ -9669,7 +9689,7 @@ |
855 | + IFS=$as_save_IFS |
856 | + test -z "$as_dir" && as_dir=. |
857 | + for ac_exec_ext in '' $ac_executable_extensions; do |
858 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
859 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
860 | + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" |
861 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
862 | + break 2 |
863 | +@@ -9709,7 +9729,7 @@ |
864 | + IFS=$as_save_IFS |
865 | + test -z "$as_dir" && as_dir=. |
866 | + for ac_exec_ext in '' $ac_executable_extensions; do |
867 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
868 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
869 | + ac_cv_prog_ac_ct_NMEDIT="nmedit" |
870 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
871 | + break 2 |
872 | +@@ -9761,7 +9781,7 @@ |
873 | + IFS=$as_save_IFS |
874 | + test -z "$as_dir" && as_dir=. |
875 | + for ac_exec_ext in '' $ac_executable_extensions; do |
876 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
877 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
878 | + ac_cv_prog_LIPO="${ac_tool_prefix}lipo" |
879 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
880 | + break 2 |
881 | +@@ -9801,7 +9821,7 @@ |
882 | + IFS=$as_save_IFS |
883 | + test -z "$as_dir" && as_dir=. |
884 | + for ac_exec_ext in '' $ac_executable_extensions; do |
885 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
886 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
887 | + ac_cv_prog_ac_ct_LIPO="lipo" |
888 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
889 | + break 2 |
890 | +@@ -9853,7 +9873,7 @@ |
891 | + IFS=$as_save_IFS |
892 | + test -z "$as_dir" && as_dir=. |
893 | + for ac_exec_ext in '' $ac_executable_extensions; do |
894 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
895 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
896 | + ac_cv_prog_OTOOL="${ac_tool_prefix}otool" |
897 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
898 | + break 2 |
899 | +@@ -9893,7 +9913,7 @@ |
900 | + IFS=$as_save_IFS |
901 | + test -z "$as_dir" && as_dir=. |
902 | + for ac_exec_ext in '' $ac_executable_extensions; do |
903 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
904 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
905 | + ac_cv_prog_ac_ct_OTOOL="otool" |
906 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
907 | + break 2 |
908 | +@@ -9945,7 +9965,7 @@ |
909 | + IFS=$as_save_IFS |
910 | + test -z "$as_dir" && as_dir=. |
911 | + for ac_exec_ext in '' $ac_executable_extensions; do |
912 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
913 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
914 | + ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" |
915 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
916 | + break 2 |
917 | +@@ -9985,7 +10005,7 @@ |
918 | + IFS=$as_save_IFS |
919 | + test -z "$as_dir" && as_dir=. |
920 | + for ac_exec_ext in '' $ac_executable_extensions; do |
921 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
922 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
923 | + ac_cv_prog_ac_ct_OTOOL64="otool64" |
924 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
925 | + break 2 |
926 | +@@ -18619,7 +18639,7 @@ |
927 | + IFS=$as_save_IFS |
928 | + test -z "$as_dir" && as_dir=. |
929 | + for ac_exec_ext in '' $ac_executable_extensions; do |
930 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
931 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
932 | + ac_cv_path_WIN32_PSAPI="$as_dir/$ac_word$ac_exec_ext" |
933 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
934 | + break 2 |
935 | +@@ -18680,6 +18700,18 @@ |
936 | + _ACEOF |
937 | + |
938 | + |
939 | ++# define distribution |
940 | ++if test -x /usr/bin/lsb_release && lsb_release -si; then |
941 | ++ SQUID_DISTRIBUTION="$(lsb_release -si)" |
942 | ++else |
943 | ++ SQUID_DISTRIBUTION="" |
944 | ++fi |
945 | ++ |
946 | ++cat >>confdefs.h <<_ACEOF |
947 | ++#define SQUID_DISTRIBUTION "$SQUID_DISTRIBUTION" |
948 | ++_ACEOF |
949 | ++ |
950 | ++ |
951 | + CACHE_EFFECTIVE_USER="nobody" |
952 | + |
953 | + # Check whether --with-default-user was given. |
954 | +@@ -18849,7 +18881,7 @@ |
955 | + IFS=$as_save_IFS |
956 | + test -z "$as_dir" && as_dir=. |
957 | + for ac_exec_ext in '' $ac_executable_extensions; do |
958 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
959 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
960 | + ac_cv_path_BZR="$as_dir/$ac_word$ac_exec_ext" |
961 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
962 | + break 2 |
963 | +@@ -20376,7 +20408,7 @@ |
964 | + IFS=$as_save_IFS |
965 | + test -z "$as_dir" && as_dir=. |
966 | + for ac_exec_ext in '' $ac_executable_extensions; do |
967 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
968 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
969 | + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
970 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
971 | + break 2 |
972 | +@@ -20419,7 +20451,7 @@ |
973 | + IFS=$as_save_IFS |
974 | + test -z "$as_dir" && as_dir=. |
975 | + for ac_exec_ext in '' $ac_executable_extensions; do |
976 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
977 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
978 | + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
979 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
980 | + break 2 |
981 | +@@ -22785,7 +22817,7 @@ |
982 | + IFS=$as_save_IFS |
983 | + test -z "$as_dir" && as_dir=. |
984 | + for ac_exec_ext in '' $ac_executable_extensions; do |
985 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
986 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
987 | + ac_cv_prog_ac_krb5_config="yes" |
988 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
989 | + break 2 |
990 | +@@ -22826,7 +22858,7 @@ |
991 | + IFS=$as_save_IFS |
992 | + test -z "$as_dir" && as_dir=. |
993 | + for ac_exec_ext in '' $ac_executable_extensions; do |
994 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
995 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
996 | + ac_cv_prog_ac_krb5_config="yes" |
997 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
998 | + break 2 |
999 | +@@ -22865,7 +22897,7 @@ |
1000 | + IFS=$as_save_IFS |
1001 | + test -z "$as_dir" && as_dir=. |
1002 | + for ac_exec_ext in '' $ac_executable_extensions; do |
1003 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1004 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1005 | + ac_cv_prog_ac_krb5_config="yes" |
1006 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1007 | + break 2 |
1008 | +@@ -25177,11 +25209,11 @@ |
1009 | + int |
1010 | + main () |
1011 | + { |
1012 | +-/* FIXME: Include the comments suggested by Paul. */ |
1013 | ++ |
1014 | + #ifndef __cplusplus |
1015 | +- /* Ultrix mips cc rejects this. */ |
1016 | ++ /* Ultrix mips cc rejects this sort of thing. */ |
1017 | + typedef int charset[2]; |
1018 | +- const charset cs; |
1019 | ++ const charset cs = { 0, 0 }; |
1020 | + /* SunOS 4.1.1 cc rejects this. */ |
1021 | + char const *const *pcpcc; |
1022 | + char **ppc; |
1023 | +@@ -25198,8 +25230,9 @@ |
1024 | + ++pcpcc; |
1025 | + ppc = (char**) pcpcc; |
1026 | + pcpcc = (char const *const *) ppc; |
1027 | +- { /* SCO 3.2v4 cc rejects this. */ |
1028 | +- char *t; |
1029 | ++ { /* SCO 3.2v4 cc rejects this sort of thing. */ |
1030 | ++ char tx; |
1031 | ++ char *t = &tx; |
1032 | + char const *s = 0 ? (char *) 0 : (char const *) 0; |
1033 | + |
1034 | + *t++ = 0; |
1035 | +@@ -25215,10 +25248,10 @@ |
1036 | + iptr p = 0; |
1037 | + ++p; |
1038 | + } |
1039 | +- { /* AIX XL C 1.02.0.0 rejects this saying |
1040 | ++ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying |
1041 | + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ |
1042 | +- struct s { int j; const int *ap[3]; }; |
1043 | +- struct s *b; b->j = 5; |
1044 | ++ struct s { int j; const int *ap[3]; } bx; |
1045 | ++ struct s *b = &bx; b->j = 5; |
1046 | + } |
1047 | + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ |
1048 | + const int foo = 10; |
1049 | +@@ -26477,23 +26510,20 @@ |
1050 | + /* end confdefs.h. */ |
1051 | + $ac_includes_default |
1052 | + int |
1053 | +-find_stack_direction () |
1054 | ++find_stack_direction (int *addr, int depth) |
1055 | + { |
1056 | +- static char *addr = 0; |
1057 | +- auto char dummy; |
1058 | +- if (addr == 0) |
1059 | +- { |
1060 | +- addr = &dummy; |
1061 | +- return find_stack_direction (); |
1062 | +- } |
1063 | +- else |
1064 | +- return (&dummy > addr) ? 1 : -1; |
1065 | ++ int dir, dummy = 0; |
1066 | ++ if (! addr) |
1067 | ++ addr = &dummy; |
1068 | ++ *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1; |
1069 | ++ dir = depth ? find_stack_direction (addr, depth - 1) : 0; |
1070 | ++ return dir + dummy; |
1071 | + } |
1072 | + |
1073 | + int |
1074 | +-main () |
1075 | ++main (int argc, char **argv) |
1076 | + { |
1077 | +- return find_stack_direction () < 0; |
1078 | ++ return find_stack_direction (0, argc + !argv + 20) < 0; |
1079 | + } |
1080 | + _ACEOF |
1081 | + if ac_fn_cxx_try_run "$LINENO"; then : |
1082 | +@@ -30885,7 +30915,7 @@ |
1083 | + IFS=$as_save_IFS |
1084 | + test -z "$as_dir" && as_dir=. |
1085 | + for ac_exec_ext in '' $ac_executable_extensions; do |
1086 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1087 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1088 | + ac_cv_path_PO2HTML="$as_dir/$ac_word$ac_exec_ext" |
1089 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1090 | + break 2 |
1091 | +@@ -30977,7 +31007,7 @@ |
1092 | + IFS=$as_save_IFS |
1093 | + test -z "$as_dir" && as_dir=. |
1094 | + for ac_exec_ext in '' $ac_executable_extensions; do |
1095 | +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1096 | ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1097 | + ac_cv_path_PO2TEXT="$as_dir/$ac_word$ac_exec_ext" |
1098 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1099 | + break 2 |
1100 | +@@ -31699,16 +31729,16 @@ |
1101 | + # ... but there are two gotchas: |
1102 | + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
1103 | + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
1104 | +- # In both cases, we have to default to `cp -p'. |
1105 | ++ # In both cases, we have to default to `cp -pR'. |
1106 | + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
1107 | +- as_ln_s='cp -p' |
1108 | ++ as_ln_s='cp -pR' |
1109 | + elif ln conf$$.file conf$$ 2>/dev/null; then |
1110 | + as_ln_s=ln |
1111 | + else |
1112 | +- as_ln_s='cp -p' |
1113 | ++ as_ln_s='cp -pR' |
1114 | + fi |
1115 | + else |
1116 | +- as_ln_s='cp -p' |
1117 | ++ as_ln_s='cp -pR' |
1118 | + fi |
1119 | + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
1120 | + rmdir conf$$.dir 2>/dev/null |
1121 | +@@ -31768,28 +31798,16 @@ |
1122 | + as_mkdir_p=false |
1123 | + fi |
1124 | + |
1125 | +-if test -x / >/dev/null 2>&1; then |
1126 | +- as_test_x='test -x' |
1127 | +-else |
1128 | +- if ls -dL / >/dev/null 2>&1; then |
1129 | +- as_ls_L_option=L |
1130 | +- else |
1131 | +- as_ls_L_option= |
1132 | +- fi |
1133 | +- as_test_x=' |
1134 | +- eval sh -c '\'' |
1135 | +- if test -d "$1"; then |
1136 | +- test -d "$1/."; |
1137 | +- else |
1138 | +- case $1 in #( |
1139 | +- -*)set "./$1";; |
1140 | +- esac; |
1141 | +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( |
1142 | +- ???[sx]*):;;*)false;;esac;fi |
1143 | +- '\'' sh |
1144 | +- ' |
1145 | +-fi |
1146 | +-as_executable_p=$as_test_x |
1147 | ++ |
1148 | ++# as_fn_executable_p FILE |
1149 | ++# ----------------------- |
1150 | ++# Test if FILE is an executable regular file. |
1151 | ++as_fn_executable_p () |
1152 | ++{ |
1153 | ++ test -f "$1" && test -x "$1" |
1154 | ++} # as_fn_executable_p |
1155 | ++as_test_x='test -x' |
1156 | ++as_executable_p=as_fn_executable_p |
1157 | + |
1158 | + # Sed expression to map a string onto a valid CPP name. |
1159 | + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
1160 | +@@ -31811,7 +31829,7 @@ |
1161 | + # values after options handling. |
1162 | + ac_log=" |
1163 | + This file was extended by Squid Web Proxy $as_me 3.3.8, which was |
1164 | +-generated by GNU Autoconf 2.68. Invocation command line was |
1165 | ++generated by GNU Autoconf 2.69. Invocation command line was |
1166 | + |
1167 | + CONFIG_FILES = $CONFIG_FILES |
1168 | + CONFIG_HEADERS = $CONFIG_HEADERS |
1169 | +@@ -31877,10 +31895,10 @@ |
1170 | + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
1171 | + ac_cs_version="\\ |
1172 | + Squid Web Proxy config.status 3.3.8 |
1173 | +-configured by $0, generated by GNU Autoconf 2.68, |
1174 | ++configured by $0, generated by GNU Autoconf 2.69, |
1175 | + with options \\"\$ac_cs_config\\" |
1176 | + |
1177 | +-Copyright (C) 2010 Free Software Foundation, Inc. |
1178 | ++Copyright (C) 2012 Free Software Foundation, Inc. |
1179 | + This config.status script is free software; the Free Software Foundation |
1180 | + gives unlimited permission to copy, distribute and modify it." |
1181 | + |
1182 | +@@ -31971,7 +31989,7 @@ |
1183 | + _ACEOF |
1184 | + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
1185 | + if \$ac_cs_recheck; then |
1186 | +- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
1187 | ++ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
1188 | + shift |
1189 | + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 |
1190 | + CONFIG_SHELL='$SHELL' |
1191 | +@@ -33999,9 +34017,6 @@ |
1192 | + # Remove --cache-file, --srcdir, and --disable-option-checking arguments |
1193 | + # so they do not pile up. |
1194 | + ac_sub_configure_args= |
1195 | +- # Add --quiet option if used |
1196 | +- test "$silent" = yes && |
1197 | +- ac_sub_configure_args="$ac_sub_configure_args --quiet" |
1198 | + ac_prev= |
1199 | + eval "set x $ac_configure_args" |
1200 | + shift |
1201 | |
1202 | === modified file 'debian/patches/series' |
1203 | --- debian/patches/series 2013-11-04 02:17:30 +0000 |
1204 | +++ debian/patches/series 2013-11-11 09:06:53 +0000 |
1205 | @@ -5,3 +5,4 @@ |
1206 | 90-cf.data.ubuntu.patch |
1207 | 99-ubuntu-ssl-cert-snakeoil.patch |
1208 | fix-pod2man-config.test.patch |
1209 | +fix-distribution.patch |
Not sure about the configure diff, because it's huge. Proper way of doing it should be adding the change to configure.ac and run autoreconf, but then it breaks another patches that are patching Makefile.in directly instead of Makefile.am