431a1081371bdc4f72f8952e1ec9fac5824ac03a
[hcoop/zz_old/debian/suphp.git] / debian / patches / 02_libtool.dpatch
1 #! /bin/sh /usr/share/dpatch/dpatch-run
2 ## 03_libtool.dpatch by <elacour@home-dn.net>
3 ##
4 ## All lines beginning with `## DP:' are a description of the patch.
5 ## DP: Libtool update
6
7 @DPATCH@
8 --- ./aclocal.m4
9 +++ ./aclocal.m4
10 @@ -1,7 +1,7 @@
11 -# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
12 +# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
13
14 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
15 -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
16 +# 2005 Free Software Foundation, Inc.
17 # This file is free software; the Free Software Foundation
18 # gives unlimited permission to copy and/or distribute it,
19 # with or without modifications, as long as this notice is preserved.
20 @@ -11,17 +11,9 @@
21 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
22 # PARTICULAR PURPOSE.
23
24 -m4_ifndef([AC_AUTOCONF_VERSION],
25 - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
26 -m4_if(AC_AUTOCONF_VERSION, [2.61],,
27 -[m4_warning([this file was generated for autoconf 2.61.
28 -You have another version of autoconf. It may work, but is not guaranteed to.
29 -If you have problems, you may need to regenerate the build system entirely.
30 -To do so, use the procedure documented by the package, typically `autoreconf'.])])
31 -
32 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
33
34 -# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
35 +# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
36
37
38 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
39 @@ -6671,7 +6663,7 @@ AC_SUBST([SED])
40 AC_MSG_RESULT([$SED])
41 ])
42
43 -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
44 +# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
45 #
46 # This file is free software; the Free Software Foundation
47 # gives unlimited permission to copy and/or distribute it,
48 @@ -6681,31 +6673,14 @@ AC_MSG_RESULT([$SED])
49 # ----------------------------
50 # Automake X.Y traces this macro to ensure aclocal.m4 has been
51 # generated from the m4 files accompanying Automake X.Y.
52 -# (This private macro should not be called outside this file.)
53 -AC_DEFUN([AM_AUTOMAKE_VERSION],
54 -[am__api_version='1.10'
55 -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
56 -dnl require some minimum version. Point them to the right macro.
57 -m4_if([$1], [1.10.1], [],
58 - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
59 -])
60 -
61 -# _AM_AUTOCONF_VERSION(VERSION)
62 -# -----------------------------
63 -# aclocal traces this macro to find the Autoconf version.
64 -# This is a private macro too. Using m4_define simplifies
65 -# the logic in aclocal, which can simply ignore this definition.
66 -m4_define([_AM_AUTOCONF_VERSION], [])
67 +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
68
69 # AM_SET_CURRENT_AUTOMAKE_VERSION
70 # -------------------------------
71 -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
72 +# Call AM_AUTOMAKE_VERSION so it can be traced.
73 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
74 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
75 -[AM_AUTOMAKE_VERSION([1.10.1])dnl
76 -m4_ifndef([AC_AUTOCONF_VERSION],
77 - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
78 -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
79 + [AM_AUTOMAKE_VERSION([1.9.6])])
80
81 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
82
83 @@ -6762,14 +6737,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
84
85 # AM_CONDITIONAL -*- Autoconf -*-
86
87 -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
88 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
89 # Free Software Foundation, Inc.
90 #
91 # This file is free software; the Free Software Foundation
92 # gives unlimited permission to copy and/or distribute it,
93 # with or without modifications, as long as this notice is preserved.
94
95 -# serial 8
96 +# serial 7
97
98 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
99 # -------------------------------------
100 @@ -6778,10 +6753,8 @@ AC_DEFUN([AM_CONDITIONAL],
101 [AC_PREREQ(2.52)dnl
102 ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
103 [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
104 -AC_SUBST([$1_TRUE])dnl
105 -AC_SUBST([$1_FALSE])dnl
106 -_AM_SUBST_NOTMAKE([$1_TRUE])dnl
107 -_AM_SUBST_NOTMAKE([$1_FALSE])dnl
108 +AC_SUBST([$1_TRUE])
109 +AC_SUBST([$1_FALSE])
110 if $2; then
111 $1_TRUE=
112 $1_FALSE='#'
113 @@ -6795,14 +6768,15 @@ AC_CONFIG_COMMANDS_PRE(
114 Usually this means the macro was only invoked conditionally.]])
115 fi])])
116
117 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
118 +
119 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
120 # Free Software Foundation, Inc.
121 #
122 # This file is free software; the Free Software Foundation
123 # gives unlimited permission to copy and/or distribute it,
124 # with or without modifications, as long as this notice is preserved.
125
126 -# serial 9
127 +# serial 8
128
129 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
130 # written in clear, in which case automake, when reading aclocal.m4,
131 @@ -6830,7 +6804,6 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
132 ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
133 [$1], CXX, [depcc="$CXX" am_compiler_list=],
134 [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
135 - [$1], UPC, [depcc="$UPC" am_compiler_list=],
136 [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
137 [depcc="$$1" am_compiler_list=])
138
139 @@ -6896,7 +6869,6 @@ AC_CACHE_CHECK([dependency style of $depcc],
140 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
141 $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
142 >/dev/null 2>conftest.err &&
143 - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
144 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
145 grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
146 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
147 @@ -6949,8 +6921,7 @@ if test "x$enable_dependency_tracking" != xno; then
148 AMDEPBACKSLASH='\'
149 fi
150 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
151 -AC_SUBST([AMDEPBACKSLASH])dnl
152 -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
153 +AC_SUBST([AMDEPBACKSLASH])
154 ])
155
156 # Generate code to set up dependency tracking. -*- Autoconf -*-
157 @@ -6975,9 +6946,8 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
158 # some people rename them; so instead we look at the file content.
159 # Grep'ing the first line is not enough: some people post-process
160 # each Makefile.in and add a new line on top of each file to say so.
161 - # Grep'ing the whole file is not good either: AIX grep has a line
162 - # limit of 2048, but all sed's we know have understand at least 4000.
163 - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
164 + # So let's grep whole file.
165 + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
166 dirpart=`AS_DIRNAME("$mf")`
167 else
168 continue
169 @@ -7036,14 +7006,14 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
170
171 # Do all the work for Automake. -*- Autoconf -*-
172
173 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
174 -# 2005, 2006, 2008 Free Software Foundation, Inc.
175 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
176 +# Free Software Foundation, Inc.
177 #
178 # This file is free software; the Free Software Foundation
179 # gives unlimited permission to copy and/or distribute it,
180 # with or without modifications, as long as this notice is preserved.
181
182 -# serial 13
183 +# serial 12
184
185 # This macro actually does too much. Some checks are only needed if
186 # your package does certain things. But this isn't really a big deal.
187 @@ -7060,20 +7030,16 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
188 # arguments mandatory, and then we can depend on a new Autoconf
189 # release and drop the old call support.
190 AC_DEFUN([AM_INIT_AUTOMAKE],
191 -[AC_PREREQ([2.60])dnl
192 +[AC_PREREQ([2.58])dnl
193 dnl Autoconf wants to disallow AM_ names. We explicitly allow
194 dnl the ones we care about.
195 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
196 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
197 AC_REQUIRE([AC_PROG_INSTALL])dnl
198 -if test "`cd $srcdir && pwd`" != "`pwd`"; then
199 - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
200 - # is not polluted with repeated "-I."
201 - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
202 - # test to see if srcdir already configured
203 - if test -f $srcdir/config.status; then
204 - AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
205 - fi
206 +# test to see if srcdir already configured
207 +if test "`cd $srcdir && pwd`" != "`pwd`" &&
208 + test -f $srcdir/config.status; then
209 + AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
210 fi
211
212 # test whether we have cygpath
213 @@ -7093,9 +7059,6 @@ m4_ifval([$2],
214 AC_SUBST([PACKAGE], [$1])dnl
215 AC_SUBST([VERSION], [$2])],
216 [_AM_SET_OPTIONS([$1])dnl
217 -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
218 -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
219 - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
220 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
221 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
222
223 @@ -7131,10 +7094,6 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
224 [_AM_DEPENDENCIES(CXX)],
225 [define([AC_PROG_CXX],
226 defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
227 -AC_PROVIDE_IFELSE([AC_PROG_OBJC],
228 - [_AM_DEPENDENCIES(OBJC)],
229 - [define([AC_PROG_OBJC],
230 - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
231 ])
232 ])
233
234 @@ -7148,17 +7107,16 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
235 # our stamp files there.
236 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
237 [# Compute $1's index in $config_headers.
238 -_am_arg=$1
239 _am_stamp_count=1
240 for _am_header in $config_headers :; do
241 case $_am_header in
242 - $_am_arg | $_am_arg:* )
243 + $1 | $1:* )
244 break ;;
245 * )
246 _am_stamp_count=`expr $_am_stamp_count + 1` ;;
247 esac
248 done
249 -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
250 +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
251
252 # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
253 #
254 @@ -7171,7 +7129,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
255 # Define $install_sh.
256 AC_DEFUN([AM_PROG_INSTALL_SH],
257 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
258 -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
259 +install_sh=${install_sh-"$am_aux_dir/install-sh"}
260 AC_SUBST(install_sh)])
261
262 # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
263 @@ -7249,14 +7207,14 @@ rm -f confinc confmf
264
265 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
266
267 -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
268 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
269 # Free Software Foundation, Inc.
270 #
271 # This file is free software; the Free Software Foundation
272 # gives unlimited permission to copy and/or distribute it,
273 # with or without modifications, as long as this notice is preserved.
274
275 -# serial 5
276 +# serial 4
277
278 # AM_MISSING_PROG(NAME, PROGRAM)
279 # ------------------------------
280 @@ -7272,7 +7230,6 @@ AC_SUBST($1)])
281 # If it does, set am_missing_run to use it, otherwise, to nothing.
282 AC_DEFUN([AM_MISSING_HAS_RUN],
283 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
284 -AC_REQUIRE_AUX_FILE([missing])dnl
285 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
286 # Use eval to expand $SHELL
287 if eval "$MISSING --run true"; then
288 @@ -7283,7 +7240,7 @@ else
289 fi
290 ])
291
292 -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
293 +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
294 #
295 # This file is free software; the Free Software Foundation
296 # gives unlimited permission to copy and/or distribute it,
297 @@ -7291,23 +7248,60 @@ fi
298
299 # AM_PROG_MKDIR_P
300 # ---------------
301 -# Check for `mkdir -p'.
302 +# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
303 +#
304 +# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
305 +# created by `make install' are always world readable, even if the
306 +# installer happens to have an overly restrictive umask (e.g. 077).
307 +# This was a mistake. There are at least two reasons why we must not
308 +# use `-m 0755':
309 +# - it causes special bits like SGID to be ignored,
310 +# - it may be too restrictive (some setups expect 775 directories).
311 +#
312 +# Do not use -m 0755 and let people choose whatever they expect by
313 +# setting umask.
314 +#
315 +# We cannot accept any implementation of `mkdir' that recognizes `-p'.
316 +# Some implementations (such as Solaris 8's) are not thread-safe: if a
317 +# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
318 +# concurrently, both version can detect that a/ is missing, but only
319 +# one can create it and the other will error out. Consequently we
320 +# restrict ourselves to GNU make (using the --version option ensures
321 +# this.)
322 AC_DEFUN([AM_PROG_MKDIR_P],
323 -[AC_PREREQ([2.60])dnl
324 -AC_REQUIRE([AC_PROG_MKDIR_P])dnl
325 -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
326 -dnl while keeping a definition of mkdir_p for backward compatibility.
327 -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
328 -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
329 -dnl Makefile.ins that do not define MKDIR_P, so we do our own
330 -dnl adjustment using top_builddir (which is defined more often than
331 -dnl MKDIR_P).
332 -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
333 -case $mkdir_p in
334 - [[\\/$]]* | ?:[[\\/]]*) ;;
335 - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
336 -esac
337 -])
338 +[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
339 + # We used to keeping the `.' as first argument, in order to
340 + # allow $(mkdir_p) to be used without argument. As in
341 + # $(mkdir_p) $(somedir)
342 + # where $(somedir) is conditionally defined. However this is wrong
343 + # for two reasons:
344 + # 1. if the package is installed by a user who cannot write `.'
345 + # make install will fail,
346 + # 2. the above comment should most certainly read
347 + # $(mkdir_p) $(DESTDIR)$(somedir)
348 + # so it does not work when $(somedir) is undefined and
349 + # $(DESTDIR) is not.
350 + # To support the latter case, we have to write
351 + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
352 + # so the `.' trick is pointless.
353 + mkdir_p='mkdir -p --'
354 +else
355 + # On NextStep and OpenStep, the `mkdir' command does not
356 + # recognize any option. It will interpret all options as
357 + # directories to create, and then abort because `.' already
358 + # exists.
359 + for d in ./-p ./--version;
360 + do
361 + test -d $d && rmdir $d
362 + done
363 + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
364 + if test -f "$ac_aux_dir/mkinstalldirs"; then
365 + mkdir_p='$(mkinstalldirs)'
366 + else
367 + mkdir_p='$(install_sh) -d'
368 + fi
369 +fi
370 +AC_SUBST([mkdir_p])])
371
372 # Helper functions for option handling. -*- Autoconf -*-
373
374 @@ -7419,21 +7413,9 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
375 if test "$cross_compiling" != no; then
376 AC_CHECK_TOOL([STRIP], [strip], :)
377 fi
378 -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
379 +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
380 AC_SUBST([INSTALL_STRIP_PROGRAM])])
381
382 -# Copyright (C) 2006 Free Software Foundation, Inc.
383 -#
384 -# This file is free software; the Free Software Foundation
385 -# gives unlimited permission to copy and/or distribute it,
386 -# with or without modifications, as long as this notice is preserved.
387 -
388 -# _AM_SUBST_NOTMAKE(VARIABLE)
389 -# ---------------------------
390 -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
391 -# This macro is traced by Automake.
392 -AC_DEFUN([_AM_SUBST_NOTMAKE])
393 -
394 # Check how to create a tarball. -*- Autoconf -*-
395
396 # Copyright (C) 2004, 2005 Free Software Foundation, Inc.
397 --- ./config/config.guess
398 +++ ./config/config.guess
399 @@ -1,10 +1,10 @@
400 #! /bin/sh
401 # Attempt to guess a canonical system name.
402 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
403 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
404 -# Inc.
405 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
406 +# Free Software Foundation, Inc.
407
408 -timestamp='2007-07-22'
409 +timestamp='2008-01-23'
410
411 # This file is free software; you can redistribute it and/or modify it
412 # under the terms of the GNU General Public License as published by
413 @@ -56,8 +56,8 @@ version="\
414 GNU config.guess ($timestamp)
415
416 Originally written by Per Bothner.
417 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
418 -Free Software Foundation, Inc.
419 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
420 +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
421
422 This is free software; see the source for copying conditions. There is NO
423 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
424 @@ -532,7 +532,7 @@ EOF
425 echo rs6000-ibm-aix3.2
426 fi
427 exit ;;
428 - *:AIX:*:[45])
429 + *:AIX:*:[456])
430 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
431 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
432 IBM_ARCH=rs6000
433 @@ -799,6 +799,9 @@ EOF
434 EM64T | authenticamd)
435 echo x86_64-unknown-interix${UNAME_RELEASE}
436 exit ;;
437 + IA64)
438 + echo ia64-unknown-interix${UNAME_RELEASE}
439 + exit ;;
440 esac ;;
441 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
442 echo i${UNAME_MACHINE}-pc-mks
443 @@ -833,7 +836,14 @@ EOF
444 echo ${UNAME_MACHINE}-pc-minix
445 exit ;;
446 arm*:Linux:*:*)
447 - echo ${UNAME_MACHINE}-unknown-linux-gnu
448 + eval $set_cc_for_build
449 + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
450 + | grep -q __ARM_EABI__
451 + then
452 + echo ${UNAME_MACHINE}-unknown-linux-gnu
453 + else
454 + echo ${UNAME_MACHINE}-unknown-linux-gnueabi
455 + fi
456 exit ;;
457 avr32*:Linux:*:*)
458 echo ${UNAME_MACHINE}-unknown-linux-gnu
459 @@ -954,8 +964,8 @@ EOF
460 x86_64:Linux:*:*)
461 echo x86_64-unknown-linux-gnu
462 exit ;;
463 - xtensa:Linux:*:*)
464 - echo xtensa-unknown-linux-gnu
465 + xtensa*:Linux:*:*)
466 + echo ${UNAME_MACHINE}-unknown-linux-gnu
467 exit ;;
468 i*86:Linux:*:*)
469 # The BFD linker knows what the default object file format is, so
470 @@ -1474,9 +1484,9 @@ This script, last modified $timestamp, has failed to recognize
471 the operating system you are using. It is advised that you
472 download the most up to date version of the config scripts from
473
474 - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
475 + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
476 and
477 - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
478 + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
479
480 If the version you run ($0) is already up to date, please
481 send the following data and any information you think might be
482 --- ./config/config.sub
483 +++ ./config/config.sub
484 @@ -1,10 +1,10 @@
485 #! /bin/sh
486 # Configuration validation subroutine script.
487 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
488 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
489 -# Inc.
490 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
491 +# Free Software Foundation, Inc.
492
493 -timestamp='2007-06-28'
494 +timestamp='2008-01-16'
495
496 # This file is (in principle) common to ALL GNU software.
497 # The presence of a machine in this file suggests that SOME GNU software
498 @@ -72,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
499 version="\
500 GNU config.sub ($timestamp)
501
502 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
503 -Free Software Foundation, Inc.
504 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
505 +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
506
507 This is free software; see the source for copying conditions. There is NO
508 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
509 @@ -369,10 +369,14 @@ case $basic_machine in
510 | v850-* | v850e-* | vax-* \
511 | we32k-* \
512 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
513 - | xstormy16-* | xtensa-* \
514 + | xstormy16-* | xtensa*-* \
515 | ymp-* \
516 | z8k-*)
517 ;;
518 + # Recognize the basic CPU types without company name, with glob match.
519 + xtensa*)
520 + basic_machine=$basic_machine-unknown
521 + ;;
522 # Recognize the various machine names and aliases which stand
523 # for a CPU type and a company and sometimes even an OS.
524 386bsd)
525 @@ -443,6 +447,14 @@ case $basic_machine in
526 basic_machine=ns32k-sequent
527 os=-dynix
528 ;;
529 + blackfin)
530 + basic_machine=bfin-unknown
531 + os=-linux
532 + ;;
533 + blackfin-*)
534 + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
535 + os=-linux
536 + ;;
537 c90)
538 basic_machine=c90-cray
539 os=-unicos
540 @@ -668,6 +680,14 @@ case $basic_machine in
541 basic_machine=m68k-isi
542 os=-sysv
543 ;;
544 + m68knommu)
545 + basic_machine=m68k-unknown
546 + os=-linux
547 + ;;
548 + m68knommu-*)
549 + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
550 + os=-linux
551 + ;;
552 m88k-omron*)
553 basic_machine=m88k-omron
554 ;;
555 @@ -813,6 +833,14 @@ case $basic_machine in
556 basic_machine=i860-intel
557 os=-osf
558 ;;
559 + parisc)
560 + basic_machine=hppa-unknown
561 + os=-linux
562 + ;;
563 + parisc-*)
564 + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
565 + os=-linux
566 + ;;
567 pbd)
568 basic_machine=sparc-tti
569 ;;
570 @@ -1021,6 +1049,10 @@ case $basic_machine in
571 basic_machine=tic6x-unknown
572 os=-coff
573 ;;
574 + tile*)
575 + basic_machine=tile-unknown
576 + os=-linux-gnu
577 + ;;
578 tx39)
579 basic_machine=mipstx39-unknown
580 ;;
581 --- ./config/ltmain.sh
582 +++ ./config/ltmain.sh
583 @@ -43,7 +43,7 @@ EXIT_FAILURE=1
584
585 PROGRAM=ltmain.sh
586 PACKAGE=libtool
587 -VERSION="1.5.26 Debian 1.5.26-1ubuntu1"
588 +VERSION="1.5.26 Debian 1.5.26-4"
589 TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
590
591 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
592 --- ./configure
593 +++ ./configure
594 @@ -1,11 +1,11 @@
595 #! /bin/sh
596 # Guess values for system-dependent variables and create Makefiles.
597 -# Generated by GNU Autoconf 2.61 for suPHP 0.7.1.
598 +# Generated by GNU Autoconf 2.63 for suPHP 0.7.1.
599 #
600 # Report bugs to <sebastian.marsching@suphp.org>.
601 #
602 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
603 -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
604 +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
605 # This configure script is free software; the Free Software Foundation
606 # gives unlimited permission to copy, distribute and modify it.
607 ## --------------------- ##
608 @@ -17,7 +17,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
609 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
610 emulate sh
611 NULLCMD=:
612 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
613 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
614 # is contrary to our usage. Disable this feature.
615 alias -g '${1+"$@"}'='"$@"'
616 setopt NO_GLOB_SUBST
617 @@ -39,17 +39,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
618 as_cr_digits='0123456789'
619 as_cr_alnum=$as_cr_Letters$as_cr_digits
620
621 -# The user is always right.
622 -if test "${PATH_SEPARATOR+set}" != set; then
623 - echo "#! /bin/sh" >conf$$.sh
624 - echo "exit 0" >>conf$$.sh
625 - chmod +x conf$$.sh
626 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
627 - PATH_SEPARATOR=';'
628 +as_nl='
629 +'
630 +export as_nl
631 +# Printing a long string crashes Solaris 7 /usr/bin/printf.
632 +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
633 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
634 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
635 +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
636 + as_echo='printf %s\n'
637 + as_echo_n='printf %s'
638 +else
639 + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
640 + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
641 + as_echo_n='/usr/ucb/echo -n'
642 else
643 - PATH_SEPARATOR=:
644 + as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
645 + as_echo_n_body='eval
646 + arg=$1;
647 + case $arg in
648 + *"$as_nl"*)
649 + expr "X$arg" : "X\\(.*\\)$as_nl";
650 + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
651 + esac;
652 + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
653 + '
654 + export as_echo_n_body
655 + as_echo_n='sh -c $as_echo_n_body as_echo'
656 fi
657 - rm -f conf$$.sh
658 + export as_echo_body
659 + as_echo='sh -c $as_echo_body as_echo'
660 +fi
661 +
662 +# The user is always right.
663 +if test "${PATH_SEPARATOR+set}" != set; then
664 + PATH_SEPARATOR=:
665 + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
666 + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
667 + PATH_SEPARATOR=';'
668 + }
669 fi
670
671 # Support unset when possible.
672 @@ -65,8 +93,6 @@ fi
673 # there to prevent editors from complaining about space-tab.
674 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
675 # splitting by setting IFS to empty value.)
676 -as_nl='
677 -'
678 IFS=" "" $as_nl"
679
680 # Find who we are. Look in the path if we contain no directory separator.
681 @@ -89,7 +115,7 @@ if test "x$as_myself" = x; then
682 as_myself=$0
683 fi
684 if test ! -f "$as_myself"; then
685 - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
686 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
687 { (exit 1); exit 1; }
688 fi
689
690 @@ -102,17 +128,10 @@ PS2='> '
691 PS4='+ '
692
693 # NLS nuisances.
694 -for as_var in \
695 - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
696 - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
697 - LC_TELEPHONE LC_TIME
698 -do
699 - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
700 - eval $as_var=C; export $as_var
701 - else
702 - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
703 - fi
704 -done
705 +LC_ALL=C
706 +export LC_ALL
707 +LANGUAGE=C
708 +export LANGUAGE
709
710 # Required to use basename.
711 if expr a : '\(a\)' >/dev/null 2>&1 &&
712 @@ -134,7 +153,7 @@ as_me=`$as_basename -- "$0" ||
713 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
714 X"$0" : 'X\(//\)$' \| \
715 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
716 -echo X/"$0" |
717 +$as_echo X/"$0" |
718 sed '/^.*\/\([^/][^/]*\)\/*$/{
719 s//\1/
720 q
721 @@ -160,7 +179,7 @@ else
722 as_have_required=no
723 fi
724
725 - if test $as_have_required = yes && (eval ":
726 + if test $as_have_required = yes && (eval ":
727 (as_func_return () {
728 (exit \$1)
729 }
730 @@ -242,7 +261,7 @@ IFS=$as_save_IFS
731 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
732 emulate sh
733 NULLCMD=:
734 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
735 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
736 # is contrary to our usage. Disable this feature.
737 alias -g '${1+"$@"}'='"$@"'
738 setopt NO_GLOB_SUBST
739 @@ -263,7 +282,7 @@ _ASEOF
740 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
741 emulate sh
742 NULLCMD=:
743 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
744 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
745 # is contrary to our usage. Disable this feature.
746 alias -g '${1+"$@"}'='"$@"'
747 setopt NO_GLOB_SUBST
748 @@ -343,10 +362,10 @@ fi
749
750 if test "x$CONFIG_SHELL" != x; then
751 for as_var in BASH_ENV ENV
752 - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
753 - done
754 - export CONFIG_SHELL
755 - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
756 + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
757 + done
758 + export CONFIG_SHELL
759 + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
760 fi
761
762
763 @@ -415,9 +434,10 @@ fi
764
765 test \$exitcode = 0") || {
766 echo No shell found that supports shell functions.
767 - echo Please tell autoconf@gnu.org about your system,
768 - echo including any error possibly output before this
769 - echo message
770 + echo Please tell bug-autoconf@gnu.org about your system,
771 + echo including any error possibly output before this message.
772 + echo This can help us improve future autoconf versions.
773 + echo Configuration will now proceed without shell functions.
774 }
775
776
777 @@ -453,7 +473,7 @@ test \$exitcode = 0") || {
778 s/-\n.*//
779 ' >$as_me.lineno &&
780 chmod +x "$as_me.lineno" ||
781 - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
782 + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
783 { (exit 1); exit 1; }; }
784
785 # Don't try to exec as it changes $[0], causing all sort of problems
786 @@ -481,7 +501,6 @@ case `echo -n x` in
787 *)
788 ECHO_N='-n';;
789 esac
790 -
791 if expr a : '\(a\)' >/dev/null 2>&1 &&
792 test "X`expr 00001 : '.*\(...\)'`" = X001; then
793 as_expr=expr
794 @@ -494,19 +513,22 @@ if test -d conf$$.dir; then
795 rm -f conf$$.dir/conf$$.file
796 else
797 rm -f conf$$.dir
798 - mkdir conf$$.dir
799 -fi
800 -echo >conf$$.file
801 -if ln -s conf$$.file conf$$ 2>/dev/null; then
802 - as_ln_s='ln -s'
803 - # ... but there are two gotchas:
804 - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
805 - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
806 - # In both cases, we have to default to `cp -p'.
807 - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
808 + mkdir conf$$.dir 2>/dev/null
809 +fi
810 +if (echo >conf$$.file) 2>/dev/null; then
811 + if ln -s conf$$.file conf$$ 2>/dev/null; then
812 + as_ln_s='ln -s'
813 + # ... but there are two gotchas:
814 + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
815 + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
816 + # In both cases, we have to default to `cp -p'.
817 + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
818 + as_ln_s='cp -p'
819 + elif ln conf$$.file conf$$ 2>/dev/null; then
820 + as_ln_s=ln
821 + else
822 as_ln_s='cp -p'
823 -elif ln conf$$.file conf$$ 2>/dev/null; then
824 - as_ln_s=ln
825 + fi
826 else
827 as_ln_s='cp -p'
828 fi
829 @@ -531,10 +553,10 @@ else
830 as_test_x='
831 eval sh -c '\''
832 if test -d "$1"; then
833 - test -d "$1/.";
834 + test -d "$1/.";
835 else
836 case $1 in
837 - -*)set "./$1";;
838 + -*)set "./$1";;
839 esac;
840 case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
841 ???[sx]*):;;*)false;;esac;fi
842 @@ -769,128 +791,146 @@ ac_includes_default="\
843 # include <unistd.h>
844 #endif"
845
846 -ac_subst_vars='SHELL
847 -PATH_SEPARATOR
848 -PACKAGE_NAME
849 -PACKAGE_TARNAME
850 -PACKAGE_VERSION
851 -PACKAGE_STRING
852 -PACKAGE_BUGREPORT
853 -exec_prefix
854 -prefix
855 -program_transform_name
856 -bindir
857 -sbindir
858 -libexecdir
859 -datarootdir
860 -datadir
861 -sysconfdir
862 -sharedstatedir
863 -localstatedir
864 -includedir
865 -oldincludedir
866 -docdir
867 -infodir
868 -htmldir
869 -dvidir
870 -pdfdir
871 -psdir
872 -libdir
873 -localedir
874 -mandir
875 -DEFS
876 -ECHO_C
877 -ECHO_N
878 -ECHO_T
879 -LIBS
880 -build_alias
881 -host_alias
882 -target_alias
883 -INSTALL_PROGRAM
884 -INSTALL_SCRIPT
885 -INSTALL_DATA
886 -am__isrc
887 -CYGPATH_W
888 -PACKAGE
889 -VERSION
890 -ACLOCAL
891 -AUTOCONF
892 -AUTOMAKE
893 -AUTOHEADER
894 -MAKEINFO
895 -install_sh
896 -STRIP
897 -INSTALL_STRIP_PROGRAM
898 -mkdir_p
899 -AWK
900 -SET_MAKE
901 -am__leading_dot
902 -AMTAR
903 -am__tar
904 -am__untar
905 -CC
906 -CFLAGS
907 -LDFLAGS
908 -CPPFLAGS
909 -ac_ct_CC
910 -EXEEXT
911 -OBJEXT
912 -DEPDIR
913 -am__include
914 -am__quote
915 -AMDEP_TRUE
916 -AMDEP_FALSE
917 -AMDEPBACKSLASH
918 -CCDEPMODE
919 -am__fastdepCC_TRUE
920 -am__fastdepCC_FALSE
921 -CXX
922 -CXXFLAGS
923 -ac_ct_CXX
924 -CXXDEPMODE
925 -am__fastdepCXX_TRUE
926 -am__fastdepCXX_FALSE
927 -build
928 -build_cpu
929 -build_vendor
930 -build_os
931 -host
932 -host_cpu
933 -host_vendor
934 -host_os
935 -SED
936 -GREP
937 -EGREP
938 -LN_S
939 -ECHO
940 -AR
941 -RANLIB
942 -DSYMUTIL
943 -NMEDIT
944 -CPP
945 -CXXCPP
946 -F77
947 -FFLAGS
948 -ac_ct_F77
949 -LIBTOOL
950 -APXS
951 -APACHE_VERSION_1_3
952 -APACHE_VERSION_2
953 -APXS_INCLUDEDIR
954 -APXS_LIBEXECDIR
955 -APXS_EXTRA_CFLAGS
956 -APR_INCLUDEDIR
957 -APR_CPPFLAGS
958 -OPT_APACHEMOD_USERGROUP_DEF
959 -COND_AP13_TRUE
960 -COND_AP13_FALSE
961 -COND_AP20_TRUE
962 -COND_AP20_FALSE
963 -COND_APUSERGROUP_TRUE
964 -COND_APUSERGROUP_FALSE
965 +ac_subst_vars='LTLIBOBJS
966 LIBOBJS
967 -LTLIBOBJS'
968 +COND_APUSERGROUP_FALSE
969 +COND_APUSERGROUP_TRUE
970 +COND_AP20_FALSE
971 +COND_AP20_TRUE
972 +COND_AP13_FALSE
973 +COND_AP13_TRUE
974 +OPT_APACHEMOD_USERGROUP_DEF
975 +APR_CPPFLAGS
976 +APR_INCLUDEDIR
977 +APXS_EXTRA_CFLAGS
978 +APXS_LIBEXECDIR
979 +APXS_INCLUDEDIR
980 +APACHE_VERSION_2
981 +APACHE_VERSION_1_3
982 +APXS
983 +LIBTOOL
984 +ac_ct_F77
985 +FFLAGS
986 +F77
987 +CXXCPP
988 +CPP
989 +NMEDIT
990 +DSYMUTIL
991 +RANLIB
992 +AR
993 +ECHO
994 +LN_S
995 +EGREP
996 +GREP
997 +SED
998 +host_os
999 +host_vendor
1000 +host_cpu
1001 +host
1002 +build_os
1003 +build_vendor
1004 +build_cpu
1005 +build
1006 +am__fastdepCXX_FALSE
1007 +am__fastdepCXX_TRUE
1008 +CXXDEPMODE
1009 +ac_ct_CXX
1010 +CXXFLAGS
1011 +CXX
1012 +am__fastdepCC_FALSE
1013 +am__fastdepCC_TRUE
1014 +CCDEPMODE
1015 +AMDEPBACKSLASH
1016 +AMDEP_FALSE
1017 +AMDEP_TRUE
1018 +am__quote
1019 +am__include
1020 +DEPDIR
1021 +OBJEXT
1022 +EXEEXT
1023 +ac_ct_CC
1024 +CPPFLAGS
1025 +LDFLAGS
1026 +CFLAGS
1027 +CC
1028 +am__untar
1029 +am__tar
1030 +AMTAR
1031 +am__leading_dot
1032 +SET_MAKE
1033 +AWK
1034 +mkdir_p
1035 +INSTALL_STRIP_PROGRAM
1036 +STRIP
1037 +install_sh
1038 +MAKEINFO
1039 +AUTOHEADER
1040 +AUTOMAKE
1041 +AUTOCONF
1042 +ACLOCAL
1043 +VERSION
1044 +PACKAGE
1045 +CYGPATH_W
1046 +INSTALL_DATA
1047 +INSTALL_SCRIPT
1048 +INSTALL_PROGRAM
1049 +target_alias
1050 +host_alias
1051 +build_alias
1052 +LIBS
1053 +ECHO_T
1054 +ECHO_N
1055 +ECHO_C
1056 +DEFS
1057 +mandir
1058 +localedir
1059 +libdir
1060 +psdir
1061 +pdfdir
1062 +dvidir
1063 +htmldir
1064 +infodir
1065 +docdir
1066 +oldincludedir
1067 +includedir
1068 +localstatedir
1069 +sharedstatedir
1070 +sysconfdir
1071 +datadir
1072 +datarootdir
1073 +libexecdir
1074 +sbindir
1075 +bindir
1076 +program_transform_name
1077 +prefix
1078 +exec_prefix
1079 +PACKAGE_BUGREPORT
1080 +PACKAGE_STRING
1081 +PACKAGE_VERSION
1082 +PACKAGE_TARNAME
1083 +PACKAGE_NAME
1084 +PATH_SEPARATOR
1085 +SHELL'
1086 ac_subst_files=''
1087 +ac_user_opts='
1088 +enable_option_checking
1089 +enable_dependency_tracking
1090 +enable_shared
1091 +enable_static
1092 +enable_fast_install
1093 +with_gnu_ld
1094 +enable_libtool_lock
1095 +with_pic
1096 +with_tags
1097 +with_apr
1098 +with_apxs
1099 +with_setid_mode
1100 +enable_checkpath
1101 +with_min_uid
1102 +with_min_gid
1103 +with_apache_user
1104 +with_logfile
1105 +'
1106 ac_precious_vars='build_alias
1107 host_alias
1108 target_alias
1109 @@ -911,6 +951,8 @@ FFLAGS'
1110 # Initialize some variables set by options.
1111 ac_init_help=
1112 ac_init_version=false
1113 +ac_unrecognized_opts=
1114 +ac_unrecognized_sep=
1115 # The variables have the same names as the options, with
1116 # dashes changed to underlines.
1117 cache_file=/dev/null
1118 @@ -1009,13 +1051,21 @@ do
1119 datarootdir=$ac_optarg ;;
1120
1121 -disable-* | --disable-*)
1122 - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
1123 + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
1124 # Reject names that are not valid shell variable names.
1125 - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1126 - { echo "$as_me: error: invalid feature name: $ac_feature" >&2
1127 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1128 + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
1129 { (exit 1); exit 1; }; }
1130 - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
1131 - eval enable_$ac_feature=no ;;
1132 + ac_useropt_orig=$ac_useropt
1133 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1134 + case $ac_user_opts in
1135 + *"
1136 +"enable_$ac_useropt"
1137 +"*) ;;
1138 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
1139 + ac_unrecognized_sep=', ';;
1140 + esac
1141 + eval enable_$ac_useropt=no ;;
1142
1143 -docdir | --docdir | --docdi | --doc | --do)
1144 ac_prev=docdir ;;
1145 @@ -1028,13 +1078,21 @@ do
1146 dvidir=$ac_optarg ;;
1147
1148 -enable-* | --enable-*)
1149 - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
1150 + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
1151 # Reject names that are not valid shell variable names.
1152 - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1153 - { echo "$as_me: error: invalid feature name: $ac_feature" >&2
1154 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1155 + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
1156 { (exit 1); exit 1; }; }
1157 - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
1158 - eval enable_$ac_feature=\$ac_optarg ;;
1159 + ac_useropt_orig=$ac_useropt
1160 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1161 + case $ac_user_opts in
1162 + *"
1163 +"enable_$ac_useropt"
1164 +"*) ;;
1165 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
1166 + ac_unrecognized_sep=', ';;
1167 + esac
1168 + eval enable_$ac_useropt=\$ac_optarg ;;
1169
1170 -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
1171 | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
1172 @@ -1225,22 +1283,38 @@ do
1173 ac_init_version=: ;;
1174
1175 -with-* | --with-*)
1176 - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
1177 + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
1178 # Reject names that are not valid shell variable names.
1179 - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1180 - { echo "$as_me: error: invalid package name: $ac_package" >&2
1181 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1182 + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
1183 { (exit 1); exit 1; }; }
1184 - ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
1185 - eval with_$ac_package=\$ac_optarg ;;
1186 + ac_useropt_orig=$ac_useropt
1187 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1188 + case $ac_user_opts in
1189 + *"
1190 +"with_$ac_useropt"
1191 +"*) ;;
1192 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
1193 + ac_unrecognized_sep=', ';;
1194 + esac
1195 + eval with_$ac_useropt=\$ac_optarg ;;
1196
1197 -without-* | --without-*)
1198 - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
1199 + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
1200 # Reject names that are not valid shell variable names.
1201 - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1202 - { echo "$as_me: error: invalid package name: $ac_package" >&2
1203 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1204 + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
1205 { (exit 1); exit 1; }; }
1206 - ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
1207 - eval with_$ac_package=no ;;
1208 + ac_useropt_orig=$ac_useropt
1209 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1210 + case $ac_user_opts in
1211 + *"
1212 +"with_$ac_useropt"
1213 +"*) ;;
1214 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
1215 + ac_unrecognized_sep=', ';;
1216 + esac
1217 + eval with_$ac_useropt=no ;;
1218
1219 --x)
1220 # Obsolete; use --with-x.
1221 @@ -1260,7 +1334,7 @@ do
1222 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
1223 x_libraries=$ac_optarg ;;
1224
1225 - -*) { echo "$as_me: error: unrecognized option: $ac_option
1226 + -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
1227 Try \`$0 --help' for more information." >&2
1228 { (exit 1); exit 1; }; }
1229 ;;
1230 @@ -1269,16 +1343,16 @@ Try \`$0 --help' for more information." >&2
1231 ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
1232 # Reject names that are not valid shell variable names.
1233 expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
1234 - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
1235 + { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
1236 { (exit 1); exit 1; }; }
1237 eval $ac_envvar=\$ac_optarg
1238 export $ac_envvar ;;
1239
1240 *)
1241 # FIXME: should be removed in autoconf 3.0.
1242 - echo "$as_me: WARNING: you should use --build, --host, --target" >&2
1243 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
1244 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1245 - echo "$as_me: WARNING: invalid host type: $ac_option" >&2
1246 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
1247 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
1248 ;;
1249
1250 @@ -1287,22 +1361,38 @@ done
1251
1252 if test -n "$ac_prev"; then
1253 ac_option=--`echo $ac_prev | sed 's/_/-/g'`
1254 - { echo "$as_me: error: missing argument to $ac_option" >&2
1255 + { $as_echo "$as_me: error: missing argument to $ac_option" >&2
1256 { (exit 1); exit 1; }; }
1257 fi
1258
1259 -# Be sure to have absolute directory names.
1260 +if test -n "$ac_unrecognized_opts"; then
1261 + case $enable_option_checking in
1262 + no) ;;
1263 + fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
1264 + { (exit 1); exit 1; }; } ;;
1265 + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
1266 + esac
1267 +fi
1268 +
1269 +# Check all directory arguments for consistency.
1270 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
1271 datadir sysconfdir sharedstatedir localstatedir includedir \
1272 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1273 libdir localedir mandir
1274 do
1275 eval ac_val=\$$ac_var
1276 + # Remove trailing slashes.
1277 + case $ac_val in
1278 + */ )
1279 + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
1280 + eval $ac_var=\$ac_val;;
1281 + esac
1282 + # Be sure to have absolute directory names.
1283 case $ac_val in
1284 [\\/$]* | ?:[\\/]* ) continue;;
1285 NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
1286 esac
1287 - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
1288 + { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
1289 { (exit 1); exit 1; }; }
1290 done
1291
1292 @@ -1317,7 +1407,7 @@ target=$target_alias
1293 if test "x$host_alias" != x; then
1294 if test "x$build_alias" = x; then
1295 cross_compiling=maybe
1296 - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
1297 + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
1298 If a cross compiler is detected then cross compile mode will be used." >&2
1299 elif test "x$build_alias" != "x$host_alias"; then
1300 cross_compiling=yes
1301 @@ -1333,10 +1423,10 @@ test "$silent" = yes && exec 6>/dev/null
1302 ac_pwd=`pwd` && test -n "$ac_pwd" &&
1303 ac_ls_di=`ls -di .` &&
1304 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
1305 - { echo "$as_me: error: Working directory cannot be determined" >&2
1306 + { $as_echo "$as_me: error: working directory cannot be determined" >&2
1307 { (exit 1); exit 1; }; }
1308 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
1309 - { echo "$as_me: error: pwd does not report name of working directory" >&2
1310 + { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
1311 { (exit 1); exit 1; }; }
1312
1313
1314 @@ -1344,12 +1434,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
1315 if test -z "$srcdir"; then
1316 ac_srcdir_defaulted=yes
1317 # Try the directory containing this script, then the parent directory.
1318 - ac_confdir=`$as_dirname -- "$0" ||
1319 -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
1320 - X"$0" : 'X\(//\)[^/]' \| \
1321 - X"$0" : 'X\(//\)$' \| \
1322 - X"$0" : 'X\(/\)' \| . 2>/dev/null ||
1323 -echo X"$0" |
1324 + ac_confdir=`$as_dirname -- "$as_myself" ||
1325 +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
1326 + X"$as_myself" : 'X\(//\)[^/]' \| \
1327 + X"$as_myself" : 'X\(//\)$' \| \
1328 + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
1329 +$as_echo X"$as_myself" |
1330 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
1331 s//\1/
1332 q
1333 @@ -1376,12 +1466,12 @@ else
1334 fi
1335 if test ! -r "$srcdir/$ac_unique_file"; then
1336 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
1337 - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
1338 + { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
1339 { (exit 1); exit 1; }; }
1340 fi
1341 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
1342 ac_abs_confdir=`(
1343 - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
1344 + cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
1345 { (exit 1); exit 1; }; }
1346 pwd)`
1347 # When building in place, set srcdir=.
1348 @@ -1430,9 +1520,9 @@ Configuration:
1349
1350 Installation directories:
1351 --prefix=PREFIX install architecture-independent files in PREFIX
1352 - [$ac_default_prefix]
1353 + [$ac_default_prefix]
1354 --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
1355 - [PREFIX]
1356 + [PREFIX]
1357
1358 By default, \`make install' will install all the files in
1359 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
1360 @@ -1442,25 +1532,25 @@ for instance \`--prefix=\$HOME'.
1361 For better control, use the options below.
1362
1363 Fine tuning of the installation directories:
1364 - --bindir=DIR user executables [EPREFIX/bin]
1365 - --sbindir=DIR system admin executables [EPREFIX/sbin]
1366 - --libexecdir=DIR program executables [EPREFIX/libexec]
1367 - --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
1368 - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
1369 - --localstatedir=DIR modifiable single-machine data [PREFIX/var]
1370 - --libdir=DIR object code libraries [EPREFIX/lib]
1371 - --includedir=DIR C header files [PREFIX/include]
1372 - --oldincludedir=DIR C header files for non-gcc [/usr/include]
1373 - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
1374 - --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
1375 - --infodir=DIR info documentation [DATAROOTDIR/info]
1376 - --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
1377 - --mandir=DIR man documentation [DATAROOTDIR/man]
1378 - --docdir=DIR documentation root [DATAROOTDIR/doc/suphp]
1379 - --htmldir=DIR html documentation [DOCDIR]
1380 - --dvidir=DIR dvi documentation [DOCDIR]
1381 - --pdfdir=DIR pdf documentation [DOCDIR]
1382 - --psdir=DIR ps documentation [DOCDIR]
1383 + --bindir=DIR user executables [EPREFIX/bin]
1384 + --sbindir=DIR system admin executables [EPREFIX/sbin]
1385 + --libexecdir=DIR program executables [EPREFIX/libexec]
1386 + --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
1387 + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
1388 + --localstatedir=DIR modifiable single-machine data [PREFIX/var]
1389 + --libdir=DIR object code libraries [EPREFIX/lib]
1390 + --includedir=DIR C header files [PREFIX/include]
1391 + --oldincludedir=DIR C header files for non-gcc [/usr/include]
1392 + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
1393 + --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
1394 + --infodir=DIR info documentation [DATAROOTDIR/info]
1395 + --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
1396 + --mandir=DIR man documentation [DATAROOTDIR/man]
1397 + --docdir=DIR documentation root [DATAROOTDIR/doc/suphp]
1398 + --htmldir=DIR html documentation [DOCDIR]
1399 + --dvidir=DIR dvi documentation [DOCDIR]
1400 + --pdfdir=DIR pdf documentation [DOCDIR]
1401 + --psdir=DIR ps documentation [DOCDIR]
1402 _ACEOF
1403
1404 cat <<\_ACEOF
1405 @@ -1483,6 +1573,7 @@ if test -n "$ac_init_help"; then
1406 cat <<\_ACEOF
1407
1408 Optional Features:
1409 + --disable-option-checking ignore unrecognized --enable/--with options
1410 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
1411 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1412 --disable-dependency-tracking speeds up one-time build
1413 @@ -1546,15 +1637,17 @@ fi
1414 if test "$ac_init_help" = "recursive"; then
1415 # If there are subdirs, report their specific --help.
1416 for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
1417 - test -d "$ac_dir" || continue
1418 + test -d "$ac_dir" ||
1419 + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
1420 + continue
1421 ac_builddir=.
1422
1423 case "$ac_dir" in
1424 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
1425 *)
1426 - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
1427 + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
1428 # A ".." for each directory in $ac_dir_suffix.
1429 - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
1430 + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
1431 case $ac_top_builddir_sub in
1432 "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
1433 *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
1434 @@ -1590,7 +1683,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
1435 echo &&
1436 $SHELL "$ac_srcdir/configure" --help=recursive
1437 else
1438 - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
1439 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
1440 fi || ac_status=$?
1441 cd "$ac_pwd" || { ac_status=$?; break; }
1442 done
1443 @@ -1600,10 +1693,10 @@ test -n "$ac_init_help" && exit $ac_status
1444 if $ac_init_version; then
1445 cat <<\_ACEOF
1446 suPHP configure 0.7.1
1447 -generated by GNU Autoconf 2.61
1448 +generated by GNU Autoconf 2.63
1449
1450 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
1451 -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
1452 +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
1453 This configure script is free software; the Free Software Foundation
1454 gives unlimited permission to copy, distribute and modify it.
1455 _ACEOF
1456 @@ -1614,7 +1707,7 @@ This file contains any messages produced by compilers while
1457 running configure, to aid debugging if configure makes a mistake.
1458
1459 It was created by suPHP $as_me 0.7.1, which was
1460 -generated by GNU Autoconf 2.61. Invocation command line was
1461 +generated by GNU Autoconf 2.63. Invocation command line was
1462
1463 $ $0 $@
1464
1465 @@ -1650,7 +1743,7 @@ for as_dir in $PATH
1466 do
1467 IFS=$as_save_IFS
1468 test -z "$as_dir" && as_dir=.
1469 - echo "PATH: $as_dir"
1470 + $as_echo "PATH: $as_dir"
1471 done
1472 IFS=$as_save_IFS
1473
1474 @@ -1685,7 +1778,7 @@ do
1475 | -silent | --silent | --silen | --sile | --sil)
1476 continue ;;
1477 *\'*)
1478 - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
1479 + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
1480 esac
1481 case $ac_pass in
1482 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
1483 @@ -1737,11 +1830,12 @@ _ASBOX
1484 case $ac_val in #(
1485 *${as_nl}*)
1486 case $ac_var in #(
1487 - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
1488 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
1489 + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
1490 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
1491 esac
1492 case $ac_var in #(
1493 _ | IFS | as_nl) ;; #(
1494 + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
1495 *) $as_unset $ac_var ;;
1496 esac ;;
1497 esac
1498 @@ -1771,9 +1865,9 @@ _ASBOX
1499 do
1500 eval ac_val=\$$ac_var
1501 case $ac_val in
1502 - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
1503 + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
1504 esac
1505 - echo "$ac_var='\''$ac_val'\''"
1506 + $as_echo "$ac_var='\''$ac_val'\''"
1507 done | sort
1508 echo
1509
1510 @@ -1788,9 +1882,9 @@ _ASBOX
1511 do
1512 eval ac_val=\$$ac_var
1513 case $ac_val in
1514 - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
1515 + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
1516 esac
1517 - echo "$ac_var='\''$ac_val'\''"
1518 + $as_echo "$ac_var='\''$ac_val'\''"
1519 done | sort
1520 echo
1521 fi
1522 @@ -1806,8 +1900,8 @@ _ASBOX
1523 echo
1524 fi
1525 test "$ac_signal" != 0 &&
1526 - echo "$as_me: caught signal $ac_signal"
1527 - echo "$as_me: exit $exit_status"
1528 + $as_echo "$as_me: caught signal $ac_signal"
1529 + $as_echo "$as_me: exit $exit_status"
1530 } >&5
1531 rm -f core *.core core.conftest.* &&
1532 rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
1533 @@ -1849,21 +1943,24 @@ _ACEOF
1534
1535
1536 # Let the site file select an alternate cache file if it wants to.
1537 -# Prefer explicitly selected file to automatically selected ones.
1538 +# Prefer an explicitly selected file to automatically selected ones.
1539 +ac_site_file1=NONE
1540 +ac_site_file2=NONE
1541 if test -n "$CONFIG_SITE"; then
1542 - set x "$CONFIG_SITE"
1543 + ac_site_file1=$CONFIG_SITE
1544 elif test "x$prefix" != xNONE; then
1545 - set x "$prefix/share/config.site" "$prefix/etc/config.site"
1546 + ac_site_file1=$prefix/share/config.site
1547 + ac_site_file2=$prefix/etc/config.site
1548 else
1549 - set x "$ac_default_prefix/share/config.site" \
1550 - "$ac_default_prefix/etc/config.site"
1551 + ac_site_file1=$ac_default_prefix/share/config.site
1552 + ac_site_file2=$ac_default_prefix/etc/config.site
1553 fi
1554 -shift
1555 -for ac_site_file
1556 +for ac_site_file in "$ac_site_file1" "$ac_site_file2"
1557 do
1558 + test "x$ac_site_file" = xNONE && continue
1559 if test -r "$ac_site_file"; then
1560 - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
1561 -echo "$as_me: loading site script $ac_site_file" >&6;}
1562 + { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
1563 +$as_echo "$as_me: loading site script $ac_site_file" >&6;}
1564 sed 's/^/| /' "$ac_site_file" >&5
1565 . "$ac_site_file"
1566 fi
1567 @@ -1873,16 +1970,16 @@ if test -r "$cache_file"; then
1568 # Some versions of bash will fail to source /dev/null (special
1569 # files actually), so we avoid doing that.
1570 if test -f "$cache_file"; then
1571 - { echo "$as_me:$LINENO: loading cache $cache_file" >&5
1572 -echo "$as_me: loading cache $cache_file" >&6;}
1573 + { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
1574 +$as_echo "$as_me: loading cache $cache_file" >&6;}
1575 case $cache_file in
1576 [\\/]* | ?:[\\/]* ) . "$cache_file";;
1577 *) . "./$cache_file";;
1578 esac
1579 fi
1580 else
1581 - { echo "$as_me:$LINENO: creating cache $cache_file" >&5
1582 -echo "$as_me: creating cache $cache_file" >&6;}
1583 + { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
1584 +$as_echo "$as_me: creating cache $cache_file" >&6;}
1585 >$cache_file
1586 fi
1587
1588 @@ -1896,29 +1993,38 @@ for ac_var in $ac_precious_vars; do
1589 eval ac_new_val=\$ac_env_${ac_var}_value
1590 case $ac_old_set,$ac_new_set in
1591 set,)
1592 - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
1593 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
1594 + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
1595 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
1596 ac_cache_corrupted=: ;;
1597 ,set)
1598 - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
1599 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
1600 + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
1601 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
1602 ac_cache_corrupted=: ;;
1603 ,);;
1604 *)
1605 if test "x$ac_old_val" != "x$ac_new_val"; then
1606 - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
1607 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
1608 - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
1609 -echo "$as_me: former value: $ac_old_val" >&2;}
1610 - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
1611 -echo "$as_me: current value: $ac_new_val" >&2;}
1612 - ac_cache_corrupted=:
1613 + # differences in whitespace do not lead to failure.
1614 + ac_old_val_w=`echo x $ac_old_val`
1615 + ac_new_val_w=`echo x $ac_new_val`
1616 + if test "$ac_old_val_w" != "$ac_new_val_w"; then
1617 + { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
1618 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
1619 + ac_cache_corrupted=:
1620 + else
1621 + { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
1622 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
1623 + eval $ac_var=\$ac_old_val
1624 + fi
1625 + { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
1626 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
1627 + { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
1628 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
1629 fi;;
1630 esac
1631 # Pass precious variables to config.status.
1632 if test "$ac_new_set" = set; then
1633 case $ac_new_val in
1634 - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
1635 + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
1636 *) ac_arg=$ac_var=$ac_new_val ;;
1637 esac
1638 case " $ac_configure_args " in
1639 @@ -1928,10 +2034,12 @@ echo "$as_me: current value: $ac_new_val" >&2;}
1640 fi
1641 done
1642 if $ac_cache_corrupted; then
1643 - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
1644 -echo "$as_me: error: changes in the environment can compromise the build" >&2;}
1645 - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
1646 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
1647 + { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
1648 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1649 + { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
1650 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
1651 + { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
1652 +$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
1653 { (exit 1); exit 1; }; }
1654 fi
1655
1656 @@ -1985,8 +2093,8 @@ for ac_dir in config "$srcdir"/config; do
1657 fi
1658 done
1659 if test -z "$ac_aux_dir"; then
1660 - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
1661 -echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
1662 + { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
1663 +$as_echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
1664 { (exit 1); exit 1; }; }
1665 fi
1666
1667 @@ -2000,8 +2108,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
1668
1669
1670
1671 -am__api_version='1.10'
1672 -
1673 +am__api_version="1.9"
1674 # Find a good install program. We prefer a C program (faster),
1675 # so one script is as good as another. But avoid the broken or
1676 # incompatible versions:
1677 @@ -2015,11 +2122,12 @@ am__api_version='1.10'
1678 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
1679 # OS/2's system install, which has a completely different semantic
1680 # ./install, which can be erroneously created by make from ./install.sh.
1681 -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
1682 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
1683 +# Reject install programs that cannot install multiple files.
1684 +{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
1685 +$as_echo_n "checking for a BSD-compatible install... " >&6; }
1686 if test -z "$INSTALL"; then
1687 if test "${ac_cv_path_install+set}" = set; then
1688 - echo $ECHO_N "(cached) $ECHO_C" >&6
1689 + $as_echo_n "(cached) " >&6
1690 else
1691 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1692 for as_dir in $PATH
1693 @@ -2048,17 +2156,29 @@ case $as_dir/ in
1694 # program-specific install script used by HP pwplus--don't use.
1695 :
1696 else
1697 - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
1698 - break 3
1699 + rm -rf conftest.one conftest.two conftest.dir
1700 + echo one > conftest.one
1701 + echo two > conftest.two
1702 + mkdir conftest.dir
1703 + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
1704 + test -s conftest.one && test -s conftest.two &&
1705 + test -s conftest.dir/conftest.one &&
1706 + test -s conftest.dir/conftest.two
1707 + then
1708 + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
1709 + break 3
1710 + fi
1711 fi
1712 fi
1713 done
1714 done
1715 ;;
1716 esac
1717 +
1718 done
1719 IFS=$as_save_IFS
1720
1721 +rm -rf conftest.one conftest.two conftest.dir
1722
1723 fi
1724 if test "${ac_cv_path_install+set}" = set; then
1725 @@ -2071,8 +2191,8 @@ fi
1726 INSTALL=$ac_install_sh
1727 fi
1728 fi
1729 -{ echo "$as_me:$LINENO: result: $INSTALL" >&5
1730 -echo "${ECHO_T}$INSTALL" >&6; }
1731 +{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
1732 +$as_echo "$INSTALL" >&6; }
1733
1734 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
1735 # It thinks the first close brace ends the variable substitution.
1736 @@ -2082,8 +2202,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
1737
1738 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
1739
1740 -{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
1741 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
1742 +{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
1743 +$as_echo_n "checking whether build environment is sane... " >&6; }
1744 # Just in case
1745 sleep 1
1746 echo timestamp > conftest.file
1747 @@ -2106,9 +2226,9 @@ if (
1748 # if, for instance, CONFIG_SHELL is bash and it inherits a
1749 # broken ls alias from the environment. This has actually
1750 # happened. Such a system could not be considered "sane".
1751 - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
1752 + { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
1753 alias in your environment" >&5
1754 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
1755 +$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
1756 alias in your environment" >&2;}
1757 { (exit 1); exit 1; }; }
1758 fi
1759 @@ -2119,26 +2239,23 @@ then
1760 # Ok.
1761 :
1762 else
1763 - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
1764 + { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
1765 Check your system clock" >&5
1766 -echo "$as_me: error: newly created file is older than distributed files!
1767 +$as_echo "$as_me: error: newly created file is older than distributed files!
1768 Check your system clock" >&2;}
1769 { (exit 1); exit 1; }; }
1770 fi
1771 -{ echo "$as_me:$LINENO: result: yes" >&5
1772 -echo "${ECHO_T}yes" >&6; }
1773 +{ $as_echo "$as_me:$LINENO: result: yes" >&5
1774 +$as_echo "yes" >&6; }
1775 test "$program_prefix" != NONE &&
1776 program_transform_name="s&^&$program_prefix&;$program_transform_name"
1777 # Use a double $ so make ignores it.
1778 test "$program_suffix" != NONE &&
1779 program_transform_name="s&\$&$program_suffix&;$program_transform_name"
1780 -# Double any \ or $. echo might interpret backslashes.
1781 +# Double any \ or $.
1782 # By default was `s,x,x', remove it if useless.
1783 -cat <<\_ACEOF >conftest.sed
1784 -s/[\\$]/&&/g;s/;s,x,x,$//
1785 -_ACEOF
1786 -program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
1787 -rm -f conftest.sed
1788 +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
1789 +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
1790
1791 # expand $ac_aux_dir to an absolute path
1792 am_aux_dir=`cd $ac_aux_dir && pwd`
1793 @@ -2149,66 +2266,51 @@ if eval "$MISSING --run true"; then
1794 am_missing_run="$MISSING --run "
1795 else
1796 am_missing_run=
1797 - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
1798 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
1799 -fi
1800 -
1801 -{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
1802 -echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
1803 -if test -z "$MKDIR_P"; then
1804 - if test "${ac_cv_path_mkdir+set}" = set; then
1805 - echo $ECHO_N "(cached) $ECHO_C" >&6
1806 -else
1807 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1808 -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
1809 -do
1810 - IFS=$as_save_IFS
1811 - test -z "$as_dir" && as_dir=.
1812 - for ac_prog in mkdir gmkdir; do
1813 - for ac_exec_ext in '' $ac_executable_extensions; do
1814 - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
1815 - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
1816 - 'mkdir (GNU coreutils) '* | \
1817 - 'mkdir (coreutils) '* | \
1818 - 'mkdir (fileutils) '4.1*)
1819 - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
1820 - break 3;;
1821 - esac
1822 - done
1823 - done
1824 -done
1825 -IFS=$as_save_IFS
1826 -
1827 -fi
1828 -
1829 - if test "${ac_cv_path_mkdir+set}" = set; then
1830 - MKDIR_P="$ac_cv_path_mkdir -p"
1831 + { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
1832 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
1833 +fi
1834 +
1835 +if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
1836 + # We used to keeping the `.' as first argument, in order to
1837 + # allow $(mkdir_p) to be used without argument. As in
1838 + # $(mkdir_p) $(somedir)
1839 + # where $(somedir) is conditionally defined. However this is wrong
1840 + # for two reasons:
1841 + # 1. if the package is installed by a user who cannot write `.'
1842 + # make install will fail,
1843 + # 2. the above comment should most certainly read
1844 + # $(mkdir_p) $(DESTDIR)$(somedir)
1845 + # so it does not work when $(somedir) is undefined and
1846 + # $(DESTDIR) is not.
1847 + # To support the latter case, we have to write
1848 + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
1849 + # so the `.' trick is pointless.
1850 + mkdir_p='mkdir -p --'
1851 +else
1852 + # On NextStep and OpenStep, the `mkdir' command does not
1853 + # recognize any option. It will interpret all options as
1854 + # directories to create, and then abort because `.' already
1855 + # exists.
1856 + for d in ./-p ./--version;
1857 + do
1858 + test -d $d && rmdir $d
1859 + done
1860 + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
1861 + if test -f "$ac_aux_dir/mkinstalldirs"; then
1862 + mkdir_p='$(mkinstalldirs)'
1863 else
1864 - # As a last resort, use the slow shell script. Don't cache a
1865 - # value for MKDIR_P within a source directory, because that will
1866 - # break other packages using the cache if that directory is
1867 - # removed, or if the value is a relative name.
1868 - test -d ./--version && rmdir ./--version
1869 - MKDIR_P="$ac_install_sh -d"
1870 + mkdir_p='$(install_sh) -d'
1871 fi
1872 fi
1873 -{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
1874 -echo "${ECHO_T}$MKDIR_P" >&6; }
1875 -
1876 -mkdir_p="$MKDIR_P"
1877 -case $mkdir_p in
1878 - [\\/$]* | ?:[\\/]*) ;;
1879 - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
1880 -esac
1881
1882 for ac_prog in gawk mawk nawk awk
1883 do
1884 # Extract the first word of "$ac_prog", so it can be a program name with args.
1885 set dummy $ac_prog; ac_word=$2
1886 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1887 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1888 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1889 +$as_echo_n "checking for $ac_word... " >&6; }
1890 if test "${ac_cv_prog_AWK+set}" = set; then
1891 - echo $ECHO_N "(cached) $ECHO_C" >&6
1892 + $as_echo_n "(cached) " >&6
1893 else
1894 if test -n "$AWK"; then
1895 ac_cv_prog_AWK="$AWK" # Let the user override the test.
1896 @@ -2221,7 +2323,7 @@ do
1897 for ac_exec_ext in '' $ac_executable_extensions; do
1898 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1899 ac_cv_prog_AWK="$ac_prog"
1900 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1901 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1902 break 2
1903 fi
1904 done
1905 @@ -2232,22 +2334,23 @@ fi
1906 fi
1907 AWK=$ac_cv_prog_AWK
1908 if test -n "$AWK"; then
1909 - { echo "$as_me:$LINENO: result: $AWK" >&5
1910 -echo "${ECHO_T}$AWK" >&6; }
1911 + { $as_echo "$as_me:$LINENO: result: $AWK" >&5
1912 +$as_echo "$AWK" >&6; }
1913 else
1914 - { echo "$as_me:$LINENO: result: no" >&5
1915 -echo "${ECHO_T}no" >&6; }
1916 + { $as_echo "$as_me:$LINENO: result: no" >&5
1917 +$as_echo "no" >&6; }
1918 fi
1919
1920
1921 test -n "$AWK" && break
1922 done
1923
1924 -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
1925 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
1926 -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
1927 +{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
1928 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
1929 +set x ${MAKE-make}
1930 +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
1931 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
1932 - echo $ECHO_N "(cached) $ECHO_C" >&6
1933 + $as_echo_n "(cached) " >&6
1934 else
1935 cat >conftest.make <<\_ACEOF
1936 SHELL = /bin/sh
1937 @@ -2264,12 +2367,12 @@ esac
1938 rm -f conftest.make
1939 fi
1940 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
1941 - { echo "$as_me:$LINENO: result: yes" >&5
1942 -echo "${ECHO_T}yes" >&6; }
1943 + { $as_echo "$as_me:$LINENO: result: yes" >&5
1944 +$as_echo "yes" >&6; }
1945 SET_MAKE=
1946 else
1947 - { echo "$as_me:$LINENO: result: no" >&5
1948 -echo "${ECHO_T}no" >&6; }
1949 + { $as_echo "$as_me:$LINENO: result: no" >&5
1950 +$as_echo "no" >&6; }
1951 SET_MAKE="MAKE=${MAKE-make}"
1952 fi
1953
1954 @@ -2282,16 +2385,12 @@ else
1955 fi
1956 rmdir .tst 2>/dev/null
1957
1958 -if test "`cd $srcdir && pwd`" != "`pwd`"; then
1959 - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
1960 - # is not polluted with repeated "-I."
1961 - am__isrc=' -I$(srcdir)'
1962 - # test to see if srcdir already configured
1963 - if test -f $srcdir/config.status; then
1964 - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
1965 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
1966 +# test to see if srcdir already configured
1967 +if test "`cd $srcdir && pwd`" != "`pwd`" &&
1968 + test -f $srcdir/config.status; then
1969 + { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
1970 +$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
1971 { (exit 1); exit 1; }; }
1972 - fi
1973 fi
1974
1975 # test whether we have cygpath
1976 @@ -2334,7 +2433,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
1977
1978 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
1979
1980 -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
1981 +install_sh=${install_sh-"$am_aux_dir/install-sh"}
1982
1983 # Installed binaries are usually stripped using `strip' when the user
1984 # run `make install-strip'. However `strip' might not be the right
1985 @@ -2344,10 +2443,10 @@ if test "$cross_compiling" != no; then
1986 if test -n "$ac_tool_prefix"; then
1987 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
1988 set dummy ${ac_tool_prefix}strip; ac_word=$2
1989 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1990 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1991 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1992 +$as_echo_n "checking for $ac_word... " >&6; }
1993 if test "${ac_cv_prog_STRIP+set}" = set; then
1994 - echo $ECHO_N "(cached) $ECHO_C" >&6
1995 + $as_echo_n "(cached) " >&6
1996 else
1997 if test -n "$STRIP"; then
1998 ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
1999 @@ -2360,7 +2459,7 @@ do
2000 for ac_exec_ext in '' $ac_executable_extensions; do
2001 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2002 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
2003 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2004 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2005 break 2
2006 fi
2007 done
2008 @@ -2371,11 +2470,11 @@ fi
2009 fi
2010 STRIP=$ac_cv_prog_STRIP
2011 if test -n "$STRIP"; then
2012 - { echo "$as_me:$LINENO: result: $STRIP" >&5
2013 -echo "${ECHO_T}$STRIP" >&6; }
2014 + { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
2015 +$as_echo "$STRIP" >&6; }
2016 else
2017 - { echo "$as_me:$LINENO: result: no" >&5
2018 -echo "${ECHO_T}no" >&6; }
2019 + { $as_echo "$as_me:$LINENO: result: no" >&5
2020 +$as_echo "no" >&6; }
2021 fi
2022
2023
2024 @@ -2384,10 +2483,10 @@ if test -z "$ac_cv_prog_STRIP"; then
2025 ac_ct_STRIP=$STRIP
2026 # Extract the first word of "strip", so it can be a program name with args.
2027 set dummy strip; ac_word=$2
2028 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2029 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2030 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2031 +$as_echo_n "checking for $ac_word... " >&6; }
2032 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
2033 - echo $ECHO_N "(cached) $ECHO_C" >&6
2034 + $as_echo_n "(cached) " >&6
2035 else
2036 if test -n "$ac_ct_STRIP"; then
2037 ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
2038 @@ -2400,7 +2499,7 @@ do
2039 for ac_exec_ext in '' $ac_executable_extensions; do
2040 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2041 ac_cv_prog_ac_ct_STRIP="strip"
2042 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2043 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2044 break 2
2045 fi
2046 done
2047 @@ -2411,11 +2510,11 @@ fi
2048 fi
2049 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
2050 if test -n "$ac_ct_STRIP"; then
2051 - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
2052 -echo "${ECHO_T}$ac_ct_STRIP" >&6; }
2053 + { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
2054 +$as_echo "$ac_ct_STRIP" >&6; }
2055 else
2056 - { echo "$as_me:$LINENO: result: no" >&5
2057 -echo "${ECHO_T}no" >&6; }
2058 + { $as_echo "$as_me:$LINENO: result: no" >&5
2059 +$as_echo "no" >&6; }
2060 fi
2061
2062 if test "x$ac_ct_STRIP" = x; then
2063 @@ -2423,12 +2522,8 @@ fi
2064 else
2065 case $cross_compiling:$ac_tool_warned in
2066 yes:)
2067 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
2068 -whose name does not start with the host triplet. If you think this
2069 -configuration is useful to you, please write to autoconf@gnu.org." >&5
2070 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
2071 -whose name does not start with the host triplet. If you think this
2072 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
2073 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
2074 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2075 ac_tool_warned=yes ;;
2076 esac
2077 STRIP=$ac_ct_STRIP
2078 @@ -2438,7 +2533,7 @@ else
2079 fi
2080
2081 fi
2082 -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
2083 +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
2084
2085 # We need awk for the "check" target. The system "awk" is bad on
2086 # some platforms.
2087 @@ -2459,8 +2554,8 @@ ac_config_headers="$ac_config_headers src/config.h"
2088
2089
2090 # Build time sanity check
2091 -{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
2092 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
2093 +{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
2094 +$as_echo_n "checking whether build environment is sane... " >&6; }
2095 # Just in case
2096 sleep 1
2097 echo timestamp > conftest.file
2098 @@ -2483,9 +2578,9 @@ if (
2099 # if, for instance, CONFIG_SHELL is bash and it inherits a
2100 # broken ls alias from the environment. This has actually
2101 # happened. Such a system could not be considered "sane".
2102 - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
2103 + { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
2104 alias in your environment" >&5
2105 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
2106 +$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
2107 alias in your environment" >&2;}
2108 { (exit 1); exit 1; }; }
2109 fi
2110 @@ -2496,14 +2591,14 @@ then
2111 # Ok.
2112 :
2113 else
2114 - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
2115 + { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
2116 Check your system clock" >&5
2117 -echo "$as_me: error: newly created file is older than distributed files!
2118 +$as_echo "$as_me: error: newly created file is older than distributed files!
2119 Check your system clock" >&2;}
2120 { (exit 1); exit 1; }; }
2121 fi
2122 -{ echo "$as_me:$LINENO: result: yes" >&5
2123 -echo "${ECHO_T}yes" >&6; }
2124 +{ $as_echo "$as_me:$LINENO: result: yes" >&5
2125 +$as_echo "yes" >&6; }
2126
2127 # Look for install program
2128 # Find a good install program. We prefer a C program (faster),
2129 @@ -2519,11 +2614,12 @@ echo "${ECHO_T}yes" >&6; }
2130 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
2131 # OS/2's system install, which has a completely different semantic
2132 # ./install, which can be erroneously created by make from ./install.sh.
2133 -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
2134 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
2135 +# Reject install programs that cannot install multiple files.
2136 +{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
2137 +$as_echo_n "checking for a BSD-compatible install... " >&6; }
2138 if test -z "$INSTALL"; then
2139 if test "${ac_cv_path_install+set}" = set; then
2140 - echo $ECHO_N "(cached) $ECHO_C" >&6
2141 + $as_echo_n "(cached) " >&6
2142 else
2143 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2144 for as_dir in $PATH
2145 @@ -2552,17 +2648,29 @@ case $as_dir/ in
2146 # program-specific install script used by HP pwplus--don't use.
2147 :
2148 else
2149 - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
2150 - break 3
2151 + rm -rf conftest.one conftest.two conftest.dir
2152 + echo one > conftest.one
2153 + echo two > conftest.two
2154 + mkdir conftest.dir
2155 + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
2156 + test -s conftest.one && test -s conftest.two &&
2157 + test -s conftest.dir/conftest.one &&
2158 + test -s conftest.dir/conftest.two
2159 + then
2160 + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
2161 + break 3
2162 + fi
2163 fi
2164 fi
2165 done
2166 done
2167 ;;
2168 esac
2169 +
2170 done
2171 IFS=$as_save_IFS
2172
2173 +rm -rf conftest.one conftest.two conftest.dir
2174
2175 fi
2176 if test "${ac_cv_path_install+set}" = set; then
2177 @@ -2575,8 +2683,8 @@ fi
2178 INSTALL=$ac_install_sh
2179 fi
2180 fi
2181 -{ echo "$as_me:$LINENO: result: $INSTALL" >&5
2182 -echo "${ECHO_T}$INSTALL" >&6; }
2183 +{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
2184 +$as_echo "$INSTALL" >&6; }
2185
2186 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
2187 # It thinks the first close brace ends the variable substitution.
2188 @@ -2596,10 +2704,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
2189 if test -n "$ac_tool_prefix"; then
2190 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
2191 set dummy ${ac_tool_prefix}gcc; ac_word=$2
2192 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2193 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2194 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2195 +$as_echo_n "checking for $ac_word... " >&6; }
2196 if test "${ac_cv_prog_CC+set}" = set; then
2197 - echo $ECHO_N "(cached) $ECHO_C" >&6
2198 + $as_echo_n "(cached) " >&6
2199 else
2200 if test -n "$CC"; then
2201 ac_cv_prog_CC="$CC" # Let the user override the test.
2202 @@ -2612,7 +2720,7 @@ do
2203 for ac_exec_ext in '' $ac_executable_extensions; do
2204 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2205 ac_cv_prog_CC="${ac_tool_prefix}gcc"
2206 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2207 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2208 break 2
2209 fi
2210 done
2211 @@ -2623,11 +2731,11 @@ fi
2212 fi
2213 CC=$ac_cv_prog_CC
2214 if test -n "$CC"; then
2215 - { echo "$as_me:$LINENO: result: $CC" >&5
2216 -echo "${ECHO_T}$CC" >&6; }
2217 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
2218 +$as_echo "$CC" >&6; }
2219 else
2220 - { echo "$as_me:$LINENO: result: no" >&5
2221 -echo "${ECHO_T}no" >&6; }
2222 + { $as_echo "$as_me:$LINENO: result: no" >&5
2223 +$as_echo "no" >&6; }
2224 fi
2225
2226
2227 @@ -2636,10 +2744,10 @@ if test -z "$ac_cv_prog_CC"; then
2228 ac_ct_CC=$CC
2229 # Extract the first word of "gcc", so it can be a program name with args.
2230 set dummy gcc; ac_word=$2
2231 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2232 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2233 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2234 +$as_echo_n "checking for $ac_word... " >&6; }
2235 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
2236 - echo $ECHO_N "(cached) $ECHO_C" >&6
2237 + $as_echo_n "(cached) " >&6
2238 else
2239 if test -n "$ac_ct_CC"; then
2240 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
2241 @@ -2652,7 +2760,7 @@ do
2242 for ac_exec_ext in '' $ac_executable_extensions; do
2243 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2244 ac_cv_prog_ac_ct_CC="gcc"
2245 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2246 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2247 break 2
2248 fi
2249 done
2250 @@ -2663,11 +2771,11 @@ fi
2251 fi
2252 ac_ct_CC=$ac_cv_prog_ac_ct_CC
2253 if test -n "$ac_ct_CC"; then
2254 - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
2255 -echo "${ECHO_T}$ac_ct_CC" >&6; }
2256 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
2257 +$as_echo "$ac_ct_CC" >&6; }
2258 else
2259 - { echo "$as_me:$LINENO: result: no" >&5
2260 -echo "${ECHO_T}no" >&6; }
2261 + { $as_echo "$as_me:$LINENO: result: no" >&5
2262 +$as_echo "no" >&6; }
2263 fi
2264
2265 if test "x$ac_ct_CC" = x; then
2266 @@ -2675,12 +2783,8 @@ fi
2267 else
2268 case $cross_compiling:$ac_tool_warned in
2269 yes:)
2270 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
2271 -whose name does not start with the host triplet. If you think this
2272 -configuration is useful to you, please write to autoconf@gnu.org." >&5
2273 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
2274 -whose name does not start with the host triplet. If you think this
2275 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
2276 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
2277 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2278 ac_tool_warned=yes ;;
2279 esac
2280 CC=$ac_ct_CC
2281 @@ -2693,10 +2797,10 @@ if test -z "$CC"; then
2282 if test -n "$ac_tool_prefix"; then
2283 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
2284 set dummy ${ac_tool_prefix}cc; ac_word=$2
2285 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2286 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2287 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2288 +$as_echo_n "checking for $ac_word... " >&6; }
2289 if test "${ac_cv_prog_CC+set}" = set; then
2290 - echo $ECHO_N "(cached) $ECHO_C" >&6
2291 + $as_echo_n "(cached) " >&6
2292 else
2293 if test -n "$CC"; then
2294 ac_cv_prog_CC="$CC" # Let the user override the test.
2295 @@ -2709,7 +2813,7 @@ do
2296 for ac_exec_ext in '' $ac_executable_extensions; do
2297 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2298 ac_cv_prog_CC="${ac_tool_prefix}cc"
2299 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2300 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2301 break 2
2302 fi
2303 done
2304 @@ -2720,11 +2824,11 @@ fi
2305 fi
2306 CC=$ac_cv_prog_CC
2307 if test -n "$CC"; then
2308 - { echo "$as_me:$LINENO: result: $CC" >&5
2309 -echo "${ECHO_T}$CC" >&6; }
2310 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
2311 +$as_echo "$CC" >&6; }
2312 else
2313 - { echo "$as_me:$LINENO: result: no" >&5
2314 -echo "${ECHO_T}no" >&6; }
2315 + { $as_echo "$as_me:$LINENO: result: no" >&5
2316 +$as_echo "no" >&6; }
2317 fi
2318
2319
2320 @@ -2733,10 +2837,10 @@ fi
2321 if test -z "$CC"; then
2322 # Extract the first word of "cc", so it can be a program name with args.
2323 set dummy cc; ac_word=$2
2324 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2325 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2326 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2327 +$as_echo_n "checking for $ac_word... " >&6; }
2328 if test "${ac_cv_prog_CC+set}" = set; then
2329 - echo $ECHO_N "(cached) $ECHO_C" >&6
2330 + $as_echo_n "(cached) " >&6
2331 else
2332 if test -n "$CC"; then
2333 ac_cv_prog_CC="$CC" # Let the user override the test.
2334 @@ -2754,7 +2858,7 @@ do
2335 continue
2336 fi
2337 ac_cv_prog_CC="cc"
2338 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2339 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2340 break 2
2341 fi
2342 done
2343 @@ -2777,11 +2881,11 @@ fi
2344 fi
2345 CC=$ac_cv_prog_CC
2346 if test -n "$CC"; then
2347 - { echo "$as_me:$LINENO: result: $CC" >&5
2348 -echo "${ECHO_T}$CC" >&6; }
2349 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
2350 +$as_echo "$CC" >&6; }
2351 else
2352 - { echo "$as_me:$LINENO: result: no" >&5
2353 -echo "${ECHO_T}no" >&6; }
2354 + { $as_echo "$as_me:$LINENO: result: no" >&5
2355 +$as_echo "no" >&6; }
2356 fi
2357
2358
2359 @@ -2792,10 +2896,10 @@ if test -z "$CC"; then
2360 do
2361 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
2362 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
2363 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2364 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2365 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2366 +$as_echo_n "checking for $ac_word... " >&6; }
2367 if test "${ac_cv_prog_CC+set}" = set; then
2368 - echo $ECHO_N "(cached) $ECHO_C" >&6
2369 + $as_echo_n "(cached) " >&6
2370 else
2371 if test -n "$CC"; then
2372 ac_cv_prog_CC="$CC" # Let the user override the test.
2373 @@ -2808,7 +2912,7 @@ do
2374 for ac_exec_ext in '' $ac_executable_extensions; do
2375 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2376 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
2377 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2378 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2379 break 2
2380 fi
2381 done
2382 @@ -2819,11 +2923,11 @@ fi
2383 fi
2384 CC=$ac_cv_prog_CC
2385 if test -n "$CC"; then
2386 - { echo "$as_me:$LINENO: result: $CC" >&5
2387 -echo "${ECHO_T}$CC" >&6; }
2388 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
2389 +$as_echo "$CC" >&6; }
2390 else
2391 - { echo "$as_me:$LINENO: result: no" >&5
2392 -echo "${ECHO_T}no" >&6; }
2393 + { $as_echo "$as_me:$LINENO: result: no" >&5
2394 +$as_echo "no" >&6; }
2395 fi
2396
2397
2398 @@ -2836,10 +2940,10 @@ if test -z "$CC"; then
2399 do
2400 # Extract the first word of "$ac_prog", so it can be a program name with args.
2401 set dummy $ac_prog; ac_word=$2
2402 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2403 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2404 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2405 +$as_echo_n "checking for $ac_word... " >&6; }
2406 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
2407 - echo $ECHO_N "(cached) $ECHO_C" >&6
2408 + $as_echo_n "(cached) " >&6
2409 else
2410 if test -n "$ac_ct_CC"; then
2411 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
2412 @@ -2852,7 +2956,7 @@ do
2413 for ac_exec_ext in '' $ac_executable_extensions; do
2414 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2415 ac_cv_prog_ac_ct_CC="$ac_prog"
2416 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2417 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2418 break 2
2419 fi
2420 done
2421 @@ -2863,11 +2967,11 @@ fi
2422 fi
2423 ac_ct_CC=$ac_cv_prog_ac_ct_CC
2424 if test -n "$ac_ct_CC"; then
2425 - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
2426 -echo "${ECHO_T}$ac_ct_CC" >&6; }
2427 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
2428 +$as_echo "$ac_ct_CC" >&6; }
2429 else
2430 - { echo "$as_me:$LINENO: result: no" >&5
2431 -echo "${ECHO_T}no" >&6; }
2432 + { $as_echo "$as_me:$LINENO: result: no" >&5
2433 +$as_echo "no" >&6; }
2434 fi
2435
2436
2437 @@ -2879,12 +2983,8 @@ done
2438 else
2439 case $cross_compiling:$ac_tool_warned in
2440 yes:)
2441 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
2442 -whose name does not start with the host triplet. If you think this
2443 -configuration is useful to you, please write to autoconf@gnu.org." >&5
2444 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
2445 -whose name does not start with the host triplet. If you think this
2446 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
2447 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
2448 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2449 ac_tool_warned=yes ;;
2450 esac
2451 CC=$ac_ct_CC
2452 @@ -2894,44 +2994,50 @@ fi
2453 fi
2454
2455
2456 -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
2457 +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2458 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2459 +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
2460 See \`config.log' for more details." >&5
2461 -echo "$as_me: error: no acceptable C compiler found in \$PATH
2462 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
2463 See \`config.log' for more details." >&2;}
2464 - { (exit 1); exit 1; }; }
2465 + { (exit 1); exit 1; }; }; }
2466
2467 # Provide some information about the compiler.
2468 -echo "$as_me:$LINENO: checking for C compiler version" >&5
2469 -ac_compiler=`set X $ac_compile; echo $2`
2470 +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
2471 +set X $ac_compile
2472 +ac_compiler=$2
2473 { (ac_try="$ac_compiler --version >&5"
2474 case "(($ac_try" in
2475 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2476 *) ac_try_echo=$ac_try;;
2477 esac
2478 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2479 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2480 +$as_echo "$ac_try_echo") >&5
2481 (eval "$ac_compiler --version >&5") 2>&5
2482 ac_status=$?
2483 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2484 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2485 (exit $ac_status); }
2486 { (ac_try="$ac_compiler -v >&5"
2487 case "(($ac_try" in
2488 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2489 *) ac_try_echo=$ac_try;;
2490 esac
2491 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2492 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2493 +$as_echo "$ac_try_echo") >&5
2494 (eval "$ac_compiler -v >&5") 2>&5
2495 ac_status=$?
2496 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2497 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2498 (exit $ac_status); }
2499 { (ac_try="$ac_compiler -V >&5"
2500 case "(($ac_try" in
2501 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2502 *) ac_try_echo=$ac_try;;
2503 esac
2504 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2505 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2506 +$as_echo "$ac_try_echo") >&5
2507 (eval "$ac_compiler -V >&5") 2>&5
2508 ac_status=$?
2509 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2510 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2511 (exit $ac_status); }
2512
2513 cat >conftest.$ac_ext <<_ACEOF
2514 @@ -2950,27 +3056,22 @@ main ()
2515 }
2516 _ACEOF
2517 ac_clean_files_save=$ac_clean_files
2518 -ac_clean_files="$ac_clean_files a.out a.exe b.out"
2519 +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
2520 # Try to create an executable without -o first, disregard a.out.
2521 # It will help us diagnose broken compilers, and finding out an intuition
2522 # of exeext.
2523 -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
2524 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
2525 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
2526 -#
2527 -# List of possible output files, starting from the most likely.
2528 -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
2529 -# only as a last resort. b.out is created by i960 compilers.
2530 -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
2531 -#
2532 -# The IRIX 6 linker writes into existing files which may not be
2533 -# executable, retaining their permissions. Remove them first so a
2534 -# subsequent execution test works.
2535 +{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
2536 +$as_echo_n "checking for C compiler default output file name... " >&6; }
2537 +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
2538 +
2539 +# The possible output files:
2540 +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
2541 +
2542 ac_rmfiles=
2543 for ac_file in $ac_files
2544 do
2545 case $ac_file in
2546 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
2547 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
2548 * ) ac_rmfiles="$ac_rmfiles $ac_file";;
2549 esac
2550 done
2551 @@ -2981,10 +3082,11 @@ case "(($ac_try" in
2552 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2553 *) ac_try_echo=$ac_try;;
2554 esac
2555 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2556 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2557 +$as_echo "$ac_try_echo") >&5
2558 (eval "$ac_link_default") 2>&5
2559 ac_status=$?
2560 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2561 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2562 (exit $ac_status); }; then
2563 # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
2564 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
2565 @@ -2995,7 +3097,7 @@ for ac_file in $ac_files ''
2566 do
2567 test -f "$ac_file" || continue
2568 case $ac_file in
2569 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
2570 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
2571 ;;
2572 [ab].out )
2573 # We found the default executable, but exeext='' is most
2574 @@ -3022,25 +3124,27 @@ else
2575 ac_file=''
2576 fi
2577
2578 -{ echo "$as_me:$LINENO: result: $ac_file" >&5
2579 -echo "${ECHO_T}$ac_file" >&6; }
2580 +{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
2581 +$as_echo "$ac_file" >&6; }
2582 if test -z "$ac_file"; then
2583 - echo "$as_me: failed program was:" >&5
2584 + $as_echo "$as_me: failed program was:" >&5
2585 sed 's/^/| /' conftest.$ac_ext >&5
2586
2587 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
2588 +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2589 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2590 +{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
2591 See \`config.log' for more details." >&5
2592 -echo "$as_me: error: C compiler cannot create executables
2593 +$as_echo "$as_me: error: C compiler cannot create executables
2594 See \`config.log' for more details." >&2;}
2595 - { (exit 77); exit 77; }; }
2596 + { (exit 77); exit 77; }; }; }
2597 fi
2598
2599 ac_exeext=$ac_cv_exeext
2600
2601 # Check that the compiler produces executables we can run. If not, either
2602 # the compiler is broken, or we cross compile.
2603 -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
2604 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
2605 +{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
2606 +$as_echo_n "checking whether the C compiler works... " >&6; }
2607 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
2608 # If not cross compiling, check that we can run a simple program.
2609 if test "$cross_compiling" != yes; then
2610 @@ -3049,49 +3153,53 @@ if test "$cross_compiling" != yes; then
2611 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2612 *) ac_try_echo=$ac_try;;
2613 esac
2614 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2615 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2616 +$as_echo "$ac_try_echo") >&5
2617 (eval "$ac_try") 2>&5
2618 ac_status=$?
2619 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2620 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2621 (exit $ac_status); }; }; then
2622 cross_compiling=no
2623 else
2624 if test "$cross_compiling" = maybe; then
2625 cross_compiling=yes
2626 else
2627 - { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
2628 + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2629 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2630 +{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
2631 If you meant to cross compile, use \`--host'.
2632 See \`config.log' for more details." >&5
2633 -echo "$as_me: error: cannot run C compiled programs.
2634 +$as_echo "$as_me: error: cannot run C compiled programs.
2635 If you meant to cross compile, use \`--host'.
2636 See \`config.log' for more details." >&2;}
2637 - { (exit 1); exit 1; }; }
2638 + { (exit 1); exit 1; }; }; }
2639 fi
2640 fi
2641 fi
2642 -{ echo "$as_me:$LINENO: result: yes" >&5
2643 -echo "${ECHO_T}yes" >&6; }
2644 +{ $as_echo "$as_me:$LINENO: result: yes" >&5
2645 +$as_echo "yes" >&6; }
2646
2647 -rm -f a.out a.exe conftest$ac_cv_exeext b.out
2648 +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
2649 ac_clean_files=$ac_clean_files_save
2650 # Check that the compiler produces executables we can run. If not, either
2651 # the compiler is broken, or we cross compile.
2652 -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
2653 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
2654 -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
2655 -echo "${ECHO_T}$cross_compiling" >&6; }
2656 +{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
2657 +$as_echo_n "checking whether we are cross compiling... " >&6; }
2658 +{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
2659 +$as_echo "$cross_compiling" >&6; }
2660
2661 -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
2662 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
2663 +{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
2664 +$as_echo_n "checking for suffix of executables... " >&6; }
2665 if { (ac_try="$ac_link"
2666 case "(($ac_try" in
2667 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2668 *) ac_try_echo=$ac_try;;
2669 esac
2670 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2671 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2672 +$as_echo "$ac_try_echo") >&5
2673 (eval "$ac_link") 2>&5
2674 ac_status=$?
2675 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2676 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2677 (exit $ac_status); }; then
2678 # If both `conftest.exe' and `conftest' are `present' (well, observable)
2679 # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
2680 @@ -3100,31 +3208,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2681 for ac_file in conftest.exe conftest conftest.*; do
2682 test -f "$ac_file" || continue
2683 case $ac_file in
2684 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
2685 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
2686 *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
2687 break;;
2688 * ) break;;
2689 esac
2690 done
2691 else
2692 - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
2693 + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2694 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2695 +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
2696 See \`config.log' for more details." >&5
2697 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
2698 +$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
2699 See \`config.log' for more details." >&2;}
2700 - { (exit 1); exit 1; }; }
2701 + { (exit 1); exit 1; }; }; }
2702 fi
2703
2704 rm -f conftest$ac_cv_exeext
2705 -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
2706 -echo "${ECHO_T}$ac_cv_exeext" >&6; }
2707 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
2708 +$as_echo "$ac_cv_exeext" >&6; }
2709
2710 rm -f conftest.$ac_ext
2711 EXEEXT=$ac_cv_exeext
2712 ac_exeext=$EXEEXT
2713 -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
2714 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
2715 +{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
2716 +$as_echo_n "checking for suffix of object files... " >&6; }
2717 if test "${ac_cv_objext+set}" = set; then
2718 - echo $ECHO_N "(cached) $ECHO_C" >&6
2719 + $as_echo_n "(cached) " >&6
2720 else
2721 cat >conftest.$ac_ext <<_ACEOF
2722 /* confdefs.h. */
2723 @@ -3147,40 +3257,43 @@ case "(($ac_try" in
2724 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2725 *) ac_try_echo=$ac_try;;
2726 esac
2727 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2728 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2729 +$as_echo "$ac_try_echo") >&5
2730 (eval "$ac_compile") 2>&5
2731 ac_status=$?
2732 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2733 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2734 (exit $ac_status); }; then
2735 for ac_file in conftest.o conftest.obj conftest.*; do
2736 test -f "$ac_file" || continue;
2737 case $ac_file in
2738 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
2739 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
2740 *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
2741 break;;
2742 esac
2743 done
2744 else
2745 - echo "$as_me: failed program was:" >&5
2746 + $as_echo "$as_me: failed program was:" >&5
2747 sed 's/^/| /' conftest.$ac_ext >&5
2748
2749 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
2750 +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2751 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2752 +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
2753 See \`config.log' for more details." >&5
2754 -echo "$as_me: error: cannot compute suffix of object files: cannot compile
2755 +$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
2756 See \`config.log' for more details." >&2;}
2757 - { (exit 1); exit 1; }; }
2758 + { (exit 1); exit 1; }; }; }
2759 fi
2760
2761 rm -f conftest.$ac_cv_objext conftest.$ac_ext
2762 fi
2763 -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
2764 -echo "${ECHO_T}$ac_cv_objext" >&6; }
2765 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
2766 +$as_echo "$ac_cv_objext" >&6; }
2767 OBJEXT=$ac_cv_objext
2768 ac_objext=$OBJEXT
2769 -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
2770 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
2771 +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
2772 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
2773 if test "${ac_cv_c_compiler_gnu+set}" = set; then
2774 - echo $ECHO_N "(cached) $ECHO_C" >&6
2775 + $as_echo_n "(cached) " >&6
2776 else
2777 cat >conftest.$ac_ext <<_ACEOF
2778 /* confdefs.h. */
2779 @@ -3206,20 +3319,21 @@ case "(($ac_try" in
2780 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2781 *) ac_try_echo=$ac_try;;
2782 esac
2783 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2784 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2785 +$as_echo "$ac_try_echo") >&5
2786 (eval "$ac_compile") 2>conftest.er1
2787 ac_status=$?
2788 grep -v '^ *+' conftest.er1 >conftest.err
2789 rm -f conftest.er1
2790 cat conftest.err >&5
2791 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2792 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2793 (exit $ac_status); } && {
2794 test -z "$ac_c_werror_flag" ||
2795 test ! -s conftest.err
2796 } && test -s conftest.$ac_objext; then
2797 ac_compiler_gnu=yes
2798 else
2799 - echo "$as_me: failed program was:" >&5
2800 + $as_echo "$as_me: failed program was:" >&5
2801 sed 's/^/| /' conftest.$ac_ext >&5
2802
2803 ac_compiler_gnu=no
2804 @@ -3229,15 +3343,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2805 ac_cv_c_compiler_gnu=$ac_compiler_gnu
2806
2807 fi
2808 -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
2809 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
2810 -GCC=`test $ac_compiler_gnu = yes && echo yes`
2811 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
2812 +$as_echo "$ac_cv_c_compiler_gnu" >&6; }
2813 +if test $ac_compiler_gnu = yes; then
2814 + GCC=yes
2815 +else
2816 + GCC=
2817 +fi
2818 ac_test_CFLAGS=${CFLAGS+set}
2819 ac_save_CFLAGS=$CFLAGS
2820 -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
2821 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
2822 +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
2823 +$as_echo_n "checking whether $CC accepts -g... " >&6; }
2824 if test "${ac_cv_prog_cc_g+set}" = set; then
2825 - echo $ECHO_N "(cached) $ECHO_C" >&6
2826 + $as_echo_n "(cached) " >&6
2827 else
2828 ac_save_c_werror_flag=$ac_c_werror_flag
2829 ac_c_werror_flag=yes
2830 @@ -3264,20 +3382,21 @@ case "(($ac_try" in
2831 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2832 *) ac_try_echo=$ac_try;;
2833 esac
2834 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2835 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2836 +$as_echo "$ac_try_echo") >&5
2837 (eval "$ac_compile") 2>conftest.er1
2838 ac_status=$?
2839 grep -v '^ *+' conftest.er1 >conftest.err
2840 rm -f conftest.er1
2841 cat conftest.err >&5
2842 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2843 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2844 (exit $ac_status); } && {
2845 test -z "$ac_c_werror_flag" ||
2846 test ! -s conftest.err
2847 } && test -s conftest.$ac_objext; then
2848 ac_cv_prog_cc_g=yes
2849 else
2850 - echo "$as_me: failed program was:" >&5
2851 + $as_echo "$as_me: failed program was:" >&5
2852 sed 's/^/| /' conftest.$ac_ext >&5
2853
2854 CFLAGS=""
2855 @@ -3302,20 +3421,21 @@ case "(($ac_try" in
2856 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2857 *) ac_try_echo=$ac_try;;
2858 esac
2859 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2860 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2861 +$as_echo "$ac_try_echo") >&5
2862 (eval "$ac_compile") 2>conftest.er1
2863 ac_status=$?
2864 grep -v '^ *+' conftest.er1 >conftest.err
2865 rm -f conftest.er1
2866 cat conftest.err >&5
2867 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2868 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2869 (exit $ac_status); } && {
2870 test -z "$ac_c_werror_flag" ||
2871 test ! -s conftest.err
2872 } && test -s conftest.$ac_objext; then
2873 :
2874 else
2875 - echo "$as_me: failed program was:" >&5
2876 + $as_echo "$as_me: failed program was:" >&5
2877 sed 's/^/| /' conftest.$ac_ext >&5
2878
2879 ac_c_werror_flag=$ac_save_c_werror_flag
2880 @@ -3341,20 +3461,21 @@ case "(($ac_try" in
2881 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2882 *) ac_try_echo=$ac_try;;
2883 esac
2884 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2885 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2886 +$as_echo "$ac_try_echo") >&5
2887 (eval "$ac_compile") 2>conftest.er1
2888 ac_status=$?
2889 grep -v '^ *+' conftest.er1 >conftest.err
2890 rm -f conftest.er1
2891 cat conftest.err >&5
2892 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2893 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2894 (exit $ac_status); } && {
2895 test -z "$ac_c_werror_flag" ||
2896 test ! -s conftest.err
2897 } && test -s conftest.$ac_objext; then
2898 ac_cv_prog_cc_g=yes
2899 else
2900 - echo "$as_me: failed program was:" >&5
2901 + $as_echo "$as_me: failed program was:" >&5
2902 sed 's/^/| /' conftest.$ac_ext >&5
2903
2904
2905 @@ -3369,8 +3490,8 @@ fi
2906 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2907 ac_c_werror_flag=$ac_save_c_werror_flag
2908 fi
2909 -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
2910 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
2911 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
2912 +$as_echo "$ac_cv_prog_cc_g" >&6; }
2913 if test "$ac_test_CFLAGS" = set; then
2914 CFLAGS=$ac_save_CFLAGS
2915 elif test $ac_cv_prog_cc_g = yes; then
2916 @@ -3386,10 +3507,10 @@ else
2917 CFLAGS=
2918 fi
2919 fi
2920 -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
2921 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
2922 +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
2923 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
2924 if test "${ac_cv_prog_cc_c89+set}" = set; then
2925 - echo $ECHO_N "(cached) $ECHO_C" >&6
2926 + $as_echo_n "(cached) " >&6
2927 else
2928 ac_cv_prog_cc_c89=no
2929 ac_save_CC=$CC
2930 @@ -3460,20 +3581,21 @@ case "(($ac_try" in
2931 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2932 *) ac_try_echo=$ac_try;;
2933 esac
2934 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2935 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2936 +$as_echo "$ac_try_echo") >&5
2937 (eval "$ac_compile") 2>conftest.er1
2938 ac_status=$?
2939 grep -v '^ *+' conftest.er1 >conftest.err
2940 rm -f conftest.er1
2941 cat conftest.err >&5
2942 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2943 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2944 (exit $ac_status); } && {
2945 test -z "$ac_c_werror_flag" ||
2946 test ! -s conftest.err
2947 } && test -s conftest.$ac_objext; then
2948 ac_cv_prog_cc_c89=$ac_arg
2949 else
2950 - echo "$as_me: failed program was:" >&5
2951 + $as_echo "$as_me: failed program was:" >&5
2952 sed 's/^/| /' conftest.$ac_ext >&5
2953
2954
2955 @@ -3489,15 +3611,15 @@ fi
2956 # AC_CACHE_VAL
2957 case "x$ac_cv_prog_cc_c89" in
2958 x)
2959 - { echo "$as_me:$LINENO: result: none needed" >&5
2960 -echo "${ECHO_T}none needed" >&6; } ;;
2961 + { $as_echo "$as_me:$LINENO: result: none needed" >&5
2962 +$as_echo "none needed" >&6; } ;;
2963 xno)
2964 - { echo "$as_me:$LINENO: result: unsupported" >&5
2965 -echo "${ECHO_T}unsupported" >&6; } ;;
2966 + { $as_echo "$as_me:$LINENO: result: unsupported" >&5
2967 +$as_echo "unsupported" >&6; } ;;
2968 *)
2969 CC="$CC $ac_cv_prog_cc_c89"
2970 - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
2971 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
2972 + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
2973 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
2974 esac
2975
2976
2977 @@ -3518,8 +3640,8 @@ am__doit:
2978 .PHONY: am__doit
2979 END
2980 # If we don't find an include directive, just comment out the code.
2981 -{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
2982 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
2983 +{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
2984 +$as_echo_n "checking for style of include used by $am_make... " >&6; }
2985 am__include="#"
2986 am__quote=
2987 _am_result=none
2988 @@ -3546,8 +3668,8 @@ if test "$am__include" = "#"; then
2989 fi
2990
2991
2992 -{ echo "$as_me:$LINENO: result: $_am_result" >&5
2993 -echo "${ECHO_T}$_am_result" >&6; }
2994 +{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
2995 +$as_echo "$_am_result" >&6; }
2996 rm -f confinc confmf
2997
2998 # Check whether --enable-dependency-tracking was given.
2999 @@ -3559,7 +3681,9 @@ if test "x$enable_dependency_tracking" != xno; then
3000 am_depcomp="$ac_aux_dir/depcomp"
3001 AMDEPBACKSLASH='\'
3002 fi
3003 - if test "x$enable_dependency_tracking" != xno; then
3004 +
3005 +
3006 +if test "x$enable_dependency_tracking" != xno; then
3007 AMDEP_TRUE=
3008 AMDEP_FALSE='#'
3009 else
3010 @@ -3569,12 +3693,13 @@ fi
3011
3012
3013
3014 +
3015 depcc="$CC" am_compiler_list=
3016
3017 -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
3018 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
3019 +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
3020 +$as_echo_n "checking dependency style of $depcc... " >&6; }
3021 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
3022 - echo $ECHO_N "(cached) $ECHO_C" >&6
3023 + $as_echo_n "(cached) " >&6
3024 else
3025 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
3026 # We make a subdir and do the tests there. Otherwise we can end up
3027 @@ -3636,7 +3761,6 @@ else
3028 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
3029 $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
3030 >/dev/null 2>conftest.err &&
3031 - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
3032 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
3033 grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
3034 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
3035 @@ -3662,11 +3786,13 @@ else
3036 fi
3037
3038 fi
3039 -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
3040 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
3041 +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
3042 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
3043 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
3044
3045 - if
3046 +
3047 +
3048 +if
3049 test "x$enable_dependency_tracking" != xno \
3050 && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
3051 am__fastdepCC_TRUE=
3052 @@ -3691,10 +3817,10 @@ if test -z "$CXX"; then
3053 do
3054 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
3055 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
3056 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3057 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3058 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3059 +$as_echo_n "checking for $ac_word... " >&6; }
3060 if test "${ac_cv_prog_CXX+set}" = set; then
3061 - echo $ECHO_N "(cached) $ECHO_C" >&6
3062 + $as_echo_n "(cached) " >&6
3063 else
3064 if test -n "$CXX"; then
3065 ac_cv_prog_CXX="$CXX" # Let the user override the test.
3066 @@ -3707,7 +3833,7 @@ do
3067 for ac_exec_ext in '' $ac_executable_extensions; do
3068 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3069 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
3070 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3071 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3072 break 2
3073 fi
3074 done
3075 @@ -3718,11 +3844,11 @@ fi
3076 fi
3077 CXX=$ac_cv_prog_CXX
3078 if test -n "$CXX"; then
3079 - { echo "$as_me:$LINENO: result: $CXX" >&5
3080 -echo "${ECHO_T}$CXX" >&6; }
3081 + { $as_echo "$as_me:$LINENO: result: $CXX" >&5
3082 +$as_echo "$CXX" >&6; }
3083 else
3084 - { echo "$as_me:$LINENO: result: no" >&5
3085 -echo "${ECHO_T}no" >&6; }
3086 + { $as_echo "$as_me:$LINENO: result: no" >&5
3087 +$as_echo "no" >&6; }
3088 fi
3089
3090
3091 @@ -3735,10 +3861,10 @@ if test -z "$CXX"; then
3092 do
3093 # Extract the first word of "$ac_prog", so it can be a program name with args.
3094 set dummy $ac_prog; ac_word=$2
3095 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3096 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3097 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3098 +$as_echo_n "checking for $ac_word... " >&6; }
3099 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
3100 - echo $ECHO_N "(cached) $ECHO_C" >&6
3101 + $as_echo_n "(cached) " >&6
3102 else
3103 if test -n "$ac_ct_CXX"; then
3104 ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
3105 @@ -3751,7 +3877,7 @@ do
3106 for ac_exec_ext in '' $ac_executable_extensions; do
3107 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3108 ac_cv_prog_ac_ct_CXX="$ac_prog"
3109 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3110 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3111 break 2
3112 fi
3113 done
3114 @@ -3762,11 +3888,11 @@ fi
3115 fi
3116 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
3117 if test -n "$ac_ct_CXX"; then
3118 - { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
3119 -echo "${ECHO_T}$ac_ct_CXX" >&6; }
3120 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
3121 +$as_echo "$ac_ct_CXX" >&6; }
3122 else
3123 - { echo "$as_me:$LINENO: result: no" >&5
3124 -echo "${ECHO_T}no" >&6; }
3125 + { $as_echo "$as_me:$LINENO: result: no" >&5
3126 +$as_echo "no" >&6; }
3127 fi
3128
3129
3130 @@ -3778,12 +3904,8 @@ done
3131 else
3132 case $cross_compiling:$ac_tool_warned in
3133 yes:)
3134 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
3135 -whose name does not start with the host triplet. If you think this
3136 -configuration is useful to you, please write to autoconf@gnu.org." >&5
3137 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
3138 -whose name does not start with the host triplet. If you think this
3139 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
3140 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
3141 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3142 ac_tool_warned=yes ;;
3143 esac
3144 CXX=$ac_ct_CXX
3145 @@ -3793,43 +3915,47 @@ fi
3146 fi
3147 fi
3148 # Provide some information about the compiler.
3149 -echo "$as_me:$LINENO: checking for C++ compiler version" >&5
3150 -ac_compiler=`set X $ac_compile; echo $2`
3151 +$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
3152 +set X $ac_compile
3153 +ac_compiler=$2
3154 { (ac_try="$ac_compiler --version >&5"
3155 case "(($ac_try" in
3156 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3157 *) ac_try_echo=$ac_try;;
3158 esac
3159 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3160 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3161 +$as_echo "$ac_try_echo") >&5
3162 (eval "$ac_compiler --version >&5") 2>&5
3163 ac_status=$?
3164 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3165 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3166 (exit $ac_status); }
3167 { (ac_try="$ac_compiler -v >&5"
3168 case "(($ac_try" in