|
3516
|
1 |
diff -ur xfce4-mpc-plugin-0.3.1.orig//Makefile.am xfce4-mpc-plugin-0.3.1//Makefile.am
|
|
|
2 |
--- xfce4-mpc-plugin-0.3.1.orig//Makefile.am ne črn 18 18:55:16 2006
|
|
|
3 |
+++ xfce4-mpc-plugin-0.3.1//Makefile.am so dub 21 18:46:38 2007
|
|
|
4 |
@@ -1,5 +1,7 @@
|
|
|
5 |
@SET_MAKE@
|
|
|
6 |
|
|
|
7 |
+SOLLIBS = @SOLLIBS@
|
|
|
8 |
+
|
|
|
9 |
SUBDIRS = panel-plugin po
|
|
|
10 |
|
|
|
11 |
distclean-local:
|
|
|
12 |
diff -ur xfce4-mpc-plugin-0.3.1.orig//Makefile.in xfce4-mpc-plugin-0.3.1//Makefile.in
|
|
|
13 |
--- xfce4-mpc-plugin-0.3.1.orig//Makefile.in ne led 28 19:30:50 2007
|
|
|
14 |
+++ xfce4-mpc-plugin-0.3.1//Makefile.in so dub 21 18:35:13 2007
|
|
|
15 |
@@ -105,7 +105,7 @@
|
|
|
16 |
LIBMPD_REQUIRED_VERSION = @LIBMPD_REQUIRED_VERSION@
|
|
|
17 |
LIBMPD_VERSION = @LIBMPD_VERSION@
|
|
|
18 |
LIBOBJS = @LIBOBJS@
|
|
|
19 |
-LIBS = @LIBS@
|
|
|
20 |
+LIBS = @LIBS@ @SOLLIBS@
|
|
|
21 |
LIBXFCE4PANEL_CFLAGS = @LIBXFCE4PANEL_CFLAGS@
|
|
|
22 |
LIBXFCE4PANEL_LIBS = @LIBXFCE4PANEL_LIBS@
|
|
|
23 |
LIBXFCE4PANEL_REQUIRED_VERSION = @LIBXFCE4PANEL_REQUIRED_VERSION@
|
|
|
24 |
@@ -132,6 +132,7 @@
|
|
|
25 |
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
|
|
|
26 |
SET_MAKE = @SET_MAKE@
|
|
|
27 |
SHELL = @SHELL@
|
|
|
28 |
+SOLLIBS = @SOLLIBS@
|
|
|
29 |
STRIP = @STRIP@
|
|
|
30 |
USE_NLS = @USE_NLS@
|
|
|
31 |
VERSION = @VERSION@
|
|
|
32 |
Only in xfce4-mpc-plugin-0.3.1/: autom4te.cache
|
|
|
33 |
diff -ur xfce4-mpc-plugin-0.3.1.orig//configure xfce4-mpc-plugin-0.3.1//configure
|
|
|
34 |
--- xfce4-mpc-plugin-0.3.1.orig//configure ne led 28 19:30:51 2007
|
|
|
35 |
+++ xfce4-mpc-plugin-0.3.1//configure so dub 21 18:56:16 2007
|
|
|
36 |
@@ -1,11 +1,10 @@
|
|
|
37 |
#! /bin/sh
|
|
|
38 |
# Guess values for system-dependent variables and create Makefiles.
|
|
|
39 |
-# Generated by GNU Autoconf 2.61 for xfce4-mpc-plugin 0.3.1.
|
|
|
40 |
+# Generated by GNU Autoconf 2.59 for xfce4-mpc-plugin 0.3.1.
|
|
|
41 |
#
|
|
|
42 |
# Report bugs to <[email protected]>.
|
|
|
43 |
#
|
|
|
44 |
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
|
|
45 |
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
|
|
46 |
+# Copyright (C) 2003 Free Software Foundation, Inc.
|
|
|
47 |
# This configure script is free software; the Free Software Foundation
|
|
|
48 |
# gives unlimited permission to copy, distribute and modify it.
|
|
|
49 |
## --------------------- ##
|
|
|
50 |
@@ -12,8 +11,7 @@
|
|
|
51 |
## M4sh Initialization. ##
|
|
|
52 |
## --------------------- ##
|
|
|
53 |
|
|
|
54 |
-# Be more Bourne compatible
|
|
|
55 |
-DUALCASE=1; export DUALCASE # for MKS sh
|
|
|
56 |
+# Be Bourne compatible
|
|
|
57 |
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
|
58 |
emulate sh
|
|
|
59 |
NULLCMD=:
|
|
|
60 |
@@ -20,38 +18,11 @@
|
|
|
61 |
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
|
|
62 |
# is contrary to our usage. Disable this feature.
|
|
|
63 |
alias -g '${1+"$@"}'='"$@"'
|
|
|
64 |
- setopt NO_GLOB_SUBST
|
|
|
65 |
-else
|
|
|
66 |
- case `(set -o) 2>/dev/null` in
|
|
|
67 |
- *posix*) set -o posix ;;
|
|
|
68 |
-esac
|
|
|
69 |
-
|
|
|
70 |
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
|
|
|
71 |
+ set -o posix
|
|
|
72 |
fi
|
|
|
73 |
+DUALCASE=1; export DUALCASE # for MKS sh
|
|
|
74 |
|
|
|
75 |
-
|
|
|
76 |
-
|
|
|
77 |
-
|
|
|
78 |
-# PATH needs CR
|
|
|
79 |
-# Avoid depending upon Character Ranges.
|
|
|
80 |
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
|
81 |
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
|
82 |
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
|
|
83 |
-as_cr_digits='0123456789'
|
|
|
84 |
-as_cr_alnum=$as_cr_Letters$as_cr_digits
|
|
|
85 |
-
|
|
|
86 |
-# The user is always right.
|
|
|
87 |
-if test "${PATH_SEPARATOR+set}" != set; then
|
|
|
88 |
- echo "#! /bin/sh" >conf$$.sh
|
|
|
89 |
- echo "exit 0" >>conf$$.sh
|
|
|
90 |
- chmod +x conf$$.sh
|
|
|
91 |
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
|
|
92 |
- PATH_SEPARATOR=';'
|
|
|
93 |
- else
|
|
|
94 |
- PATH_SEPARATOR=:
|
|
|
95 |
- fi
|
|
|
96 |
- rm -f conf$$.sh
|
|
|
97 |
-fi
|
|
|
98 |
-
|
|
|
99 |
# Support unset when possible.
|
|
|
100 |
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
|
|
101 |
as_unset=unset
|
|
|
102 |
@@ -60,43 +31,8 @@
|
|
|
103 |
fi
|
|
|
104 |
|
|
|
105 |
|
|
|
106 |
-# IFS
|
|
|
107 |
-# We need space, tab and new line, in precisely that order. Quoting is
|
|
|
108 |
-# there to prevent editors from complaining about space-tab.
|
|
|
109 |
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
|
|
|
110 |
-# splitting by setting IFS to empty value.)
|
|
|
111 |
-as_nl='
|
|
|
112 |
-'
|
|
|
113 |
-IFS=" "" $as_nl"
|
|
|
114 |
-
|
|
|
115 |
-# Find who we are. Look in the path if we contain no directory separator.
|
|
|
116 |
-case $0 in
|
|
|
117 |
- *[\\/]* ) as_myself=$0 ;;
|
|
|
118 |
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
|
119 |
-for as_dir in $PATH
|
|
|
120 |
-do
|
|
|
121 |
- IFS=$as_save_IFS
|
|
|
122 |
- test -z "$as_dir" && as_dir=.
|
|
|
123 |
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
|
|
124 |
-done
|
|
|
125 |
-IFS=$as_save_IFS
|
|
|
126 |
-
|
|
|
127 |
- ;;
|
|
|
128 |
-esac
|
|
|
129 |
-# We did not find ourselves, most probably we were run as `sh COMMAND'
|
|
|
130 |
-# in which case we are not to be found in the path.
|
|
|
131 |
-if test "x$as_myself" = x; then
|
|
|
132 |
- as_myself=$0
|
|
|
133 |
-fi
|
|
|
134 |
-if test ! -f "$as_myself"; then
|
|
|
135 |
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
|
|
136 |
- { (exit 1); exit 1; }
|
|
|
137 |
-fi
|
|
|
138 |
-
|
|
|
139 |
# Work around bugs in pre-3.0 UWIN ksh.
|
|
|
140 |
-for as_var in ENV MAIL MAILPATH
|
|
|
141 |
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
|
142 |
-done
|
|
|
143 |
+$as_unset ENV MAIL MAILPATH
|
|
|
144 |
PS1='$ '
|
|
|
145 |
PS2='> '
|
|
|
146 |
PS4='+ '
|
|
|
147 |
@@ -110,19 +46,18 @@
|
|
|
148 |
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
|
|
|
149 |
eval $as_var=C; export $as_var
|
|
|
150 |
else
|
|
|
151 |
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
|
152 |
+ $as_unset $as_var
|
|
|
153 |
fi
|
|
|
154 |
done
|
|
|
155 |
|
|
|
156 |
# Required to use basename.
|
|
|
157 |
-if expr a : '\(a\)' >/dev/null 2>&1 &&
|
|
|
158 |
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
|
|
159 |
+if expr a : '\(a\)' >/dev/null 2>&1; then
|
|
|
160 |
as_expr=expr
|
|
|
161 |
else
|
|
|
162 |
as_expr=false
|
|
|
163 |
fi
|
|
|
164 |
|
|
|
165 |
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
|
|
|
166 |
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
|
|
|
167 |
as_basename=basename
|
|
|
168 |
else
|
|
|
169 |
as_basename=false
|
|
|
170 |
@@ -130,360 +65,135 @@
|
|
|
171 |
|
|
|
172 |
|
|
|
173 |
# Name of the executable.
|
|
|
174 |
-as_me=`$as_basename -- "$0" ||
|
|
|
175 |
+as_me=`$as_basename "$0" ||
|
|
|
176 |
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
|
|
177 |
X"$0" : 'X\(//\)$' \| \
|
|
|
178 |
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
|
|
179 |
+ X"$0" : 'X\(/\)$' \| \
|
|
|
180 |
+ . : '\(.\)' 2>/dev/null ||
|
|
|
181 |
echo X/"$0" |
|
|
|
182 |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
|
|
|
183 |
- s//\1/
|
|
|
184 |
- q
|
|
|
185 |
- }
|
|
|
186 |
- /^X\/\(\/\/\)$/{
|
|
|
187 |
- s//\1/
|
|
|
188 |
- q
|
|
|
189 |
- }
|
|
|
190 |
- /^X\/\(\/\).*/{
|
|
|
191 |
- s//\1/
|
|
|
192 |
- q
|
|
|
193 |
- }
|
|
|
194 |
- s/.*/./; q'`
|
|
|
195 |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
|
|
|
196 |
+ /^X\/\(\/\/\)$/{ s//\1/; q; }
|
|
|
197 |
+ /^X\/\(\/\).*/{ s//\1/; q; }
|
|
|
198 |
+ s/.*/./; q'`
|
|
|
199 |
|
|
|
200 |
-# CDPATH.
|
|
|
201 |
-$as_unset CDPATH
|
|
|
202 |
|
|
|
203 |
+# PATH needs CR, and LINENO needs CR and PATH.
|
|
|
204 |
+# Avoid depending upon Character Ranges.
|
|
|
205 |
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
|
206 |
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
|
207 |
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
|
|
208 |
+as_cr_digits='0123456789'
|
|
|
209 |
+as_cr_alnum=$as_cr_Letters$as_cr_digits
|
|
|
210 |
|
|
|
211 |
-if test "x$CONFIG_SHELL" = x; then
|
|
|
212 |
- if (eval ":") 2>/dev/null; then
|
|
|
213 |
- as_have_required=yes
|
|
|
214 |
-else
|
|
|
215 |
- as_have_required=no
|
|
|
216 |
+# The user is always right.
|
|
|
217 |
+if test "${PATH_SEPARATOR+set}" != set; then
|
|
|
218 |
+ echo "#! /bin/sh" >conf$$.sh
|
|
|
219 |
+ echo "exit 0" >>conf$$.sh
|
|
|
220 |
+ chmod +x conf$$.sh
|
|
|
221 |
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
|
|
222 |
+ PATH_SEPARATOR=';'
|
|
|
223 |
+ else
|
|
|
224 |
+ PATH_SEPARATOR=:
|
|
|
225 |
+ fi
|
|
|
226 |
+ rm -f conf$$.sh
|
|
|
227 |
fi
|
|
|
228 |
|
|
|
229 |
- if test $as_have_required = yes && (eval ":
|
|
|
230 |
-(as_func_return () {
|
|
|
231 |
- (exit \$1)
|
|
|
232 |
-}
|
|
|
233 |
-as_func_success () {
|
|
|
234 |
- as_func_return 0
|
|
|
235 |
-}
|
|
|
236 |
-as_func_failure () {
|
|
|
237 |
- as_func_return 1
|
|
|
238 |
-}
|
|
|
239 |
-as_func_ret_success () {
|
|
|
240 |
- return 0
|
|
|
241 |
-}
|
|
|
242 |
-as_func_ret_failure () {
|
|
|
243 |
- return 1
|
|
|
244 |
-}
|
|
|
245 |
|
|
|
246 |
-exitcode=0
|
|
|
247 |
-if as_func_success; then
|
|
|
248 |
- :
|
|
|
249 |
-else
|
|
|
250 |
- exitcode=1
|
|
|
251 |
- echo as_func_success failed.
|
|
|
252 |
-fi
|
|
|
253 |
+ as_lineno_1=$LINENO
|
|
|
254 |
+ as_lineno_2=$LINENO
|
|
|
255 |
+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
|
|
|
256 |
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
|
257 |
+ test "x$as_lineno_3" = "x$as_lineno_2" || {
|
|
|
258 |
+ # Find who we are. Look in the path if we contain no path at all
|
|
|
259 |
+ # relative or not.
|
|
|
260 |
+ case $0 in
|
|
|
261 |
+ *[\\/]* ) as_myself=$0 ;;
|
|
|
262 |
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
|
263 |
+for as_dir in $PATH
|
|
|
264 |
+do
|
|
|
265 |
+ IFS=$as_save_IFS
|
|
|
266 |
+ test -z "$as_dir" && as_dir=.
|
|
|
267 |
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
|
|
268 |
+done
|
|
|
269 |
|
|
|
270 |
-if as_func_failure; then
|
|
|
271 |
- exitcode=1
|
|
|
272 |
- echo as_func_failure succeeded.
|
|
|
273 |
-fi
|
|
|
274 |
-
|
|
|
275 |
-if as_func_ret_success; then
|
|
|
276 |
- :
|
|
|
277 |
-else
|
|
|
278 |
- exitcode=1
|
|
|
279 |
- echo as_func_ret_success failed.
|
|
|
280 |
-fi
|
|
|
281 |
-
|
|
|
282 |
-if as_func_ret_failure; then
|
|
|
283 |
- exitcode=1
|
|
|
284 |
- echo as_func_ret_failure succeeded.
|
|
|
285 |
-fi
|
|
|
286 |
-
|
|
|
287 |
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
|
|
|
288 |
- :
|
|
|
289 |
-else
|
|
|
290 |
- exitcode=1
|
|
|
291 |
- echo positional parameters were not saved.
|
|
|
292 |
-fi
|
|
|
293 |
-
|
|
|
294 |
-test \$exitcode = 0) || { (exit 1); exit 1; }
|
|
|
295 |
-
|
|
|
296 |
-(
|
|
|
297 |
- as_lineno_1=\$LINENO
|
|
|
298 |
- as_lineno_2=\$LINENO
|
|
|
299 |
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
|
|
|
300 |
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
|
|
|
301 |
-") 2> /dev/null; then
|
|
|
302 |
- :
|
|
|
303 |
-else
|
|
|
304 |
- as_candidate_shells=
|
|
|
305 |
+ ;;
|
|
|
306 |
+ esac
|
|
|
307 |
+ # We did not find ourselves, most probably we were run as `sh COMMAND'
|
|
|
308 |
+ # in which case we are not to be found in the path.
|
|
|
309 |
+ if test "x$as_myself" = x; then
|
|
|
310 |
+ as_myself=$0
|
|
|
311 |
+ fi
|
|
|
312 |
+ if test ! -f "$as_myself"; then
|
|
|
313 |
+ { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
|
|
|
314 |
+ { (exit 1); exit 1; }; }
|
|
|
315 |
+ fi
|
|
|
316 |
+ case $CONFIG_SHELL in
|
|
|
317 |
+ '')
|
|
|
318 |
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
|
319 |
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
|
|
|
320 |
do
|
|
|
321 |
IFS=$as_save_IFS
|
|
|
322 |
test -z "$as_dir" && as_dir=.
|
|
|
323 |
- case $as_dir in
|
|
|
324 |
+ for as_base in sh bash ksh sh5; do
|
|
|
325 |
+ case $as_dir in
|
|
|
326 |
/*)
|
|
|
327 |
- for as_base in sh bash ksh sh5; do
|
|
|
328 |
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
|
|
|
329 |
- done;;
|
|
|
330 |
- esac
|
|
|
331 |
-done
|
|
|
332 |
-IFS=$as_save_IFS
|
|
|
333 |
-
|
|
|
334 |
-
|
|
|
335 |
- for as_shell in $as_candidate_shells $SHELL; do
|
|
|
336 |
- # Try only shells that exist, to save several forks.
|
|
|
337 |
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
|
|
|
338 |
- { ("$as_shell") 2> /dev/null <<\_ASEOF
|
|
|
339 |
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
|
340 |
- emulate sh
|
|
|
341 |
- NULLCMD=:
|
|
|
342 |
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
|
|
343 |
- # is contrary to our usage. Disable this feature.
|
|
|
344 |
- alias -g '${1+"$@"}'='"$@"'
|
|
|
345 |
- setopt NO_GLOB_SUBST
|
|
|
346 |
-else
|
|
|
347 |
- case `(set -o) 2>/dev/null` in
|
|
|
348 |
- *posix*) set -o posix ;;
|
|
|
349 |
-esac
|
|
|
350 |
-
|
|
|
351 |
-fi
|
|
|
352 |
-
|
|
|
353 |
-
|
|
|
354 |
-:
|
|
|
355 |
-_ASEOF
|
|
|
356 |
-}; then
|
|
|
357 |
- CONFIG_SHELL=$as_shell
|
|
|
358 |
- as_have_required=yes
|
|
|
359 |
- if { "$as_shell" 2> /dev/null <<\_ASEOF
|
|
|
360 |
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
|
361 |
- emulate sh
|
|
|
362 |
- NULLCMD=:
|
|
|
363 |
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
|
|
364 |
- # is contrary to our usage. Disable this feature.
|
|
|
365 |
- alias -g '${1+"$@"}'='"$@"'
|
|
|
366 |
- setopt NO_GLOB_SUBST
|
|
|
367 |
-else
|
|
|
368 |
- case `(set -o) 2>/dev/null` in
|
|
|
369 |
- *posix*) set -o posix ;;
|
|
|
370 |
-esac
|
|
|
371 |
-
|
|
|
372 |
-fi
|
|
|
373 |
-
|
|
|
374 |
-
|
|
|
375 |
-:
|
|
|
376 |
-(as_func_return () {
|
|
|
377 |
- (exit $1)
|
|
|
378 |
-}
|
|
|
379 |
-as_func_success () {
|
|
|
380 |
- as_func_return 0
|
|
|
381 |
-}
|
|
|
382 |
-as_func_failure () {
|
|
|
383 |
- as_func_return 1
|
|
|
384 |
-}
|
|
|
385 |
-as_func_ret_success () {
|
|
|
386 |
- return 0
|
|
|
387 |
-}
|
|
|
388 |
-as_func_ret_failure () {
|
|
|
389 |
- return 1
|
|
|
390 |
-}
|
|
|
391 |
-
|
|
|
392 |
-exitcode=0
|
|
|
393 |
-if as_func_success; then
|
|
|
394 |
- :
|
|
|
395 |
-else
|
|
|
396 |
- exitcode=1
|
|
|
397 |
- echo as_func_success failed.
|
|
|
398 |
-fi
|
|
|
399 |
-
|
|
|
400 |
-if as_func_failure; then
|
|
|
401 |
- exitcode=1
|
|
|
402 |
- echo as_func_failure succeeded.
|
|
|
403 |
-fi
|
|
|
404 |
-
|
|
|
405 |
-if as_func_ret_success; then
|
|
|
406 |
- :
|
|
|
407 |
-else
|
|
|
408 |
- exitcode=1
|
|
|
409 |
- echo as_func_ret_success failed.
|
|
|
410 |
-fi
|
|
|
411 |
-
|
|
|
412 |
-if as_func_ret_failure; then
|
|
|
413 |
- exitcode=1
|
|
|
414 |
- echo as_func_ret_failure succeeded.
|
|
|
415 |
-fi
|
|
|
416 |
-
|
|
|
417 |
-if ( set x; as_func_ret_success y && test x = "$1" ); then
|
|
|
418 |
- :
|
|
|
419 |
-else
|
|
|
420 |
- exitcode=1
|
|
|
421 |
- echo positional parameters were not saved.
|
|
|
422 |
-fi
|
|
|
423 |
-
|
|
|
424 |
-test $exitcode = 0) || { (exit 1); exit 1; }
|
|
|
425 |
-
|
|
|
426 |
-(
|
|
|
427 |
+ if ("$as_dir/$as_base" -c '
|
|
|
428 |
as_lineno_1=$LINENO
|
|
|
429 |
as_lineno_2=$LINENO
|
|
|
430 |
+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
|
|
|
431 |
test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
|
432 |
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
|
|
|
433 |
+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
|
|
|
434 |
+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
|
|
|
435 |
+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
|
|
|
436 |
+ CONFIG_SHELL=$as_dir/$as_base
|
|
|
437 |
+ export CONFIG_SHELL
|
|
|
438 |
+ exec "$CONFIG_SHELL" "$0" ${1+"$@"}
|
|
|
439 |
+ fi;;
|
|
|
440 |
+ esac
|
|
|
441 |
+ done
|
|
|
442 |
+done
|
|
|
443 |
+;;
|
|
|
444 |
+ esac
|
|
|
445 |
|
|
|
446 |
-_ASEOF
|
|
|
447 |
-}; then
|
|
|
448 |
- break
|
|
|
449 |
-fi
|
|
|
450 |
-
|
|
|
451 |
-fi
|
|
|
452 |
-
|
|
|
453 |
- done
|
|
|
454 |
-
|
|
|
455 |
- if test "x$CONFIG_SHELL" != x; then
|
|
|
456 |
- for as_var in BASH_ENV ENV
|
|
|
457 |
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
|
458 |
- done
|
|
|
459 |
- export CONFIG_SHELL
|
|
|
460 |
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
|
|
|
461 |
-fi
|
|
|
462 |
-
|
|
|
463 |
-
|
|
|
464 |
- if test $as_have_required = no; then
|
|
|
465 |
- echo This script requires a shell more modern than all the
|
|
|
466 |
- echo shells that I found on your system. Please install a
|
|
|
467 |
- echo modern shell, or manually run the script under such a
|
|
|
468 |
- echo shell if you do have one.
|
|
|
469 |
- { (exit 1); exit 1; }
|
|
|
470 |
-fi
|
|
|
471 |
-
|
|
|
472 |
-
|
|
|
473 |
-fi
|
|
|
474 |
-
|
|
|
475 |
-fi
|
|
|
476 |
-
|
|
|
477 |
-
|
|
|
478 |
-
|
|
|
479 |
-(eval "as_func_return () {
|
|
|
480 |
- (exit \$1)
|
|
|
481 |
-}
|
|
|
482 |
-as_func_success () {
|
|
|
483 |
- as_func_return 0
|
|
|
484 |
-}
|
|
|
485 |
-as_func_failure () {
|
|
|
486 |
- as_func_return 1
|
|
|
487 |
-}
|
|
|
488 |
-as_func_ret_success () {
|
|
|
489 |
- return 0
|
|
|
490 |
-}
|
|
|
491 |
-as_func_ret_failure () {
|
|
|
492 |
- return 1
|
|
|
493 |
-}
|
|
|
494 |
-
|
|
|
495 |
-exitcode=0
|
|
|
496 |
-if as_func_success; then
|
|
|
497 |
- :
|
|
|
498 |
-else
|
|
|
499 |
- exitcode=1
|
|
|
500 |
- echo as_func_success failed.
|
|
|
501 |
-fi
|
|
|
502 |
-
|
|
|
503 |
-if as_func_failure; then
|
|
|
504 |
- exitcode=1
|
|
|
505 |
- echo as_func_failure succeeded.
|
|
|
506 |
-fi
|
|
|
507 |
-
|
|
|
508 |
-if as_func_ret_success; then
|
|
|
509 |
- :
|
|
|
510 |
-else
|
|
|
511 |
- exitcode=1
|
|
|
512 |
- echo as_func_ret_success failed.
|
|
|
513 |
-fi
|
|
|
514 |
-
|
|
|
515 |
-if as_func_ret_failure; then
|
|
|
516 |
- exitcode=1
|
|
|
517 |
- echo as_func_ret_failure succeeded.
|
|
|
518 |
-fi
|
|
|
519 |
-
|
|
|
520 |
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
|
|
|
521 |
- :
|
|
|
522 |
-else
|
|
|
523 |
- exitcode=1
|
|
|
524 |
- echo positional parameters were not saved.
|
|
|
525 |
-fi
|
|
|
526 |
-
|
|
|
527 |
-test \$exitcode = 0") || {
|
|
|
528 |
- echo No shell found that supports shell functions.
|
|
|
529 |
- echo Please tell [email protected] about your system,
|
|
|
530 |
- echo including any error possibly output before this
|
|
|
531 |
- echo message
|
|
|
532 |
-}
|
|
|
533 |
-
|
|
|
534 |
-
|
|
|
535 |
-
|
|
|
536 |
- as_lineno_1=$LINENO
|
|
|
537 |
- as_lineno_2=$LINENO
|
|
|
538 |
- test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
|
539 |
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
|
|
|
540 |
-
|
|
|
541 |
# Create $as_me.lineno as a copy of $as_myself, but with $LINENO
|
|
|
542 |
# uniformly replaced by the line number. The first 'sed' inserts a
|
|
|
543 |
- # line-number line after each line using $LINENO; the second 'sed'
|
|
|
544 |
- # does the real work. The second script uses 'N' to pair each
|
|
|
545 |
- # line-number line with the line containing $LINENO, and appends
|
|
|
546 |
- # trailing '-' during substitution so that $LINENO is not a special
|
|
|
547 |
- # case at line end.
|
|
|
548 |
+ # line-number line before each line; the second 'sed' does the real
|
|
|
549 |
+ # work. The second script uses 'N' to pair each line-number line
|
|
|
550 |
+ # with the numbered line, and appends trailing '-' during
|
|
|
551 |
+ # substitution so that $LINENO is not a special case at line end.
|
|
|
552 |
# (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
|
|
|
553 |
- # scripts with optimization help from Paolo Bonzini. Blame Lee
|
|
|
554 |
- # E. McMahon (1931-1989) for sed's syntax. :-)
|
|
|
555 |
- sed -n '
|
|
|
556 |
- p
|
|
|
557 |
- /[$]LINENO/=
|
|
|
558 |
- ' <$as_myself |
|
|
|
559 |
+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
|
|
|
560 |
+ sed '=' <$as_myself |
|
|
|
561 |
sed '
|
|
|
562 |
- s/[$]LINENO.*/&-/
|
|
|
563 |
- t lineno
|
|
|
564 |
- b
|
|
|
565 |
- :lineno
|
|
|
566 |
N
|
|
|
567 |
- :loop
|
|
|
568 |
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
|
|
|
569 |
+ s,$,-,
|
|
|
570 |
+ : loop
|
|
|
571 |
+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
|
|
|
572 |
t loop
|
|
|
573 |
- s/-\n.*//
|
|
|
574 |
+ s,-$,,
|
|
|
575 |
+ s,^['$as_cr_digits']*\n,,
|
|
|
576 |
' >$as_me.lineno &&
|
|
|
577 |
- chmod +x "$as_me.lineno" ||
|
|
|
578 |
+ chmod +x $as_me.lineno ||
|
|
|
579 |
{ echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
|
|
|
580 |
{ (exit 1); exit 1; }; }
|
|
|
581 |
|
|
|
582 |
# Don't try to exec as it changes $[0], causing all sort of problems
|
|
|
583 |
# (the dirname of $[0] is not the place where we might find the
|
|
|
584 |
- # original and so on. Autoconf is especially sensitive to this).
|
|
|
585 |
- . "./$as_me.lineno"
|
|
|
586 |
+ # original and so on. Autoconf is especially sensible to this).
|
|
|
587 |
+ . ./$as_me.lineno
|
|
|
588 |
# Exit status is that of the last command.
|
|
|
589 |
exit
|
|
|
590 |
}
|
|
|
591 |
|
|
|
592 |
|
|
|
593 |
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
|
|
594 |
- as_dirname=dirname
|
|
|
595 |
-else
|
|
|
596 |
- as_dirname=false
|
|
|
597 |
-fi
|
|
|
598 |
-
|
|
|
599 |
-ECHO_C= ECHO_N= ECHO_T=
|
|
|
600 |
-case `echo -n x` in
|
|
|
601 |
--n*)
|
|
|
602 |
- case `echo 'x\c'` in
|
|
|
603 |
- *c*) ECHO_T=' ';; # ECHO_T is single tab character.
|
|
|
604 |
- *) ECHO_C='\c';;
|
|
|
605 |
- esac;;
|
|
|
606 |
-*)
|
|
|
607 |
- ECHO_N='-n';;
|
|
|
608 |
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
|
|
|
609 |
+ *c*,-n*) ECHO_N= ECHO_C='
|
|
|
610 |
+' ECHO_T=' ' ;;
|
|
|
611 |
+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
|
|
|
612 |
+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
|
|
|
613 |
esac
|
|
|
614 |
|
|
|
615 |
-if expr a : '\(a\)' >/dev/null 2>&1 &&
|
|
|
616 |
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
|
|
617 |
+if expr a : '\(a\)' >/dev/null 2>&1; then
|
|
|
618 |
as_expr=expr
|
|
|
619 |
else
|
|
|
620 |
as_expr=false
|
|
|
621 |
@@ -490,28 +200,22 @@
|
|
|
622 |
fi
|
|
|
623 |
|
|
|
624 |
rm -f conf$$ conf$$.exe conf$$.file
|
|
|
625 |
-if test -d conf$$.dir; then
|
|
|
626 |
- rm -f conf$$.dir/conf$$.file
|
|
|
627 |
-else
|
|
|
628 |
- rm -f conf$$.dir
|
|
|
629 |
- mkdir conf$$.dir
|
|
|
630 |
-fi
|
|
|
631 |
echo >conf$$.file
|
|
|
632 |
if ln -s conf$$.file conf$$ 2>/dev/null; then
|
|
|
633 |
- as_ln_s='ln -s'
|
|
|
634 |
- # ... but there are two gotchas:
|
|
|
635 |
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
|
|
636 |
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
|
|
637 |
- # In both cases, we have to default to `cp -p'.
|
|
|
638 |
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
|
|
639 |
+ # We could just check for DJGPP; but this test a) works b) is more generic
|
|
|
640 |
+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
|
|
|
641 |
+ if test -f conf$$.exe; then
|
|
|
642 |
+ # Don't use ln at all; we don't have any links
|
|
|
643 |
as_ln_s='cp -p'
|
|
|
644 |
+ else
|
|
|
645 |
+ as_ln_s='ln -s'
|
|
|
646 |
+ fi
|
|
|
647 |
elif ln conf$$.file conf$$ 2>/dev/null; then
|
|
|
648 |
as_ln_s=ln
|
|
|
649 |
else
|
|
|
650 |
as_ln_s='cp -p'
|
|
|
651 |
fi
|
|
|
652 |
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
|
|
|
653 |
-rmdir conf$$.dir 2>/dev/null
|
|
|
654 |
+rm -f conf$$ conf$$.exe conf$$.file
|
|
|
655 |
|
|
|
656 |
if mkdir -p . 2>/dev/null; then
|
|
|
657 |
as_mkdir_p=:
|
|
|
658 |
@@ -520,28 +224,7 @@
|
|
|
659 |
as_mkdir_p=false
|
|
|
660 |
fi
|
|
|
661 |
|
|
|
662 |
-if test -x / >/dev/null 2>&1; then
|
|
|
663 |
- as_test_x='test -x'
|
|
|
664 |
-else
|
|
|
665 |
- if ls -dL / >/dev/null 2>&1; then
|
|
|
666 |
- as_ls_L_option=L
|
|
|
667 |
- else
|
|
|
668 |
- as_ls_L_option=
|
|
|
669 |
- fi
|
|
|
670 |
- as_test_x='
|
|
|
671 |
- eval sh -c '\''
|
|
|
672 |
- if test -d "$1"; then
|
|
|
673 |
- test -d "$1/.";
|
|
|
674 |
- else
|
|
|
675 |
- case $1 in
|
|
|
676 |
- -*)set "./$1";;
|
|
|
677 |
- esac;
|
|
|
678 |
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
|
|
|
679 |
- ???[sx]*):;;*)false;;esac;fi
|
|
|
680 |
- '\'' sh
|
|
|
681 |
- '
|
|
|
682 |
-fi
|
|
|
683 |
-as_executable_p=$as_test_x
|
|
|
684 |
+as_executable_p="test -f"
|
|
|
685 |
|
|
|
686 |
# Sed expression to map a string onto a valid CPP name.
|
|
|
687 |
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
|
|
|
688 |
@@ -550,21 +233,28 @@
|
|
|
689 |
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
|
|
|
690 |
|
|
|
691 |
|
|
|
692 |
+# IFS
|
|
|
693 |
+# We need space, tab and new line, in precisely that order.
|
|
|
694 |
+as_nl='
|
|
|
695 |
+'
|
|
|
696 |
+IFS=" $as_nl"
|
|
|
697 |
|
|
|
698 |
-exec 7<&0 </dev/null 6>&1
|
|
|
699 |
+# CDPATH.
|
|
|
700 |
+$as_unset CDPATH
|
|
|
701 |
|
|
|
702 |
+
|
|
|
703 |
# Name of the host.
|
|
|
704 |
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
|
|
|
705 |
# so uname gets run too.
|
|
|
706 |
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
|
|
|
707 |
|
|
|
708 |
+exec 6>&1
|
|
|
709 |
+
|
|
|
710 |
#
|
|
|
711 |
# Initializations.
|
|
|
712 |
#
|
|
|
713 |
ac_default_prefix=/usr/local
|
|
|
714 |
-ac_clean_files=
|
|
|
715 |
ac_config_libobj_dir=.
|
|
|
716 |
-LIBOBJS=
|
|
|
717 |
cross_compiling=no
|
|
|
718 |
subdirs=
|
|
|
719 |
MFLAGS=
|
|
|
720 |
@@ -571,6 +261,11 @@
|
|
|
721 |
MAKEFLAGS=
|
|
|
722 |
SHELL=${CONFIG_SHELL-/bin/sh}
|
|
|
723 |
|
|
|
724 |
+# Maximum number of lines to put in a shell here document.
|
|
|
725 |
+# This variable seems obsolete. It should probably be removed, and
|
|
|
726 |
+# only ac_max_sed_lines should be used.
|
|
|
727 |
+: ${ac_max_here_lines=38}
|
|
|
728 |
+
|
|
|
729 |
# Identity of this package.
|
|
|
730 |
PACKAGE_NAME='xfce4-mpc-plugin'
|
|
|
731 |
PACKAGE_TARNAME='xfce4-mpc-plugin'
|
|
|
732 |
@@ -581,193 +276,43 @@
|
|
|
733 |
# Factoring default headers for most tests.
|
|
|
734 |
ac_includes_default="\
|
|
|
735 |
#include <stdio.h>
|
|
|
736 |
-#ifdef HAVE_SYS_TYPES_H
|
|
|
737 |
+#if HAVE_SYS_TYPES_H
|
|
|
738 |
# include <sys/types.h>
|
|
|
739 |
#endif
|
|
|
740 |
-#ifdef HAVE_SYS_STAT_H
|
|
|
741 |
+#if HAVE_SYS_STAT_H
|
|
|
742 |
# include <sys/stat.h>
|
|
|
743 |
#endif
|
|
|
744 |
-#ifdef STDC_HEADERS
|
|
|
745 |
+#if STDC_HEADERS
|
|
|
746 |
# include <stdlib.h>
|
|
|
747 |
# include <stddef.h>
|
|
|
748 |
#else
|
|
|
749 |
-# ifdef HAVE_STDLIB_H
|
|
|
750 |
+# if HAVE_STDLIB_H
|
|
|
751 |
# include <stdlib.h>
|
|
|
752 |
# endif
|
|
|
753 |
#endif
|
|
|
754 |
-#ifdef HAVE_STRING_H
|
|
|
755 |
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
|
|
|
756 |
+#if HAVE_STRING_H
|
|
|
757 |
+# if !STDC_HEADERS && HAVE_MEMORY_H
|
|
|
758 |
# include <memory.h>
|
|
|
759 |
# endif
|
|
|
760 |
# include <string.h>
|
|
|
761 |
#endif
|
|
|
762 |
-#ifdef HAVE_STRINGS_H
|
|
|
763 |
+#if HAVE_STRINGS_H
|
|
|
764 |
# include <strings.h>
|
|
|
765 |
#endif
|
|
|
766 |
-#ifdef HAVE_INTTYPES_H
|
|
|
767 |
+#if HAVE_INTTYPES_H
|
|
|
768 |
# include <inttypes.h>
|
|
|
769 |
+#else
|
|
|
770 |
+# if HAVE_STDINT_H
|
|
|
771 |
+# include <stdint.h>
|
|
|
772 |
+# endif
|
|
|
773 |
#endif
|
|
|
774 |
-#ifdef HAVE_STDINT_H
|
|
|
775 |
-# include <stdint.h>
|
|
|
776 |
-#endif
|
|
|
777 |
-#ifdef HAVE_UNISTD_H
|
|
|
778 |
+#if HAVE_UNISTD_H
|
|
|
779 |
# include <unistd.h>
|
|
|
780 |
#endif"
|
|
|
781 |
|
|
|
782 |
-ac_subst_vars='SHELL
|
|
|
783 |
-PATH_SEPARATOR
|
|
|
784 |
-PACKAGE_NAME
|
|
|
785 |
-PACKAGE_TARNAME
|
|
|
786 |
-PACKAGE_VERSION
|
|
|
787 |
-PACKAGE_STRING
|
|
|
788 |
-PACKAGE_BUGREPORT
|
|
|
789 |
-exec_prefix
|
|
|
790 |
-prefix
|
|
|
791 |
-program_transform_name
|
|
|
792 |
-bindir
|
|
|
793 |
-sbindir
|
|
|
794 |
-libexecdir
|
|
|
795 |
-datarootdir
|
|
|
796 |
-datadir
|
|
|
797 |
-sysconfdir
|
|
|
798 |
-sharedstatedir
|
|
|
799 |
-localstatedir
|
|
|
800 |
-includedir
|
|
|
801 |
-oldincludedir
|
|
|
802 |
-docdir
|
|
|
803 |
-infodir
|
|
|
804 |
-htmldir
|
|
|
805 |
-dvidir
|
|
|
806 |
-pdfdir
|
|
|
807 |
-psdir
|
|
|
808 |
-libdir
|
|
|
809 |
-localedir
|
|
|
810 |
-mandir
|
|
|
811 |
-DEFS
|
|
|
812 |
-ECHO_C
|
|
|
813 |
-ECHO_N
|
|
|
814 |
-ECHO_T
|
|
|
815 |
-LIBS
|
|
|
816 |
-build_alias
|
|
|
817 |
-host_alias
|
|
|
818 |
-target_alias
|
|
|
819 |
-INSTALL_PROGRAM
|
|
|
820 |
-INSTALL_SCRIPT
|
|
|
821 |
-INSTALL_DATA
|
|
|
822 |
-CYGPATH_W
|
|
|
823 |
-PACKAGE
|
|
|
824 |
-VERSION
|
|
|
825 |
-ACLOCAL
|
|
|
826 |
-AUTOCONF
|
|
|
827 |
-AUTOMAKE
|
|
|
828 |
-AUTOHEADER
|
|
|
829 |
-MAKEINFO
|
|
|
830 |
-AMTAR
|
|
|
831 |
-install_sh
|
|
|
832 |
-STRIP
|
|
|
833 |
-INSTALL_STRIP_PROGRAM
|
|
|
834 |
-AWK
|
|
|
835 |
-SET_MAKE
|
|
|
836 |
-am__leading_dot
|
|
|
837 |
-MAINTAINER_MODE_TRUE
|
|
|
838 |
-MAINTAINER_MODE_FALSE
|
|
|
839 |
-MAINT
|
|
|
840 |
-CC
|
|
|
841 |
-CFLAGS
|
|
|
842 |
-LDFLAGS
|
|
|
843 |
-CPPFLAGS
|
|
|
844 |
-ac_ct_CC
|
|
|
845 |
-EXEEXT
|
|
|
846 |
-OBJEXT
|
|
|
847 |
-DEPDIR
|
|
|
848 |
-am__include
|
|
|
849 |
-am__quote
|
|
|
850 |
-AMDEP_TRUE
|
|
|
851 |
-AMDEP_FALSE
|
|
|
852 |
-AMDEPBACKSLASH
|
|
|
853 |
-CCDEPMODE
|
|
|
854 |
-am__fastdepCC_TRUE
|
|
|
855 |
-am__fastdepCC_FALSE
|
|
|
856 |
-CPP
|
|
|
857 |
-GREP
|
|
|
858 |
-EGREP
|
|
|
859 |
-INTLTOOL_DESKTOP_RULE
|
|
|
860 |
-INTLTOOL_DIRECTORY_RULE
|
|
|
861 |
-INTLTOOL_KEYS_RULE
|
|
|
862 |
-INTLTOOL_PROP_RULE
|
|
|
863 |
-INTLTOOL_OAF_RULE
|
|
|
864 |
-INTLTOOL_PONG_RULE
|
|
|
865 |
-INTLTOOL_SERVER_RULE
|
|
|
866 |
-INTLTOOL_SHEET_RULE
|
|
|
867 |
-INTLTOOL_SOUNDLIST_RULE
|
|
|
868 |
-INTLTOOL_UI_RULE
|
|
|
869 |
-INTLTOOL_XAM_RULE
|
|
|
870 |
-INTLTOOL_KBD_RULE
|
|
|
871 |
-INTLTOOL_XML_RULE
|
|
|
872 |
-INTLTOOL_XML_NOMERGE_RULE
|
|
|
873 |
-INTLTOOL_CAVES_RULE
|
|
|
874 |
-INTLTOOL_SCHEMAS_RULE
|
|
|
875 |
-INTLTOOL_THEME_RULE
|
|
|
876 |
-INTLTOOL_SERVICE_RULE
|
|
|
877 |
-INTLTOOL_EXTRACT
|
|
|
878 |
-INTLTOOL_MERGE
|
|
|
879 |
-INTLTOOL_UPDATE
|
|
|
880 |
-INTLTOOL_PERL
|
|
|
881 |
-INTLTOOL_ICONV
|
|
|
882 |
-INTLTOOL_MSGFMT
|
|
|
883 |
-INTLTOOL_MSGMERGE
|
|
|
884 |
-INTLTOOL_XGETTEXT
|
|
|
885 |
-ALL_LINGUAS
|
|
|
886 |
-DATADIRNAME
|
|
|
887 |
-PKG_CONFIG
|
|
|
888 |
-LIBXFCE4PANEL_VERSION
|
|
|
889 |
-LIBXFCE4PANEL_CFLAGS
|
|
|
890 |
-LIBXFCE4PANEL_LIBS
|
|
|
891 |
-LIBXFCE4PANEL_REQUIRED_VERSION
|
|
|
892 |
-HAVE_LIBMPD_TRUE
|
|
|
893 |
-HAVE_LIBMPD_FALSE
|
|
|
894 |
-LIBMPD_CFLAGS
|
|
|
895 |
-LIBMPD_LIBS
|
|
|
896 |
-LIBMPD_VERSION
|
|
|
897 |
-LIBMPD_REQUIRED_VERSION
|
|
|
898 |
-GETTEXT_PACKAGE
|
|
|
899 |
-build
|
|
|
900 |
-build_cpu
|
|
|
901 |
-build_vendor
|
|
|
902 |
-build_os
|
|
|
903 |
-host
|
|
|
904 |
-host_cpu
|
|
|
905 |
-host_vendor
|
|
|
906 |
-host_os
|
|
|
907 |
-USE_NLS
|
|
|
908 |
-MSGFMT
|
|
|
909 |
-GMSGFMT
|
|
|
910 |
-XGETTEXT
|
|
|
911 |
-CATALOGS
|
|
|
912 |
-CATOBJEXT
|
|
|
913 |
-GMOFILES
|
|
|
914 |
-INSTOBJEXT
|
|
|
915 |
-INTLLIBS
|
|
|
916 |
-PO_IN_DATADIR_TRUE
|
|
|
917 |
-PO_IN_DATADIR_FALSE
|
|
|
918 |
-POFILES
|
|
|
919 |
-POSUB
|
|
|
920 |
-MKINSTALLDIRS
|
|
|
921 |
-XGETTEXT_ARGS
|
|
|
922 |
-LIBOBJS
|
|
|
923 |
-LTLIBOBJS'
|
|
|
924 |
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS DATADIRNAME PKG_CONFIG LIBXFCE4PANEL_VERSION LIBXFCE4PANEL_CFLAGS LIBXFCE4PANEL_LIBS LIBXFCE4PANEL_REQUIRED_VERSION SOLLIBS HAVE_LIBMPD_TRUE HAVE_LIBMPD_FALSE LIBMPD_CFLAGS LIBMPD_LIBS LIBMPD_VERSION LIBMPD_REQUIRED_VERSION GETTEXT_PACKAGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS localedir XGETTEXT_ARGS LIBOBJS LTLIBOBJS'
|
|
|
925 |
ac_subst_files=''
|
|
|
926 |
- ac_precious_vars='build_alias
|
|
|
927 |
-host_alias
|
|
|
928 |
-target_alias
|
|
|
929 |
-CC
|
|
|
930 |
-CFLAGS
|
|
|
931 |
-LDFLAGS
|
|
|
932 |
-LIBS
|
|
|
933 |
-CPPFLAGS
|
|
|
934 |
-CPP'
|
|
|
935 |
|
|
|
936 |
-
|
|
|
937 |
# Initialize some variables set by options.
|
|
|
938 |
ac_init_help=
|
|
|
939 |
ac_init_version=false
|
|
|
940 |
@@ -793,48 +338,34 @@
|
|
|
941 |
# and all the variables that are supposed to be based on exec_prefix
|
|
|
942 |
# by default will actually change.
|
|
|
943 |
# Use braces instead of parens because sh, perl, etc. also accept them.
|
|
|
944 |
-# (The list follows the same order as the GNU Coding Standards.)
|
|
|
945 |
bindir='${exec_prefix}/bin'
|
|
|
946 |
sbindir='${exec_prefix}/sbin'
|
|
|
947 |
libexecdir='${exec_prefix}/libexec'
|
|
|
948 |
-datarootdir='${prefix}/share'
|
|
|
949 |
-datadir='${datarootdir}'
|
|
|
950 |
+datadir='${prefix}/share'
|
|
|
951 |
sysconfdir='${prefix}/etc'
|
|
|
952 |
sharedstatedir='${prefix}/com'
|
|
|
953 |
localstatedir='${prefix}/var'
|
|
|
954 |
+libdir='${exec_prefix}/lib'
|
|
|
955 |
includedir='${prefix}/include'
|
|
|
956 |
oldincludedir='/usr/include'
|
|
|
957 |
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
|
|
|
958 |
-infodir='${datarootdir}/info'
|
|
|
959 |
-htmldir='${docdir}'
|
|
|
960 |
-dvidir='${docdir}'
|
|
|
961 |
-pdfdir='${docdir}'
|
|
|
962 |
-psdir='${docdir}'
|
|
|
963 |
-libdir='${exec_prefix}/lib'
|
|
|
964 |
-localedir='${datarootdir}/locale'
|
|
|
965 |
-mandir='${datarootdir}/man'
|
|
|
966 |
+infodir='${prefix}/info'
|
|
|
967 |
+mandir='${prefix}/man'
|
|
|
968 |
|
|
|
969 |
ac_prev=
|
|
|
970 |
-ac_dashdash=
|
|
|
971 |
for ac_option
|
|
|
972 |
do
|
|
|
973 |
# If the previous option needs an argument, assign it.
|
|
|
974 |
if test -n "$ac_prev"; then
|
|
|
975 |
- eval $ac_prev=\$ac_option
|
|
|
976 |
+ eval "$ac_prev=\$ac_option"
|
|
|
977 |
ac_prev=
|
|
|
978 |
continue
|
|
|
979 |
fi
|
|
|
980 |
|
|
|
981 |
- case $ac_option in
|
|
|
982 |
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
|
|
|
983 |
- *) ac_optarg=yes ;;
|
|
|
984 |
- esac
|
|
|
985 |
+ ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
|
|
|
986 |
|
|
|
987 |
# Accept the important Cygnus configure options, so we can diagnose typos.
|
|
|
988 |
|
|
|
989 |
- case $ac_dashdash$ac_option in
|
|
|
990 |
- --)
|
|
|
991 |
- ac_dashdash=yes ;;
|
|
|
992 |
+ case $ac_option in
|
|
|
993 |
|
|
|
994 |
-bindir | --bindir | --bindi | --bind | --bin | --bi)
|
|
|
995 |
ac_prev=bindir ;;
|
|
|
996 |
@@ -856,45 +387,33 @@
|
|
|
997 |
--config-cache | -C)
|
|
|
998 |
cache_file=config.cache ;;
|
|
|
999 |
|
|
|
1000 |
- -datadir | --datadir | --datadi | --datad)
|
|
|
1001 |
+ -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
|
|
|
1002 |
ac_prev=datadir ;;
|
|
|
1003 |
- -datadir=* | --datadir=* | --datadi=* | --datad=*)
|
|
|
1004 |
+ -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
|
|
|
1005 |
+ | --da=*)
|
|
|
1006 |
datadir=$ac_optarg ;;
|
|
|
1007 |
|
|
|
1008 |
- -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
|
|
|
1009 |
- | --dataroo | --dataro | --datar)
|
|
|
1010 |
- ac_prev=datarootdir ;;
|
|
|
1011 |
- -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
|
|
|
1012 |
- | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
|
|
|
1013 |
- datarootdir=$ac_optarg ;;
|
|
|
1014 |
-
|
|
|
1015 |
-disable-* | --disable-*)
|
|
|
1016 |
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
|
|
|
1017 |
# Reject names that are not valid shell variable names.
|
|
|
1018 |
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
|
1019 |
+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
|
|
|
1020 |
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
|
|
|
1021 |
{ (exit 1); exit 1; }; }
|
|
|
1022 |
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
|
|
|
1023 |
- eval enable_$ac_feature=no ;;
|
|
|
1024 |
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
|
|
|
1025 |
+ eval "enable_$ac_feature=no" ;;
|
|
|
1026 |
|
|
|
1027 |
- -docdir | --docdir | --docdi | --doc | --do)
|
|
|
1028 |
- ac_prev=docdir ;;
|
|
|
1029 |
- -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
|
|
|
1030 |
- docdir=$ac_optarg ;;
|
|
|
1031 |
-
|
|
|
1032 |
- -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
|
|
|
1033 |
- ac_prev=dvidir ;;
|
|
|
1034 |
- -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
|
|
|
1035 |
- dvidir=$ac_optarg ;;
|
|
|
1036 |
-
|
|
|
1037 |
-enable-* | --enable-*)
|
|
|
1038 |
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
|
|
|
1039 |
# Reject names that are not valid shell variable names.
|
|
|
1040 |
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
|
1041 |
+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
|
|
|
1042 |
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
|
|
|
1043 |
{ (exit 1); exit 1; }; }
|
|
|
1044 |
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
|
|
|
1045 |
- eval enable_$ac_feature=\$ac_optarg ;;
|
|
|
1046 |
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
|
|
|
1047 |
+ case $ac_option in
|
|
|
1048 |
+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
|
|
|
1049 |
+ *) ac_optarg=yes ;;
|
|
|
1050 |
+ esac
|
|
|
1051 |
+ eval "enable_$ac_feature='$ac_optarg'" ;;
|
|
|
1052 |
|
|
|
1053 |
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
|
|
|
1054 |
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
|
|
|
1055 |
@@ -921,12 +440,6 @@
|
|
|
1056 |
-host=* | --host=* | --hos=* | --ho=*)
|
|
|
1057 |
host_alias=$ac_optarg ;;
|
|
|
1058 |
|
|
|
1059 |
- -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
|
|
|
1060 |
- ac_prev=htmldir ;;
|
|
|
1061 |
- -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
|
|
|
1062 |
- | --ht=*)
|
|
|
1063 |
- htmldir=$ac_optarg ;;
|
|
|
1064 |
-
|
|
|
1065 |
-includedir | --includedir | --includedi | --included | --include \
|
|
|
1066 |
| --includ | --inclu | --incl | --inc)
|
|
|
1067 |
ac_prev=includedir ;;
|
|
|
1068 |
@@ -951,16 +464,13 @@
|
|
|
1069 |
| --libexe=* | --libex=* | --libe=*)
|
|
|
1070 |
libexecdir=$ac_optarg ;;
|
|
|
1071 |
|
|
|
1072 |
- -localedir | --localedir | --localedi | --localed | --locale)
|
|
|
1073 |
- ac_prev=localedir ;;
|
|
|
1074 |
- -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
|
|
|
1075 |
- localedir=$ac_optarg ;;
|
|
|
1076 |
-
|
|
|
1077 |
-localstatedir | --localstatedir | --localstatedi | --localstated \
|
|
|
1078 |
- | --localstate | --localstat | --localsta | --localst | --locals)
|
|
|
1079 |
+ | --localstate | --localstat | --localsta | --localst \
|
|
|
1080 |
+ | --locals | --local | --loca | --loc | --lo)
|
|
|
1081 |
ac_prev=localstatedir ;;
|
|
|
1082 |
-localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
|
|
|
1083 |
- | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
|
|
|
1084 |
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* \
|
|
|
1085 |
+ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
|
|
|
1086 |
localstatedir=$ac_optarg ;;
|
|
|
1087 |
|
|
|
1088 |
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
|
|
|
1089 |
@@ -1025,16 +535,6 @@
|
|
|
1090 |
| --progr-tra=* | --program-tr=* | --program-t=*)
|
|
|
1091 |
program_transform_name=$ac_optarg ;;
|
|
|
1092 |
|
|
|
1093 |
- -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
|
|
|
1094 |
- ac_prev=pdfdir ;;
|
|
|
1095 |
- -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
|
|
|
1096 |
- pdfdir=$ac_optarg ;;
|
|
|
1097 |
-
|
|
|
1098 |
- -psdir | --psdir | --psdi | --psd | --ps)
|
|
|
1099 |
- ac_prev=psdir ;;
|
|
|
1100 |
- -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
|
|
|
1101 |
- psdir=$ac_optarg ;;
|
|
|
1102 |
-
|
|
|
1103 |
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
|
|
|
1104 |
| -silent | --silent | --silen | --sile | --sil)
|
|
|
1105 |
silent=yes ;;
|
|
|
1106 |
@@ -1087,20 +587,24 @@
|
|
|
1107 |
-with-* | --with-*)
|
|
|
1108 |
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
|
|
|
1109 |
# Reject names that are not valid shell variable names.
|
|
|
1110 |
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
|
1111 |
+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
|
|
|
1112 |
{ echo "$as_me: error: invalid package name: $ac_package" >&2
|
|
|
1113 |
{ (exit 1); exit 1; }; }
|
|
|
1114 |
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
|
|
|
1115 |
- eval with_$ac_package=\$ac_optarg ;;
|
|
|
1116 |
+ ac_package=`echo $ac_package| sed 's/-/_/g'`
|
|
|
1117 |
+ case $ac_option in
|
|
|
1118 |
+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
|
|
|
1119 |
+ *) ac_optarg=yes ;;
|
|
|
1120 |
+ esac
|
|
|
1121 |
+ eval "with_$ac_package='$ac_optarg'" ;;
|
|
|
1122 |
|
|
|
1123 |
-without-* | --without-*)
|
|
|
1124 |
ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
|
|
|
1125 |
# Reject names that are not valid shell variable names.
|
|
|
1126 |
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
|
1127 |
+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
|
|
|
1128 |
{ echo "$as_me: error: invalid package name: $ac_package" >&2
|
|
|
1129 |
{ (exit 1); exit 1; }; }
|
|
|
1130 |
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
|
|
|
1131 |
- eval with_$ac_package=no ;;
|
|
|
1132 |
+ ac_package=`echo $ac_package | sed 's/-/_/g'`
|
|
|
1133 |
+ eval "with_$ac_package=no" ;;
|
|
|
1134 |
|
|
|
1135 |
--x)
|
|
|
1136 |
# Obsolete; use --with-x.
|
|
|
1137 |
@@ -1131,7 +635,8 @@
|
|
|
1138 |
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
|
|
|
1139 |
{ echo "$as_me: error: invalid variable name: $ac_envvar" >&2
|
|
|
1140 |
{ (exit 1); exit 1; }; }
|
|
|
1141 |
- eval $ac_envvar=\$ac_optarg
|
|
|
1142 |
+ ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
|
|
|
1143 |
+ eval "$ac_envvar='$ac_optarg'"
|
|
|
1144 |
export $ac_envvar ;;
|
|
|
1145 |
|
|
|
1146 |
*)
|
|
|
1147 |
@@ -1151,21 +656,29 @@
|
|
|
1148 |
{ (exit 1); exit 1; }; }
|
|
|
1149 |
fi
|
|
|
1150 |
|
|
|
1151 |
-# Be sure to have absolute directory names.
|
|
|
1152 |
-for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
|
|
1153 |
- datadir sysconfdir sharedstatedir localstatedir includedir \
|
|
|
1154 |
- oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
|
|
1155 |
- libdir localedir mandir
|
|
|
1156 |
+# Be sure to have absolute paths.
|
|
|
1157 |
+for ac_var in exec_prefix prefix
|
|
|
1158 |
do
|
|
|
1159 |
- eval ac_val=\$$ac_var
|
|
|
1160 |
+ eval ac_val=$`echo $ac_var`
|
|
|
1161 |
case $ac_val in
|
|
|
1162 |
- [\\/$]* | ?:[\\/]* ) continue;;
|
|
|
1163 |
- NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
|
|
|
1164 |
+ [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
|
|
|
1165 |
+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
|
|
|
1166 |
+ { (exit 1); exit 1; }; };;
|
|
|
1167 |
esac
|
|
|
1168 |
- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
|
|
|
1169 |
- { (exit 1); exit 1; }; }
|
|
|
1170 |
done
|
|
|
1171 |
|
|
|
1172 |
+# Be sure to have absolute paths.
|
|
|
1173 |
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
|
|
|
1174 |
+ localstatedir libdir includedir oldincludedir infodir mandir
|
|
|
1175 |
+do
|
|
|
1176 |
+ eval ac_val=$`echo $ac_var`
|
|
|
1177 |
+ case $ac_val in
|
|
|
1178 |
+ [\\/$]* | ?:[\\/]* ) ;;
|
|
|
1179 |
+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
|
|
|
1180 |
+ { (exit 1); exit 1; }; };;
|
|
|
1181 |
+ esac
|
|
|
1182 |
+done
|
|
|
1183 |
+
|
|
|
1184 |
# There might be people who depend on the old broken behavior: `$host'
|
|
|
1185 |
# used to hold the argument of --host etc.
|
|
|
1186 |
# FIXME: To remove some day.
|
|
|
1187 |
@@ -1190,76 +703,74 @@
|
|
|
1188 |
test "$silent" = yes && exec 6>/dev/null
|
|
|
1189 |
|
|
|
1190 |
|
|
|
1191 |
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
|
|
|
1192 |
-ac_ls_di=`ls -di .` &&
|
|
|
1193 |
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
|
|
|
1194 |
- { echo "$as_me: error: Working directory cannot be determined" >&2
|
|
|
1195 |
- { (exit 1); exit 1; }; }
|
|
|
1196 |
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
|
|
|
1197 |
- { echo "$as_me: error: pwd does not report name of working directory" >&2
|
|
|
1198 |
- { (exit 1); exit 1; }; }
|
|
|
1199 |
-
|
|
|
1200 |
-
|
|
|
1201 |
# Find the source files, if location was not specified.
|
|
|
1202 |
if test -z "$srcdir"; then
|
|
|
1203 |
ac_srcdir_defaulted=yes
|
|
|
1204 |
- # Try the directory containing this script, then the parent directory.
|
|
|
1205 |
- ac_confdir=`$as_dirname -- "$0" ||
|
|
|
1206 |
+ # Try the directory containing this script, then its parent.
|
|
|
1207 |
+ ac_confdir=`(dirname "$0") 2>/dev/null ||
|
|
|
1208 |
$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
|
1209 |
X"$0" : 'X\(//\)[^/]' \| \
|
|
|
1210 |
X"$0" : 'X\(//\)$' \| \
|
|
|
1211 |
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
|
|
1212 |
+ X"$0" : 'X\(/\)' \| \
|
|
|
1213 |
+ . : '\(.\)' 2>/dev/null ||
|
|
|
1214 |
echo X"$0" |
|
|
|
1215 |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
|
1216 |
- s//\1/
|
|
|
1217 |
- q
|
|
|
1218 |
- }
|
|
|
1219 |
- /^X\(\/\/\)[^/].*/{
|
|
|
1220 |
- s//\1/
|
|
|
1221 |
- q
|
|
|
1222 |
- }
|
|
|
1223 |
- /^X\(\/\/\)$/{
|
|
|
1224 |
- s//\1/
|
|
|
1225 |
- q
|
|
|
1226 |
- }
|
|
|
1227 |
- /^X\(\/\).*/{
|
|
|
1228 |
- s//\1/
|
|
|
1229 |
- q
|
|
|
1230 |
- }
|
|
|
1231 |
- s/.*/./; q'`
|
|
|
1232 |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
|
1233 |
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
|
1234 |
+ /^X\(\/\/\)$/{ s//\1/; q; }
|
|
|
1235 |
+ /^X\(\/\).*/{ s//\1/; q; }
|
|
|
1236 |
+ s/.*/./; q'`
|
|
|
1237 |
srcdir=$ac_confdir
|
|
|
1238 |
- if test ! -r "$srcdir/$ac_unique_file"; then
|
|
|
1239 |
+ if test ! -r $srcdir/$ac_unique_file; then
|
|
|
1240 |
srcdir=..
|
|
|
1241 |
fi
|
|
|
1242 |
else
|
|
|
1243 |
ac_srcdir_defaulted=no
|
|
|
1244 |
fi
|
|
|
1245 |
-if test ! -r "$srcdir/$ac_unique_file"; then
|
|
|
1246 |
- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
|
|
|
1247 |
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
|
|
|
1248 |
+if test ! -r $srcdir/$ac_unique_file; then
|
|
|
1249 |
+ if test "$ac_srcdir_defaulted" = yes; then
|
|
|
1250 |
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
|
|
|
1251 |
{ (exit 1); exit 1; }; }
|
|
|
1252 |
-fi
|
|
|
1253 |
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
|
|
|
1254 |
-ac_abs_confdir=`(
|
|
|
1255 |
- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
|
|
|
1256 |
+ else
|
|
|
1257 |
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
|
|
|
1258 |
{ (exit 1); exit 1; }; }
|
|
|
1259 |
- pwd)`
|
|
|
1260 |
-# When building in place, set srcdir=.
|
|
|
1261 |
-if test "$ac_abs_confdir" = "$ac_pwd"; then
|
|
|
1262 |
- srcdir=.
|
|
|
1263 |
+ fi
|
|
|
1264 |
fi
|
|
|
1265 |
-# Remove unnecessary trailing slashes from srcdir.
|
|
|
1266 |
-# Double slashes in file names in object file debugging info
|
|
|
1267 |
-# mess up M-x gdb in Emacs.
|
|
|
1268 |
-case $srcdir in
|
|
|
1269 |
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
|
|
|
1270 |
-esac
|
|
|
1271 |
-for ac_var in $ac_precious_vars; do
|
|
|
1272 |
- eval ac_env_${ac_var}_set=\${${ac_var}+set}
|
|
|
1273 |
- eval ac_env_${ac_var}_value=\$${ac_var}
|
|
|
1274 |
- eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
|
|
|
1275 |
- eval ac_cv_env_${ac_var}_value=\$${ac_var}
|
|
|
1276 |
-done
|
|
|
1277 |
+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
|
|
|
1278 |
+ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
|
|
|
1279 |
+ { (exit 1); exit 1; }; }
|
|
|
1280 |
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
|
|
|
1281 |
+ac_env_build_alias_set=${build_alias+set}
|
|
|
1282 |
+ac_env_build_alias_value=$build_alias
|
|
|
1283 |
+ac_cv_env_build_alias_set=${build_alias+set}
|
|
|
1284 |
+ac_cv_env_build_alias_value=$build_alias
|
|
|
1285 |
+ac_env_host_alias_set=${host_alias+set}
|
|
|
1286 |
+ac_env_host_alias_value=$host_alias
|
|
|
1287 |
+ac_cv_env_host_alias_set=${host_alias+set}
|
|
|
1288 |
+ac_cv_env_host_alias_value=$host_alias
|
|
|
1289 |
+ac_env_target_alias_set=${target_alias+set}
|
|
|
1290 |
+ac_env_target_alias_value=$target_alias
|
|
|
1291 |
+ac_cv_env_target_alias_set=${target_alias+set}
|
|
|
1292 |
+ac_cv_env_target_alias_value=$target_alias
|
|
|
1293 |
+ac_env_CC_set=${CC+set}
|
|
|
1294 |
+ac_env_CC_value=$CC
|
|
|
1295 |
+ac_cv_env_CC_set=${CC+set}
|
|
|
1296 |
+ac_cv_env_CC_value=$CC
|
|
|
1297 |
+ac_env_CFLAGS_set=${CFLAGS+set}
|
|
|
1298 |
+ac_env_CFLAGS_value=$CFLAGS
|
|
|
1299 |
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
|
|
|
1300 |
+ac_cv_env_CFLAGS_value=$CFLAGS
|
|
|
1301 |
+ac_env_LDFLAGS_set=${LDFLAGS+set}
|
|
|
1302 |
+ac_env_LDFLAGS_value=$LDFLAGS
|
|
|
1303 |
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
|
|
|
1304 |
+ac_cv_env_LDFLAGS_value=$LDFLAGS
|
|
|
1305 |
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
|
|
|
1306 |
+ac_env_CPPFLAGS_value=$CPPFLAGS
|
|
|
1307 |
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
|
|
|
1308 |
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
|
|
|
1309 |
+ac_env_CPP_set=${CPP+set}
|
|
|
1310 |
+ac_env_CPP_value=$CPP
|
|
|
1311 |
+ac_cv_env_CPP_set=${CPP+set}
|
|
|
1312 |
+ac_cv_env_CPP_value=$CPP
|
|
|
1313 |
|
|
|
1314 |
#
|
|
|
1315 |
# Report the --help message.
|
|
|
1316 |
@@ -1288,6 +799,9 @@
|
|
|
1317 |
-n, --no-create do not create output files
|
|
|
1318 |
--srcdir=DIR find the sources in DIR [configure dir or \`..']
|
|
|
1319 |
|
|
|
1320 |
+_ACEOF
|
|
|
1321 |
+
|
|
|
1322 |
+ cat <<_ACEOF
|
|
|
1323 |
Installation directories:
|
|
|
1324 |
--prefix=PREFIX install architecture-independent files in PREFIX
|
|
|
1325 |
[$ac_default_prefix]
|
|
|
1326 |
@@ -1305,6 +819,7 @@
|
|
|
1327 |
--bindir=DIR user executables [EPREFIX/bin]
|
|
|
1328 |
--sbindir=DIR system admin executables [EPREFIX/sbin]
|
|
|
1329 |
--libexecdir=DIR program executables [EPREFIX/libexec]
|
|
|
1330 |
+ --datadir=DIR read-only architecture-independent data [PREFIX/share]
|
|
|
1331 |
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
|
|
1332 |
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
|
|
1333 |
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
|
|
1334 |
@@ -1311,16 +826,8 @@
|
|
|
1335 |
--libdir=DIR object code libraries [EPREFIX/lib]
|
|
|
1336 |
--includedir=DIR C header files [PREFIX/include]
|
|
|
1337 |
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
|
|
1338 |
- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
|
|
|
1339 |
- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
|
|
|
1340 |
- --infodir=DIR info documentation [DATAROOTDIR/info]
|
|
|
1341 |
- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
|
|
|
1342 |
- --mandir=DIR man documentation [DATAROOTDIR/man]
|
|
|
1343 |
- --docdir=DIR documentation root [DATAROOTDIR/doc/xfce4-mpc-plugin]
|
|
|
1344 |
- --htmldir=DIR html documentation [DOCDIR]
|
|
|
1345 |
- --dvidir=DIR dvi documentation [DOCDIR]
|
|
|
1346 |
- --pdfdir=DIR pdf documentation [DOCDIR]
|
|
|
1347 |
- --psdir=DIR ps documentation [DOCDIR]
|
|
|
1348 |
+ --infodir=DIR info documentation [PREFIX/info]
|
|
|
1349 |
+ --mandir=DIR man documentation [PREFIX/man]
|
|
|
1350 |
_ACEOF
|
|
|
1351 |
|
|
|
1352 |
cat <<\_ACEOF
|
|
|
1353 |
@@ -1368,9 +875,8 @@
|
|
|
1354 |
CFLAGS C compiler flags
|
|
|
1355 |
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
|
|
|
1356 |
nonstandard directory <lib dir>
|
|
|
1357 |
- LIBS libraries to pass to the linker, e.g. -l<library>
|
|
|
1358 |
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
|
|
|
1359 |
- you have headers in a nonstandard directory <include dir>
|
|
|
1360 |
+ CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
|
|
|
1361 |
+ headers in a nonstandard directory <include dir>
|
|
|
1362 |
CPP C preprocessor
|
|
|
1363 |
|
|
|
1364 |
Use these variables to override the choices made by `configure' or to help
|
|
|
1365 |
@@ -1378,86 +884,120 @@
|
|
|
1366 |
|
|
|
1367 |
Report bugs to <[email protected]>.
|
|
|
1368 |
_ACEOF
|
|
|
1369 |
-ac_status=$?
|
|
|
1370 |
fi
|
|
|
1371 |
|
|
|
1372 |
if test "$ac_init_help" = "recursive"; then
|
|
|
1373 |
# If there are subdirs, report their specific --help.
|
|
|
1374 |
+ ac_popdir=`pwd`
|
|
|
1375 |
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
|
|
|
1376 |
- test -d "$ac_dir" || continue
|
|
|
1377 |
+ test -d $ac_dir || continue
|
|
|
1378 |
ac_builddir=.
|
|
|
1379 |
|
|
|
1380 |
-case "$ac_dir" in
|
|
|
1381 |
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
|
|
1382 |
-*)
|
|
|
1383 |
+if test "$ac_dir" != .; then
|
|
|
1384 |
ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
|
|
|
1385 |
- # A ".." for each directory in $ac_dir_suffix.
|
|
|
1386 |
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
|
|
|
1387 |
- case $ac_top_builddir_sub in
|
|
|
1388 |
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
|
|
1389 |
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
|
|
|
1390 |
- esac ;;
|
|
|
1391 |
-esac
|
|
|
1392 |
-ac_abs_top_builddir=$ac_pwd
|
|
|
1393 |
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
|
|
|
1394 |
-# for backward compatibility:
|
|
|
1395 |
-ac_top_builddir=$ac_top_build_prefix
|
|
|
1396 |
+ # A "../" for each directory in $ac_dir_suffix.
|
|
|
1397 |
+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
|
|
|
1398 |
+else
|
|
|
1399 |
+ ac_dir_suffix= ac_top_builddir=
|
|
|
1400 |
+fi
|
|
|
1401 |
|
|
|
1402 |
case $srcdir in
|
|
|
1403 |
- .) # We are building in place.
|
|
|
1404 |
+ .) # No --srcdir option. We are building in place.
|
|
|
1405 |
ac_srcdir=.
|
|
|
1406 |
- ac_top_srcdir=$ac_top_builddir_sub
|
|
|
1407 |
- ac_abs_top_srcdir=$ac_pwd ;;
|
|
|
1408 |
- [\\/]* | ?:[\\/]* ) # Absolute name.
|
|
|
1409 |
+ if test -z "$ac_top_builddir"; then
|
|
|
1410 |
+ ac_top_srcdir=.
|
|
|
1411 |
+ else
|
|
|
1412 |
+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
|
|
|
1413 |
+ fi ;;
|
|
|
1414 |
+ [\\/]* | ?:[\\/]* ) # Absolute path.
|
|
|
1415 |
ac_srcdir=$srcdir$ac_dir_suffix;
|
|
|
1416 |
- ac_top_srcdir=$srcdir
|
|
|
1417 |
- ac_abs_top_srcdir=$srcdir ;;
|
|
|
1418 |
- *) # Relative name.
|
|
|
1419 |
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
|
|
|
1420 |
- ac_top_srcdir=$ac_top_build_prefix$srcdir
|
|
|
1421 |
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
|
|
|
1422 |
+ ac_top_srcdir=$srcdir ;;
|
|
|
1423 |
+ *) # Relative path.
|
|
|
1424 |
+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
|
|
|
1425 |
+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
|
|
|
1426 |
esac
|
|
|
1427 |
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
|
|
|
1428 |
|
|
|
1429 |
- cd "$ac_dir" || { ac_status=$?; continue; }
|
|
|
1430 |
- # Check for guested configure.
|
|
|
1431 |
- if test -f "$ac_srcdir/configure.gnu"; then
|
|
|
1432 |
- echo &&
|
|
|
1433 |
- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
|
|
|
1434 |
- elif test -f "$ac_srcdir/configure"; then
|
|
|
1435 |
- echo &&
|
|
|
1436 |
- $SHELL "$ac_srcdir/configure" --help=recursive
|
|
|
1437 |
+# Do not use `cd foo && pwd` to compute absolute paths, because
|
|
|
1438 |
+# the directories may not exist.
|
|
|
1439 |
+case `pwd` in
|
|
|
1440 |
+.) ac_abs_builddir="$ac_dir";;
|
|
|
1441 |
+*)
|
|
|
1442 |
+ case "$ac_dir" in
|
|
|
1443 |
+ .) ac_abs_builddir=`pwd`;;
|
|
|
1444 |
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
|
|
|
1445 |
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
|
|
|
1446 |
+ esac;;
|
|
|
1447 |
+esac
|
|
|
1448 |
+case $ac_abs_builddir in
|
|
|
1449 |
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
|
|
|
1450 |
+*)
|
|
|
1451 |
+ case ${ac_top_builddir}. in
|
|
|
1452 |
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
|
|
|
1453 |
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
|
|
|
1454 |
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
|
|
|
1455 |
+ esac;;
|
|
|
1456 |
+esac
|
|
|
1457 |
+case $ac_abs_builddir in
|
|
|
1458 |
+.) ac_abs_srcdir=$ac_srcdir;;
|
|
|
1459 |
+*)
|
|
|
1460 |
+ case $ac_srcdir in
|
|
|
1461 |
+ .) ac_abs_srcdir=$ac_abs_builddir;;
|
|
|
1462 |
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
|
|
|
1463 |
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
|
|
|
1464 |
+ esac;;
|
|
|
1465 |
+esac
|
|
|
1466 |
+case $ac_abs_builddir in
|
|
|
1467 |
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
|
|
|
1468 |
+*)
|
|
|
1469 |
+ case $ac_top_srcdir in
|
|
|
1470 |
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
|
|
|
1471 |
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
|
|
|
1472 |
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
|
|
|
1473 |
+ esac;;
|
|
|
1474 |
+esac
|
|
|
1475 |
+
|
|
|
1476 |
+ cd $ac_dir
|
|
|
1477 |
+ # Check for guested configure; otherwise get Cygnus style configure.
|
|
|
1478 |
+ if test -f $ac_srcdir/configure.gnu; then
|
|
|
1479 |
+ echo
|
|
|
1480 |
+ $SHELL $ac_srcdir/configure.gnu --help=recursive
|
|
|
1481 |
+ elif test -f $ac_srcdir/configure; then
|
|
|
1482 |
+ echo
|
|
|
1483 |
+ $SHELL $ac_srcdir/configure --help=recursive
|
|
|
1484 |
+ elif test -f $ac_srcdir/configure.ac ||
|
|
|
1485 |
+ test -f $ac_srcdir/configure.in; then
|
|
|
1486 |
+ echo
|
|
|
1487 |
+ $ac_configure --help
|
|
|
1488 |
else
|
|
|
1489 |
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
|
|
|
1490 |
- fi || ac_status=$?
|
|
|
1491 |
- cd "$ac_pwd" || { ac_status=$?; break; }
|
|
|
1492 |
+ fi
|
|
|
1493 |
+ cd $ac_popdir
|
|
|
1494 |
done
|
|
|
1495 |
fi
|
|
|
1496 |
|
|
|
1497 |
-test -n "$ac_init_help" && exit $ac_status
|
|
|
1498 |
+test -n "$ac_init_help" && exit 0
|
|
|
1499 |
if $ac_init_version; then
|
|
|
1500 |
cat <<\_ACEOF
|
|
|
1501 |
xfce4-mpc-plugin configure 0.3.1
|
|
|
1502 |
-generated by GNU Autoconf 2.61
|
|
|
1503 |
+generated by GNU Autoconf 2.59
|
|
|
1504 |
|
|
|
1505 |
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
|
|
1506 |
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
|
|
1507 |
+Copyright (C) 2003 Free Software Foundation, Inc.
|
|
|
1508 |
This configure script is free software; the Free Software Foundation
|
|
|
1509 |
gives unlimited permission to copy, distribute and modify it.
|
|
|
1510 |
_ACEOF
|
|
|
1511 |
- exit
|
|
|
1512 |
+ exit 0
|
|
|
1513 |
fi
|
|
|
1514 |
-cat >config.log <<_ACEOF
|
|
|
1515 |
+exec 5>config.log
|
|
|
1516 |
+cat >&5 <<_ACEOF
|
|
|
1517 |
This file contains any messages produced by compilers while
|
|
|
1518 |
running configure, to aid debugging if configure makes a mistake.
|
|
|
1519 |
|
|
|
1520 |
It was created by xfce4-mpc-plugin $as_me 0.3.1, which was
|
|
|
1521 |
-generated by GNU Autoconf 2.61. Invocation command line was
|
|
|
1522 |
+generated by GNU Autoconf 2.59. Invocation command line was
|
|
|
1523 |
|
|
|
1524 |
$ $0 $@
|
|
|
1525 |
|
|
|
1526 |
_ACEOF
|
|
|
1527 |
-exec 5>>config.log
|
|
|
1528 |
{
|
|
|
1529 |
cat <<_ASUNAME
|
|
|
1530 |
## --------- ##
|
|
|
1531 |
@@ -1476,7 +1016,7 @@
|
|
|
1532 |
/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
|
|
|
1533 |
/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
|
|
|
1534 |
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
|
|
|
1535 |
-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
|
|
|
1536 |
+hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
|
|
|
1537 |
/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
|
|
|
1538 |
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
|
|
|
1539 |
/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
|
|
|
1540 |
@@ -1490,7 +1030,6 @@
|
|
|
1541 |
test -z "$as_dir" && as_dir=.
|
|
|
1542 |
echo "PATH: $as_dir"
|
|
|
1543 |
done
|
|
|
1544 |
-IFS=$as_save_IFS
|
|
|
1545 |
|
|
|
1546 |
} >&5
|
|
|
1547 |
|
|
|
1548 |
@@ -1512,6 +1051,7 @@
|
|
|
1549 |
ac_configure_args=
|
|
|
1550 |
ac_configure_args0=
|
|
|
1551 |
ac_configure_args1=
|
|
|
1552 |
+ac_sep=
|
|
|
1553 |
ac_must_keep_next=false
|
|
|
1554 |
for ac_pass in 1 2
|
|
|
1555 |
do
|
|
|
1556 |
@@ -1522,7 +1062,7 @@
|
|
|
1557 |
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
|
|
|
1558 |
| -silent | --silent | --silen | --sile | --sil)
|
|
|
1559 |
continue ;;
|
|
|
1560 |
- *\'*)
|
|
|
1561 |
+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
|
|
|
1562 |
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
|
1563 |
esac
|
|
|
1564 |
case $ac_pass in
|
|
|
1565 |
@@ -1544,7 +1084,9 @@
|
|
|
1566 |
-* ) ac_must_keep_next=true ;;
|
|
|
1567 |
esac
|
|
|
1568 |
fi
|
|
|
1569 |
- ac_configure_args="$ac_configure_args '$ac_arg'"
|
|
|
1570 |
+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
|
|
|
1571 |
+ # Get rid of the leading space.
|
|
|
1572 |
+ ac_sep=" "
|
|
|
1573 |
;;
|
|
|
1574 |
esac
|
|
|
1575 |
done
|
|
|
1576 |
@@ -1555,8 +1097,8 @@
|
|
|
1577 |
# When interrupted or exit'd, cleanup temporary files, and complete
|
|
|
1578 |
# config.log. We remove comments because anyway the quotes in there
|
|
|
1579 |
# would cause problems or look ugly.
|
|
|
1580 |
-# WARNING: Use '\'' to represent an apostrophe within the trap.
|
|
|
1581 |
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
|
|
|
1582 |
+# WARNING: Be sure not to use single quotes in there, as some shells,
|
|
|
1583 |
+# such as our DU 5.0 friend, will then `close' the trap.
|
|
|
1584 |
trap 'exit_status=$?
|
|
|
1585 |
# Save into config.log some information that might help in debugging.
|
|
|
1586 |
{
|
|
|
1587 |
@@ -1569,34 +1111,20 @@
|
|
|
1588 |
_ASBOX
|
|
|
1589 |
echo
|
|
|
1590 |
# The following way of writing the cache mishandles newlines in values,
|
|
|
1591 |
-(
|
|
|
1592 |
- for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
|
|
|
1593 |
- eval ac_val=\$$ac_var
|
|
|
1594 |
- case $ac_val in #(
|
|
|
1595 |
- *${as_nl}*)
|
|
|
1596 |
- case $ac_var in #(
|
|
|
1597 |
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
|
|
|
1598 |
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
|
|
|
1599 |
- esac
|
|
|
1600 |
- case $ac_var in #(
|
|
|
1601 |
- _ | IFS | as_nl) ;; #(
|
|
|
1602 |
- *) $as_unset $ac_var ;;
|
|
|
1603 |
- esac ;;
|
|
|
1604 |
- esac
|
|
|
1605 |
- done
|
|
|
1606 |
+{
|
|
|
1607 |
(set) 2>&1 |
|
|
|
1608 |
- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
|
|
|
1609 |
- *${as_nl}ac_space=\ *)
|
|
|
1610 |
+ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
|
|
|
1611 |
+ *ac_space=\ *)
|
|
|
1612 |
sed -n \
|
|
|
1613 |
- "s/'\''/'\''\\\\'\'''\''/g;
|
|
|
1614 |
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
|
|
|
1615 |
- ;; #(
|
|
|
1616 |
+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
|
|
|
1617 |
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
|
|
|
1618 |
+ ;;
|
|
|
1619 |
*)
|
|
|
1620 |
- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
|
|
|
1621 |
+ sed -n \
|
|
|
1622 |
+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
|
|
|
1623 |
;;
|
|
|
1624 |
- esac |
|
|
|
1625 |
- sort
|
|
|
1626 |
-)
|
|
|
1627 |
+ esac;
|
|
|
1628 |
+}
|
|
|
1629 |
echo
|
|
|
1630 |
|
|
|
1631 |
cat <<\_ASBOX
|
|
|
1632 |
@@ -1607,28 +1135,22 @@
|
|
|
1633 |
echo
|
|
|
1634 |
for ac_var in $ac_subst_vars
|
|
|
1635 |
do
|
|
|
1636 |
- eval ac_val=\$$ac_var
|
|
|
1637 |
- case $ac_val in
|
|
|
1638 |
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
|
|
1639 |
- esac
|
|
|
1640 |
- echo "$ac_var='\''$ac_val'\''"
|
|
|
1641 |
+ eval ac_val=$`echo $ac_var`
|
|
|
1642 |
+ echo "$ac_var='"'"'$ac_val'"'"'"
|
|
|
1643 |
done | sort
|
|
|
1644 |
echo
|
|
|
1645 |
|
|
|
1646 |
if test -n "$ac_subst_files"; then
|
|
|
1647 |
cat <<\_ASBOX
|
|
|
1648 |
-## ------------------- ##
|
|
|
1649 |
-## File substitutions. ##
|
|
|
1650 |
-## ------------------- ##
|
|
|
1651 |
+## ------------- ##
|
|
|
1652 |
+## Output files. ##
|
|
|
1653 |
+## ------------- ##
|
|
|
1654 |
_ASBOX
|
|
|
1655 |
echo
|
|
|
1656 |
for ac_var in $ac_subst_files
|
|
|
1657 |
do
|
|
|
1658 |
- eval ac_val=\$$ac_var
|
|
|
1659 |
- case $ac_val in
|
|
|
1660 |
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
|
|
1661 |
- esac
|
|
|
1662 |
- echo "$ac_var='\''$ac_val'\''"
|
|
|
1663 |
+ eval ac_val=$`echo $ac_var`
|
|
|
1664 |
+ echo "$ac_var='"'"'$ac_val'"'"'"
|
|
|
1665 |
done | sort
|
|
|
1666 |
echo
|
|
|
1667 |
fi
|
|
|
1668 |
@@ -1640,7 +1162,7 @@
|
|
|
1669 |
## ----------- ##
|
|
|
1670 |
_ASBOX
|
|
|
1671 |
echo
|
|
|
1672 |
- cat confdefs.h
|
|
|
1673 |
+ sed "/^$/d" confdefs.h | sort
|
|
|
1674 |
echo
|
|
|
1675 |
fi
|
|
|
1676 |
test "$ac_signal" != 0 &&
|
|
|
1677 |
@@ -1647,10 +1169,10 @@
|
|
|
1678 |
echo "$as_me: caught signal $ac_signal"
|
|
|
1679 |
echo "$as_me: exit $exit_status"
|
|
|
1680 |
} >&5
|
|
|
1681 |
- rm -f core *.core core.conftest.* &&
|
|
|
1682 |
- rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
|
|
|
1683 |
+ rm -f core *.core &&
|
|
|
1684 |
+ rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
|
|
|
1685 |
exit $exit_status
|
|
|
1686 |
-' 0
|
|
|
1687 |
+ ' 0
|
|
|
1688 |
for ac_signal in 1 2 13 15; do
|
|
|
1689 |
trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
|
|
|
1690 |
done
|
|
|
1691 |
@@ -1657,7 +1179,9 @@
|
|
|
1692 |
ac_signal=0
|
|
|
1693 |
|
|
|
1694 |
# confdefs.h avoids OS command line length limits that DEFS can exceed.
|
|
|
1695 |
-rm -f -r conftest* confdefs.h
|
|
|
1696 |
+rm -rf conftest* confdefs.h
|
|
|
1697 |
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
|
|
|
1698 |
+echo >confdefs.h
|
|
|
1699 |
|
|
|
1700 |
# Predefined preprocessor variables.
|
|
|
1701 |
|
|
|
1702 |
@@ -1688,17 +1212,14 @@
|
|
|
1703 |
|
|
|
1704 |
# Let the site file select an alternate cache file if it wants to.
|
|
|
1705 |
# Prefer explicitly selected file to automatically selected ones.
|
|
|
1706 |
-if test -n "$CONFIG_SITE"; then
|
|
|
1707 |
- set x "$CONFIG_SITE"
|
|
|
1708 |
-elif test "x$prefix" != xNONE; then
|
|
|
1709 |
- set x "$prefix/share/config.site" "$prefix/etc/config.site"
|
|
|
1710 |
-else
|
|
|
1711 |
- set x "$ac_default_prefix/share/config.site" \
|
|
|
1712 |
- "$ac_default_prefix/etc/config.site"
|
|
|
1713 |
+if test -z "$CONFIG_SITE"; then
|
|
|
1714 |
+ if test "x$prefix" != xNONE; then
|
|
|
1715 |
+ CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
|
|
|
1716 |
+ else
|
|
|
1717 |
+ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
|
|
|
1718 |
+ fi
|
|
|
1719 |
fi
|
|
|
1720 |
-shift
|
|
|
1721 |
-for ac_site_file
|
|
|
1722 |
-do
|
|
|
1723 |
+for ac_site_file in $CONFIG_SITE; do
|
|
|
1724 |
if test -r "$ac_site_file"; then
|
|
|
1725 |
{ echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
|
|
|
1726 |
echo "$as_me: loading site script $ac_site_file" >&6;}
|
|
|
1727 |
@@ -1714,8 +1235,8 @@
|
|
|
1728 |
{ echo "$as_me:$LINENO: loading cache $cache_file" >&5
|
|
|
1729 |
echo "$as_me: loading cache $cache_file" >&6;}
|
|
|
1730 |
case $cache_file in
|
|
|
1731 |
- [\\/]* | ?:[\\/]* ) . "$cache_file";;
|
|
|
1732 |
- *) . "./$cache_file";;
|
|
|
1733 |
+ [\\/]* | ?:[\\/]* ) . $cache_file;;
|
|
|
1734 |
+ *) . ./$cache_file;;
|
|
|
1735 |
esac
|
|
|
1736 |
fi
|
|
|
1737 |
else
|
|
|
1738 |
@@ -1727,11 +1248,12 @@
|
|
|
1739 |
# Check that the precious variables saved in the cache have kept the same
|
|
|
1740 |
# value.
|
|
|
1741 |
ac_cache_corrupted=false
|
|
|
1742 |
-for ac_var in $ac_precious_vars; do
|
|
|
1743 |
+for ac_var in `(set) 2>&1 |
|
|
|
1744 |
+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
|
|
|
1745 |
eval ac_old_set=\$ac_cv_env_${ac_var}_set
|
|
|
1746 |
eval ac_new_set=\$ac_env_${ac_var}_set
|
|
|
1747 |
- eval ac_old_val=\$ac_cv_env_${ac_var}_value
|
|
|
1748 |
- eval ac_new_val=\$ac_env_${ac_var}_value
|
|
|
1749 |
+ eval ac_old_val="\$ac_cv_env_${ac_var}_value"
|
|
|
1750 |
+ eval ac_new_val="\$ac_env_${ac_var}_value"
|
|
|
1751 |
case $ac_old_set,$ac_new_set in
|
|
|
1752 |
set,)
|
|
|
1753 |
{ echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
|
|
|
1754 |
@@ -1756,7 +1278,8 @@
|
|
|
1755 |
# Pass precious variables to config.status.
|
|
|
1756 |
if test "$ac_new_set" = set; then
|
|
|
1757 |
case $ac_new_val in
|
|
|
1758 |
- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
|
1759 |
+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
|
|
|
1760 |
+ ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
|
1761 |
*) ac_arg=$ac_var=$ac_new_val ;;
|
|
|
1762 |
esac
|
|
|
1763 |
case " $ac_configure_args " in
|
|
|
1764 |
@@ -1773,6 +1296,11 @@
|
|
|
1765 |
{ (exit 1); exit 1; }; }
|
|
|
1766 |
fi
|
|
|
1767 |
|
|
|
1768 |
+ac_ext=c
|
|
|
1769 |
+ac_cpp='$CPP $CPPFLAGS'
|
|
|
1770 |
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
|
1771 |
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
|
1772 |
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
1773 |
|
|
|
1774 |
|
|
|
1775 |
|
|
|
1776 |
@@ -1797,27 +1325,23 @@
|
|
|
1777 |
|
|
|
1778 |
|
|
|
1779 |
|
|
|
1780 |
-ac_ext=c
|
|
|
1781 |
-ac_cpp='$CPP $CPPFLAGS'
|
|
|
1782 |
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
|
1783 |
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
|
1784 |
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
1785 |
|
|
|
1786 |
|
|
|
1787 |
|
|
|
1788 |
+
|
|
|
1789 |
MPC_VERSION=0.3.1
|
|
|
1790 |
am__api_version="1.7"
|
|
|
1791 |
ac_aux_dir=
|
|
|
1792 |
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
|
|
|
1793 |
- if test -f "$ac_dir/install-sh"; then
|
|
|
1794 |
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
|
|
|
1795 |
+ if test -f $ac_dir/install-sh; then
|
|
|
1796 |
ac_aux_dir=$ac_dir
|
|
|
1797 |
ac_install_sh="$ac_aux_dir/install-sh -c"
|
|
|
1798 |
break
|
|
|
1799 |
- elif test -f "$ac_dir/install.sh"; then
|
|
|
1800 |
+ elif test -f $ac_dir/install.sh; then
|
|
|
1801 |
ac_aux_dir=$ac_dir
|
|
|
1802 |
ac_install_sh="$ac_aux_dir/install.sh -c"
|
|
|
1803 |
break
|
|
|
1804 |
- elif test -f "$ac_dir/shtool"; then
|
|
|
1805 |
+ elif test -f $ac_dir/shtool; then
|
|
|
1806 |
ac_aux_dir=$ac_dir
|
|
|
1807 |
ac_install_sh="$ac_aux_dir/shtool install -c"
|
|
|
1808 |
break
|
|
|
1809 |
@@ -1824,20 +1348,14 @@
|
|
|
1810 |
fi
|
|
|
1811 |
done
|
|
|
1812 |
if test -z "$ac_aux_dir"; then
|
|
|
1813 |
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
|
|
|
1814 |
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
|
|
|
1815 |
+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
|
|
|
1816 |
+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
|
|
|
1817 |
{ (exit 1); exit 1; }; }
|
|
|
1818 |
fi
|
|
|
1819 |
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
|
|
|
1820 |
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
|
|
|
1821 |
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
|
|
|
1822 |
|
|
|
1823 |
-# These three variables are undocumented and unsupported,
|
|
|
1824 |
-# and are intended to be withdrawn in a future Autoconf release.
|
|
|
1825 |
-# They can cause serious problems if a builder's source tree is in a directory
|
|
|
1826 |
-# whose full name contains unusual characters.
|
|
|
1827 |
-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
|
|
|
1828 |
-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
|
|
|
1829 |
-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
|
|
|
1830 |
-
|
|
|
1831 |
-
|
|
|
1832 |
# Find a good install program. We prefer a C program (faster),
|
|
|
1833 |
# so one script is as good as another. But avoid the broken or
|
|
|
1834 |
# incompatible versions:
|
|
|
1835 |
@@ -1851,8 +1369,8 @@
|
|
|
1836 |
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
|
|
1837 |
# OS/2's system install, which has a completely different semantic
|
|
|
1838 |
# ./install, which can be erroneously created by make from ./install.sh.
|
|
|
1839 |
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
|
|
|
1840 |
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
|
|
|
1841 |
+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
|
|
|
1842 |
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
|
|
|
1843 |
if test -z "$INSTALL"; then
|
|
|
1844 |
if test "${ac_cv_path_install+set}" = set; then
|
|
|
1845 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
1846 |
@@ -1874,7 +1392,7 @@
|
|
|
1847 |
# by default.
|
|
|
1848 |
for ac_prog in ginstall scoinst install; do
|
|
|
1849 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
1850 |
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
|
|
|
1851 |
+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
|
|
|
1852 |
if test $ac_prog = install &&
|
|
|
1853 |
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
|
|
|
1854 |
# AIX install. It has an incompatible calling convention.
|
|
|
1855 |
@@ -1893,7 +1411,6 @@
|
|
|
1856 |
;;
|
|
|
1857 |
esac
|
|
|
1858 |
done
|
|
|
1859 |
-IFS=$as_save_IFS
|
|
|
1860 |
|
|
|
1861 |
|
|
|
1862 |
fi
|
|
|
1863 |
@@ -1900,15 +1417,15 @@
|
|
|
1864 |
if test "${ac_cv_path_install+set}" = set; then
|
|
|
1865 |
INSTALL=$ac_cv_path_install
|
|
|
1866 |
else
|
|
|
1867 |
- # As a last resort, use the slow shell script. Don't cache a
|
|
|
1868 |
- # value for INSTALL within a source directory, because that will
|
|
|
1869 |
+ # As a last resort, use the slow shell script. We don't cache a
|
|
|
1870 |
+ # path for INSTALL within a source directory, because that will
|
|
|
1871 |
# break other packages using the cache if that directory is
|
|
|
1872 |
- # removed, or if the value is a relative name.
|
|
|
1873 |
+ # removed, or if the path is relative.
|
|
|
1874 |
INSTALL=$ac_install_sh
|
|
|
1875 |
fi
|
|
|
1876 |
fi
|
|
|
1877 |
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
|
|
|
1878 |
-echo "${ECHO_T}$INSTALL" >&6; }
|
|
|
1879 |
+echo "$as_me:$LINENO: result: $INSTALL" >&5
|
|
|
1880 |
+echo "${ECHO_T}$INSTALL" >&6
|
|
|
1881 |
|
|
|
1882 |
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
|
|
|
1883 |
# It thinks the first close brace ends the variable substitution.
|
|
|
1884 |
@@ -1918,8 +1435,8 @@
|
|
|
1885 |
|
|
|
1886 |
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
|
|
1887 |
|
|
|
1888 |
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
|
|
|
1889 |
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
|
|
|
1890 |
+echo "$as_me:$LINENO: checking whether build environment is sane" >&5
|
|
|
1891 |
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
|
|
|
1892 |
# Just in case
|
|
|
1893 |
sleep 1
|
|
|
1894 |
echo timestamp > conftest.file
|
|
|
1895 |
@@ -1961,13 +1478,13 @@
|
|
|
1896 |
Check your system clock" >&2;}
|
|
|
1897 |
{ (exit 1); exit 1; }; }
|
|
|
1898 |
fi
|
|
|
1899 |
-{ echo "$as_me:$LINENO: result: yes" >&5
|
|
|
1900 |
-echo "${ECHO_T}yes" >&6; }
|
|
|
1901 |
+echo "$as_me:$LINENO: result: yes" >&5
|
|
|
1902 |
+echo "${ECHO_T}yes" >&6
|
|
|
1903 |
test "$program_prefix" != NONE &&
|
|
|
1904 |
- program_transform_name="s&^&$program_prefix&;$program_transform_name"
|
|
|
1905 |
+ program_transform_name="s,^,$program_prefix,;$program_transform_name"
|
|
|
1906 |
# Use a double $ so make ignores it.
|
|
|
1907 |
test "$program_suffix" != NONE &&
|
|
|
1908 |
- program_transform_name="s&\$&$program_suffix&;$program_transform_name"
|
|
|
1909 |
+ program_transform_name="s,\$,$program_suffix,;$program_transform_name"
|
|
|
1910 |
# Double any \ or $. echo might interpret backslashes.
|
|
|
1911 |
# By default was `s,x,x', remove it if useless.
|
|
|
1912 |
cat <<\_ACEOF >conftest.sed
|
|
|
1913 |
@@ -1974,7 +1491,7 @@
|
|
|
1914 |
s/[\\$]/&&/g;s/;s,x,x,$//
|
|
|
1915 |
_ACEOF
|
|
|
1916 |
program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
|
|
|
1917 |
-rm -f conftest.sed
|
|
|
1918 |
+rm conftest.sed
|
|
|
1919 |
|
|
|
1920 |
|
|
|
1921 |
# expand $ac_aux_dir to an absolute path
|
|
|
1922 |
@@ -1994,8 +1511,8 @@
|
|
|
1923 |
do
|
|
|
1924 |
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
|
1925 |
set dummy $ac_prog; ac_word=$2
|
|
|
1926 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
1927 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
1928 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
1929 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
1930 |
if test "${ac_cv_prog_AWK+set}" = set; then
|
|
|
1931 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
1932 |
else
|
|
|
1933 |
@@ -2008,7 +1525,7 @@
|
|
|
1934 |
IFS=$as_save_IFS
|
|
|
1935 |
test -z "$as_dir" && as_dir=.
|
|
|
1936 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
1937 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
1938 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
1939 |
ac_cv_prog_AWK="$ac_prog"
|
|
|
1940 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
1941 |
break 2
|
|
|
1942 |
@@ -2015,50 +1532,47 @@
|
|
|
1943 |
fi
|
|
|
1944 |
done
|
|
|
1945 |
done
|
|
|
1946 |
-IFS=$as_save_IFS
|
|
|
1947 |
|
|
|
1948 |
fi
|
|
|
1949 |
fi
|
|
|
1950 |
AWK=$ac_cv_prog_AWK
|
|
|
1951 |
if test -n "$AWK"; then
|
|
|
1952 |
- { echo "$as_me:$LINENO: result: $AWK" >&5
|
|
|
1953 |
-echo "${ECHO_T}$AWK" >&6; }
|
|
|
1954 |
+ echo "$as_me:$LINENO: result: $AWK" >&5
|
|
|
1955 |
+echo "${ECHO_T}$AWK" >&6
|
|
|
1956 |
else
|
|
|
1957 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
1958 |
-echo "${ECHO_T}no" >&6; }
|
|
|
1959 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
1960 |
+echo "${ECHO_T}no" >&6
|
|
|
1961 |
fi
|
|
|
1962 |
|
|
|
1963 |
-
|
|
|
1964 |
test -n "$AWK" && break
|
|
|
1965 |
done
|
|
|
1966 |
|
|
|
1967 |
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
|
|
1968 |
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
|
|
|
1969 |
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
|
|
|
1970 |
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
|
1971 |
+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
|
|
1972 |
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
|
|
|
1973 |
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
|
|
|
1974 |
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
|
|
|
1975 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
1976 |
else
|
|
|
1977 |
cat >conftest.make <<\_ACEOF
|
|
|
1978 |
-SHELL = /bin/sh
|
|
|
1979 |
all:
|
|
|
1980 |
- @echo '@@@%%%=$(MAKE)=@@@%%%'
|
|
|
1981 |
+ @echo 'ac_maketemp="$(MAKE)"'
|
|
|
1982 |
_ACEOF
|
|
|
1983 |
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
|
|
|
1984 |
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
|
|
|
1985 |
- *@@@%%%=?*=@@@%%%*)
|
|
|
1986 |
- eval ac_cv_prog_make_${ac_make}_set=yes;;
|
|
|
1987 |
- *)
|
|
|
1988 |
- eval ac_cv_prog_make_${ac_make}_set=no;;
|
|
|
1989 |
-esac
|
|
|
1990 |
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
|
|
|
1991 |
+if test -n "$ac_maketemp"; then
|
|
|
1992 |
+ eval ac_cv_prog_make_${ac_make}_set=yes
|
|
|
1993 |
+else
|
|
|
1994 |
+ eval ac_cv_prog_make_${ac_make}_set=no
|
|
|
1995 |
+fi
|
|
|
1996 |
rm -f conftest.make
|
|
|
1997 |
fi
|
|
|
1998 |
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
|
|
|
1999 |
- { echo "$as_me:$LINENO: result: yes" >&5
|
|
|
2000 |
-echo "${ECHO_T}yes" >&6; }
|
|
|
2001 |
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
|
|
|
2002 |
+ echo "$as_me:$LINENO: result: yes" >&5
|
|
|
2003 |
+echo "${ECHO_T}yes" >&6
|
|
|
2004 |
SET_MAKE=
|
|
|
2005 |
else
|
|
|
2006 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
2007 |
-echo "${ECHO_T}no" >&6; }
|
|
|
2008 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
2009 |
+echo "${ECHO_T}no" >&6
|
|
|
2010 |
SET_MAKE="MAKE=${MAKE-make}"
|
|
|
2011 |
fi
|
|
|
2012 |
|
|
|
2013 |
@@ -2132,8 +1646,8 @@
|
|
|
2014 |
if test -n "$ac_tool_prefix"; then
|
|
|
2015 |
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
|
|
|
2016 |
set dummy ${ac_tool_prefix}strip; ac_word=$2
|
|
|
2017 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
2018 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
2019 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
2020 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
2021 |
if test "${ac_cv_prog_STRIP+set}" = set; then
|
|
|
2022 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
2023 |
else
|
|
|
2024 |
@@ -2146,7 +1660,7 @@
|
|
|
2025 |
IFS=$as_save_IFS
|
|
|
2026 |
test -z "$as_dir" && as_dir=.
|
|
|
2027 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
2028 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
2029 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
2030 |
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
|
|
|
2031 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
2032 |
break 2
|
|
|
2033 |
@@ -2153,27 +1667,25 @@
|
|
|
2034 |
fi
|
|
|
2035 |
done
|
|
|
2036 |
done
|
|
|
2037 |
-IFS=$as_save_IFS
|
|
|
2038 |
|
|
|
2039 |
fi
|
|
|
2040 |
fi
|
|
|
2041 |
STRIP=$ac_cv_prog_STRIP
|
|
|
2042 |
if test -n "$STRIP"; then
|
|
|
2043 |
- { echo "$as_me:$LINENO: result: $STRIP" >&5
|
|
|
2044 |
-echo "${ECHO_T}$STRIP" >&6; }
|
|
|
2045 |
+ echo "$as_me:$LINENO: result: $STRIP" >&5
|
|
|
2046 |
+echo "${ECHO_T}$STRIP" >&6
|
|
|
2047 |
else
|
|
|
2048 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
2049 |
-echo "${ECHO_T}no" >&6; }
|
|
|
2050 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
2051 |
+echo "${ECHO_T}no" >&6
|
|
|
2052 |
fi
|
|
|
2053 |
|
|
|
2054 |
-
|
|
|
2055 |
fi
|
|
|
2056 |
if test -z "$ac_cv_prog_STRIP"; then
|
|
|
2057 |
ac_ct_STRIP=$STRIP
|
|
|
2058 |
# Extract the first word of "strip", so it can be a program name with args.
|
|
|
2059 |
set dummy strip; ac_word=$2
|
|
|
2060 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
2061 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
2062 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
2063 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
2064 |
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
|
|
|
2065 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
2066 |
else
|
|
|
2067 |
@@ -2186,7 +1698,7 @@
|
|
|
2068 |
IFS=$as_save_IFS
|
|
|
2069 |
test -z "$as_dir" && as_dir=.
|
|
|
2070 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
2071 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
2072 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
2073 |
ac_cv_prog_ac_ct_STRIP="strip"
|
|
|
2074 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
2075 |
break 2
|
|
|
2076 |
@@ -2193,34 +1705,20 @@
|
|
|
2077 |
fi
|
|
|
2078 |
done
|
|
|
2079 |
done
|
|
|
2080 |
-IFS=$as_save_IFS
|
|
|
2081 |
|
|
|
2082 |
+ test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
|
|
|
2083 |
fi
|
|
|
2084 |
fi
|
|
|
2085 |
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
|
|
|
2086 |
if test -n "$ac_ct_STRIP"; then
|
|
|
2087 |
- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
|
|
|
2088 |
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
|
|
|
2089 |
+ echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
|
|
|
2090 |
+echo "${ECHO_T}$ac_ct_STRIP" >&6
|
|
|
2091 |
else
|
|
|
2092 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
2093 |
-echo "${ECHO_T}no" >&6; }
|
|
|
2094 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
2095 |
+echo "${ECHO_T}no" >&6
|
|
|
2096 |
fi
|
|
|
2097 |
|
|
|
2098 |
- if test "x$ac_ct_STRIP" = x; then
|
|
|
2099 |
- STRIP=":"
|
|
|
2100 |
- else
|
|
|
2101 |
- case $cross_compiling:$ac_tool_warned in
|
|
|
2102 |
-yes:)
|
|
|
2103 |
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
|
2104 |
-whose name does not start with the host triplet. If you think this
|
|
|
2105 |
-configuration is useful to you, please write to [email protected]." >&5
|
|
|
2106 |
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
|
2107 |
-whose name does not start with the host triplet. If you think this
|
|
|
2108 |
-configuration is useful to you, please write to [email protected]." >&2;}
|
|
|
2109 |
-ac_tool_warned=yes ;;
|
|
|
2110 |
-esac
|
|
|
2111 |
- STRIP=$ac_ct_STRIP
|
|
|
2112 |
- fi
|
|
|
2113 |
+ STRIP=$ac_ct_STRIP
|
|
|
2114 |
else
|
|
|
2115 |
STRIP="$ac_cv_prog_STRIP"
|
|
|
2116 |
fi
|
|
|
2117 |
@@ -2233,22 +1731,22 @@
|
|
|
2118 |
|
|
|
2119 |
|
|
|
2120 |
|
|
|
2121 |
-ac_config_headers="$ac_config_headers config.h"
|
|
|
2122 |
+ ac_config_headers="$ac_config_headers config.h"
|
|
|
2123 |
|
|
|
2124 |
|
|
|
2125 |
-{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
|
|
2126 |
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
|
|
|
2127 |
- # Check whether --enable-maintainer-mode was given.
|
|
|
2128 |
+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
|
|
2129 |
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
|
|
|
2130 |
+ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
|
|
|
2131 |
if test "${enable_maintainer_mode+set}" = set; then
|
|
|
2132 |
- enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
|
|
|
2133 |
+ enableval="$enable_maintainer_mode"
|
|
|
2134 |
+ USE_MAINTAINER_MODE=$enableval
|
|
|
2135 |
else
|
|
|
2136 |
USE_MAINTAINER_MODE=no
|
|
|
2137 |
-fi
|
|
|
2138 |
+fi;
|
|
|
2139 |
+ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
|
|
|
2140 |
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
|
|
|
2141 |
|
|
|
2142 |
- { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
|
|
|
2143 |
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
|
|
|
2144 |
|
|
|
2145 |
-
|
|
|
2146 |
if test $USE_MAINTAINER_MODE = yes; then
|
|
|
2147 |
MAINTAINER_MODE_TRUE=
|
|
|
2148 |
MAINTAINER_MODE_FALSE='#'
|
|
|
2149 |
@@ -2263,7 +1761,7 @@
|
|
|
2150 |
|
|
|
2151 |
DEPDIR="${am__leading_dot}deps"
|
|
|
2152 |
|
|
|
2153 |
-ac_config_commands="$ac_config_commands depfiles"
|
|
|
2154 |
+ ac_config_commands="$ac_config_commands depfiles"
|
|
|
2155 |
|
|
|
2156 |
|
|
|
2157 |
am_make=${MAKE-make}
|
|
|
2158 |
@@ -2273,8 +1771,8 @@
|
|
|
2159 |
.PHONY: am__doit
|
|
|
2160 |
END
|
|
|
2161 |
# If we don't find an include directive, just comment out the code.
|
|
|
2162 |
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
|
|
|
2163 |
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
|
|
|
2164 |
+echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
|
|
|
2165 |
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
|
|
|
2166 |
am__include="#"
|
|
|
2167 |
am__quote=
|
|
|
2168 |
_am_result=none
|
|
|
2169 |
@@ -2301,15 +1799,15 @@
|
|
|
2170 |
fi
|
|
|
2171 |
|
|
|
2172 |
|
|
|
2173 |
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
|
|
|
2174 |
-echo "${ECHO_T}$_am_result" >&6; }
|
|
|
2175 |
+echo "$as_me:$LINENO: result: $_am_result" >&5
|
|
|
2176 |
+echo "${ECHO_T}$_am_result" >&6
|
|
|
2177 |
rm -f confinc confmf
|
|
|
2178 |
|
|
|
2179 |
-# Check whether --enable-dependency-tracking was given.
|
|
|
2180 |
+# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
|
|
|
2181 |
if test "${enable_dependency_tracking+set}" = set; then
|
|
|
2182 |
- enableval=$enable_dependency_tracking;
|
|
|
2183 |
-fi
|
|
|
2184 |
+ enableval="$enable_dependency_tracking"
|
|
|
2185 |
|
|
|
2186 |
+fi;
|
|
|
2187 |
if test "x$enable_dependency_tracking" != xno; then
|
|
|
2188 |
am_depcomp="$ac_aux_dir/depcomp"
|
|
|
2189 |
AMDEPBACKSLASH='\'
|
|
|
2190 |
@@ -2334,8 +1832,8 @@
|
|
|
2191 |
if test -n "$ac_tool_prefix"; then
|
|
|
2192 |
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
|
|
|
2193 |
set dummy ${ac_tool_prefix}gcc; ac_word=$2
|
|
|
2194 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
2195 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
2196 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
2197 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
2198 |
if test "${ac_cv_prog_CC+set}" = set; then
|
|
|
2199 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
2200 |
else
|
|
|
2201 |
@@ -2348,7 +1846,7 @@
|
|
|
2202 |
IFS=$as_save_IFS
|
|
|
2203 |
test -z "$as_dir" && as_dir=.
|
|
|
2204 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
2205 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
2206 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
2207 |
ac_cv_prog_CC="${ac_tool_prefix}gcc"
|
|
|
2208 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
2209 |
break 2
|
|
|
2210 |
@@ -2355,27 +1853,25 @@
|
|
|
2211 |
fi
|
|
|
2212 |
done
|
|
|
2213 |
done
|
|
|
2214 |
-IFS=$as_save_IFS
|
|
|
2215 |
|
|
|
2216 |
fi
|
|
|
2217 |
fi
|
|
|
2218 |
CC=$ac_cv_prog_CC
|
|
|
2219 |
if test -n "$CC"; then
|
|
|
2220 |
- { echo "$as_me:$LINENO: result: $CC" >&5
|
|
|
2221 |
-echo "${ECHO_T}$CC" >&6; }
|
|
|
2222 |
+ echo "$as_me:$LINENO: result: $CC" >&5
|
|
|
2223 |
+echo "${ECHO_T}$CC" >&6
|
|
|
2224 |
else
|
|
|
2225 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
2226 |
-echo "${ECHO_T}no" >&6; }
|
|
|
2227 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
2228 |
+echo "${ECHO_T}no" >&6
|
|
|
2229 |
fi
|
|
|
2230 |
|
|
|
2231 |
-
|
|
|
2232 |
fi
|
|
|
2233 |
if test -z "$ac_cv_prog_CC"; then
|
|
|
2234 |
ac_ct_CC=$CC
|
|
|
2235 |
# Extract the first word of "gcc", so it can be a program name with args.
|
|
|
2236 |
set dummy gcc; ac_word=$2
|
|
|
2237 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
2238 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
2239 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
2240 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
2241 |
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
|
|
2242 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
2243 |
else
|
|
|
2244 |
@@ -2388,7 +1884,7 @@
|
|
|
2245 |
IFS=$as_save_IFS
|
|
|
2246 |
test -z "$as_dir" && as_dir=.
|
|
|
2247 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
2248 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
2249 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
2250 |
ac_cv_prog_ac_ct_CC="gcc"
|
|
|
2251 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
2252 |
break 2
|
|
|
2253 |
@@ -2395,44 +1891,29 @@
|
|
|
2254 |
fi
|
|
|
2255 |
done
|
|
|
2256 |
done
|
|
|
2257 |
-IFS=$as_save_IFS
|
|
|
2258 |
|
|
|
2259 |
fi
|
|
|
2260 |
fi
|
|
|
2261 |
ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
|
2262 |
if test -n "$ac_ct_CC"; then
|
|
|
2263 |
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
|
2264 |
-echo "${ECHO_T}$ac_ct_CC" >&6; }
|
|
|
2265 |
+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
|
2266 |
+echo "${ECHO_T}$ac_ct_CC" >&6
|
|
|
2267 |
else
|
|
|
2268 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
2269 |
-echo "${ECHO_T}no" >&6; }
|
|
|
2270 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
2271 |
+echo "${ECHO_T}no" >&6
|
|
|
2272 |
fi
|
|
|
2273 |
|
|
|
2274 |
- if test "x$ac_ct_CC" = x; then
|
|
|
2275 |
- CC=""
|
|
|
2276 |
- else
|
|
|
2277 |
- case $cross_compiling:$ac_tool_warned in
|
|
|
2278 |
-yes:)
|
|
|
2279 |
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
|
2280 |
-whose name does not start with the host triplet. If you think this
|
|
|
2281 |
-configuration is useful to you, please write to [email protected]." >&5
|
|
|
2282 |
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
|
2283 |
-whose name does not start with the host triplet. If you think this
|
|
|
2284 |
-configuration is useful to you, please write to [email protected]." >&2;}
|
|
|
2285 |
-ac_tool_warned=yes ;;
|
|
|
2286 |
-esac
|
|
|
2287 |
- CC=$ac_ct_CC
|
|
|
2288 |
- fi
|
|
|
2289 |
+ CC=$ac_ct_CC
|
|
|
2290 |
else
|
|
|
2291 |
CC="$ac_cv_prog_CC"
|
|
|
2292 |
fi
|
|
|
2293 |
|
|
|
2294 |
if test -z "$CC"; then
|
|
|
2295 |
- if test -n "$ac_tool_prefix"; then
|
|
|
2296 |
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
|
|
|
2297 |
+ if test -n "$ac_tool_prefix"; then
|
|
|
2298 |
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
|
|
|
2299 |
set dummy ${ac_tool_prefix}cc; ac_word=$2
|
|
|
2300 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
2301 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
2302 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
2303 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
2304 |
if test "${ac_cv_prog_CC+set}" = set; then
|
|
|
2305 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
2306 |
else
|
|
|
2307 |
@@ -2445,7 +1926,7 @@
|
|
|
2308 |
IFS=$as_save_IFS
|
|
|
2309 |
test -z "$as_dir" && as_dir=.
|
|
|
2310 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
2311 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
2312 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
2313 |
ac_cv_prog_CC="${ac_tool_prefix}cc"
|
|
|
2314 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
2315 |
break 2
|
|
|
2316 |
@@ -2452,27 +1933,67 @@
|
|
|
2317 |
fi
|
|
|
2318 |
done
|
|
|
2319 |
done
|
|
|
2320 |
-IFS=$as_save_IFS
|
|
|
2321 |
|
|
|
2322 |
fi
|
|
|
2323 |
fi
|
|
|
2324 |
CC=$ac_cv_prog_CC
|
|
|
2325 |
if test -n "$CC"; then
|
|
|
2326 |
- { echo "$as_me:$LINENO: result: $CC" >&5
|
|
|
2327 |
-echo "${ECHO_T}$CC" >&6; }
|
|
|
2328 |
+ echo "$as_me:$LINENO: result: $CC" >&5
|
|
|
2329 |
+echo "${ECHO_T}$CC" >&6
|
|
|
2330 |
else
|
|
|
2331 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
2332 |
-echo "${ECHO_T}no" >&6; }
|
|
|
2333 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
2334 |
+echo "${ECHO_T}no" >&6
|
|
|
2335 |
fi
|
|
|
2336 |
|
|
|
2337 |
-
|
|
|
2338 |
+fi
|
|
|
2339 |
+if test -z "$ac_cv_prog_CC"; then
|
|
|
2340 |
+ ac_ct_CC=$CC
|
|
|
2341 |
+ # Extract the first word of "cc", so it can be a program name with args.
|
|
|
2342 |
+set dummy cc; ac_word=$2
|
|
|
2343 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
2344 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
2345 |
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
|
|
2346 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
2347 |
+else
|
|
|
2348 |
+ if test -n "$ac_ct_CC"; then
|
|
|
2349 |
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
|
|
2350 |
+else
|
|
|
2351 |
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
|
2352 |
+for as_dir in $PATH
|
|
|
2353 |
+do
|
|
|
2354 |
+ IFS=$as_save_IFS
|
|
|
2355 |
+ test -z "$as_dir" && as_dir=.
|
|
|
2356 |
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
2357 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
2358 |
+ ac_cv_prog_ac_ct_CC="cc"
|
|
|
2359 |
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
2360 |
+ break 2
|
|
|
2361 |
fi
|
|
|
2362 |
+done
|
|
|
2363 |
+done
|
|
|
2364 |
+
|
|
|
2365 |
fi
|
|
|
2366 |
+fi
|
|
|
2367 |
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
|
2368 |
+if test -n "$ac_ct_CC"; then
|
|
|
2369 |
+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
|
2370 |
+echo "${ECHO_T}$ac_ct_CC" >&6
|
|
|
2371 |
+else
|
|
|
2372 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
2373 |
+echo "${ECHO_T}no" >&6
|
|
|
2374 |
+fi
|
|
|
2375 |
+
|
|
|
2376 |
+ CC=$ac_ct_CC
|
|
|
2377 |
+else
|
|
|
2378 |
+ CC="$ac_cv_prog_CC"
|
|
|
2379 |
+fi
|
|
|
2380 |
+
|
|
|
2381 |
+fi
|
|
|
2382 |
if test -z "$CC"; then
|
|
|
2383 |
# Extract the first word of "cc", so it can be a program name with args.
|
|
|
2384 |
set dummy cc; ac_word=$2
|
|
|
2385 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
2386 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
2387 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
2388 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
2389 |
if test "${ac_cv_prog_CC+set}" = set; then
|
|
|
2390 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
2391 |
else
|
|
|
2392 |
@@ -2486,7 +2007,7 @@
|
|
|
2393 |
IFS=$as_save_IFS
|
|
|
2394 |
test -z "$as_dir" && as_dir=.
|
|
|
2395 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
2396 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
2397 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
2398 |
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
|
|
|
2399 |
ac_prog_rejected=yes
|
|
|
2400 |
continue
|
|
|
2401 |
@@ -2497,7 +2018,6 @@
|
|
|
2402 |
fi
|
|
|
2403 |
done
|
|
|
2404 |
done
|
|
|
2405 |
-IFS=$as_save_IFS
|
|
|
2406 |
|
|
|
2407 |
if test $ac_prog_rejected = yes; then
|
|
|
2408 |
# We found a bogon in the path, so make sure we never use it.
|
|
|
2409 |
@@ -2515,23 +2035,22 @@
|
|
|
2410 |
fi
|
|
|
2411 |
CC=$ac_cv_prog_CC
|
|
|
2412 |
if test -n "$CC"; then
|
|
|
2413 |
- { echo "$as_me:$LINENO: result: $CC" >&5
|
|
|
2414 |
-echo "${ECHO_T}$CC" >&6; }
|
|
|
2415 |
+ echo "$as_me:$LINENO: result: $CC" >&5
|
|
|
2416 |
+echo "${ECHO_T}$CC" >&6
|
|
|
2417 |
else
|
|
|
2418 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
2419 |
-echo "${ECHO_T}no" >&6; }
|
|
|
2420 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
2421 |
+echo "${ECHO_T}no" >&6
|
|
|
2422 |
fi
|
|
|
2423 |
|
|
|
2424 |
-
|
|
|
2425 |
fi
|
|
|
2426 |
if test -z "$CC"; then
|
|
|
2427 |
if test -n "$ac_tool_prefix"; then
|
|
|
2428 |
- for ac_prog in cl.exe
|
|
|
2429 |
+ for ac_prog in cl
|
|
|
2430 |
do
|
|
|
2431 |
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
|
|
|
2432 |
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
|
|
2433 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
2434 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
2435 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
2436 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
2437 |
if test "${ac_cv_prog_CC+set}" = set; then
|
|
|
2438 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
2439 |
else
|
|
|
2440 |
@@ -2544,7 +2063,7 @@
|
|
|
2441 |
IFS=$as_save_IFS
|
|
|
2442 |
test -z "$as_dir" && as_dir=.
|
|
|
2443 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
2444 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
2445 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
2446 |
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
|
|
|
2447 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
2448 |
break 2
|
|
|
2449 |
@@ -2551,31 +2070,29 @@
|
|
|
2450 |
fi
|
|
|
2451 |
done
|
|
|
2452 |
done
|
|
|
2453 |
-IFS=$as_save_IFS
|
|
|
2454 |
|
|
|
2455 |
fi
|
|
|
2456 |
fi
|
|
|
2457 |
CC=$ac_cv_prog_CC
|
|
|
2458 |
if test -n "$CC"; then
|
|
|
2459 |
- { echo "$as_me:$LINENO: result: $CC" >&5
|
|
|
2460 |
-echo "${ECHO_T}$CC" >&6; }
|
|
|
2461 |
+ echo "$as_me:$LINENO: result: $CC" >&5
|
|
|
2462 |
+echo "${ECHO_T}$CC" >&6
|
|
|
2463 |
else
|
|
|
2464 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
2465 |
-echo "${ECHO_T}no" >&6; }
|
|
|
2466 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
2467 |
+echo "${ECHO_T}no" >&6
|
|
|
2468 |
fi
|
|
|
2469 |
|
|
|
2470 |
-
|
|
|
2471 |
test -n "$CC" && break
|
|
|
2472 |
done
|
|
|
2473 |
fi
|
|
|
2474 |
if test -z "$CC"; then
|
|
|
2475 |
ac_ct_CC=$CC
|
|
|
2476 |
- for ac_prog in cl.exe
|
|
|
2477 |
+ for ac_prog in cl
|
|
|
2478 |
do
|
|
|
2479 |
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
|
2480 |
set dummy $ac_prog; ac_word=$2
|
|
|
2481 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
2482 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
2483 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
2484 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
2485 |
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
|
|
2486 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
2487 |
else
|
|
|
2488 |
@@ -2588,7 +2105,7 @@
|
|
|
2489 |
IFS=$as_save_IFS
|
|
|
2490 |
test -z "$as_dir" && as_dir=.
|
|
|
2491 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
2492 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
2493 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
2494 |
ac_cv_prog_ac_ct_CC="$ac_prog"
|
|
|
2495 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
2496 |
break 2
|
|
|
2497 |
@@ -2595,38 +2112,22 @@
|
|
|
2498 |
fi
|
|
|
2499 |
done
|
|
|
2500 |
done
|
|
|
2501 |
-IFS=$as_save_IFS
|
|
|
2502 |
|
|
|
2503 |
fi
|
|
|
2504 |
fi
|
|
|
2505 |
ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
|
2506 |
if test -n "$ac_ct_CC"; then
|
|
|
2507 |
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
|
2508 |
-echo "${ECHO_T}$ac_ct_CC" >&6; }
|
|
|
2509 |
+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
|
2510 |
+echo "${ECHO_T}$ac_ct_CC" >&6
|
|
|
2511 |
else
|
|
|
2512 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
2513 |
-echo "${ECHO_T}no" >&6; }
|
|
|
2514 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
2515 |
+echo "${ECHO_T}no" >&6
|
|
|
2516 |
fi
|
|
|
2517 |
|
|
|
2518 |
-
|
|
|
2519 |
test -n "$ac_ct_CC" && break
|
|
|
2520 |
done
|
|
|
2521 |
|
|
|
2522 |
- if test "x$ac_ct_CC" = x; then
|
|
|
2523 |
- CC=""
|
|
|
2524 |
- else
|
|
|
2525 |
- case $cross_compiling:$ac_tool_warned in
|
|
|
2526 |
-yes:)
|
|
|
2527 |
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
|
2528 |
-whose name does not start with the host triplet. If you think this
|
|
|
2529 |
-configuration is useful to you, please write to [email protected]." >&5
|
|
|
2530 |
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
|
2531 |
-whose name does not start with the host triplet. If you think this
|
|
|
2532 |
-configuration is useful to you, please write to [email protected]." >&2;}
|
|
|
2533 |
-ac_tool_warned=yes ;;
|
|
|
2534 |
-esac
|
|
|
2535 |
- CC=$ac_ct_CC
|
|
|
2536 |
- fi
|
|
|
2537 |
+ CC=$ac_ct_CC
|
|
|
2538 |
fi
|
|
|
2539 |
|
|
|
2540 |
fi
|
|
|
2541 |
@@ -2639,35 +2140,21 @@
|
|
|
2542 |
{ (exit 1); exit 1; }; }
|
|
|
2543 |
|
|
|
2544 |
# Provide some information about the compiler.
|
|
|
2545 |
-echo "$as_me:$LINENO: checking for C compiler version" >&5
|
|
|
2546 |
+echo "$as_me:$LINENO:" \
|
|
|
2547 |
+ "checking for C compiler version" >&5
|
|
|
2548 |
ac_compiler=`set X $ac_compile; echo $2`
|
|
|
2549 |
-{ (ac_try="$ac_compiler --version >&5"
|
|
|
2550 |
-case "(($ac_try" in
|
|
|
2551 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
2552 |
- *) ac_try_echo=$ac_try;;
|
|
|
2553 |
-esac
|
|
|
2554 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
2555 |
- (eval "$ac_compiler --version >&5") 2>&5
|
|
|
2556 |
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
|
|
2557 |
+ (eval $ac_compiler --version </dev/null >&5) 2>&5
|
|
|
2558 |
ac_status=$?
|
|
|
2559 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
2560 |
(exit $ac_status); }
|
|
|
2561 |
-{ (ac_try="$ac_compiler -v >&5"
|
|
|
2562 |
-case "(($ac_try" in
|
|
|
2563 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
2564 |
- *) ac_try_echo=$ac_try;;
|
|
|
2565 |
-esac
|
|
|
2566 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
2567 |
- (eval "$ac_compiler -v >&5") 2>&5
|
|
|
2568 |
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
|
|
|
2569 |
+ (eval $ac_compiler -v </dev/null >&5) 2>&5
|
|
|
2570 |
ac_status=$?
|
|
|
2571 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
2572 |
(exit $ac_status); }
|
|
|
2573 |
-{ (ac_try="$ac_compiler -V >&5"
|
|
|
2574 |
-case "(($ac_try" in
|
|
|
2575 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
2576 |
- *) ac_try_echo=$ac_try;;
|
|
|
2577 |
-esac
|
|
|
2578 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
2579 |
- (eval "$ac_compiler -V >&5") 2>&5
|
|
|
2580 |
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
|
|
|
2581 |
+ (eval $ac_compiler -V </dev/null >&5) 2>&5
|
|
|
2582 |
ac_status=$?
|
|
|
2583 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
2584 |
(exit $ac_status); }
|
|
|
2585 |
@@ -2692,77 +2179,47 @@
|
|
|
2586 |
# Try to create an executable without -o first, disregard a.out.
|
|
|
2587 |
# It will help us diagnose broken compilers, and finding out an intuition
|
|
|
2588 |
# of exeext.
|
|
|
2589 |
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
|
|
|
2590 |
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
|
|
|
2591 |
+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
|
|
|
2592 |
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
|
|
|
2593 |
ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
|
|
|
2594 |
-#
|
|
|
2595 |
-# List of possible output files, starting from the most likely.
|
|
|
2596 |
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
|
|
|
2597 |
-# only as a last resort. b.out is created by i960 compilers.
|
|
|
2598 |
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
|
|
|
2599 |
-#
|
|
|
2600 |
-# The IRIX 6 linker writes into existing files which may not be
|
|
|
2601 |
-# executable, retaining their permissions. Remove them first so a
|
|
|
2602 |
-# subsequent execution test works.
|
|
|
2603 |
-ac_rmfiles=
|
|
|
2604 |
-for ac_file in $ac_files
|
|
|
2605 |
-do
|
|
|
2606 |
- case $ac_file in
|
|
|
2607 |
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
|
|
|
2608 |
- * ) ac_rmfiles="$ac_rmfiles $ac_file";;
|
|
|
2609 |
- esac
|
|
|
2610 |
-done
|
|
|
2611 |
-rm -f $ac_rmfiles
|
|
|
2612 |
-
|
|
|
2613 |
-if { (ac_try="$ac_link_default"
|
|
|
2614 |
-case "(($ac_try" in
|
|
|
2615 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
2616 |
- *) ac_try_echo=$ac_try;;
|
|
|
2617 |
-esac
|
|
|
2618 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
2619 |
- (eval "$ac_link_default") 2>&5
|
|
|
2620 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
|
|
|
2621 |
+ (eval $ac_link_default) 2>&5
|
|
|
2622 |
ac_status=$?
|
|
|
2623 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
2624 |
(exit $ac_status); }; then
|
|
|
2625 |
- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
|
|
|
2626 |
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
|
|
|
2627 |
-# in a Makefile. We should not override ac_cv_exeext if it was cached,
|
|
|
2628 |
-# so that the user can short-circuit this test for compilers unknown to
|
|
|
2629 |
-# Autoconf.
|
|
|
2630 |
-for ac_file in $ac_files ''
|
|
|
2631 |
+ # Find the output, starting from the most likely. This scheme is
|
|
|
2632 |
+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
|
|
|
2633 |
+# resort.
|
|
|
2634 |
+
|
|
|
2635 |
+# Be careful to initialize this variable, since it used to be cached.
|
|
|
2636 |
+# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
|
|
|
2637 |
+ac_cv_exeext=
|
|
|
2638 |
+# b.out is created by i960 compilers.
|
|
|
2639 |
+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
|
|
|
2640 |
do
|
|
|
2641 |
test -f "$ac_file" || continue
|
|
|
2642 |
case $ac_file in
|
|
|
2643 |
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
|
|
|
2644 |
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
|
|
|
2645 |
;;
|
|
|
2646 |
+ conftest.$ac_ext )
|
|
|
2647 |
+ # This is the source file.
|
|
|
2648 |
+ ;;
|
|
|
2649 |
[ab].out )
|
|
|
2650 |
# We found the default executable, but exeext='' is most
|
|
|
2651 |
# certainly right.
|
|
|
2652 |
break;;
|
|
|
2653 |
*.* )
|
|
|
2654 |
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
|
|
|
2655 |
- then :; else
|
|
|
2656 |
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
|
|
2657 |
- fi
|
|
|
2658 |
- # We set ac_cv_exeext here because the later test for it is not
|
|
|
2659 |
- # safe: cross compilers may not add the suffix if given an `-o'
|
|
|
2660 |
- # argument, so we may need to know it at that point already.
|
|
|
2661 |
- # Even if this section looks crufty: it has the advantage of
|
|
|
2662 |
- # actually working.
|
|
|
2663 |
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
|
|
2664 |
+ # FIXME: I believe we export ac_cv_exeext for Libtool,
|
|
|
2665 |
+ # but it would be cool to find out if it's true. Does anybody
|
|
|
2666 |
+ # maintain Libtool? --akim.
|
|
|
2667 |
+ export ac_cv_exeext
|
|
|
2668 |
break;;
|
|
|
2669 |
* )
|
|
|
2670 |
break;;
|
|
|
2671 |
esac
|
|
|
2672 |
done
|
|
|
2673 |
-test "$ac_cv_exeext" = no && ac_cv_exeext=
|
|
|
2674 |
-
|
|
|
2675 |
else
|
|
|
2676 |
- ac_file=''
|
|
|
2677 |
-fi
|
|
|
2678 |
-
|
|
|
2679 |
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
|
|
|
2680 |
-echo "${ECHO_T}$ac_file" >&6; }
|
|
|
2681 |
-if test -z "$ac_file"; then
|
|
|
2682 |
echo "$as_me: failed program was:" >&5
|
|
|
2683 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
2684 |
|
|
|
2685 |
@@ -2774,21 +2231,19 @@
|
|
|
2686 |
fi
|
|
|
2687 |
|
|
|
2688 |
ac_exeext=$ac_cv_exeext
|
|
|
2689 |
+echo "$as_me:$LINENO: result: $ac_file" >&5
|
|
|
2690 |
+echo "${ECHO_T}$ac_file" >&6
|
|
|
2691 |
|
|
|
2692 |
-# Check that the compiler produces executables we can run. If not, either
|
|
|
2693 |
+# Check the compiler produces executables we can run. If not, either
|
|
|
2694 |
# the compiler is broken, or we cross compile.
|
|
|
2695 |
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
|
|
|
2696 |
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
|
|
|
2697 |
+echo "$as_me:$LINENO: checking whether the C compiler works" >&5
|
|
|
2698 |
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
|
|
|
2699 |
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
|
|
|
2700 |
# If not cross compiling, check that we can run a simple program.
|
|
|
2701 |
if test "$cross_compiling" != yes; then
|
|
|
2702 |
if { ac_try='./$ac_file'
|
|
|
2703 |
- { (case "(($ac_try" in
|
|
|
2704 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
2705 |
- *) ac_try_echo=$ac_try;;
|
|
|
2706 |
-esac
|
|
|
2707 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
2708 |
- (eval "$ac_try") 2>&5
|
|
|
2709 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
2710 |
+ (eval $ac_try) 2>&5
|
|
|
2711 |
ac_status=$?
|
|
|
2712 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
2713 |
(exit $ac_status); }; }; then
|
|
|
2714 |
@@ -2807,27 +2262,22 @@
|
|
|
2715 |
fi
|
|
|
2716 |
fi
|
|
|
2717 |
fi
|
|
|
2718 |
-{ echo "$as_me:$LINENO: result: yes" >&5
|
|
|
2719 |
-echo "${ECHO_T}yes" >&6; }
|
|
|
2720 |
+echo "$as_me:$LINENO: result: yes" >&5
|
|
|
2721 |
+echo "${ECHO_T}yes" >&6
|
|
|
2722 |
|
|
|
2723 |
rm -f a.out a.exe conftest$ac_cv_exeext b.out
|
|
|
2724 |
ac_clean_files=$ac_clean_files_save
|
|
|
2725 |
-# Check that the compiler produces executables we can run. If not, either
|
|
|
2726 |
+# Check the compiler produces executables we can run. If not, either
|
|
|
2727 |
# the compiler is broken, or we cross compile.
|
|
|
2728 |
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
|
|
|
2729 |
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
|
|
|
2730 |
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
|
|
|
2731 |
-echo "${ECHO_T}$cross_compiling" >&6; }
|
|
|
2732 |
+echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
|
|
|
2733 |
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
|
|
|
2734 |
+echo "$as_me:$LINENO: result: $cross_compiling" >&5
|
|
|
2735 |
+echo "${ECHO_T}$cross_compiling" >&6
|
|
|
2736 |
|
|
|
2737 |
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
|
|
|
2738 |
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
|
|
|
2739 |
-if { (ac_try="$ac_link"
|
|
|
2740 |
-case "(($ac_try" in
|
|
|
2741 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
2742 |
- *) ac_try_echo=$ac_try;;
|
|
|
2743 |
-esac
|
|
|
2744 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
2745 |
- (eval "$ac_link") 2>&5
|
|
|
2746 |
+echo "$as_me:$LINENO: checking for suffix of executables" >&5
|
|
|
2747 |
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
|
|
|
2748 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
2749 |
+ (eval $ac_link) 2>&5
|
|
|
2750 |
ac_status=$?
|
|
|
2751 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
2752 |
(exit $ac_status); }; then
|
|
|
2753 |
@@ -2838,8 +2288,9 @@
|
|
|
2754 |
for ac_file in conftest.exe conftest conftest.*; do
|
|
|
2755 |
test -f "$ac_file" || continue
|
|
|
2756 |
case $ac_file in
|
|
|
2757 |
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
|
|
|
2758 |
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
|
|
|
2759 |
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
|
|
2760 |
+ export ac_cv_exeext
|
|
|
2761 |
break;;
|
|
|
2762 |
* ) break;;
|
|
|
2763 |
esac
|
|
|
2764 |
@@ -2853,14 +2304,14 @@
|
|
|
2765 |
fi
|
|
|
2766 |
|
|
|
2767 |
rm -f conftest$ac_cv_exeext
|
|
|
2768 |
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
|
|
|
2769 |
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
|
|
|
2770 |
+echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
|
|
|
2771 |
+echo "${ECHO_T}$ac_cv_exeext" >&6
|
|
|
2772 |
|
|
|
2773 |
rm -f conftest.$ac_ext
|
|
|
2774 |
EXEEXT=$ac_cv_exeext
|
|
|
2775 |
ac_exeext=$EXEEXT
|
|
|
2776 |
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
|
|
|
2777 |
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
|
|
|
2778 |
+echo "$as_me:$LINENO: checking for suffix of object files" >&5
|
|
|
2779 |
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
|
|
|
2780 |
if test "${ac_cv_objext+set}" = set; then
|
|
|
2781 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
2782 |
else
|
|
|
2783 |
@@ -2880,20 +2331,14 @@
|
|
|
2784 |
}
|
|
|
2785 |
_ACEOF
|
|
|
2786 |
rm -f conftest.o conftest.obj
|
|
|
2787 |
-if { (ac_try="$ac_compile"
|
|
|
2788 |
-case "(($ac_try" in
|
|
|
2789 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
2790 |
- *) ac_try_echo=$ac_try;;
|
|
|
2791 |
-esac
|
|
|
2792 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
2793 |
- (eval "$ac_compile") 2>&5
|
|
|
2794 |
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
2795 |
+ (eval $ac_compile) 2>&5
|
|
|
2796 |
ac_status=$?
|
|
|
2797 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
2798 |
(exit $ac_status); }; then
|
|
|
2799 |
- for ac_file in conftest.o conftest.obj conftest.*; do
|
|
|
2800 |
- test -f "$ac_file" || continue;
|
|
|
2801 |
+ for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
|
|
|
2802 |
case $ac_file in
|
|
|
2803 |
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
|
|
|
2804 |
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
|
|
|
2805 |
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
|
|
|
2806 |
break;;
|
|
|
2807 |
esac
|
|
|
2808 |
@@ -2911,12 +2356,12 @@
|
|
|
2809 |
|
|
|
2810 |
rm -f conftest.$ac_cv_objext conftest.$ac_ext
|
|
|
2811 |
fi
|
|
|
2812 |
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
|
|
|
2813 |
-echo "${ECHO_T}$ac_cv_objext" >&6; }
|
|
|
2814 |
+echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
|
|
|
2815 |
+echo "${ECHO_T}$ac_cv_objext" >&6
|
|
|
2816 |
OBJEXT=$ac_cv_objext
|
|
|
2817 |
ac_objext=$OBJEXT
|
|
|
2818 |
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
|
|
|
2819 |
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
|
|
|
2820 |
+echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
|
|
|
2821 |
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
|
|
|
2822 |
if test "${ac_cv_c_compiler_gnu+set}" = set; then
|
|
|
2823 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
2824 |
else
|
|
|
2825 |
@@ -2939,49 +2384,50 @@
|
|
|
2826 |
}
|
|
|
2827 |
_ACEOF
|
|
|
2828 |
rm -f conftest.$ac_objext
|
|
|
2829 |
-if { (ac_try="$ac_compile"
|
|
|
2830 |
-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_compile") 2>conftest.er1
|
|
|
2836 |
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 |
- (exit $ac_status); } && {
|
|
|
2844 |
- test -z "$ac_c_werror_flag" ||
|
|
|
2845 |
- test ! -s conftest.err
|
|
|
2846 |
- } && test -s conftest.$ac_objext; then
|
|
|
2847 |
+ (exit $ac_status); } &&
|
|
|
2848 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
2849 |
+ || test ! -s conftest.err'
|
|
|
2850 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
2851 |
+ (eval $ac_try) 2>&5
|
|
|
2852 |
+ ac_status=$?
|
|
|
2853 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
2854 |
+ (exit $ac_status); }; } &&
|
|
|
2855 |
+ { ac_try='test -s conftest.$ac_objext'
|
|
|
2856 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
2857 |
+ (eval $ac_try) 2>&5
|
|
|
2858 |
+ ac_status=$?
|
|
|
2859 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
2860 |
+ (exit $ac_status); }; }; then
|
|
|
2861 |
ac_compiler_gnu=yes
|
|
|
2862 |
else
|
|
|
2863 |
echo "$as_me: failed program was:" >&5
|
|
|
2864 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
2865 |
|
|
|
2866 |
- ac_compiler_gnu=no
|
|
|
2867 |
+ac_compiler_gnu=no
|
|
|
2868 |
fi
|
|
|
2869 |
-
|
|
|
2870 |
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
2871 |
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
2872 |
ac_cv_c_compiler_gnu=$ac_compiler_gnu
|
|
|
2873 |
|
|
|
2874 |
fi
|
|
|
2875 |
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
|
|
|
2876 |
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
|
|
|
2877 |
+echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
|
|
|
2878 |
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
|
|
|
2879 |
GCC=`test $ac_compiler_gnu = yes && echo yes`
|
|
|
2880 |
ac_test_CFLAGS=${CFLAGS+set}
|
|
|
2881 |
ac_save_CFLAGS=$CFLAGS
|
|
|
2882 |
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
|
|
2883 |
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
|
|
|
2884 |
+CFLAGS="-g"
|
|
|
2885 |
+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
|
|
2886 |
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
|
|
|
2887 |
if test "${ac_cv_prog_cc_g+set}" = set; then
|
|
|
2888 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
2889 |
else
|
|
|
2890 |
- ac_save_c_werror_flag=$ac_c_werror_flag
|
|
|
2891 |
- ac_c_werror_flag=yes
|
|
|
2892 |
- ac_cv_prog_cc_g=no
|
|
|
2893 |
- CFLAGS="-g"
|
|
|
2894 |
- cat >conftest.$ac_ext <<_ACEOF
|
|
|
2895 |
+ cat >conftest.$ac_ext <<_ACEOF
|
|
|
2896 |
/* confdefs.h. */
|
|
|
2897 |
_ACEOF
|
|
|
2898 |
cat confdefs.h >>conftest.$ac_ext
|
|
|
2899 |
@@ -2997,118 +2443,38 @@
|
|
|
2900 |
}
|
|
|
2901 |
_ACEOF
|
|
|
2902 |
rm -f conftest.$ac_objext
|
|
|
2903 |
-if { (ac_try="$ac_compile"
|
|
|
2904 |
-case "(($ac_try" in
|
|
|
2905 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
2906 |
- *) ac_try_echo=$ac_try;;
|
|
|
2907 |
-esac
|
|
|
2908 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
2909 |
- (eval "$ac_compile") 2>conftest.er1
|
|
|
2910 |
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
2911 |
+ (eval $ac_compile) 2>conftest.er1
|
|
|
2912 |
ac_status=$?
|
|
|
2913 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
2914 |
rm -f conftest.er1
|
|
|
2915 |
cat conftest.err >&5
|
|
|
2916 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
2917 |
- (exit $ac_status); } && {
|
|
|
2918 |
- test -z "$ac_c_werror_flag" ||
|
|
|
2919 |
- test ! -s conftest.err
|
|
|
2920 |
- } && test -s conftest.$ac_objext; then
|
|
|
2921 |
- ac_cv_prog_cc_g=yes
|
|
|
2922 |
-else
|
|
|
2923 |
- echo "$as_me: failed program was:" >&5
|
|
|
2924 |
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
2925 |
-
|
|
|
2926 |
- CFLAGS=""
|
|
|
2927 |
- cat >conftest.$ac_ext <<_ACEOF
|
|
|
2928 |
-/* confdefs.h. */
|
|
|
2929 |
-_ACEOF
|
|
|
2930 |
-cat confdefs.h >>conftest.$ac_ext
|
|
|
2931 |
-cat >>conftest.$ac_ext <<_ACEOF
|
|
|
2932 |
-/* end confdefs.h. */
|
|
|
2933 |
-
|
|
|
2934 |
-int
|
|
|
2935 |
-main ()
|
|
|
2936 |
-{
|
|
|
2937 |
-
|
|
|
2938 |
- ;
|
|
|
2939 |
- return 0;
|
|
|
2940 |
-}
|
|
|
2941 |
-_ACEOF
|
|
|
2942 |
-rm -f conftest.$ac_objext
|
|
|
2943 |
-if { (ac_try="$ac_compile"
|
|
|
2944 |
-case "(($ac_try" in
|
|
|
2945 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
2946 |
- *) ac_try_echo=$ac_try;;
|
|
|
2947 |
-esac
|
|
|
2948 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
2949 |
- (eval "$ac_compile") 2>conftest.er1
|
|
|
2950 |
+ (exit $ac_status); } &&
|
|
|
2951 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
2952 |
+ || test ! -s conftest.err'
|
|
|
2953 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
2954 |
+ (eval $ac_try) 2>&5
|
|
|
2955 |
ac_status=$?
|
|
|
2956 |
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
2957 |
- rm -f conftest.er1
|
|
|
2958 |
- cat conftest.err >&5
|
|
|
2959 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
2960 |
- (exit $ac_status); } && {
|
|
|
2961 |
- test -z "$ac_c_werror_flag" ||
|
|
|
2962 |
- test ! -s conftest.err
|
|
|
2963 |
- } && test -s conftest.$ac_objext; then
|
|
|
2964 |
- :
|
|
|
2965 |
-else
|
|
|
2966 |
- echo "$as_me: failed program was:" >&5
|
|
|
2967 |
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
2968 |
-
|
|
|
2969 |
- ac_c_werror_flag=$ac_save_c_werror_flag
|
|
|
2970 |
- CFLAGS="-g"
|
|
|
2971 |
- cat >conftest.$ac_ext <<_ACEOF
|
|
|
2972 |
-/* confdefs.h. */
|
|
|
2973 |
-_ACEOF
|
|
|
2974 |
-cat confdefs.h >>conftest.$ac_ext
|
|
|
2975 |
-cat >>conftest.$ac_ext <<_ACEOF
|
|
|
2976 |
-/* end confdefs.h. */
|
|
|
2977 |
-
|
|
|
2978 |
-int
|
|
|
2979 |
-main ()
|
|
|
2980 |
-{
|
|
|
2981 |
-
|
|
|
2982 |
- ;
|
|
|
2983 |
- return 0;
|
|
|
2984 |
-}
|
|
|
2985 |
-_ACEOF
|
|
|
2986 |
-rm -f conftest.$ac_objext
|
|
|
2987 |
-if { (ac_try="$ac_compile"
|
|
|
2988 |
-case "(($ac_try" in
|
|
|
2989 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
2990 |
- *) ac_try_echo=$ac_try;;
|
|
|
2991 |
-esac
|
|
|
2992 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
2993 |
- (eval "$ac_compile") 2>conftest.er1
|
|
|
2994 |
+ (exit $ac_status); }; } &&
|
|
|
2995 |
+ { ac_try='test -s conftest.$ac_objext'
|
|
|
2996 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
2997 |
+ (eval $ac_try) 2>&5
|
|
|
2998 |
ac_status=$?
|
|
|
2999 |
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
3000 |
- rm -f conftest.er1
|
|
|
3001 |
- cat conftest.err >&5
|
|
|
3002 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3003 |
- (exit $ac_status); } && {
|
|
|
3004 |
- test -z "$ac_c_werror_flag" ||
|
|
|
3005 |
- test ! -s conftest.err
|
|
|
3006 |
- } && test -s conftest.$ac_objext; then
|
|
|
3007 |
+ (exit $ac_status); }; }; then
|
|
|
3008 |
ac_cv_prog_cc_g=yes
|
|
|
3009 |
else
|
|
|
3010 |
echo "$as_me: failed program was:" >&5
|
|
|
3011 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
3012 |
|
|
|
3013 |
-
|
|
|
3014 |
+ac_cv_prog_cc_g=no
|
|
|
3015 |
fi
|
|
|
3016 |
-
|
|
|
3017 |
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
3018 |
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
3019 |
fi
|
|
|
3020 |
-
|
|
|
3021 |
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
3022 |
-fi
|
|
|
3023 |
-
|
|
|
3024 |
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
3025 |
- ac_c_werror_flag=$ac_save_c_werror_flag
|
|
|
3026 |
-fi
|
|
|
3027 |
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
|
|
|
3028 |
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
|
|
|
3029 |
+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
|
|
|
3030 |
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
|
|
|
3031 |
if test "$ac_test_CFLAGS" = set; then
|
|
|
3032 |
CFLAGS=$ac_save_CFLAGS
|
|
|
3033 |
elif test $ac_cv_prog_cc_g = yes; then
|
|
|
3034 |
@@ -3124,12 +2490,12 @@
|
|
|
3035 |
CFLAGS=
|
|
|
3036 |
fi
|
|
|
3037 |
fi
|
|
|
3038 |
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
|
|
|
3039 |
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
|
|
|
3040 |
-if test "${ac_cv_prog_cc_c89+set}" = set; then
|
|
|
3041 |
+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
|
|
|
3042 |
+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
|
|
|
3043 |
+if test "${ac_cv_prog_cc_stdc+set}" = set; then
|
|
|
3044 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
3045 |
else
|
|
|
3046 |
- ac_cv_prog_cc_c89=no
|
|
|
3047 |
+ ac_cv_prog_cc_stdc=no
|
|
|
3048 |
ac_save_CC=$CC
|
|
|
3049 |
cat >conftest.$ac_ext <<_ACEOF
|
|
|
3050 |
/* confdefs.h. */
|
|
|
3051 |
@@ -3163,17 +2529,12 @@
|
|
|
3052 |
/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
|
|
|
3053 |
function prototypes and stuff, but not '\xHH' hex character constants.
|
|
|
3054 |
These don't provoke an error unfortunately, instead are silently treated
|
|
|
3055 |
- as 'x'. The following induces an error, until -std is added to get
|
|
|
3056 |
+ as 'x'. The following induces an error, until -std1 is added to get
|
|
|
3057 |
proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
|
|
|
3058 |
array size at least. It's necessary to write '\x00'==0 to get something
|
|
|
3059 |
- that's true only with -std. */
|
|
|
3060 |
+ that's true only with -std1. */
|
|
|
3061 |
int osf4_cc_array ['\x00' == 0 ? 1 : -1];
|
|
|
3062 |
|
|
|
3063 |
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
|
|
|
3064 |
- inside strings and character constants. */
|
|
|
3065 |
-#define FOO(x) 'x'
|
|
|
3066 |
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
|
|
|
3067 |
-
|
|
|
3068 |
int test (int i, double x);
|
|
|
3069 |
struct s1 {int (*f) (int a);};
|
|
|
3070 |
struct s2 {int (*f) (double a);};
|
|
|
3071 |
@@ -3188,57 +2549,205 @@
|
|
|
3072 |
return 0;
|
|
|
3073 |
}
|
|
|
3074 |
_ACEOF
|
|
|
3075 |
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
|
|
|
3076 |
- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
|
|
|
3077 |
+# Don't try gcc -ansi; that turns off useful extensions and
|
|
|
3078 |
+# breaks some systems' header files.
|
|
|
3079 |
+# AIX -qlanglvl=ansi
|
|
|
3080 |
+# Ultrix and OSF/1 -std1
|
|
|
3081 |
+# HP-UX 10.20 and later -Ae
|
|
|
3082 |
+# HP-UX older versions -Aa -D_HPUX_SOURCE
|
|
|
3083 |
+# SVR4 -Xc -D__EXTENSIONS__
|
|
|
3084 |
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
|
|
|
3085 |
do
|
|
|
3086 |
CC="$ac_save_CC $ac_arg"
|
|
|
3087 |
rm -f conftest.$ac_objext
|
|
|
3088 |
-if { (ac_try="$ac_compile"
|
|
|
3089 |
-case "(($ac_try" in
|
|
|
3090 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
3091 |
- *) ac_try_echo=$ac_try;;
|
|
|
3092 |
-esac
|
|
|
3093 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
3094 |
- (eval "$ac_compile") 2>conftest.er1
|
|
|
3095 |
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
3096 |
+ (eval $ac_compile) 2>conftest.er1
|
|
|
3097 |
ac_status=$?
|
|
|
3098 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
3099 |
rm -f conftest.er1
|
|
|
3100 |
cat conftest.err >&5
|
|
|
3101 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3102 |
- (exit $ac_status); } && {
|
|
|
3103 |
- test -z "$ac_c_werror_flag" ||
|
|
|
3104 |
- test ! -s conftest.err
|
|
|
3105 |
- } && test -s conftest.$ac_objext; then
|
|
|
3106 |
- ac_cv_prog_cc_c89=$ac_arg
|
|
|
3107 |
+ (exit $ac_status); } &&
|
|
|
3108 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
3109 |
+ || test ! -s conftest.err'
|
|
|
3110 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
3111 |
+ (eval $ac_try) 2>&5
|
|
|
3112 |
+ ac_status=$?
|
|
|
3113 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3114 |
+ (exit $ac_status); }; } &&
|
|
|
3115 |
+ { ac_try='test -s conftest.$ac_objext'
|
|
|
3116 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
3117 |
+ (eval $ac_try) 2>&5
|
|
|
3118 |
+ ac_status=$?
|
|
|
3119 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3120 |
+ (exit $ac_status); }; }; then
|
|
|
3121 |
+ ac_cv_prog_cc_stdc=$ac_arg
|
|
|
3122 |
+break
|
|
|
3123 |
else
|
|
|
3124 |
echo "$as_me: failed program was:" >&5
|
|
|
3125 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
3126 |
|
|
|
3127 |
-
|
|
|
3128 |
fi
|
|
|
3129 |
-
|
|
|
3130 |
-rm -f core conftest.err conftest.$ac_objext
|
|
|
3131 |
- test "x$ac_cv_prog_cc_c89" != "xno" && break
|
|
|
3132 |
+rm -f conftest.err conftest.$ac_objext
|
|
|
3133 |
done
|
|
|
3134 |
-rm -f conftest.$ac_ext
|
|
|
3135 |
+rm -f conftest.$ac_ext conftest.$ac_objext
|
|
|
3136 |
CC=$ac_save_CC
|
|
|
3137 |
|
|
|
3138 |
fi
|
|
|
3139 |
-# AC_CACHE_VAL
|
|
|
3140 |
-case "x$ac_cv_prog_cc_c89" in
|
|
|
3141 |
- x)
|
|
|
3142 |
- { echo "$as_me:$LINENO: result: none needed" >&5
|
|
|
3143 |
-echo "${ECHO_T}none needed" >&6; } ;;
|
|
|
3144 |
- xno)
|
|
|
3145 |
- { echo "$as_me:$LINENO: result: unsupported" >&5
|
|
|
3146 |
-echo "${ECHO_T}unsupported" >&6; } ;;
|
|
|
3147 |
+
|
|
|
3148 |
+case "x$ac_cv_prog_cc_stdc" in
|
|
|
3149 |
+ x|xno)
|
|
|
3150 |
+ echo "$as_me:$LINENO: result: none needed" >&5
|
|
|
3151 |
+echo "${ECHO_T}none needed" >&6 ;;
|
|
|
3152 |
*)
|
|
|
3153 |
- CC="$CC $ac_cv_prog_cc_c89"
|
|
|
3154 |
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
|
|
|
3155 |
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
|
|
|
3156 |
+ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
|
|
|
3157 |
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
|
|
|
3158 |
+ CC="$CC $ac_cv_prog_cc_stdc" ;;
|
|
|
3159 |
esac
|
|
|
3160 |
|
|
|
3161 |
+# Some people use a C++ compiler to compile C. Since we use `exit',
|
|
|
3162 |
+# in C++ we need to declare it. In case someone uses the same compiler
|
|
|
3163 |
+# for both compiling C and C++ we need to have the C++ compiler decide
|
|
|
3164 |
+# the declaration of exit, since it's the most demanding environment.
|
|
|
3165 |
+cat >conftest.$ac_ext <<_ACEOF
|
|
|
3166 |
+#ifndef __cplusplus
|
|
|
3167 |
+ choke me
|
|
|
3168 |
+#endif
|
|
|
3169 |
+_ACEOF
|
|
|
3170 |
+rm -f conftest.$ac_objext
|
|
|
3171 |
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
3172 |
+ (eval $ac_compile) 2>conftest.er1
|
|
|
3173 |
+ ac_status=$?
|
|
|
3174 |
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
3175 |
+ rm -f conftest.er1
|
|
|
3176 |
+ cat conftest.err >&5
|
|
|
3177 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3178 |
+ (exit $ac_status); } &&
|
|
|
3179 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
3180 |
+ || test ! -s conftest.err'
|
|
|
3181 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
3182 |
+ (eval $ac_try) 2>&5
|
|
|
3183 |
+ ac_status=$?
|
|
|
3184 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3185 |
+ (exit $ac_status); }; } &&
|
|
|
3186 |
+ { ac_try='test -s conftest.$ac_objext'
|
|
|
3187 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
3188 |
+ (eval $ac_try) 2>&5
|
|
|
3189 |
+ ac_status=$?
|
|
|
3190 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3191 |
+ (exit $ac_status); }; }; then
|
|
|
3192 |
+ for ac_declaration in \
|
|
|
3193 |
+ '' \
|
|
|
3194 |
+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
|
|
|
3195 |
+ 'extern "C" void std::exit (int); using std::exit;' \
|
|
|
3196 |
+ 'extern "C" void exit (int) throw ();' \
|
|
|
3197 |
+ 'extern "C" void exit (int);' \
|
|
|
3198 |
+ 'void exit (int);'
|
|
|
3199 |
+do
|
|
|
3200 |
+ cat >conftest.$ac_ext <<_ACEOF
|
|
|
3201 |
+/* confdefs.h. */
|
|
|
3202 |
+_ACEOF
|
|
|
3203 |
+cat confdefs.h >>conftest.$ac_ext
|
|
|
3204 |
+cat >>conftest.$ac_ext <<_ACEOF
|
|
|
3205 |
+/* end confdefs.h. */
|
|
|
3206 |
+$ac_declaration
|
|
|
3207 |
+#include <stdlib.h>
|
|
|
3208 |
+int
|
|
|
3209 |
+main ()
|
|
|
3210 |
+{
|
|
|
3211 |
+exit (42);
|
|
|
3212 |
+ ;
|
|
|
3213 |
+ return 0;
|
|
|
3214 |
+}
|
|
|
3215 |
+_ACEOF
|
|
|
3216 |
+rm -f conftest.$ac_objext
|
|
|
3217 |
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
3218 |
+ (eval $ac_compile) 2>conftest.er1
|
|
|
3219 |
+ ac_status=$?
|
|
|
3220 |
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
3221 |
+ rm -f conftest.er1
|
|
|
3222 |
+ cat conftest.err >&5
|
|
|
3223 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3224 |
+ (exit $ac_status); } &&
|
|
|
3225 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
3226 |
+ || test ! -s conftest.err'
|
|
|
3227 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
3228 |
+ (eval $ac_try) 2>&5
|
|
|
3229 |
+ ac_status=$?
|
|
|
3230 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3231 |
+ (exit $ac_status); }; } &&
|
|
|
3232 |
+ { ac_try='test -s conftest.$ac_objext'
|
|
|
3233 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
3234 |
+ (eval $ac_try) 2>&5
|
|
|
3235 |
+ ac_status=$?
|
|
|
3236 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3237 |
+ (exit $ac_status); }; }; then
|
|
|
3238 |
+ :
|
|
|
3239 |
+else
|
|
|
3240 |
+ echo "$as_me: failed program was:" >&5
|
|
|
3241 |
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
3242 |
|
|
|
3243 |
+continue
|
|
|
3244 |
+fi
|
|
|
3245 |
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
3246 |
+ cat >conftest.$ac_ext <<_ACEOF
|
|
|
3247 |
+/* confdefs.h. */
|
|
|
3248 |
+_ACEOF
|
|
|
3249 |
+cat confdefs.h >>conftest.$ac_ext
|
|
|
3250 |
+cat >>conftest.$ac_ext <<_ACEOF
|
|
|
3251 |
+/* end confdefs.h. */
|
|
|
3252 |
+$ac_declaration
|
|
|
3253 |
+int
|
|
|
3254 |
+main ()
|
|
|
3255 |
+{
|
|
|
3256 |
+exit (42);
|
|
|
3257 |
+ ;
|
|
|
3258 |
+ return 0;
|
|
|
3259 |
+}
|
|
|
3260 |
+_ACEOF
|
|
|
3261 |
+rm -f conftest.$ac_objext
|
|
|
3262 |
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
3263 |
+ (eval $ac_compile) 2>conftest.er1
|
|
|
3264 |
+ ac_status=$?
|
|
|
3265 |
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
3266 |
+ rm -f conftest.er1
|
|
|
3267 |
+ cat conftest.err >&5
|
|
|
3268 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3269 |
+ (exit $ac_status); } &&
|
|
|
3270 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
3271 |
+ || test ! -s conftest.err'
|
|
|
3272 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
3273 |
+ (eval $ac_try) 2>&5
|
|
|
3274 |
+ ac_status=$?
|
|
|
3275 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3276 |
+ (exit $ac_status); }; } &&
|
|
|
3277 |
+ { ac_try='test -s conftest.$ac_objext'
|
|
|
3278 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
3279 |
+ (eval $ac_try) 2>&5
|
|
|
3280 |
+ ac_status=$?
|
|
|
3281 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3282 |
+ (exit $ac_status); }; }; then
|
|
|
3283 |
+ break
|
|
|
3284 |
+else
|
|
|
3285 |
+ echo "$as_me: failed program was:" >&5
|
|
|
3286 |
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
3287 |
+
|
|
|
3288 |
+fi
|
|
|
3289 |
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
3290 |
+done
|
|
|
3291 |
+rm -f conftest*
|
|
|
3292 |
+if test -n "$ac_declaration"; then
|
|
|
3293 |
+ echo '#ifdef __cplusplus' >>confdefs.h
|
|
|
3294 |
+ echo $ac_declaration >>confdefs.h
|
|
|
3295 |
+ echo '#endif' >>confdefs.h
|
|
|
3296 |
+fi
|
|
|
3297 |
+
|
|
|
3298 |
+else
|
|
|
3299 |
+ echo "$as_me: failed program was:" >&5
|
|
|
3300 |
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
3301 |
+
|
|
|
3302 |
+fi
|
|
|
3303 |
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
3304 |
ac_ext=c
|
|
|
3305 |
ac_cpp='$CPP $CPPFLAGS'
|
|
|
3306 |
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
|
3307 |
@@ -3247,8 +2756,8 @@
|
|
|
3308 |
|
|
|
3309 |
depcc="$CC" am_compiler_list=
|
|
|
3310 |
|
|
|
3311 |
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
|
|
|
3312 |
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
|
|
|
3313 |
+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
|
|
|
3314 |
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
|
|
|
3315 |
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
|
|
|
3316 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
3317 |
else
|
|
|
3318 |
@@ -3330,8 +2839,8 @@
|
|
|
3319 |
fi
|
|
|
3320 |
|
|
|
3321 |
fi
|
|
|
3322 |
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
|
|
|
3323 |
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
|
|
|
3324 |
+echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
|
|
|
3325 |
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
|
|
|
3326 |
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
|
|
|
3327 |
|
|
|
3328 |
|
|
|
3329 |
@@ -3353,8 +2862,8 @@
|
|
|
3330 |
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
|
3331 |
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
|
3332 |
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
3333 |
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
|
|
|
3334 |
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
|
|
|
3335 |
+echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
|
|
|
3336 |
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
|
|
|
3337 |
# On Suns, sometimes $CPP names a directory.
|
|
|
3338 |
if test -n "$CPP" && test -d "$CPP"; then
|
|
|
3339 |
CPP=
|
|
|
3340 |
@@ -3388,22 +2897,24 @@
|
|
|
3341 |
#endif
|
|
|
3342 |
Syntax error
|
|
|
3343 |
_ACEOF
|
|
|
3344 |
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
|
3345 |
-case "(($ac_try" in
|
|
|
3346 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
3347 |
- *) ac_try_echo=$ac_try;;
|
|
|
3348 |
-esac
|
|
|
3349 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
3350 |
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
|
|
3351 |
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
|
|
3352 |
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
|
|
3353 |
ac_status=$?
|
|
|
3354 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
3355 |
rm -f conftest.er1
|
|
|
3356 |
cat conftest.err >&5
|
|
|
3357 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3358 |
- (exit $ac_status); } >/dev/null && {
|
|
|
3359 |
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
|
3360 |
- test ! -s conftest.err
|
|
|
3361 |
- }; then
|
|
|
3362 |
+ (exit $ac_status); } >/dev/null; then
|
|
|
3363 |
+ if test -s conftest.err; then
|
|
|
3364 |
+ ac_cpp_err=$ac_c_preproc_warn_flag
|
|
|
3365 |
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
|
3366 |
+ else
|
|
|
3367 |
+ ac_cpp_err=
|
|
|
3368 |
+ fi
|
|
|
3369 |
+else
|
|
|
3370 |
+ ac_cpp_err=yes
|
|
|
3371 |
+fi
|
|
|
3372 |
+if test -z "$ac_cpp_err"; then
|
|
|
3373 |
:
|
|
|
3374 |
else
|
|
|
3375 |
echo "$as_me: failed program was:" >&5
|
|
|
3376 |
@@ -3412,10 +2923,9 @@
|
|
|
3377 |
# Broken: fails on valid input.
|
|
|
3378 |
continue
|
|
|
3379 |
fi
|
|
|
3380 |
-
|
|
|
3381 |
rm -f conftest.err conftest.$ac_ext
|
|
|
3382 |
|
|
|
3383 |
- # OK, works on sane cases. Now check whether nonexistent headers
|
|
|
3384 |
+ # OK, works on sane cases. Now check whether non-existent headers
|
|
|
3385 |
# can be detected and how.
|
|
|
3386 |
cat >conftest.$ac_ext <<_ACEOF
|
|
|
3387 |
/* confdefs.h. */
|
|
|
3388 |
@@ -3425,22 +2935,24 @@
|
|
|
3389 |
/* end confdefs.h. */
|
|
|
3390 |
#include <ac_nonexistent.h>
|
|
|
3391 |
_ACEOF
|
|
|
3392 |
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
|
3393 |
-case "(($ac_try" in
|
|
|
3394 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
3395 |
- *) ac_try_echo=$ac_try;;
|
|
|
3396 |
-esac
|
|
|
3397 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
3398 |
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
|
|
3399 |
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
|
|
3400 |
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
|
|
3401 |
ac_status=$?
|
|
|
3402 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
3403 |
rm -f conftest.er1
|
|
|
3404 |
cat conftest.err >&5
|
|
|
3405 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3406 |
- (exit $ac_status); } >/dev/null && {
|
|
|
3407 |
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
|
3408 |
- test ! -s conftest.err
|
|
|
3409 |
- }; then
|
|
|
3410 |
+ (exit $ac_status); } >/dev/null; then
|
|
|
3411 |
+ if test -s conftest.err; then
|
|
|
3412 |
+ ac_cpp_err=$ac_c_preproc_warn_flag
|
|
|
3413 |
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
|
3414 |
+ else
|
|
|
3415 |
+ ac_cpp_err=
|
|
|
3416 |
+ fi
|
|
|
3417 |
+else
|
|
|
3418 |
+ ac_cpp_err=yes
|
|
|
3419 |
+fi
|
|
|
3420 |
+if test -z "$ac_cpp_err"; then
|
|
|
3421 |
# Broken: success on invalid input.
|
|
|
3422 |
continue
|
|
|
3423 |
else
|
|
|
3424 |
@@ -3451,7 +2963,6 @@
|
|
|
3425 |
ac_preproc_ok=:
|
|
|
3426 |
break
|
|
|
3427 |
fi
|
|
|
3428 |
-
|
|
|
3429 |
rm -f conftest.err conftest.$ac_ext
|
|
|
3430 |
|
|
|
3431 |
done
|
|
|
3432 |
@@ -3469,8 +2980,8 @@
|
|
|
3433 |
else
|
|
|
3434 |
ac_cv_prog_CPP=$CPP
|
|
|
3435 |
fi
|
|
|
3436 |
-{ echo "$as_me:$LINENO: result: $CPP" >&5
|
|
|
3437 |
-echo "${ECHO_T}$CPP" >&6; }
|
|
|
3438 |
+echo "$as_me:$LINENO: result: $CPP" >&5
|
|
|
3439 |
+echo "${ECHO_T}$CPP" >&6
|
|
|
3440 |
ac_preproc_ok=false
|
|
|
3441 |
for ac_c_preproc_warn_flag in '' yes
|
|
|
3442 |
do
|
|
|
3443 |
@@ -3493,22 +3004,24 @@
|
|
|
3444 |
#endif
|
|
|
3445 |
Syntax error
|
|
|
3446 |
_ACEOF
|
|
|
3447 |
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
|
3448 |
-case "(($ac_try" in
|
|
|
3449 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
3450 |
- *) ac_try_echo=$ac_try;;
|
|
|
3451 |
-esac
|
|
|
3452 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
3453 |
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
|
|
3454 |
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
|
|
3455 |
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
|
|
3456 |
ac_status=$?
|
|
|
3457 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
3458 |
rm -f conftest.er1
|
|
|
3459 |
cat conftest.err >&5
|
|
|
3460 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3461 |
- (exit $ac_status); } >/dev/null && {
|
|
|
3462 |
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
|
3463 |
- test ! -s conftest.err
|
|
|
3464 |
- }; then
|
|
|
3465 |
+ (exit $ac_status); } >/dev/null; then
|
|
|
3466 |
+ if test -s conftest.err; then
|
|
|
3467 |
+ ac_cpp_err=$ac_c_preproc_warn_flag
|
|
|
3468 |
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
|
3469 |
+ else
|
|
|
3470 |
+ ac_cpp_err=
|
|
|
3471 |
+ fi
|
|
|
3472 |
+else
|
|
|
3473 |
+ ac_cpp_err=yes
|
|
|
3474 |
+fi
|
|
|
3475 |
+if test -z "$ac_cpp_err"; then
|
|
|
3476 |
:
|
|
|
3477 |
else
|
|
|
3478 |
echo "$as_me: failed program was:" >&5
|
|
|
3479 |
@@ -3517,10 +3030,9 @@
|
|
|
3480 |
# Broken: fails on valid input.
|
|
|
3481 |
continue
|
|
|
3482 |
fi
|
|
|
3483 |
-
|
|
|
3484 |
rm -f conftest.err conftest.$ac_ext
|
|
|
3485 |
|
|
|
3486 |
- # OK, works on sane cases. Now check whether nonexistent headers
|
|
|
3487 |
+ # OK, works on sane cases. Now check whether non-existent headers
|
|
|
3488 |
# can be detected and how.
|
|
|
3489 |
cat >conftest.$ac_ext <<_ACEOF
|
|
|
3490 |
/* confdefs.h. */
|
|
|
3491 |
@@ -3530,22 +3042,24 @@
|
|
|
3492 |
/* end confdefs.h. */
|
|
|
3493 |
#include <ac_nonexistent.h>
|
|
|
3494 |
_ACEOF
|
|
|
3495 |
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
|
3496 |
-case "(($ac_try" in
|
|
|
3497 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
3498 |
- *) ac_try_echo=$ac_try;;
|
|
|
3499 |
-esac
|
|
|
3500 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
3501 |
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
|
|
3502 |
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
|
|
3503 |
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
|
|
3504 |
ac_status=$?
|
|
|
3505 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
3506 |
rm -f conftest.er1
|
|
|
3507 |
cat conftest.err >&5
|
|
|
3508 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3509 |
- (exit $ac_status); } >/dev/null && {
|
|
|
3510 |
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
|
3511 |
- test ! -s conftest.err
|
|
|
3512 |
- }; then
|
|
|
3513 |
+ (exit $ac_status); } >/dev/null; then
|
|
|
3514 |
+ if test -s conftest.err; then
|
|
|
3515 |
+ ac_cpp_err=$ac_c_preproc_warn_flag
|
|
|
3516 |
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
|
3517 |
+ else
|
|
|
3518 |
+ ac_cpp_err=
|
|
|
3519 |
+ fi
|
|
|
3520 |
+else
|
|
|
3521 |
+ ac_cpp_err=yes
|
|
|
3522 |
+fi
|
|
|
3523 |
+if test -z "$ac_cpp_err"; then
|
|
|
3524 |
# Broken: success on invalid input.
|
|
|
3525 |
continue
|
|
|
3526 |
else
|
|
|
3527 |
@@ -3556,7 +3070,6 @@
|
|
|
3528 |
ac_preproc_ok=:
|
|
|
3529 |
break
|
|
|
3530 |
fi
|
|
|
3531 |
-
|
|
|
3532 |
rm -f conftest.err conftest.$ac_ext
|
|
|
3533 |
|
|
|
3534 |
done
|
|
|
3535 |
@@ -3579,171 +3092,24 @@
|
|
|
3536 |
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
3537 |
|
|
|
3538 |
|
|
|
3539 |
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
|
|
|
3540 |
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
|
|
|
3541 |
-if test "${ac_cv_path_GREP+set}" = set; then
|
|
|
3542 |
+echo "$as_me:$LINENO: checking for egrep" >&5
|
|
|
3543 |
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
|
|
|
3544 |
+if test "${ac_cv_prog_egrep+set}" = set; then
|
|
|
3545 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
3546 |
else
|
|
|
3547 |
- # Extract the first word of "grep ggrep" to use in msg output
|
|
|
3548 |
-if test -z "$GREP"; then
|
|
|
3549 |
-set dummy grep ggrep; ac_prog_name=$2
|
|
|
3550 |
-if test "${ac_cv_path_GREP+set}" = set; then
|
|
|
3551 |
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
3552 |
-else
|
|
|
3553 |
- ac_path_GREP_found=false
|
|
|
3554 |
-# Loop through the user's path and test for each of PROGNAME-LIST
|
|
|
3555 |
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
|
3556 |
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
|
|
3557 |
-do
|
|
|
3558 |
- IFS=$as_save_IFS
|
|
|
3559 |
- test -z "$as_dir" && as_dir=.
|
|
|
3560 |
- for ac_prog in grep ggrep; do
|
|
|
3561 |
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
3562 |
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
|
3563 |
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
|
|
|
3564 |
- # Check for GNU ac_path_GREP and select it if it is found.
|
|
|
3565 |
- # Check for GNU $ac_path_GREP
|
|
|
3566 |
-case `"$ac_path_GREP" --version 2>&1` in
|
|
|
3567 |
-*GNU*)
|
|
|
3568 |
- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
|
|
|
3569 |
-*)
|
|
|
3570 |
- ac_count=0
|
|
|
3571 |
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
|
|
|
3572 |
- while :
|
|
|
3573 |
- do
|
|
|
3574 |
- cat "conftest.in" "conftest.in" >"conftest.tmp"
|
|
|
3575 |
- mv "conftest.tmp" "conftest.in"
|
|
|
3576 |
- cp "conftest.in" "conftest.nl"
|
|
|
3577 |
- echo 'GREP' >> "conftest.nl"
|
|
|
3578 |
- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
|
|
3579 |
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
|
|
3580 |
- ac_count=`expr $ac_count + 1`
|
|
|
3581 |
- if test $ac_count -gt ${ac_path_GREP_max-0}; then
|
|
|
3582 |
- # Best one so far, save it but keep looking for a better one
|
|
|
3583 |
- ac_cv_path_GREP="$ac_path_GREP"
|
|
|
3584 |
- ac_path_GREP_max=$ac_count
|
|
|
3585 |
+ if echo a | (grep -E '(a|b)') >/dev/null 2>&1
|
|
|
3586 |
+ then ac_cv_prog_egrep='grep -E'
|
|
|
3587 |
+ else ac_cv_prog_egrep='egrep'
|
|
|
3588 |
fi
|
|
|
3589 |
- # 10*(2^10) chars as input seems more than enough
|
|
|
3590 |
- test $ac_count -gt 10 && break
|
|
|
3591 |
- done
|
|
|
3592 |
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
|
|
3593 |
-esac
|
|
|
3594 |
-
|
|
|
3595 |
-
|
|
|
3596 |
- $ac_path_GREP_found && break 3
|
|
|
3597 |
- done
|
|
|
3598 |
-done
|
|
|
3599 |
-
|
|
|
3600 |
-done
|
|
|
3601 |
-IFS=$as_save_IFS
|
|
|
3602 |
-
|
|
|
3603 |
-
|
|
|
3604 |
fi
|
|
|
3605 |
+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
|
|
|
3606 |
+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
|
|
|
3607 |
+ EGREP=$ac_cv_prog_egrep
|
|
|
3608 |
|
|
|
3609 |
-GREP="$ac_cv_path_GREP"
|
|
|
3610 |
-if test -z "$GREP"; then
|
|
|
3611 |
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
|
|
|
3612 |
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
|
|
|
3613 |
- { (exit 1); exit 1; }; }
|
|
|
3614 |
-fi
|
|
|
3615 |
|
|
|
3616 |
-else
|
|
|
3617 |
- ac_cv_path_GREP=$GREP
|
|
|
3618 |
-fi
|
|
|
3619 |
|
|
|
3620 |
-
|
|
|
3621 |
-fi
|
|
|
3622 |
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
|
|
|
3623 |
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
|
|
|
3624 |
- GREP="$ac_cv_path_GREP"
|
|
|
3625 |
-
|
|
|
3626 |
-
|
|
|
3627 |
-{ echo "$as_me:$LINENO: checking for egrep" >&5
|
|
|
3628 |
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
|
|
|
3629 |
-if test "${ac_cv_path_EGREP+set}" = set; then
|
|
|
3630 |
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
3631 |
-else
|
|
|
3632 |
- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
|
|
|
3633 |
- then ac_cv_path_EGREP="$GREP -E"
|
|
|
3634 |
- else
|
|
|
3635 |
- # Extract the first word of "egrep" to use in msg output
|
|
|
3636 |
-if test -z "$EGREP"; then
|
|
|
3637 |
-set dummy egrep; ac_prog_name=$2
|
|
|
3638 |
-if test "${ac_cv_path_EGREP+set}" = set; then
|
|
|
3639 |
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
3640 |
-else
|
|
|
3641 |
- ac_path_EGREP_found=false
|
|
|
3642 |
-# Loop through the user's path and test for each of PROGNAME-LIST
|
|
|
3643 |
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
|
3644 |
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
|
|
3645 |
-do
|
|
|
3646 |
- IFS=$as_save_IFS
|
|
|
3647 |
- test -z "$as_dir" && as_dir=.
|
|
|
3648 |
- for ac_prog in egrep; do
|
|
|
3649 |
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
3650 |
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
|
3651 |
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
|
|
|
3652 |
- # Check for GNU ac_path_EGREP and select it if it is found.
|
|
|
3653 |
- # Check for GNU $ac_path_EGREP
|
|
|
3654 |
-case `"$ac_path_EGREP" --version 2>&1` in
|
|
|
3655 |
-*GNU*)
|
|
|
3656 |
- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
|
|
|
3657 |
-*)
|
|
|
3658 |
- ac_count=0
|
|
|
3659 |
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
|
|
|
3660 |
- while :
|
|
|
3661 |
- do
|
|
|
3662 |
- cat "conftest.in" "conftest.in" >"conftest.tmp"
|
|
|
3663 |
- mv "conftest.tmp" "conftest.in"
|
|
|
3664 |
- cp "conftest.in" "conftest.nl"
|
|
|
3665 |
- echo 'EGREP' >> "conftest.nl"
|
|
|
3666 |
- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
|
|
3667 |
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
|
|
3668 |
- ac_count=`expr $ac_count + 1`
|
|
|
3669 |
- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
|
|
|
3670 |
- # Best one so far, save it but keep looking for a better one
|
|
|
3671 |
- ac_cv_path_EGREP="$ac_path_EGREP"
|
|
|
3672 |
- ac_path_EGREP_max=$ac_count
|
|
|
3673 |
- fi
|
|
|
3674 |
- # 10*(2^10) chars as input seems more than enough
|
|
|
3675 |
- test $ac_count -gt 10 && break
|
|
|
3676 |
- done
|
|
|
3677 |
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
|
|
3678 |
-esac
|
|
|
3679 |
-
|
|
|
3680 |
-
|
|
|
3681 |
- $ac_path_EGREP_found && break 3
|
|
|
3682 |
- done
|
|
|
3683 |
-done
|
|
|
3684 |
-
|
|
|
3685 |
-done
|
|
|
3686 |
-IFS=$as_save_IFS
|
|
|
3687 |
-
|
|
|
3688 |
-
|
|
|
3689 |
-fi
|
|
|
3690 |
-
|
|
|
3691 |
-EGREP="$ac_cv_path_EGREP"
|
|
|
3692 |
-if test -z "$EGREP"; then
|
|
|
3693 |
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
|
|
|
3694 |
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
|
|
|
3695 |
- { (exit 1); exit 1; }; }
|
|
|
3696 |
-fi
|
|
|
3697 |
-
|
|
|
3698 |
-else
|
|
|
3699 |
- ac_cv_path_EGREP=$EGREP
|
|
|
3700 |
-fi
|
|
|
3701 |
-
|
|
|
3702 |
-
|
|
|
3703 |
- fi
|
|
|
3704 |
-fi
|
|
|
3705 |
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
|
|
|
3706 |
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
|
|
|
3707 |
- EGREP="$ac_cv_path_EGREP"
|
|
|
3708 |
-
|
|
|
3709 |
-
|
|
|
3710 |
-
|
|
|
3711 |
-{ echo "$as_me:$LINENO: checking for AIX" >&5
|
|
|
3712 |
-echo $ECHO_N "checking for AIX... $ECHO_C" >&6; }
|
|
|
3713 |
+echo "$as_me:$LINENO: checking for AIX" >&5
|
|
|
3714 |
+echo $ECHO_N "checking for AIX... $ECHO_C" >&6
|
|
|
3715 |
cat >conftest.$ac_ext <<_ACEOF
|
|
|
3716 |
/* confdefs.h. */
|
|
|
3717 |
_ACEOF
|
|
|
3718 |
@@ -3757,25 +3123,26 @@
|
|
|
3719 |
_ACEOF
|
|
|
3720 |
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
|
3721 |
$EGREP "yes" >/dev/null 2>&1; then
|
|
|
3722 |
- { echo "$as_me:$LINENO: result: yes" >&5
|
|
|
3723 |
-echo "${ECHO_T}yes" >&6; }
|
|
|
3724 |
+ echo "$as_me:$LINENO: result: yes" >&5
|
|
|
3725 |
+echo "${ECHO_T}yes" >&6
|
|
|
3726 |
cat >>confdefs.h <<\_ACEOF
|
|
|
3727 |
#define _ALL_SOURCE 1
|
|
|
3728 |
_ACEOF
|
|
|
3729 |
|
|
|
3730 |
else
|
|
|
3731 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
3732 |
-echo "${ECHO_T}no" >&6; }
|
|
|
3733 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
3734 |
+echo "${ECHO_T}no" >&6
|
|
|
3735 |
fi
|
|
|
3736 |
rm -f conftest*
|
|
|
3737 |
|
|
|
3738 |
|
|
|
3739 |
-{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
|
|
|
3740 |
-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
|
|
|
3741 |
+echo "$as_me:$LINENO: checking for library containing strerror" >&5
|
|
|
3742 |
+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
|
|
|
3743 |
if test "${ac_cv_search_strerror+set}" = set; then
|
|
|
3744 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
3745 |
else
|
|
|
3746 |
ac_func_search_save_LIBS=$LIBS
|
|
|
3747 |
+ac_cv_search_strerror=no
|
|
|
3748 |
cat >conftest.$ac_ext <<_ACEOF
|
|
|
3749 |
/* confdefs.h. */
|
|
|
3750 |
_ACEOF
|
|
|
3751 |
@@ -3783,78 +3150,120 @@
|
|
|
3752 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
|
3753 |
/* end confdefs.h. */
|
|
|
3754 |
|
|
|
3755 |
-/* Override any GCC internal prototype to avoid an error.
|
|
|
3756 |
- Use char because int might match the return type of a GCC
|
|
|
3757 |
- builtin and then its argument prototype would still apply. */
|
|
|
3758 |
+/* Override any gcc2 internal prototype to avoid an error. */
|
|
|
3759 |
#ifdef __cplusplus
|
|
|
3760 |
extern "C"
|
|
|
3761 |
#endif
|
|
|
3762 |
+/* We use char because int might match the return type of a gcc2
|
|
|
3763 |
+ builtin and then its argument prototype would still apply. */
|
|
|
3764 |
char strerror ();
|
|
|
3765 |
int
|
|
|
3766 |
main ()
|
|
|
3767 |
{
|
|
|
3768 |
-return strerror ();
|
|
|
3769 |
+strerror ();
|
|
|
3770 |
;
|
|
|
3771 |
return 0;
|
|
|
3772 |
}
|
|
|
3773 |
_ACEOF
|
|
|
3774 |
-for ac_lib in '' cposix; do
|
|
|
3775 |
- if test -z "$ac_lib"; then
|
|
|
3776 |
- ac_res="none required"
|
|
|
3777 |
- else
|
|
|
3778 |
- ac_res=-l$ac_lib
|
|
|
3779 |
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
|
|
3780 |
- fi
|
|
|
3781 |
- rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
3782 |
-if { (ac_try="$ac_link"
|
|
|
3783 |
-case "(($ac_try" in
|
|
|
3784 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
3785 |
- *) ac_try_echo=$ac_try;;
|
|
|
3786 |
-esac
|
|
|
3787 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
3788 |
- (eval "$ac_link") 2>conftest.er1
|
|
|
3789 |
+rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
3790 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
3791 |
+ (eval $ac_link) 2>conftest.er1
|
|
|
3792 |
ac_status=$?
|
|
|
3793 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
3794 |
rm -f conftest.er1
|
|
|
3795 |
cat conftest.err >&5
|
|
|
3796 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3797 |
- (exit $ac_status); } && {
|
|
|
3798 |
- test -z "$ac_c_werror_flag" ||
|
|
|
3799 |
- test ! -s conftest.err
|
|
|
3800 |
- } && test -s conftest$ac_exeext &&
|
|
|
3801 |
- $as_test_x conftest$ac_exeext; then
|
|
|
3802 |
- ac_cv_search_strerror=$ac_res
|
|
|
3803 |
+ (exit $ac_status); } &&
|
|
|
3804 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
3805 |
+ || test ! -s conftest.err'
|
|
|
3806 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
3807 |
+ (eval $ac_try) 2>&5
|
|
|
3808 |
+ ac_status=$?
|
|
|
3809 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3810 |
+ (exit $ac_status); }; } &&
|
|
|
3811 |
+ { ac_try='test -s conftest$ac_exeext'
|
|
|
3812 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
3813 |
+ (eval $ac_try) 2>&5
|
|
|
3814 |
+ ac_status=$?
|
|
|
3815 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3816 |
+ (exit $ac_status); }; }; then
|
|
|
3817 |
+ ac_cv_search_strerror="none required"
|
|
|
3818 |
else
|
|
|
3819 |
echo "$as_me: failed program was:" >&5
|
|
|
3820 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
3821 |
|
|
|
3822 |
-
|
|
|
3823 |
fi
|
|
|
3824 |
+rm -f conftest.err conftest.$ac_objext \
|
|
|
3825 |
+ conftest$ac_exeext conftest.$ac_ext
|
|
|
3826 |
+if test "$ac_cv_search_strerror" = no; then
|
|
|
3827 |
+ for ac_lib in cposix; do
|
|
|
3828 |
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
|
|
3829 |
+ cat >conftest.$ac_ext <<_ACEOF
|
|
|
3830 |
+/* confdefs.h. */
|
|
|
3831 |
+_ACEOF
|
|
|
3832 |
+cat confdefs.h >>conftest.$ac_ext
|
|
|
3833 |
+cat >>conftest.$ac_ext <<_ACEOF
|
|
|
3834 |
+/* end confdefs.h. */
|
|
|
3835 |
|
|
|
3836 |
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
|
3837 |
- conftest$ac_exeext
|
|
|
3838 |
- if test "${ac_cv_search_strerror+set}" = set; then
|
|
|
3839 |
- break
|
|
|
3840 |
-fi
|
|
|
3841 |
-done
|
|
|
3842 |
-if test "${ac_cv_search_strerror+set}" = set; then
|
|
|
3843 |
- :
|
|
|
3844 |
+/* Override any gcc2 internal prototype to avoid an error. */
|
|
|
3845 |
+#ifdef __cplusplus
|
|
|
3846 |
+extern "C"
|
|
|
3847 |
+#endif
|
|
|
3848 |
+/* We use char because int might match the return type of a gcc2
|
|
|
3849 |
+ builtin and then its argument prototype would still apply. */
|
|
|
3850 |
+char strerror ();
|
|
|
3851 |
+int
|
|
|
3852 |
+main ()
|
|
|
3853 |
+{
|
|
|
3854 |
+strerror ();
|
|
|
3855 |
+ ;
|
|
|
3856 |
+ return 0;
|
|
|
3857 |
+}
|
|
|
3858 |
+_ACEOF
|
|
|
3859 |
+rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
3860 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
3861 |
+ (eval $ac_link) 2>conftest.er1
|
|
|
3862 |
+ ac_status=$?
|
|
|
3863 |
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
3864 |
+ rm -f conftest.er1
|
|
|
3865 |
+ cat conftest.err >&5
|
|
|
3866 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3867 |
+ (exit $ac_status); } &&
|
|
|
3868 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
3869 |
+ || test ! -s conftest.err'
|
|
|
3870 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
3871 |
+ (eval $ac_try) 2>&5
|
|
|
3872 |
+ ac_status=$?
|
|
|
3873 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3874 |
+ (exit $ac_status); }; } &&
|
|
|
3875 |
+ { ac_try='test -s conftest$ac_exeext'
|
|
|
3876 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
3877 |
+ (eval $ac_try) 2>&5
|
|
|
3878 |
+ ac_status=$?
|
|
|
3879 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3880 |
+ (exit $ac_status); }; }; then
|
|
|
3881 |
+ ac_cv_search_strerror="-l$ac_lib"
|
|
|
3882 |
+break
|
|
|
3883 |
else
|
|
|
3884 |
- ac_cv_search_strerror=no
|
|
|
3885 |
+ echo "$as_me: failed program was:" >&5
|
|
|
3886 |
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
3887 |
+
|
|
|
3888 |
fi
|
|
|
3889 |
-rm conftest.$ac_ext
|
|
|
3890 |
+rm -f conftest.err conftest.$ac_objext \
|
|
|
3891 |
+ conftest$ac_exeext conftest.$ac_ext
|
|
|
3892 |
+ done
|
|
|
3893 |
+fi
|
|
|
3894 |
LIBS=$ac_func_search_save_LIBS
|
|
|
3895 |
fi
|
|
|
3896 |
-{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
|
|
|
3897 |
-echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
|
|
|
3898 |
-ac_res=$ac_cv_search_strerror
|
|
|
3899 |
-if test "$ac_res" != no; then
|
|
|
3900 |
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
|
|
|
3901 |
+echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
|
|
|
3902 |
+echo "${ECHO_T}$ac_cv_search_strerror" >&6
|
|
|
3903 |
+if test "$ac_cv_search_strerror" != no; then
|
|
|
3904 |
+ test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
|
|
|
3905 |
|
|
|
3906 |
fi
|
|
|
3907 |
|
|
|
3908 |
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
|
|
|
3909 |
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
|
|
|
3910 |
+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
|
|
|
3911 |
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
|
|
|
3912 |
if test "${ac_cv_header_stdc+set}" = set; then
|
|
|
3913 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
3914 |
else
|
|
|
3915 |
@@ -3878,32 +3287,36 @@
|
|
|
3916 |
}
|
|
|
3917 |
_ACEOF
|
|
|
3918 |
rm -f conftest.$ac_objext
|
|
|
3919 |
-if { (ac_try="$ac_compile"
|
|
|
3920 |
-case "(($ac_try" in
|
|
|
3921 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
3922 |
- *) ac_try_echo=$ac_try;;
|
|
|
3923 |
-esac
|
|
|
3924 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
3925 |
- (eval "$ac_compile") 2>conftest.er1
|
|
|
3926 |
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
3927 |
+ (eval $ac_compile) 2>conftest.er1
|
|
|
3928 |
ac_status=$?
|
|
|
3929 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
3930 |
rm -f conftest.er1
|
|
|
3931 |
cat conftest.err >&5
|
|
|
3932 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3933 |
- (exit $ac_status); } && {
|
|
|
3934 |
- test -z "$ac_c_werror_flag" ||
|
|
|
3935 |
- test ! -s conftest.err
|
|
|
3936 |
- } && test -s conftest.$ac_objext; then
|
|
|
3937 |
+ (exit $ac_status); } &&
|
|
|
3938 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
3939 |
+ || test ! -s conftest.err'
|
|
|
3940 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
3941 |
+ (eval $ac_try) 2>&5
|
|
|
3942 |
+ ac_status=$?
|
|
|
3943 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3944 |
+ (exit $ac_status); }; } &&
|
|
|
3945 |
+ { ac_try='test -s conftest.$ac_objext'
|
|
|
3946 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
3947 |
+ (eval $ac_try) 2>&5
|
|
|
3948 |
+ ac_status=$?
|
|
|
3949 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3950 |
+ (exit $ac_status); }; }; then
|
|
|
3951 |
ac_cv_header_stdc=yes
|
|
|
3952 |
else
|
|
|
3953 |
echo "$as_me: failed program was:" >&5
|
|
|
3954 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
3955 |
|
|
|
3956 |
- ac_cv_header_stdc=no
|
|
|
3957 |
+ac_cv_header_stdc=no
|
|
|
3958 |
fi
|
|
|
3959 |
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
3960 |
|
|
|
3961 |
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
3962 |
-
|
|
|
3963 |
if test $ac_cv_header_stdc = yes; then
|
|
|
3964 |
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
|
|
|
3965 |
cat >conftest.$ac_ext <<_ACEOF
|
|
|
3966 |
@@ -3958,7 +3371,6 @@
|
|
|
3967 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
|
3968 |
/* end confdefs.h. */
|
|
|
3969 |
#include <ctype.h>
|
|
|
3970 |
-#include <stdlib.h>
|
|
|
3971 |
#if ((' ' & 0x0FF) == 0x020)
|
|
|
3972 |
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
|
|
|
3973 |
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
|
|
|
3974 |
@@ -3978,27 +3390,18 @@
|
|
|
3975 |
for (i = 0; i < 256; i++)
|
|
|
3976 |
if (XOR (islower (i), ISLOWER (i))
|
|
|
3977 |
|| toupper (i) != TOUPPER (i))
|
|
|
3978 |
- return 2;
|
|
|
3979 |
- return 0;
|
|
|
3980 |
+ exit(2);
|
|
|
3981 |
+ exit (0);
|
|
|
3982 |
}
|
|
|
3983 |
_ACEOF
|
|
|
3984 |
rm -f conftest$ac_exeext
|
|
|
3985 |
-if { (ac_try="$ac_link"
|
|
|
3986 |
-case "(($ac_try" in
|
|
|
3987 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
3988 |
- *) ac_try_echo=$ac_try;;
|
|
|
3989 |
-esac
|
|
|
3990 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
3991 |
- (eval "$ac_link") 2>&5
|
|
|
3992 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
3993 |
+ (eval $ac_link) 2>&5
|
|
|
3994 |
ac_status=$?
|
|
|
3995 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
3996 |
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
|
|
3997 |
- { (case "(($ac_try" in
|
|
|
3998 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
3999 |
- *) ac_try_echo=$ac_try;;
|
|
|
4000 |
-esac
|
|
|
4001 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
4002 |
- (eval "$ac_try") 2>&5
|
|
|
4003 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
4004 |
+ (eval $ac_try) 2>&5
|
|
|
4005 |
ac_status=$?
|
|
|
4006 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
4007 |
(exit $ac_status); }; }; then
|
|
|
4008 |
@@ -4011,14 +3414,12 @@
|
|
|
4009 |
( exit $ac_status )
|
|
|
4010 |
ac_cv_header_stdc=no
|
|
|
4011 |
fi
|
|
|
4012 |
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
|
4013 |
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
|
4014 |
fi
|
|
|
4015 |
-
|
|
|
4016 |
-
|
|
|
4017 |
fi
|
|
|
4018 |
fi
|
|
|
4019 |
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
|
|
|
4020 |
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
|
|
|
4021 |
+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
|
|
|
4022 |
+echo "${ECHO_T}$ac_cv_header_stdc" >&6
|
|
|
4023 |
if test $ac_cv_header_stdc = yes; then
|
|
|
4024 |
|
|
|
4025 |
cat >>confdefs.h <<\_ACEOF
|
|
|
4026 |
@@ -4041,9 +3442,9 @@
|
|
|
4027 |
inttypes.h stdint.h unistd.h
|
|
|
4028 |
do
|
|
|
4029 |
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
|
4030 |
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
|
4031 |
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
|
4032 |
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
|
4033 |
+echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
|
4034 |
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
|
|
4035 |
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
|
|
4036 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
4037 |
else
|
|
|
4038 |
cat >conftest.$ac_ext <<_ACEOF
|
|
|
4039 |
@@ -4057,35 +3458,38 @@
|
|
|
4040 |
#include <$ac_header>
|
|
|
4041 |
_ACEOF
|
|
|
4042 |
rm -f conftest.$ac_objext
|
|
|
4043 |
-if { (ac_try="$ac_compile"
|
|
|
4044 |
-case "(($ac_try" in
|
|
|
4045 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
4046 |
- *) ac_try_echo=$ac_try;;
|
|
|
4047 |
-esac
|
|
|
4048 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
4049 |
- (eval "$ac_compile") 2>conftest.er1
|
|
|
4050 |
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
4051 |
+ (eval $ac_compile) 2>conftest.er1
|
|
|
4052 |
ac_status=$?
|
|
|
4053 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
4054 |
rm -f conftest.er1
|
|
|
4055 |
cat conftest.err >&5
|
|
|
4056 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
4057 |
- (exit $ac_status); } && {
|
|
|
4058 |
- test -z "$ac_c_werror_flag" ||
|
|
|
4059 |
- test ! -s conftest.err
|
|
|
4060 |
- } && test -s conftest.$ac_objext; then
|
|
|
4061 |
+ (exit $ac_status); } &&
|
|
|
4062 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
4063 |
+ || test ! -s conftest.err'
|
|
|
4064 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
4065 |
+ (eval $ac_try) 2>&5
|
|
|
4066 |
+ ac_status=$?
|
|
|
4067 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
4068 |
+ (exit $ac_status); }; } &&
|
|
|
4069 |
+ { ac_try='test -s conftest.$ac_objext'
|
|
|
4070 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
4071 |
+ (eval $ac_try) 2>&5
|
|
|
4072 |
+ ac_status=$?
|
|
|
4073 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
4074 |
+ (exit $ac_status); }; }; then
|
|
|
4075 |
eval "$as_ac_Header=yes"
|
|
|
4076 |
else
|
|
|
4077 |
echo "$as_me: failed program was:" >&5
|
|
|
4078 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
4079 |
|
|
|
4080 |
- eval "$as_ac_Header=no"
|
|
|
4081 |
+eval "$as_ac_Header=no"
|
|
|
4082 |
fi
|
|
|
4083 |
-
|
|
|
4084 |
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
4085 |
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
4086 |
fi
|
|
|
4087 |
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
|
4088 |
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
|
4089 |
-echo "${ECHO_T}$ac_res" >&6; }
|
|
|
4090 |
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
|
|
4091 |
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
|
|
4092 |
if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
|
|
4093 |
cat >>confdefs.h <<_ACEOF
|
|
|
4094 |
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
|
4095 |
@@ -4097,17 +3501,17 @@
|
|
|
4096 |
|
|
|
4097 |
|
|
|
4098 |
if test "${ac_cv_header_minix_config_h+set}" = set; then
|
|
|
4099 |
- { echo "$as_me:$LINENO: checking for minix/config.h" >&5
|
|
|
4100 |
-echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
|
|
|
4101 |
+ echo "$as_me:$LINENO: checking for minix/config.h" >&5
|
|
|
4102 |
+echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
|
|
|
4103 |
if test "${ac_cv_header_minix_config_h+set}" = set; then
|
|
|
4104 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
4105 |
fi
|
|
|
4106 |
-{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
|
|
|
4107 |
-echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
|
|
|
4108 |
+echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
|
|
|
4109 |
+echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
|
|
|
4110 |
else
|
|
|
4111 |
# Is the header compilable?
|
|
|
4112 |
-{ echo "$as_me:$LINENO: checking minix/config.h usability" >&5
|
|
|
4113 |
-echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6; }
|
|
|
4114 |
+echo "$as_me:$LINENO: checking minix/config.h usability" >&5
|
|
|
4115 |
+echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6
|
|
|
4116 |
cat >conftest.$ac_ext <<_ACEOF
|
|
|
4117 |
/* confdefs.h. */
|
|
|
4118 |
_ACEOF
|
|
|
4119 |
@@ -4118,37 +3522,41 @@
|
|
|
4120 |
#include <minix/config.h>
|
|
|
4121 |
_ACEOF
|
|
|
4122 |
rm -f conftest.$ac_objext
|
|
|
4123 |
-if { (ac_try="$ac_compile"
|
|
|
4124 |
-case "(($ac_try" in
|
|
|
4125 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
4126 |
- *) ac_try_echo=$ac_try;;
|
|
|
4127 |
-esac
|
|
|
4128 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
4129 |
- (eval "$ac_compile") 2>conftest.er1
|
|
|
4130 |
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
4131 |
+ (eval $ac_compile) 2>conftest.er1
|
|
|
4132 |
ac_status=$?
|
|
|
4133 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
4134 |
rm -f conftest.er1
|
|
|
4135 |
cat conftest.err >&5
|
|
|
4136 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
4137 |
- (exit $ac_status); } && {
|
|
|
4138 |
- test -z "$ac_c_werror_flag" ||
|
|
|
4139 |
- test ! -s conftest.err
|
|
|
4140 |
- } && test -s conftest.$ac_objext; then
|
|
|
4141 |
+ (exit $ac_status); } &&
|
|
|
4142 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
4143 |
+ || test ! -s conftest.err'
|
|
|
4144 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
4145 |
+ (eval $ac_try) 2>&5
|
|
|
4146 |
+ ac_status=$?
|
|
|
4147 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
4148 |
+ (exit $ac_status); }; } &&
|
|
|
4149 |
+ { ac_try='test -s conftest.$ac_objext'
|
|
|
4150 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
4151 |
+ (eval $ac_try) 2>&5
|
|
|
4152 |
+ ac_status=$?
|
|
|
4153 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
4154 |
+ (exit $ac_status); }; }; then
|
|
|
4155 |
ac_header_compiler=yes
|
|
|
4156 |
else
|
|
|
4157 |
echo "$as_me: failed program was:" >&5
|
|
|
4158 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
4159 |
|
|
|
4160 |
- ac_header_compiler=no
|
|
|
4161 |
+ac_header_compiler=no
|
|
|
4162 |
fi
|
|
|
4163 |
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
4164 |
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
|
4165 |
+echo "${ECHO_T}$ac_header_compiler" >&6
|
|
|
4166 |
|
|
|
4167 |
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
4168 |
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
|
4169 |
-echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
|
4170 |
-
|
|
|
4171 |
# Is the header present?
|
|
|
4172 |
-{ echo "$as_me:$LINENO: checking minix/config.h presence" >&5
|
|
|
4173 |
-echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6; }
|
|
|
4174 |
+echo "$as_me:$LINENO: checking minix/config.h presence" >&5
|
|
|
4175 |
+echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6
|
|
|
4176 |
cat >conftest.$ac_ext <<_ACEOF
|
|
|
4177 |
/* confdefs.h. */
|
|
|
4178 |
_ACEOF
|
|
|
4179 |
@@ -4157,22 +3565,24 @@
|
|
|
4180 |
/* end confdefs.h. */
|
|
|
4181 |
#include <minix/config.h>
|
|
|
4182 |
_ACEOF
|
|
|
4183 |
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
|
4184 |
-case "(($ac_try" in
|
|
|
4185 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
4186 |
- *) ac_try_echo=$ac_try;;
|
|
|
4187 |
-esac
|
|
|
4188 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
4189 |
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
|
|
4190 |
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
|
|
4191 |
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
|
|
4192 |
ac_status=$?
|
|
|
4193 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
4194 |
rm -f conftest.er1
|
|
|
4195 |
cat conftest.err >&5
|
|
|
4196 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
4197 |
- (exit $ac_status); } >/dev/null && {
|
|
|
4198 |
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
|
4199 |
- test ! -s conftest.err
|
|
|
4200 |
- }; then
|
|
|
4201 |
+ (exit $ac_status); } >/dev/null; then
|
|
|
4202 |
+ if test -s conftest.err; then
|
|
|
4203 |
+ ac_cpp_err=$ac_c_preproc_warn_flag
|
|
|
4204 |
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
|
4205 |
+ else
|
|
|
4206 |
+ ac_cpp_err=
|
|
|
4207 |
+ fi
|
|
|
4208 |
+else
|
|
|
4209 |
+ ac_cpp_err=yes
|
|
|
4210 |
+fi
|
|
|
4211 |
+if test -z "$ac_cpp_err"; then
|
|
|
4212 |
ac_header_preproc=yes
|
|
|
4213 |
else
|
|
|
4214 |
echo "$as_me: failed program was:" >&5
|
|
|
4215 |
@@ -4180,10 +3590,9 @@
|
|
|
4216 |
|
|
|
4217 |
ac_header_preproc=no
|
|
|
4218 |
fi
|
|
|
4219 |
-
|
|
|
4220 |
rm -f conftest.err conftest.$ac_ext
|
|
|
4221 |
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
|
4222 |
-echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
|
4223 |
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
|
4224 |
+echo "${ECHO_T}$ac_header_preproc" >&6
|
|
|
4225 |
|
|
|
4226 |
# So? What about this header?
|
|
|
4227 |
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
|
4228 |
@@ -4207,23 +3616,25 @@
|
|
|
4229 |
echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
|
|
|
4230 |
{ echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
|
|
|
4231 |
echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
|
|
|
4232 |
- ( cat <<\_ASBOX
|
|
|
4233 |
+ (
|
|
|
4234 |
+ cat <<\_ASBOX
|
|
|
4235 |
## ------------------------------------- ##
|
|
|
4236 |
## Report this to [email protected] ##
|
|
|
4237 |
## ------------------------------------- ##
|
|
|
4238 |
_ASBOX
|
|
|
4239 |
- ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
|
4240 |
+ ) |
|
|
|
4241 |
+ sed "s/^/$as_me: WARNING: /" >&2
|
|
|
4242 |
;;
|
|
|
4243 |
esac
|
|
|
4244 |
-{ echo "$as_me:$LINENO: checking for minix/config.h" >&5
|
|
|
4245 |
-echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
|
|
|
4246 |
+echo "$as_me:$LINENO: checking for minix/config.h" >&5
|
|
|
4247 |
+echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
|
|
|
4248 |
if test "${ac_cv_header_minix_config_h+set}" = set; then
|
|
|
4249 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
4250 |
else
|
|
|
4251 |
ac_cv_header_minix_config_h=$ac_header_preproc
|
|
|
4252 |
fi
|
|
|
4253 |
-{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
|
|
|
4254 |
-echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
|
|
|
4255 |
+echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
|
|
|
4256 |
+echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
|
|
|
4257 |
|
|
|
4258 |
fi
|
|
|
4259 |
if test $ac_cv_header_minix_config_h = yes; then
|
|
|
4260 |
@@ -4260,8 +3671,8 @@
|
|
|
4261 |
if test -n "$ac_tool_prefix"; then
|
|
|
4262 |
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
|
|
|
4263 |
set dummy ${ac_tool_prefix}gcc; ac_word=$2
|
|
|
4264 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
4265 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
4266 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
4267 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
4268 |
if test "${ac_cv_prog_CC+set}" = set; then
|
|
|
4269 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
4270 |
else
|
|
|
4271 |
@@ -4274,7 +3685,7 @@
|
|
|
4272 |
IFS=$as_save_IFS
|
|
|
4273 |
test -z "$as_dir" && as_dir=.
|
|
|
4274 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
4275 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
4276 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
4277 |
ac_cv_prog_CC="${ac_tool_prefix}gcc"
|
|
|
4278 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
4279 |
break 2
|
|
|
4280 |
@@ -4281,27 +3692,25 @@
|
|
|
4281 |
fi
|
|
|
4282 |
done
|
|
|
4283 |
done
|
|
|
4284 |
-IFS=$as_save_IFS
|
|
|
4285 |
|
|
|
4286 |
fi
|
|
|
4287 |
fi
|
|
|
4288 |
CC=$ac_cv_prog_CC
|
|
|
4289 |
if test -n "$CC"; then
|
|
|
4290 |
- { echo "$as_me:$LINENO: result: $CC" >&5
|
|
|
4291 |
-echo "${ECHO_T}$CC" >&6; }
|
|
|
4292 |
+ echo "$as_me:$LINENO: result: $CC" >&5
|
|
|
4293 |
+echo "${ECHO_T}$CC" >&6
|
|
|
4294 |
else
|
|
|
4295 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
4296 |
-echo "${ECHO_T}no" >&6; }
|
|
|
4297 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
4298 |
+echo "${ECHO_T}no" >&6
|
|
|
4299 |
fi
|
|
|
4300 |
|
|
|
4301 |
-
|
|
|
4302 |
fi
|
|
|
4303 |
if test -z "$ac_cv_prog_CC"; then
|
|
|
4304 |
ac_ct_CC=$CC
|
|
|
4305 |
# Extract the first word of "gcc", so it can be a program name with args.
|
|
|
4306 |
set dummy gcc; ac_word=$2
|
|
|
4307 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
4308 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
4309 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
4310 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
4311 |
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
|
|
4312 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
4313 |
else
|
|
|
4314 |
@@ -4314,7 +3723,7 @@
|
|
|
4315 |
IFS=$as_save_IFS
|
|
|
4316 |
test -z "$as_dir" && as_dir=.
|
|
|
4317 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
4318 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
4319 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
4320 |
ac_cv_prog_ac_ct_CC="gcc"
|
|
|
4321 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
4322 |
break 2
|
|
|
4323 |
@@ -4321,44 +3730,29 @@
|
|
|
4324 |
fi
|
|
|
4325 |
done
|
|
|
4326 |
done
|
|
|
4327 |
-IFS=$as_save_IFS
|
|
|
4328 |
|
|
|
4329 |
fi
|
|
|
4330 |
fi
|
|
|
4331 |
ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
|
4332 |
if test -n "$ac_ct_CC"; then
|
|
|
4333 |
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
|
4334 |
-echo "${ECHO_T}$ac_ct_CC" >&6; }
|
|
|
4335 |
+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
|
4336 |
+echo "${ECHO_T}$ac_ct_CC" >&6
|
|
|
4337 |
else
|
|
|
4338 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
4339 |
-echo "${ECHO_T}no" >&6; }
|
|
|
4340 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
4341 |
+echo "${ECHO_T}no" >&6
|
|
|
4342 |
fi
|
|
|
4343 |
|
|
|
4344 |
- if test "x$ac_ct_CC" = x; then
|
|
|
4345 |
- CC=""
|
|
|
4346 |
- else
|
|
|
4347 |
- case $cross_compiling:$ac_tool_warned in
|
|
|
4348 |
-yes:)
|
|
|
4349 |
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
|
4350 |
-whose name does not start with the host triplet. If you think this
|
|
|
4351 |
-configuration is useful to you, please write to [email protected]." >&5
|
|
|
4352 |
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
|
4353 |
-whose name does not start with the host triplet. If you think this
|
|
|
4354 |
-configuration is useful to you, please write to [email protected]." >&2;}
|
|
|
4355 |
-ac_tool_warned=yes ;;
|
|
|
4356 |
-esac
|
|
|
4357 |
- CC=$ac_ct_CC
|
|
|
4358 |
- fi
|
|
|
4359 |
+ CC=$ac_ct_CC
|
|
|
4360 |
else
|
|
|
4361 |
CC="$ac_cv_prog_CC"
|
|
|
4362 |
fi
|
|
|
4363 |
|
|
|
4364 |
if test -z "$CC"; then
|
|
|
4365 |
- if test -n "$ac_tool_prefix"; then
|
|
|
4366 |
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
|
|
|
4367 |
+ if test -n "$ac_tool_prefix"; then
|
|
|
4368 |
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
|
|
|
4369 |
set dummy ${ac_tool_prefix}cc; ac_word=$2
|
|
|
4370 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
4371 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
4372 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
4373 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
4374 |
if test "${ac_cv_prog_CC+set}" = set; then
|
|
|
4375 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
4376 |
else
|
|
|
4377 |
@@ -4371,7 +3765,7 @@
|
|
|
4378 |
IFS=$as_save_IFS
|
|
|
4379 |
test -z "$as_dir" && as_dir=.
|
|
|
4380 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
4381 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
4382 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
4383 |
ac_cv_prog_CC="${ac_tool_prefix}cc"
|
|
|
4384 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
4385 |
break 2
|
|
|
4386 |
@@ -4378,27 +3772,67 @@
|
|
|
4387 |
fi
|
|
|
4388 |
done
|
|
|
4389 |
done
|
|
|
4390 |
-IFS=$as_save_IFS
|
|
|
4391 |
|
|
|
4392 |
fi
|
|
|
4393 |
fi
|
|
|
4394 |
CC=$ac_cv_prog_CC
|
|
|
4395 |
if test -n "$CC"; then
|
|
|
4396 |
- { echo "$as_me:$LINENO: result: $CC" >&5
|
|
|
4397 |
-echo "${ECHO_T}$CC" >&6; }
|
|
|
4398 |
+ echo "$as_me:$LINENO: result: $CC" >&5
|
|
|
4399 |
+echo "${ECHO_T}$CC" >&6
|
|
|
4400 |
else
|
|
|
4401 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
4402 |
-echo "${ECHO_T}no" >&6; }
|
|
|
4403 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
4404 |
+echo "${ECHO_T}no" >&6
|
|
|
4405 |
fi
|
|
|
4406 |
|
|
|
4407 |
-
|
|
|
4408 |
+fi
|
|
|
4409 |
+if test -z "$ac_cv_prog_CC"; then
|
|
|
4410 |
+ ac_ct_CC=$CC
|
|
|
4411 |
+ # Extract the first word of "cc", so it can be a program name with args.
|
|
|
4412 |
+set dummy cc; ac_word=$2
|
|
|
4413 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
4414 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
4415 |
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
|
|
4416 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
4417 |
+else
|
|
|
4418 |
+ if test -n "$ac_ct_CC"; then
|
|
|
4419 |
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
|
|
4420 |
+else
|
|
|
4421 |
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
|
4422 |
+for as_dir in $PATH
|
|
|
4423 |
+do
|
|
|
4424 |
+ IFS=$as_save_IFS
|
|
|
4425 |
+ test -z "$as_dir" && as_dir=.
|
|
|
4426 |
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
4427 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
4428 |
+ ac_cv_prog_ac_ct_CC="cc"
|
|
|
4429 |
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
4430 |
+ break 2
|
|
|
4431 |
fi
|
|
|
4432 |
+done
|
|
|
4433 |
+done
|
|
|
4434 |
+
|
|
|
4435 |
fi
|
|
|
4436 |
+fi
|
|
|
4437 |
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
|
4438 |
+if test -n "$ac_ct_CC"; then
|
|
|
4439 |
+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
|
4440 |
+echo "${ECHO_T}$ac_ct_CC" >&6
|
|
|
4441 |
+else
|
|
|
4442 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
4443 |
+echo "${ECHO_T}no" >&6
|
|
|
4444 |
+fi
|
|
|
4445 |
+
|
|
|
4446 |
+ CC=$ac_ct_CC
|
|
|
4447 |
+else
|
|
|
4448 |
+ CC="$ac_cv_prog_CC"
|
|
|
4449 |
+fi
|
|
|
4450 |
+
|
|
|
4451 |
+fi
|
|
|
4452 |
if test -z "$CC"; then
|
|
|
4453 |
# Extract the first word of "cc", so it can be a program name with args.
|
|
|
4454 |
set dummy cc; ac_word=$2
|
|
|
4455 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
4456 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
4457 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
4458 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
4459 |
if test "${ac_cv_prog_CC+set}" = set; then
|
|
|
4460 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
4461 |
else
|
|
|
4462 |
@@ -4412,7 +3846,7 @@
|
|
|
4463 |
IFS=$as_save_IFS
|
|
|
4464 |
test -z "$as_dir" && as_dir=.
|
|
|
4465 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
4466 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
4467 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
4468 |
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
|
|
|
4469 |
ac_prog_rejected=yes
|
|
|
4470 |
continue
|
|
|
4471 |
@@ -4423,7 +3857,6 @@
|
|
|
4472 |
fi
|
|
|
4473 |
done
|
|
|
4474 |
done
|
|
|
4475 |
-IFS=$as_save_IFS
|
|
|
4476 |
|
|
|
4477 |
if test $ac_prog_rejected = yes; then
|
|
|
4478 |
# We found a bogon in the path, so make sure we never use it.
|
|
|
4479 |
@@ -4441,23 +3874,22 @@
|
|
|
4480 |
fi
|
|
|
4481 |
CC=$ac_cv_prog_CC
|
|
|
4482 |
if test -n "$CC"; then
|
|
|
4483 |
- { echo "$as_me:$LINENO: result: $CC" >&5
|
|
|
4484 |
-echo "${ECHO_T}$CC" >&6; }
|
|
|
4485 |
+ echo "$as_me:$LINENO: result: $CC" >&5
|
|
|
4486 |
+echo "${ECHO_T}$CC" >&6
|
|
|
4487 |
else
|
|
|
4488 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
4489 |
-echo "${ECHO_T}no" >&6; }
|
|
|
4490 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
4491 |
+echo "${ECHO_T}no" >&6
|
|
|
4492 |
fi
|
|
|
4493 |
|
|
|
4494 |
-
|
|
|
4495 |
fi
|
|
|
4496 |
if test -z "$CC"; then
|
|
|
4497 |
if test -n "$ac_tool_prefix"; then
|
|
|
4498 |
- for ac_prog in cl.exe
|
|
|
4499 |
+ for ac_prog in cl
|
|
|
4500 |
do
|
|
|
4501 |
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
|
|
|
4502 |
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
|
|
4503 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
4504 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
4505 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
4506 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
4507 |
if test "${ac_cv_prog_CC+set}" = set; then
|
|
|
4508 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
4509 |
else
|
|
|
4510 |
@@ -4470,7 +3902,7 @@
|
|
|
4511 |
IFS=$as_save_IFS
|
|
|
4512 |
test -z "$as_dir" && as_dir=.
|
|
|
4513 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
4514 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
4515 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
4516 |
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
|
|
|
4517 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
4518 |
break 2
|
|
|
4519 |
@@ -4477,31 +3909,29 @@
|
|
|
4520 |
fi
|
|
|
4521 |
done
|
|
|
4522 |
done
|
|
|
4523 |
-IFS=$as_save_IFS
|
|
|
4524 |
|
|
|
4525 |
fi
|
|
|
4526 |
fi
|
|
|
4527 |
CC=$ac_cv_prog_CC
|
|
|
4528 |
if test -n "$CC"; then
|
|
|
4529 |
- { echo "$as_me:$LINENO: result: $CC" >&5
|
|
|
4530 |
-echo "${ECHO_T}$CC" >&6; }
|
|
|
4531 |
+ echo "$as_me:$LINENO: result: $CC" >&5
|
|
|
4532 |
+echo "${ECHO_T}$CC" >&6
|
|
|
4533 |
else
|
|
|
4534 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
4535 |
-echo "${ECHO_T}no" >&6; }
|
|
|
4536 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
4537 |
+echo "${ECHO_T}no" >&6
|
|
|
4538 |
fi
|
|
|
4539 |
|
|
|
4540 |
-
|
|
|
4541 |
test -n "$CC" && break
|
|
|
4542 |
done
|
|
|
4543 |
fi
|
|
|
4544 |
if test -z "$CC"; then
|
|
|
4545 |
ac_ct_CC=$CC
|
|
|
4546 |
- for ac_prog in cl.exe
|
|
|
4547 |
+ for ac_prog in cl
|
|
|
4548 |
do
|
|
|
4549 |
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
|
4550 |
set dummy $ac_prog; ac_word=$2
|
|
|
4551 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
4552 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
4553 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
4554 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
4555 |
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
|
|
4556 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
4557 |
else
|
|
|
4558 |
@@ -4514,7 +3944,7 @@
|
|
|
4559 |
IFS=$as_save_IFS
|
|
|
4560 |
test -z "$as_dir" && as_dir=.
|
|
|
4561 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
4562 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
4563 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
4564 |
ac_cv_prog_ac_ct_CC="$ac_prog"
|
|
|
4565 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
4566 |
break 2
|
|
|
4567 |
@@ -4521,38 +3951,22 @@
|
|
|
4568 |
fi
|
|
|
4569 |
done
|
|
|
4570 |
done
|
|
|
4571 |
-IFS=$as_save_IFS
|
|
|
4572 |
|
|
|
4573 |
fi
|
|
|
4574 |
fi
|
|
|
4575 |
ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
|
4576 |
if test -n "$ac_ct_CC"; then
|
|
|
4577 |
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
|
4578 |
-echo "${ECHO_T}$ac_ct_CC" >&6; }
|
|
|
4579 |
+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
|
4580 |
+echo "${ECHO_T}$ac_ct_CC" >&6
|
|
|
4581 |
else
|
|
|
4582 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
4583 |
-echo "${ECHO_T}no" >&6; }
|
|
|
4584 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
4585 |
+echo "${ECHO_T}no" >&6
|
|
|
4586 |
fi
|
|
|
4587 |
|
|
|
4588 |
-
|
|
|
4589 |
test -n "$ac_ct_CC" && break
|
|
|
4590 |
done
|
|
|
4591 |
|
|
|
4592 |
- if test "x$ac_ct_CC" = x; then
|
|
|
4593 |
- CC=""
|
|
|
4594 |
- else
|
|
|
4595 |
- case $cross_compiling:$ac_tool_warned in
|
|
|
4596 |
-yes:)
|
|
|
4597 |
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
|
4598 |
-whose name does not start with the host triplet. If you think this
|
|
|
4599 |
-configuration is useful to you, please write to [email protected]." >&5
|
|
|
4600 |
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
|
4601 |
-whose name does not start with the host triplet. If you think this
|
|
|
4602 |
-configuration is useful to you, please write to [email protected]." >&2;}
|
|
|
4603 |
-ac_tool_warned=yes ;;
|
|
|
4604 |
-esac
|
|
|
4605 |
- CC=$ac_ct_CC
|
|
|
4606 |
- fi
|
|
|
4607 |
+ CC=$ac_ct_CC
|
|
|
4608 |
fi
|
|
|
4609 |
|
|
|
4610 |
fi
|
|
|
4611 |
@@ -4565,41 +3979,27 @@
|
|
|
4612 |
{ (exit 1); exit 1; }; }
|
|
|
4613 |
|
|
|
4614 |
# Provide some information about the compiler.
|
|
|
4615 |
-echo "$as_me:$LINENO: checking for C compiler version" >&5
|
|
|
4616 |
+echo "$as_me:$LINENO:" \
|
|
|
4617 |
+ "checking for C compiler version" >&5
|
|
|
4618 |
ac_compiler=`set X $ac_compile; echo $2`
|
|
|
4619 |
-{ (ac_try="$ac_compiler --version >&5"
|
|
|
4620 |
-case "(($ac_try" in
|
|
|
4621 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
4622 |
- *) ac_try_echo=$ac_try;;
|
|
|
4623 |
-esac
|
|
|
4624 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
4625 |
- (eval "$ac_compiler --version >&5") 2>&5
|
|
|
4626 |
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
|
|
4627 |
+ (eval $ac_compiler --version </dev/null >&5) 2>&5
|
|
|
4628 |
ac_status=$?
|
|
|
4629 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
4630 |
(exit $ac_status); }
|
|
|
4631 |
-{ (ac_try="$ac_compiler -v >&5"
|
|
|
4632 |
-case "(($ac_try" in
|
|
|
4633 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
4634 |
- *) ac_try_echo=$ac_try;;
|
|
|
4635 |
-esac
|
|
|
4636 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
4637 |
- (eval "$ac_compiler -v >&5") 2>&5
|
|
|
4638 |
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
|
|
|
4639 |
+ (eval $ac_compiler -v </dev/null >&5) 2>&5
|
|
|
4640 |
ac_status=$?
|
|
|
4641 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
4642 |
(exit $ac_status); }
|
|
|
4643 |
-{ (ac_try="$ac_compiler -V >&5"
|
|
|
4644 |
-case "(($ac_try" in
|
|
|
4645 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
4646 |
- *) ac_try_echo=$ac_try;;
|
|
|
4647 |
-esac
|
|
|
4648 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
4649 |
- (eval "$ac_compiler -V >&5") 2>&5
|
|
|
4650 |
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
|
|
|
4651 |
+ (eval $ac_compiler -V </dev/null >&5) 2>&5
|
|
|
4652 |
ac_status=$?
|
|
|
4653 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
4654 |
(exit $ac_status); }
|
|
|
4655 |
|
|
|
4656 |
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
|
|
|
4657 |
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
|
|
|
4658 |
+echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
|
|
|
4659 |
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
|
|
|
4660 |
if test "${ac_cv_c_compiler_gnu+set}" = set; then
|
|
|
4661 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
4662 |
else
|
|
|
4663 |
@@ -4622,49 +4022,50 @@
|
|
|
4664 |
}
|
|
|
4665 |
_ACEOF
|
|
|
4666 |
rm -f conftest.$ac_objext
|
|
|
4667 |
-if { (ac_try="$ac_compile"
|
|
|
4668 |
-case "(($ac_try" in
|
|
|
4669 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
4670 |
- *) ac_try_echo=$ac_try;;
|
|
|
4671 |
-esac
|
|
|
4672 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
4673 |
- (eval "$ac_compile") 2>conftest.er1
|
|
|
4674 |
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
4675 |
+ (eval $ac_compile) 2>conftest.er1
|
|
|
4676 |
ac_status=$?
|
|
|
4677 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
4678 |
rm -f conftest.er1
|
|
|
4679 |
cat conftest.err >&5
|
|
|
4680 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
4681 |
- (exit $ac_status); } && {
|
|
|
4682 |
- test -z "$ac_c_werror_flag" ||
|
|
|
4683 |
- test ! -s conftest.err
|
|
|
4684 |
- } && test -s conftest.$ac_objext; then
|
|
|
4685 |
+ (exit $ac_status); } &&
|
|
|
4686 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
4687 |
+ || test ! -s conftest.err'
|
|
|
4688 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
4689 |
+ (eval $ac_try) 2>&5
|
|
|
4690 |
+ ac_status=$?
|
|
|
4691 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
4692 |
+ (exit $ac_status); }; } &&
|
|
|
4693 |
+ { ac_try='test -s conftest.$ac_objext'
|
|
|
4694 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
4695 |
+ (eval $ac_try) 2>&5
|
|
|
4696 |
+ ac_status=$?
|
|
|
4697 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
4698 |
+ (exit $ac_status); }; }; then
|
|
|
4699 |
ac_compiler_gnu=yes
|
|
|
4700 |
else
|
|
|
4701 |
echo "$as_me: failed program was:" >&5
|
|
|
4702 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
4703 |
|
|
|
4704 |
- ac_compiler_gnu=no
|
|
|
4705 |
+ac_compiler_gnu=no
|
|
|
4706 |
fi
|
|
|
4707 |
-
|
|
|
4708 |
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
4709 |
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
4710 |
ac_cv_c_compiler_gnu=$ac_compiler_gnu
|
|
|
4711 |
|
|
|
4712 |
fi
|
|
|
4713 |
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
|
|
|
4714 |
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
|
|
|
4715 |
+echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
|
|
|
4716 |
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
|
|
|
4717 |
GCC=`test $ac_compiler_gnu = yes && echo yes`
|
|
|
4718 |
ac_test_CFLAGS=${CFLAGS+set}
|
|
|
4719 |
ac_save_CFLAGS=$CFLAGS
|
|
|
4720 |
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
|
|
4721 |
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
|
|
|
4722 |
+CFLAGS="-g"
|
|
|
4723 |
+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
|
|
4724 |
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
|
|
|
4725 |
if test "${ac_cv_prog_cc_g+set}" = set; then
|
|
|
4726 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
4727 |
else
|
|
|
4728 |
- ac_save_c_werror_flag=$ac_c_werror_flag
|
|
|
4729 |
- ac_c_werror_flag=yes
|
|
|
4730 |
- ac_cv_prog_cc_g=no
|
|
|
4731 |
- CFLAGS="-g"
|
|
|
4732 |
- cat >conftest.$ac_ext <<_ACEOF
|
|
|
4733 |
+ cat >conftest.$ac_ext <<_ACEOF
|
|
|
4734 |
/* confdefs.h. */
|
|
|
4735 |
_ACEOF
|
|
|
4736 |
cat confdefs.h >>conftest.$ac_ext
|
|
|
4737 |
@@ -4680,118 +4081,38 @@
|
|
|
4738 |
}
|
|
|
4739 |
_ACEOF
|
|
|
4740 |
rm -f conftest.$ac_objext
|
|
|
4741 |
-if { (ac_try="$ac_compile"
|
|
|
4742 |
-case "(($ac_try" in
|
|
|
4743 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
4744 |
- *) ac_try_echo=$ac_try;;
|
|
|
4745 |
-esac
|
|
|
4746 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
4747 |
- (eval "$ac_compile") 2>conftest.er1
|
|
|
4748 |
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
4749 |
+ (eval $ac_compile) 2>conftest.er1
|
|
|
4750 |
ac_status=$?
|
|
|
4751 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
4752 |
rm -f conftest.er1
|
|
|
4753 |
cat conftest.err >&5
|
|
|
4754 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
4755 |
- (exit $ac_status); } && {
|
|
|
4756 |
- test -z "$ac_c_werror_flag" ||
|
|
|
4757 |
- test ! -s conftest.err
|
|
|
4758 |
- } && test -s conftest.$ac_objext; then
|
|
|
4759 |
- ac_cv_prog_cc_g=yes
|
|
|
4760 |
-else
|
|
|
4761 |
- echo "$as_me: failed program was:" >&5
|
|
|
4762 |
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
4763 |
-
|
|
|
4764 |
- CFLAGS=""
|
|
|
4765 |
- cat >conftest.$ac_ext <<_ACEOF
|
|
|
4766 |
-/* confdefs.h. */
|
|
|
4767 |
-_ACEOF
|
|
|
4768 |
-cat confdefs.h >>conftest.$ac_ext
|
|
|
4769 |
-cat >>conftest.$ac_ext <<_ACEOF
|
|
|
4770 |
-/* end confdefs.h. */
|
|
|
4771 |
-
|
|
|
4772 |
-int
|
|
|
4773 |
-main ()
|
|
|
4774 |
-{
|
|
|
4775 |
-
|
|
|
4776 |
- ;
|
|
|
4777 |
- return 0;
|
|
|
4778 |
-}
|
|
|
4779 |
-_ACEOF
|
|
|
4780 |
-rm -f conftest.$ac_objext
|
|
|
4781 |
-if { (ac_try="$ac_compile"
|
|
|
4782 |
-case "(($ac_try" in
|
|
|
4783 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
4784 |
- *) ac_try_echo=$ac_try;;
|
|
|
4785 |
-esac
|
|
|
4786 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
4787 |
- (eval "$ac_compile") 2>conftest.er1
|
|
|
4788 |
+ (exit $ac_status); } &&
|
|
|
4789 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
4790 |
+ || test ! -s conftest.err'
|
|
|
4791 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
4792 |
+ (eval $ac_try) 2>&5
|
|
|
4793 |
ac_status=$?
|
|
|
4794 |
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
4795 |
- rm -f conftest.er1
|
|
|
4796 |
- cat conftest.err >&5
|
|
|
4797 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
4798 |
- (exit $ac_status); } && {
|
|
|
4799 |
- test -z "$ac_c_werror_flag" ||
|
|
|
4800 |
- test ! -s conftest.err
|
|
|
4801 |
- } && test -s conftest.$ac_objext; then
|
|
|
4802 |
- :
|
|
|
4803 |
-else
|
|
|
4804 |
- echo "$as_me: failed program was:" >&5
|
|
|
4805 |
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
4806 |
-
|
|
|
4807 |
- ac_c_werror_flag=$ac_save_c_werror_flag
|
|
|
4808 |
- CFLAGS="-g"
|
|
|
4809 |
- cat >conftest.$ac_ext <<_ACEOF
|
|
|
4810 |
-/* confdefs.h. */
|
|
|
4811 |
-_ACEOF
|
|
|
4812 |
-cat confdefs.h >>conftest.$ac_ext
|
|
|
4813 |
-cat >>conftest.$ac_ext <<_ACEOF
|
|
|
4814 |
-/* end confdefs.h. */
|
|
|
4815 |
-
|
|
|
4816 |
-int
|
|
|
4817 |
-main ()
|
|
|
4818 |
-{
|
|
|
4819 |
-
|
|
|
4820 |
- ;
|
|
|
4821 |
- return 0;
|
|
|
4822 |
-}
|
|
|
4823 |
-_ACEOF
|
|
|
4824 |
-rm -f conftest.$ac_objext
|
|
|
4825 |
-if { (ac_try="$ac_compile"
|
|
|
4826 |
-case "(($ac_try" in
|
|
|
4827 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
4828 |
- *) ac_try_echo=$ac_try;;
|
|
|
4829 |
-esac
|
|
|
4830 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
4831 |
- (eval "$ac_compile") 2>conftest.er1
|
|
|
4832 |
+ (exit $ac_status); }; } &&
|
|
|
4833 |
+ { ac_try='test -s conftest.$ac_objext'
|
|
|
4834 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
4835 |
+ (eval $ac_try) 2>&5
|
|
|
4836 |
ac_status=$?
|
|
|
4837 |
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
4838 |
- rm -f conftest.er1
|
|
|
4839 |
- cat conftest.err >&5
|
|
|
4840 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
4841 |
- (exit $ac_status); } && {
|
|
|
4842 |
- test -z "$ac_c_werror_flag" ||
|
|
|
4843 |
- test ! -s conftest.err
|
|
|
4844 |
- } && test -s conftest.$ac_objext; then
|
|
|
4845 |
+ (exit $ac_status); }; }; then
|
|
|
4846 |
ac_cv_prog_cc_g=yes
|
|
|
4847 |
else
|
|
|
4848 |
echo "$as_me: failed program was:" >&5
|
|
|
4849 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
4850 |
|
|
|
4851 |
-
|
|
|
4852 |
+ac_cv_prog_cc_g=no
|
|
|
4853 |
fi
|
|
|
4854 |
-
|
|
|
4855 |
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
4856 |
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
4857 |
fi
|
|
|
4858 |
-
|
|
|
4859 |
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
4860 |
-fi
|
|
|
4861 |
-
|
|
|
4862 |
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
4863 |
- ac_c_werror_flag=$ac_save_c_werror_flag
|
|
|
4864 |
-fi
|
|
|
4865 |
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
|
|
|
4866 |
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
|
|
|
4867 |
+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
|
|
|
4868 |
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
|
|
|
4869 |
if test "$ac_test_CFLAGS" = set; then
|
|
|
4870 |
CFLAGS=$ac_save_CFLAGS
|
|
|
4871 |
elif test $ac_cv_prog_cc_g = yes; then
|
|
|
4872 |
@@ -4807,12 +4128,12 @@
|
|
|
4873 |
CFLAGS=
|
|
|
4874 |
fi
|
|
|
4875 |
fi
|
|
|
4876 |
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
|
|
|
4877 |
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
|
|
|
4878 |
-if test "${ac_cv_prog_cc_c89+set}" = set; then
|
|
|
4879 |
+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
|
|
|
4880 |
+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
|
|
|
4881 |
+if test "${ac_cv_prog_cc_stdc+set}" = set; then
|
|
|
4882 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
4883 |
else
|
|
|
4884 |
- ac_cv_prog_cc_c89=no
|
|
|
4885 |
+ ac_cv_prog_cc_stdc=no
|
|
|
4886 |
ac_save_CC=$CC
|
|
|
4887 |
cat >conftest.$ac_ext <<_ACEOF
|
|
|
4888 |
/* confdefs.h. */
|
|
|
4889 |
@@ -4846,17 +4167,12 @@
|
|
|
4890 |
/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
|
|
|
4891 |
function prototypes and stuff, but not '\xHH' hex character constants.
|
|
|
4892 |
These don't provoke an error unfortunately, instead are silently treated
|
|
|
4893 |
- as 'x'. The following induces an error, until -std is added to get
|
|
|
4894 |
+ as 'x'. The following induces an error, until -std1 is added to get
|
|
|
4895 |
proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
|
|
|
4896 |
array size at least. It's necessary to write '\x00'==0 to get something
|
|
|
4897 |
- that's true only with -std. */
|
|
|
4898 |
+ that's true only with -std1. */
|
|
|
4899 |
int osf4_cc_array ['\x00' == 0 ? 1 : -1];
|
|
|
4900 |
|
|
|
4901 |
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
|
|
|
4902 |
- inside strings and character constants. */
|
|
|
4903 |
-#define FOO(x) 'x'
|
|
|
4904 |
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
|
|
|
4905 |
-
|
|
|
4906 |
int test (int i, double x);
|
|
|
4907 |
struct s1 {int (*f) (int a);};
|
|
|
4908 |
struct s2 {int (*f) (double a);};
|
|
|
4909 |
@@ -4871,57 +4187,205 @@
|
|
|
4910 |
return 0;
|
|
|
4911 |
}
|
|
|
4912 |
_ACEOF
|
|
|
4913 |
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
|
|
|
4914 |
- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
|
|
|
4915 |
+# Don't try gcc -ansi; that turns off useful extensions and
|
|
|
4916 |
+# breaks some systems' header files.
|
|
|
4917 |
+# AIX -qlanglvl=ansi
|
|
|
4918 |
+# Ultrix and OSF/1 -std1
|
|
|
4919 |
+# HP-UX 10.20 and later -Ae
|
|
|
4920 |
+# HP-UX older versions -Aa -D_HPUX_SOURCE
|
|
|
4921 |
+# SVR4 -Xc -D__EXTENSIONS__
|
|
|
4922 |
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
|
|
|
4923 |
do
|
|
|
4924 |
CC="$ac_save_CC $ac_arg"
|
|
|
4925 |
rm -f conftest.$ac_objext
|
|
|
4926 |
-if { (ac_try="$ac_compile"
|
|
|
4927 |
-case "(($ac_try" in
|
|
|
4928 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
4929 |
- *) ac_try_echo=$ac_try;;
|
|
|
4930 |
-esac
|
|
|
4931 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
4932 |
- (eval "$ac_compile") 2>conftest.er1
|
|
|
4933 |
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
4934 |
+ (eval $ac_compile) 2>conftest.er1
|
|
|
4935 |
ac_status=$?
|
|
|
4936 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
4937 |
rm -f conftest.er1
|
|
|
4938 |
cat conftest.err >&5
|
|
|
4939 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
4940 |
- (exit $ac_status); } && {
|
|
|
4941 |
- test -z "$ac_c_werror_flag" ||
|
|
|
4942 |
- test ! -s conftest.err
|
|
|
4943 |
- } && test -s conftest.$ac_objext; then
|
|
|
4944 |
- ac_cv_prog_cc_c89=$ac_arg
|
|
|
4945 |
+ (exit $ac_status); } &&
|
|
|
4946 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
4947 |
+ || test ! -s conftest.err'
|
|
|
4948 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
4949 |
+ (eval $ac_try) 2>&5
|
|
|
4950 |
+ ac_status=$?
|
|
|
4951 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
4952 |
+ (exit $ac_status); }; } &&
|
|
|
4953 |
+ { ac_try='test -s conftest.$ac_objext'
|
|
|
4954 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
4955 |
+ (eval $ac_try) 2>&5
|
|
|
4956 |
+ ac_status=$?
|
|
|
4957 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
4958 |
+ (exit $ac_status); }; }; then
|
|
|
4959 |
+ ac_cv_prog_cc_stdc=$ac_arg
|
|
|
4960 |
+break
|
|
|
4961 |
else
|
|
|
4962 |
echo "$as_me: failed program was:" >&5
|
|
|
4963 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
4964 |
|
|
|
4965 |
-
|
|
|
4966 |
fi
|
|
|
4967 |
-
|
|
|
4968 |
-rm -f core conftest.err conftest.$ac_objext
|
|
|
4969 |
- test "x$ac_cv_prog_cc_c89" != "xno" && break
|
|
|
4970 |
+rm -f conftest.err conftest.$ac_objext
|
|
|
4971 |
done
|
|
|
4972 |
-rm -f conftest.$ac_ext
|
|
|
4973 |
+rm -f conftest.$ac_ext conftest.$ac_objext
|
|
|
4974 |
CC=$ac_save_CC
|
|
|
4975 |
|
|
|
4976 |
fi
|
|
|
4977 |
-# AC_CACHE_VAL
|
|
|
4978 |
-case "x$ac_cv_prog_cc_c89" in
|
|
|
4979 |
- x)
|
|
|
4980 |
- { echo "$as_me:$LINENO: result: none needed" >&5
|
|
|
4981 |
-echo "${ECHO_T}none needed" >&6; } ;;
|
|
|
4982 |
- xno)
|
|
|
4983 |
- { echo "$as_me:$LINENO: result: unsupported" >&5
|
|
|
4984 |
-echo "${ECHO_T}unsupported" >&6; } ;;
|
|
|
4985 |
+
|
|
|
4986 |
+case "x$ac_cv_prog_cc_stdc" in
|
|
|
4987 |
+ x|xno)
|
|
|
4988 |
+ echo "$as_me:$LINENO: result: none needed" >&5
|
|
|
4989 |
+echo "${ECHO_T}none needed" >&6 ;;
|
|
|
4990 |
*)
|
|
|
4991 |
- CC="$CC $ac_cv_prog_cc_c89"
|
|
|
4992 |
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
|
|
|
4993 |
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
|
|
|
4994 |
+ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
|
|
|
4995 |
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
|
|
|
4996 |
+ CC="$CC $ac_cv_prog_cc_stdc" ;;
|
|
|
4997 |
esac
|
|
|
4998 |
|
|
|
4999 |
+# Some people use a C++ compiler to compile C. Since we use `exit',
|
|
|
5000 |
+# in C++ we need to declare it. In case someone uses the same compiler
|
|
|
5001 |
+# for both compiling C and C++ we need to have the C++ compiler decide
|
|
|
5002 |
+# the declaration of exit, since it's the most demanding environment.
|
|
|
5003 |
+cat >conftest.$ac_ext <<_ACEOF
|
|
|
5004 |
+#ifndef __cplusplus
|
|
|
5005 |
+ choke me
|
|
|
5006 |
+#endif
|
|
|
5007 |
+_ACEOF
|
|
|
5008 |
+rm -f conftest.$ac_objext
|
|
|
5009 |
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
5010 |
+ (eval $ac_compile) 2>conftest.er1
|
|
|
5011 |
+ ac_status=$?
|
|
|
5012 |
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
5013 |
+ rm -f conftest.er1
|
|
|
5014 |
+ cat conftest.err >&5
|
|
|
5015 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5016 |
+ (exit $ac_status); } &&
|
|
|
5017 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
5018 |
+ || test ! -s conftest.err'
|
|
|
5019 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
5020 |
+ (eval $ac_try) 2>&5
|
|
|
5021 |
+ ac_status=$?
|
|
|
5022 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5023 |
+ (exit $ac_status); }; } &&
|
|
|
5024 |
+ { ac_try='test -s conftest.$ac_objext'
|
|
|
5025 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
5026 |
+ (eval $ac_try) 2>&5
|
|
|
5027 |
+ ac_status=$?
|
|
|
5028 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5029 |
+ (exit $ac_status); }; }; then
|
|
|
5030 |
+ for ac_declaration in \
|
|
|
5031 |
+ '' \
|
|
|
5032 |
+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
|
|
|
5033 |
+ 'extern "C" void std::exit (int); using std::exit;' \
|
|
|
5034 |
+ 'extern "C" void exit (int) throw ();' \
|
|
|
5035 |
+ 'extern "C" void exit (int);' \
|
|
|
5036 |
+ 'void exit (int);'
|
|
|
5037 |
+do
|
|
|
5038 |
+ cat >conftest.$ac_ext <<_ACEOF
|
|
|
5039 |
+/* confdefs.h. */
|
|
|
5040 |
+_ACEOF
|
|
|
5041 |
+cat confdefs.h >>conftest.$ac_ext
|
|
|
5042 |
+cat >>conftest.$ac_ext <<_ACEOF
|
|
|
5043 |
+/* end confdefs.h. */
|
|
|
5044 |
+$ac_declaration
|
|
|
5045 |
+#include <stdlib.h>
|
|
|
5046 |
+int
|
|
|
5047 |
+main ()
|
|
|
5048 |
+{
|
|
|
5049 |
+exit (42);
|
|
|
5050 |
+ ;
|
|
|
5051 |
+ return 0;
|
|
|
5052 |
+}
|
|
|
5053 |
+_ACEOF
|
|
|
5054 |
+rm -f conftest.$ac_objext
|
|
|
5055 |
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
5056 |
+ (eval $ac_compile) 2>conftest.er1
|
|
|
5057 |
+ ac_status=$?
|
|
|
5058 |
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
5059 |
+ rm -f conftest.er1
|
|
|
5060 |
+ cat conftest.err >&5
|
|
|
5061 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5062 |
+ (exit $ac_status); } &&
|
|
|
5063 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
5064 |
+ || test ! -s conftest.err'
|
|
|
5065 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
5066 |
+ (eval $ac_try) 2>&5
|
|
|
5067 |
+ ac_status=$?
|
|
|
5068 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5069 |
+ (exit $ac_status); }; } &&
|
|
|
5070 |
+ { ac_try='test -s conftest.$ac_objext'
|
|
|
5071 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
5072 |
+ (eval $ac_try) 2>&5
|
|
|
5073 |
+ ac_status=$?
|
|
|
5074 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5075 |
+ (exit $ac_status); }; }; then
|
|
|
5076 |
+ :
|
|
|
5077 |
+else
|
|
|
5078 |
+ echo "$as_me: failed program was:" >&5
|
|
|
5079 |
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
5080 |
|
|
|
5081 |
+continue
|
|
|
5082 |
+fi
|
|
|
5083 |
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
5084 |
+ cat >conftest.$ac_ext <<_ACEOF
|
|
|
5085 |
+/* confdefs.h. */
|
|
|
5086 |
+_ACEOF
|
|
|
5087 |
+cat confdefs.h >>conftest.$ac_ext
|
|
|
5088 |
+cat >>conftest.$ac_ext <<_ACEOF
|
|
|
5089 |
+/* end confdefs.h. */
|
|
|
5090 |
+$ac_declaration
|
|
|
5091 |
+int
|
|
|
5092 |
+main ()
|
|
|
5093 |
+{
|
|
|
5094 |
+exit (42);
|
|
|
5095 |
+ ;
|
|
|
5096 |
+ return 0;
|
|
|
5097 |
+}
|
|
|
5098 |
+_ACEOF
|
|
|
5099 |
+rm -f conftest.$ac_objext
|
|
|
5100 |
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
5101 |
+ (eval $ac_compile) 2>conftest.er1
|
|
|
5102 |
+ ac_status=$?
|
|
|
5103 |
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
5104 |
+ rm -f conftest.er1
|
|
|
5105 |
+ cat conftest.err >&5
|
|
|
5106 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5107 |
+ (exit $ac_status); } &&
|
|
|
5108 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
5109 |
+ || test ! -s conftest.err'
|
|
|
5110 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
5111 |
+ (eval $ac_try) 2>&5
|
|
|
5112 |
+ ac_status=$?
|
|
|
5113 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5114 |
+ (exit $ac_status); }; } &&
|
|
|
5115 |
+ { ac_try='test -s conftest.$ac_objext'
|
|
|
5116 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
5117 |
+ (eval $ac_try) 2>&5
|
|
|
5118 |
+ ac_status=$?
|
|
|
5119 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5120 |
+ (exit $ac_status); }; }; then
|
|
|
5121 |
+ break
|
|
|
5122 |
+else
|
|
|
5123 |
+ echo "$as_me: failed program was:" >&5
|
|
|
5124 |
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
5125 |
+
|
|
|
5126 |
+fi
|
|
|
5127 |
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
5128 |
+done
|
|
|
5129 |
+rm -f conftest*
|
|
|
5130 |
+if test -n "$ac_declaration"; then
|
|
|
5131 |
+ echo '#ifdef __cplusplus' >>confdefs.h
|
|
|
5132 |
+ echo $ac_declaration >>confdefs.h
|
|
|
5133 |
+ echo '#endif' >>confdefs.h
|
|
|
5134 |
+fi
|
|
|
5135 |
+
|
|
|
5136 |
+else
|
|
|
5137 |
+ echo "$as_me: failed program was:" >&5
|
|
|
5138 |
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
5139 |
+
|
|
|
5140 |
+fi
|
|
|
5141 |
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
5142 |
ac_ext=c
|
|
|
5143 |
ac_cpp='$CPP $CPPFLAGS'
|
|
|
5144 |
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
|
5145 |
@@ -4930,8 +4394,8 @@
|
|
|
5146 |
|
|
|
5147 |
depcc="$CC" am_compiler_list=
|
|
|
5148 |
|
|
|
5149 |
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
|
|
|
5150 |
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
|
|
|
5151 |
+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
|
|
|
5152 |
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
|
|
|
5153 |
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
|
|
|
5154 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
5155 |
else
|
|
|
5156 |
@@ -5013,8 +4477,8 @@
|
|
|
5157 |
fi
|
|
|
5158 |
|
|
|
5159 |
fi
|
|
|
5160 |
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
|
|
|
5161 |
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
|
|
|
5162 |
+echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
|
|
|
5163 |
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
|
|
|
5164 |
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
|
|
|
5165 |
|
|
|
5166 |
|
|
|
5167 |
@@ -5043,8 +4507,8 @@
|
|
|
5168 |
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
|
|
5169 |
# OS/2's system install, which has a completely different semantic
|
|
|
5170 |
# ./install, which can be erroneously created by make from ./install.sh.
|
|
|
5171 |
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
|
|
|
5172 |
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
|
|
|
5173 |
+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
|
|
|
5174 |
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
|
|
|
5175 |
if test -z "$INSTALL"; then
|
|
|
5176 |
if test "${ac_cv_path_install+set}" = set; then
|
|
|
5177 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
5178 |
@@ -5066,7 +4530,7 @@
|
|
|
5179 |
# by default.
|
|
|
5180 |
for ac_prog in ginstall scoinst install; do
|
|
|
5181 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
5182 |
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
|
|
|
5183 |
+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
|
|
|
5184 |
if test $ac_prog = install &&
|
|
|
5185 |
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
|
|
|
5186 |
# AIX install. It has an incompatible calling convention.
|
|
|
5187 |
@@ -5085,7 +4549,6 @@
|
|
|
5188 |
;;
|
|
|
5189 |
esac
|
|
|
5190 |
done
|
|
|
5191 |
-IFS=$as_save_IFS
|
|
|
5192 |
|
|
|
5193 |
|
|
|
5194 |
fi
|
|
|
5195 |
@@ -5092,15 +4555,15 @@
|
|
|
5196 |
if test "${ac_cv_path_install+set}" = set; then
|
|
|
5197 |
INSTALL=$ac_cv_path_install
|
|
|
5198 |
else
|
|
|
5199 |
- # As a last resort, use the slow shell script. Don't cache a
|
|
|
5200 |
- # value for INSTALL within a source directory, because that will
|
|
|
5201 |
+ # As a last resort, use the slow shell script. We don't cache a
|
|
|
5202 |
+ # path for INSTALL within a source directory, because that will
|
|
|
5203 |
# break other packages using the cache if that directory is
|
|
|
5204 |
- # removed, or if the value is a relative name.
|
|
|
5205 |
+ # removed, or if the path is relative.
|
|
|
5206 |
INSTALL=$ac_install_sh
|
|
|
5207 |
fi
|
|
|
5208 |
fi
|
|
|
5209 |
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
|
|
|
5210 |
-echo "${ECHO_T}$INSTALL" >&6; }
|
|
|
5211 |
+echo "$as_me:$LINENO: result: $INSTALL" >&5
|
|
|
5212 |
+echo "${ECHO_T}$INSTALL" >&6
|
|
|
5213 |
|
|
|
5214 |
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
|
|
|
5215 |
# It thinks the first close brace ends the variable substitution.
|
|
|
5216 |
@@ -5122,15 +4585,15 @@
|
|
|
5217 |
esac
|
|
|
5218 |
|
|
|
5219 |
if test -n ""; then
|
|
|
5220 |
- { echo "$as_me:$LINENO: checking for intltool >= " >&5
|
|
|
5221 |
-echo $ECHO_N "checking for intltool >= ... $ECHO_C" >&6; }
|
|
|
5222 |
+ echo "$as_me:$LINENO: checking for intltool >= " >&5
|
|
|
5223 |
+echo $ECHO_N "checking for intltool >= ... $ECHO_C" >&6
|
|
|
5224 |
|
|
|
5225 |
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
|
|
|
5226 |
INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
|
|
|
5227 |
INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
|
|
|
5228 |
|
|
|
5229 |
- { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
|
|
|
5230 |
-echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
|
|
|
5231 |
+ echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
|
|
|
5232 |
+echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6
|
|
|
5233 |
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
|
|
|
5234 |
{ { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool or later." >&5
|
|
|
5235 |
echo "$as_me: error: Your intltool is too old. You need intltool or later." >&2;}
|
|
|
5236 |
@@ -5185,8 +4648,8 @@
|
|
|
5237 |
|
|
|
5238 |
# Extract the first word of "perl", so it can be a program name with args.
|
|
|
5239 |
set dummy perl; ac_word=$2
|
|
|
5240 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
5241 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
5242 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
5243 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
5244 |
if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
|
|
|
5245 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
5246 |
else
|
|
|
5247 |
@@ -5201,7 +4664,7 @@
|
|
|
5248 |
IFS=$as_save_IFS
|
|
|
5249 |
test -z "$as_dir" && as_dir=.
|
|
|
5250 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
5251 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
5252 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
5253 |
ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
|
|
|
5254 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
5255 |
break 2
|
|
|
5256 |
@@ -5208,21 +4671,20 @@
|
|
|
5257 |
fi
|
|
|
5258 |
done
|
|
|
5259 |
done
|
|
|
5260 |
-IFS=$as_save_IFS
|
|
|
5261 |
|
|
|
5262 |
;;
|
|
|
5263 |
esac
|
|
|
5264 |
fi
|
|
|
5265 |
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
|
|
|
5266 |
+
|
|
|
5267 |
if test -n "$INTLTOOL_PERL"; then
|
|
|
5268 |
- { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
|
|
|
5269 |
-echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
|
|
|
5270 |
+ echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
|
|
|
5271 |
+echo "${ECHO_T}$INTLTOOL_PERL" >&6
|
|
|
5272 |
else
|
|
|
5273 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
5274 |
-echo "${ECHO_T}no" >&6; }
|
|
|
5275 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
5276 |
+echo "${ECHO_T}no" >&6
|
|
|
5277 |
fi
|
|
|
5278 |
|
|
|
5279 |
-
|
|
|
5280 |
if test -z "$INTLTOOL_PERL"; then
|
|
|
5281 |
{ { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
|
|
|
5282 |
echo "$as_me: error: perl not found; required for intltool" >&2;}
|
|
|
5283 |
@@ -5234,11 +4696,11 @@
|
|
|
5284 |
{ (exit 1); exit 1; }; }
|
|
|
5285 |
fi
|
|
|
5286 |
if test "x" != "xno-xml"; then
|
|
|
5287 |
- { echo "$as_me:$LINENO: checking for XML::Parser" >&5
|
|
|
5288 |
-echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
|
|
|
5289 |
+ echo "$as_me:$LINENO: checking for XML::Parser" >&5
|
|
|
5290 |
+echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6
|
|
|
5291 |
if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
|
|
|
5292 |
- { echo "$as_me:$LINENO: result: ok" >&5
|
|
|
5293 |
-echo "${ECHO_T}ok" >&6; }
|
|
|
5294 |
+ echo "$as_me:$LINENO: result: ok" >&5
|
|
|
5295 |
+echo "${ECHO_T}ok" >&6
|
|
|
5296 |
else
|
|
|
5297 |
{ { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
|
|
|
5298 |
echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
|
|
|
5299 |
@@ -5248,8 +4710,8 @@
|
|
|
5300 |
|
|
|
5301 |
# Extract the first word of "iconv", so it can be a program name with args.
|
|
|
5302 |
set dummy iconv; ac_word=$2
|
|
|
5303 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
5304 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
5305 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
5306 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
5307 |
if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then
|
|
|
5308 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
5309 |
else
|
|
|
5310 |
@@ -5264,7 +4726,7 @@
|
|
|
5311 |
IFS=$as_save_IFS
|
|
|
5312 |
test -z "$as_dir" && as_dir=.
|
|
|
5313 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
5314 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
5315 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
5316 |
ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext"
|
|
|
5317 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
5318 |
break 2
|
|
|
5319 |
@@ -5271,7 +4733,6 @@
|
|
|
5320 |
fi
|
|
|
5321 |
done
|
|
|
5322 |
done
|
|
|
5323 |
-IFS=$as_save_IFS
|
|
|
5324 |
|
|
|
5325 |
test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv"
|
|
|
5326 |
;;
|
|
|
5327 |
@@ -5278,19 +4739,19 @@
|
|
|
5328 |
esac
|
|
|
5329 |
fi
|
|
|
5330 |
INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV
|
|
|
5331 |
+
|
|
|
5332 |
if test -n "$INTLTOOL_ICONV"; then
|
|
|
5333 |
- { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5
|
|
|
5334 |
-echo "${ECHO_T}$INTLTOOL_ICONV" >&6; }
|
|
|
5335 |
+ echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5
|
|
|
5336 |
+echo "${ECHO_T}$INTLTOOL_ICONV" >&6
|
|
|
5337 |
else
|
|
|
5338 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
5339 |
-echo "${ECHO_T}no" >&6; }
|
|
|
5340 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
5341 |
+echo "${ECHO_T}no" >&6
|
|
|
5342 |
fi
|
|
|
5343 |
|
|
|
5344 |
-
|
|
|
5345 |
# Extract the first word of "msgfmt", so it can be a program name with args.
|
|
|
5346 |
set dummy msgfmt; ac_word=$2
|
|
|
5347 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
5348 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
5349 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
5350 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
5351 |
if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then
|
|
|
5352 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
5353 |
else
|
|
|
5354 |
@@ -5305,7 +4766,7 @@
|
|
|
5355 |
IFS=$as_save_IFS
|
|
|
5356 |
test -z "$as_dir" && as_dir=.
|
|
|
5357 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
5358 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
5359 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
5360 |
ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
|
|
|
5361 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
5362 |
break 2
|
|
|
5363 |
@@ -5312,7 +4773,6 @@
|
|
|
5364 |
fi
|
|
|
5365 |
done
|
|
|
5366 |
done
|
|
|
5367 |
-IFS=$as_save_IFS
|
|
|
5368 |
|
|
|
5369 |
test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt"
|
|
|
5370 |
;;
|
|
|
5371 |
@@ -5319,19 +4779,19 @@
|
|
|
5372 |
esac
|
|
|
5373 |
fi
|
|
|
5374 |
INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT
|
|
|
5375 |
+
|
|
|
5376 |
if test -n "$INTLTOOL_MSGFMT"; then
|
|
|
5377 |
- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5
|
|
|
5378 |
-echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; }
|
|
|
5379 |
+ echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5
|
|
|
5380 |
+echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6
|
|
|
5381 |
else
|
|
|
5382 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
5383 |
-echo "${ECHO_T}no" >&6; }
|
|
|
5384 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
5385 |
+echo "${ECHO_T}no" >&6
|
|
|
5386 |
fi
|
|
|
5387 |
|
|
|
5388 |
-
|
|
|
5389 |
# Extract the first word of "msgmerge", so it can be a program name with args.
|
|
|
5390 |
set dummy msgmerge; ac_word=$2
|
|
|
5391 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
5392 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
5393 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
5394 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
5395 |
if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then
|
|
|
5396 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
5397 |
else
|
|
|
5398 |
@@ -5346,7 +4806,7 @@
|
|
|
5399 |
IFS=$as_save_IFS
|
|
|
5400 |
test -z "$as_dir" && as_dir=.
|
|
|
5401 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
5402 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
5403 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
5404 |
ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
|
|
|
5405 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
5406 |
break 2
|
|
|
5407 |
@@ -5353,7 +4813,6 @@
|
|
|
5408 |
fi
|
|
|
5409 |
done
|
|
|
5410 |
done
|
|
|
5411 |
-IFS=$as_save_IFS
|
|
|
5412 |
|
|
|
5413 |
test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge"
|
|
|
5414 |
;;
|
|
|
5415 |
@@ -5360,19 +4819,19 @@
|
|
|
5416 |
esac
|
|
|
5417 |
fi
|
|
|
5418 |
INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE
|
|
|
5419 |
+
|
|
|
5420 |
if test -n "$INTLTOOL_MSGMERGE"; then
|
|
|
5421 |
- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5
|
|
|
5422 |
-echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; }
|
|
|
5423 |
+ echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5
|
|
|
5424 |
+echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6
|
|
|
5425 |
else
|
|
|
5426 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
5427 |
-echo "${ECHO_T}no" >&6; }
|
|
|
5428 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
5429 |
+echo "${ECHO_T}no" >&6
|
|
|
5430 |
fi
|
|
|
5431 |
|
|
|
5432 |
-
|
|
|
5433 |
# Extract the first word of "xgettext", so it can be a program name with args.
|
|
|
5434 |
set dummy xgettext; ac_word=$2
|
|
|
5435 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
5436 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
5437 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
5438 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
5439 |
if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
|
|
|
5440 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
5441 |
else
|
|
|
5442 |
@@ -5387,7 +4846,7 @@
|
|
|
5443 |
IFS=$as_save_IFS
|
|
|
5444 |
test -z "$as_dir" && as_dir=.
|
|
|
5445 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
5446 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
5447 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
5448 |
ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
|
|
|
5449 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
5450 |
break 2
|
|
|
5451 |
@@ -5394,7 +4853,6 @@
|
|
|
5452 |
fi
|
|
|
5453 |
done
|
|
|
5454 |
done
|
|
|
5455 |
-IFS=$as_save_IFS
|
|
|
5456 |
|
|
|
5457 |
test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"
|
|
|
5458 |
;;
|
|
|
5459 |
@@ -5401,16 +4859,16 @@
|
|
|
5460 |
esac
|
|
|
5461 |
fi
|
|
|
5462 |
INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT
|
|
|
5463 |
+
|
|
|
5464 |
if test -n "$INTLTOOL_XGETTEXT"; then
|
|
|
5465 |
- { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
|
|
|
5466 |
-echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; }
|
|
|
5467 |
+ echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
|
|
|
5468 |
+echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6
|
|
|
5469 |
else
|
|
|
5470 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
5471 |
-echo "${ECHO_T}no" >&6; }
|
|
|
5472 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
5473 |
+echo "${ECHO_T}no" >&6
|
|
|
5474 |
fi
|
|
|
5475 |
|
|
|
5476 |
|
|
|
5477 |
-
|
|
|
5478 |
# Substitute ALL_LINGUAS so we can use it in po/Makefile
|
|
|
5479 |
|
|
|
5480 |
|
|
|
5481 |
@@ -5434,32 +4892,36 @@
|
|
|
5482 |
}
|
|
|
5483 |
_ACEOF
|
|
|
5484 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
5485 |
-if { (ac_try="$ac_link"
|
|
|
5486 |
-case "(($ac_try" in
|
|
|
5487 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
5488 |
- *) ac_try_echo=$ac_try;;
|
|
|
5489 |
-esac
|
|
|
5490 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
5491 |
- (eval "$ac_link") 2>conftest.er1
|
|
|
5492 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
5493 |
+ (eval $ac_link) 2>conftest.er1
|
|
|
5494 |
ac_status=$?
|
|
|
5495 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
5496 |
rm -f conftest.er1
|
|
|
5497 |
cat conftest.err >&5
|
|
|
5498 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5499 |
- (exit $ac_status); } && {
|
|
|
5500 |
- test -z "$ac_c_werror_flag" ||
|
|
|
5501 |
- test ! -s conftest.err
|
|
|
5502 |
- } && test -s conftest$ac_exeext &&
|
|
|
5503 |
- $as_test_x conftest$ac_exeext; then
|
|
|
5504 |
+ (exit $ac_status); } &&
|
|
|
5505 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
5506 |
+ || test ! -s conftest.err'
|
|
|
5507 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
5508 |
+ (eval $ac_try) 2>&5
|
|
|
5509 |
+ ac_status=$?
|
|
|
5510 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5511 |
+ (exit $ac_status); }; } &&
|
|
|
5512 |
+ { ac_try='test -s conftest$ac_exeext'
|
|
|
5513 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
5514 |
+ (eval $ac_try) 2>&5
|
|
|
5515 |
+ ac_status=$?
|
|
|
5516 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5517 |
+ (exit $ac_status); }; }; then
|
|
|
5518 |
DATADIRNAME=share
|
|
|
5519 |
else
|
|
|
5520 |
echo "$as_me: failed program was:" >&5
|
|
|
5521 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
5522 |
|
|
|
5523 |
- case $host in
|
|
|
5524 |
+case $host in
|
|
|
5525 |
*-*-solaris*)
|
|
|
5526 |
- { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
|
|
|
5527 |
-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
|
|
|
5528 |
+ echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
|
|
|
5529 |
+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6
|
|
|
5530 |
if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
|
|
|
5531 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
5532 |
else
|
|
|
5533 |
@@ -5486,59 +4948,68 @@
|
|
|
5534 |
|
|
|
5535 |
#undef bind_textdomain_codeset
|
|
|
5536 |
|
|
|
5537 |
-/* Override any GCC internal prototype to avoid an error.
|
|
|
5538 |
- Use char because int might match the return type of a GCC
|
|
|
5539 |
- builtin and then its argument prototype would still apply. */
|
|
|
5540 |
+/* Override any gcc2 internal prototype to avoid an error. */
|
|
|
5541 |
#ifdef __cplusplus
|
|
|
5542 |
extern "C"
|
|
|
5543 |
+{
|
|
|
5544 |
#endif
|
|
|
5545 |
+/* We use char because int might match the return type of a gcc2
|
|
|
5546 |
+ builtin and then its argument prototype would still apply. */
|
|
|
5547 |
char bind_textdomain_codeset ();
|
|
|
5548 |
/* The GNU C library defines this for functions which it implements
|
|
|
5549 |
to always fail with ENOSYS. Some functions are actually named
|
|
|
5550 |
something starting with __ and the normal name is an alias. */
|
|
|
5551 |
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
|
|
|
5552 |
+#if defined (__stub_bind_textdomain_codeset) || defined (__stub___bind_textdomain_codeset)
|
|
|
5553 |
choke me
|
|
|
5554 |
+#else
|
|
|
5555 |
+char (*f) () = bind_textdomain_codeset;
|
|
|
5556 |
#endif
|
|
|
5557 |
+#ifdef __cplusplus
|
|
|
5558 |
+}
|
|
|
5559 |
+#endif
|
|
|
5560 |
|
|
|
5561 |
int
|
|
|
5562 |
main ()
|
|
|
5563 |
{
|
|
|
5564 |
-return bind_textdomain_codeset ();
|
|
|
5565 |
+return f != bind_textdomain_codeset;
|
|
|
5566 |
;
|
|
|
5567 |
return 0;
|
|
|
5568 |
}
|
|
|
5569 |
_ACEOF
|
|
|
5570 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
5571 |
-if { (ac_try="$ac_link"
|
|
|
5572 |
-case "(($ac_try" in
|
|
|
5573 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
5574 |
- *) ac_try_echo=$ac_try;;
|
|
|
5575 |
-esac
|
|
|
5576 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
5577 |
- (eval "$ac_link") 2>conftest.er1
|
|
|
5578 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
5579 |
+ (eval $ac_link) 2>conftest.er1
|
|
|
5580 |
ac_status=$?
|
|
|
5581 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
5582 |
rm -f conftest.er1
|
|
|
5583 |
cat conftest.err >&5
|
|
|
5584 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5585 |
- (exit $ac_status); } && {
|
|
|
5586 |
- test -z "$ac_c_werror_flag" ||
|
|
|
5587 |
- test ! -s conftest.err
|
|
|
5588 |
- } && test -s conftest$ac_exeext &&
|
|
|
5589 |
- $as_test_x conftest$ac_exeext; then
|
|
|
5590 |
+ (exit $ac_status); } &&
|
|
|
5591 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
5592 |
+ || test ! -s conftest.err'
|
|
|
5593 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
5594 |
+ (eval $ac_try) 2>&5
|
|
|
5595 |
+ ac_status=$?
|
|
|
5596 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5597 |
+ (exit $ac_status); }; } &&
|
|
|
5598 |
+ { ac_try='test -s conftest$ac_exeext'
|
|
|
5599 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
5600 |
+ (eval $ac_try) 2>&5
|
|
|
5601 |
+ ac_status=$?
|
|
|
5602 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5603 |
+ (exit $ac_status); }; }; then
|
|
|
5604 |
ac_cv_func_bind_textdomain_codeset=yes
|
|
|
5605 |
else
|
|
|
5606 |
echo "$as_me: failed program was:" >&5
|
|
|
5607 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
5608 |
|
|
|
5609 |
- ac_cv_func_bind_textdomain_codeset=no
|
|
|
5610 |
+ac_cv_func_bind_textdomain_codeset=no
|
|
|
5611 |
fi
|
|
|
5612 |
-
|
|
|
5613 |
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
|
5614 |
+rm -f conftest.err conftest.$ac_objext \
|
|
|
5615 |
conftest$ac_exeext conftest.$ac_ext
|
|
|
5616 |
fi
|
|
|
5617 |
-{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
|
|
|
5618 |
-echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
|
|
|
5619 |
+echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
|
|
|
5620 |
+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6
|
|
|
5621 |
if test $ac_cv_func_bind_textdomain_codeset = yes; then
|
|
|
5622 |
DATADIRNAME=share
|
|
|
5623 |
else
|
|
|
5624 |
@@ -5551,8 +5022,7 @@
|
|
|
5625 |
;;
|
|
|
5626 |
esac
|
|
|
5627 |
fi
|
|
|
5628 |
-
|
|
|
5629 |
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
|
5630 |
+rm -f conftest.err conftest.$ac_objext \
|
|
|
5631 |
conftest$ac_exeext conftest.$ac_ext
|
|
|
5632 |
fi
|
|
|
5633 |
|
|
|
5634 |
@@ -5560,13 +5030,13 @@
|
|
|
5635 |
|
|
|
5636 |
|
|
|
5637 |
|
|
|
5638 |
-ac_config_commands="$ac_config_commands intltool"
|
|
|
5639 |
+ ac_config_commands="$ac_config_commands intltool"
|
|
|
5640 |
|
|
|
5641 |
|
|
|
5642 |
|
|
|
5643 |
|
|
|
5644 |
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
|
|
|
5645 |
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
|
|
|
5646 |
+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
|
|
|
5647 |
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
|
|
|
5648 |
if test "${ac_cv_header_stdc+set}" = set; then
|
|
|
5649 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
5650 |
else
|
|
|
5651 |
@@ -5590,32 +5060,36 @@
|
|
|
5652 |
}
|
|
|
5653 |
_ACEOF
|
|
|
5654 |
rm -f conftest.$ac_objext
|
|
|
5655 |
-if { (ac_try="$ac_compile"
|
|
|
5656 |
-case "(($ac_try" in
|
|
|
5657 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
5658 |
- *) ac_try_echo=$ac_try;;
|
|
|
5659 |
-esac
|
|
|
5660 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
5661 |
- (eval "$ac_compile") 2>conftest.er1
|
|
|
5662 |
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
5663 |
+ (eval $ac_compile) 2>conftest.er1
|
|
|
5664 |
ac_status=$?
|
|
|
5665 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
5666 |
rm -f conftest.er1
|
|
|
5667 |
cat conftest.err >&5
|
|
|
5668 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5669 |
- (exit $ac_status); } && {
|
|
|
5670 |
- test -z "$ac_c_werror_flag" ||
|
|
|
5671 |
- test ! -s conftest.err
|
|
|
5672 |
- } && test -s conftest.$ac_objext; then
|
|
|
5673 |
+ (exit $ac_status); } &&
|
|
|
5674 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
5675 |
+ || test ! -s conftest.err'
|
|
|
5676 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
5677 |
+ (eval $ac_try) 2>&5
|
|
|
5678 |
+ ac_status=$?
|
|
|
5679 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5680 |
+ (exit $ac_status); }; } &&
|
|
|
5681 |
+ { ac_try='test -s conftest.$ac_objext'
|
|
|
5682 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
5683 |
+ (eval $ac_try) 2>&5
|
|
|
5684 |
+ ac_status=$?
|
|
|
5685 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5686 |
+ (exit $ac_status); }; }; then
|
|
|
5687 |
ac_cv_header_stdc=yes
|
|
|
5688 |
else
|
|
|
5689 |
echo "$as_me: failed program was:" >&5
|
|
|
5690 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
5691 |
|
|
|
5692 |
- ac_cv_header_stdc=no
|
|
|
5693 |
+ac_cv_header_stdc=no
|
|
|
5694 |
fi
|
|
|
5695 |
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
5696 |
|
|
|
5697 |
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
5698 |
-
|
|
|
5699 |
if test $ac_cv_header_stdc = yes; then
|
|
|
5700 |
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
|
|
|
5701 |
cat >conftest.$ac_ext <<_ACEOF
|
|
|
5702 |
@@ -5670,7 +5144,6 @@
|
|
|
5703 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
|
5704 |
/* end confdefs.h. */
|
|
|
5705 |
#include <ctype.h>
|
|
|
5706 |
-#include <stdlib.h>
|
|
|
5707 |
#if ((' ' & 0x0FF) == 0x020)
|
|
|
5708 |
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
|
|
|
5709 |
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
|
|
|
5710 |
@@ -5690,27 +5163,18 @@
|
|
|
5711 |
for (i = 0; i < 256; i++)
|
|
|
5712 |
if (XOR (islower (i), ISLOWER (i))
|
|
|
5713 |
|| toupper (i) != TOUPPER (i))
|
|
|
5714 |
- return 2;
|
|
|
5715 |
- return 0;
|
|
|
5716 |
+ exit(2);
|
|
|
5717 |
+ exit (0);
|
|
|
5718 |
}
|
|
|
5719 |
_ACEOF
|
|
|
5720 |
rm -f conftest$ac_exeext
|
|
|
5721 |
-if { (ac_try="$ac_link"
|
|
|
5722 |
-case "(($ac_try" in
|
|
|
5723 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
5724 |
- *) ac_try_echo=$ac_try;;
|
|
|
5725 |
-esac
|
|
|
5726 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
5727 |
- (eval "$ac_link") 2>&5
|
|
|
5728 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
5729 |
+ (eval $ac_link) 2>&5
|
|
|
5730 |
ac_status=$?
|
|
|
5731 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5732 |
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
|
|
5733 |
- { (case "(($ac_try" in
|
|
|
5734 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
5735 |
- *) ac_try_echo=$ac_try;;
|
|
|
5736 |
-esac
|
|
|
5737 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
5738 |
- (eval "$ac_try") 2>&5
|
|
|
5739 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
5740 |
+ (eval $ac_try) 2>&5
|
|
|
5741 |
ac_status=$?
|
|
|
5742 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5743 |
(exit $ac_status); }; }; then
|
|
|
5744 |
@@ -5723,14 +5187,12 @@
|
|
|
5745 |
( exit $ac_status )
|
|
|
5746 |
ac_cv_header_stdc=no
|
|
|
5747 |
fi
|
|
|
5748 |
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
|
5749 |
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
|
5750 |
fi
|
|
|
5751 |
-
|
|
|
5752 |
-
|
|
|
5753 |
fi
|
|
|
5754 |
fi
|
|
|
5755 |
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
|
|
|
5756 |
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
|
|
|
5757 |
+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
|
|
|
5758 |
+echo "${ECHO_T}$ac_cv_header_stdc" >&6
|
|
|
5759 |
if test $ac_cv_header_stdc = yes; then
|
|
|
5760 |
|
|
|
5761 |
cat >>confdefs.h <<\_ACEOF
|
|
|
5762 |
@@ -5749,8 +5211,8 @@
|
|
|
5763 |
if test x"$PKG_CONFIG" = x""; then
|
|
|
5764 |
# Extract the first word of "pkg-config", so it can be a program name with args.
|
|
|
5765 |
set dummy pkg-config; ac_word=$2
|
|
|
5766 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
5767 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
5768 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
5769 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
5770 |
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
|
|
|
5771 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
5772 |
else
|
|
|
5773 |
@@ -5765,7 +5227,7 @@
|
|
|
5774 |
IFS=$as_save_IFS
|
|
|
5775 |
test -z "$as_dir" && as_dir=.
|
|
|
5776 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
5777 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
5778 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
5779 |
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
|
|
5780 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
5781 |
break 2
|
|
|
5782 |
@@ -5772,7 +5234,6 @@
|
|
|
5783 |
fi
|
|
|
5784 |
done
|
|
|
5785 |
done
|
|
|
5786 |
-IFS=$as_save_IFS
|
|
|
5787 |
|
|
|
5788 |
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
|
|
|
5789 |
;;
|
|
|
5790 |
@@ -5779,16 +5240,16 @@
|
|
|
5791 |
esac
|
|
|
5792 |
fi
|
|
|
5793 |
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
|
|
|
5794 |
+
|
|
|
5795 |
if test -n "$PKG_CONFIG"; then
|
|
|
5796 |
- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
|
|
|
5797 |
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
|
|
|
5798 |
+ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
|
|
|
5799 |
+echo "${ECHO_T}$PKG_CONFIG" >&6
|
|
|
5800 |
else
|
|
|
5801 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
5802 |
-echo "${ECHO_T}no" >&6; }
|
|
|
5803 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
5804 |
+echo "${ECHO_T}no" >&6
|
|
|
5805 |
fi
|
|
|
5806 |
|
|
|
5807 |
|
|
|
5808 |
-
|
|
|
5809 |
if test x"$PKG_CONFIG" = x"no"; then
|
|
|
5810 |
echo "*** The pkg-config utility could not be found on your system."
|
|
|
5811 |
echo "*** Make sure it is in your path, or set the PKG_CONFIG"
|
|
|
5812 |
@@ -5802,16 +5263,16 @@
|
|
|
5813 |
fi
|
|
|
5814 |
|
|
|
5815 |
# check pkg-config version
|
|
|
5816 |
- { echo "$as_me:$LINENO: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5
|
|
|
5817 |
-echo $ECHO_N "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... $ECHO_C" >&6; }
|
|
|
5818 |
+ echo "$as_me:$LINENO: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5
|
|
|
5819 |
+echo $ECHO_N "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... $ECHO_C" >&6
|
|
|
5820 |
if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then
|
|
|
5821 |
xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
|
|
|
5822 |
- { echo "$as_me:$LINENO: result: $xdt_cv_PKG_CONFIG_VERSION" >&5
|
|
|
5823 |
-echo "${ECHO_T}$xdt_cv_PKG_CONFIG_VERSION" >&6; }
|
|
|
5824 |
+ echo "$as_me:$LINENO: result: $xdt_cv_PKG_CONFIG_VERSION" >&5
|
|
|
5825 |
+echo "${ECHO_T}$xdt_cv_PKG_CONFIG_VERSION" >&6
|
|
|
5826 |
else
|
|
|
5827 |
xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
|
|
|
5828 |
- { echo "$as_me:$LINENO: result: $xdt_cv_PKG_CONFIG_VERSION" >&5
|
|
|
5829 |
-echo "${ECHO_T}$xdt_cv_PKG_CONFIG_VERSION" >&6; }
|
|
|
5830 |
+ echo "$as_me:$LINENO: result: $xdt_cv_PKG_CONFIG_VERSION" >&5
|
|
|
5831 |
+echo "${ECHO_T}$xdt_cv_PKG_CONFIG_VERSION" >&6
|
|
|
5832 |
echo "*** Your version of pkg-config is too old. You need atleast"
|
|
|
5833 |
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config "
|
|
|
5834 |
echo "*** from the freedesktop.org software repository at"
|
|
|
5835 |
@@ -5823,24 +5284,24 @@
|
|
|
5836 |
fi
|
|
|
5837 |
|
|
|
5838 |
|
|
|
5839 |
- { echo "$as_me:$LINENO: checking for libxfce4panel-1.0 >= 4.3.22" >&5
|
|
|
5840 |
-echo $ECHO_N "checking for libxfce4panel-1.0 >= 4.3.22... $ECHO_C" >&6; }
|
|
|
5841 |
+ echo "$as_me:$LINENO: checking for libxfce4panel-1.0 >= 4.3.22" >&5
|
|
|
5842 |
+echo $ECHO_N "checking for libxfce4panel-1.0 >= 4.3.22... $ECHO_C" >&6
|
|
|
5843 |
if $PKG_CONFIG "--atleast-version=4.3.22" "libxfce4panel-1.0" >/dev/null 2>&1; then
|
|
|
5844 |
LIBXFCE4PANEL_VERSION=`$PKG_CONFIG --modversion "libxfce4panel-1.0"`
|
|
|
5845 |
- { echo "$as_me:$LINENO: result: $LIBXFCE4PANEL_VERSION" >&5
|
|
|
5846 |
-echo "${ECHO_T}$LIBXFCE4PANEL_VERSION" >&6; }
|
|
|
5847 |
+ echo "$as_me:$LINENO: result: $LIBXFCE4PANEL_VERSION" >&5
|
|
|
5848 |
+echo "${ECHO_T}$LIBXFCE4PANEL_VERSION" >&6
|
|
|
5849 |
|
|
|
5850 |
- { echo "$as_me:$LINENO: checking LIBXFCE4PANEL_CFLAGS" >&5
|
|
|
5851 |
-echo $ECHO_N "checking LIBXFCE4PANEL_CFLAGS... $ECHO_C" >&6; }
|
|
|
5852 |
+ echo "$as_me:$LINENO: checking LIBXFCE4PANEL_CFLAGS" >&5
|
|
|
5853 |
+echo $ECHO_N "checking LIBXFCE4PANEL_CFLAGS... $ECHO_C" >&6
|
|
|
5854 |
LIBXFCE4PANEL_CFLAGS=`$PKG_CONFIG --cflags "libxfce4panel-1.0"`
|
|
|
5855 |
- { echo "$as_me:$LINENO: result: $LIBXFCE4PANEL_CFLAGS" >&5
|
|
|
5856 |
-echo "${ECHO_T}$LIBXFCE4PANEL_CFLAGS" >&6; }
|
|
|
5857 |
+ echo "$as_me:$LINENO: result: $LIBXFCE4PANEL_CFLAGS" >&5
|
|
|
5858 |
+echo "${ECHO_T}$LIBXFCE4PANEL_CFLAGS" >&6
|
|
|
5859 |
|
|
|
5860 |
- { echo "$as_me:$LINENO: checking LIBXFCE4PANEL_LIBS" >&5
|
|
|
5861 |
-echo $ECHO_N "checking LIBXFCE4PANEL_LIBS... $ECHO_C" >&6; }
|
|
|
5862 |
+ echo "$as_me:$LINENO: checking LIBXFCE4PANEL_LIBS" >&5
|
|
|
5863 |
+echo $ECHO_N "checking LIBXFCE4PANEL_LIBS... $ECHO_C" >&6
|
|
|
5864 |
LIBXFCE4PANEL_LIBS=`$PKG_CONFIG --libs "libxfce4panel-1.0"`
|
|
|
5865 |
- { echo "$as_me:$LINENO: result: $LIBXFCE4PANEL_LIBS" >&5
|
|
|
5866 |
-echo "${ECHO_T}$LIBXFCE4PANEL_LIBS" >&6; }
|
|
|
5867 |
+ echo "$as_me:$LINENO: result: $LIBXFCE4PANEL_LIBS" >&5
|
|
|
5868 |
+echo "${ECHO_T}$LIBXFCE4PANEL_LIBS" >&6
|
|
|
5869 |
|
|
|
5870 |
LIBXFCE4PANEL_REQUIRED_VERSION=4.3.22
|
|
|
5871 |
|
|
|
5872 |
@@ -5852,8 +5313,8 @@
|
|
|
5873 |
|
|
|
5874 |
elif $PKG_CONFIG --exists "libxfce4panel-1.0" >/dev/null 2>&1; then
|
|
|
5875 |
xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4panel-1.0"`
|
|
|
5876 |
- { echo "$as_me:$LINENO: result: found, but $xdt_cv_version" >&5
|
|
|
5877 |
-echo "${ECHO_T}found, but $xdt_cv_version" >&6; }
|
|
|
5878 |
+ echo "$as_me:$LINENO: result: found, but $xdt_cv_version" >&5
|
|
|
5879 |
+echo "${ECHO_T}found, but $xdt_cv_version" >&6
|
|
|
5880 |
|
|
|
5881 |
|
|
|
5882 |
echo "*** The required package libxfce4panel-1.0 was found on your system,"
|
|
|
5883 |
@@ -5865,8 +5326,8 @@
|
|
|
5884 |
exit 1
|
|
|
5885 |
|
|
|
5886 |
else
|
|
|
5887 |
- { echo "$as_me:$LINENO: result: not found" >&5
|
|
|
5888 |
-echo "${ECHO_T}not found" >&6; }
|
|
|
5889 |
+ echo "$as_me:$LINENO: result: not found" >&5
|
|
|
5890 |
+echo "${ECHO_T}not found" >&6
|
|
|
5891 |
|
|
|
5892 |
|
|
|
5893 |
echo "*** The required package libxfce4panel-1.0 was not found on your system."
|
|
|
5894 |
@@ -5879,8 +5340,80 @@
|
|
|
5895 |
fi
|
|
|
5896 |
|
|
|
5897 |
|
|
|
5898 |
+echo "$as_me:$LINENO: checking for inet_ntop in -lnsl" >&5
|
|
|
5899 |
+echo $ECHO_N "checking for inet_ntop in -lnsl... $ECHO_C" >&6
|
|
|
5900 |
+if test "${ac_cv_lib_nsl_inet_ntop+set}" = set; then
|
|
|
5901 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
5902 |
+else
|
|
|
5903 |
+ ac_check_lib_save_LIBS=$LIBS
|
|
|
5904 |
+LIBS="-lnsl $LIBS"
|
|
|
5905 |
+cat >conftest.$ac_ext <<_ACEOF
|
|
|
5906 |
+/* confdefs.h. */
|
|
|
5907 |
+_ACEOF
|
|
|
5908 |
+cat confdefs.h >>conftest.$ac_ext
|
|
|
5909 |
+cat >>conftest.$ac_ext <<_ACEOF
|
|
|
5910 |
+/* end confdefs.h. */
|
|
|
5911 |
|
|
|
5912 |
+/* Override any gcc2 internal prototype to avoid an error. */
|
|
|
5913 |
+#ifdef __cplusplus
|
|
|
5914 |
+extern "C"
|
|
|
5915 |
+#endif
|
|
|
5916 |
+/* We use char because int might match the return type of a gcc2
|
|
|
5917 |
+ builtin and then its argument prototype would still apply. */
|
|
|
5918 |
+char inet_ntop ();
|
|
|
5919 |
+int
|
|
|
5920 |
+main ()
|
|
|
5921 |
+{
|
|
|
5922 |
+inet_ntop ();
|
|
|
5923 |
+ ;
|
|
|
5924 |
+ return 0;
|
|
|
5925 |
+}
|
|
|
5926 |
+_ACEOF
|
|
|
5927 |
+rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
5928 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
5929 |
+ (eval $ac_link) 2>conftest.er1
|
|
|
5930 |
+ ac_status=$?
|
|
|
5931 |
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
5932 |
+ rm -f conftest.er1
|
|
|
5933 |
+ cat conftest.err >&5
|
|
|
5934 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5935 |
+ (exit $ac_status); } &&
|
|
|
5936 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
5937 |
+ || test ! -s conftest.err'
|
|
|
5938 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
5939 |
+ (eval $ac_try) 2>&5
|
|
|
5940 |
+ ac_status=$?
|
|
|
5941 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5942 |
+ (exit $ac_status); }; } &&
|
|
|
5943 |
+ { ac_try='test -s conftest$ac_exeext'
|
|
|
5944 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
5945 |
+ (eval $ac_try) 2>&5
|
|
|
5946 |
+ ac_status=$?
|
|
|
5947 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
5948 |
+ (exit $ac_status); }; }; then
|
|
|
5949 |
+ ac_cv_lib_nsl_inet_ntop=yes
|
|
|
5950 |
+else
|
|
|
5951 |
+ echo "$as_me: failed program was:" >&5
|
|
|
5952 |
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
5953 |
|
|
|
5954 |
+ac_cv_lib_nsl_inet_ntop=no
|
|
|
5955 |
+fi
|
|
|
5956 |
+rm -f conftest.err conftest.$ac_objext \
|
|
|
5957 |
+ conftest$ac_exeext conftest.$ac_ext
|
|
|
5958 |
+LIBS=$ac_check_lib_save_LIBS
|
|
|
5959 |
+fi
|
|
|
5960 |
+echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntop" >&5
|
|
|
5961 |
+echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntop" >&6
|
|
|
5962 |
+if test $ac_cv_lib_nsl_inet_ntop = yes; then
|
|
|
5963 |
+ SOLLIBS="$LIBS -lnsl -lsocket"
|
|
|
5964 |
+else
|
|
|
5965 |
+ SOLLIBS="$LIBS"
|
|
|
5966 |
+fi
|
|
|
5967 |
+
|
|
|
5968 |
+
|
|
|
5969 |
+
|
|
|
5970 |
+
|
|
|
5971 |
+
|
|
|
5972 |
if false; then
|
|
|
5973 |
HAVE_LIBMPD_TRUE=
|
|
|
5974 |
HAVE_LIBMPD_FALSE='#'
|
|
|
5975 |
@@ -5890,24 +5423,24 @@
|
|
|
5976 |
fi
|
|
|
5977 |
|
|
|
5978 |
|
|
|
5979 |
-# Check whether --with-libmpd was given.
|
|
|
5980 |
+# Check whether --with-libmpd or --without-libmpd was given.
|
|
|
5981 |
if test "${with_libmpd+set}" = set; then
|
|
|
5982 |
- withval=$with_libmpd; LIBMPD_PATH="$withval"
|
|
|
5983 |
+ withval="$with_libmpd"
|
|
|
5984 |
+ LIBMPD_PATH="$withval"
|
|
|
5985 |
else
|
|
|
5986 |
LIBMPD_PATH=""
|
|
|
5987 |
-fi
|
|
|
5988 |
+fi;
|
|
|
5989 |
|
|
|
5990 |
-
|
|
|
5991 |
-{ echo "$as_me:$LINENO: checking whether --with-libmpd was used" >&5
|
|
|
5992 |
-echo $ECHO_N "checking whether --with-libmpd was used... $ECHO_C" >&6; }
|
|
|
5993 |
+echo "$as_me:$LINENO: checking whether --with-libmpd was used" >&5
|
|
|
5994 |
+echo $ECHO_N "checking whether --with-libmpd was used... $ECHO_C" >&6
|
|
|
5995 |
if test x"$LIBMPD_PATH" != x"" ; then
|
|
|
5996 |
if test x"$LIBMPD_PATH" = x"no" ; then
|
|
|
5997 |
- { echo "$as_me:$LINENO: result: yes, disabled" >&5
|
|
|
5998 |
-echo "${ECHO_T}yes, disabled" >&6; }
|
|
|
5999 |
+ echo "$as_me:$LINENO: result: yes, disabled" >&5
|
|
|
6000 |
+echo "${ECHO_T}yes, disabled" >&6
|
|
|
6001 |
echo "* Build with libmpd: no, falling back to our implementation"
|
|
|
6002 |
else
|
|
|
6003 |
- { echo "$as_me:$LINENO: result: yes, using $LIBMPD_PATH" >&5
|
|
|
6004 |
-echo "${ECHO_T}yes, using $LIBMPD_PATH" >&6; }
|
|
|
6005 |
+ echo "$as_me:$LINENO: result: yes, using $LIBMPD_PATH" >&5
|
|
|
6006 |
+echo "${ECHO_T}yes, using $LIBMPD_PATH" >&6
|
|
|
6007 |
LIBMPD_CFLAGS="-I${LIBMPD_PATH}/include/"
|
|
|
6008 |
LIBMPD_LIBS="-L${LIBMPD_PATH}/lib/ -lmpd"
|
|
|
6009 |
cat >>confdefs.h <<\_ACEOF
|
|
|
6010 |
@@ -5918,19 +5451,19 @@
|
|
|
6011 |
|
|
|
6012 |
fi
|
|
|
6013 |
else
|
|
|
6014 |
- { echo "$as_me:$LINENO: result: no, falling back to pkg-config" >&5
|
|
|
6015 |
-echo "${ECHO_T}no, falling back to pkg-config" >&6; }
|
|
|
6016 |
+ echo "$as_me:$LINENO: result: no, falling back to pkg-config" >&5
|
|
|
6017 |
+echo "${ECHO_T}no, falling back to pkg-config" >&6
|
|
|
6018 |
|
|
|
6019 |
|
|
|
6020 |
|
|
|
6021 |
- # Check whether --enable-libmpd was given.
|
|
|
6022 |
+ # Check whether --enable-libmpd or --disable-libmpd was given.
|
|
|
6023 |
if test "${enable_libmpd+set}" = set; then
|
|
|
6024 |
- enableval=$enable_libmpd; xdt_cv_LIBMPD_check=$enableval
|
|
|
6025 |
+ enableval="$enable_libmpd"
|
|
|
6026 |
+ xdt_cv_LIBMPD_check=$enableval
|
|
|
6027 |
else
|
|
|
6028 |
xdt_cv_LIBMPD_check=yes
|
|
|
6029 |
-fi
|
|
|
6030 |
+fi;
|
|
|
6031 |
|
|
|
6032 |
-
|
|
|
6033 |
if test x"$xdt_cv_LIBMPD_check" = x"yes"; then
|
|
|
6034 |
if $PKG_CONFIG --exists "libmpd >= 0.12" >/dev/null 2>&1; then
|
|
|
6035 |
|
|
|
6036 |
@@ -5942,8 +5475,8 @@
|
|
|
6037 |
if test x"$PKG_CONFIG" = x""; then
|
|
|
6038 |
# Extract the first word of "pkg-config", so it can be a program name with args.
|
|
|
6039 |
set dummy pkg-config; ac_word=$2
|
|
|
6040 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
6041 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
6042 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
6043 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
6044 |
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
|
|
|
6045 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
6046 |
else
|
|
|
6047 |
@@ -5958,7 +5491,7 @@
|
|
|
6048 |
IFS=$as_save_IFS
|
|
|
6049 |
test -z "$as_dir" && as_dir=.
|
|
|
6050 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
6051 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
6052 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
6053 |
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
|
|
6054 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
6055 |
break 2
|
|
|
6056 |
@@ -5965,7 +5498,6 @@
|
|
|
6057 |
fi
|
|
|
6058 |
done
|
|
|
6059 |
done
|
|
|
6060 |
-IFS=$as_save_IFS
|
|
|
6061 |
|
|
|
6062 |
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
|
|
|
6063 |
;;
|
|
|
6064 |
@@ -5972,16 +5504,16 @@
|
|
|
6065 |
esac
|
|
|
6066 |
fi
|
|
|
6067 |
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
|
|
|
6068 |
+
|
|
|
6069 |
if test -n "$PKG_CONFIG"; then
|
|
|
6070 |
- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
|
|
|
6071 |
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
|
|
|
6072 |
+ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
|
|
|
6073 |
+echo "${ECHO_T}$PKG_CONFIG" >&6
|
|
|
6074 |
else
|
|
|
6075 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
6076 |
-echo "${ECHO_T}no" >&6; }
|
|
|
6077 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
6078 |
+echo "${ECHO_T}no" >&6
|
|
|
6079 |
fi
|
|
|
6080 |
|
|
|
6081 |
|
|
|
6082 |
-
|
|
|
6083 |
if test x"$PKG_CONFIG" = x"no"; then
|
|
|
6084 |
echo "*** The pkg-config utility could not be found on your system."
|
|
|
6085 |
echo "*** Make sure it is in your path, or set the PKG_CONFIG"
|
|
|
6086 |
@@ -5995,16 +5527,16 @@
|
|
|
6087 |
fi
|
|
|
6088 |
|
|
|
6089 |
# check pkg-config version
|
|
|
6090 |
- { echo "$as_me:$LINENO: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5
|
|
|
6091 |
-echo $ECHO_N "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... $ECHO_C" >&6; }
|
|
|
6092 |
+ echo "$as_me:$LINENO: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5
|
|
|
6093 |
+echo $ECHO_N "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... $ECHO_C" >&6
|
|
|
6094 |
if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then
|
|
|
6095 |
xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
|
|
|
6096 |
- { echo "$as_me:$LINENO: result: $xdt_cv_PKG_CONFIG_VERSION" >&5
|
|
|
6097 |
-echo "${ECHO_T}$xdt_cv_PKG_CONFIG_VERSION" >&6; }
|
|
|
6098 |
+ echo "$as_me:$LINENO: result: $xdt_cv_PKG_CONFIG_VERSION" >&5
|
|
|
6099 |
+echo "${ECHO_T}$xdt_cv_PKG_CONFIG_VERSION" >&6
|
|
|
6100 |
else
|
|
|
6101 |
xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
|
|
|
6102 |
- { echo "$as_me:$LINENO: result: $xdt_cv_PKG_CONFIG_VERSION" >&5
|
|
|
6103 |
-echo "${ECHO_T}$xdt_cv_PKG_CONFIG_VERSION" >&6; }
|
|
|
6104 |
+ echo "$as_me:$LINENO: result: $xdt_cv_PKG_CONFIG_VERSION" >&5
|
|
|
6105 |
+echo "${ECHO_T}$xdt_cv_PKG_CONFIG_VERSION" >&6
|
|
|
6106 |
echo "*** Your version of pkg-config is too old. You need atleast"
|
|
|
6107 |
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config "
|
|
|
6108 |
echo "*** from the freedesktop.org software repository at"
|
|
|
6109 |
@@ -6016,24 +5548,24 @@
|
|
|
6110 |
fi
|
|
|
6111 |
|
|
|
6112 |
|
|
|
6113 |
- { echo "$as_me:$LINENO: checking for libmpd >= 0.12" >&5
|
|
|
6114 |
-echo $ECHO_N "checking for libmpd >= 0.12... $ECHO_C" >&6; }
|
|
|
6115 |
+ echo "$as_me:$LINENO: checking for libmpd >= 0.12" >&5
|
|
|
6116 |
+echo $ECHO_N "checking for libmpd >= 0.12... $ECHO_C" >&6
|
|
|
6117 |
if $PKG_CONFIG "--atleast-version=0.12" "libmpd" >/dev/null 2>&1; then
|
|
|
6118 |
LIBMPD_VERSION=`$PKG_CONFIG --modversion "libmpd"`
|
|
|
6119 |
- { echo "$as_me:$LINENO: result: $LIBMPD_VERSION" >&5
|
|
|
6120 |
-echo "${ECHO_T}$LIBMPD_VERSION" >&6; }
|
|
|
6121 |
+ echo "$as_me:$LINENO: result: $LIBMPD_VERSION" >&5
|
|
|
6122 |
+echo "${ECHO_T}$LIBMPD_VERSION" >&6
|
|
|
6123 |
|
|
|
6124 |
- { echo "$as_me:$LINENO: checking LIBMPD_CFLAGS" >&5
|
|
|
6125 |
-echo $ECHO_N "checking LIBMPD_CFLAGS... $ECHO_C" >&6; }
|
|
|
6126 |
+ echo "$as_me:$LINENO: checking LIBMPD_CFLAGS" >&5
|
|
|
6127 |
+echo $ECHO_N "checking LIBMPD_CFLAGS... $ECHO_C" >&6
|
|
|
6128 |
LIBMPD_CFLAGS=`$PKG_CONFIG --cflags "libmpd"`
|
|
|
6129 |
- { echo "$as_me:$LINENO: result: $LIBMPD_CFLAGS" >&5
|
|
|
6130 |
-echo "${ECHO_T}$LIBMPD_CFLAGS" >&6; }
|
|
|
6131 |
+ echo "$as_me:$LINENO: result: $LIBMPD_CFLAGS" >&5
|
|
|
6132 |
+echo "${ECHO_T}$LIBMPD_CFLAGS" >&6
|
|
|
6133 |
|
|
|
6134 |
- { echo "$as_me:$LINENO: checking LIBMPD_LIBS" >&5
|
|
|
6135 |
-echo $ECHO_N "checking LIBMPD_LIBS... $ECHO_C" >&6; }
|
|
|
6136 |
+ echo "$as_me:$LINENO: checking LIBMPD_LIBS" >&5
|
|
|
6137 |
+echo $ECHO_N "checking LIBMPD_LIBS... $ECHO_C" >&6
|
|
|
6138 |
LIBMPD_LIBS=`$PKG_CONFIG --libs "libmpd"`
|
|
|
6139 |
- { echo "$as_me:$LINENO: result: $LIBMPD_LIBS" >&5
|
|
|
6140 |
-echo "${ECHO_T}$LIBMPD_LIBS" >&6; }
|
|
|
6141 |
+ echo "$as_me:$LINENO: result: $LIBMPD_LIBS" >&5
|
|
|
6142 |
+echo "${ECHO_T}$LIBMPD_LIBS" >&6
|
|
|
6143 |
|
|
|
6144 |
LIBMPD_REQUIRED_VERSION=0.12
|
|
|
6145 |
|
|
|
6146 |
@@ -6052,8 +5584,8 @@
|
|
|
6147 |
|
|
|
6148 |
elif $PKG_CONFIG --exists "libmpd" >/dev/null 2>&1; then
|
|
|
6149 |
xdt_cv_version=`$PKG_CONFIG --modversion "libmpd"`
|
|
|
6150 |
- { echo "$as_me:$LINENO: result: found, but $xdt_cv_version" >&5
|
|
|
6151 |
-echo "${ECHO_T}found, but $xdt_cv_version" >&6; }
|
|
|
6152 |
+ echo "$as_me:$LINENO: result: found, but $xdt_cv_version" >&5
|
|
|
6153 |
+echo "${ECHO_T}found, but $xdt_cv_version" >&6
|
|
|
6154 |
|
|
|
6155 |
|
|
|
6156 |
echo "*** The required package libmpd was found on your system,"
|
|
|
6157 |
@@ -6065,8 +5597,8 @@
|
|
|
6158 |
exit 1
|
|
|
6159 |
|
|
|
6160 |
else
|
|
|
6161 |
- { echo "$as_me:$LINENO: result: not found" >&5
|
|
|
6162 |
-echo "${ECHO_T}not found" >&6; }
|
|
|
6163 |
+ echo "$as_me:$LINENO: result: not found" >&5
|
|
|
6164 |
+echo "${ECHO_T}not found" >&6
|
|
|
6165 |
|
|
|
6166 |
|
|
|
6167 |
echo "*** The required package libmpd was not found on your system."
|
|
|
6168 |
@@ -6079,16 +5611,16 @@
|
|
|
6169 |
fi
|
|
|
6170 |
|
|
|
6171 |
else
|
|
|
6172 |
- { echo "$as_me:$LINENO: checking for optional package libmpd >= 0.12" >&5
|
|
|
6173 |
-echo $ECHO_N "checking for optional package libmpd >= 0.12... $ECHO_C" >&6; }
|
|
|
6174 |
- { echo "$as_me:$LINENO: result: not found" >&5
|
|
|
6175 |
-echo "${ECHO_T}not found" >&6; }
|
|
|
6176 |
+ echo "$as_me:$LINENO: checking for optional package libmpd >= 0.12" >&5
|
|
|
6177 |
+echo $ECHO_N "checking for optional package libmpd >= 0.12... $ECHO_C" >&6
|
|
|
6178 |
+ echo "$as_me:$LINENO: result: not found" >&5
|
|
|
6179 |
+echo "${ECHO_T}not found" >&6
|
|
|
6180 |
fi
|
|
|
6181 |
else
|
|
|
6182 |
- { echo "$as_me:$LINENO: checking for optional package libmpd" >&5
|
|
|
6183 |
-echo $ECHO_N "checking for optional package libmpd... $ECHO_C" >&6; }
|
|
|
6184 |
- { echo "$as_me:$LINENO: result: disabled" >&5
|
|
|
6185 |
-echo "${ECHO_T}disabled" >&6; }
|
|
|
6186 |
+ echo "$as_me:$LINENO: checking for optional package libmpd" >&5
|
|
|
6187 |
+echo $ECHO_N "checking for optional package libmpd... $ECHO_C" >&6
|
|
|
6188 |
+ echo "$as_me:$LINENO: result: disabled" >&5
|
|
|
6189 |
+echo "${ECHO_T}disabled" >&6
|
|
|
6190 |
fi
|
|
|
6191 |
|
|
|
6192 |
|
|
|
6193 |
@@ -6114,86 +5646,57 @@
|
|
|
6194 |
fi
|
|
|
6195 |
|
|
|
6196 |
# Make sure we can run config.sub.
|
|
|
6197 |
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
|
|
|
6198 |
- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
|
|
|
6199 |
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
|
|
|
6200 |
+$ac_config_sub sun4 >/dev/null 2>&1 ||
|
|
|
6201 |
+ { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
|
|
|
6202 |
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
|
|
|
6203 |
{ (exit 1); exit 1; }; }
|
|
|
6204 |
|
|
|
6205 |
-{ echo "$as_me:$LINENO: checking build system type" >&5
|
|
|
6206 |
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
|
|
|
6207 |
+echo "$as_me:$LINENO: checking build system type" >&5
|
|
|
6208 |
+echo $ECHO_N "checking build system type... $ECHO_C" >&6
|
|
|
6209 |
if test "${ac_cv_build+set}" = set; then
|
|
|
6210 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
6211 |
else
|
|
|
6212 |
- ac_build_alias=$build_alias
|
|
|
6213 |
-test "x$ac_build_alias" = x &&
|
|
|
6214 |
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
|
|
|
6215 |
-test "x$ac_build_alias" = x &&
|
|
|
6216 |
+ ac_cv_build_alias=$build_alias
|
|
|
6217 |
+test -z "$ac_cv_build_alias" &&
|
|
|
6218 |
+ ac_cv_build_alias=`$ac_config_guess`
|
|
|
6219 |
+test -z "$ac_cv_build_alias" &&
|
|
|
6220 |
{ { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
|
|
|
6221 |
echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
|
|
|
6222 |
{ (exit 1); exit 1; }; }
|
|
|
6223 |
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
|
|
|
6224 |
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
|
|
|
6225 |
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
|
|
|
6226 |
+ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
|
|
|
6227 |
+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
|
|
|
6228 |
+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
|
|
|
6229 |
{ (exit 1); exit 1; }; }
|
|
|
6230 |
|
|
|
6231 |
fi
|
|
|
6232 |
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
|
|
|
6233 |
-echo "${ECHO_T}$ac_cv_build" >&6; }
|
|
|
6234 |
-case $ac_cv_build in
|
|
|
6235 |
-*-*-*) ;;
|
|
|
6236 |
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
|
|
|
6237 |
-echo "$as_me: error: invalid value of canonical build" >&2;}
|
|
|
6238 |
- { (exit 1); exit 1; }; };;
|
|
|
6239 |
-esac
|
|
|
6240 |
+echo "$as_me:$LINENO: result: $ac_cv_build" >&5
|
|
|
6241 |
+echo "${ECHO_T}$ac_cv_build" >&6
|
|
|
6242 |
build=$ac_cv_build
|
|
|
6243 |
-ac_save_IFS=$IFS; IFS='-'
|
|
|
6244 |
-set x $ac_cv_build
|
|
|
6245 |
-shift
|
|
|
6246 |
-build_cpu=$1
|
|
|
6247 |
-build_vendor=$2
|
|
|
6248 |
-shift; shift
|
|
|
6249 |
-# Remember, the first character of IFS is used to create $*,
|
|
|
6250 |
-# except with old shells:
|
|
|
6251 |
-build_os=$*
|
|
|
6252 |
-IFS=$ac_save_IFS
|
|
|
6253 |
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
|
|
|
6254 |
+build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
|
|
6255 |
+build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
|
|
6256 |
+build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|
|
6257 |
|
|
|
6258 |
|
|
|
6259 |
-{ echo "$as_me:$LINENO: checking host system type" >&5
|
|
|
6260 |
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
|
|
|
6261 |
+echo "$as_me:$LINENO: checking host system type" >&5
|
|
|
6262 |
+echo $ECHO_N "checking host system type... $ECHO_C" >&6
|
|
|
6263 |
if test "${ac_cv_host+set}" = set; then
|
|
|
6264 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
6265 |
else
|
|
|
6266 |
- if test "x$host_alias" = x; then
|
|
|
6267 |
- ac_cv_host=$ac_cv_build
|
|
|
6268 |
-else
|
|
|
6269 |
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
|
|
|
6270 |
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
|
|
|
6271 |
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
|
|
|
6272 |
+ ac_cv_host_alias=$host_alias
|
|
|
6273 |
+test -z "$ac_cv_host_alias" &&
|
|
|
6274 |
+ ac_cv_host_alias=$ac_cv_build_alias
|
|
|
6275 |
+ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
|
|
|
6276 |
+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
|
|
|
6277 |
+echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
|
|
|
6278 |
{ (exit 1); exit 1; }; }
|
|
|
6279 |
-fi
|
|
|
6280 |
|
|
|
6281 |
fi
|
|
|
6282 |
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
|
|
|
6283 |
-echo "${ECHO_T}$ac_cv_host" >&6; }
|
|
|
6284 |
-case $ac_cv_host in
|
|
|
6285 |
-*-*-*) ;;
|
|
|
6286 |
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
|
|
|
6287 |
-echo "$as_me: error: invalid value of canonical host" >&2;}
|
|
|
6288 |
- { (exit 1); exit 1; }; };;
|
|
|
6289 |
-esac
|
|
|
6290 |
+echo "$as_me:$LINENO: result: $ac_cv_host" >&5
|
|
|
6291 |
+echo "${ECHO_T}$ac_cv_host" >&6
|
|
|
6292 |
host=$ac_cv_host
|
|
|
6293 |
-ac_save_IFS=$IFS; IFS='-'
|
|
|
6294 |
-set x $ac_cv_host
|
|
|
6295 |
-shift
|
|
|
6296 |
-host_cpu=$1
|
|
|
6297 |
-host_vendor=$2
|
|
|
6298 |
-shift; shift
|
|
|
6299 |
-# Remember, the first character of IFS is used to create $*,
|
|
|
6300 |
-# except with old shells:
|
|
|
6301 |
-host_os=$*
|
|
|
6302 |
-IFS=$ac_save_IFS
|
|
|
6303 |
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
|
|
6304 |
+host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
|
|
6305 |
+host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
|
|
6306 |
+host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|
|
6307 |
|
|
|
6308 |
|
|
|
6309 |
|
|
|
6310 |
@@ -6211,19 +5714,18 @@
|
|
|
6311 |
for ac_header in locale.h
|
|
|
6312 |
do
|
|
|
6313 |
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
|
6314 |
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
|
6315 |
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
|
6316 |
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
|
6317 |
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
|
6318 |
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
|
|
6319 |
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
|
6320 |
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
|
|
6321 |
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
|
|
6322 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
6323 |
fi
|
|
|
6324 |
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
|
6325 |
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
|
6326 |
-echo "${ECHO_T}$ac_res" >&6; }
|
|
|
6327 |
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
|
|
6328 |
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
|
|
6329 |
else
|
|
|
6330 |
# Is the header compilable?
|
|
|
6331 |
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
|
|
6332 |
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
|
|
|
6333 |
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
|
|
6334 |
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
|
|
|
6335 |
cat >conftest.$ac_ext <<_ACEOF
|
|
|
6336 |
/* confdefs.h. */
|
|
|
6337 |
_ACEOF
|
|
|
6338 |
@@ -6234,37 +5736,41 @@
|
|
|
6339 |
#include <$ac_header>
|
|
|
6340 |
_ACEOF
|
|
|
6341 |
rm -f conftest.$ac_objext
|
|
|
6342 |
-if { (ac_try="$ac_compile"
|
|
|
6343 |
-case "(($ac_try" in
|
|
|
6344 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
6345 |
- *) ac_try_echo=$ac_try;;
|
|
|
6346 |
-esac
|
|
|
6347 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
6348 |
- (eval "$ac_compile") 2>conftest.er1
|
|
|
6349 |
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
6350 |
+ (eval $ac_compile) 2>conftest.er1
|
|
|
6351 |
ac_status=$?
|
|
|
6352 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
6353 |
rm -f conftest.er1
|
|
|
6354 |
cat conftest.err >&5
|
|
|
6355 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
6356 |
- (exit $ac_status); } && {
|
|
|
6357 |
- test -z "$ac_c_werror_flag" ||
|
|
|
6358 |
- test ! -s conftest.err
|
|
|
6359 |
- } && test -s conftest.$ac_objext; then
|
|
|
6360 |
+ (exit $ac_status); } &&
|
|
|
6361 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
6362 |
+ || test ! -s conftest.err'
|
|
|
6363 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
6364 |
+ (eval $ac_try) 2>&5
|
|
|
6365 |
+ ac_status=$?
|
|
|
6366 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
6367 |
+ (exit $ac_status); }; } &&
|
|
|
6368 |
+ { ac_try='test -s conftest.$ac_objext'
|
|
|
6369 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
6370 |
+ (eval $ac_try) 2>&5
|
|
|
6371 |
+ ac_status=$?
|
|
|
6372 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
6373 |
+ (exit $ac_status); }; }; then
|
|
|
6374 |
ac_header_compiler=yes
|
|
|
6375 |
else
|
|
|
6376 |
echo "$as_me: failed program was:" >&5
|
|
|
6377 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
6378 |
|
|
|
6379 |
- ac_header_compiler=no
|
|
|
6380 |
+ac_header_compiler=no
|
|
|
6381 |
fi
|
|
|
6382 |
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
6383 |
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
|
6384 |
+echo "${ECHO_T}$ac_header_compiler" >&6
|
|
|
6385 |
|
|
|
6386 |
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
6387 |
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
|
6388 |
-echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
|
6389 |
-
|
|
|
6390 |
# Is the header present?
|
|
|
6391 |
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
|
|
6392 |
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
|
|
|
6393 |
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
|
|
6394 |
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
|
|
|
6395 |
cat >conftest.$ac_ext <<_ACEOF
|
|
|
6396 |
/* confdefs.h. */
|
|
|
6397 |
_ACEOF
|
|
|
6398 |
@@ -6273,22 +5779,24 @@
|
|
|
6399 |
/* end confdefs.h. */
|
|
|
6400 |
#include <$ac_header>
|
|
|
6401 |
_ACEOF
|
|
|
6402 |
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
|
6403 |
-case "(($ac_try" in
|
|
|
6404 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
6405 |
- *) ac_try_echo=$ac_try;;
|
|
|
6406 |
-esac
|
|
|
6407 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
6408 |
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
|
|
6409 |
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
|
|
6410 |
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
|
|
6411 |
ac_status=$?
|
|
|
6412 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
6413 |
rm -f conftest.er1
|
|
|
6414 |
cat conftest.err >&5
|
|
|
6415 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
6416 |
- (exit $ac_status); } >/dev/null && {
|
|
|
6417 |
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
|
6418 |
- test ! -s conftest.err
|
|
|
6419 |
- }; then
|
|
|
6420 |
+ (exit $ac_status); } >/dev/null; then
|
|
|
6421 |
+ if test -s conftest.err; then
|
|
|
6422 |
+ ac_cpp_err=$ac_c_preproc_warn_flag
|
|
|
6423 |
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
|
6424 |
+ else
|
|
|
6425 |
+ ac_cpp_err=
|
|
|
6426 |
+ fi
|
|
|
6427 |
+else
|
|
|
6428 |
+ ac_cpp_err=yes
|
|
|
6429 |
+fi
|
|
|
6430 |
+if test -z "$ac_cpp_err"; then
|
|
|
6431 |
ac_header_preproc=yes
|
|
|
6432 |
else
|
|
|
6433 |
echo "$as_me: failed program was:" >&5
|
|
|
6434 |
@@ -6296,10 +5804,9 @@
|
|
|
6435 |
|
|
|
6436 |
ac_header_preproc=no
|
|
|
6437 |
fi
|
|
|
6438 |
-
|
|
|
6439 |
rm -f conftest.err conftest.$ac_ext
|
|
|
6440 |
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
|
6441 |
-echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
|
6442 |
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
|
6443 |
+echo "${ECHO_T}$ac_header_preproc" >&6
|
|
|
6444 |
|
|
|
6445 |
# So? What about this header?
|
|
|
6446 |
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
|
6447 |
@@ -6323,24 +5830,25 @@
|
|
|
6448 |
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
|
|
6449 |
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
|
|
6450 |
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
|
|
6451 |
- ( cat <<\_ASBOX
|
|
|
6452 |
+ (
|
|
|
6453 |
+ cat <<\_ASBOX
|
|
|
6454 |
## ------------------------------------- ##
|
|
|
6455 |
## Report this to [email protected] ##
|
|
|
6456 |
## ------------------------------------- ##
|
|
|
6457 |
_ASBOX
|
|
|
6458 |
- ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
|
6459 |
+ ) |
|
|
|
6460 |
+ sed "s/^/$as_me: WARNING: /" >&2
|
|
|
6461 |
;;
|
|
|
6462 |
esac
|
|
|
6463 |
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
|
6464 |
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
|
6465 |
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
|
6466 |
+echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
|
6467 |
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
|
|
6468 |
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
|
|
6469 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
6470 |
else
|
|
|
6471 |
eval "$as_ac_Header=\$ac_header_preproc"
|
|
|
6472 |
fi
|
|
|
6473 |
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
|
6474 |
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
|
6475 |
-echo "${ECHO_T}$ac_res" >&6; }
|
|
|
6476 |
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
|
|
6477 |
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
|
|
6478 |
|
|
|
6479 |
fi
|
|
|
6480 |
if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
|
|
6481 |
@@ -6353,8 +5861,8 @@
|
|
|
6482 |
done
|
|
|
6483 |
|
|
|
6484 |
if test $ac_cv_header_locale_h = yes; then
|
|
|
6485 |
- { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
|
|
|
6486 |
-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
|
|
|
6487 |
+ echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
|
|
|
6488 |
+echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
|
|
|
6489 |
if test "${am_cv_val_LC_MESSAGES+set}" = set; then
|
|
|
6490 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
6491 |
else
|
|
|
6492 |
@@ -6374,36 +5882,39 @@
|
|
|
6493 |
}
|
|
|
6494 |
_ACEOF
|
|
|
6495 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
6496 |
-if { (ac_try="$ac_link"
|
|
|
6497 |
-case "(($ac_try" in
|
|
|
6498 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
6499 |
- *) ac_try_echo=$ac_try;;
|
|
|
6500 |
-esac
|
|
|
6501 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
6502 |
- (eval "$ac_link") 2>conftest.er1
|
|
|
6503 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
6504 |
+ (eval $ac_link) 2>conftest.er1
|
|
|
6505 |
ac_status=$?
|
|
|
6506 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
6507 |
rm -f conftest.er1
|
|
|
6508 |
cat conftest.err >&5
|
|
|
6509 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
6510 |
- (exit $ac_status); } && {
|
|
|
6511 |
- test -z "$ac_c_werror_flag" ||
|
|
|
6512 |
- test ! -s conftest.err
|
|
|
6513 |
- } && test -s conftest$ac_exeext &&
|
|
|
6514 |
- $as_test_x conftest$ac_exeext; then
|
|
|
6515 |
+ (exit $ac_status); } &&
|
|
|
6516 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
6517 |
+ || test ! -s conftest.err'
|
|
|
6518 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
6519 |
+ (eval $ac_try) 2>&5
|
|
|
6520 |
+ ac_status=$?
|
|
|
6521 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
6522 |
+ (exit $ac_status); }; } &&
|
|
|
6523 |
+ { ac_try='test -s conftest$ac_exeext'
|
|
|
6524 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
6525 |
+ (eval $ac_try) 2>&5
|
|
|
6526 |
+ ac_status=$?
|
|
|
6527 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
6528 |
+ (exit $ac_status); }; }; then
|
|
|
6529 |
am_cv_val_LC_MESSAGES=yes
|
|
|
6530 |
else
|
|
|
6531 |
echo "$as_me: failed program was:" >&5
|
|
|
6532 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
6533 |
|
|
|
6534 |
- am_cv_val_LC_MESSAGES=no
|
|
|
6535 |
+am_cv_val_LC_MESSAGES=no
|
|
|
6536 |
fi
|
|
|
6537 |
-
|
|
|
6538 |
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
|
6539 |
+rm -f conftest.err conftest.$ac_objext \
|
|
|
6540 |
conftest$ac_exeext conftest.$ac_ext
|
|
|
6541 |
fi
|
|
|
6542 |
-{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
|
|
|
6543 |
-echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
|
|
|
6544 |
+echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
|
|
|
6545 |
+echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
|
|
|
6546 |
if test $am_cv_val_LC_MESSAGES = yes; then
|
|
|
6547 |
|
|
|
6548 |
cat >>confdefs.h <<\_ACEOF
|
|
|
6549 |
@@ -6422,17 +5933,17 @@
|
|
|
6550 |
INTLLIBS=
|
|
|
6551 |
|
|
|
6552 |
if test "${ac_cv_header_libintl_h+set}" = set; then
|
|
|
6553 |
- { echo "$as_me:$LINENO: checking for libintl.h" >&5
|
|
|
6554 |
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
|
|
|
6555 |
+ echo "$as_me:$LINENO: checking for libintl.h" >&5
|
|
|
6556 |
+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
|
|
|
6557 |
if test "${ac_cv_header_libintl_h+set}" = set; then
|
|
|
6558 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
6559 |
fi
|
|
|
6560 |
-{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
|
|
|
6561 |
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
|
|
|
6562 |
+echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
|
|
|
6563 |
+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
|
|
|
6564 |
else
|
|
|
6565 |
# Is the header compilable?
|
|
|
6566 |
-{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
|
|
|
6567 |
-echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }
|
|
|
6568 |
+echo "$as_me:$LINENO: checking libintl.h usability" >&5
|
|
|
6569 |
+echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6
|
|
|
6570 |
cat >conftest.$ac_ext <<_ACEOF
|
|
|
6571 |
/* confdefs.h. */
|
|
|
6572 |
_ACEOF
|
|
|
6573 |
@@ -6443,37 +5954,41 @@
|
|
|
6574 |
#include <libintl.h>
|
|
|
6575 |
_ACEOF
|
|
|
6576 |
rm -f conftest.$ac_objext
|
|
|
6577 |
-if { (ac_try="$ac_compile"
|
|
|
6578 |
-case "(($ac_try" in
|
|
|
6579 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
6580 |
- *) ac_try_echo=$ac_try;;
|
|
|
6581 |
-esac
|
|
|
6582 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
6583 |
- (eval "$ac_compile") 2>conftest.er1
|
|
|
6584 |
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
6585 |
+ (eval $ac_compile) 2>conftest.er1
|
|
|
6586 |
ac_status=$?
|
|
|
6587 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
6588 |
rm -f conftest.er1
|
|
|
6589 |
cat conftest.err >&5
|
|
|
6590 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
6591 |
- (exit $ac_status); } && {
|
|
|
6592 |
- test -z "$ac_c_werror_flag" ||
|
|
|
6593 |
- test ! -s conftest.err
|
|
|
6594 |
- } && test -s conftest.$ac_objext; then
|
|
|
6595 |
+ (exit $ac_status); } &&
|
|
|
6596 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
6597 |
+ || test ! -s conftest.err'
|
|
|
6598 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
6599 |
+ (eval $ac_try) 2>&5
|
|
|
6600 |
+ ac_status=$?
|
|
|
6601 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
6602 |
+ (exit $ac_status); }; } &&
|
|
|
6603 |
+ { ac_try='test -s conftest.$ac_objext'
|
|
|
6604 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
6605 |
+ (eval $ac_try) 2>&5
|
|
|
6606 |
+ ac_status=$?
|
|
|
6607 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
6608 |
+ (exit $ac_status); }; }; then
|
|
|
6609 |
ac_header_compiler=yes
|
|
|
6610 |
else
|
|
|
6611 |
echo "$as_me: failed program was:" >&5
|
|
|
6612 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
6613 |
|
|
|
6614 |
- ac_header_compiler=no
|
|
|
6615 |
+ac_header_compiler=no
|
|
|
6616 |
fi
|
|
|
6617 |
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
6618 |
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
|
6619 |
+echo "${ECHO_T}$ac_header_compiler" >&6
|
|
|
6620 |
|
|
|
6621 |
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
6622 |
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
|
6623 |
-echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
|
6624 |
-
|
|
|
6625 |
# Is the header present?
|
|
|
6626 |
-{ echo "$as_me:$LINENO: checking libintl.h presence" >&5
|
|
|
6627 |
-echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }
|
|
|
6628 |
+echo "$as_me:$LINENO: checking libintl.h presence" >&5
|
|
|
6629 |
+echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6
|
|
|
6630 |
cat >conftest.$ac_ext <<_ACEOF
|
|
|
6631 |
/* confdefs.h. */
|
|
|
6632 |
_ACEOF
|
|
|
6633 |
@@ -6482,22 +5997,24 @@
|
|
|
6634 |
/* end confdefs.h. */
|
|
|
6635 |
#include <libintl.h>
|
|
|
6636 |
_ACEOF
|
|
|
6637 |
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
|
6638 |
-case "(($ac_try" in
|
|
|
6639 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
6640 |
- *) ac_try_echo=$ac_try;;
|
|
|
6641 |
-esac
|
|
|
6642 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
6643 |
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
|
|
6644 |
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
|
|
6645 |
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
|
|
6646 |
ac_status=$?
|
|
|
6647 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
6648 |
rm -f conftest.er1
|
|
|
6649 |
cat conftest.err >&5
|
|
|
6650 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
6651 |
- (exit $ac_status); } >/dev/null && {
|
|
|
6652 |
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
|
6653 |
- test ! -s conftest.err
|
|
|
6654 |
- }; then
|
|
|
6655 |
+ (exit $ac_status); } >/dev/null; then
|
|
|
6656 |
+ if test -s conftest.err; then
|
|
|
6657 |
+ ac_cpp_err=$ac_c_preproc_warn_flag
|
|
|
6658 |
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
|
6659 |
+ else
|
|
|
6660 |
+ ac_cpp_err=
|
|
|
6661 |
+ fi
|
|
|
6662 |
+else
|
|
|
6663 |
+ ac_cpp_err=yes
|
|
|
6664 |
+fi
|
|
|
6665 |
+if test -z "$ac_cpp_err"; then
|
|
|
6666 |
ac_header_preproc=yes
|
|
|
6667 |
else
|
|
|
6668 |
echo "$as_me: failed program was:" >&5
|
|
|
6669 |
@@ -6505,10 +6022,9 @@
|
|
|
6670 |
|
|
|
6671 |
ac_header_preproc=no
|
|
|
6672 |
fi
|
|
|
6673 |
-
|
|
|
6674 |
rm -f conftest.err conftest.$ac_ext
|
|
|
6675 |
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
|
6676 |
-echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
|
6677 |
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
|
6678 |
+echo "${ECHO_T}$ac_header_preproc" >&6
|
|
|
6679 |
|
|
|
6680 |
# So? What about this header?
|
|
|
6681 |
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
|
6682 |
@@ -6532,23 +6048,25 @@
|
|
|
6683 |
echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
|
|
|
6684 |
{ echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
|
|
|
6685 |
echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
|
|
|
6686 |
- ( cat <<\_ASBOX
|
|
|
6687 |
+ (
|
|
|
6688 |
+ cat <<\_ASBOX
|
|
|
6689 |
## ------------------------------------- ##
|
|
|
6690 |
## Report this to [email protected] ##
|
|
|
6691 |
## ------------------------------------- ##
|
|
|
6692 |
_ASBOX
|
|
|
6693 |
- ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
|
6694 |
+ ) |
|
|
|
6695 |
+ sed "s/^/$as_me: WARNING: /" >&2
|
|
|
6696 |
;;
|
|
|
6697 |
esac
|
|
|
6698 |
-{ echo "$as_me:$LINENO: checking for libintl.h" >&5
|
|
|
6699 |
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
|
|
|
6700 |
+echo "$as_me:$LINENO: checking for libintl.h" >&5
|
|
|
6701 |
+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
|
|
|
6702 |
if test "${ac_cv_header_libintl_h+set}" = set; then
|
|
|
6703 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
6704 |
else
|
|
|
6705 |
ac_cv_header_libintl_h=$ac_header_preproc
|
|
|
6706 |
fi
|
|
|
6707 |
-{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
|
|
|
6708 |
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
|
|
|
6709 |
+echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
|
|
|
6710 |
+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
|
|
|
6711 |
|
|
|
6712 |
fi
|
|
|
6713 |
if test $ac_cv_header_libintl_h = yes; then
|
|
|
6714 |
@@ -6558,8 +6076,8 @@
|
|
|
6715 |
#
|
|
|
6716 |
# First check in libc
|
|
|
6717 |
#
|
|
|
6718 |
- { echo "$as_me:$LINENO: checking for ngettext in libc" >&5
|
|
|
6719 |
-echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; }
|
|
|
6720 |
+ echo "$as_me:$LINENO: checking for ngettext in libc" >&5
|
|
|
6721 |
+echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6
|
|
|
6722 |
if test "${gt_cv_func_ngettext_libc+set}" = set; then
|
|
|
6723 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
6724 |
else
|
|
|
6725 |
@@ -6581,41 +6099,44 @@
|
|
|
6726 |
}
|
|
|
6727 |
_ACEOF
|
|
|
6728 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
6729 |
-if { (ac_try="$ac_link"
|
|
|
6730 |
-case "(($ac_try" in
|
|
|
6731 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
6732 |
- *) ac_try_echo=$ac_try;;
|
|
|
6733 |
-esac
|
|
|
6734 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
6735 |
- (eval "$ac_link") 2>conftest.er1
|
|
|
6736 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
6737 |
+ (eval $ac_link) 2>conftest.er1
|
|
|
6738 |
ac_status=$?
|
|
|
6739 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
6740 |
rm -f conftest.er1
|
|
|
6741 |
cat conftest.err >&5
|
|
|
6742 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
6743 |
- (exit $ac_status); } && {
|
|
|
6744 |
- test -z "$ac_c_werror_flag" ||
|
|
|
6745 |
- test ! -s conftest.err
|
|
|
6746 |
- } && test -s conftest$ac_exeext &&
|
|
|
6747 |
- $as_test_x conftest$ac_exeext; then
|
|
|
6748 |
+ (exit $ac_status); } &&
|
|
|
6749 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
6750 |
+ || test ! -s conftest.err'
|
|
|
6751 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
6752 |
+ (eval $ac_try) 2>&5
|
|
|
6753 |
+ ac_status=$?
|
|
|
6754 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
6755 |
+ (exit $ac_status); }; } &&
|
|
|
6756 |
+ { ac_try='test -s conftest$ac_exeext'
|
|
|
6757 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
6758 |
+ (eval $ac_try) 2>&5
|
|
|
6759 |
+ ac_status=$?
|
|
|
6760 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
6761 |
+ (exit $ac_status); }; }; then
|
|
|
6762 |
gt_cv_func_ngettext_libc=yes
|
|
|
6763 |
else
|
|
|
6764 |
echo "$as_me: failed program was:" >&5
|
|
|
6765 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
6766 |
|
|
|
6767 |
- gt_cv_func_ngettext_libc=no
|
|
|
6768 |
+gt_cv_func_ngettext_libc=no
|
|
|
6769 |
fi
|
|
|
6770 |
-
|
|
|
6771 |
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
|
6772 |
+rm -f conftest.err conftest.$ac_objext \
|
|
|
6773 |
conftest$ac_exeext conftest.$ac_ext
|
|
|
6774 |
|
|
|
6775 |
fi
|
|
|
6776 |
-{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
|
|
|
6777 |
-echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; }
|
|
|
6778 |
+echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
|
|
|
6779 |
+echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6
|
|
|
6780 |
|
|
|
6781 |
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
|
|
|
6782 |
- { echo "$as_me:$LINENO: checking for dgettext in libc" >&5
|
|
|
6783 |
-echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; }
|
|
|
6784 |
+ echo "$as_me:$LINENO: checking for dgettext in libc" >&5
|
|
|
6785 |
+echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6
|
|
|
6786 |
if test "${gt_cv_func_dgettext_libc+set}" = set; then
|
|
|
6787 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
6788 |
else
|
|
|
6789 |
@@ -6637,37 +6158,40 @@
|
|
|
6790 |
}
|
|
|
6791 |
_ACEOF
|
|
|
6792 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
6793 |
-if { (ac_try="$ac_link"
|
|
|
6794 |
-case "(($ac_try" in
|
|
|
6795 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
6796 |
- *) ac_try_echo=$ac_try;;
|
|
|
6797 |
-esac
|
|
|
6798 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
6799 |
- (eval "$ac_link") 2>conftest.er1
|
|
|
6800 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
6801 |
+ (eval $ac_link) 2>conftest.er1
|
|
|
6802 |
ac_status=$?
|
|
|
6803 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
6804 |
rm -f conftest.er1
|
|
|
6805 |
cat conftest.err >&5
|
|
|
6806 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
6807 |
- (exit $ac_status); } && {
|
|
|
6808 |
- test -z "$ac_c_werror_flag" ||
|
|
|
6809 |
- test ! -s conftest.err
|
|
|
6810 |
- } && test -s conftest$ac_exeext &&
|
|
|
6811 |
- $as_test_x conftest$ac_exeext; then
|
|
|
6812 |
+ (exit $ac_status); } &&
|
|
|
6813 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
6814 |
+ || test ! -s conftest.err'
|
|
|
6815 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
6816 |
+ (eval $ac_try) 2>&5
|
|
|
6817 |
+ ac_status=$?
|
|
|
6818 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
6819 |
+ (exit $ac_status); }; } &&
|
|
|
6820 |
+ { ac_try='test -s conftest$ac_exeext'
|
|
|
6821 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
6822 |
+ (eval $ac_try) 2>&5
|
|
|
6823 |
+ ac_status=$?
|
|
|
6824 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
6825 |
+ (exit $ac_status); }; }; then
|
|
|
6826 |
gt_cv_func_dgettext_libc=yes
|
|
|
6827 |
else
|
|
|
6828 |
echo "$as_me: failed program was:" >&5
|
|
|
6829 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
6830 |
|
|
|
6831 |
- gt_cv_func_dgettext_libc=no
|
|
|
6832 |
+gt_cv_func_dgettext_libc=no
|
|
|
6833 |
fi
|
|
|
6834 |
-
|
|
|
6835 |
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
|
6836 |
+rm -f conftest.err conftest.$ac_objext \
|
|
|
6837 |
conftest$ac_exeext conftest.$ac_ext
|
|
|
6838 |
|
|
|
6839 |
fi
|
|
|
6840 |
-{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
|
|
|
6841 |
-echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; }
|
|
|
6842 |
+echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
|
|
|
6843 |
+echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6
|
|
|
6844 |
fi
|
|
|
6845 |
|
|
|
6846 |
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
|
|
|
6847 |
@@ -6675,9 +6199,9 @@
|
|
|
6848 |
for ac_func in bind_textdomain_codeset
|
|
|
6849 |
do
|
|
|
6850 |
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
|
6851 |
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
|
6852 |
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
|
|
6853 |
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
|
6854 |
+echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
|
6855 |
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
|
|
|
6856 |
+if eval "test \"\${$as_ac_var+set}\" = set"; then
|
|
|
6857 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
6858 |
else
|
|
|
6859 |
cat >conftest.$ac_ext <<_ACEOF
|
|
|
6860 |
@@ -6703,60 +6227,68 @@
|
|
|
6861 |
|
|
|
6862 |
#undef $ac_func
|
|
|
6863 |
|
|
|
6864 |
-/* Override any GCC internal prototype to avoid an error.
|
|
|
6865 |
- Use char because int might match the return type of a GCC
|
|
|
6866 |
- builtin and then its argument prototype would still apply. */
|
|
|
6867 |
+/* Override any gcc2 internal prototype to avoid an error. */
|
|
|
6868 |
#ifdef __cplusplus
|
|
|
6869 |
extern "C"
|
|
|
6870 |
+{
|
|
|
6871 |
#endif
|
|
|
6872 |
+/* We use char because int might match the return type of a gcc2
|
|
|
6873 |
+ builtin and then its argument prototype would still apply. */
|
|
|
6874 |
char $ac_func ();
|
|
|
6875 |
/* The GNU C library defines this for functions which it implements
|
|
|
6876 |
to always fail with ENOSYS. Some functions are actually named
|
|
|
6877 |
something starting with __ and the normal name is an alias. */
|
|
|
6878 |
-#if defined __stub_$ac_func || defined __stub___$ac_func
|
|
|
6879 |
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
|
|
|
6880 |
choke me
|
|
|
6881 |
+#else
|
|
|
6882 |
+char (*f) () = $ac_func;
|
|
|
6883 |
#endif
|
|
|
6884 |
+#ifdef __cplusplus
|
|
|
6885 |
+}
|
|
|
6886 |
+#endif
|
|
|
6887 |
|
|
|
6888 |
int
|
|
|
6889 |
main ()
|
|
|
6890 |
{
|
|
|
6891 |
-return $ac_func ();
|
|
|
6892 |
+return f != $ac_func;
|
|
|
6893 |
;
|
|
|
6894 |
return 0;
|
|
|
6895 |
}
|
|
|
6896 |
_ACEOF
|
|
|
6897 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
6898 |
-if { (ac_try="$ac_link"
|
|
|
6899 |
-case "(($ac_try" in
|
|
|
6900 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
6901 |
- *) ac_try_echo=$ac_try;;
|
|
|
6902 |
-esac
|
|
|
6903 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
6904 |
- (eval "$ac_link") 2>conftest.er1
|
|
|
6905 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
6906 |
+ (eval $ac_link) 2>conftest.er1
|
|
|
6907 |
ac_status=$?
|
|
|
6908 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
6909 |
rm -f conftest.er1
|
|
|
6910 |
cat conftest.err >&5
|
|
|
6911 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
6912 |
- (exit $ac_status); } && {
|
|
|
6913 |
- test -z "$ac_c_werror_flag" ||
|
|
|
6914 |
- test ! -s conftest.err
|
|
|
6915 |
- } && test -s conftest$ac_exeext &&
|
|
|
6916 |
- $as_test_x conftest$ac_exeext; then
|
|
|
6917 |
+ (exit $ac_status); } &&
|
|
|
6918 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
6919 |
+ || test ! -s conftest.err'
|
|
|
6920 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
6921 |
+ (eval $ac_try) 2>&5
|
|
|
6922 |
+ ac_status=$?
|
|
|
6923 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
6924 |
+ (exit $ac_status); }; } &&
|
|
|
6925 |
+ { ac_try='test -s conftest$ac_exeext'
|
|
|
6926 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
6927 |
+ (eval $ac_try) 2>&5
|
|
|
6928 |
+ ac_status=$?
|
|
|
6929 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
6930 |
+ (exit $ac_status); }; }; then
|
|
|
6931 |
eval "$as_ac_var=yes"
|
|
|
6932 |
else
|
|
|
6933 |
echo "$as_me: failed program was:" >&5
|
|
|
6934 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
6935 |
|
|
|
6936 |
- eval "$as_ac_var=no"
|
|
|
6937 |
+eval "$as_ac_var=no"
|
|
|
6938 |
fi
|
|
|
6939 |
-
|
|
|
6940 |
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
|
6941 |
+rm -f conftest.err conftest.$ac_objext \
|
|
|
6942 |
conftest$ac_exeext conftest.$ac_ext
|
|
|
6943 |
fi
|
|
|
6944 |
-ac_res=`eval echo '${'$as_ac_var'}'`
|
|
|
6945 |
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
|
6946 |
-echo "${ECHO_T}$ac_res" >&6; }
|
|
|
6947 |
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
|
|
|
6948 |
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
|
|
|
6949 |
if test `eval echo '${'$as_ac_var'}'` = yes; then
|
|
|
6950 |
cat >>confdefs.h <<_ACEOF
|
|
|
6951 |
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
|
6952 |
@@ -6774,8 +6306,8 @@
|
|
|
6953 |
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|
|
|
6954 |
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
|
|
|
6955 |
|
|
|
6956 |
- { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
|
|
|
6957 |
-echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; }
|
|
|
6958 |
+ echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
|
|
|
6959 |
+echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6
|
|
|
6960 |
if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
|
|
|
6961 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
6962 |
else
|
|
|
6963 |
@@ -6788,56 +6320,59 @@
|
|
|
6964 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
|
6965 |
/* end confdefs.h. */
|
|
|
6966 |
|
|
|
6967 |
-/* Override any GCC internal prototype to avoid an error.
|
|
|
6968 |
- Use char because int might match the return type of a GCC
|
|
|
6969 |
- builtin and then its argument prototype would still apply. */
|
|
|
6970 |
+/* Override any gcc2 internal prototype to avoid an error. */
|
|
|
6971 |
#ifdef __cplusplus
|
|
|
6972 |
extern "C"
|
|
|
6973 |
#endif
|
|
|
6974 |
+/* We use char because int might match the return type of a gcc2
|
|
|
6975 |
+ builtin and then its argument prototype would still apply. */
|
|
|
6976 |
char bindtextdomain ();
|
|
|
6977 |
int
|
|
|
6978 |
main ()
|
|
|
6979 |
{
|
|
|
6980 |
-return bindtextdomain ();
|
|
|
6981 |
+bindtextdomain ();
|
|
|
6982 |
;
|
|
|
6983 |
return 0;
|
|
|
6984 |
}
|
|
|
6985 |
_ACEOF
|
|
|
6986 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
6987 |
-if { (ac_try="$ac_link"
|
|
|
6988 |
-case "(($ac_try" in
|
|
|
6989 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
6990 |
- *) ac_try_echo=$ac_try;;
|
|
|
6991 |
-esac
|
|
|
6992 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
6993 |
- (eval "$ac_link") 2>conftest.er1
|
|
|
6994 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
6995 |
+ (eval $ac_link) 2>conftest.er1
|
|
|
6996 |
ac_status=$?
|
|
|
6997 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
6998 |
rm -f conftest.er1
|
|
|
6999 |
cat conftest.err >&5
|
|
|
7000 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7001 |
- (exit $ac_status); } && {
|
|
|
7002 |
- test -z "$ac_c_werror_flag" ||
|
|
|
7003 |
- test ! -s conftest.err
|
|
|
7004 |
- } && test -s conftest$ac_exeext &&
|
|
|
7005 |
- $as_test_x conftest$ac_exeext; then
|
|
|
7006 |
+ (exit $ac_status); } &&
|
|
|
7007 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
7008 |
+ || test ! -s conftest.err'
|
|
|
7009 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
7010 |
+ (eval $ac_try) 2>&5
|
|
|
7011 |
+ ac_status=$?
|
|
|
7012 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7013 |
+ (exit $ac_status); }; } &&
|
|
|
7014 |
+ { ac_try='test -s conftest$ac_exeext'
|
|
|
7015 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
7016 |
+ (eval $ac_try) 2>&5
|
|
|
7017 |
+ ac_status=$?
|
|
|
7018 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7019 |
+ (exit $ac_status); }; }; then
|
|
|
7020 |
ac_cv_lib_intl_bindtextdomain=yes
|
|
|
7021 |
else
|
|
|
7022 |
echo "$as_me: failed program was:" >&5
|
|
|
7023 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
7024 |
|
|
|
7025 |
- ac_cv_lib_intl_bindtextdomain=no
|
|
|
7026 |
+ac_cv_lib_intl_bindtextdomain=no
|
|
|
7027 |
fi
|
|
|
7028 |
-
|
|
|
7029 |
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
|
7030 |
+rm -f conftest.err conftest.$ac_objext \
|
|
|
7031 |
conftest$ac_exeext conftest.$ac_ext
|
|
|
7032 |
LIBS=$ac_check_lib_save_LIBS
|
|
|
7033 |
fi
|
|
|
7034 |
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
|
|
|
7035 |
-echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; }
|
|
|
7036 |
+echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
|
|
|
7037 |
+echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6
|
|
|
7038 |
if test $ac_cv_lib_intl_bindtextdomain = yes; then
|
|
|
7039 |
- { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
|
|
|
7040 |
-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
|
|
|
7041 |
+ echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
|
|
|
7042 |
+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6
|
|
|
7043 |
if test "${ac_cv_lib_intl_ngettext+set}" = set; then
|
|
|
7044 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
7045 |
else
|
|
|
7046 |
@@ -6850,56 +6385,59 @@
|
|
|
7047 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
|
7048 |
/* end confdefs.h. */
|
|
|
7049 |
|
|
|
7050 |
-/* Override any GCC internal prototype to avoid an error.
|
|
|
7051 |
- Use char because int might match the return type of a GCC
|
|
|
7052 |
- builtin and then its argument prototype would still apply. */
|
|
|
7053 |
+/* Override any gcc2 internal prototype to avoid an error. */
|
|
|
7054 |
#ifdef __cplusplus
|
|
|
7055 |
extern "C"
|
|
|
7056 |
#endif
|
|
|
7057 |
+/* We use char because int might match the return type of a gcc2
|
|
|
7058 |
+ builtin and then its argument prototype would still apply. */
|
|
|
7059 |
char ngettext ();
|
|
|
7060 |
int
|
|
|
7061 |
main ()
|
|
|
7062 |
{
|
|
|
7063 |
-return ngettext ();
|
|
|
7064 |
+ngettext ();
|
|
|
7065 |
;
|
|
|
7066 |
return 0;
|
|
|
7067 |
}
|
|
|
7068 |
_ACEOF
|
|
|
7069 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
7070 |
-if { (ac_try="$ac_link"
|
|
|
7071 |
-case "(($ac_try" in
|
|
|
7072 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
7073 |
- *) ac_try_echo=$ac_try;;
|
|
|
7074 |
-esac
|
|
|
7075 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
7076 |
- (eval "$ac_link") 2>conftest.er1
|
|
|
7077 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
7078 |
+ (eval $ac_link) 2>conftest.er1
|
|
|
7079 |
ac_status=$?
|
|
|
7080 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
7081 |
rm -f conftest.er1
|
|
|
7082 |
cat conftest.err >&5
|
|
|
7083 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7084 |
- (exit $ac_status); } && {
|
|
|
7085 |
- test -z "$ac_c_werror_flag" ||
|
|
|
7086 |
- test ! -s conftest.err
|
|
|
7087 |
- } && test -s conftest$ac_exeext &&
|
|
|
7088 |
- $as_test_x conftest$ac_exeext; then
|
|
|
7089 |
+ (exit $ac_status); } &&
|
|
|
7090 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
7091 |
+ || test ! -s conftest.err'
|
|
|
7092 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
7093 |
+ (eval $ac_try) 2>&5
|
|
|
7094 |
+ ac_status=$?
|
|
|
7095 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7096 |
+ (exit $ac_status); }; } &&
|
|
|
7097 |
+ { ac_try='test -s conftest$ac_exeext'
|
|
|
7098 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
7099 |
+ (eval $ac_try) 2>&5
|
|
|
7100 |
+ ac_status=$?
|
|
|
7101 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7102 |
+ (exit $ac_status); }; }; then
|
|
|
7103 |
ac_cv_lib_intl_ngettext=yes
|
|
|
7104 |
else
|
|
|
7105 |
echo "$as_me: failed program was:" >&5
|
|
|
7106 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
7107 |
|
|
|
7108 |
- ac_cv_lib_intl_ngettext=no
|
|
|
7109 |
+ac_cv_lib_intl_ngettext=no
|
|
|
7110 |
fi
|
|
|
7111 |
-
|
|
|
7112 |
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
|
7113 |
+rm -f conftest.err conftest.$ac_objext \
|
|
|
7114 |
conftest$ac_exeext conftest.$ac_ext
|
|
|
7115 |
LIBS=$ac_check_lib_save_LIBS
|
|
|
7116 |
fi
|
|
|
7117 |
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
|
|
|
7118 |
-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
|
|
|
7119 |
+echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
|
|
|
7120 |
+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6
|
|
|
7121 |
if test $ac_cv_lib_intl_ngettext = yes; then
|
|
|
7122 |
- { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
|
|
|
7123 |
-echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; }
|
|
|
7124 |
+ echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
|
|
|
7125 |
+echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6
|
|
|
7126 |
if test "${ac_cv_lib_intl_dgettext+set}" = set; then
|
|
|
7127 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
7128 |
else
|
|
|
7129 |
@@ -6912,53 +6450,56 @@
|
|
|
7130 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
|
7131 |
/* end confdefs.h. */
|
|
|
7132 |
|
|
|
7133 |
-/* Override any GCC internal prototype to avoid an error.
|
|
|
7134 |
- Use char because int might match the return type of a GCC
|
|
|
7135 |
- builtin and then its argument prototype would still apply. */
|
|
|
7136 |
+/* Override any gcc2 internal prototype to avoid an error. */
|
|
|
7137 |
#ifdef __cplusplus
|
|
|
7138 |
extern "C"
|
|
|
7139 |
#endif
|
|
|
7140 |
+/* We use char because int might match the return type of a gcc2
|
|
|
7141 |
+ builtin and then its argument prototype would still apply. */
|
|
|
7142 |
char dgettext ();
|
|
|
7143 |
int
|
|
|
7144 |
main ()
|
|
|
7145 |
{
|
|
|
7146 |
-return dgettext ();
|
|
|
7147 |
+dgettext ();
|
|
|
7148 |
;
|
|
|
7149 |
return 0;
|
|
|
7150 |
}
|
|
|
7151 |
_ACEOF
|
|
|
7152 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
7153 |
-if { (ac_try="$ac_link"
|
|
|
7154 |
-case "(($ac_try" in
|
|
|
7155 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
7156 |
- *) ac_try_echo=$ac_try;;
|
|
|
7157 |
-esac
|
|
|
7158 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
7159 |
- (eval "$ac_link") 2>conftest.er1
|
|
|
7160 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
7161 |
+ (eval $ac_link) 2>conftest.er1
|
|
|
7162 |
ac_status=$?
|
|
|
7163 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
7164 |
rm -f conftest.er1
|
|
|
7165 |
cat conftest.err >&5
|
|
|
7166 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7167 |
- (exit $ac_status); } && {
|
|
|
7168 |
- test -z "$ac_c_werror_flag" ||
|
|
|
7169 |
- test ! -s conftest.err
|
|
|
7170 |
- } && test -s conftest$ac_exeext &&
|
|
|
7171 |
- $as_test_x conftest$ac_exeext; then
|
|
|
7172 |
+ (exit $ac_status); } &&
|
|
|
7173 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
7174 |
+ || test ! -s conftest.err'
|
|
|
7175 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
7176 |
+ (eval $ac_try) 2>&5
|
|
|
7177 |
+ ac_status=$?
|
|
|
7178 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7179 |
+ (exit $ac_status); }; } &&
|
|
|
7180 |
+ { ac_try='test -s conftest$ac_exeext'
|
|
|
7181 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
7182 |
+ (eval $ac_try) 2>&5
|
|
|
7183 |
+ ac_status=$?
|
|
|
7184 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7185 |
+ (exit $ac_status); }; }; then
|
|
|
7186 |
ac_cv_lib_intl_dgettext=yes
|
|
|
7187 |
else
|
|
|
7188 |
echo "$as_me: failed program was:" >&5
|
|
|
7189 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
7190 |
|
|
|
7191 |
- ac_cv_lib_intl_dgettext=no
|
|
|
7192 |
+ac_cv_lib_intl_dgettext=no
|
|
|
7193 |
fi
|
|
|
7194 |
-
|
|
|
7195 |
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
|
7196 |
+rm -f conftest.err conftest.$ac_objext \
|
|
|
7197 |
conftest$ac_exeext conftest.$ac_ext
|
|
|
7198 |
LIBS=$ac_check_lib_save_LIBS
|
|
|
7199 |
fi
|
|
|
7200 |
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
|
|
|
7201 |
-echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; }
|
|
|
7202 |
+echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
|
|
|
7203 |
+echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6
|
|
|
7204 |
if test $ac_cv_lib_intl_dgettext = yes; then
|
|
|
7205 |
gt_cv_func_dgettext_libintl=yes
|
|
|
7206 |
fi
|
|
|
7207 |
@@ -6969,12 +6510,12 @@
|
|
|
7208 |
|
|
|
7209 |
|
|
|
7210 |
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
|
|
|
7211 |
- { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
|
|
|
7212 |
-echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; }
|
|
|
7213 |
- { echo "$as_me:$LINENO: result: " >&5
|
|
|
7214 |
-echo "${ECHO_T}" >&6; }
|
|
|
7215 |
- { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
|
|
|
7216 |
-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
|
|
|
7217 |
+ echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
|
|
|
7218 |
+echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6
|
|
|
7219 |
+ echo "$as_me:$LINENO: result: " >&5
|
|
|
7220 |
+echo "${ECHO_T}" >&6
|
|
|
7221 |
+ echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
|
|
|
7222 |
+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6
|
|
|
7223 |
if test "${ac_cv_lib_intl_ngettext+set}" = set; then
|
|
|
7224 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
7225 |
else
|
|
|
7226 |
@@ -6987,56 +6528,59 @@
|
|
|
7227 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
|
7228 |
/* end confdefs.h. */
|
|
|
7229 |
|
|
|
7230 |
-/* Override any GCC internal prototype to avoid an error.
|
|
|
7231 |
- Use char because int might match the return type of a GCC
|
|
|
7232 |
- builtin and then its argument prototype would still apply. */
|
|
|
7233 |
+/* Override any gcc2 internal prototype to avoid an error. */
|
|
|
7234 |
#ifdef __cplusplus
|
|
|
7235 |
extern "C"
|
|
|
7236 |
#endif
|
|
|
7237 |
+/* We use char because int might match the return type of a gcc2
|
|
|
7238 |
+ builtin and then its argument prototype would still apply. */
|
|
|
7239 |
char ngettext ();
|
|
|
7240 |
int
|
|
|
7241 |
main ()
|
|
|
7242 |
{
|
|
|
7243 |
-return ngettext ();
|
|
|
7244 |
+ngettext ();
|
|
|
7245 |
;
|
|
|
7246 |
return 0;
|
|
|
7247 |
}
|
|
|
7248 |
_ACEOF
|
|
|
7249 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
7250 |
-if { (ac_try="$ac_link"
|
|
|
7251 |
-case "(($ac_try" in
|
|
|
7252 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
7253 |
- *) ac_try_echo=$ac_try;;
|
|
|
7254 |
-esac
|
|
|
7255 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
7256 |
- (eval "$ac_link") 2>conftest.er1
|
|
|
7257 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
7258 |
+ (eval $ac_link) 2>conftest.er1
|
|
|
7259 |
ac_status=$?
|
|
|
7260 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
7261 |
rm -f conftest.er1
|
|
|
7262 |
cat conftest.err >&5
|
|
|
7263 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7264 |
- (exit $ac_status); } && {
|
|
|
7265 |
- test -z "$ac_c_werror_flag" ||
|
|
|
7266 |
- test ! -s conftest.err
|
|
|
7267 |
- } && test -s conftest$ac_exeext &&
|
|
|
7268 |
- $as_test_x conftest$ac_exeext; then
|
|
|
7269 |
+ (exit $ac_status); } &&
|
|
|
7270 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
7271 |
+ || test ! -s conftest.err'
|
|
|
7272 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
7273 |
+ (eval $ac_try) 2>&5
|
|
|
7274 |
+ ac_status=$?
|
|
|
7275 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7276 |
+ (exit $ac_status); }; } &&
|
|
|
7277 |
+ { ac_try='test -s conftest$ac_exeext'
|
|
|
7278 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
7279 |
+ (eval $ac_try) 2>&5
|
|
|
7280 |
+ ac_status=$?
|
|
|
7281 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7282 |
+ (exit $ac_status); }; }; then
|
|
|
7283 |
ac_cv_lib_intl_ngettext=yes
|
|
|
7284 |
else
|
|
|
7285 |
echo "$as_me: failed program was:" >&5
|
|
|
7286 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
7287 |
|
|
|
7288 |
- ac_cv_lib_intl_ngettext=no
|
|
|
7289 |
+ac_cv_lib_intl_ngettext=no
|
|
|
7290 |
fi
|
|
|
7291 |
-
|
|
|
7292 |
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
|
7293 |
+rm -f conftest.err conftest.$ac_objext \
|
|
|
7294 |
conftest$ac_exeext conftest.$ac_ext
|
|
|
7295 |
LIBS=$ac_check_lib_save_LIBS
|
|
|
7296 |
fi
|
|
|
7297 |
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
|
|
|
7298 |
-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
|
|
|
7299 |
+echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
|
|
|
7300 |
+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6
|
|
|
7301 |
if test $ac_cv_lib_intl_ngettext = yes; then
|
|
|
7302 |
- { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
|
|
|
7303 |
-echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; }
|
|
|
7304 |
+ echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
|
|
|
7305 |
+echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6
|
|
|
7306 |
if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
|
|
|
7307 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
7308 |
else
|
|
|
7309 |
@@ -7049,53 +6593,56 @@
|
|
|
7310 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
|
7311 |
/* end confdefs.h. */
|
|
|
7312 |
|
|
|
7313 |
-/* Override any GCC internal prototype to avoid an error.
|
|
|
7314 |
- Use char because int might match the return type of a GCC
|
|
|
7315 |
- builtin and then its argument prototype would still apply. */
|
|
|
7316 |
+/* Override any gcc2 internal prototype to avoid an error. */
|
|
|
7317 |
#ifdef __cplusplus
|
|
|
7318 |
extern "C"
|
|
|
7319 |
#endif
|
|
|
7320 |
+/* We use char because int might match the return type of a gcc2
|
|
|
7321 |
+ builtin and then its argument prototype would still apply. */
|
|
|
7322 |
char dcgettext ();
|
|
|
7323 |
int
|
|
|
7324 |
main ()
|
|
|
7325 |
{
|
|
|
7326 |
-return dcgettext ();
|
|
|
7327 |
+dcgettext ();
|
|
|
7328 |
;
|
|
|
7329 |
return 0;
|
|
|
7330 |
}
|
|
|
7331 |
_ACEOF
|
|
|
7332 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
7333 |
-if { (ac_try="$ac_link"
|
|
|
7334 |
-case "(($ac_try" in
|
|
|
7335 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
7336 |
- *) ac_try_echo=$ac_try;;
|
|
|
7337 |
-esac
|
|
|
7338 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
7339 |
- (eval "$ac_link") 2>conftest.er1
|
|
|
7340 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
7341 |
+ (eval $ac_link) 2>conftest.er1
|
|
|
7342 |
ac_status=$?
|
|
|
7343 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
7344 |
rm -f conftest.er1
|
|
|
7345 |
cat conftest.err >&5
|
|
|
7346 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7347 |
- (exit $ac_status); } && {
|
|
|
7348 |
- test -z "$ac_c_werror_flag" ||
|
|
|
7349 |
- test ! -s conftest.err
|
|
|
7350 |
- } && test -s conftest$ac_exeext &&
|
|
|
7351 |
- $as_test_x conftest$ac_exeext; then
|
|
|
7352 |
+ (exit $ac_status); } &&
|
|
|
7353 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
7354 |
+ || test ! -s conftest.err'
|
|
|
7355 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
7356 |
+ (eval $ac_try) 2>&5
|
|
|
7357 |
+ ac_status=$?
|
|
|
7358 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7359 |
+ (exit $ac_status); }; } &&
|
|
|
7360 |
+ { ac_try='test -s conftest$ac_exeext'
|
|
|
7361 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
7362 |
+ (eval $ac_try) 2>&5
|
|
|
7363 |
+ ac_status=$?
|
|
|
7364 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7365 |
+ (exit $ac_status); }; }; then
|
|
|
7366 |
ac_cv_lib_intl_dcgettext=yes
|
|
|
7367 |
else
|
|
|
7368 |
echo "$as_me: failed program was:" >&5
|
|
|
7369 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
7370 |
|
|
|
7371 |
- ac_cv_lib_intl_dcgettext=no
|
|
|
7372 |
+ac_cv_lib_intl_dcgettext=no
|
|
|
7373 |
fi
|
|
|
7374 |
-
|
|
|
7375 |
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
|
7376 |
+rm -f conftest.err conftest.$ac_objext \
|
|
|
7377 |
conftest$ac_exeext conftest.$ac_ext
|
|
|
7378 |
LIBS=$ac_check_lib_save_LIBS
|
|
|
7379 |
fi
|
|
|
7380 |
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
|
|
|
7381 |
-echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; }
|
|
|
7382 |
+echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
|
|
|
7383 |
+echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6
|
|
|
7384 |
if test $ac_cv_lib_intl_dcgettext = yes; then
|
|
|
7385 |
gt_cv_func_dgettext_libintl=yes
|
|
|
7386 |
libintl_extra_libs=-liconv
|
|
|
7387 |
@@ -7122,9 +6669,9 @@
|
|
|
7388 |
for ac_func in bind_textdomain_codeset
|
|
|
7389 |
do
|
|
|
7390 |
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
|
7391 |
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
|
7392 |
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
|
|
7393 |
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
|
7394 |
+echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
|
7395 |
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
|
|
|
7396 |
+if eval "test \"\${$as_ac_var+set}\" = set"; then
|
|
|
7397 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
7398 |
else
|
|
|
7399 |
cat >conftest.$ac_ext <<_ACEOF
|
|
|
7400 |
@@ -7150,60 +6697,68 @@
|
|
|
7401 |
|
|
|
7402 |
#undef $ac_func
|
|
|
7403 |
|
|
|
7404 |
-/* Override any GCC internal prototype to avoid an error.
|
|
|
7405 |
- Use char because int might match the return type of a GCC
|
|
|
7406 |
- builtin and then its argument prototype would still apply. */
|
|
|
7407 |
+/* Override any gcc2 internal prototype to avoid an error. */
|
|
|
7408 |
#ifdef __cplusplus
|
|
|
7409 |
extern "C"
|
|
|
7410 |
+{
|
|
|
7411 |
#endif
|
|
|
7412 |
+/* We use char because int might match the return type of a gcc2
|
|
|
7413 |
+ builtin and then its argument prototype would still apply. */
|
|
|
7414 |
char $ac_func ();
|
|
|
7415 |
/* The GNU C library defines this for functions which it implements
|
|
|
7416 |
to always fail with ENOSYS. Some functions are actually named
|
|
|
7417 |
something starting with __ and the normal name is an alias. */
|
|
|
7418 |
-#if defined __stub_$ac_func || defined __stub___$ac_func
|
|
|
7419 |
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
|
|
|
7420 |
choke me
|
|
|
7421 |
+#else
|
|
|
7422 |
+char (*f) () = $ac_func;
|
|
|
7423 |
#endif
|
|
|
7424 |
+#ifdef __cplusplus
|
|
|
7425 |
+}
|
|
|
7426 |
+#endif
|
|
|
7427 |
|
|
|
7428 |
int
|
|
|
7429 |
main ()
|
|
|
7430 |
{
|
|
|
7431 |
-return $ac_func ();
|
|
|
7432 |
+return f != $ac_func;
|
|
|
7433 |
;
|
|
|
7434 |
return 0;
|
|
|
7435 |
}
|
|
|
7436 |
_ACEOF
|
|
|
7437 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
7438 |
-if { (ac_try="$ac_link"
|
|
|
7439 |
-case "(($ac_try" in
|
|
|
7440 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
7441 |
- *) ac_try_echo=$ac_try;;
|
|
|
7442 |
-esac
|
|
|
7443 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
7444 |
- (eval "$ac_link") 2>conftest.er1
|
|
|
7445 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
7446 |
+ (eval $ac_link) 2>conftest.er1
|
|
|
7447 |
ac_status=$?
|
|
|
7448 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
7449 |
rm -f conftest.er1
|
|
|
7450 |
cat conftest.err >&5
|
|
|
7451 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7452 |
- (exit $ac_status); } && {
|
|
|
7453 |
- test -z "$ac_c_werror_flag" ||
|
|
|
7454 |
- test ! -s conftest.err
|
|
|
7455 |
- } && test -s conftest$ac_exeext &&
|
|
|
7456 |
- $as_test_x conftest$ac_exeext; then
|
|
|
7457 |
+ (exit $ac_status); } &&
|
|
|
7458 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
7459 |
+ || test ! -s conftest.err'
|
|
|
7460 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
7461 |
+ (eval $ac_try) 2>&5
|
|
|
7462 |
+ ac_status=$?
|
|
|
7463 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7464 |
+ (exit $ac_status); }; } &&
|
|
|
7465 |
+ { ac_try='test -s conftest$ac_exeext'
|
|
|
7466 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
7467 |
+ (eval $ac_try) 2>&5
|
|
|
7468 |
+ ac_status=$?
|
|
|
7469 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7470 |
+ (exit $ac_status); }; }; then
|
|
|
7471 |
eval "$as_ac_var=yes"
|
|
|
7472 |
else
|
|
|
7473 |
echo "$as_me: failed program was:" >&5
|
|
|
7474 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
7475 |
|
|
|
7476 |
- eval "$as_ac_var=no"
|
|
|
7477 |
+eval "$as_ac_var=no"
|
|
|
7478 |
fi
|
|
|
7479 |
-
|
|
|
7480 |
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
|
7481 |
+rm -f conftest.err conftest.$ac_objext \
|
|
|
7482 |
conftest$ac_exeext conftest.$ac_ext
|
|
|
7483 |
fi
|
|
|
7484 |
-ac_res=`eval echo '${'$as_ac_var'}'`
|
|
|
7485 |
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
|
7486 |
-echo "${ECHO_T}$ac_res" >&6; }
|
|
|
7487 |
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
|
|
|
7488 |
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
|
|
|
7489 |
if test `eval echo '${'$as_ac_var'}'` = yes; then
|
|
|
7490 |
cat >>confdefs.h <<_ACEOF
|
|
|
7491 |
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
|
7492 |
@@ -7242,8 +6797,8 @@
|
|
|
7493 |
|
|
|
7494 |
# Extract the first word of "msgfmt", so it can be a program name with args.
|
|
|
7495 |
set dummy msgfmt; ac_word=$2
|
|
|
7496 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
7497 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
7498 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
7499 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
7500 |
if test "${ac_cv_path_MSGFMT+set}" = set; then
|
|
|
7501 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
7502 |
else
|
|
|
7503 |
@@ -7269,11 +6824,11 @@
|
|
|
7504 |
fi
|
|
|
7505 |
MSGFMT="$ac_cv_path_MSGFMT"
|
|
|
7506 |
if test "$MSGFMT" != "no"; then
|
|
|
7507 |
- { echo "$as_me:$LINENO: result: $MSGFMT" >&5
|
|
|
7508 |
-echo "${ECHO_T}$MSGFMT" >&6; }
|
|
|
7509 |
+ echo "$as_me:$LINENO: result: $MSGFMT" >&5
|
|
|
7510 |
+echo "${ECHO_T}$MSGFMT" >&6
|
|
|
7511 |
else
|
|
|
7512 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
7513 |
-echo "${ECHO_T}no" >&6; }
|
|
|
7514 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
7515 |
+echo "${ECHO_T}no" >&6
|
|
|
7516 |
fi
|
|
|
7517 |
if test "$MSGFMT" != "no"; then
|
|
|
7518 |
glib_save_LIBS="$LIBS"
|
|
|
7519 |
@@ -7282,9 +6837,9 @@
|
|
|
7520 |
for ac_func in dcgettext
|
|
|
7521 |
do
|
|
|
7522 |
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
|
7523 |
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
|
7524 |
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
|
|
7525 |
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
|
7526 |
+echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
|
7527 |
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
|
|
|
7528 |
+if eval "test \"\${$as_ac_var+set}\" = set"; then
|
|
|
7529 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
7530 |
else
|
|
|
7531 |
cat >conftest.$ac_ext <<_ACEOF
|
|
|
7532 |
@@ -7310,60 +6865,68 @@
|
|
|
7533 |
|
|
|
7534 |
#undef $ac_func
|
|
|
7535 |
|
|
|
7536 |
-/* Override any GCC internal prototype to avoid an error.
|
|
|
7537 |
- Use char because int might match the return type of a GCC
|
|
|
7538 |
- builtin and then its argument prototype would still apply. */
|
|
|
7539 |
+/* Override any gcc2 internal prototype to avoid an error. */
|
|
|
7540 |
#ifdef __cplusplus
|
|
|
7541 |
extern "C"
|
|
|
7542 |
+{
|
|
|
7543 |
#endif
|
|
|
7544 |
+/* We use char because int might match the return type of a gcc2
|
|
|
7545 |
+ builtin and then its argument prototype would still apply. */
|
|
|
7546 |
char $ac_func ();
|
|
|
7547 |
/* The GNU C library defines this for functions which it implements
|
|
|
7548 |
to always fail with ENOSYS. Some functions are actually named
|
|
|
7549 |
something starting with __ and the normal name is an alias. */
|
|
|
7550 |
-#if defined __stub_$ac_func || defined __stub___$ac_func
|
|
|
7551 |
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
|
|
|
7552 |
choke me
|
|
|
7553 |
+#else
|
|
|
7554 |
+char (*f) () = $ac_func;
|
|
|
7555 |
#endif
|
|
|
7556 |
+#ifdef __cplusplus
|
|
|
7557 |
+}
|
|
|
7558 |
+#endif
|
|
|
7559 |
|
|
|
7560 |
int
|
|
|
7561 |
main ()
|
|
|
7562 |
{
|
|
|
7563 |
-return $ac_func ();
|
|
|
7564 |
+return f != $ac_func;
|
|
|
7565 |
;
|
|
|
7566 |
return 0;
|
|
|
7567 |
}
|
|
|
7568 |
_ACEOF
|
|
|
7569 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
7570 |
-if { (ac_try="$ac_link"
|
|
|
7571 |
-case "(($ac_try" in
|
|
|
7572 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
7573 |
- *) ac_try_echo=$ac_try;;
|
|
|
7574 |
-esac
|
|
|
7575 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
7576 |
- (eval "$ac_link") 2>conftest.er1
|
|
|
7577 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
7578 |
+ (eval $ac_link) 2>conftest.er1
|
|
|
7579 |
ac_status=$?
|
|
|
7580 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
7581 |
rm -f conftest.er1
|
|
|
7582 |
cat conftest.err >&5
|
|
|
7583 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7584 |
- (exit $ac_status); } && {
|
|
|
7585 |
- test -z "$ac_c_werror_flag" ||
|
|
|
7586 |
- test ! -s conftest.err
|
|
|
7587 |
- } && test -s conftest$ac_exeext &&
|
|
|
7588 |
- $as_test_x conftest$ac_exeext; then
|
|
|
7589 |
+ (exit $ac_status); } &&
|
|
|
7590 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
7591 |
+ || test ! -s conftest.err'
|
|
|
7592 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
7593 |
+ (eval $ac_try) 2>&5
|
|
|
7594 |
+ ac_status=$?
|
|
|
7595 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7596 |
+ (exit $ac_status); }; } &&
|
|
|
7597 |
+ { ac_try='test -s conftest$ac_exeext'
|
|
|
7598 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
7599 |
+ (eval $ac_try) 2>&5
|
|
|
7600 |
+ ac_status=$?
|
|
|
7601 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7602 |
+ (exit $ac_status); }; }; then
|
|
|
7603 |
eval "$as_ac_var=yes"
|
|
|
7604 |
else
|
|
|
7605 |
echo "$as_me: failed program was:" >&5
|
|
|
7606 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
7607 |
|
|
|
7608 |
- eval "$as_ac_var=no"
|
|
|
7609 |
+eval "$as_ac_var=no"
|
|
|
7610 |
fi
|
|
|
7611 |
-
|
|
|
7612 |
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
|
7613 |
+rm -f conftest.err conftest.$ac_objext \
|
|
|
7614 |
conftest$ac_exeext conftest.$ac_ext
|
|
|
7615 |
fi
|
|
|
7616 |
-ac_res=`eval echo '${'$as_ac_var'}'`
|
|
|
7617 |
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
|
7618 |
-echo "${ECHO_T}$ac_res" >&6; }
|
|
|
7619 |
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
|
|
|
7620 |
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
|
|
|
7621 |
if test `eval echo '${'$as_ac_var'}'` = yes; then
|
|
|
7622 |
cat >>confdefs.h <<_ACEOF
|
|
|
7623 |
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
|
7624 |
@@ -7374,8 +6937,8 @@
|
|
|
7625 |
|
|
|
7626 |
# Extract the first word of "gmsgfmt", so it can be a program name with args.
|
|
|
7627 |
set dummy gmsgfmt; ac_word=$2
|
|
|
7628 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
7629 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
7630 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
7631 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
7632 |
if test "${ac_cv_path_GMSGFMT+set}" = set; then
|
|
|
7633 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
7634 |
else
|
|
|
7635 |
@@ -7390,7 +6953,7 @@
|
|
|
7636 |
IFS=$as_save_IFS
|
|
|
7637 |
test -z "$as_dir" && as_dir=.
|
|
|
7638 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
7639 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
|
7640 |
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
7641 |
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
|
|
|
7642 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
7643 |
break 2
|
|
|
7644 |
@@ -7397,7 +6960,6 @@
|
|
|
7645 |
fi
|
|
|
7646 |
done
|
|
|
7647 |
done
|
|
|
7648 |
-IFS=$as_save_IFS
|
|
|
7649 |
|
|
|
7650 |
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
|
|
|
7651 |
;;
|
|
|
7652 |
@@ -7404,19 +6966,19 @@
|
|
|
7653 |
esac
|
|
|
7654 |
fi
|
|
|
7655 |
GMSGFMT=$ac_cv_path_GMSGFMT
|
|
|
7656 |
+
|
|
|
7657 |
if test -n "$GMSGFMT"; then
|
|
|
7658 |
- { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
|
|
|
7659 |
-echo "${ECHO_T}$GMSGFMT" >&6; }
|
|
|
7660 |
+ echo "$as_me:$LINENO: result: $GMSGFMT" >&5
|
|
|
7661 |
+echo "${ECHO_T}$GMSGFMT" >&6
|
|
|
7662 |
else
|
|
|
7663 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
7664 |
-echo "${ECHO_T}no" >&6; }
|
|
|
7665 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
7666 |
+echo "${ECHO_T}no" >&6
|
|
|
7667 |
fi
|
|
|
7668 |
|
|
|
7669 |
-
|
|
|
7670 |
# Extract the first word of "xgettext", so it can be a program name with args.
|
|
|
7671 |
set dummy xgettext; ac_word=$2
|
|
|
7672 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
7673 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
|
7674 |
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
7675 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
7676 |
if test "${ac_cv_path_XGETTEXT+set}" = set; then
|
|
|
7677 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
7678 |
else
|
|
|
7679 |
@@ -7442,11 +7004,11 @@
|
|
|
7680 |
fi
|
|
|
7681 |
XGETTEXT="$ac_cv_path_XGETTEXT"
|
|
|
7682 |
if test "$XGETTEXT" != ":"; then
|
|
|
7683 |
- { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
|
|
|
7684 |
-echo "${ECHO_T}$XGETTEXT" >&6; }
|
|
|
7685 |
+ echo "$as_me:$LINENO: result: $XGETTEXT" >&5
|
|
|
7686 |
+echo "${ECHO_T}$XGETTEXT" >&6
|
|
|
7687 |
else
|
|
|
7688 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
7689 |
-echo "${ECHO_T}no" >&6; }
|
|
|
7690 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
7691 |
+echo "${ECHO_T}no" >&6
|
|
|
7692 |
fi
|
|
|
7693 |
|
|
|
7694 |
cat >conftest.$ac_ext <<_ACEOF
|
|
|
7695 |
@@ -7466,23 +7028,27 @@
|
|
|
7696 |
}
|
|
|
7697 |
_ACEOF
|
|
|
7698 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
7699 |
-if { (ac_try="$ac_link"
|
|
|
7700 |
-case "(($ac_try" in
|
|
|
7701 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
7702 |
- *) ac_try_echo=$ac_try;;
|
|
|
7703 |
-esac
|
|
|
7704 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
7705 |
- (eval "$ac_link") 2>conftest.er1
|
|
|
7706 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
7707 |
+ (eval $ac_link) 2>conftest.er1
|
|
|
7708 |
ac_status=$?
|
|
|
7709 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
7710 |
rm -f conftest.er1
|
|
|
7711 |
cat conftest.err >&5
|
|
|
7712 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7713 |
- (exit $ac_status); } && {
|
|
|
7714 |
- test -z "$ac_c_werror_flag" ||
|
|
|
7715 |
- test ! -s conftest.err
|
|
|
7716 |
- } && test -s conftest$ac_exeext &&
|
|
|
7717 |
- $as_test_x conftest$ac_exeext; then
|
|
|
7718 |
+ (exit $ac_status); } &&
|
|
|
7719 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
7720 |
+ || test ! -s conftest.err'
|
|
|
7721 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
7722 |
+ (eval $ac_try) 2>&5
|
|
|
7723 |
+ ac_status=$?
|
|
|
7724 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7725 |
+ (exit $ac_status); }; } &&
|
|
|
7726 |
+ { ac_try='test -s conftest$ac_exeext'
|
|
|
7727 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
7728 |
+ (eval $ac_try) 2>&5
|
|
|
7729 |
+ ac_status=$?
|
|
|
7730 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7731 |
+ (exit $ac_status); }; }; then
|
|
|
7732 |
CATOBJEXT=.gmo
|
|
|
7733 |
DATADIRNAME=share
|
|
|
7734 |
else
|
|
|
7735 |
@@ -7489,10 +7055,10 @@
|
|
|
7736 |
echo "$as_me: failed program was:" >&5
|
|
|
7737 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
7738 |
|
|
|
7739 |
- case $host in
|
|
|
7740 |
+case $host in
|
|
|
7741 |
*-*-solaris*)
|
|
|
7742 |
- { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
|
|
|
7743 |
-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
|
|
|
7744 |
+ echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
|
|
|
7745 |
+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6
|
|
|
7746 |
if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
|
|
|
7747 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
7748 |
else
|
|
|
7749 |
@@ -7519,59 +7085,68 @@
|
|
|
7750 |
|
|
|
7751 |
#undef bind_textdomain_codeset
|
|
|
7752 |
|
|
|
7753 |
-/* Override any GCC internal prototype to avoid an error.
|
|
|
7754 |
- Use char because int might match the return type of a GCC
|
|
|
7755 |
- builtin and then its argument prototype would still apply. */
|
|
|
7756 |
+/* Override any gcc2 internal prototype to avoid an error. */
|
|
|
7757 |
#ifdef __cplusplus
|
|
|
7758 |
extern "C"
|
|
|
7759 |
+{
|
|
|
7760 |
#endif
|
|
|
7761 |
+/* We use char because int might match the return type of a gcc2
|
|
|
7762 |
+ builtin and then its argument prototype would still apply. */
|
|
|
7763 |
char bind_textdomain_codeset ();
|
|
|
7764 |
/* The GNU C library defines this for functions which it implements
|
|
|
7765 |
to always fail with ENOSYS. Some functions are actually named
|
|
|
7766 |
something starting with __ and the normal name is an alias. */
|
|
|
7767 |
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
|
|
|
7768 |
+#if defined (__stub_bind_textdomain_codeset) || defined (__stub___bind_textdomain_codeset)
|
|
|
7769 |
choke me
|
|
|
7770 |
+#else
|
|
|
7771 |
+char (*f) () = bind_textdomain_codeset;
|
|
|
7772 |
#endif
|
|
|
7773 |
+#ifdef __cplusplus
|
|
|
7774 |
+}
|
|
|
7775 |
+#endif
|
|
|
7776 |
|
|
|
7777 |
int
|
|
|
7778 |
main ()
|
|
|
7779 |
{
|
|
|
7780 |
-return bind_textdomain_codeset ();
|
|
|
7781 |
+return f != bind_textdomain_codeset;
|
|
|
7782 |
;
|
|
|
7783 |
return 0;
|
|
|
7784 |
}
|
|
|
7785 |
_ACEOF
|
|
|
7786 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
7787 |
-if { (ac_try="$ac_link"
|
|
|
7788 |
-case "(($ac_try" in
|
|
|
7789 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
7790 |
- *) ac_try_echo=$ac_try;;
|
|
|
7791 |
-esac
|
|
|
7792 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
7793 |
- (eval "$ac_link") 2>conftest.er1
|
|
|
7794 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
7795 |
+ (eval $ac_link) 2>conftest.er1
|
|
|
7796 |
ac_status=$?
|
|
|
7797 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
7798 |
rm -f conftest.er1
|
|
|
7799 |
cat conftest.err >&5
|
|
|
7800 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7801 |
- (exit $ac_status); } && {
|
|
|
7802 |
- test -z "$ac_c_werror_flag" ||
|
|
|
7803 |
- test ! -s conftest.err
|
|
|
7804 |
- } && test -s conftest$ac_exeext &&
|
|
|
7805 |
- $as_test_x conftest$ac_exeext; then
|
|
|
7806 |
+ (exit $ac_status); } &&
|
|
|
7807 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
7808 |
+ || test ! -s conftest.err'
|
|
|
7809 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
7810 |
+ (eval $ac_try) 2>&5
|
|
|
7811 |
+ ac_status=$?
|
|
|
7812 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7813 |
+ (exit $ac_status); }; } &&
|
|
|
7814 |
+ { ac_try='test -s conftest$ac_exeext'
|
|
|
7815 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
7816 |
+ (eval $ac_try) 2>&5
|
|
|
7817 |
+ ac_status=$?
|
|
|
7818 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7819 |
+ (exit $ac_status); }; }; then
|
|
|
7820 |
ac_cv_func_bind_textdomain_codeset=yes
|
|
|
7821 |
else
|
|
|
7822 |
echo "$as_me: failed program was:" >&5
|
|
|
7823 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
7824 |
|
|
|
7825 |
- ac_cv_func_bind_textdomain_codeset=no
|
|
|
7826 |
+ac_cv_func_bind_textdomain_codeset=no
|
|
|
7827 |
fi
|
|
|
7828 |
-
|
|
|
7829 |
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
|
7830 |
+rm -f conftest.err conftest.$ac_objext \
|
|
|
7831 |
conftest$ac_exeext conftest.$ac_ext
|
|
|
7832 |
fi
|
|
|
7833 |
-{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
|
|
|
7834 |
-echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
|
|
|
7835 |
+echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
|
|
|
7836 |
+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6
|
|
|
7837 |
if test $ac_cv_func_bind_textdomain_codeset = yes; then
|
|
|
7838 |
CATOBJEXT=.gmo
|
|
|
7839 |
DATADIRNAME=share
|
|
|
7840 |
@@ -7587,8 +7162,7 @@
|
|
|
7841 |
;;
|
|
|
7842 |
esac
|
|
|
7843 |
fi
|
|
|
7844 |
-
|
|
|
7845 |
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
|
7846 |
+rm -f conftest.err conftest.$ac_objext \
|
|
|
7847 |
conftest$ac_exeext conftest.$ac_ext
|
|
|
7848 |
LIBS="$glib_save_LIBS"
|
|
|
7849 |
INSTOBJEXT=.mo
|
|
|
7850 |
@@ -7613,8 +7187,8 @@
|
|
|
7851 |
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
|
|
|
7852 |
: ;
|
|
|
7853 |
else
|
|
|
7854 |
- { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
|
|
|
7855 |
-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
|
|
|
7856 |
+ echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
|
|
|
7857 |
+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
|
|
|
7858 |
XGETTEXT=":"
|
|
|
7859 |
fi
|
|
|
7860 |
fi
|
|
|
7861 |
@@ -7622,7 +7196,7 @@
|
|
|
7862 |
# We need to process the po/ directory.
|
|
|
7863 |
POSUB=po
|
|
|
7864 |
|
|
|
7865 |
- ac_config_commands="$ac_config_commands default-1"
|
|
|
7866 |
+ ac_config_commands="$ac_config_commands default-1"
|
|
|
7867 |
|
|
|
7868 |
|
|
|
7869 |
for lang in $ALL_LINGUAS; do
|
|
|
7870 |
@@ -7646,8 +7220,8 @@
|
|
|
7871 |
if test "x$ALL_LINGUAS" = "x"; then
|
|
|
7872 |
LINGUAS=
|
|
|
7873 |
else
|
|
|
7874 |
- { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
|
|
|
7875 |
-echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }
|
|
|
7876 |
+ echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
|
|
|
7877 |
+echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
|
|
|
7878 |
NEW_LINGUAS=
|
|
|
7879 |
for presentlang in $ALL_LINGUAS; do
|
|
|
7880 |
useit=no
|
|
|
7881 |
@@ -7671,8 +7245,8 @@
|
|
|
7882 |
fi
|
|
|
7883 |
done
|
|
|
7884 |
LINGUAS=$NEW_LINGUAS
|
|
|
7885 |
- { echo "$as_me:$LINENO: result: $LINGUAS" >&5
|
|
|
7886 |
-echo "${ECHO_T}$LINGUAS" >&6; }
|
|
|
7887 |
+ echo "$as_me:$LINENO: result: $LINGUAS" >&5
|
|
|
7888 |
+echo "${ECHO_T}$LINGUAS" >&6
|
|
|
7889 |
fi
|
|
|
7890 |
|
|
|
7891 |
if test -n "$LINGUAS"; then
|
|
|
7892 |
@@ -7704,8 +7278,8 @@
|
|
|
7893 |
< $srcdir/po/POTFILES.in > po/POTFILES
|
|
|
7894 |
|
|
|
7895 |
|
|
|
7896 |
- { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
|
|
|
7897 |
-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
|
|
|
7898 |
+ echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
|
|
|
7899 |
+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6
|
|
|
7900 |
if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
|
|
|
7901 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
7902 |
else
|
|
|
7903 |
@@ -7732,67 +7306,77 @@
|
|
|
7904 |
|
|
|
7905 |
#undef bind_textdomain_codeset
|
|
|
7906 |
|
|
|
7907 |
-/* Override any GCC internal prototype to avoid an error.
|
|
|
7908 |
- Use char because int might match the return type of a GCC
|
|
|
7909 |
- builtin and then its argument prototype would still apply. */
|
|
|
7910 |
+/* Override any gcc2 internal prototype to avoid an error. */
|
|
|
7911 |
#ifdef __cplusplus
|
|
|
7912 |
extern "C"
|
|
|
7913 |
+{
|
|
|
7914 |
#endif
|
|
|
7915 |
+/* We use char because int might match the return type of a gcc2
|
|
|
7916 |
+ builtin and then its argument prototype would still apply. */
|
|
|
7917 |
char bind_textdomain_codeset ();
|
|
|
7918 |
/* The GNU C library defines this for functions which it implements
|
|
|
7919 |
to always fail with ENOSYS. Some functions are actually named
|
|
|
7920 |
something starting with __ and the normal name is an alias. */
|
|
|
7921 |
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
|
|
|
7922 |
+#if defined (__stub_bind_textdomain_codeset) || defined (__stub___bind_textdomain_codeset)
|
|
|
7923 |
choke me
|
|
|
7924 |
+#else
|
|
|
7925 |
+char (*f) () = bind_textdomain_codeset;
|
|
|
7926 |
#endif
|
|
|
7927 |
+#ifdef __cplusplus
|
|
|
7928 |
+}
|
|
|
7929 |
+#endif
|
|
|
7930 |
|
|
|
7931 |
int
|
|
|
7932 |
main ()
|
|
|
7933 |
{
|
|
|
7934 |
-return bind_textdomain_codeset ();
|
|
|
7935 |
+return f != bind_textdomain_codeset;
|
|
|
7936 |
;
|
|
|
7937 |
return 0;
|
|
|
7938 |
}
|
|
|
7939 |
_ACEOF
|
|
|
7940 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
7941 |
-if { (ac_try="$ac_link"
|
|
|
7942 |
-case "(($ac_try" in
|
|
|
7943 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
7944 |
- *) ac_try_echo=$ac_try;;
|
|
|
7945 |
-esac
|
|
|
7946 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
|
7947 |
- (eval "$ac_link") 2>conftest.er1
|
|
|
7948 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
|
7949 |
+ (eval $ac_link) 2>conftest.er1
|
|
|
7950 |
ac_status=$?
|
|
|
7951 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
7952 |
rm -f conftest.er1
|
|
|
7953 |
cat conftest.err >&5
|
|
|
7954 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7955 |
- (exit $ac_status); } && {
|
|
|
7956 |
- test -z "$ac_c_werror_flag" ||
|
|
|
7957 |
- test ! -s conftest.err
|
|
|
7958 |
- } && test -s conftest$ac_exeext &&
|
|
|
7959 |
- $as_test_x conftest$ac_exeext; then
|
|
|
7960 |
+ (exit $ac_status); } &&
|
|
|
7961 |
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
|
7962 |
+ || test ! -s conftest.err'
|
|
|
7963 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
7964 |
+ (eval $ac_try) 2>&5
|
|
|
7965 |
+ ac_status=$?
|
|
|
7966 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7967 |
+ (exit $ac_status); }; } &&
|
|
|
7968 |
+ { ac_try='test -s conftest$ac_exeext'
|
|
|
7969 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
|
7970 |
+ (eval $ac_try) 2>&5
|
|
|
7971 |
+ ac_status=$?
|
|
|
7972 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
7973 |
+ (exit $ac_status); }; }; then
|
|
|
7974 |
ac_cv_func_bind_textdomain_codeset=yes
|
|
|
7975 |
else
|
|
|
7976 |
echo "$as_me: failed program was:" >&5
|
|
|
7977 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
7978 |
|
|
|
7979 |
- ac_cv_func_bind_textdomain_codeset=no
|
|
|
7980 |
+ac_cv_func_bind_textdomain_codeset=no
|
|
|
7981 |
fi
|
|
|
7982 |
-
|
|
|
7983 |
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
|
7984 |
+rm -f conftest.err conftest.$ac_objext \
|
|
|
7985 |
conftest$ac_exeext conftest.$ac_ext
|
|
|
7986 |
fi
|
|
|
7987 |
-{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
|
|
|
7988 |
-echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
|
|
|
7989 |
+echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
|
|
|
7990 |
+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6
|
|
|
7991 |
|
|
|
7992 |
|
|
|
7993 |
- { echo "$as_me:$LINENO: checking for locales directory" >&5
|
|
|
7994 |
-echo $ECHO_N "checking for locales directory... $ECHO_C" >&6; }
|
|
|
7995 |
+ echo "$as_me:$LINENO: checking for locales directory" >&5
|
|
|
7996 |
+echo $ECHO_N "checking for locales directory... $ECHO_C" >&6
|
|
|
7997 |
|
|
|
7998 |
-# Check whether --with-locales-dir was given.
|
|
|
7999 |
+# Check whether --with-locales-dir or --without-locales-dir was given.
|
|
|
8000 |
if test "${with_locales_dir+set}" = set; then
|
|
|
8001 |
- withval=$with_locales_dir; localedir=$withval
|
|
|
8002 |
+ withval="$with_locales_dir"
|
|
|
8003 |
+ localedir=$withval
|
|
|
8004 |
else
|
|
|
8005 |
|
|
|
8006 |
if test x"$CATOBJEXT" = x".mo"; then
|
|
|
8007 |
@@ -7801,14 +7385,13 @@
|
|
|
8008 |
localedir=$datadir/locale
|
|
|
8009 |
fi
|
|
|
8010 |
|
|
|
8011 |
-fi
|
|
|
8012 |
+fi;
|
|
|
8013 |
+ echo "$as_me:$LINENO: result: $localedir" >&5
|
|
|
8014 |
+echo "${ECHO_T}$localedir" >&6
|
|
|
8015 |
|
|
|
8016 |
- { echo "$as_me:$LINENO: result: $localedir" >&5
|
|
|
8017 |
-echo "${ECHO_T}$localedir" >&6; }
|
|
|
8018 |
|
|
|
8019 |
-
|
|
|
8020 |
- { echo "$as_me:$LINENO: checking for additional xgettext flags" >&5
|
|
|
8021 |
-echo $ECHO_N "checking for additional xgettext flags... $ECHO_C" >&6; }
|
|
|
8022 |
+ echo "$as_me:$LINENO: checking for additional xgettext flags" >&5
|
|
|
8023 |
+echo $ECHO_N "checking for additional xgettext flags... $ECHO_C" >&6
|
|
|
8024 |
if test x"$XGETTEXT_ARGS" = x""; then
|
|
|
8025 |
XGETTEXT_ARGS="--keyword=Q_ --from-code=UTF-8";
|
|
|
8026 |
else
|
|
|
8027 |
@@ -7815,21 +7398,21 @@
|
|
|
8028 |
XGETTEXT_ARGS="$XGETTEXT_ARGS --keyword=Q_ --from-code=UTF-8";
|
|
|
8029 |
fi
|
|
|
8030 |
|
|
|
8031 |
- { echo "$as_me:$LINENO: result: $XGETTEXT_ARGS" >&5
|
|
|
8032 |
-echo "${ECHO_T}$XGETTEXT_ARGS" >&6; }
|
|
|
8033 |
+ echo "$as_me:$LINENO: result: $XGETTEXT_ARGS" >&5
|
|
|
8034 |
+echo "${ECHO_T}$XGETTEXT_ARGS" >&6
|
|
|
8035 |
|
|
|
8036 |
|
|
|
8037 |
|
|
|
8038 |
- # Check whether --enable-debug was given.
|
|
|
8039 |
+ # Check whether --enable-debug or --disable-debug was given.
|
|
|
8040 |
if test "${enable_debug+set}" = set; then
|
|
|
8041 |
- enableval=$enable_debug;
|
|
|
8042 |
+ enableval="$enable_debug"
|
|
|
8043 |
+
|
|
|
8044 |
else
|
|
|
8045 |
enable_debug=no
|
|
|
8046 |
-fi
|
|
|
8047 |
+fi;
|
|
|
8048 |
|
|
|
8049 |
-
|
|
|
8050 |
- { echo "$as_me:$LINENO: checking whether to build with debugging support" >&5
|
|
|
8051 |
-echo $ECHO_N "checking whether to build with debugging support... $ECHO_C" >&6; }
|
|
|
8052 |
+ echo "$as_me:$LINENO: checking whether to build with debugging support" >&5
|
|
|
8053 |
+echo $ECHO_N "checking whether to build with debugging support... $ECHO_C" >&6
|
|
|
8054 |
if test x"$enable_debug" != x"no"; then
|
|
|
8055 |
|
|
|
8056 |
cat >>confdefs.h <<\_ACEOF
|
|
|
8057 |
@@ -7851,25 +7434,24 @@
|
|
|
8058 |
if test x"$GCC" = x"yes"; then
|
|
|
8059 |
xdt_cv_additional_CFLAGS="-g3 -Werror $xdt_cv_additional_CFLAGS"
|
|
|
8060 |
fi
|
|
|
8061 |
- { echo "$as_me:$LINENO: result: full" >&5
|
|
|
8062 |
-echo "${ECHO_T}full" >&6; }
|
|
|
8063 |
+ echo "$as_me:$LINENO: result: full" >&5
|
|
|
8064 |
+echo "${ECHO_T}full" >&6
|
|
|
8065 |
else
|
|
|
8066 |
if test x"$GCC" = x"yes"; then
|
|
|
8067 |
xdt_cv_additional_CFLAGS="-g $xdt_cv_additional_CFLAGS"
|
|
|
8068 |
fi
|
|
|
8069 |
- { echo "$as_me:$LINENO: result: yes" >&5
|
|
|
8070 |
-echo "${ECHO_T}yes" >&6; }
|
|
|
8071 |
+ echo "$as_me:$LINENO: result: yes" >&5
|
|
|
8072 |
+echo "${ECHO_T}yes" >&6
|
|
|
8073 |
fi
|
|
|
8074 |
|
|
|
8075 |
CFLAGS="$CFLAGS $xdt_cv_additional_CFLAGS"
|
|
|
8076 |
CXXFLAGS="$CXXFLAGS $xdt_cv_additional_CFLAGS"
|
|
|
8077 |
else
|
|
|
8078 |
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
8079 |
-echo "${ECHO_T}no" >&6; }
|
|
|
8080 |
+ echo "$as_me:$LINENO: result: no" >&5
|
|
|
8081 |
+echo "${ECHO_T}no" >&6
|
|
|
8082 |
fi
|
|
|
8083 |
|
|
|
8084 |
-ac_config_files="$ac_config_files Makefile panel-plugin/Makefile po/Makefile.in"
|
|
|
8085 |
-
|
|
|
8086 |
+ ac_config_files="$ac_config_files Makefile panel-plugin/Makefile po/Makefile.in"
|
|
|
8087 |
cat >confcache <<\_ACEOF
|
|
|
8088 |
# This file is a shell script that caches the results of configure
|
|
|
8089 |
# tests run on this system so they can be shared between configure
|
|
|
8090 |
@@ -7888,58 +7470,39 @@
|
|
|
8091 |
|
|
|
8092 |
# The following way of writing the cache mishandles newlines in values,
|
|
|
8093 |
# but we know of no workaround that is simple, portable, and efficient.
|
|
|
8094 |
-# So, we kill variables containing newlines.
|
|
|
8095 |
+# So, don't put newlines in cache variables' values.
|
|
|
8096 |
# Ultrix sh set writes to stderr and can't be redirected directly,
|
|
|
8097 |
# and sets the high bit in the cache file unless we assign to the vars.
|
|
|
8098 |
-(
|
|
|
8099 |
- for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
|
|
|
8100 |
- eval ac_val=\$$ac_var
|
|
|
8101 |
- case $ac_val in #(
|
|
|
8102 |
- *${as_nl}*)
|
|
|
8103 |
- case $ac_var in #(
|
|
|
8104 |
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
|
|
|
8105 |
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
|
|
|
8106 |
- esac
|
|
|
8107 |
- case $ac_var in #(
|
|
|
8108 |
- _ | IFS | as_nl) ;; #(
|
|
|
8109 |
- *) $as_unset $ac_var ;;
|
|
|
8110 |
- esac ;;
|
|
|
8111 |
- esac
|
|
|
8112 |
- done
|
|
|
8113 |
-
|
|
|
8114 |
+{
|
|
|
8115 |
(set) 2>&1 |
|
|
|
8116 |
- case $as_nl`(ac_space=' '; set) 2>&1` in #(
|
|
|
8117 |
- *${as_nl}ac_space=\ *)
|
|
|
8118 |
+ case `(ac_space=' '; set | grep ac_space) 2>&1` in
|
|
|
8119 |
+ *ac_space=\ *)
|
|
|
8120 |
# `set' does not quote correctly, so add quotes (double-quote
|
|
|
8121 |
# substitution turns \\\\ into \\, and sed turns \\ into \).
|
|
|
8122 |
sed -n \
|
|
|
8123 |
"s/'/'\\\\''/g;
|
|
|
8124 |
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
|
|
|
8125 |
- ;; #(
|
|
|
8126 |
+ ;;
|
|
|
8127 |
*)
|
|
|
8128 |
# `set' quotes correctly as required by POSIX, so do not add quotes.
|
|
|
8129 |
- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
|
|
|
8130 |
+ sed -n \
|
|
|
8131 |
+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
|
|
|
8132 |
;;
|
|
|
8133 |
- esac |
|
|
|
8134 |
- sort
|
|
|
8135 |
-) |
|
|
|
8136 |
+ esac;
|
|
|
8137 |
+} |
|
|
|
8138 |
sed '
|
|
|
8139 |
- /^ac_cv_env_/b end
|
|
|
8140 |
t clear
|
|
|
8141 |
- :clear
|
|
|
8142 |
+ : clear
|
|
|
8143 |
s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
|
|
|
8144 |
t end
|
|
|
8145 |
- s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
|
|
|
8146 |
- :end' >>confcache
|
|
|
8147 |
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
|
|
|
8148 |
- if test -w "$cache_file"; then
|
|
|
8149 |
- test "x$cache_file" != "x/dev/null" &&
|
|
|
8150 |
- { echo "$as_me:$LINENO: updating cache $cache_file" >&5
|
|
|
8151 |
-echo "$as_me: updating cache $cache_file" >&6;}
|
|
|
8152 |
+ /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
|
|
|
8153 |
+ : end' >>confcache
|
|
|
8154 |
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
|
|
|
8155 |
+ if test -w $cache_file; then
|
|
|
8156 |
+ test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
|
|
|
8157 |
cat confcache >$cache_file
|
|
|
8158 |
else
|
|
|
8159 |
- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
|
|
|
8160 |
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
|
|
|
8161 |
+ echo "not updating unwritable cache $cache_file"
|
|
|
8162 |
fi
|
|
|
8163 |
fi
|
|
|
8164 |
rm -f confcache
|
|
|
8165 |
@@ -7948,6 +7511,21 @@
|
|
|
8166 |
# Let make expand exec_prefix.
|
|
|
8167 |
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
|
|
|
8168 |
|
|
|
8169 |
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
|
|
|
8170 |
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
|
|
|
8171 |
+# trailing colons and then remove the whole line if VPATH becomes empty
|
|
|
8172 |
+# (actually we leave an empty line to preserve line numbers).
|
|
|
8173 |
+if test "x$srcdir" = x.; then
|
|
|
8174 |
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
|
|
|
8175 |
+s/:*\$(srcdir):*/:/;
|
|
|
8176 |
+s/:*\${srcdir}:*/:/;
|
|
|
8177 |
+s/:*@srcdir@:*/:/;
|
|
|
8178 |
+s/^\([^=]*=[ ]*\):*/\1/;
|
|
|
8179 |
+s/:*$//;
|
|
|
8180 |
+s/^[^=]*=[ ]*$//;
|
|
|
8181 |
+}'
|
|
|
8182 |
+fi
|
|
|
8183 |
+
|
|
|
8184 |
DEFS=-DHAVE_CONFIG_H
|
|
|
8185 |
|
|
|
8186 |
ac_libobjs=
|
|
|
8187 |
@@ -7954,12 +7532,11 @@
|
|
|
8188 |
ac_ltlibobjs=
|
|
|
8189 |
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
|
|
|
8190 |
# 1. Remove the extension, and $U if already installed.
|
|
|
8191 |
- ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
|
|
|
8192 |
- ac_i=`echo "$ac_i" | sed "$ac_script"`
|
|
|
8193 |
- # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
|
|
|
8194 |
- # will be set to the directory where LIBOBJS objects are built.
|
|
|
8195 |
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
|
|
|
8196 |
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
|
|
|
8197 |
+ ac_i=`echo "$ac_i" |
|
|
|
8198 |
+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
|
|
|
8199 |
+ # 2. Add them.
|
|
|
8200 |
+ ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
|
|
|
8201 |
+ ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
|
|
|
8202 |
done
|
|
|
8203 |
LIBOBJS=$ac_libobjs
|
|
|
8204 |
|
|
|
8205 |
@@ -7995,7 +7572,7 @@
|
|
|
8206 |
{ (exit 1); exit 1; }; }
|
|
|
8207 |
fi
|
|
|
8208 |
|
|
|
8209 |
- ac_config_commands="$ac_config_commands po/stamp-it"
|
|
|
8210 |
+ ac_config_commands="$ac_config_commands po/stamp-it"
|
|
|
8211 |
|
|
|
8212 |
|
|
|
8213 |
if test -z "${HAVE_LIBMPD_TRUE}" && test -z "${HAVE_LIBMPD_FALSE}"; then
|
|
|
8214 |
@@ -8036,8 +7613,7 @@
|
|
|
8215 |
## M4sh Initialization. ##
|
|
|
8216 |
## --------------------- ##
|
|
|
8217 |
|
|
|
8218 |
-# Be more Bourne compatible
|
|
|
8219 |
-DUALCASE=1; export DUALCASE # for MKS sh
|
|
|
8220 |
+# Be Bourne compatible
|
|
|
8221 |
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
|
8222 |
emulate sh
|
|
|
8223 |
NULLCMD=:
|
|
|
8224 |
@@ -8044,38 +7620,11 @@
|
|
|
8225 |
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
|
|
8226 |
# is contrary to our usage. Disable this feature.
|
|
|
8227 |
alias -g '${1+"$@"}'='"$@"'
|
|
|
8228 |
- setopt NO_GLOB_SUBST
|
|
|
8229 |
-else
|
|
|
8230 |
- case `(set -o) 2>/dev/null` in
|
|
|
8231 |
- *posix*) set -o posix ;;
|
|
|
8232 |
-esac
|
|
|
8233 |
-
|
|
|
8234 |
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
|
|
|
8235 |
+ set -o posix
|
|
|
8236 |
fi
|
|
|
8237 |
+DUALCASE=1; export DUALCASE # for MKS sh
|
|
|
8238 |
|
|
|
8239 |
-
|
|
|
8240 |
-
|
|
|
8241 |
-
|
|
|
8242 |
-# PATH needs CR
|
|
|
8243 |
-# Avoid depending upon Character Ranges.
|
|
|
8244 |
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
|
8245 |
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
|
8246 |
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
|
|
8247 |
-as_cr_digits='0123456789'
|
|
|
8248 |
-as_cr_alnum=$as_cr_Letters$as_cr_digits
|
|
|
8249 |
-
|
|
|
8250 |
-# The user is always right.
|
|
|
8251 |
-if test "${PATH_SEPARATOR+set}" != set; then
|
|
|
8252 |
- echo "#! /bin/sh" >conf$$.sh
|
|
|
8253 |
- echo "exit 0" >>conf$$.sh
|
|
|
8254 |
- chmod +x conf$$.sh
|
|
|
8255 |
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
|
|
8256 |
- PATH_SEPARATOR=';'
|
|
|
8257 |
- else
|
|
|
8258 |
- PATH_SEPARATOR=:
|
|
|
8259 |
- fi
|
|
|
8260 |
- rm -f conf$$.sh
|
|
|
8261 |
-fi
|
|
|
8262 |
-
|
|
|
8263 |
# Support unset when possible.
|
|
|
8264 |
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
|
|
8265 |
as_unset=unset
|
|
|
8266 |
@@ -8084,43 +7633,8 @@
|
|
|
8267 |
fi
|
|
|
8268 |
|
|
|
8269 |
|
|
|
8270 |
-# IFS
|
|
|
8271 |
-# We need space, tab and new line, in precisely that order. Quoting is
|
|
|
8272 |
-# there to prevent editors from complaining about space-tab.
|
|
|
8273 |
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
|
|
|
8274 |
-# splitting by setting IFS to empty value.)
|
|
|
8275 |
-as_nl='
|
|
|
8276 |
-'
|
|
|
8277 |
-IFS=" "" $as_nl"
|
|
|
8278 |
-
|
|
|
8279 |
-# Find who we are. Look in the path if we contain no directory separator.
|
|
|
8280 |
-case $0 in
|
|
|
8281 |
- *[\\/]* ) as_myself=$0 ;;
|
|
|
8282 |
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
|
8283 |
-for as_dir in $PATH
|
|
|
8284 |
-do
|
|
|
8285 |
- IFS=$as_save_IFS
|
|
|
8286 |
- test -z "$as_dir" && as_dir=.
|
|
|
8287 |
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
|
|
8288 |
-done
|
|
|
8289 |
-IFS=$as_save_IFS
|
|
|
8290 |
-
|
|
|
8291 |
- ;;
|
|
|
8292 |
-esac
|
|
|
8293 |
-# We did not find ourselves, most probably we were run as `sh COMMAND'
|
|
|
8294 |
-# in which case we are not to be found in the path.
|
|
|
8295 |
-if test "x$as_myself" = x; then
|
|
|
8296 |
- as_myself=$0
|
|
|
8297 |
-fi
|
|
|
8298 |
-if test ! -f "$as_myself"; then
|
|
|
8299 |
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
|
|
8300 |
- { (exit 1); exit 1; }
|
|
|
8301 |
-fi
|
|
|
8302 |
-
|
|
|
8303 |
# Work around bugs in pre-3.0 UWIN ksh.
|
|
|
8304 |
-for as_var in ENV MAIL MAILPATH
|
|
|
8305 |
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
|
8306 |
-done
|
|
|
8307 |
+$as_unset ENV MAIL MAILPATH
|
|
|
8308 |
PS1='$ '
|
|
|
8309 |
PS2='> '
|
|
|
8310 |
PS4='+ '
|
|
|
8311 |
@@ -8134,19 +7648,18 @@
|
|
|
8312 |
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
|
|
|
8313 |
eval $as_var=C; export $as_var
|
|
|
8314 |
else
|
|
|
8315 |
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
|
8316 |
+ $as_unset $as_var
|
|
|
8317 |
fi
|
|
|
8318 |
done
|
|
|
8319 |
|
|
|
8320 |
# Required to use basename.
|
|
|
8321 |
-if expr a : '\(a\)' >/dev/null 2>&1 &&
|
|
|
8322 |
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
|
|
8323 |
+if expr a : '\(a\)' >/dev/null 2>&1; then
|
|
|
8324 |
as_expr=expr
|
|
|
8325 |
else
|
|
|
8326 |
as_expr=false
|
|
|
8327 |
fi
|
|
|
8328 |
|
|
|
8329 |
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
|
|
|
8330 |
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
|
|
|
8331 |
as_basename=basename
|
|
|
8332 |
else
|
|
|
8333 |
as_basename=false
|
|
|
8334 |
@@ -8154,92 +7667,137 @@
|
|
|
8335 |
|
|
|
8336 |
|
|
|
8337 |
# Name of the executable.
|
|
|
8338 |
-as_me=`$as_basename -- "$0" ||
|
|
|
8339 |
+as_me=`$as_basename "$0" ||
|
|
|
8340 |
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
|
|
8341 |
X"$0" : 'X\(//\)$' \| \
|
|
|
8342 |
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
|
|
8343 |
+ X"$0" : 'X\(/\)$' \| \
|
|
|
8344 |
+ . : '\(.\)' 2>/dev/null ||
|
|
|
8345 |
echo X/"$0" |
|
|
|
8346 |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
|
|
|
8347 |
- s//\1/
|
|
|
8348 |
- q
|
|
|
8349 |
- }
|
|
|
8350 |
- /^X\/\(\/\/\)$/{
|
|
|
8351 |
- s//\1/
|
|
|
8352 |
- q
|
|
|
8353 |
- }
|
|
|
8354 |
- /^X\/\(\/\).*/{
|
|
|
8355 |
- s//\1/
|
|
|
8356 |
- q
|
|
|
8357 |
- }
|
|
|
8358 |
- s/.*/./; q'`
|
|
|
8359 |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
|
|
|
8360 |
+ /^X\/\(\/\/\)$/{ s//\1/; q; }
|
|
|
8361 |
+ /^X\/\(\/\).*/{ s//\1/; q; }
|
|
|
8362 |
+ s/.*/./; q'`
|
|
|
8363 |
|
|
|
8364 |
-# CDPATH.
|
|
|
8365 |
-$as_unset CDPATH
|
|
|
8366 |
|
|
|
8367 |
+# PATH needs CR, and LINENO needs CR and PATH.
|
|
|
8368 |
+# Avoid depending upon Character Ranges.
|
|
|
8369 |
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
|
8370 |
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
|
8371 |
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
|
|
8372 |
+as_cr_digits='0123456789'
|
|
|
8373 |
+as_cr_alnum=$as_cr_Letters$as_cr_digits
|
|
|
8374 |
|
|
|
8375 |
+# The user is always right.
|
|
|
8376 |
+if test "${PATH_SEPARATOR+set}" != set; then
|
|
|
8377 |
+ echo "#! /bin/sh" >conf$$.sh
|
|
|
8378 |
+ echo "exit 0" >>conf$$.sh
|
|
|
8379 |
+ chmod +x conf$$.sh
|
|
|
8380 |
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
|
|
8381 |
+ PATH_SEPARATOR=';'
|
|
|
8382 |
+ else
|
|
|
8383 |
+ PATH_SEPARATOR=:
|
|
|
8384 |
+ fi
|
|
|
8385 |
+ rm -f conf$$.sh
|
|
|
8386 |
+fi
|
|
|
8387 |
|
|
|
8388 |
+
|
|
|
8389 |
as_lineno_1=$LINENO
|
|
|
8390 |
as_lineno_2=$LINENO
|
|
|
8391 |
+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
|
|
|
8392 |
test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
|
8393 |
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
|
|
|
8394 |
+ test "x$as_lineno_3" = "x$as_lineno_2" || {
|
|
|
8395 |
+ # Find who we are. Look in the path if we contain no path at all
|
|
|
8396 |
+ # relative or not.
|
|
|
8397 |
+ case $0 in
|
|
|
8398 |
+ *[\\/]* ) as_myself=$0 ;;
|
|
|
8399 |
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
|
8400 |
+for as_dir in $PATH
|
|
|
8401 |
+do
|
|
|
8402 |
+ IFS=$as_save_IFS
|
|
|
8403 |
+ test -z "$as_dir" && as_dir=.
|
|
|
8404 |
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
|
|
8405 |
+done
|
|
|
8406 |
|
|
|
8407 |
+ ;;
|
|
|
8408 |
+ esac
|
|
|
8409 |
+ # We did not find ourselves, most probably we were run as `sh COMMAND'
|
|
|
8410 |
+ # in which case we are not to be found in the path.
|
|
|
8411 |
+ if test "x$as_myself" = x; then
|
|
|
8412 |
+ as_myself=$0
|
|
|
8413 |
+ fi
|
|
|
8414 |
+ if test ! -f "$as_myself"; then
|
|
|
8415 |
+ { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
|
|
|
8416 |
+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
|
|
|
8417 |
+ { (exit 1); exit 1; }; }
|
|
|
8418 |
+ fi
|
|
|
8419 |
+ case $CONFIG_SHELL in
|
|
|
8420 |
+ '')
|
|
|
8421 |
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
|
8422 |
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
|
|
|
8423 |
+do
|
|
|
8424 |
+ IFS=$as_save_IFS
|
|
|
8425 |
+ test -z "$as_dir" && as_dir=.
|
|
|
8426 |
+ for as_base in sh bash ksh sh5; do
|
|
|
8427 |
+ case $as_dir in
|
|
|
8428 |
+ /*)
|
|
|
8429 |
+ if ("$as_dir/$as_base" -c '
|
|
|
8430 |
+ as_lineno_1=$LINENO
|
|
|
8431 |
+ as_lineno_2=$LINENO
|
|
|
8432 |
+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
|
|
|
8433 |
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
|
8434 |
+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
|
|
|
8435 |
+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
|
|
|
8436 |
+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
|
|
|
8437 |
+ CONFIG_SHELL=$as_dir/$as_base
|
|
|
8438 |
+ export CONFIG_SHELL
|
|
|
8439 |
+ exec "$CONFIG_SHELL" "$0" ${1+"$@"}
|
|
|
8440 |
+ fi;;
|
|
|
8441 |
+ esac
|
|
|
8442 |
+ done
|
|
|
8443 |
+done
|
|
|
8444 |
+;;
|
|
|
8445 |
+ esac
|
|
|
8446 |
+
|
|
|
8447 |
# Create $as_me.lineno as a copy of $as_myself, but with $LINENO
|
|
|
8448 |
# uniformly replaced by the line number. The first 'sed' inserts a
|
|
|
8449 |
- # line-number line after each line using $LINENO; the second 'sed'
|
|
|
8450 |
- # does the real work. The second script uses 'N' to pair each
|
|
|
8451 |
- # line-number line with the line containing $LINENO, and appends
|
|
|
8452 |
- # trailing '-' during substitution so that $LINENO is not a special
|
|
|
8453 |
- # case at line end.
|
|
|
8454 |
+ # line-number line before each line; the second 'sed' does the real
|
|
|
8455 |
+ # work. The second script uses 'N' to pair each line-number line
|
|
|
8456 |
+ # with the numbered line, and appends trailing '-' during
|
|
|
8457 |
+ # substitution so that $LINENO is not a special case at line end.
|
|
|
8458 |
# (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
|
|
|
8459 |
- # scripts with optimization help from Paolo Bonzini. Blame Lee
|
|
|
8460 |
- # E. McMahon (1931-1989) for sed's syntax. :-)
|
|
|
8461 |
- sed -n '
|
|
|
8462 |
- p
|
|
|
8463 |
- /[$]LINENO/=
|
|
|
8464 |
- ' <$as_myself |
|
|
|
8465 |
+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
|
|
|
8466 |
+ sed '=' <$as_myself |
|
|
|
8467 |
sed '
|
|
|
8468 |
- s/[$]LINENO.*/&-/
|
|
|
8469 |
- t lineno
|
|
|
8470 |
- b
|
|
|
8471 |
- :lineno
|
|
|
8472 |
N
|
|
|
8473 |
- :loop
|
|
|
8474 |
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
|
|
|
8475 |
+ s,$,-,
|
|
|
8476 |
+ : loop
|
|
|
8477 |
+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
|
|
|
8478 |
t loop
|
|
|
8479 |
- s/-\n.*//
|
|
|
8480 |
+ s,-$,,
|
|
|
8481 |
+ s,^['$as_cr_digits']*\n,,
|
|
|
8482 |
' >$as_me.lineno &&
|
|
|
8483 |
- chmod +x "$as_me.lineno" ||
|
|
|
8484 |
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
|
|
|
8485 |
+ chmod +x $as_me.lineno ||
|
|
|
8486 |
+ { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
|
|
|
8487 |
+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
|
|
|
8488 |
{ (exit 1); exit 1; }; }
|
|
|
8489 |
|
|
|
8490 |
# Don't try to exec as it changes $[0], causing all sort of problems
|
|
|
8491 |
# (the dirname of $[0] is not the place where we might find the
|
|
|
8492 |
- # original and so on. Autoconf is especially sensitive to this).
|
|
|
8493 |
- . "./$as_me.lineno"
|
|
|
8494 |
+ # original and so on. Autoconf is especially sensible to this).
|
|
|
8495 |
+ . ./$as_me.lineno
|
|
|
8496 |
# Exit status is that of the last command.
|
|
|
8497 |
exit
|
|
|
8498 |
}
|
|
|
8499 |
|
|
|
8500 |
|
|
|
8501 |
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
|
|
8502 |
- as_dirname=dirname
|
|
|
8503 |
-else
|
|
|
8504 |
- as_dirname=false
|
|
|
8505 |
-fi
|
|
|
8506 |
-
|
|
|
8507 |
-ECHO_C= ECHO_N= ECHO_T=
|
|
|
8508 |
-case `echo -n x` in
|
|
|
8509 |
--n*)
|
|
|
8510 |
- case `echo 'x\c'` in
|
|
|
8511 |
- *c*) ECHO_T=' ';; # ECHO_T is single tab character.
|
|
|
8512 |
- *) ECHO_C='\c';;
|
|
|
8513 |
- esac;;
|
|
|
8514 |
-*)
|
|
|
8515 |
- ECHO_N='-n';;
|
|
|
8516 |
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
|
|
|
8517 |
+ *c*,-n*) ECHO_N= ECHO_C='
|
|
|
8518 |
+' ECHO_T=' ' ;;
|
|
|
8519 |
+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
|
|
|
8520 |
+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
|
|
|
8521 |
esac
|
|
|
8522 |
|
|
|
8523 |
-if expr a : '\(a\)' >/dev/null 2>&1 &&
|
|
|
8524 |
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
|
|
8525 |
+if expr a : '\(a\)' >/dev/null 2>&1; then
|
|
|
8526 |
as_expr=expr
|
|
|
8527 |
else
|
|
|
8528 |
as_expr=false
|
|
|
8529 |
@@ -8246,28 +7804,22 @@
|
|
|
8530 |
fi
|
|
|
8531 |
|
|
|
8532 |
rm -f conf$$ conf$$.exe conf$$.file
|
|
|
8533 |
-if test -d conf$$.dir; then
|
|
|
8534 |
- rm -f conf$$.dir/conf$$.file
|
|
|
8535 |
-else
|
|
|
8536 |
- rm -f conf$$.dir
|
|
|
8537 |
- mkdir conf$$.dir
|
|
|
8538 |
-fi
|
|
|
8539 |
echo >conf$$.file
|
|
|
8540 |
if ln -s conf$$.file conf$$ 2>/dev/null; then
|
|
|
8541 |
- as_ln_s='ln -s'
|
|
|
8542 |
- # ... but there are two gotchas:
|
|
|
8543 |
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
|
|
8544 |
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
|
|
8545 |
- # In both cases, we have to default to `cp -p'.
|
|
|
8546 |
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
|
|
8547 |
+ # We could just check for DJGPP; but this test a) works b) is more generic
|
|
|
8548 |
+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
|
|
|
8549 |
+ if test -f conf$$.exe; then
|
|
|
8550 |
+ # Don't use ln at all; we don't have any links
|
|
|
8551 |
as_ln_s='cp -p'
|
|
|
8552 |
+ else
|
|
|
8553 |
+ as_ln_s='ln -s'
|
|
|
8554 |
+ fi
|
|
|
8555 |
elif ln conf$$.file conf$$ 2>/dev/null; then
|
|
|
8556 |
as_ln_s=ln
|
|
|
8557 |
else
|
|
|
8558 |
as_ln_s='cp -p'
|
|
|
8559 |
fi
|
|
|
8560 |
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
|
|
|
8561 |
-rmdir conf$$.dir 2>/dev/null
|
|
|
8562 |
+rm -f conf$$ conf$$.exe conf$$.file
|
|
|
8563 |
|
|
|
8564 |
if mkdir -p . 2>/dev/null; then
|
|
|
8565 |
as_mkdir_p=:
|
|
|
8566 |
@@ -8276,28 +7828,7 @@
|
|
|
8567 |
as_mkdir_p=false
|
|
|
8568 |
fi
|
|
|
8569 |
|
|
|
8570 |
-if test -x / >/dev/null 2>&1; then
|
|
|
8571 |
- as_test_x='test -x'
|
|
|
8572 |
-else
|
|
|
8573 |
- if ls -dL / >/dev/null 2>&1; then
|
|
|
8574 |
- as_ls_L_option=L
|
|
|
8575 |
- else
|
|
|
8576 |
- as_ls_L_option=
|
|
|
8577 |
- fi
|
|
|
8578 |
- as_test_x='
|
|
|
8579 |
- eval sh -c '\''
|
|
|
8580 |
- if test -d "$1"; then
|
|
|
8581 |
- test -d "$1/.";
|
|
|
8582 |
- else
|
|
|
8583 |
- case $1 in
|
|
|
8584 |
- -*)set "./$1";;
|
|
|
8585 |
- esac;
|
|
|
8586 |
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
|
|
|
8587 |
- ???[sx]*):;;*)false;;esac;fi
|
|
|
8588 |
- '\'' sh
|
|
|
8589 |
- '
|
|
|
8590 |
-fi
|
|
|
8591 |
-as_executable_p=$as_test_x
|
|
|
8592 |
+as_executable_p="test -f"
|
|
|
8593 |
|
|
|
8594 |
# Sed expression to map a string onto a valid CPP name.
|
|
|
8595 |
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
|
|
|
8596 |
@@ -8306,14 +7837,31 @@
|
|
|
8597 |
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
|
|
|
8598 |
|
|
|
8599 |
|
|
|
8600 |
+# IFS
|
|
|
8601 |
+# We need space, tab and new line, in precisely that order.
|
|
|
8602 |
+as_nl='
|
|
|
8603 |
+'
|
|
|
8604 |
+IFS=" $as_nl"
|
|
|
8605 |
+
|
|
|
8606 |
+# CDPATH.
|
|
|
8607 |
+$as_unset CDPATH
|
|
|
8608 |
+
|
|
|
8609 |
exec 6>&1
|
|
|
8610 |
|
|
|
8611 |
-# Save the log message, to keep $[0] and so on meaningful, and to
|
|
|
8612 |
+# Open the log real soon, to keep \$[0] and so on meaningful, and to
|
|
|
8613 |
# report actual input values of CONFIG_FILES etc. instead of their
|
|
|
8614 |
-# values after options handling.
|
|
|
8615 |
-ac_log="
|
|
|
8616 |
+# values after options handling. Logging --version etc. is OK.
|
|
|
8617 |
+exec 5>>config.log
|
|
|
8618 |
+{
|
|
|
8619 |
+ echo
|
|
|
8620 |
+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
|
|
|
8621 |
+## Running $as_me. ##
|
|
|
8622 |
+_ASBOX
|
|
|
8623 |
+} >&5
|
|
|
8624 |
+cat >&5 <<_CSEOF
|
|
|
8625 |
+
|
|
|
8626 |
This file was extended by xfce4-mpc-plugin $as_me 0.3.1, which was
|
|
|
8627 |
-generated by GNU Autoconf 2.61. Invocation command line was
|
|
|
8628 |
+generated by GNU Autoconf 2.59. Invocation command line was
|
|
|
8629 |
|
|
|
8630 |
CONFIG_FILES = $CONFIG_FILES
|
|
|
8631 |
CONFIG_HEADERS = $CONFIG_HEADERS
|
|
|
8632 |
@@ -8321,20 +7869,30 @@
|
|
|
8633 |
CONFIG_COMMANDS = $CONFIG_COMMANDS
|
|
|
8634 |
$ $0 $@
|
|
|
8635 |
|
|
|
8636 |
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
|
|
|
8637 |
-"
|
|
|
8638 |
-
|
|
|
8639 |
+_CSEOF
|
|
|
8640 |
+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
|
|
|
8641 |
+echo >&5
|
|
|
8642 |
_ACEOF
|
|
|
8643 |
|
|
|
8644 |
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
|
8645 |
# Files that config.status was made for.
|
|
|
8646 |
-config_files="$ac_config_files"
|
|
|
8647 |
-config_headers="$ac_config_headers"
|
|
|
8648 |
-config_commands="$ac_config_commands"
|
|
|
8649 |
+if test -n "$ac_config_files"; then
|
|
|
8650 |
+ echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
|
|
|
8651 |
+fi
|
|
|
8652 |
|
|
|
8653 |
-_ACEOF
|
|
|
8654 |
+if test -n "$ac_config_headers"; then
|
|
|
8655 |
+ echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
|
|
|
8656 |
+fi
|
|
|
8657 |
|
|
|
8658 |
+if test -n "$ac_config_links"; then
|
|
|
8659 |
+ echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
|
|
|
8660 |
+fi
|
|
|
8661 |
+
|
|
|
8662 |
+if test -n "$ac_config_commands"; then
|
|
|
8663 |
+ echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
|
|
|
8664 |
+fi
|
|
|
8665 |
+
|
|
|
8666 |
cat >>$CONFIG_STATUS <<\_ACEOF
|
|
|
8667 |
+
|
|
|
8668 |
ac_cs_usage="\
|
|
|
8669 |
\`$as_me' instantiates files from templates according to the
|
|
|
8670 |
current configuration.
|
|
|
8671 |
@@ -8342,7 +7900,7 @@
|
|
|
8672 |
Usage: $0 [OPTIONS] [FILE]...
|
|
|
8673 |
|
|
|
8674 |
-h, --help print this help, then exit
|
|
|
8675 |
- -V, --version print version number and configuration settings, then exit
|
|
|
8676 |
+ -V, --version print version number, then exit
|
|
|
8677 |
-q, --quiet do not print progress messages
|
|
|
8678 |
-d, --debug don't remove temporary files
|
|
|
8679 |
--recheck update $as_me by reconfiguring in the same conditions
|
|
|
8680 |
@@ -8361,21 +7919,19 @@
|
|
|
8681 |
$config_commands
|
|
|
8682 |
|
|
|
8683 |
Report bugs to <[email protected]>."
|
|
|
8684 |
-
|
|
|
8685 |
_ACEOF
|
|
|
8686 |
+
|
|
|
8687 |
cat >>$CONFIG_STATUS <<_ACEOF
|
|
|
8688 |
ac_cs_version="\\
|
|
|
8689 |
xfce4-mpc-plugin config.status 0.3.1
|
|
|
8690 |
-configured by $0, generated by GNU Autoconf 2.61,
|
|
|
8691 |
- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
|
|
8692 |
+configured by $0, generated by GNU Autoconf 2.59,
|
|
|
8693 |
+ with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
|
|
|
8694 |
|
|
|
8695 |
-Copyright (C) 2006 Free Software Foundation, Inc.
|
|
|
8696 |
+Copyright (C) 2003 Free Software Foundation, Inc.
|
|
|
8697 |
This config.status script is free software; the Free Software Foundation
|
|
|
8698 |
gives unlimited permission to copy, distribute and modify it."
|
|
|
8699 |
-
|
|
|
8700 |
-ac_pwd='$ac_pwd'
|
|
|
8701 |
-srcdir='$srcdir'
|
|
|
8702 |
-INSTALL='$INSTALL'
|
|
|
8703 |
+srcdir=$srcdir
|
|
|
8704 |
+INSTALL="$INSTALL"
|
|
|
8705 |
_ACEOF
|
|
|
8706 |
|
|
|
8707 |
cat >>$CONFIG_STATUS <<\_ACEOF
|
|
|
8708 |
@@ -8386,24 +7942,39 @@
|
|
|
8709 |
do
|
|
|
8710 |
case $1 in
|
|
|
8711 |
--*=*)
|
|
|
8712 |
- ac_option=`expr "X$1" : 'X\([^=]*\)='`
|
|
|
8713 |
- ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
|
|
|
8714 |
+ ac_option=`expr "x$1" : 'x\([^=]*\)='`
|
|
|
8715 |
+ ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
|
|
|
8716 |
ac_shift=:
|
|
|
8717 |
;;
|
|
|
8718 |
- *)
|
|
|
8719 |
+ -*)
|
|
|
8720 |
ac_option=$1
|
|
|
8721 |
ac_optarg=$2
|
|
|
8722 |
ac_shift=shift
|
|
|
8723 |
;;
|
|
|
8724 |
+ *) # This is not an option, so the user has probably given explicit
|
|
|
8725 |
+ # arguments.
|
|
|
8726 |
+ ac_option=$1
|
|
|
8727 |
+ ac_need_defaults=false;;
|
|
|
8728 |
esac
|
|
|
8729 |
|
|
|
8730 |
case $ac_option in
|
|
|
8731 |
# Handling of the options.
|
|
|
8732 |
+_ACEOF
|
|
|
8733 |
+cat >>$CONFIG_STATUS <<\_ACEOF
|
|
|
8734 |
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
|
|
|
8735 |
ac_cs_recheck=: ;;
|
|
|
8736 |
- --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
|
|
|
8737 |
- echo "$ac_cs_version"; exit ;;
|
|
|
8738 |
- --debug | --debu | --deb | --de | --d | -d )
|
|
|
8739 |
+ --version | --vers* | -V )
|
|
|
8740 |
+ echo "$ac_cs_version"; exit 0 ;;
|
|
|
8741 |
+ --he | --h)
|
|
|
8742 |
+ # Conflict between --help and --header
|
|
|
8743 |
+ { { echo "$as_me:$LINENO: error: ambiguous option: $1
|
|
|
8744 |
+Try \`$0 --help' for more information." >&5
|
|
|
8745 |
+echo "$as_me: error: ambiguous option: $1
|
|
|
8746 |
+Try \`$0 --help' for more information." >&2;}
|
|
|
8747 |
+ { (exit 1); exit 1; }; };;
|
|
|
8748 |
+ --help | --hel | -h )
|
|
|
8749 |
+ echo "$ac_cs_usage"; exit 0 ;;
|
|
|
8750 |
+ --debug | --d* | -d )
|
|
|
8751 |
debug=: ;;
|
|
|
8752 |
--file | --fil | --fi | --f )
|
|
|
8753 |
$ac_shift
|
|
|
8754 |
@@ -8413,24 +7984,18 @@
|
|
|
8755 |
$ac_shift
|
|
|
8756 |
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
|
|
|
8757 |
ac_need_defaults=false;;
|
|
|
8758 |
- --he | --h)
|
|
|
8759 |
- # Conflict between --help and --header
|
|
|
8760 |
- { echo "$as_me: error: ambiguous option: $1
|
|
|
8761 |
-Try \`$0 --help' for more information." >&2
|
|
|
8762 |
- { (exit 1); exit 1; }; };;
|
|
|
8763 |
- --help | --hel | -h )
|
|
|
8764 |
- echo "$ac_cs_usage"; exit ;;
|
|
|
8765 |
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
|
|
|
8766 |
| -silent | --silent | --silen | --sile | --sil | --si | --s)
|
|
|
8767 |
ac_cs_silent=: ;;
|
|
|
8768 |
|
|
|
8769 |
# This is an error.
|
|
|
8770 |
- -*) { echo "$as_me: error: unrecognized option: $1
|
|
|
8771 |
-Try \`$0 --help' for more information." >&2
|
|
|
8772 |
+ -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
|
|
|
8773 |
+Try \`$0 --help' for more information." >&5
|
|
|
8774 |
+echo "$as_me: error: unrecognized option: $1
|
|
|
8775 |
+Try \`$0 --help' for more information." >&2;}
|
|
|
8776 |
{ (exit 1); exit 1; }; } ;;
|
|
|
8777 |
|
|
|
8778 |
- *) ac_config_targets="$ac_config_targets $1"
|
|
|
8779 |
- ac_need_defaults=false ;;
|
|
|
8780 |
+ *) ac_config_targets="$ac_config_targets $1" ;;
|
|
|
8781 |
|
|
|
8782 |
esac
|
|
|
8783 |
shift
|
|
|
8784 |
@@ -8446,28 +8011,17 @@
|
|
|
8785 |
_ACEOF
|
|
|
8786 |
cat >>$CONFIG_STATUS <<_ACEOF
|
|
|
8787 |
if \$ac_cs_recheck; then
|
|
|
8788 |
- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
|
|
|
8789 |
- CONFIG_SHELL=$SHELL
|
|
|
8790 |
- export CONFIG_SHELL
|
|
|
8791 |
- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
|
|
|
8792 |
+ echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
|
|
|
8793 |
+ exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
|
|
|
8794 |
fi
|
|
|
8795 |
|
|
|
8796 |
_ACEOF
|
|
|
8797 |
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
|
8798 |
-exec 5>>config.log
|
|
|
8799 |
-{
|
|
|
8800 |
- echo
|
|
|
8801 |
- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
|
|
|
8802 |
-## Running $as_me. ##
|
|
|
8803 |
-_ASBOX
|
|
|
8804 |
- echo "$ac_log"
|
|
|
8805 |
-} >&5
|
|
|
8806 |
|
|
|
8807 |
-_ACEOF
|
|
|
8808 |
cat >>$CONFIG_STATUS <<_ACEOF
|
|
|
8809 |
#
|
|
|
8810 |
-# INIT-COMMANDS
|
|
|
8811 |
+# INIT-COMMANDS section.
|
|
|
8812 |
#
|
|
|
8813 |
+
|
|
|
8814 |
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
|
|
|
8815 |
INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
|
|
|
8816 |
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
|
|
|
8817 |
@@ -8478,21 +8032,21 @@
|
|
|
8818 |
|
|
|
8819 |
_ACEOF
|
|
|
8820 |
|
|
|
8821 |
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
|
8822 |
|
|
|
8823 |
-# Handling of arguments.
|
|
|
8824 |
+
|
|
|
8825 |
+cat >>$CONFIG_STATUS <<\_ACEOF
|
|
|
8826 |
for ac_config_target in $ac_config_targets
|
|
|
8827 |
do
|
|
|
8828 |
- case $ac_config_target in
|
|
|
8829 |
- "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
|
|
|
8830 |
- "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
|
|
|
8831 |
- "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
|
|
|
8832 |
- "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
|
|
|
8833 |
- "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
|
|
8834 |
- "panel-plugin/Makefile") CONFIG_FILES="$CONFIG_FILES panel-plugin/Makefile" ;;
|
|
|
8835 |
- "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
|
|
|
8836 |
- "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
|
|
|
8837 |
-
|
|
|
8838 |
+ case "$ac_config_target" in
|
|
|
8839 |
+ # Handling of arguments.
|
|
|
8840 |
+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
|
|
8841 |
+ "panel-plugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES panel-plugin/Makefile" ;;
|
|
|
8842 |
+ "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
|
|
|
8843 |
+ "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
|
|
|
8844 |
+ "intltool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
|
|
|
8845 |
+ "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
|
|
|
8846 |
+ "po/stamp-it" ) CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
|
|
|
8847 |
+ "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
|
|
|
8848 |
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
|
|
8849 |
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
|
|
8850 |
{ (exit 1); exit 1; }; };;
|
|
|
8851 |
@@ -8499,7 +8053,6 @@
|
|
|
8852 |
esac
|
|
|
8853 |
done
|
|
|
8854 |
|
|
|
8855 |
-
|
|
|
8856 |
# If the user did not use the arguments to specify the items to instantiate,
|
|
|
8857 |
# then the envvar interface is used. Set only those that are not.
|
|
|
8858 |
# We use the long form for the default assignment because of an extremely
|
|
|
8859 |
@@ -8511,28 +8064,24 @@
|
|
|
8860 |
fi
|
|
|
8861 |
|
|
|
8862 |
# Have a temporary directory for convenience. Make it in the build tree
|
|
|
8863 |
-# simply because there is no reason against having it here, and in addition,
|
|
|
8864 |
+# simply because there is no reason to put it here, and in addition,
|
|
|
8865 |
# creating and moving files from /tmp can sometimes cause problems.
|
|
|
8866 |
-# Hook for its removal unless debugging.
|
|
|
8867 |
-# Note that there is a small window in which the directory will not be cleaned:
|
|
|
8868 |
-# after its creation but before its name has been assigned to `$tmp'.
|
|
|
8869 |
+# Create a temporary directory, and hook for its removal unless debugging.
|
|
|
8870 |
$debug ||
|
|
|
8871 |
{
|
|
|
8872 |
- tmp=
|
|
|
8873 |
- trap 'exit_status=$?
|
|
|
8874 |
- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
|
|
|
8875 |
-' 0
|
|
|
8876 |
+ trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
|
|
|
8877 |
trap '{ (exit 1); exit 1; }' 1 2 13 15
|
|
|
8878 |
}
|
|
|
8879 |
+
|
|
|
8880 |
# Create a (secure) tmp directory for tmp files.
|
|
|
8881 |
|
|
|
8882 |
{
|
|
|
8883 |
- tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
|
|
|
8884 |
+ tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
|
|
|
8885 |
test -n "$tmp" && test -d "$tmp"
|
|
|
8886 |
} ||
|
|
|
8887 |
{
|
|
|
8888 |
- tmp=./conf$$-$RANDOM
|
|
|
8889 |
- (umask 077 && mkdir "$tmp")
|
|
|
8890 |
+ tmp=./confstat$$-$RANDOM
|
|
|
8891 |
+ (umask 077 && mkdir $tmp)
|
|
|
8892 |
} ||
|
|
|
8893 |
{
|
|
|
8894 |
echo "$me: cannot create a temporary directory in ." >&2
|
|
|
8895 |
@@ -8539,470 +8088,368 @@
|
|
|
8896 |
{ (exit 1); exit 1; }
|
|
|
8897 |
}
|
|
|
8898 |
|
|
|
8899 |
+_ACEOF
|
|
|
8900 |
+
|
|
|
8901 |
+cat >>$CONFIG_STATUS <<_ACEOF
|
|
|
8902 |
+
|
|
|
8903 |
#
|
|
|
8904 |
-# Set up the sed scripts for CONFIG_FILES section.
|
|
|
8905 |
+# CONFIG_FILES section.
|
|
|
8906 |
#
|
|
|
8907 |
|
|
|
8908 |
# No need to generate the scripts if there are no CONFIG_FILES.
|
|
|
8909 |
# This happens for instance when ./config.status config.h
|
|
|
8910 |
-if test -n "$CONFIG_FILES"; then
|
|
|
8911 |
+if test -n "\$CONFIG_FILES"; then
|
|
|
8912 |
+ # Protect against being on the right side of a sed subst in config.status.
|
|
|
8913 |
+ sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
|
|
|
8914 |
+ s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
|
|
|
8915 |
+s,@SHELL@,$SHELL,;t t
|
|
|
8916 |
+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
|
|
|
8917 |
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
|
|
|
8918 |
+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
|
|
|
8919 |
+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
|
|
|
8920 |
+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
|
|
|
8921 |
+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
|
|
|
8922 |
+s,@exec_prefix@,$exec_prefix,;t t
|
|
|
8923 |
+s,@prefix@,$prefix,;t t
|
|
|
8924 |
+s,@program_transform_name@,$program_transform_name,;t t
|
|
|
8925 |
+s,@bindir@,$bindir,;t t
|
|
|
8926 |
+s,@sbindir@,$sbindir,;t t
|
|
|
8927 |
+s,@libexecdir@,$libexecdir,;t t
|
|
|
8928 |
+s,@datadir@,$datadir,;t t
|
|
|
8929 |
+s,@sysconfdir@,$sysconfdir,;t t
|
|
|
8930 |
+s,@sharedstatedir@,$sharedstatedir,;t t
|
|
|
8931 |
+s,@localstatedir@,$localstatedir,;t t
|
|
|
8932 |
+s,@libdir@,$libdir,;t t
|
|
|
8933 |
+s,@includedir@,$includedir,;t t
|
|
|
8934 |
+s,@oldincludedir@,$oldincludedir,;t t
|
|
|
8935 |
+s,@infodir@,$infodir,;t t
|
|
|
8936 |
+s,@mandir@,$mandir,;t t
|
|
|
8937 |
+s,@build_alias@,$build_alias,;t t
|
|
|
8938 |
+s,@host_alias@,$host_alias,;t t
|
|
|
8939 |
+s,@target_alias@,$target_alias,;t t
|
|
|
8940 |
+s,@DEFS@,$DEFS,;t t
|
|
|
8941 |
+s,@ECHO_C@,$ECHO_C,;t t
|
|
|
8942 |
+s,@ECHO_N@,$ECHO_N,;t t
|
|
|
8943 |
+s,@ECHO_T@,$ECHO_T,;t t
|
|
|
8944 |
+s,@LIBS@,$LIBS,;t t
|
|
|
8945 |
+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
|
|
|
8946 |
+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
|
|
|
8947 |
+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
|
|
|
8948 |
+s,@CYGPATH_W@,$CYGPATH_W,;t t
|
|
|
8949 |
+s,@PACKAGE@,$PACKAGE,;t t
|
|
|
8950 |
+s,@VERSION@,$VERSION,;t t
|
|
|
8951 |
+s,@ACLOCAL@,$ACLOCAL,;t t
|
|
|
8952 |
+s,@AUTOCONF@,$AUTOCONF,;t t
|
|
|
8953 |
+s,@AUTOMAKE@,$AUTOMAKE,;t t
|
|
|
8954 |
+s,@AUTOHEADER@,$AUTOHEADER,;t t
|
|
|
8955 |
+s,@MAKEINFO@,$MAKEINFO,;t t
|
|
|
8956 |
+s,@AMTAR@,$AMTAR,;t t
|
|
|
8957 |
+s,@install_sh@,$install_sh,;t t
|
|
|
8958 |
+s,@STRIP@,$STRIP,;t t
|
|
|
8959 |
+s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
|
|
|
8960 |
+s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
|
|
|
8961 |
+s,@AWK@,$AWK,;t t
|
|
|
8962 |
+s,@SET_MAKE@,$SET_MAKE,;t t
|
|
|
8963 |
+s,@am__leading_dot@,$am__leading_dot,;t t
|
|
|
8964 |
+s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
|
|
|
8965 |
+s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
|
|
|
8966 |
+s,@MAINT@,$MAINT,;t t
|
|
|
8967 |
+s,@CC@,$CC,;t t
|
|
|
8968 |
+s,@CFLAGS@,$CFLAGS,;t t
|
|
|
8969 |
+s,@LDFLAGS@,$LDFLAGS,;t t
|
|
|
8970 |
+s,@CPPFLAGS@,$CPPFLAGS,;t t
|
|
|
8971 |
+s,@ac_ct_CC@,$ac_ct_CC,;t t
|
|
|
8972 |
+s,@EXEEXT@,$EXEEXT,;t t
|
|
|
8973 |
+s,@OBJEXT@,$OBJEXT,;t t
|
|
|
8974 |
+s,@DEPDIR@,$DEPDIR,;t t
|
|
|
8975 |
+s,@am__include@,$am__include,;t t
|
|
|
8976 |
+s,@am__quote@,$am__quote,;t t
|
|
|
8977 |
+s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
|
|
|
8978 |
+s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
|
|
|
8979 |
+s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
|
|
|
8980 |
+s,@CCDEPMODE@,$CCDEPMODE,;t t
|
|
|
8981 |
+s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
|
|
|
8982 |
+s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
|
|
|
8983 |
+s,@CPP@,$CPP,;t t
|
|
|
8984 |
+s,@EGREP@,$EGREP,;t t
|
|
|
8985 |
+s,@INTLTOOL_DESKTOP_RULE@,$INTLTOOL_DESKTOP_RULE,;t t
|
|
|
8986 |
+s,@INTLTOOL_DIRECTORY_RULE@,$INTLTOOL_DIRECTORY_RULE,;t t
|
|
|
8987 |
+s,@INTLTOOL_KEYS_RULE@,$INTLTOOL_KEYS_RULE,;t t
|
|
|
8988 |
+s,@INTLTOOL_PROP_RULE@,$INTLTOOL_PROP_RULE,;t t
|
|
|
8989 |
+s,@INTLTOOL_OAF_RULE@,$INTLTOOL_OAF_RULE,;t t
|
|
|
8990 |
+s,@INTLTOOL_PONG_RULE@,$INTLTOOL_PONG_RULE,;t t
|
|
|
8991 |
+s,@INTLTOOL_SERVER_RULE@,$INTLTOOL_SERVER_RULE,;t t
|
|
|
8992 |
+s,@INTLTOOL_SHEET_RULE@,$INTLTOOL_SHEET_RULE,;t t
|
|
|
8993 |
+s,@INTLTOOL_SOUNDLIST_RULE@,$INTLTOOL_SOUNDLIST_RULE,;t t
|
|
|
8994 |
+s,@INTLTOOL_UI_RULE@,$INTLTOOL_UI_RULE,;t t
|
|
|
8995 |
+s,@INTLTOOL_XAM_RULE@,$INTLTOOL_XAM_RULE,;t t
|
|
|
8996 |
+s,@INTLTOOL_KBD_RULE@,$INTLTOOL_KBD_RULE,;t t
|
|
|
8997 |
+s,@INTLTOOL_XML_RULE@,$INTLTOOL_XML_RULE,;t t
|
|
|
8998 |
+s,@INTLTOOL_XML_NOMERGE_RULE@,$INTLTOOL_XML_NOMERGE_RULE,;t t
|
|
|
8999 |
+s,@INTLTOOL_CAVES_RULE@,$INTLTOOL_CAVES_RULE,;t t
|
|
|
9000 |
+s,@INTLTOOL_SCHEMAS_RULE@,$INTLTOOL_SCHEMAS_RULE,;t t
|
|
|
9001 |
+s,@INTLTOOL_THEME_RULE@,$INTLTOOL_THEME_RULE,;t t
|
|
|
9002 |
+s,@INTLTOOL_SERVICE_RULE@,$INTLTOOL_SERVICE_RULE,;t t
|
|
|
9003 |
+s,@INTLTOOL_EXTRACT@,$INTLTOOL_EXTRACT,;t t
|
|
|
9004 |
+s,@INTLTOOL_MERGE@,$INTLTOOL_MERGE,;t t
|
|
|
9005 |
+s,@INTLTOOL_UPDATE@,$INTLTOOL_UPDATE,;t t
|
|
|
9006 |
+s,@INTLTOOL_PERL@,$INTLTOOL_PERL,;t t
|
|
|
9007 |
+s,@INTLTOOL_ICONV@,$INTLTOOL_ICONV,;t t
|
|
|
9008 |
+s,@INTLTOOL_MSGFMT@,$INTLTOOL_MSGFMT,;t t
|
|
|
9009 |
+s,@INTLTOOL_MSGMERGE@,$INTLTOOL_MSGMERGE,;t t
|
|
|
9010 |
+s,@INTLTOOL_XGETTEXT@,$INTLTOOL_XGETTEXT,;t t
|
|
|
9011 |
+s,@ALL_LINGUAS@,$ALL_LINGUAS,;t t
|
|
|
9012 |
+s,@DATADIRNAME@,$DATADIRNAME,;t t
|
|
|
9013 |
+s,@PKG_CONFIG@,$PKG_CONFIG,;t t
|
|
|
9014 |
+s,@LIBXFCE4PANEL_VERSION@,$LIBXFCE4PANEL_VERSION,;t t
|
|
|
9015 |
+s,@LIBXFCE4PANEL_CFLAGS@,$LIBXFCE4PANEL_CFLAGS,;t t
|
|
|
9016 |
+s,@LIBXFCE4PANEL_LIBS@,$LIBXFCE4PANEL_LIBS,;t t
|
|
|
9017 |
+s,@LIBXFCE4PANEL_REQUIRED_VERSION@,$LIBXFCE4PANEL_REQUIRED_VERSION,;t t
|
|
|
9018 |
+s,@SOLLIBS@,$SOLLIBS,;t t
|
|
|
9019 |
+s,@HAVE_LIBMPD_TRUE@,$HAVE_LIBMPD_TRUE,;t t
|
|
|
9020 |
+s,@HAVE_LIBMPD_FALSE@,$HAVE_LIBMPD_FALSE,;t t
|
|
|
9021 |
+s,@LIBMPD_CFLAGS@,$LIBMPD_CFLAGS,;t t
|
|
|
9022 |
+s,@LIBMPD_LIBS@,$LIBMPD_LIBS,;t t
|
|
|
9023 |
+s,@LIBMPD_VERSION@,$LIBMPD_VERSION,;t t
|
|
|
9024 |
+s,@LIBMPD_REQUIRED_VERSION@,$LIBMPD_REQUIRED_VERSION,;t t
|
|
|
9025 |
+s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
|
|
|
9026 |
+s,@build@,$build,;t t
|
|
|
9027 |
+s,@build_cpu@,$build_cpu,;t t
|
|
|
9028 |
+s,@build_vendor@,$build_vendor,;t t
|
|
|
9029 |
+s,@build_os@,$build_os,;t t
|
|
|
9030 |
+s,@host@,$host,;t t
|
|
|
9031 |
+s,@host_cpu@,$host_cpu,;t t
|
|
|
9032 |
+s,@host_vendor@,$host_vendor,;t t
|
|
|
9033 |
+s,@host_os@,$host_os,;t t
|
|
|
9034 |
+s,@USE_NLS@,$USE_NLS,;t t
|
|
|
9035 |
+s,@MSGFMT@,$MSGFMT,;t t
|
|
|
9036 |
+s,@GMSGFMT@,$GMSGFMT,;t t
|
|
|
9037 |
+s,@XGETTEXT@,$XGETTEXT,;t t
|
|
|
9038 |
+s,@CATALOGS@,$CATALOGS,;t t
|
|
|
9039 |
+s,@CATOBJEXT@,$CATOBJEXT,;t t
|
|
|
9040 |
+s,@GMOFILES@,$GMOFILES,;t t
|
|
|
9041 |
+s,@INSTOBJEXT@,$INSTOBJEXT,;t t
|
|
|
9042 |
+s,@INTLLIBS@,$INTLLIBS,;t t
|
|
|
9043 |
+s,@PO_IN_DATADIR_TRUE@,$PO_IN_DATADIR_TRUE,;t t
|
|
|
9044 |
+s,@PO_IN_DATADIR_FALSE@,$PO_IN_DATADIR_FALSE,;t t
|
|
|
9045 |
+s,@POFILES@,$POFILES,;t t
|
|
|
9046 |
+s,@POSUB@,$POSUB,;t t
|
|
|
9047 |
+s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
|
|
|
9048 |
+s,@localedir@,$localedir,;t t
|
|
|
9049 |
+s,@XGETTEXT_ARGS@,$XGETTEXT_ARGS,;t t
|
|
|
9050 |
+s,@LIBOBJS@,$LIBOBJS,;t t
|
|
|
9051 |
+s,@LTLIBOBJS@,$LTLIBOBJS,;t t
|
|
|
9052 |
+CEOF
|
|
|
9053 |
|
|
|
9054 |
_ACEOF
|
|
|
9055 |
|
|
|
9056 |
-
|
|
|
9057 |
-
|
|
|
9058 |
-ac_delim='%!_!# '
|
|
|
9059 |
-for ac_last_try in false false false false false :; do
|
|
|
9060 |
- cat >conf$$subs.sed <<_ACEOF
|
|
|
9061 |
-SHELL!$SHELL$ac_delim
|
|
|
9062 |
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
|
|
|
9063 |
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
|
|
|
9064 |
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
|
|
|
9065 |
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
|
|
|
9066 |
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
|
|
|
9067 |
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
|
|
|
9068 |
-exec_prefix!$exec_prefix$ac_delim
|
|
|
9069 |
-prefix!$prefix$ac_delim
|
|
|
9070 |
-program_transform_name!$program_transform_name$ac_delim
|
|
|
9071 |
-bindir!$bindir$ac_delim
|
|
|
9072 |
-sbindir!$sbindir$ac_delim
|
|
|
9073 |
-libexecdir!$libexecdir$ac_delim
|
|
|
9074 |
-datarootdir!$datarootdir$ac_delim
|
|
|
9075 |
-datadir!$datadir$ac_delim
|
|
|
9076 |
-sysconfdir!$sysconfdir$ac_delim
|
|
|
9077 |
-sharedstatedir!$sharedstatedir$ac_delim
|
|
|
9078 |
-localstatedir!$localstatedir$ac_delim
|
|
|
9079 |
-includedir!$includedir$ac_delim
|
|
|
9080 |
-oldincludedir!$oldincludedir$ac_delim
|
|
|
9081 |
-docdir!$docdir$ac_delim
|
|
|
9082 |
-infodir!$infodir$ac_delim
|
|
|
9083 |
-htmldir!$htmldir$ac_delim
|
|
|
9084 |
-dvidir!$dvidir$ac_delim
|
|
|
9085 |
-pdfdir!$pdfdir$ac_delim
|
|
|
9086 |
-psdir!$psdir$ac_delim
|
|
|
9087 |
-libdir!$libdir$ac_delim
|
|
|
9088 |
-localedir!$localedir$ac_delim
|
|
|
9089 |
-mandir!$mandir$ac_delim
|
|
|
9090 |
-DEFS!$DEFS$ac_delim
|
|
|
9091 |
-ECHO_C!$ECHO_C$ac_delim
|
|
|
9092 |
-ECHO_N!$ECHO_N$ac_delim
|
|
|
9093 |
-ECHO_T!$ECHO_T$ac_delim
|
|
|
9094 |
-LIBS!$LIBS$ac_delim
|
|
|
9095 |
-build_alias!$build_alias$ac_delim
|
|
|
9096 |
-host_alias!$host_alias$ac_delim
|
|
|
9097 |
-target_alias!$target_alias$ac_delim
|
|
|
9098 |
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
|
|
|
9099 |
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
|
|
|
9100 |
-INSTALL_DATA!$INSTALL_DATA$ac_delim
|
|
|
9101 |
-CYGPATH_W!$CYGPATH_W$ac_delim
|
|
|
9102 |
-PACKAGE!$PACKAGE$ac_delim
|
|
|
9103 |
-VERSION!$VERSION$ac_delim
|
|
|
9104 |
-ACLOCAL!$ACLOCAL$ac_delim
|
|
|
9105 |
-AUTOCONF!$AUTOCONF$ac_delim
|
|
|
9106 |
-AUTOMAKE!$AUTOMAKE$ac_delim
|
|
|
9107 |
-AUTOHEADER!$AUTOHEADER$ac_delim
|
|
|
9108 |
-MAKEINFO!$MAKEINFO$ac_delim
|
|
|
9109 |
-AMTAR!$AMTAR$ac_delim
|
|
|
9110 |
-install_sh!$install_sh$ac_delim
|
|
|
9111 |
-STRIP!$STRIP$ac_delim
|
|
|
9112 |
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
|
|
|
9113 |
-AWK!$AWK$ac_delim
|
|
|
9114 |
-SET_MAKE!$SET_MAKE$ac_delim
|
|
|
9115 |
-am__leading_dot!$am__leading_dot$ac_delim
|
|
|
9116 |
-MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
|
|
|
9117 |
-MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
|
|
|
9118 |
-MAINT!$MAINT$ac_delim
|
|
|
9119 |
-CC!$CC$ac_delim
|
|
|
9120 |
-CFLAGS!$CFLAGS$ac_delim
|
|
|
9121 |
-LDFLAGS!$LDFLAGS$ac_delim
|
|
|
9122 |
-CPPFLAGS!$CPPFLAGS$ac_delim
|
|
|
9123 |
-ac_ct_CC!$ac_ct_CC$ac_delim
|
|
|
9124 |
-EXEEXT!$EXEEXT$ac_delim
|
|
|
9125 |
-OBJEXT!$OBJEXT$ac_delim
|
|
|
9126 |
-DEPDIR!$DEPDIR$ac_delim
|
|
|
9127 |
-am__include!$am__include$ac_delim
|
|
|
9128 |
-am__quote!$am__quote$ac_delim
|
|
|
9129 |
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
|
|
|
9130 |
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
|
|
|
9131 |
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
|
|
|
9132 |
-CCDEPMODE!$CCDEPMODE$ac_delim
|
|
|
9133 |
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
|
|
|
9134 |
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
|
|
|
9135 |
-CPP!$CPP$ac_delim
|
|
|
9136 |
-GREP!$GREP$ac_delim
|
|
|
9137 |
-EGREP!$EGREP$ac_delim
|
|
|
9138 |
-INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
|
|
|
9139 |
-INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
|
|
|
9140 |
-INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
|
|
|
9141 |
-INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim
|
|
|
9142 |
-INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim
|
|
|
9143 |
-INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim
|
|
|
9144 |
-INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim
|
|
|
9145 |
-INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim
|
|
|
9146 |
-INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim
|
|
|
9147 |
-INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim
|
|
|
9148 |
-INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim
|
|
|
9149 |
-INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim
|
|
|
9150 |
-INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim
|
|
|
9151 |
-INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim
|
|
|
9152 |
-INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim
|
|
|
9153 |
-INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
|
|
|
9154 |
-INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
|
|
|
9155 |
-INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
|
|
|
9156 |
-INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
|
|
|
9157 |
-INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
|
|
|
9158 |
-_ACEOF
|
|
|
9159 |
-
|
|
|
9160 |
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
|
|
9161 |
- break
|
|
|
9162 |
- elif $ac_last_try; then
|
|
|
9163 |
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
|
|
9164 |
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
|
|
9165 |
- { (exit 1); exit 1; }; }
|
|
|
9166 |
- else
|
|
|
9167 |
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
|
|
9168 |
+ cat >>$CONFIG_STATUS <<\_ACEOF
|
|
|
9169 |
+ # Split the substitutions into bite-sized pieces for seds with
|
|
|
9170 |
+ # small command number limits, like on Digital OSF/1 and HP-UX.
|
|
|
9171 |
+ ac_max_sed_lines=48
|
|
|
9172 |
+ ac_sed_frag=1 # Number of current file.
|
|
|
9173 |
+ ac_beg=1 # First line for current file.
|
|
|
9174 |
+ ac_end=$ac_max_sed_lines # Line after last line for current file.
|
|
|
9175 |
+ ac_more_lines=:
|
|
|
9176 |
+ ac_sed_cmds=
|
|
|
9177 |
+ while $ac_more_lines; do
|
|
|
9178 |
+ if test $ac_beg -gt 1; then
|
|
|
9179 |
+ sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
|
|
|
9180 |
+ else
|
|
|
9181 |
+ sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
|
|
|
9182 |
+ fi
|
|
|
9183 |
+ if test ! -s $tmp/subs.frag; then
|
|
|
9184 |
+ ac_more_lines=false
|
|
|
9185 |
+ else
|
|
|
9186 |
+ # The purpose of the label and of the branching condition is to
|
|
|
9187 |
+ # speed up the sed processing (if there are no `@' at all, there
|
|
|
9188 |
+ # is no need to browse any of the substitutions).
|
|
|
9189 |
+ # These are the two extra sed commands mentioned above.
|
|
|
9190 |
+ (echo ':t
|
|
|
9191 |
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
|
|
|
9192 |
+ if test -z "$ac_sed_cmds"; then
|
|
|
9193 |
+ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
|
|
|
9194 |
+ else
|
|
|
9195 |
+ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
|
|
|
9196 |
+ fi
|
|
|
9197 |
+ ac_sed_frag=`expr $ac_sed_frag + 1`
|
|
|
9198 |
+ ac_beg=$ac_end
|
|
|
9199 |
+ ac_end=`expr $ac_end + $ac_max_sed_lines`
|
|
|
9200 |
+ fi
|
|
|
9201 |
+ done
|
|
|
9202 |
+ if test -z "$ac_sed_cmds"; then
|
|
|
9203 |
+ ac_sed_cmds=cat
|
|
|
9204 |
fi
|
|
|
9205 |
-done
|
|
|
9206 |
+fi # test -n "$CONFIG_FILES"
|
|
|
9207 |
|
|
|
9208 |
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
|
|
|
9209 |
-if test -n "$ac_eof"; then
|
|
|
9210 |
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
|
|
|
9211 |
- ac_eof=`expr $ac_eof + 1`
|
|
|
9212 |
-fi
|
|
|
9213 |
-
|
|
|
9214 |
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
|
9215 |
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
|
|
|
9216 |
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
|
|
|
9217 |
_ACEOF
|
|
|
9218 |
-sed '
|
|
|
9219 |
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
|
|
|
9220 |
-s/^/s,@/; s/!/@,|#_!!_#|/
|
|
|
9221 |
-:n
|
|
|
9222 |
-t n
|
|
|
9223 |
-s/'"$ac_delim"'$/,g/; t
|
|
|
9224 |
-s/$/\\/; p
|
|
|
9225 |
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
|
|
|
9226 |
-' >>$CONFIG_STATUS <conf$$subs.sed
|
|
|
9227 |
-rm -f conf$$subs.sed
|
|
|
9228 |
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
|
9229 |
-CEOF$ac_eof
|
|
|
9230 |
-_ACEOF
|
|
|
9231 |
-
|
|
|
9232 |
-
|
|
|
9233 |
-ac_delim='%!_!# '
|
|
|
9234 |
-for ac_last_try in false false false false false :; do
|
|
|
9235 |
- cat >conf$$subs.sed <<_ACEOF
|
|
|
9236 |
-INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
|
|
|
9237 |
-INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
|
|
|
9238 |
-INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim
|
|
|
9239 |
-INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim
|
|
|
9240 |
-INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim
|
|
|
9241 |
-INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim
|
|
|
9242 |
-ALL_LINGUAS!$ALL_LINGUAS$ac_delim
|
|
|
9243 |
-DATADIRNAME!$DATADIRNAME$ac_delim
|
|
|
9244 |
-PKG_CONFIG!$PKG_CONFIG$ac_delim
|
|
|
9245 |
-LIBXFCE4PANEL_VERSION!$LIBXFCE4PANEL_VERSION$ac_delim
|
|
|
9246 |
-LIBXFCE4PANEL_CFLAGS!$LIBXFCE4PANEL_CFLAGS$ac_delim
|
|
|
9247 |
-LIBXFCE4PANEL_LIBS!$LIBXFCE4PANEL_LIBS$ac_delim
|
|
|
9248 |
-LIBXFCE4PANEL_REQUIRED_VERSION!$LIBXFCE4PANEL_REQUIRED_VERSION$ac_delim
|
|
|
9249 |
-HAVE_LIBMPD_TRUE!$HAVE_LIBMPD_TRUE$ac_delim
|
|
|
9250 |
-HAVE_LIBMPD_FALSE!$HAVE_LIBMPD_FALSE$ac_delim
|
|
|
9251 |
-LIBMPD_CFLAGS!$LIBMPD_CFLAGS$ac_delim
|
|
|
9252 |
-LIBMPD_LIBS!$LIBMPD_LIBS$ac_delim
|
|
|
9253 |
-LIBMPD_VERSION!$LIBMPD_VERSION$ac_delim
|
|
|
9254 |
-LIBMPD_REQUIRED_VERSION!$LIBMPD_REQUIRED_VERSION$ac_delim
|
|
|
9255 |
-GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
|
|
|
9256 |
-build!$build$ac_delim
|
|
|
9257 |
-build_cpu!$build_cpu$ac_delim
|
|
|
9258 |
-build_vendor!$build_vendor$ac_delim
|
|
|
9259 |
-build_os!$build_os$ac_delim
|
|
|
9260 |
-host!$host$ac_delim
|
|
|
9261 |
-host_cpu!$host_cpu$ac_delim
|
|
|
9262 |
-host_vendor!$host_vendor$ac_delim
|
|
|
9263 |
-host_os!$host_os$ac_delim
|
|
|
9264 |
-USE_NLS!$USE_NLS$ac_delim
|
|
|
9265 |
-MSGFMT!$MSGFMT$ac_delim
|
|
|
9266 |
-GMSGFMT!$GMSGFMT$ac_delim
|
|
|
9267 |
-XGETTEXT!$XGETTEXT$ac_delim
|
|
|
9268 |
-CATALOGS!$CATALOGS$ac_delim
|
|
|
9269 |
-CATOBJEXT!$CATOBJEXT$ac_delim
|
|
|
9270 |
-GMOFILES!$GMOFILES$ac_delim
|
|
|
9271 |
-INSTOBJEXT!$INSTOBJEXT$ac_delim
|
|
|
9272 |
-INTLLIBS!$INTLLIBS$ac_delim
|
|
|
9273 |
-PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
|
|
|
9274 |
-PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
|
|
|
9275 |
-POFILES!$POFILES$ac_delim
|
|
|
9276 |
-POSUB!$POSUB$ac_delim
|
|
|
9277 |
-MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
|
|
|
9278 |
-XGETTEXT_ARGS!$XGETTEXT_ARGS$ac_delim
|
|
|
9279 |
-LIBOBJS!$LIBOBJS$ac_delim
|
|
|
9280 |
-LTLIBOBJS!$LTLIBOBJS$ac_delim
|
|
|
9281 |
-_ACEOF
|
|
|
9282 |
-
|
|
|
9283 |
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 45; then
|
|
|
9284 |
- break
|
|
|
9285 |
- elif $ac_last_try; then
|
|
|
9286 |
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
|
|
9287 |
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
|
|
9288 |
- { (exit 1); exit 1; }; }
|
|
|
9289 |
- else
|
|
|
9290 |
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
|
|
9291 |
- fi
|
|
|
9292 |
-done
|
|
|
9293 |
-
|
|
|
9294 |
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
|
|
|
9295 |
-if test -n "$ac_eof"; then
|
|
|
9296 |
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
|
|
|
9297 |
- ac_eof=`expr $ac_eof + 1`
|
|
|
9298 |
-fi
|
|
|
9299 |
-
|
|
|
9300 |
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
|
9301 |
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
|
|
|
9302 |
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
|
|
|
9303 |
-_ACEOF
|
|
|
9304 |
-sed '
|
|
|
9305 |
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
|
|
|
9306 |
-s/^/s,@/; s/!/@,|#_!!_#|/
|
|
|
9307 |
-:n
|
|
|
9308 |
-t n
|
|
|
9309 |
-s/'"$ac_delim"'$/,g/; t
|
|
|
9310 |
-s/$/\\/; p
|
|
|
9311 |
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
|
|
|
9312 |
-' >>$CONFIG_STATUS <conf$$subs.sed
|
|
|
9313 |
-rm -f conf$$subs.sed
|
|
|
9314 |
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
|
9315 |
-:end
|
|
|
9316 |
-s/|#_!!_#|//g
|
|
|
9317 |
-CEOF$ac_eof
|
|
|
9318 |
-_ACEOF
|
|
|
9319 |
-
|
|
|
9320 |
-
|
|
|
9321 |
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
|
|
|
9322 |
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
|
|
|
9323 |
-# trailing colons and then remove the whole line if VPATH becomes empty
|
|
|
9324 |
-# (actually we leave an empty line to preserve line numbers).
|
|
|
9325 |
-if test "x$srcdir" = x.; then
|
|
|
9326 |
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
|
|
|
9327 |
-s/:*\$(srcdir):*/:/
|
|
|
9328 |
-s/:*\${srcdir}:*/:/
|
|
|
9329 |
-s/:*@srcdir@:*/:/
|
|
|
9330 |
-s/^\([^=]*=[ ]*\):*/\1/
|
|
|
9331 |
-s/:*$//
|
|
|
9332 |
-s/^[^=]*=[ ]*$//
|
|
|
9333 |
-}'
|
|
|
9334 |
-fi
|
|
|
9335 |
-
|
|
|
9336 |
cat >>$CONFIG_STATUS <<\_ACEOF
|
|
|
9337 |
-fi # test -n "$CONFIG_FILES"
|
|
|
9338 |
-
|
|
|
9339 |
-
|
|
|
9340 |
-for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
|
|
|
9341 |
-do
|
|
|
9342 |
- case $ac_tag in
|
|
|
9343 |
- :[FHLC]) ac_mode=$ac_tag; continue;;
|
|
|
9344 |
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
|
|
|
9345 |
+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
|
|
|
9346 |
+ case $ac_file in
|
|
|
9347 |
+ - | *:- | *:-:* ) # input from stdin
|
|
|
9348 |
+ cat >$tmp/stdin
|
|
|
9349 |
+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
|
|
|
9350 |
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
|
|
|
9351 |
+ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
|
|
|
9352 |
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
|
|
|
9353 |
+ * ) ac_file_in=$ac_file.in ;;
|
|
|
9354 |
esac
|
|
|
9355 |
- case $ac_mode$ac_tag in
|
|
|
9356 |
- :[FHL]*:*);;
|
|
|
9357 |
- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
|
|
|
9358 |
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
|
|
|
9359 |
- { (exit 1); exit 1; }; };;
|
|
|
9360 |
- :[FH]-) ac_tag=-:-;;
|
|
|
9361 |
- :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
|
|
|
9362 |
- esac
|
|
|
9363 |
- ac_save_IFS=$IFS
|
|
|
9364 |
- IFS=:
|
|
|
9365 |
- set x $ac_tag
|
|
|
9366 |
- IFS=$ac_save_IFS
|
|
|
9367 |
- shift
|
|
|
9368 |
- ac_file=$1
|
|
|
9369 |
- shift
|
|
|
9370 |
|
|
|
9371 |
- case $ac_mode in
|
|
|
9372 |
- :L) ac_source=$1;;
|
|
|
9373 |
- :[FH])
|
|
|
9374 |
- ac_file_inputs=
|
|
|
9375 |
- for ac_f
|
|
|
9376 |
- do
|
|
|
9377 |
- case $ac_f in
|
|
|
9378 |
- -) ac_f="$tmp/stdin";;
|
|
|
9379 |
- *) # Look for the file first in the build tree, then in the source tree
|
|
|
9380 |
- # (if the path is not absolute). The absolute path cannot be DOS-style,
|
|
|
9381 |
- # because $ac_f cannot contain `:'.
|
|
|
9382 |
- test -f "$ac_f" ||
|
|
|
9383 |
- case $ac_f in
|
|
|
9384 |
- [\\/$]*) false;;
|
|
|
9385 |
- *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
|
|
|
9386 |
- esac ||
|
|
|
9387 |
- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
|
|
|
9388 |
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
|
|
|
9389 |
- { (exit 1); exit 1; }; };;
|
|
|
9390 |
- esac
|
|
|
9391 |
- ac_file_inputs="$ac_file_inputs $ac_f"
|
|
|
9392 |
- done
|
|
|
9393 |
-
|
|
|
9394 |
- # Let's still pretend it is `configure' which instantiates (i.e., don't
|
|
|
9395 |
- # use $as_me), people would be surprised to read:
|
|
|
9396 |
- # /* config.h. Generated by config.status. */
|
|
|
9397 |
- configure_input="Generated from "`IFS=:
|
|
|
9398 |
- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
|
|
|
9399 |
- if test x"$ac_file" != x-; then
|
|
|
9400 |
- configure_input="$ac_file. $configure_input"
|
|
|
9401 |
- { echo "$as_me:$LINENO: creating $ac_file" >&5
|
|
|
9402 |
-echo "$as_me: creating $ac_file" >&6;}
|
|
|
9403 |
- fi
|
|
|
9404 |
-
|
|
|
9405 |
- case $ac_tag in
|
|
|
9406 |
- *:-:* | *:-) cat >"$tmp/stdin";;
|
|
|
9407 |
- esac
|
|
|
9408 |
- ;;
|
|
|
9409 |
- esac
|
|
|
9410 |
-
|
|
|
9411 |
- ac_dir=`$as_dirname -- "$ac_file" ||
|
|
|
9412 |
+ # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
|
|
|
9413 |
+ ac_dir=`(dirname "$ac_file") 2>/dev/null ||
|
|
|
9414 |
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
|
9415 |
X"$ac_file" : 'X\(//\)[^/]' \| \
|
|
|
9416 |
X"$ac_file" : 'X\(//\)$' \| \
|
|
|
9417 |
- X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
|
|
|
9418 |
+ X"$ac_file" : 'X\(/\)' \| \
|
|
|
9419 |
+ . : '\(.\)' 2>/dev/null ||
|
|
|
9420 |
echo X"$ac_file" |
|
|
|
9421 |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
|
9422 |
- s//\1/
|
|
|
9423 |
- q
|
|
|
9424 |
- }
|
|
|
9425 |
- /^X\(\/\/\)[^/].*/{
|
|
|
9426 |
- s//\1/
|
|
|
9427 |
- q
|
|
|
9428 |
- }
|
|
|
9429 |
- /^X\(\/\/\)$/{
|
|
|
9430 |
- s//\1/
|
|
|
9431 |
- q
|
|
|
9432 |
- }
|
|
|
9433 |
- /^X\(\/\).*/{
|
|
|
9434 |
- s//\1/
|
|
|
9435 |
- q
|
|
|
9436 |
- }
|
|
|
9437 |
- s/.*/./; q'`
|
|
|
9438 |
- { as_dir="$ac_dir"
|
|
|
9439 |
- case $as_dir in #(
|
|
|
9440 |
- -*) as_dir=./$as_dir;;
|
|
|
9441 |
- esac
|
|
|
9442 |
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
|
|
|
9443 |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
|
9444 |
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
|
9445 |
+ /^X\(\/\/\)$/{ s//\1/; q; }
|
|
|
9446 |
+ /^X\(\/\).*/{ s//\1/; q; }
|
|
|
9447 |
+ s/.*/./; q'`
|
|
|
9448 |
+ { if $as_mkdir_p; then
|
|
|
9449 |
+ mkdir -p "$ac_dir"
|
|
|
9450 |
+ else
|
|
|
9451 |
+ as_dir="$ac_dir"
|
|
|
9452 |
as_dirs=
|
|
|
9453 |
- while :; do
|
|
|
9454 |
- case $as_dir in #(
|
|
|
9455 |
- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
|
|
|
9456 |
- *) as_qdir=$as_dir;;
|
|
|
9457 |
- esac
|
|
|
9458 |
- as_dirs="'$as_qdir' $as_dirs"
|
|
|
9459 |
- as_dir=`$as_dirname -- "$as_dir" ||
|
|
|
9460 |
+ while test ! -d "$as_dir"; do
|
|
|
9461 |
+ as_dirs="$as_dir $as_dirs"
|
|
|
9462 |
+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
|
|
|
9463 |
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
|
9464 |
X"$as_dir" : 'X\(//\)[^/]' \| \
|
|
|
9465 |
X"$as_dir" : 'X\(//\)$' \| \
|
|
|
9466 |
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
|
|
|
9467 |
+ X"$as_dir" : 'X\(/\)' \| \
|
|
|
9468 |
+ . : '\(.\)' 2>/dev/null ||
|
|
|
9469 |
echo X"$as_dir" |
|
|
|
9470 |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
|
9471 |
- s//\1/
|
|
|
9472 |
- q
|
|
|
9473 |
- }
|
|
|
9474 |
- /^X\(\/\/\)[^/].*/{
|
|
|
9475 |
- s//\1/
|
|
|
9476 |
- q
|
|
|
9477 |
- }
|
|
|
9478 |
- /^X\(\/\/\)$/{
|
|
|
9479 |
- s//\1/
|
|
|
9480 |
- q
|
|
|
9481 |
- }
|
|
|
9482 |
- /^X\(\/\).*/{
|
|
|
9483 |
- s//\1/
|
|
|
9484 |
- q
|
|
|
9485 |
- }
|
|
|
9486 |
- s/.*/./; q'`
|
|
|
9487 |
- test -d "$as_dir" && break
|
|
|
9488 |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
|
9489 |
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
|
9490 |
+ /^X\(\/\/\)$/{ s//\1/; q; }
|
|
|
9491 |
+ /^X\(\/\).*/{ s//\1/; q; }
|
|
|
9492 |
+ s/.*/./; q'`
|
|
|
9493 |
done
|
|
|
9494 |
- test -z "$as_dirs" || eval "mkdir $as_dirs"
|
|
|
9495 |
- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
|
|
|
9496 |
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
|
|
|
9497 |
+ test ! -n "$as_dirs" || mkdir $as_dirs
|
|
|
9498 |
+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
|
|
|
9499 |
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
|
|
|
9500 |
{ (exit 1); exit 1; }; }; }
|
|
|
9501 |
+
|
|
|
9502 |
ac_builddir=.
|
|
|
9503 |
|
|
|
9504 |
-case "$ac_dir" in
|
|
|
9505 |
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
|
|
9506 |
-*)
|
|
|
9507 |
+if test "$ac_dir" != .; then
|
|
|
9508 |
ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
|
|
|
9509 |
- # A ".." for each directory in $ac_dir_suffix.
|
|
|
9510 |
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
|
|
|
9511 |
- case $ac_top_builddir_sub in
|
|
|
9512 |
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
|
|
9513 |
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
|
|
|
9514 |
- esac ;;
|
|
|
9515 |
-esac
|
|
|
9516 |
-ac_abs_top_builddir=$ac_pwd
|
|
|
9517 |
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
|
|
|
9518 |
-# for backward compatibility:
|
|
|
9519 |
-ac_top_builddir=$ac_top_build_prefix
|
|
|
9520 |
+ # A "../" for each directory in $ac_dir_suffix.
|
|
|
9521 |
+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
|
|
|
9522 |
+else
|
|
|
9523 |
+ ac_dir_suffix= ac_top_builddir=
|
|
|
9524 |
+fi
|
|
|
9525 |
|
|
|
9526 |
case $srcdir in
|
|
|
9527 |
- .) # We are building in place.
|
|
|
9528 |
+ .) # No --srcdir option. We are building in place.
|
|
|
9529 |
ac_srcdir=.
|
|
|
9530 |
- ac_top_srcdir=$ac_top_builddir_sub
|
|
|
9531 |
- ac_abs_top_srcdir=$ac_pwd ;;
|
|
|
9532 |
- [\\/]* | ?:[\\/]* ) # Absolute name.
|
|
|
9533 |
+ if test -z "$ac_top_builddir"; then
|
|
|
9534 |
+ ac_top_srcdir=.
|
|
|
9535 |
+ else
|
|
|
9536 |
+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
|
|
|
9537 |
+ fi ;;
|
|
|
9538 |
+ [\\/]* | ?:[\\/]* ) # Absolute path.
|
|
|
9539 |
ac_srcdir=$srcdir$ac_dir_suffix;
|
|
|
9540 |
- ac_top_srcdir=$srcdir
|
|
|
9541 |
- ac_abs_top_srcdir=$srcdir ;;
|
|
|
9542 |
- *) # Relative name.
|
|
|
9543 |
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
|
|
|
9544 |
- ac_top_srcdir=$ac_top_build_prefix$srcdir
|
|
|
9545 |
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
|
|
|
9546 |
+ ac_top_srcdir=$srcdir ;;
|
|
|
9547 |
+ *) # Relative path.
|
|
|
9548 |
+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
|
|
|
9549 |
+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
|
|
|
9550 |
esac
|
|
|
9551 |
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
|
|
|
9552 |
|
|
|
9553 |
+# Do not use `cd foo && pwd` to compute absolute paths, because
|
|
|
9554 |
+# the directories may not exist.
|
|
|
9555 |
+case `pwd` in
|
|
|
9556 |
+.) ac_abs_builddir="$ac_dir";;
|
|
|
9557 |
+*)
|
|
|
9558 |
+ case "$ac_dir" in
|
|
|
9559 |
+ .) ac_abs_builddir=`pwd`;;
|
|
|
9560 |
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
|
|
|
9561 |
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
|
|
|
9562 |
+ esac;;
|
|
|
9563 |
+esac
|
|
|
9564 |
+case $ac_abs_builddir in
|
|
|
9565 |
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
|
|
|
9566 |
+*)
|
|
|
9567 |
+ case ${ac_top_builddir}. in
|
|
|
9568 |
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
|
|
|
9569 |
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
|
|
|
9570 |
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
|
|
|
9571 |
+ esac;;
|
|
|
9572 |
+esac
|
|
|
9573 |
+case $ac_abs_builddir in
|
|
|
9574 |
+.) ac_abs_srcdir=$ac_srcdir;;
|
|
|
9575 |
+*)
|
|
|
9576 |
+ case $ac_srcdir in
|
|
|
9577 |
+ .) ac_abs_srcdir=$ac_abs_builddir;;
|
|
|
9578 |
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
|
|
|
9579 |
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
|
|
|
9580 |
+ esac;;
|
|
|
9581 |
+esac
|
|
|
9582 |
+case $ac_abs_builddir in
|
|
|
9583 |
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
|
|
|
9584 |
+*)
|
|
|
9585 |
+ case $ac_top_srcdir in
|
|
|
9586 |
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
|
|
|
9587 |
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
|
|
|
9588 |
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
|
|
|
9589 |
+ esac;;
|
|
|
9590 |
+esac
|
|
|
9591 |
|
|
|
9592 |
- case $ac_mode in
|
|
|
9593 |
- :F)
|
|
|
9594 |
- #
|
|
|
9595 |
- # CONFIG_FILE
|
|
|
9596 |
- #
|
|
|
9597 |
|
|
|
9598 |
case $INSTALL in
|
|
|
9599 |
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
|
|
|
9600 |
- *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
|
|
|
9601 |
+ *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
|
|
|
9602 |
esac
|
|
|
9603 |
-_ACEOF
|
|
|
9604 |
|
|
|
9605 |
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
|
9606 |
-# If the template does not know about datarootdir, expand it.
|
|
|
9607 |
-# FIXME: This hack should be removed a few years after 2.60.
|
|
|
9608 |
-ac_datarootdir_hack=; ac_datarootdir_seen=
|
|
|
9609 |
+ if test x"$ac_file" != x-; then
|
|
|
9610 |
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
|
|
|
9611 |
+echo "$as_me: creating $ac_file" >&6;}
|
|
|
9612 |
+ rm -f "$ac_file"
|
|
|
9613 |
+ fi
|
|
|
9614 |
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
|
|
|
9615 |
+ # use $as_me), people would be surprised to read:
|
|
|
9616 |
+ # /* config.h. Generated by config.status. */
|
|
|
9617 |
+ if test x"$ac_file" = x-; then
|
|
|
9618 |
+ configure_input=
|
|
|
9619 |
+ else
|
|
|
9620 |
+ configure_input="$ac_file. "
|
|
|
9621 |
+ fi
|
|
|
9622 |
+ configure_input=$configure_input"Generated from `echo $ac_file_in |
|
|
|
9623 |
+ sed 's,.*/,,'` by configure."
|
|
|
9624 |
|
|
|
9625 |
-case `sed -n '/datarootdir/ {
|
|
|
9626 |
- p
|
|
|
9627 |
- q
|
|
|
9628 |
-}
|
|
|
9629 |
-/@datadir@/p
|
|
|
9630 |
-/@docdir@/p
|
|
|
9631 |
-/@infodir@/p
|
|
|
9632 |
-/@localedir@/p
|
|
|
9633 |
-/@mandir@/p
|
|
|
9634 |
-' $ac_file_inputs` in
|
|
|
9635 |
-*datarootdir*) ac_datarootdir_seen=yes;;
|
|
|
9636 |
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
|
|
|
9637 |
- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
|
|
|
9638 |
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
|
|
|
9639 |
+ # First look for the input files in the build tree, otherwise in the
|
|
|
9640 |
+ # src tree.
|
|
|
9641 |
+ ac_file_inputs=`IFS=:
|
|
|
9642 |
+ for f in $ac_file_in; do
|
|
|
9643 |
+ case $f in
|
|
|
9644 |
+ -) echo $tmp/stdin ;;
|
|
|
9645 |
+ [\\/$]*)
|
|
|
9646 |
+ # Absolute (can't be DOS-style, as IFS=:)
|
|
|
9647 |
+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
|
|
|
9648 |
+echo "$as_me: error: cannot find input file: $f" >&2;}
|
|
|
9649 |
+ { (exit 1); exit 1; }; }
|
|
|
9650 |
+ echo "$f";;
|
|
|
9651 |
+ *) # Relative
|
|
|
9652 |
+ if test -f "$f"; then
|
|
|
9653 |
+ # Build tree
|
|
|
9654 |
+ echo "$f"
|
|
|
9655 |
+ elif test -f "$srcdir/$f"; then
|
|
|
9656 |
+ # Source tree
|
|
|
9657 |
+ echo "$srcdir/$f"
|
|
|
9658 |
+ else
|
|
|
9659 |
+ # /dev/null tree
|
|
|
9660 |
+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
|
|
|
9661 |
+echo "$as_me: error: cannot find input file: $f" >&2;}
|
|
|
9662 |
+ { (exit 1); exit 1; }; }
|
|
|
9663 |
+ fi;;
|
|
|
9664 |
+ esac
|
|
|
9665 |
+ done` || { (exit 1); exit 1; }
|
|
|
9666 |
_ACEOF
|
|
|
9667 |
cat >>$CONFIG_STATUS <<_ACEOF
|
|
|
9668 |
- ac_datarootdir_hack='
|
|
|
9669 |
- s&@datadir@&$datadir&g
|
|
|
9670 |
- s&@docdir@&$docdir&g
|
|
|
9671 |
- s&@infodir@&$infodir&g
|
|
|
9672 |
- s&@localedir@&$localedir&g
|
|
|
9673 |
- s&@mandir@&$mandir&g
|
|
|
9674 |
- s&\\\${datarootdir}&$datarootdir&g' ;;
|
|
|
9675 |
-esac
|
|
|
9676 |
-_ACEOF
|
|
|
9677 |
-
|
|
|
9678 |
-# Neutralize VPATH when `$srcdir' = `.'.
|
|
|
9679 |
-# Shell code in configure.ac might set extrasub.
|
|
|
9680 |
-# FIXME: do we really want to maintain this feature?
|
|
|
9681 |
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
|
9682 |
sed "$ac_vpsub
|
|
|
9683 |
$extrasub
|
|
|
9684 |
_ACEOF
|
|
|
9685 |
@@ -9009,130 +8456,248 @@
|
|
|
9686 |
cat >>$CONFIG_STATUS <<\_ACEOF
|
|
|
9687 |
:t
|
|
|
9688 |
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
|
|
|
9689 |
-s&@configure_input@&$configure_input&;t t
|
|
|
9690 |
-s&@top_builddir@&$ac_top_builddir_sub&;t t
|
|
|
9691 |
-s&@srcdir@&$ac_srcdir&;t t
|
|
|
9692 |
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
|
|
|
9693 |
-s&@top_srcdir@&$ac_top_srcdir&;t t
|
|
|
9694 |
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
|
|
|
9695 |
-s&@builddir@&$ac_builddir&;t t
|
|
|
9696 |
-s&@abs_builddir@&$ac_abs_builddir&;t t
|
|
|
9697 |
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
|
|
|
9698 |
-s&@INSTALL@&$ac_INSTALL&;t t
|
|
|
9699 |
-$ac_datarootdir_hack
|
|
|
9700 |
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
|
|
|
9701 |
+s,@configure_input@,$configure_input,;t t
|
|
|
9702 |
+s,@srcdir@,$ac_srcdir,;t t
|
|
|
9703 |
+s,@abs_srcdir@,$ac_abs_srcdir,;t t
|
|
|
9704 |
+s,@top_srcdir@,$ac_top_srcdir,;t t
|
|
|
9705 |
+s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
|
|
|
9706 |
+s,@builddir@,$ac_builddir,;t t
|
|
|
9707 |
+s,@abs_builddir@,$ac_abs_builddir,;t t
|
|
|
9708 |
+s,@top_builddir@,$ac_top_builddir,;t t
|
|
|
9709 |
+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
|
|
|
9710 |
+s,@INSTALL@,$ac_INSTALL,;t t
|
|
|
9711 |
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
|
|
|
9712 |
+ rm -f $tmp/stdin
|
|
|
9713 |
+ if test x"$ac_file" != x-; then
|
|
|
9714 |
+ mv $tmp/out $ac_file
|
|
|
9715 |
+ else
|
|
|
9716 |
+ cat $tmp/out
|
|
|
9717 |
+ rm -f $tmp/out
|
|
|
9718 |
+ fi
|
|
|
9719 |
|
|
|
9720 |
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
|
|
|
9721 |
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
|
|
|
9722 |
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
|
|
|
9723 |
- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
|
|
9724 |
-which seems to be undefined. Please make sure it is defined." >&5
|
|
|
9725 |
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
|
|
9726 |
-which seems to be undefined. Please make sure it is defined." >&2;}
|
|
|
9727 |
+done
|
|
|
9728 |
+_ACEOF
|
|
|
9729 |
+cat >>$CONFIG_STATUS <<\_ACEOF
|
|
|
9730 |
|
|
|
9731 |
- rm -f "$tmp/stdin"
|
|
|
9732 |
+#
|
|
|
9733 |
+# CONFIG_HEADER section.
|
|
|
9734 |
+#
|
|
|
9735 |
+
|
|
|
9736 |
+# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
|
|
|
9737 |
+# NAME is the cpp macro being defined and VALUE is the value it is being given.
|
|
|
9738 |
+#
|
|
|
9739 |
+# ac_d sets the value in "#define NAME VALUE" lines.
|
|
|
9740 |
+ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
|
|
|
9741 |
+ac_dB='[ ].*$,\1#\2'
|
|
|
9742 |
+ac_dC=' '
|
|
|
9743 |
+ac_dD=',;t'
|
|
|
9744 |
+# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
|
|
|
9745 |
+ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
|
|
|
9746 |
+ac_uB='$,\1#\2define\3'
|
|
|
9747 |
+ac_uC=' '
|
|
|
9748 |
+ac_uD=',;t'
|
|
|
9749 |
+
|
|
|
9750 |
+for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
|
|
|
9751 |
+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
|
|
|
9752 |
case $ac_file in
|
|
|
9753 |
- -) cat "$tmp/out"; rm -f "$tmp/out";;
|
|
|
9754 |
- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
|
|
|
9755 |
+ - | *:- | *:-:* ) # input from stdin
|
|
|
9756 |
+ cat >$tmp/stdin
|
|
|
9757 |
+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
|
|
|
9758 |
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
|
|
|
9759 |
+ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
|
|
|
9760 |
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
|
|
|
9761 |
+ * ) ac_file_in=$ac_file.in ;;
|
|
|
9762 |
esac
|
|
|
9763 |
- ;;
|
|
|
9764 |
- :H)
|
|
|
9765 |
- #
|
|
|
9766 |
- # CONFIG_HEADER
|
|
|
9767 |
- #
|
|
|
9768 |
-_ACEOF
|
|
|
9769 |
|
|
|
9770 |
-# Transform confdefs.h into a sed script `conftest.defines', that
|
|
|
9771 |
-# substitutes the proper values into config.h.in to produce config.h.
|
|
|
9772 |
-rm -f conftest.defines conftest.tail
|
|
|
9773 |
-# First, append a space to every undef/define line, to ease matching.
|
|
|
9774 |
-echo 's/$/ /' >conftest.defines
|
|
|
9775 |
-# Then, protect against being on the right side of a sed subst, or in
|
|
|
9776 |
-# an unquoted here document, in config.status. If some macros were
|
|
|
9777 |
-# called several times there might be several #defines for the same
|
|
|
9778 |
-# symbol, which is useless. But do not sort them, since the last
|
|
|
9779 |
-# AC_DEFINE must be honored.
|
|
|
9780 |
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
|
|
|
9781 |
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
|
|
|
9782 |
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
|
|
|
9783 |
-# PARAMS is the parameter list in the macro definition--in most cases, it's
|
|
|
9784 |
-# just an empty string.
|
|
|
9785 |
-ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
|
|
|
9786 |
-ac_dB='\\)[ (].*,\\1define\\2'
|
|
|
9787 |
-ac_dC=' '
|
|
|
9788 |
-ac_dD=' ,'
|
|
|
9789 |
+ test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
|
|
|
9790 |
+echo "$as_me: creating $ac_file" >&6;}
|
|
|
9791 |
|
|
|
9792 |
-uniq confdefs.h |
|
|
|
9793 |
- sed -n '
|
|
|
9794 |
- t rset
|
|
|
9795 |
- :rset
|
|
|
9796 |
- s/^[ ]*#[ ]*define[ ][ ]*//
|
|
|
9797 |
- t ok
|
|
|
9798 |
- d
|
|
|
9799 |
- :ok
|
|
|
9800 |
- s/[\\&,]/\\&/g
|
|
|
9801 |
- s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
|
|
|
9802 |
- s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
|
|
|
9803 |
- ' >>conftest.defines
|
|
|
9804 |
+ # First look for the input files in the build tree, otherwise in the
|
|
|
9805 |
+ # src tree.
|
|
|
9806 |
+ ac_file_inputs=`IFS=:
|
|
|
9807 |
+ for f in $ac_file_in; do
|
|
|
9808 |
+ case $f in
|
|
|
9809 |
+ -) echo $tmp/stdin ;;
|
|
|
9810 |
+ [\\/$]*)
|
|
|
9811 |
+ # Absolute (can't be DOS-style, as IFS=:)
|
|
|
9812 |
+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
|
|
|
9813 |
+echo "$as_me: error: cannot find input file: $f" >&2;}
|
|
|
9814 |
+ { (exit 1); exit 1; }; }
|
|
|
9815 |
+ # Do quote $f, to prevent DOS paths from being IFS'd.
|
|
|
9816 |
+ echo "$f";;
|
|
|
9817 |
+ *) # Relative
|
|
|
9818 |
+ if test -f "$f"; then
|
|
|
9819 |
+ # Build tree
|
|
|
9820 |
+ echo "$f"
|
|
|
9821 |
+ elif test -f "$srcdir/$f"; then
|
|
|
9822 |
+ # Source tree
|
|
|
9823 |
+ echo "$srcdir/$f"
|
|
|
9824 |
+ else
|
|
|
9825 |
+ # /dev/null tree
|
|
|
9826 |
+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
|
|
|
9827 |
+echo "$as_me: error: cannot find input file: $f" >&2;}
|
|
|
9828 |
+ { (exit 1); exit 1; }; }
|
|
|
9829 |
+ fi;;
|
|
|
9830 |
+ esac
|
|
|
9831 |
+ done` || { (exit 1); exit 1; }
|
|
|
9832 |
+ # Remove the trailing spaces.
|
|
|
9833 |
+ sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
|
|
|
9834 |
|
|
|
9835 |
-# Remove the space that was appended to ease matching.
|
|
|
9836 |
-# Then replace #undef with comments. This is necessary, for
|
|
|
9837 |
+_ACEOF
|
|
|
9838 |
+
|
|
|
9839 |
+# Transform confdefs.h into two sed scripts, `conftest.defines' and
|
|
|
9840 |
+# `conftest.undefs', that substitutes the proper values into
|
|
|
9841 |
+# config.h.in to produce config.h. The first handles `#define'
|
|
|
9842 |
+# templates, and the second `#undef' templates.
|
|
|
9843 |
+# And first: Protect against being on the right side of a sed subst in
|
|
|
9844 |
+# config.status. Protect against being in an unquoted here document
|
|
|
9845 |
+# in config.status.
|
|
|
9846 |
+rm -f conftest.defines conftest.undefs
|
|
|
9847 |
+# Using a here document instead of a string reduces the quoting nightmare.
|
|
|
9848 |
+# Putting comments in sed scripts is not portable.
|
|
|
9849 |
+#
|
|
|
9850 |
+# `end' is used to avoid that the second main sed command (meant for
|
|
|
9851 |
+# 0-ary CPP macros) applies to n-ary macro definitions.
|
|
|
9852 |
+# See the Autoconf documentation for `clear'.
|
|
|
9853 |
+cat >confdef2sed.sed <<\_ACEOF
|
|
|
9854 |
+s/[\\&,]/\\&/g
|
|
|
9855 |
+s,[\\$`],\\&,g
|
|
|
9856 |
+t clear
|
|
|
9857 |
+: clear
|
|
|
9858 |
+s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
|
|
|
9859 |
+t end
|
|
|
9860 |
+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
|
|
|
9861 |
+: end
|
|
|
9862 |
+_ACEOF
|
|
|
9863 |
+# If some macros were called several times there might be several times
|
|
|
9864 |
+# the same #defines, which is useless. Nevertheless, we may not want to
|
|
|
9865 |
+# sort them, since we want the *last* AC-DEFINE to be honored.
|
|
|
9866 |
+uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
|
|
|
9867 |
+sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
|
|
|
9868 |
+rm -f confdef2sed.sed
|
|
|
9869 |
+
|
|
|
9870 |
+# This sed command replaces #undef with comments. This is necessary, for
|
|
|
9871 |
# example, in the case of _POSIX_SOURCE, which is predefined and required
|
|
|
9872 |
# on some systems where configure will not decide to define it.
|
|
|
9873 |
-# (The regexp can be short, since the line contains either #define or #undef.)
|
|
|
9874 |
-echo 's/ $//
|
|
|
9875 |
-s,^[ #]*u.*,/* & */,' >>conftest.defines
|
|
|
9876 |
+cat >>conftest.undefs <<\_ACEOF
|
|
|
9877 |
+s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
|
|
|
9878 |
+_ACEOF
|
|
|
9879 |
|
|
|
9880 |
-# Break up conftest.defines:
|
|
|
9881 |
-ac_max_sed_lines=50
|
|
|
9882 |
-
|
|
|
9883 |
-# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
|
|
|
9884 |
-# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
|
|
|
9885 |
-# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
|
|
|
9886 |
-# et cetera.
|
|
|
9887 |
-ac_in='$ac_file_inputs'
|
|
|
9888 |
-ac_out='"$tmp/out1"'
|
|
|
9889 |
-ac_nxt='"$tmp/out2"'
|
|
|
9890 |
-
|
|
|
9891 |
-while :
|
|
|
9892 |
+# Break up conftest.defines because some shells have a limit on the size
|
|
|
9893 |
+# of here documents, and old seds have small limits too (100 cmds).
|
|
|
9894 |
+echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
|
|
|
9895 |
+echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
|
|
|
9896 |
+echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
|
|
|
9897 |
+echo ' :' >>$CONFIG_STATUS
|
|
|
9898 |
+rm -f conftest.tail
|
|
|
9899 |
+while grep . conftest.defines >/dev/null
|
|
|
9900 |
do
|
|
|
9901 |
- # Write a here document:
|
|
|
9902 |
- cat >>$CONFIG_STATUS <<_ACEOF
|
|
|
9903 |
- # First, check the format of the line:
|
|
|
9904 |
- cat >"\$tmp/defines.sed" <<\\CEOF
|
|
|
9905 |
-/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
|
|
|
9906 |
-/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
|
|
|
9907 |
-b
|
|
|
9908 |
-:def
|
|
|
9909 |
-_ACEOF
|
|
|
9910 |
- sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
|
|
|
9911 |
+ # Write a limited-size here document to $tmp/defines.sed.
|
|
|
9912 |
+ echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
|
|
|
9913 |
+ # Speed up: don't consider the non `#define' lines.
|
|
|
9914 |
+ echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
|
|
|
9915 |
+ # Work around the forget-to-reset-the-flag bug.
|
|
|
9916 |
+ echo 't clr' >>$CONFIG_STATUS
|
|
|
9917 |
+ echo ': clr' >>$CONFIG_STATUS
|
|
|
9918 |
+ sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
|
|
|
9919 |
echo 'CEOF
|
|
|
9920 |
- sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
|
|
|
9921 |
- ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
|
|
|
9922 |
- sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
|
|
|
9923 |
- grep . conftest.tail >/dev/null || break
|
|
|
9924 |
+ sed -f $tmp/defines.sed $tmp/in >$tmp/out
|
|
|
9925 |
+ rm -f $tmp/in
|
|
|
9926 |
+ mv $tmp/out $tmp/in
|
|
|
9927 |
+' >>$CONFIG_STATUS
|
|
|
9928 |
+ sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
|
|
|
9929 |
rm -f conftest.defines
|
|
|
9930 |
mv conftest.tail conftest.defines
|
|
|
9931 |
done
|
|
|
9932 |
-rm -f conftest.defines conftest.tail
|
|
|
9933 |
+rm -f conftest.defines
|
|
|
9934 |
+echo ' fi # grep' >>$CONFIG_STATUS
|
|
|
9935 |
+echo >>$CONFIG_STATUS
|
|
|
9936 |
|
|
|
9937 |
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
|
|
|
9938 |
+# Break up conftest.undefs because some shells have a limit on the size
|
|
|
9939 |
+# of here documents, and old seds have small limits too (100 cmds).
|
|
|
9940 |
+echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
|
|
|
9941 |
+rm -f conftest.tail
|
|
|
9942 |
+while grep . conftest.undefs >/dev/null
|
|
|
9943 |
+do
|
|
|
9944 |
+ # Write a limited-size here document to $tmp/undefs.sed.
|
|
|
9945 |
+ echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
|
|
|
9946 |
+ # Speed up: don't consider the non `#undef'
|
|
|
9947 |
+ echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
|
|
|
9948 |
+ # Work around the forget-to-reset-the-flag bug.
|
|
|
9949 |
+ echo 't clr' >>$CONFIG_STATUS
|
|
|
9950 |
+ echo ': clr' >>$CONFIG_STATUS
|
|
|
9951 |
+ sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
|
|
|
9952 |
+ echo 'CEOF
|
|
|
9953 |
+ sed -f $tmp/undefs.sed $tmp/in >$tmp/out
|
|
|
9954 |
+ rm -f $tmp/in
|
|
|
9955 |
+ mv $tmp/out $tmp/in
|
|
|
9956 |
+' >>$CONFIG_STATUS
|
|
|
9957 |
+ sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
|
|
|
9958 |
+ rm -f conftest.undefs
|
|
|
9959 |
+ mv conftest.tail conftest.undefs
|
|
|
9960 |
+done
|
|
|
9961 |
+rm -f conftest.undefs
|
|
|
9962 |
+
|
|
|
9963 |
cat >>$CONFIG_STATUS <<\_ACEOF
|
|
|
9964 |
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
|
|
|
9965 |
+ # use $as_me), people would be surprised to read:
|
|
|
9966 |
+ # /* config.h. Generated by config.status. */
|
|
|
9967 |
+ if test x"$ac_file" = x-; then
|
|
|
9968 |
+ echo "/* Generated by configure. */" >$tmp/config.h
|
|
|
9969 |
+ else
|
|
|
9970 |
+ echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
|
|
|
9971 |
+ fi
|
|
|
9972 |
+ cat $tmp/in >>$tmp/config.h
|
|
|
9973 |
+ rm -f $tmp/in
|
|
|
9974 |
if test x"$ac_file" != x-; then
|
|
|
9975 |
- echo "/* $configure_input */" >"$tmp/config.h"
|
|
|
9976 |
- cat "$ac_result" >>"$tmp/config.h"
|
|
|
9977 |
- if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
|
|
|
9978 |
+ if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
|
|
|
9979 |
{ echo "$as_me:$LINENO: $ac_file is unchanged" >&5
|
|
|
9980 |
echo "$as_me: $ac_file is unchanged" >&6;}
|
|
|
9981 |
else
|
|
|
9982 |
+ ac_dir=`(dirname "$ac_file") 2>/dev/null ||
|
|
|
9983 |
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
|
9984 |
+ X"$ac_file" : 'X\(//\)[^/]' \| \
|
|
|
9985 |
+ X"$ac_file" : 'X\(//\)$' \| \
|
|
|
9986 |
+ X"$ac_file" : 'X\(/\)' \| \
|
|
|
9987 |
+ . : '\(.\)' 2>/dev/null ||
|
|
|
9988 |
+echo X"$ac_file" |
|
|
|
9989 |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
|
9990 |
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
|
9991 |
+ /^X\(\/\/\)$/{ s//\1/; q; }
|
|
|
9992 |
+ /^X\(\/\).*/{ s//\1/; q; }
|
|
|
9993 |
+ s/.*/./; q'`
|
|
|
9994 |
+ { if $as_mkdir_p; then
|
|
|
9995 |
+ mkdir -p "$ac_dir"
|
|
|
9996 |
+ else
|
|
|
9997 |
+ as_dir="$ac_dir"
|
|
|
9998 |
+ as_dirs=
|
|
|
9999 |
+ while test ! -d "$as_dir"; do
|
|
|
10000 |
+ as_dirs="$as_dir $as_dirs"
|
|
|
10001 |
+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
|
|
|
10002 |
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
|
10003 |
+ X"$as_dir" : 'X\(//\)[^/]' \| \
|
|
|
10004 |
+ X"$as_dir" : 'X\(//\)$' \| \
|
|
|
10005 |
+ X"$as_dir" : 'X\(/\)' \| \
|
|
|
10006 |
+ . : '\(.\)' 2>/dev/null ||
|
|
|
10007 |
+echo X"$as_dir" |
|
|
|
10008 |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
|
10009 |
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
|
10010 |
+ /^X\(\/\/\)$/{ s//\1/; q; }
|
|
|
10011 |
+ /^X\(\/\).*/{ s//\1/; q; }
|
|
|
10012 |
+ s/.*/./; q'`
|
|
|
10013 |
+ done
|
|
|
10014 |
+ test ! -n "$as_dirs" || mkdir $as_dirs
|
|
|
10015 |
+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
|
|
|
10016 |
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
|
|
|
10017 |
+ { (exit 1); exit 1; }; }; }
|
|
|
10018 |
+
|
|
|
10019 |
rm -f $ac_file
|
|
|
10020 |
- mv "$tmp/config.h" $ac_file
|
|
|
10021 |
+ mv $tmp/config.h $ac_file
|
|
|
10022 |
fi
|
|
|
10023 |
else
|
|
|
10024 |
- echo "/* $configure_input */"
|
|
|
10025 |
- cat "$ac_result"
|
|
|
10026 |
+ cat $tmp/config.h
|
|
|
10027 |
+ rm -f $tmp/config.h
|
|
|
10028 |
fi
|
|
|
10029 |
- rm -f "$tmp/out12"
|
|
|
10030 |
# Compute $ac_file's index in $config_headers.
|
|
|
10031 |
_am_stamp_count=1
|
|
|
10032 |
for _am_header in $config_headers :; do
|
|
|
10033 |
@@ -9143,39 +8708,135 @@
|
|
|
10034 |
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
|
|
|
10035 |
esac
|
|
|
10036 |
done
|
|
|
10037 |
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
|
|
|
10038 |
+echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
|
|
|
10039 |
$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
|
10040 |
X$ac_file : 'X\(//\)[^/]' \| \
|
|
|
10041 |
X$ac_file : 'X\(//\)$' \| \
|
|
|
10042 |
- X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
|
|
|
10043 |
+ X$ac_file : 'X\(/\)' \| \
|
|
|
10044 |
+ . : '\(.\)' 2>/dev/null ||
|
|
|
10045 |
echo X$ac_file |
|
|
|
10046 |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
|
10047 |
- s//\1/
|
|
|
10048 |
- q
|
|
|
10049 |
- }
|
|
|
10050 |
- /^X\(\/\/\)[^/].*/{
|
|
|
10051 |
- s//\1/
|
|
|
10052 |
- q
|
|
|
10053 |
- }
|
|
|
10054 |
- /^X\(\/\/\)$/{
|
|
|
10055 |
- s//\1/
|
|
|
10056 |
- q
|
|
|
10057 |
- }
|
|
|
10058 |
- /^X\(\/\).*/{
|
|
|
10059 |
- s//\1/
|
|
|
10060 |
- q
|
|
|
10061 |
- }
|
|
|
10062 |
- s/.*/./; q'`/stamp-h$_am_stamp_count
|
|
|
10063 |
- ;;
|
|
|
10064 |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
|
10065 |
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
|
10066 |
+ /^X\(\/\/\)$/{ s//\1/; q; }
|
|
|
10067 |
+ /^X\(\/\).*/{ s//\1/; q; }
|
|
|
10068 |
+ s/.*/./; q'`/stamp-h$_am_stamp_count
|
|
|
10069 |
+done
|
|
|
10070 |
+_ACEOF
|
|
|
10071 |
+cat >>$CONFIG_STATUS <<\_ACEOF
|
|
|
10072 |
|
|
|
10073 |
- :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
|
|
|
10074 |
-echo "$as_me: executing $ac_file commands" >&6;}
|
|
|
10075 |
- ;;
|
|
|
10076 |
- esac
|
|
|
10077 |
+#
|
|
|
10078 |
+# CONFIG_COMMANDS section.
|
|
|
10079 |
+#
|
|
|
10080 |
+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
|
|
|
10081 |
+ ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
|
|
|
10082 |
+ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
|
|
|
10083 |
+ ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
|
|
|
10084 |
+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
|
10085 |
+ X"$ac_dest" : 'X\(//\)[^/]' \| \
|
|
|
10086 |
+ X"$ac_dest" : 'X\(//\)$' \| \
|
|
|
10087 |
+ X"$ac_dest" : 'X\(/\)' \| \
|
|
|
10088 |
+ . : '\(.\)' 2>/dev/null ||
|
|
|
10089 |
+echo X"$ac_dest" |
|
|
|
10090 |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
|
10091 |
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
|
10092 |
+ /^X\(\/\/\)$/{ s//\1/; q; }
|
|
|
10093 |
+ /^X\(\/\).*/{ s//\1/; q; }
|
|
|
10094 |
+ s/.*/./; q'`
|
|
|
10095 |
+ { if $as_mkdir_p; then
|
|
|
10096 |
+ mkdir -p "$ac_dir"
|
|
|
10097 |
+ else
|
|
|
10098 |
+ as_dir="$ac_dir"
|
|
|
10099 |
+ as_dirs=
|
|
|
10100 |
+ while test ! -d "$as_dir"; do
|
|
|
10101 |
+ as_dirs="$as_dir $as_dirs"
|
|
|
10102 |
+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
|
|
|
10103 |
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
|
10104 |
+ X"$as_dir" : 'X\(//\)[^/]' \| \
|
|
|
10105 |
+ X"$as_dir" : 'X\(//\)$' \| \
|
|
|
10106 |
+ X"$as_dir" : 'X\(/\)' \| \
|
|
|
10107 |
+ . : '\(.\)' 2>/dev/null ||
|
|
|
10108 |
+echo X"$as_dir" |
|
|
|
10109 |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
|
10110 |
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
|
10111 |
+ /^X\(\/\/\)$/{ s//\1/; q; }
|
|
|
10112 |
+ /^X\(\/\).*/{ s//\1/; q; }
|
|
|
10113 |
+ s/.*/./; q'`
|
|
|
10114 |
+ done
|
|
|
10115 |
+ test ! -n "$as_dirs" || mkdir $as_dirs
|
|
|
10116 |
+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
|
|
|
10117 |
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
|
|
|
10118 |
+ { (exit 1); exit 1; }; }; }
|
|
|
10119 |
|
|
|
10120 |
+ ac_builddir=.
|
|
|
10121 |
|
|
|
10122 |
- case $ac_file$ac_mode in
|
|
|
10123 |
- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
|
|
|
10124 |
+if test "$ac_dir" != .; then
|
|
|
10125 |
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
|
|
|
10126 |
+ # A "../" for each directory in $ac_dir_suffix.
|
|
|
10127 |
+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
|
|
|
10128 |
+else
|
|
|
10129 |
+ ac_dir_suffix= ac_top_builddir=
|
|
|
10130 |
+fi
|
|
|
10131 |
+
|
|
|
10132 |
+case $srcdir in
|
|
|
10133 |
+ .) # No --srcdir option. We are building in place.
|
|
|
10134 |
+ ac_srcdir=.
|
|
|
10135 |
+ if test -z "$ac_top_builddir"; then
|
|
|
10136 |
+ ac_top_srcdir=.
|
|
|
10137 |
+ else
|
|
|
10138 |
+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
|
|
|
10139 |
+ fi ;;
|
|
|
10140 |
+ [\\/]* | ?:[\\/]* ) # Absolute path.
|
|
|
10141 |
+ ac_srcdir=$srcdir$ac_dir_suffix;
|
|
|
10142 |
+ ac_top_srcdir=$srcdir ;;
|
|
|
10143 |
+ *) # Relative path.
|
|
|
10144 |
+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
|
|
|
10145 |
+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
|
|
|
10146 |
+esac
|
|
|
10147 |
+
|
|
|
10148 |
+# Do not use `cd foo && pwd` to compute absolute paths, because
|
|
|
10149 |
+# the directories may not exist.
|
|
|
10150 |
+case `pwd` in
|
|
|
10151 |
+.) ac_abs_builddir="$ac_dir";;
|
|
|
10152 |
+*)
|
|
|
10153 |
+ case "$ac_dir" in
|
|
|
10154 |
+ .) ac_abs_builddir=`pwd`;;
|
|
|
10155 |
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
|
|
|
10156 |
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
|
|
|
10157 |
+ esac;;
|
|
|
10158 |
+esac
|
|
|
10159 |
+case $ac_abs_builddir in
|
|
|
10160 |
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
|
|
|
10161 |
+*)
|
|
|
10162 |
+ case ${ac_top_builddir}. in
|
|
|
10163 |
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
|
|
|
10164 |
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
|
|
|
10165 |
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
|
|
|
10166 |
+ esac;;
|
|
|
10167 |
+esac
|
|
|
10168 |
+case $ac_abs_builddir in
|
|
|
10169 |
+.) ac_abs_srcdir=$ac_srcdir;;
|
|
|
10170 |
+*)
|
|
|
10171 |
+ case $ac_srcdir in
|
|
|
10172 |
+ .) ac_abs_srcdir=$ac_abs_builddir;;
|
|
|
10173 |
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
|
|
|
10174 |
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
|
|
|
10175 |
+ esac;;
|
|
|
10176 |
+esac
|
|
|
10177 |
+case $ac_abs_builddir in
|
|
|
10178 |
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
|
|
|
10179 |
+*)
|
|
|
10180 |
+ case $ac_top_srcdir in
|
|
|
10181 |
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
|
|
|
10182 |
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
|
|
|
10183 |
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
|
|
|
10184 |
+ esac;;
|
|
|
10185 |
+esac
|
|
|
10186 |
+
|
|
|
10187 |
+
|
|
|
10188 |
+ { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
|
|
|
10189 |
+echo "$as_me: executing $ac_dest commands" >&6;}
|
|
|
10190 |
+ case $ac_dest in
|
|
|
10191 |
+ depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
|
|
|
10192 |
# Strip MF so we end up with the name of the file.
|
|
|
10193 |
mf=`echo "$mf" | sed -e 's/:.*$//'`
|
|
|
10194 |
# Check whether this is an Automake generated Makefile or not.
|
|
|
10195 |
@@ -9185,29 +8846,18 @@
|
|
|
10196 |
# each Makefile.in and add a new line on top of each file to say so.
|
|
|
10197 |
# So let's grep whole file.
|
|
|
10198 |
if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
|
|
|
10199 |
- dirpart=`$as_dirname -- "$mf" ||
|
|
|
10200 |
+ dirpart=`(dirname "$mf") 2>/dev/null ||
|
|
|
10201 |
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
|
10202 |
X"$mf" : 'X\(//\)[^/]' \| \
|
|
|
10203 |
X"$mf" : 'X\(//\)$' \| \
|
|
|
10204 |
- X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
|
|
|
10205 |
+ X"$mf" : 'X\(/\)' \| \
|
|
|
10206 |
+ . : '\(.\)' 2>/dev/null ||
|
|
|
10207 |
echo X"$mf" |
|
|
|
10208 |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
|
10209 |
- s//\1/
|
|
|
10210 |
- q
|
|
|
10211 |
- }
|
|
|
10212 |
- /^X\(\/\/\)[^/].*/{
|
|
|
10213 |
- s//\1/
|
|
|
10214 |
- q
|
|
|
10215 |
- }
|
|
|
10216 |
- /^X\(\/\/\)$/{
|
|
|
10217 |
- s//\1/
|
|
|
10218 |
- q
|
|
|
10219 |
- }
|
|
|
10220 |
- /^X\(\/\).*/{
|
|
|
10221 |
- s//\1/
|
|
|
10222 |
- q
|
|
|
10223 |
- }
|
|
|
10224 |
- s/.*/./; q'`
|
|
|
10225 |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
|
10226 |
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
|
10227 |
+ /^X\(\/\/\)$/{ s//\1/; q; }
|
|
|
10228 |
+ /^X\(\/\).*/{ s//\1/; q; }
|
|
|
10229 |
+ s/.*/./; q'`
|
|
|
10230 |
else
|
|
|
10231 |
continue
|
|
|
10232 |
fi
|
|
|
10233 |
@@ -9235,76 +8885,49 @@
|
|
|
10234 |
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
|
|
|
10235 |
# Make sure the directory exists.
|
|
|
10236 |
test -f "$dirpart/$file" && continue
|
|
|
10237 |
- fdir=`$as_dirname -- "$file" ||
|
|
|
10238 |
+ fdir=`(dirname "$file") 2>/dev/null ||
|
|
|
10239 |
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
|
10240 |
X"$file" : 'X\(//\)[^/]' \| \
|
|
|
10241 |
X"$file" : 'X\(//\)$' \| \
|
|
|
10242 |
- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
|
|
|
10243 |
+ X"$file" : 'X\(/\)' \| \
|
|
|
10244 |
+ . : '\(.\)' 2>/dev/null ||
|
|
|
10245 |
echo X"$file" |
|
|
|
10246 |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
|
10247 |
- s//\1/
|
|
|
10248 |
- q
|
|
|
10249 |
- }
|
|
|
10250 |
- /^X\(\/\/\)[^/].*/{
|
|
|
10251 |
- s//\1/
|
|
|
10252 |
- q
|
|
|
10253 |
- }
|
|
|
10254 |
- /^X\(\/\/\)$/{
|
|
|
10255 |
- s//\1/
|
|
|
10256 |
- q
|
|
|
10257 |
- }
|
|
|
10258 |
- /^X\(\/\).*/{
|
|
|
10259 |
- s//\1/
|
|
|
10260 |
- q
|
|
|
10261 |
- }
|
|
|
10262 |
- s/.*/./; q'`
|
|
|
10263 |
- { as_dir=$dirpart/$fdir
|
|
|
10264 |
- case $as_dir in #(
|
|
|
10265 |
- -*) as_dir=./$as_dir;;
|
|
|
10266 |
- esac
|
|
|
10267 |
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
|
|
|
10268 |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
|
10269 |
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
|
10270 |
+ /^X\(\/\/\)$/{ s//\1/; q; }
|
|
|
10271 |
+ /^X\(\/\).*/{ s//\1/; q; }
|
|
|
10272 |
+ s/.*/./; q'`
|
|
|
10273 |
+ { if $as_mkdir_p; then
|
|
|
10274 |
+ mkdir -p $dirpart/$fdir
|
|
|
10275 |
+ else
|
|
|
10276 |
+ as_dir=$dirpart/$fdir
|
|
|
10277 |
as_dirs=
|
|
|
10278 |
- while :; do
|
|
|
10279 |
- case $as_dir in #(
|
|
|
10280 |
- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
|
|
|
10281 |
- *) as_qdir=$as_dir;;
|
|
|
10282 |
- esac
|
|
|
10283 |
- as_dirs="'$as_qdir' $as_dirs"
|
|
|
10284 |
- as_dir=`$as_dirname -- "$as_dir" ||
|
|
|
10285 |
+ while test ! -d "$as_dir"; do
|
|
|
10286 |
+ as_dirs="$as_dir $as_dirs"
|
|
|
10287 |
+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
|
|
|
10288 |
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
|
10289 |
X"$as_dir" : 'X\(//\)[^/]' \| \
|
|
|
10290 |
X"$as_dir" : 'X\(//\)$' \| \
|
|
|
10291 |
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
|
|
|
10292 |
+ X"$as_dir" : 'X\(/\)' \| \
|
|
|
10293 |
+ . : '\(.\)' 2>/dev/null ||
|
|
|
10294 |
echo X"$as_dir" |
|
|
|
10295 |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
|
10296 |
- s//\1/
|
|
|
10297 |
- q
|
|
|
10298 |
- }
|
|
|
10299 |
- /^X\(\/\/\)[^/].*/{
|
|
|
10300 |
- s//\1/
|
|
|
10301 |
- q
|
|
|
10302 |
- }
|
|
|
10303 |
- /^X\(\/\/\)$/{
|
|
|
10304 |
- s//\1/
|
|
|
10305 |
- q
|
|
|
10306 |
- }
|
|
|
10307 |
- /^X\(\/\).*/{
|
|
|
10308 |
- s//\1/
|
|
|
10309 |
- q
|
|
|
10310 |
- }
|
|
|
10311 |
- s/.*/./; q'`
|
|
|
10312 |
- test -d "$as_dir" && break
|
|
|
10313 |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
|
10314 |
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
|
10315 |
+ /^X\(\/\/\)$/{ s//\1/; q; }
|
|
|
10316 |
+ /^X\(\/\).*/{ s//\1/; q; }
|
|
|
10317 |
+ s/.*/./; q'`
|
|
|
10318 |
done
|
|
|
10319 |
- test -z "$as_dirs" || eval "mkdir $as_dirs"
|
|
|
10320 |
- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
|
|
|
10321 |
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
|
|
|
10322 |
+ test ! -n "$as_dirs" || mkdir $as_dirs
|
|
|
10323 |
+ fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
|
|
|
10324 |
+echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
|
|
|
10325 |
{ (exit 1); exit 1; }; }; }
|
|
|
10326 |
+
|
|
|
10327 |
# echo "creating $dirpart/$file"
|
|
|
10328 |
echo '# dummy' > "$dirpart/$file"
|
|
|
10329 |
done
|
|
|
10330 |
done
|
|
|
10331 |
;;
|
|
|
10332 |
- "intltool":C)
|
|
|
10333 |
+ intltool )
|
|
|
10334 |
|
|
|
10335 |
for file in intltool-extract intltool-merge intltool-update; do
|
|
|
10336 |
sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
|
|
|
10337 |
@@ -9325,10 +8948,10 @@
|
|
|
10338 |
done
|
|
|
10339 |
|
|
|
10340 |
;;
|
|
|
10341 |
- "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
|
|
|
10342 |
+ default-1 ) case "$CONFIG_FILES" in *po/Makefile.in*)
|
|
|
10343 |
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
|
|
|
10344 |
esac ;;
|
|
|
10345 |
- "po/stamp-it":C)
|
|
|
10346 |
+ po/stamp-it )
|
|
|
10347 |
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
|
|
|
10348 |
>"po/stamp-it.tmp"
|
|
|
10349 |
sed '/^#/d
|
|
|
10350 |
@@ -9351,10 +8974,11 @@
|
|
|
10351 |
rm -f "po/Makefile.tmp"
|
|
|
10352 |
mv "po/stamp-it.tmp" "po/stamp-it"
|
|
|
10353 |
;;
|
|
|
10354 |
-
|
|
|
10355 |
esac
|
|
|
10356 |
-done # for ac_tag
|
|
|
10357 |
+done
|
|
|
10358 |
+_ACEOF
|
|
|
10359 |
|
|
|
10360 |
+cat >>$CONFIG_STATUS <<\_ACEOF
|
|
|
10361 |
|
|
|
10362 |
{ (exit 0); exit 0; }
|
|
|
10363 |
_ACEOF
|
|
|
10364 |
diff -ur xfce4-mpc-plugin-0.3.1.orig//configure.ac xfce4-mpc-plugin-0.3.1//configure.ac
|
|
|
10365 |
--- xfce4-mpc-plugin-0.3.1.orig//configure.ac ne led 28 19:22:11 2007
|
|
|
10366 |
+++ xfce4-mpc-plugin-0.3.1//configure.ac so dub 21 18:36:10 2007
|
|
|
10367 |
@@ -30,6 +30,10 @@
|
|
|
10368 |
dnl configure the panel plugin
|
|
|
10369 |
XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.22])
|
|
|
10370 |
|
|
|
10371 |
+dnl Solaris net libraries
|
|
|
10372 |
+AC_CHECK_LIB(nsl, inet_ntop, SOLLIBS="$LIBS -lnsl -lsocket", SOLLIBS="$LIBS")
|
|
|
10373 |
+AC_SUBST(SOLLIBS)
|
|
|
10374 |
+
|
|
|
10375 |
dnl check for libmpd presence
|
|
|
10376 |
AM_CONDITIONAL(HAVE_LIBMPD, false)
|
|
|
10377 |
AC_ARG_WITH(libmpd,
|
|
|
10378 |
Common subdirectories: xfce4-mpc-plugin-0.3.1.orig//panel-plugin and xfce4-mpc-plugin-0.3.1//panel-plugin
|
|
|
10379 |
Common subdirectories: xfce4-mpc-plugin-0.3.1.orig//po and xfce4-mpc-plugin-0.3.1//po
|
|
|
10380 |
diff -ur xfce4-mpc-plugin-0.3.1.orig//panel-plugin/Makefile.am xfce4-mpc-plugin-0.3.1//panel-plugin/Makefile.am
|
|
|
10381 |
--- xfce4-mpc-plugin-0.3.1.orig//panel-plugin/Makefile.am čt říj 26 21:27:37 2006
|
|
|
10382 |
+++ xfce4-mpc-plugin-0.3.1//panel-plugin/Makefile.am so dub 21 18:45:41 2007
|
|
|
10383 |
@@ -1,11 +1,15 @@
|
|
|
10384 |
plugindir = $(libexecdir)/xfce4/panel-plugins
|
|
|
10385 |
plugin_PROGRAMS = xfce4-mpc-plugin
|
|
|
10386 |
|
|
|
10387 |
+SOLLIBS = @SOLLIBS@
|
|
|
10388 |
+LIBS = @LIBS@ @SOLLIBS@
|
|
|
10389 |
+
|
|
|
10390 |
xfce4_mpc_plugin_CFLAGS = \
|
|
|
10391 |
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
|
|
|
10392 |
@LIBXFCE4PANEL_CFLAGS@
|
|
|
10393 |
|
|
|
10394 |
xfce4_mpc_plugin_LDFLAGS = \
|
|
|
10395 |
+ @SOLLIBS@ \
|
|
|
10396 |
@LIBXFCE4PANEL_LIBS@
|
|
|
10397 |
|
|
|
10398 |
|
|
|
10399 |
diff -ur xfce4-mpc-plugin-0.3.1.orig//panel-plugin/Makefile.in xfce4-mpc-plugin-0.3.1//panel-plugin/Makefile.in
|
|
|
10400 |
--- xfce4-mpc-plugin-0.3.1.orig//panel-plugin/Makefile.in ne led 28 19:30:51 2007
|
|
|
10401 |
+++ xfce4-mpc-plugin-0.3.1//panel-plugin/Makefile.in so dub 21 18:32:19 2007
|
|
|
10402 |
@@ -108,7 +108,7 @@
|
|
|
10403 |
LIBMPD_REQUIRED_VERSION = @LIBMPD_REQUIRED_VERSION@
|
|
|
10404 |
LIBMPD_VERSION = @LIBMPD_VERSION@
|
|
|
10405 |
LIBOBJS = @LIBOBJS@
|
|
|
10406 |
-LIBS = @LIBS@
|
|
|
10407 |
+LIBS = @LIBS@ @SOLLIBS@
|
|
|
10408 |
LIBXFCE4PANEL_CFLAGS = @LIBXFCE4PANEL_CFLAGS@
|
|
|
10409 |
LIBXFCE4PANEL_LIBS = @LIBXFCE4PANEL_LIBS@
|
|
|
10410 |
LIBXFCE4PANEL_REQUIRED_VERSION = @LIBXFCE4PANEL_REQUIRED_VERSION@
|
|
|
10411 |
@@ -135,6 +135,7 @@
|
|
|
10412 |
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
|
|
|
10413 |
SET_MAKE = @SET_MAKE@
|
|
|
10414 |
SHELL = @SHELL@
|
|
|
10415 |
+SOLLIBS = @SOLLIBS@
|
|
|
10416 |
STRIP = @STRIP@
|
|
|
10417 |
USE_NLS = @USE_NLS@
|
|
|
10418 |
VERSION = @VERSION@
|
|
|
10419 |
@@ -189,6 +190,7 @@
|
|
|
10420 |
$(am__append_1)
|
|
|
10421 |
|
|
|
10422 |
xfce4_mpc_plugin_LDFLAGS = \
|
|
|
10423 |
+ @SOLLIBS@\
|
|
|
10424 |
@LIBXFCE4PANEL_LIBS@\
|
|
|
10425 |
$(am__append_2)
|
|
|
10426 |
|