32
24
AUTOCONF = @AUTOCONF@
33
25
AUTOHEADER = @AUTOHEADER@
35
PACKAGE_NAME = @PACKAGE_NAME@
36
PACKAGE_STRING = @PACKAGE_STRING@
37
PACKAGE_TARNAME = @PACKAGE_TARNAME@
38
+PACKAGE_URL = @PACKAGE_URL@
39
PACKAGE_VERSION = @PACKAGE_VERSION@
40
PATH_SEPARATOR = @PATH_SEPARATOR@
41
PKG_CONFIG = @PKG_CONFIG@
43
# (which will cause the Makefiles to be regenerated when you run `make');
44
# (2) otherwise, pass the desired values on the `make' command line.
46
- @failcom='exit 1'; \
47
+ @fail= failcom='exit 1'; \
48
for f in x $$MAKEFLAGS; do \
54
$(RECURSIVE_CLEAN_TARGETS):
55
- @failcom='exit 1'; \
56
+ @fail= failcom='exit 1'; \
57
for f in x $$MAKEFLAGS; do \
61
top_distdir="$(top_distdir)" distdir="$(distdir)" \
63
-test -n "$(am__skip_mode_fix)" \
64
- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
65
+ || find "$(distdir)" -type d ! -perm -755 \
66
+ -exec chmod u+rwx,go+rx {} \; -o \
67
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
68
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
69
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
72
case '$(DIST_ARCHIVES)' in \
74
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
75
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
77
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
78
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
80
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
81
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
83
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
85
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
87
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
88
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
90
unzip $(distdir).zip ;;\
92
Index: brasero-2.30.1/aclocal.m4
27
libexecdir = @libexecdir@
28
localedir = @localedir@
29
localstatedir = @localstatedir@
33
oldincludedir = @oldincludedir@
34
Index: brasero-2.30.2/aclocal.m4
93
35
===================================================================
94
--- brasero-2.30.1.orig/aclocal.m4 2010-04-29 10:36:24.165307793 +1000
95
+++ brasero-2.30.1/aclocal.m4 2010-04-29 10:36:16.052807876 +1000
97
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
98
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
100
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
101
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
104
m4_ifndef([AC_AUTOCONF_VERSION],
105
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
106
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
107
-[m4_warning([this file was generated for autoconf 2.63.
108
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
109
+[m4_warning([this file was generated for autoconf 2.65.
110
You have another version of autoconf. It may work, but is not guaranteed to.
111
If you have problems, you may need to regenerate the build system entirely.
112
To do so, use the procedure documented by the package, typically `autoreconf'.])])
114
AC_DEFUN([IT_PO_SUBDIR],
115
[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
117
-dnl The following CONFIG_COMMANDS should be executed at the very end
118
+dnl The following CONFIG_COMMANDS should be exetuted at the very end
119
dnl of config.status.
120
AC_CONFIG_COMMANDS_PRE([
121
AC_CONFIG_COMMANDS([$1/stamp-it], [
122
@@ -3444,7 +3444,7 @@
125
# This must be Linux ELF.
126
-linux* | k*bsd*-gnu)
127
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
131
@@ -3484,6 +3484,18 @@
36
--- brasero-2.30.2.orig/aclocal.m4 2010-06-22 02:14:22.000000000 +0200
37
+++ brasero-2.30.2/aclocal.m4 2010-06-24 12:24:33.830700000 +0200
39
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
41
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
42
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
44
+# 2006, 2007, 2008 Free Software Foundation, Inc.
45
# Written by Gordon Matzigkeit, 1996
47
# This file is free software; the Free Software Foundation gives
50
m4_define([_LT_COPYING], [dnl
51
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
52
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
54
+# 2006, 2007, 2008 Free Software Foundation, Inc.
55
# Written by Gordon Matzigkeit, 1996
57
# This file is part of GNU Libtool.
59
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
70
[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
71
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
72
AC_BEFORE([$0], [LT_LANG])dnl
73
AC_BEFORE([$0], [LT_OUTPUT])dnl
74
AC_BEFORE([$0], [LTDL_INIT])dnl
76
AC_REQUIRE([LTOBSOLETE_VERSION])dnl
77
m4_require([_LT_PROG_LTMAIN])dnl
79
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
82
_LT_SET_OPTIONS([$0], [$1])
88
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
89
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
95
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
96
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
97
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
98
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
100
_LT_DECL([], [host_alias], [0], [The host system])dnl
101
_LT_DECL([], [host], [0])dnl
102
_LT_DECL([], [host_os], [0])dnl
103
@@ -1192,6 +1184,7 @@
106
m4_require([_LT_TAG_COMPILER])dnl
107
+_LT_PROG_ECHO_BACKSLASH
111
@@ -1205,6 +1198,23 @@
115
+# Sed substitution that helps us do robust quoting. It backslashifies
116
+# metacharacters that are still active within double-quoted strings.
117
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
119
+# Same as above, but do not quote variable references.
120
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
122
+# Sed substitution to delay expansion of an escaped shell variable in a
123
+# double_quote_subst'ed string.
124
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
126
+# Sed substitution to delay expansion of an escaped single quote.
127
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
129
+# Sed substitution to avoid accidental globbing in evaled expressions
130
+no_glob_subst='s/\*/\\\*/g'
135
@@ -1245,28 +1255,6 @@
139
-# _LT_PREPARE_SED_QUOTE_VARS
140
-# --------------------------
141
-# Define a few sed substitution that help us do robust quoting.
142
-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
143
-[# Backslashify metacharacters that are still active within
144
-# double-quoted strings.
145
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
147
-# Same as above, but do not quote variable references.
148
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
150
-# Sed substitution to delay expansion of an escaped shell variable in a
151
-# double_quote_subst'ed string.
152
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
154
-# Sed substitution to delay expansion of an escaped single quote.
155
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
157
-# Sed substitution to avoid accidental globbing in evaled expressions
158
-no_glob_subst='s/\*/\\\*/g'
163
# Note that this code is called both from `configure', and `config.status'
164
@@ -1419,7 +1407,7 @@
165
# declaration there will have the same value as in `configure'. VARNAME
166
# must have a single quote delimited value for this to work.
167
m4_define([_LT_CONFIG_STATUS_DECLARE],
168
-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
169
+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
172
# _LT_CONFIG_STATUS_DECLARATIONS
173
@@ -1429,7 +1417,7 @@
174
# embedded single quotes properly. In configure, this macro expands
175
# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
177
-# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
178
+# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
179
m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
180
[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
181
[m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
182
@@ -1528,20 +1516,12 @@
184
compiler='$compiler_DEFAULT'
186
-# A function that is used when there is no print builtin or printf.
187
-func_fallback_echo ()
189
- eval 'cat <<_LTECHO_EOF
194
# Quote evaled strings.
195
for var in lt_decl_all_varnames([[ \
196
]], lt_decl_quote_varnames); do
197
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
198
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
199
*[[\\\\\\\`\\"\\\$]]*)
200
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
201
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
204
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
205
@@ -1552,9 +1532,9 @@
206
# Double-quote double-evaled strings.
207
for var in lt_decl_all_varnames([[ \
208
]], lt_decl_dquote_varnames); do
209
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
210
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
211
*[[\\\\\\\`\\"\\\$]]*)
212
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
213
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
216
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
217
@@ -1562,38 +1542,16 @@
221
+# Fix-up fallback echo if it was mangled by the above quoting rules.
223
+*'\\\[$]0 --fallback-echo"')dnl "
224
+ lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
228
_LT_OUTPUT_LIBTOOL_INIT
231
-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
232
-# ------------------------------------
233
-# Generate a child script FILE with all initialization necessary to
234
-# reuse the environment learned by the parent script, and make the
235
-# file executable. If COMMENT is supplied, it is inserted after the
236
-# `#!' sequence but before initialization text begins. After this
237
-# macro, additional text can be appended to FILE to form the body of
238
-# the child script. The macro ends with non-zero status if the
239
-# file could not be fully written (such as if the disk is full).
240
-m4_ifdef([AS_INIT_GENERATED],
241
-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
242
-[m4_defun([_LT_GENERATED_FILE_INIT],
243
-[m4_require([AS_PREPARE])]dnl
244
-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
246
-cat >$1 <<_ASEOF || lt_write_fail=1
248
-# Generated by $as_me.
250
-SHELL=\${CONFIG_SHELL-$SHELL}
253
-cat >>$1 <<\_ASEOF || lt_write_fail=1
256
-exec AS_MESSAGE_FD>&1
258
-test $lt_write_fail = 0 && chmod +x $1[]dnl
259
-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
263
@@ -1603,11 +1561,20 @@
264
AC_DEFUN([LT_OUTPUT],
265
[: ${CONFIG_LT=./config.lt}
266
AC_MSG_NOTICE([creating $CONFIG_LT])
267
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
268
-[# Run this file to recreate a libtool stub with the current configuration.])
269
+cat >"$CONFIG_LT" <<_LTEOF
271
+# Generated by $as_me.
272
+# Run this file to recreate a libtool stub with the current configuration.
274
-cat >>"$CONFIG_LT" <<\_LTEOF
276
+SHELL=\${CONFIG_SHELL-$SHELL}
279
+cat >>"$CONFIG_LT" <<\_LTEOF
283
+exec AS_MESSAGE_FD>&1
284
exec AS_MESSAGE_LOG_FD>>config.log
287
@@ -1633,7 +1600,7 @@
288
m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
289
configured by $[0], generated by m4_PACKAGE_STRING.
291
-Copyright (C) 2010 Free Software Foundation, Inc.
292
+Copyright (C) 2008 Free Software Foundation, Inc.
293
This config.lt script is free software; the Free Software Foundation
294
gives unlimited permision to copy, distribute and modify it."
296
@@ -1678,13 +1645,15 @@
297
# appending to config.log, which fails on DOS, as config.log is still kept
298
# open by configure. Here we exec the FD to /dev/null, effectively closing
299
# config.log, so it can be properly (re)opened and appended to by config.lt.
301
-test "$silent" = yes &&
302
- lt_config_lt_args="$lt_config_lt_args --quiet"
303
-exec AS_MESSAGE_LOG_FD>/dev/null
304
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
305
-exec AS_MESSAGE_LOG_FD>>config.log
306
-$lt_cl_success || AS_EXIT(1)
307
+if test "$no_create" != yes; then
309
+ test "$silent" = yes &&
310
+ lt_config_lt_args="$lt_config_lt_args --quiet"
311
+ exec AS_MESSAGE_LOG_FD>/dev/null
312
+ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
313
+ exec AS_MESSAGE_LOG_FD>>config.log
314
+ $lt_cl_success || AS_EXIT(1)
319
@@ -1861,13 +1830,11 @@
320
AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
321
AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
322
AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
323
-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
324
dnl aclocal-1.4 backwards compatibility:
325
dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
326
dnl AC_DEFUN([AC_LIBTOOL_F77], [])
327
dnl AC_DEFUN([AC_LIBTOOL_FC], [])
328
dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
329
-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
333
@@ -1972,31 +1939,6 @@
334
[lt_cv_ld_exported_symbols_list=no])
335
LDFLAGS="$save_LDFLAGS"
337
- AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
338
- [lt_cv_ld_force_load=no
339
- cat > conftest.c << _LT_EOF
340
-int forced_loaded() { return 2;}
342
- echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
343
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
344
- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
345
- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
346
- echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
347
- $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
348
- cat > conftest.c << _LT_EOF
349
-int main() { return 0;}
351
- echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
352
- $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
354
- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
355
- lt_cv_ld_force_load=yes
357
- cat conftest.err >&AS_MESSAGE_LOG_FD
359
- rm -f conftest.err libconftest.a conftest conftest.c
360
- rm -rf conftest.dSYM
363
rhapsody* | darwin1.[[012]])
364
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
365
@@ -2024,7 +1966,7 @@
367
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
369
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
370
+ if test "$DSYMUTIL" != ":"; then
371
_lt_dsymutil='~$DSYMUTIL $lib || :'
374
@@ -2044,11 +1986,7 @@
375
_LT_TAGVAR(hardcode_direct, $1)=no
376
_LT_TAGVAR(hardcode_automatic, $1)=yes
377
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
378
- if test "$lt_cv_ld_force_load" = "yes"; then
379
- _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
381
- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
383
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
384
_LT_TAGVAR(link_all_deplibs, $1)=yes
385
_LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
387
@@ -2056,7 +1994,7 @@
388
*) _lt_dar_can_shared=$GCC ;;
390
if test "$_lt_dar_can_shared" = "yes"; then
391
- output_verbose_link_cmd=func_echo_all
392
+ output_verbose_link_cmd=echo
393
_LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
394
_LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
395
_LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
396
@@ -2102,65 +2040,170 @@
397
# _LT_SHELL_INIT(ARG)
398
# -------------------
399
m4_define([_LT_SHELL_INIT],
400
-[m4_divert_text([M4SH-INIT], [$1
401
-])])# _LT_SHELL_INIT
403
+[ifdef([AC_DIVERSION_NOTICE],
404
+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
405
+ [AC_DIVERT_PUSH(NOTICE)])
411
# _LT_PROG_ECHO_BACKSLASH
412
# -----------------------
413
-# Find how we can fake an echo command that does not interpret backslash.
414
-# In particular, with Autoconf 2.60 or later we add some code to the start
415
-# of the generated configure script which will find a shell with a builtin
416
-# printf (which we can use as an echo command).
417
+# Add some code to the start of the generated configure script which
418
+# will find an echo command which doesn't interpret backslashes.
419
m4_defun([_LT_PROG_ECHO_BACKSLASH],
420
-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
421
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
422
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
424
-AC_MSG_CHECKING([how to print strings])
425
-# Test print first, because it will be a builtin if present.
426
-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
427
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
429
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
432
+# Check that we are running under the correct shell.
433
+SHELL=${CONFIG_SHELL-/bin/sh}
437
+ # Remove one level of quotation (which was required for Make).
438
+ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
442
+ECHO=${lt_ECHO-echo}
443
+if test "X[$]1" = X--no-reexec; then
444
+ # Discard the --no-reexec flag, and continue.
446
+elif test "X[$]1" = X--fallback-echo; then
447
+ # Avoid inline document here, it may be left over
449
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
450
+ # Yippee, $ECHO works!
453
- # Use this function as a fallback that always works.
454
- func_fallback_echo ()
456
- eval 'cat <<_LTECHO_EOF
460
- ECHO='func_fallback_echo'
461
+ # Restart under the correct shell.
462
+ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
465
-# func_echo_all arg...
466
-# Invoke $ECHO with all args, space-separated.
471
+if test "X[$]1" = X--fallback-echo; then
472
+ # used as fallback echo
481
- printf*) AC_MSG_RESULT([printf]) ;;
482
- print*) AC_MSG_RESULT([print -r]) ;;
483
- *) AC_MSG_RESULT([cat]) ;;
485
+# The HP-UX ksh and POSIX shell print the target directory to stdout
487
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
489
-m4_ifdef([_AS_DETECT_SUGGESTED],
490
-[_AS_DETECT_SUGGESTED([
491
- test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
492
- ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
493
- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
494
- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
495
- PATH=/empty FPATH=/empty; export PATH FPATH
496
- test "X`printf %s $ECHO`" = "X$ECHO" \
497
- || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
498
+if test -z "$lt_ECHO"; then
499
+ if test "X${echo_test_string+set}" != Xset; then
500
+ # find a string as large as possible, as long as the shell can cope with it
501
+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
502
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
503
+ if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
504
+ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
511
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
512
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
513
+ test "X$echo_testing_string" = "X$echo_test_string"; then
516
+ # The Solaris, AIX, and Digital Unix default echo programs unquote
517
+ # backslashes. This makes it impossible to quote backslashes using
518
+ # echo "$something" | sed 's/\\/\\\\/g'
520
+ # So, first we look for a working echo in the user's PATH.
522
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
523
+ for dir in $PATH /usr/ucb; do
525
+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
526
+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
527
+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
528
+ test "X$echo_testing_string" = "X$echo_test_string"; then
535
+ if test "X$ECHO" = Xecho; then
536
+ # We didn't find a better echo, so look for alternatives.
537
+ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
538
+ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
539
+ test "X$echo_testing_string" = "X$echo_test_string"; then
540
+ # This shell has a builtin print -r that does the trick.
542
+ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
543
+ test "X$CONFIG_SHELL" != X/bin/ksh; then
544
+ # If we have ksh, try running configure again with it.
545
+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
546
+ export ORIGINAL_CONFIG_SHELL
547
+ CONFIG_SHELL=/bin/ksh
548
+ export CONFIG_SHELL
549
+ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
551
+ # Try using printf.
553
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
554
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
555
+ test "X$echo_testing_string" = "X$echo_test_string"; then
556
+ # Cool, printf works
558
+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
559
+ test "X$echo_testing_string" = 'X\t' &&
560
+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
561
+ test "X$echo_testing_string" = "X$echo_test_string"; then
562
+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
563
+ export CONFIG_SHELL
564
+ SHELL="$CONFIG_SHELL"
566
+ ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
567
+ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
568
+ test "X$echo_testing_string" = 'X\t' &&
569
+ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
570
+ test "X$echo_testing_string" = "X$echo_test_string"; then
571
+ ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
573
+ # maybe with a smaller string...
576
+ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
577
+ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
584
+ if test "$prev" != 'sed 50q "[$]0"'; then
585
+ echo_test_string=`eval $prev`
586
+ export echo_test_string
587
+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
589
+ # Oops. We lost completely, so just stick with echo.
598
+# Copy echo and quote the copy suitably for passing to libtool from
599
+# the Makefile, instead of quoting the original, which is used later.
601
+if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
602
+ lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
607
_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
608
-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
609
+_LT_DECL([], [ECHO], [1],
610
+ [An echo program that does not interpret backslashes])
611
])# _LT_PROG_ECHO_BACKSLASH
614
@@ -2192,7 +2235,7 @@
617
# Find out which ABI we are using.
618
- echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
619
+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
620
if AC_TRY_EVAL(ac_compile); then
621
if test "$lt_cv_prog_gnu_ld" = yes; then
622
case `/usr/bin/file conftest.$ac_objext` in
623
@@ -2344,19 +2387,10 @@
625
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
630
- lock_old_archive_extraction=yes ;;
632
- lock_old_archive_extraction=no ;;
634
_LT_DECL([], [old_postinstall_cmds], [2])
635
_LT_DECL([], [old_postuninstall_cmds], [2])
636
_LT_TAGDECL([], [old_archive_cmds], [2],
637
[Commands used to build an old-style archive])
638
-_LT_DECL([], [lock_old_archive_extraction], [0],
639
- [Whether to use a lock for old archive extraction])
640
])# _LT_CMD_OLD_ARCHIVE
643
@@ -2381,15 +2415,15 @@
644
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
645
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
646
-e 's:$: $lt_compiler_flag:'`
647
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
648
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
649
(eval "$lt_compile" 2>conftest.err)
651
cat conftest.err >&AS_MESSAGE_LOG_FD
652
- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
653
+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
654
if (exit $ac_status) && test -s "$ac_outfile"; then
655
# The compiler can only warn and ignore the option if not recognized
656
# So say no if there are warnings other than the usual output.
657
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
658
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
659
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
660
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
662
@@ -2429,7 +2463,7 @@
663
if test -s conftest.err; then
664
# Append any errors to the config.log.
665
cat conftest.err 1>&AS_MESSAGE_LOG_FD
666
- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
667
+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
668
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
669
if diff conftest.exp conftest.er2 >/dev/null; then
671
@@ -2492,11 +2526,6 @@
672
lt_cv_sys_max_cmd_len=8192;
676
- # On MiNT this can take a long time and run out of memory.
677
- lt_cv_sys_max_cmd_len=8192;
681
# On AmigaOS with pdksh, this test takes hours, literally.
682
# So we just punt and use a minimum line length of 8192.
683
@@ -2561,8 +2590,8 @@
684
# If test is not a shell built-in, we'll probably end up computing a
685
# maximum length that is only half of the actual maximum length, but
687
- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
688
- = "X$teststring$teststring"; } >/dev/null 2>&1 &&
689
+ while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
690
+ = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
691
test $i != 17 # 1/2 MB should be enough
694
@@ -2613,7 +2642,7 @@
695
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
696
lt_status=$lt_dlunknown
697
cat > conftest.$ac_ext <<_LT_EOF
698
-[#line $LINENO "configure"
699
+[#line __oline__ "configure"
700
#include "confdefs.h"
703
@@ -2654,13 +2683,7 @@
707
-/* When -fvisbility=hidden is used, assume the code has been annotated
708
- correspondingly for the symbols needed. */
709
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
710
-void fnord () __attribute__((visibility("default")));
713
-void fnord () { int i=42; }
714
+void fnord() { int i=42;}
717
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
718
@@ -2669,11 +2692,7 @@
721
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
724
- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
725
- else puts (dlerror ());
727
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
728
/* dlclose (self); */
731
@@ -2849,16 +2868,16 @@
732
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
733
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
734
-e 's:$: $lt_compiler_flag:'`
735
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
736
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
737
(eval "$lt_compile" 2>out/conftest.err)
739
cat out/conftest.err >&AS_MESSAGE_LOG_FD
740
- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
741
+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
742
if (exit $ac_status) && test -s out/conftest2.$ac_objext
744
# The compiler can only warn and ignore the option if not recognized
745
# So say no if there are warnings
746
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
747
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
748
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
749
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
750
_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
751
@@ -3017,7 +3036,6 @@
752
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
753
m4_require([_LT_DECL_OBJDUMP])dnl
754
m4_require([_LT_DECL_SED])dnl
755
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
756
AC_MSG_CHECKING([dynamic linker characteristics])
759
@@ -3026,23 +3044,16 @@
760
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
761
*) lt_awk_arg="/^libraries:/" ;;
764
- mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
765
- *) lt_sed_strip_eq="s,=/,/,g" ;;
767
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
768
- case $lt_search_path_spec in
770
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
771
+ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
772
# if the path contains ";" then we assume it to be the separator
773
# otherwise default to the standard path separator (i.e. ":") - it is
774
# assumed that no part of a normal pathname contains ";" but that should
775
# okay in the real world where ";" in dirpaths is itself problematic.
776
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
779
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
782
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
784
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
786
# Ok, now we have the path, separated by spaces, we can step through it
787
# and add multilib dir if necessary.
788
lt_tmp_lt_search_path_spec=
789
@@ -3055,7 +3066,7 @@
790
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
793
- lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
794
+ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
795
BEGIN {RS=" "; FS="/|\n";} {
798
@@ -3075,13 +3086,7 @@
799
if (lt_foo != "") { lt_freq[[lt_foo]]++; }
800
if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
802
- # AWK program above erroneously prepends '/' to C:/dos/paths
805
- mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
806
- $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
808
- sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
809
+ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
811
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
813
@@ -3169,7 +3174,7 @@
815
library_names_spec='$libname.ixlibrary $libname.a'
816
# Create ${libname}_ixlibrary.a entries in /sys/libs.
817
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
818
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
822
@@ -3222,12 +3227,23 @@
824
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
825
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
827
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
828
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
831
# MinGW DLLs use traditional 'lib' prefix
832
soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
833
+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
834
+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
835
+ # It is most probably a Windows format PATH printed by
836
+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
837
+ # path with ; separators, and with drive letters. We can handle the
838
+ # drive letters (cygwin fileutils understands them), so leave them,
839
+ # especially as we might pass files found there to a mingw objdump,
840
+ # which wouldn't understand a cygwinified path. Ahh.
841
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
843
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
847
# pw32 DLLs use 'pw' prefix rather than 'lib'
848
@@ -3284,14 +3300,7 @@
852
- # Handle Gentoo/FreeBSD as it was Linux
853
- case $host_vendor in
855
- version_type=linux ;;
857
- version_type=freebsd-$objformat ;;
860
+ version_type=freebsd-$objformat
861
case $version_type in
863
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
864
@@ -3302,12 +3311,6 @@
865
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
869
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
870
- soname_spec='${libname}${release}${shared_ext}$major'
875
shlibpath_var=LD_LIBRARY_PATH
877
@@ -3340,19 +3343,6 @@
878
hardcode_into_libs=yes
885
- dynamic_linker="$host_os runtime_loader"
886
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
887
- soname_spec='${libname}${release}${shared_ext}$major'
888
- shlibpath_var=LIBRARY_PATH
889
- shlibpath_overrides_runpath=yes
890
- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
891
- hardcode_into_libs=yes
894
hpux9* | hpux10* | hpux11*)
895
# Give a soname corresponding to the major version so that dld.sl refuses to
896
# link against other versions.
897
@@ -3395,10 +3385,8 @@
898
soname_spec='${libname}${release}${shared_ext}$major'
901
- # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
902
+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
903
postinstall_cmds='chmod 555 $lib'
904
- # or fails outright, so override atomically:
905
- install_override_mode=555
909
@@ -3465,21 +3453,16 @@
910
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
911
shlibpath_var=LD_LIBRARY_PATH
912
shlibpath_overrides_runpath=no
914
# Some binutils ld are patched to set DT_RUNPATH
915
- AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
916
- [lt_cv_shlibpath_overrides_runpath=no
917
- save_LDFLAGS=$LDFLAGS
918
- save_libdir=$libdir
919
- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
920
- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
921
- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
922
- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
923
- [lt_cv_shlibpath_overrides_runpath=yes])])
924
- LDFLAGS=$save_LDFLAGS
925
- libdir=$save_libdir
927
- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
928
+ save_LDFLAGS=$LDFLAGS
929
+ save_libdir=$libdir
930
+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
931
+ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
932
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
933
+ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
934
+ [shlibpath_overrides_runpath=yes])])
935
+ LDFLAGS=$save_LDFLAGS
936
+ libdir=$save_libdir
938
# This implies no fast_install, which is unacceptable.
939
# Some rework will be needed to allow for fast_install
940
@@ -3488,7 +3471,7 @@
942
# Append ld.so.conf contents to the search path
943
if test -f /etc/ld.so.conf; then
944
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
945
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
946
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
949
@@ -3501,6 +3484,18 @@
132
950
dynamic_linker='GNU/Linux ld.so'
251
1533
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
252
1534
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
254
@@ -6836,7 +6856,7 @@
255
_LT_TAGVAR(inherit_rpath, $1)=yes
1536
@@ -6010,17 +5913,17 @@
1537
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
1538
_LT_TAGVAR(hardcode_minus_L, $1)=yes
1539
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
1540
- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
1541
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
1542
_LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
1546
if test "$GCC" = yes; then
1547
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
1548
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1549
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1551
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
1552
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
1553
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
1555
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
1556
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
1557
@@ -6030,13 +5933,13 @@
1558
osf4* | osf5*) # as osf3* with the addition of -msym flag
1559
if test "$GCC" = yes; then
1560
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
1561
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1562
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1563
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
1565
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
1566
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
1567
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
1568
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
1569
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
1570
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
1572
# Both c and cxx compiler support -rpath directly
1573
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
1574
@@ -6227,38 +6130,36 @@
1575
# Test whether the compiler implicitly links with -lc since on some
1576
# systems, -lgcc has to come before -lc. If gcc already passes -lc
1577
# to ld, don't add -lc before -lgcc.
1578
- AC_CACHE_CHECK([whether -lc should be explicitly linked in],
1579
- [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
1581
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
1583
- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
1586
- libobjs=conftest.$ac_objext
1588
- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
1589
- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
1595
- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
1596
- _LT_TAGVAR(allow_undefined_flag, $1)=
1597
- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
1599
- lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
1601
- lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
1603
- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
1605
- cat conftest.err 1>&5
1609
- _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
1610
+ AC_MSG_CHECKING([whether -lc should be explicitly linked in])
1612
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
1614
+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
1617
+ libobjs=conftest.$ac_objext
1619
+ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
1620
+ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
1626
+ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
1627
+ _LT_TAGVAR(allow_undefined_flag, $1)=
1628
+ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
1630
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
1632
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
1634
+ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
1636
+ cat conftest.err 1>&5
1639
+ AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
1643
@@ -6424,14 +6325,14 @@
1644
])# _LT_LANG_C_CONFIG
1647
-# _LT_LANG_CXX_CONFIG([TAG])
1648
-# --------------------------
1649
-# Ensure that the configuration variables for a C++ compiler are suitably
1650
-# defined. These variables are subsequently used by _LT_CONFIG to write
1651
-# the compiler configuration to `libtool'.
1652
-m4_defun([_LT_LANG_CXX_CONFIG],
1653
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
1654
-m4_require([_LT_DECL_EGREP])dnl
1657
+# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
1658
+# compiler, we have our own version here.
1659
+m4_defun([_LT_PROG_CXX],
1661
+pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
1663
if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
1664
( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
1665
(test "X$CXX" != "Xg++"))) ; then
1666
@@ -6439,6 +6340,22 @@
1668
_lt_caught_CXX_error=yes
1670
+popdef([AC_MSG_ERROR])
1673
+dnl aclocal-1.4 backwards compatibility:
1674
+dnl AC_DEFUN([_LT_PROG_CXX], [])
1677
+# _LT_LANG_CXX_CONFIG([TAG])
1678
+# --------------------------
1679
+# Ensure that the configuration variables for a C++ compiler are suitably
1680
+# defined. These variables are subsequently used by _LT_CONFIG to write
1681
+# the compiler configuration to `libtool'.
1682
+m4_defun([_LT_LANG_CXX_CONFIG],
1683
+[AC_REQUIRE([_LT_PROG_CXX])dnl
1684
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
1685
+m4_require([_LT_DECL_EGREP])dnl
1688
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
1689
@@ -6460,8 +6377,6 @@
1690
_LT_TAGVAR(module_expsym_cmds, $1)=
1691
_LT_TAGVAR(link_all_deplibs, $1)=unknown
1692
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
1693
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
1694
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
1695
_LT_TAGVAR(no_undefined_flag, $1)=
1696
_LT_TAGVAR(whole_archive_flag_spec, $1)=
1697
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
1698
@@ -6564,7 +6479,7 @@
1699
# Commands to make compiler produce verbose output that lists
1700
# what "hidden" libraries, object files and flags are used when
1701
# linking a shared library.
1702
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
1703
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
1707
@@ -6676,7 +6591,7 @@
1708
_LT_SYS_MODULE_PATH_AIX
1709
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
1711
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
1712
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
1714
if test "$host_cpu" = ia64; then
1715
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
1716
@@ -6691,13 +6606,8 @@
1717
# -berok will link without error, but may produce a broken library.
1718
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
1719
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
1720
- if test "$with_gnu_ld" = yes; then
1721
- # We only use this code for GNU lds that support --whole-archive.
1722
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
1724
- # Exported symbols can be pulled into shared objects from archives
1725
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
1727
+ # Exported symbols can be pulled into shared objects from archives
1728
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
1729
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
1730
# This is similar to how AIX traditionally builds its shared
1732
@@ -6730,7 +6640,6 @@
1733
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
1734
# as there is no search path for DLLs.
1735
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
1736
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
1737
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
1738
_LT_TAGVAR(always_export_symbols, $1)=no
1739
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1740
@@ -6791,11 +6700,6 @@
258
- linux* | k*bsd*-gnu)
259
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
262
# Kuck and Associates, Inc. (KAI) C++ Compiler
263
@@ -8843,15 +8863,15 @@
1745
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
1746
- _LT_TAGVAR(link_all_deplibs, $1)=yes
1750
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
1751
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
1752
@@ -6820,7 +6724,7 @@
1753
# explicitly linking system object files so we need to strip them
1754
# from the output so that they don't get included in the library
1756
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
1757
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
1760
if test "$GXX" = yes; then
1761
@@ -6885,7 +6789,7 @@
1762
# explicitly linking system object files so we need to strip them
1763
# from the output so that they don't get included in the library
1765
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
1766
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
1769
if test "$GXX" = yes; then
1770
@@ -6928,7 +6832,7 @@
1771
case $cc_basename in
1774
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
1775
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
1777
# Archives containing C++ object files must be created using
1778
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
1779
@@ -6939,9 +6843,9 @@
1781
if test "$GXX" = yes; then
1782
if test "$with_gnu_ld" = no; then
1783
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1784
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1786
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
1787
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
1790
_LT_TAGVAR(link_all_deplibs, $1)=yes
1791
@@ -6970,7 +6874,7 @@
1792
# explicitly linking system object files so we need to strip them
1793
# from the output so that they don't get included in the library
1795
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
1796
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
1798
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
1799
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
1800
@@ -7007,26 +6911,26 @@
1802
# Portland Group C++ compiler
1804
- *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
1805
+ *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
1806
_LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
1808
$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
1809
- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
1810
+ compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
1811
_LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
1813
$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
1814
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
1815
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
1817
_LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
1819
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
1820
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
1821
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
1822
_LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
1824
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
1825
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
1826
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
1828
- *) # Version 6 and above use weak symbols
1829
+ *) # Version 6 will use weak symbols
1830
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
1831
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
1833
@@ -7034,7 +6938,7 @@
1835
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
1836
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
1837
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
1838
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
1842
@@ -7053,9 +6957,9 @@
1843
# explicitly linking system object files so we need to strip them
1844
# from the output so that they don't get included in the library
1846
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
1847
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
1849
- xl* | mpixl* | bgxl*)
1851
# IBM XL 8.0 on PPC, with GNU ld
1852
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
1853
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
1854
@@ -7075,13 +6979,13 @@
1855
_LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
1856
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
1857
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
1858
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
1859
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
1860
_LT_TAGVAR(compiler_needs_object, $1)=yes
1862
# Not sure whether something based on
1863
# $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
1865
- output_verbose_link_cmd='func_echo_all'
1866
+ output_verbose_link_cmd='echo'
1868
# Archives containing C++ object files must be created using
1869
# "CC -xar", where "CC" is the Sun C++ compiler. This is
1870
@@ -7150,7 +7054,7 @@
1871
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
1872
_LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
1874
- output_verbose_link_cmd=func_echo_all
1875
+ output_verbose_link_cmd=echo
1877
_LT_TAGVAR(ld_shlibs, $1)=no
1879
@@ -7185,15 +7089,15 @@
1882
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
1883
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
1884
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
1885
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
1888
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
1889
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
1890
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
1891
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
1892
echo "-hidden">> $lib.exp~
1893
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
1894
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
1896
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
1898
@@ -7209,17 +7113,17 @@
1899
# explicitly linking system object files so we need to strip them
1900
# from the output so that they don't get included in the library
1902
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
1903
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
1906
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
1907
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
1910
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1911
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1914
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1915
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1919
@@ -7229,7 +7133,7 @@
1920
# Commands to make compiler produce verbose output that lists
1921
# what "hidden" libraries, object files and flags are used when
1922
# linking a shared library.
1923
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
1924
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
1927
# FIXME: insert proper C++ library support
1928
@@ -7265,7 +7169,7 @@
1931
case $cc_basename in
1934
# Sun C++ 4.2, 5.x and Centerline C++
1935
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
1936
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
1937
@@ -7286,7 +7190,7 @@
1939
_LT_TAGVAR(link_all_deplibs, $1)=yes
1941
- output_verbose_link_cmd='func_echo_all'
1942
+ output_verbose_link_cmd='echo'
1944
# Archives containing C++ object files must be created using
1945
# "CC -xar", where "CC" is the Sun C++ compiler. This is
1946
@@ -7313,7 +7217,7 @@
1947
# Commands to make compiler produce verbose output that lists
1948
# what "hidden" libraries, object files and flags are used when
1949
# linking a shared library.
1950
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
1951
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
1953
# g++ 2.7 appears to require `-G' NOT `-shared' on this
1955
@@ -7324,7 +7228,7 @@
1956
# Commands to make compiler produce verbose output that lists
1957
# what "hidden" libraries, object files and flags are used when
1958
# linking a shared library.
1959
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
1960
+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
1963
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
1964
@@ -7378,10 +7282,6 @@
1966
_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
1967
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
1968
- _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
1969
- '"$_LT_TAGVAR(old_archive_cmds, $1)"
1970
- _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
1971
- '"$_LT_TAGVAR(reload_cmds, $1)"
1974
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
1975
@@ -7628,7 +7528,7 @@
1978
case $cc_basename in
1981
# The more standards-conforming stlport4 library is
1982
# incompatible with the Cstd library. Avoid specifying
1983
# it if it's in CXXFLAGS. Ignore libCrun as
1984
@@ -7672,16 +7572,32 @@
1985
])# _LT_SYS_HIDDEN_LIBDEPS
1990
+# Since AC_PROG_F77 is broken, in that it returns the empty string
1991
+# if there is no fortran compiler, we have our own version here.
1992
+m4_defun([_LT_PROG_F77],
1994
+pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
1996
+if test -z "$F77" || test "X$F77" = "Xno"; then
1997
+ _lt_disable_F77=yes
1999
+popdef([AC_MSG_ERROR])
2002
+dnl aclocal-1.4 backwards compatibility:
2003
+dnl AC_DEFUN([_LT_PROG_F77], [])
2006
# _LT_LANG_F77_CONFIG([TAG])
2007
# --------------------------
2008
# Ensure that the configuration variables for a Fortran 77 compiler are
2009
# suitably defined. These variables are subsequently used by _LT_CONFIG
2010
# to write the compiler configuration to `libtool'.
2011
m4_defun([_LT_LANG_F77_CONFIG],
2012
-[AC_LANG_PUSH(Fortran 77)
2013
-if test -z "$F77" || test "X$F77" = "Xno"; then
2014
- _lt_disable_F77=yes
2016
+[AC_REQUIRE([_LT_PROG_F77])dnl
2017
+AC_LANG_PUSH(Fortran 77)
2019
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
2020
_LT_TAGVAR(allow_undefined_flag, $1)=
2021
@@ -7700,8 +7616,6 @@
2022
_LT_TAGVAR(module_expsym_cmds, $1)=
2023
_LT_TAGVAR(link_all_deplibs, $1)=unknown
2024
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
2025
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
2026
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
2027
_LT_TAGVAR(no_undefined_flag, $1)=
2028
_LT_TAGVAR(whole_archive_flag_spec, $1)=
2029
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
2030
@@ -7801,17 +7715,32 @@
2031
])# _LT_LANG_F77_CONFIG
2036
+# Since AC_PROG_FC is broken, in that it returns the empty string
2037
+# if there is no fortran compiler, we have our own version here.
2038
+m4_defun([_LT_PROG_FC],
2040
+pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
2042
+if test -z "$FC" || test "X$FC" = "Xno"; then
2043
+ _lt_disable_FC=yes
2045
+popdef([AC_MSG_ERROR])
2048
+dnl aclocal-1.4 backwards compatibility:
2049
+dnl AC_DEFUN([_LT_PROG_FC], [])
2052
# _LT_LANG_FC_CONFIG([TAG])
2053
# -------------------------
2054
# Ensure that the configuration variables for a Fortran compiler are
2055
# suitably defined. These variables are subsequently used by _LT_CONFIG
2056
# to write the compiler configuration to `libtool'.
2057
m4_defun([_LT_LANG_FC_CONFIG],
2058
-[AC_LANG_PUSH(Fortran)
2060
-if test -z "$FC" || test "X$FC" = "Xno"; then
2061
- _lt_disable_FC=yes
2063
+[AC_REQUIRE([_LT_PROG_FC])dnl
2064
+AC_LANG_PUSH(Fortran)
2066
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
2067
_LT_TAGVAR(allow_undefined_flag, $1)=
2068
@@ -7830,8 +7759,6 @@
2069
_LT_TAGVAR(module_expsym_cmds, $1)=
2070
_LT_TAGVAR(link_all_deplibs, $1)=unknown
2071
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
2072
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
2073
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
2074
_LT_TAGVAR(no_undefined_flag, $1)=
2075
_LT_TAGVAR(whole_archive_flag_spec, $1)=
2076
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
2077
@@ -7977,8 +7904,6 @@
2078
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
2080
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
2081
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
2082
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
2084
if test -n "$compiler"; then
2085
_LT_COMPILER_NO_RTTI($1)
2086
@@ -8340,7 +8265,7 @@
2089
# Extract subdirectory from the argument.
2090
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
2091
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
2092
if test "X$func_dirname_result" = "X${1}"; then
2093
func_dirname_result="${3}"
2095
@@ -8351,7 +8276,7 @@
2096
# func_basename file
2099
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
2100
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
2103
dnl func_dirname_and_basename
2104
@@ -8367,8 +8292,10 @@
2108
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
2109
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
2110
+ .*) func_stripname_result=`$ECHO "X${3}" \
2111
+ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
2112
+ *) func_stripname_result=`$ECHO "X${3}" \
2113
+ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
2117
@@ -8379,20 +8306,20 @@
2121
- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
2122
- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
2123
+ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
2124
+ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
2130
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
2131
+ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
2134
# func_xform libobj-or-source
2137
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
2138
+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
2141
# func_arith arithmetic-term...
2142
@@ -8440,15 +8367,14 @@
2144
# Helper functions for option handling. -*- Autoconf -*-
2146
-# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
2148
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
2149
# Written by Gary V. Vaughan, 2004
2151
# This file is free software; the Free Software Foundation gives
2152
# unlimited permission to copy and/or distribute it, with or without
2153
# modifications, as long as this notice is preserved.
2155
-# serial 7 ltoptions.m4
2156
+# serial 6 ltoptions.m4
2158
# This is to help aclocal find these macros, as it can't see m4_define.
2159
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
2160
@@ -8563,7 +8489,7 @@
2161
[enable_win32_dll=yes
2164
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
2165
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
2166
AC_CHECK_TOOL(AS, as, false)
2167
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
2168
AC_CHECK_TOOL(OBJDUMP, objdump, false)
2169
@@ -8571,13 +8497,13 @@
2172
test -z "$AS" && AS=as
2173
-_LT_DECL([], [AS], [1], [Assembler program])dnl
2174
+_LT_DECL([], [AS], [0], [Assembler program])dnl
2176
test -z "$DLLTOOL" && DLLTOOL=dlltool
2177
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
2178
+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
2180
test -z "$OBJDUMP" && OBJDUMP=objdump
2181
-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
2182
+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
2185
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
2186
@@ -8937,29 +8863,29 @@
265
2188
# Generated from ltversion.in.
267
-# serial 3012 ltversion.m4
2190
-# serial 3175 ltversion.m4
268
2191
+# serial 3017 ltversion.m4
269
2192
# This file is part of GNU Libtool
271
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
272
-m4_define([LT_PACKAGE_REVISION], [1.3012])
2194
-m4_define([LT_PACKAGE_VERSION], [2.2.10])
2195
-m4_define([LT_PACKAGE_REVISION], [1.3175])
273
2196
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
274
2197
+m4_define([LT_PACKAGE_REVISION], [1.3017])
276
2199
AC_DEFUN([LTVERSION_VERSION],
277
-[macro_version='2.2.6'
278
-macro_revision='1.3012'
2200
-[macro_version='2.2.10'
2201
-macro_revision='1.3175'
279
2202
+[macro_version='2.2.6b'
280
2203
+macro_revision='1.3017'
281
2204
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
282
2205
_LT_DECL(, macro_revision, 0)
284
@@ -9049,14 +9069,16 @@
285
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
286
# ---------------------------------------------
287
m4_define([_PKG_CONFIG],
288
-[if test -n "$$1"; then
290
- elif test -n "$PKG_CONFIG"; then
291
- PKG_CHECK_EXISTS([$3],
292
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
296
+[if test -n "$PKG_CONFIG"; then
297
+ if test -n "$$1"; then
300
+ PKG_CHECK_EXISTS([$3],
301
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
309
@@ -9100,9 +9122,9 @@
310
if test $pkg_failed = yes; then
311
_PKG_SHORT_ERRORS_SUPPORTED
312
if test $_pkg_short_errors_supported = yes; then
313
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
314
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
316
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
317
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
319
# Put the nasty error message in config.log where it belongs
320
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
321
@@ -9152,7 +9174,7 @@
322
[am__api_version='1.11'
323
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
324
dnl require some minimum version. Point them to the right macro.
325
-m4_if([$1], [1.11], [],
326
+m4_if([$1], [1.11.1], [],
327
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
330
@@ -9168,7 +9190,7 @@
331
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
332
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
333
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
334
-[AM_AUTOMAKE_VERSION([1.11])dnl
335
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
336
m4_ifndef([AC_AUTOCONF_VERSION],
337
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
338
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
339
Index: brasero-2.30.1/config.guess
340
===================================================================
341
--- brasero-2.30.1.orig/config.guess 2010-04-29 10:36:23.975307173 +1000
342
+++ brasero-2.30.1/config.guess 2010-04-29 10:36:18.492807793 +1000
345
# Attempt to guess a canonical system name.
346
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
347
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
348
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
349
# Free Software Foundation, Inc.
351
-timestamp='2009-04-27'
352
+timestamp='2009-06-10'
354
# This file is free software; you can redistribute it and/or modify it
355
# under the terms of the GNU General Public License as published by
357
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
358
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
360
-case "${UNAME_MACHINE}" in
362
- test -z "$VENDOR" && VENDOR=pc
365
- test -z "$VENDOR" && VENDOR=unknown
368
-test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
2208
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
2210
-# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
2211
+# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
2212
# Written by Scott James Remnant, 2004.
2214
# This file is free software; the Free Software Foundation gives
2215
# unlimited permission to copy and/or distribute it, with or without
2216
# modifications, as long as this notice is preserved.
2218
-# serial 5 lt~obsolete.m4
2219
+# serial 4 lt~obsolete.m4
2221
# These exist entirely to fool aclocal when bootstrapping libtool.
2223
@@ -9029,6 +8955,7 @@
2224
m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
2225
m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
2226
m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
2227
+m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
2228
m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
2229
m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
2230
m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
2231
@@ -9041,17 +8968,9 @@
2232
m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
2233
m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
2234
m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
2235
-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
2236
-m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
2237
-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
2238
-m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
2239
-m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
2240
-m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
2241
-m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
370
# Note: order is significant - the case branches are not exclusive.
372
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
374
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
375
eval $set_cc_for_build
376
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
377
- | grep __ELF__ >/dev/null
380
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
381
# Return netbsd for either. FIX?
383
# => hppa64-hp-hpux11.23
385
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
386
- grep __LP64__ >/dev/null
392
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
393
echo i${UNAME_MACHINE}-pc-mks
398
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
399
# How do we know it's Interix rather than the generic POSIX subsystem?
400
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
401
@@ -866,13 +859,13 @@
402
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
403
| grep -q __ARM_EABI__
405
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
406
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
408
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
409
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
413
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
414
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
417
echo cris-axis-linux-gnu
418
@@ -881,51 +874,28 @@
419
echo crisv32-axis-linux-gnu
422
- echo frv-${VENDOR}-linux-gnu
423
+ echo frv-unknown-linux-gnu
426
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
427
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
430
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
431
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
434
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
435
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
438
- eval $set_cc_for_build
439
- sed 's/^ //' << EOF >$dummy.c
443
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
446
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
453
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
458
- test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
461
+ mips:Linux:*:* | mips64:Linux:*:*)
462
eval $set_cc_for_build
463
sed 's/^ //' << EOF >$dummy.c
467
+ #undef ${UNAME_MACHINE}
468
+ #undef ${UNAME_MACHINE}el
469
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
471
+ CPU=${UNAME_MACHINE}el
473
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
475
+ CPU=${UNAME_MACHINE}
479
@@ -936,16 +906,16 @@
483
- test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
484
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
487
- echo or32-${VENDOR}-linux-gnu
488
+ echo or32-unknown-linux-gnu
491
- echo powerpc-${VENDOR}-linux-gnu
492
+ echo powerpc-unknown-linux-gnu
495
- echo powerpc64-${VENDOR}-linux-gnu
496
+ echo powerpc64-unknown-linux-gnu
499
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
501
EV67) UNAME_MACHINE=alphaev67 ;;
502
EV68*) UNAME_MACHINE=alphaev68 ;;
504
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
505
+ objdump --private-headers /bin/sh | grep -q ld.so.1
506
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
507
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
508
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
511
echo sparc-unknown-linux-gnu
512
@@ -967,34 +937,34 @@
513
parisc:Linux:*:* | hppa:Linux:*:*)
515
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
516
- PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
517
- PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
518
- *) echo hppa-${VENDOR}-linux-gnu ;;
519
+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
520
+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
521
+ *) echo hppa-unknown-linux-gnu ;;
524
parisc64:Linux:*:* | hppa64:Linux:*:*)
525
- echo hppa64-${VENDOR}-linux-gnu
526
+ echo hppa64-unknown-linux-gnu
528
s390:Linux:*:* | s390x:Linux:*:*)
529
echo ${UNAME_MACHINE}-ibm-linux
532
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
533
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
536
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
537
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
539
sparc:Linux:*:* | sparc64:Linux:*:*)
540
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
541
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
544
echo ${UNAME_MACHINE}-dec-linux-gnu
547
- echo x86_64-${VENDOR}-linux-gnu
548
+ echo x86_64-unknown-linux-gnu
551
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
552
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
555
# The BFD linker knows what the default object file format is, so
556
@@ -1009,16 +979,8 @@
558
case "$ld_supported_targets" in
560
- TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu"
561
+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
564
- echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout"
567
- # Either a pre-BFD a.out linker (linux-gnuoldld) or
568
- # one that does not give us useful --help.
569
- echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld"
572
# Determine whether the default compiler is a.out or elf
573
eval $set_cc_for_build
574
@@ -1051,7 +1013,7 @@
577
test x"${LIBC}" != x && {
578
- echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
579
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
582
test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
583
@@ -1076,16 +1038,16 @@
584
echo ${UNAME_MACHINE}-pc-os2-emx
587
- echo ${UNAME_MACHINE}-${VENDOR}-stop
588
+ echo ${UNAME_MACHINE}-unknown-stop
591
- echo ${UNAME_MACHINE}-${VENDOR}-atheos
592
+ echo ${UNAME_MACHINE}-unknown-atheos
595
echo ${UNAME_MACHINE}-pc-syllable
597
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
598
- echo i386-${VENDOR}-lynxos${UNAME_RELEASE}
599
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
600
+ echo i386-unknown-lynxos${UNAME_RELEASE}
603
echo ${UNAME_MACHINE}-pc-msdosdjgpp
604
@@ -1105,7 +1067,7 @@
605
*Pentium) UNAME_MACHINE=i586 ;;
606
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
608
- echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
609
+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
612
if test -f /usr/options/cb.name; then
613
@@ -1144,7 +1106,7 @@
614
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
615
echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
616
else # Add other i860-SVR4 vendors below as they are discovered.
617
- echo i860-${VENDOR}-sysv${UNAME_RELEASE} # Unknown i860-SVR4
618
+ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
622
@@ -1181,19 +1143,19 @@
623
/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
624
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
625
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
626
- echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
627
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
629
mc68030:UNIX_System_V:4.*:*)
630
echo m68k-atari-sysv4
632
TSUNAMI:LynxOS:2.*:*)
633
- echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
634
+ echo sparc-unknown-lynxos${UNAME_RELEASE}
637
- echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
638
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
640
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
641
- echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
642
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
643
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
646
echo mips-dde-sysv${UNAME_RELEASE}
647
@@ -1243,7 +1205,7 @@
648
if [ -d /usr/nec ]; then
649
echo mips-nec-sysv${UNAME_RELEASE}
651
- echo mips-${VENDOR}-sysv${UNAME_RELEASE}
652
+ echo mips-unknown-sysv${UNAME_RELEASE}
655
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
656
@@ -1324,13 +1286,13 @@
658
UNAME_MACHINE="$cputype"
660
- echo ${UNAME_MACHINE}-${VENDOR}-plan9
661
+ echo ${UNAME_MACHINE}-unknown-plan9
664
- echo pdp10-${VENDOR}-tops10
665
+ echo pdp10-unknown-tops10
668
- echo pdp10-${VENDOR}-tenex
669
+ echo pdp10-unknown-tenex
671
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
672
echo pdp10-dec-tops20
673
@@ -1339,16 +1301,16 @@
674
echo pdp10-xkl-tops20
677
- echo pdp10-${VENDOR}-tops20
678
+ echo pdp10-unknown-tops20
681
- echo pdp10-${VENDOR}-its
682
+ echo pdp10-unknown-its
685
echo mips-sei-seiux${UNAME_RELEASE}
688
- echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
689
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
692
UNAME_MACHINE=`(uname -p) 2>/dev/null`
693
Index: brasero-2.30.1/config.h.in
2243
-# nls.m4 serial 5 (gettext-0.18)
2244
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
2247
+# nls.m4 serial 3 (gettext-0.15)
2248
+dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
2249
dnl This file is free software; the Free Software Foundation
2250
dnl gives unlimited permission to copy and/or distribute it,
2251
dnl with or without modifications, as long as this notice is preserved.
2252
@@ -9069,17 +8988,17 @@
2253
dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
2254
dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
2261
AC_MSG_CHECKING([whether NLS is requested])
2262
dnl Default is enabled NLS
2263
- AC_ARG_ENABLE([nls],
2264
+ AC_ARG_ENABLE(nls,
2265
[ --disable-nls do not use Native Language Support],
2266
USE_NLS=$enableval, USE_NLS=yes)
2267
- AC_MSG_RESULT([$USE_NLS])
2268
- AC_SUBST([USE_NLS])
2269
+ AC_MSG_RESULT($USE_NLS)
2273
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
2274
Index: brasero-2.30.2/config.h.in
694
2275
===================================================================
695
--- brasero-2.30.1.orig/config.h.in 2010-04-29 10:36:24.145308184 +1000
696
+++ brasero-2.30.1/config.h.in 2010-04-29 10:36:18.022807624 +1000
2276
--- brasero-2.30.2.orig/config.h.in 2010-06-22 02:14:24.000000000 +0200
2277
+++ brasero-2.30.2/config.h.in 2010-06-24 12:23:42.634700001 +0200
697
2278
@@ -54,6 +54,9 @@
698
2279
/* Define the location where the catalogs will be installed */
699
2280
#undef GNOMELOCALEDIR
1971
2516
BRASERO_SEARCH_CFLAGS
1972
2517
C compiler flags for BRASERO_SEARCH, overriding pkg-config
1973
2518
BRASERO_SEARCH_LIBS
1974
@@ -1934,6 +1893,7 @@
1975
Use these variables to override the choices made by `configure' or to help
1976
it to find libraries and programs with nonstandard names/locations.
1978
+Report bugs to the package provider.
1982
@@ -1997,21 +1957,426 @@
1983
if $ac_init_version; then
1985
brasero configure 2.30.1
1986
-generated by GNU Autoconf 2.63
1987
+generated by GNU Autoconf 2.65
1989
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
1990
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
1991
+Copyright (C) 2009 Free Software Foundation, Inc.
1992
This configure script is free software; the Free Software Foundation
1993
gives unlimited permission to copy, distribute and modify it.
1998
+## ------------------------ ##
1999
+## Autoconf initialization. ##
2000
+## ------------------------ ##
2002
+# ac_fn_c_try_compile LINENO
2003
+# --------------------------
2004
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
2005
+ac_fn_c_try_compile ()
2007
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2008
+ rm -f conftest.$ac_objext
2009
+ if { { ac_try="$ac_compile"
2010
+case "(($ac_try" in
2011
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2012
+ *) ac_try_echo=$ac_try;;
2014
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2015
+$as_echo "$ac_try_echo"; } >&5
2016
+ (eval "$ac_compile") 2>conftest.err
2018
+ if test -s conftest.err; then
2019
+ grep -v '^ *+' conftest.err >conftest.er1
2020
+ cat conftest.er1 >&5
2021
+ mv -f conftest.er1 conftest.err
2023
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2024
+ test $ac_status = 0; } && {
2025
+ test -z "$ac_c_werror_flag" ||
2026
+ test ! -s conftest.err
2027
+ } && test -s conftest.$ac_objext; then :
2030
+ $as_echo "$as_me: failed program was:" >&5
2031
+sed 's/^/| /' conftest.$ac_ext >&5
2035
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2036
+ as_fn_set_status $ac_retval
2038
+} # ac_fn_c_try_compile
2040
+# ac_fn_c_try_link LINENO
2041
+# -----------------------
2042
+# Try to link conftest.$ac_ext, and return whether this succeeded.
2043
+ac_fn_c_try_link ()
2045
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2046
+ rm -f conftest.$ac_objext conftest$ac_exeext
2047
+ if { { ac_try="$ac_link"
2048
+case "(($ac_try" in
2049
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2050
+ *) ac_try_echo=$ac_try;;
2052
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2053
+$as_echo "$ac_try_echo"; } >&5
2054
+ (eval "$ac_link") 2>conftest.err
2056
+ if test -s conftest.err; then
2057
+ grep -v '^ *+' conftest.err >conftest.er1
2058
+ cat conftest.er1 >&5
2059
+ mv -f conftest.er1 conftest.err
2061
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2062
+ test $ac_status = 0; } && {
2063
+ test -z "$ac_c_werror_flag" ||
2064
+ test ! -s conftest.err
2065
+ } && test -s conftest$ac_exeext && {
2066
+ test "$cross_compiling" = yes ||
2067
+ $as_test_x conftest$ac_exeext
2071
+ $as_echo "$as_me: failed program was:" >&5
2072
+sed 's/^/| /' conftest.$ac_ext >&5
2076
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
2077
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
2078
+ # interfere with the next link command; also delete a directory that is
2079
+ # left behind by Apple's compiler. We do this before executing the actions.
2080
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
2081
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2082
+ as_fn_set_status $ac_retval
2084
+} # ac_fn_c_try_link
2086
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
2087
+# -------------------------------------------------------
2088
+# Tests whether HEADER exists and can be compiled using the include files in
2089
+# INCLUDES, setting the cache variable VAR accordingly.
2090
+ac_fn_c_check_header_compile ()
2092
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2093
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2094
+$as_echo_n "checking for $2... " >&6; }
2095
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2096
+ $as_echo_n "(cached) " >&6
2098
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2099
+/* end confdefs.h. */
2103
+if ac_fn_c_try_compile "$LINENO"; then :
2108
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2111
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2112
+$as_echo "$ac_res" >&6; }
2113
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2115
+} # ac_fn_c_check_header_compile
2117
+# ac_fn_c_try_cpp LINENO
2118
+# ----------------------
2119
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
2122
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2123
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
2124
+case "(($ac_try" in
2125
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2126
+ *) ac_try_echo=$ac_try;;
2128
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2129
+$as_echo "$ac_try_echo"; } >&5
2130
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
2132
+ if test -s conftest.err; then
2133
+ grep -v '^ *+' conftest.err >conftest.er1
2134
+ cat conftest.er1 >&5
2135
+ mv -f conftest.er1 conftest.err
2137
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2138
+ test $ac_status = 0; } >/dev/null && {
2139
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
2140
+ test ! -s conftest.err
2144
+ $as_echo "$as_me: failed program was:" >&5
2145
+sed 's/^/| /' conftest.$ac_ext >&5
2149
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2150
+ as_fn_set_status $ac_retval
2152
+} # ac_fn_c_try_cpp
2154
+# ac_fn_c_try_run LINENO
2155
+# ----------------------
2156
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
2157
+# that executables *can* be run.
2160
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2161
+ if { { ac_try="$ac_link"
2162
+case "(($ac_try" in
2163
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2164
+ *) ac_try_echo=$ac_try;;
2166
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2167
+$as_echo "$ac_try_echo"; } >&5
2168
+ (eval "$ac_link") 2>&5
2170
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2171
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
2172
+ { { case "(($ac_try" in
2173
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2174
+ *) ac_try_echo=$ac_try;;
2176
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2177
+$as_echo "$ac_try_echo"; } >&5
2178
+ (eval "$ac_try") 2>&5
2180
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2181
+ test $ac_status = 0; }; }; then :
2184
+ $as_echo "$as_me: program exited with status $ac_status" >&5
2185
+ $as_echo "$as_me: failed program was:" >&5
2186
+sed 's/^/| /' conftest.$ac_ext >&5
2188
+ ac_retval=$ac_status
2190
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
2191
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2192
+ as_fn_set_status $ac_retval
2194
+} # ac_fn_c_try_run
2196
+# ac_fn_c_check_func LINENO FUNC VAR
2197
+# ----------------------------------
2198
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
2199
+ac_fn_c_check_func ()
2201
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2202
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2203
+$as_echo_n "checking for $2... " >&6; }
2204
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2205
+ $as_echo_n "(cached) " >&6
2207
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2208
+/* end confdefs.h. */
2209
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
2210
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
2211
+#define $2 innocuous_$2
2213
+/* System header to define __stub macros and hopefully few prototypes,
2214
+ which can conflict with char $2 (); below.
2215
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
2216
+ <limits.h> exists even on freestanding compilers. */
2219
+# include <limits.h>
2221
+# include <assert.h>
2226
+/* Override any GCC internal prototype to avoid an error.
2227
+ Use char because int might match the return type of a GCC
2228
+ builtin and then its argument prototype would still apply. */
2233
+/* The GNU C library defines this for functions which it implements
2234
+ to always fail with ENOSYS. Some functions are actually named
2235
+ something starting with __ and the normal name is an alias. */
2236
+#if defined __stub_$2 || defined __stub___$2
2248
+if ac_fn_c_try_link "$LINENO"; then :
2253
+rm -f core conftest.err conftest.$ac_objext \
2254
+ conftest$ac_exeext conftest.$ac_ext
2257
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2258
+$as_echo "$ac_res" >&6; }
2259
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2261
+} # ac_fn_c_check_func
2263
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
2264
+# -------------------------------------------------------
2265
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
2266
+# the include files in INCLUDES and setting the cache variable VAR
2268
+ac_fn_c_check_header_mongrel ()
2270
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2271
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2272
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2273
+$as_echo_n "checking for $2... " >&6; }
2274
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2275
+ $as_echo_n "(cached) " >&6
2278
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2279
+$as_echo "$ac_res" >&6; }
2281
+ # Is the header compilable?
2282
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
2283
+$as_echo_n "checking $2 usability... " >&6; }
2284
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2285
+/* end confdefs.h. */
2289
+if ac_fn_c_try_compile "$LINENO"; then :
2290
+ ac_header_compiler=yes
2292
+ ac_header_compiler=no
2294
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2295
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
2296
+$as_echo "$ac_header_compiler" >&6; }
2298
+# Is the header present?
2299
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
2300
+$as_echo_n "checking $2 presence... " >&6; }
2301
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2302
+/* end confdefs.h. */
2305
+if ac_fn_c_try_cpp "$LINENO"; then :
2306
+ ac_header_preproc=yes
2308
+ ac_header_preproc=no
2310
+rm -f conftest.err conftest.$ac_ext
2311
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
2312
+$as_echo "$ac_header_preproc" >&6; }
2314
+# So? What about this header?
2315
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
2317
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
2318
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
2319
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
2320
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
2323
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
2324
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
2325
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
2326
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
2327
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
2328
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
2329
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
2330
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
2331
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
2332
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
2335
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2336
+$as_echo_n "checking for $2... " >&6; }
2337
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2338
+ $as_echo_n "(cached) " >&6
2340
+ eval "$3=\$ac_header_compiler"
2343
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2344
+$as_echo "$ac_res" >&6; }
2346
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2348
+} # ac_fn_c_check_header_mongrel
2350
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
2351
+# -------------------------------------------
2352
+# Tests whether TYPE exists after having included INCLUDES, setting cache
2353
+# variable VAR accordingly.
2354
+ac_fn_c_check_type ()
2356
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2357
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2358
+$as_echo_n "checking for $2... " >&6; }
2359
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2360
+ $as_echo_n "(cached) " >&6
2363
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2364
+/* end confdefs.h. */
2375
+if ac_fn_c_try_compile "$LINENO"; then :
2376
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2377
+/* end confdefs.h. */
2388
+if ac_fn_c_try_compile "$LINENO"; then :
2393
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2395
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2398
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2399
+$as_echo "$ac_res" >&6; }
2400
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2402
+} # ac_fn_c_check_type
2403
cat >config.log <<_ACEOF
2404
This file contains any messages produced by compilers while
2405
running configure, to aid debugging if configure makes a mistake.
2407
It was created by brasero $as_me 2.30.1, which was
2408
-generated by GNU Autoconf 2.63. Invocation command line was
2409
+generated by GNU Autoconf 2.65. Invocation command line was
2413
@@ -2047,8 +2412,8 @@
2416
test -z "$as_dir" && as_dir=.
2417
- $as_echo "PATH: $as_dir"
2419
+ $as_echo "PATH: $as_dir"
2424
@@ -2085,9 +2450,9 @@
2425
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
2428
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
2429
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
2431
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
2432
+ as_fn_append ac_configure_args1 " '$ac_arg'"
2433
if test $ac_must_keep_next = true; then
2434
ac_must_keep_next=false # Got value, back to normal.
2436
@@ -2103,13 +2468,13 @@
2437
-* ) ac_must_keep_next=true ;;
2440
- ac_configure_args="$ac_configure_args '$ac_arg'"
2441
+ as_fn_append ac_configure_args " '$ac_arg'"
2446
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
2447
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
2448
+{ ac_configure_args0=; unset ac_configure_args0;}
2449
+{ ac_configure_args1=; unset ac_configure_args1;}
2451
# When interrupted or exit'd, cleanup temporary files, and complete
2452
# config.log. We remove comments because anyway the quotes in there
2453
@@ -2134,13 +2499,13 @@
2457
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
2458
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
2459
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
2462
_ | IFS | as_nl) ;; #(
2463
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
2464
- *) $as_unset $ac_var ;;
2465
+ *) { eval $ac_var=; unset $ac_var;} ;;
2469
@@ -2212,39 +2577,41 @@
2472
for ac_signal in 1 2 13 15; do
2473
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
2474
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
2478
# confdefs.h avoids OS command line length limits that DEFS can exceed.
2479
rm -f -r conftest* confdefs.h
2481
+$as_echo "/* confdefs.h */" > confdefs.h
2483
# Predefined preprocessor variables.
2485
cat >>confdefs.h <<_ACEOF
2486
#define PACKAGE_NAME "$PACKAGE_NAME"
2490
cat >>confdefs.h <<_ACEOF
2491
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
2495
cat >>confdefs.h <<_ACEOF
2496
#define PACKAGE_VERSION "$PACKAGE_VERSION"
2500
cat >>confdefs.h <<_ACEOF
2501
#define PACKAGE_STRING "$PACKAGE_STRING"
2505
cat >>confdefs.h <<_ACEOF
2506
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
2509
+cat >>confdefs.h <<_ACEOF
2510
+#define PACKAGE_URL "$PACKAGE_URL"
2514
# Let the site file select an alternate cache file if it wants to.
2515
# Prefer an explicitly selected file to automatically selected ones.
2516
@@ -2262,8 +2629,8 @@
2517
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
2519
test "x$ac_site_file" = xNONE && continue
2520
- if test -r "$ac_site_file"; then
2521
- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
2522
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
2523
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
2524
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
2525
sed 's/^/| /' "$ac_site_file" >&5
2527
@@ -2271,10 +2638,10 @@
2530
if test -r "$cache_file"; then
2531
- # Some versions of bash will fail to source /dev/null (special
2532
- # files actually), so we avoid doing that.
2533
- if test -f "$cache_file"; then
2534
- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
2535
+ # Some versions of bash will fail to source /dev/null (special files
2536
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
2537
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
2538
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
2539
$as_echo "$as_me: loading cache $cache_file" >&6;}
2541
[\\/]* | ?:[\\/]* ) . "$cache_file";;
2542
@@ -2282,7 +2649,7 @@
2546
- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
2547
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
2548
$as_echo "$as_me: creating cache $cache_file" >&6;}
2551
@@ -2297,11 +2664,11 @@
2552
eval ac_new_val=\$ac_env_${ac_var}_value
2553
case $ac_old_set,$ac_new_set in
2555
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
2556
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
2557
$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
2558
ac_cache_corrupted=: ;;
2560
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
2561
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
2562
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
2563
ac_cache_corrupted=: ;;
2565
@@ -2311,17 +2678,17 @@
2566
ac_old_val_w=`echo x $ac_old_val`
2567
ac_new_val_w=`echo x $ac_new_val`
2568
if test "$ac_old_val_w" != "$ac_new_val_w"; then
2569
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
2570
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
2571
$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
2572
ac_cache_corrupted=:
2574
- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
2575
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
2576
$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
2577
eval $ac_var=\$ac_old_val
2579
- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
2580
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
2581
$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
2582
- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
2583
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
2584
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
2587
@@ -2333,43 +2700,20 @@
2589
case " $ac_configure_args " in
2590
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
2591
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
2592
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
2596
if $ac_cache_corrupted; then
2597
- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2598
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2599
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2600
- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
2601
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
2602
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
2603
- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
2604
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
2605
- { (exit 1); exit 1; }; }
2606
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
2632
+## -------------------- ##
2633
+## Main body of script. ##
2634
+## -------------------- ##
2637
ac_cpp='$CPP $CPPFLAGS'
2638
@@ -2428,24 +2772,16 @@
2641
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
2642
- if test -f "$ac_dir/install-sh"; then
2643
- ac_aux_dir=$ac_dir
2644
- ac_install_sh="$ac_aux_dir/install-sh -c"
2646
- elif test -f "$ac_dir/install.sh"; then
2647
- ac_aux_dir=$ac_dir
2648
- ac_install_sh="$ac_aux_dir/install.sh -c"
2650
- elif test -f "$ac_dir/shtool"; then
2651
- ac_aux_dir=$ac_dir
2652
- ac_install_sh="$ac_aux_dir/shtool install -c"
2655
+ for ac_t in install-sh install.sh shtool; do
2656
+ if test -f "$ac_dir/$ac_t"; then
2657
+ ac_aux_dir=$ac_dir
2658
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
2663
if test -z "$ac_aux_dir"; then
2664
- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
2665
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
2666
- { (exit 1); exit 1; }; }
2667
+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
2670
# These three variables are undocumented and unsupported,
2671
@@ -2471,10 +2807,10 @@
2672
# OS/2's system install, which has a completely different semantic
2673
# ./install, which can be erroneously created by make from ./install.sh.
2674
# Reject install programs that cannot install multiple files.
2675
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
2676
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
2677
$as_echo_n "checking for a BSD-compatible install... " >&6; }
2678
if test -z "$INSTALL"; then
2679
-if test "${ac_cv_path_install+set}" = set; then
2680
+if test "${ac_cv_path_install+set}" = set; then :
2681
$as_echo_n "(cached) " >&6
2683
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2684
@@ -2482,11 +2818,11 @@
2687
test -z "$as_dir" && as_dir=.
2688
- # Account for people who put trailing slashes in PATH elements.
2690
- ./ | .// | /cC/* | \
2691
+ # Account for people who put trailing slashes in PATH elements.
2692
+case $as_dir/ in #((
2693
+ ./ | .// | /[cC]/* | \
2694
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
2695
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
2696
+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
2699
# OSF1 and SCO ODT 3.0 have their own names for install.
2700
@@ -2523,7 +2859,7 @@
2708
rm -rf conftest.one conftest.two conftest.dir
2709
@@ -2539,7 +2875,7 @@
2710
INSTALL=$ac_install_sh
2713
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
2714
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
2715
$as_echo "$INSTALL" >&6; }
2717
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
2718
@@ -2550,7 +2886,7 @@
2720
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
2722
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
2723
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
2724
$as_echo_n "checking whether build environment is sane... " >&6; }
2727
@@ -2561,15 +2897,11 @@
2730
*[\\\"\#\$\&\'\`$am_lf]*)
2731
- { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
2732
-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
2733
- { (exit 1); exit 1; }; };;
2734
+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
2737
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
2738
- { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
2739
-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
2740
- { (exit 1); exit 1; }; };;
2741
+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
2744
# Do `set' in a subshell so we don't clobber the current shell's
2745
@@ -2591,11 +2923,8 @@
2746
# if, for instance, CONFIG_SHELL is bash and it inherits a
2747
# broken ls alias from the environment. This has actually
2748
# happened. Such a system could not be considered "sane".
2749
- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
2750
-alias in your environment" >&5
2751
-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
2752
-alias in your environment" >&2;}
2753
- { (exit 1); exit 1; }; }
2754
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
2755
+alias in your environment" "$LINENO" 5
2758
test "$2" = conftest.file
2759
@@ -2604,13 +2933,10 @@
2763
- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
2764
-Check your system clock" >&5
2765
-$as_echo "$as_me: error: newly created file is older than distributed files!
2766
-Check your system clock" >&2;}
2767
- { (exit 1); exit 1; }; }
2768
+ as_fn_error "newly created file is older than distributed files!
2769
+Check your system clock" "$LINENO" 5
2771
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
2772
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2773
$as_echo "yes" >&6; }
2774
test "$program_prefix" != NONE &&
2775
program_transform_name="s&^&$program_prefix&;$program_transform_name"
2776
@@ -2638,7 +2964,7 @@
2777
am_missing_run="$MISSING --run "
2780
- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
2781
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
2782
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
2785
@@ -2659,9 +2985,9 @@
2786
if test -n "$ac_tool_prefix"; then
2787
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2788
set dummy ${ac_tool_prefix}strip; ac_word=$2
2789
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2790
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2791
$as_echo_n "checking for $ac_word... " >&6; }
2792
-if test "${ac_cv_prog_STRIP+set}" = set; then
2793
+if test "${ac_cv_prog_STRIP+set}" = set; then :
2794
$as_echo_n "(cached) " >&6
2796
if test -n "$STRIP"; then
2797
@@ -2672,24 +2998,24 @@
2800
test -z "$as_dir" && as_dir=.
2801
- for ac_exec_ext in '' $ac_executable_extensions; do
2802
+ for ac_exec_ext in '' $ac_executable_extensions; do
2803
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2804
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
2805
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2806
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2816
STRIP=$ac_cv_prog_STRIP
2817
if test -n "$STRIP"; then
2818
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
2819
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
2820
$as_echo "$STRIP" >&6; }
2822
- { $as_echo "$as_me:$LINENO: result: no" >&5
2823
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2824
$as_echo "no" >&6; }
2827
@@ -2699,9 +3025,9 @@
2829
# Extract the first word of "strip", so it can be a program name with args.
2830
set dummy strip; ac_word=$2
2831
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2832
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2833
$as_echo_n "checking for $ac_word... " >&6; }
2834
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
2835
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
2836
$as_echo_n "(cached) " >&6
2838
if test -n "$ac_ct_STRIP"; then
2839
@@ -2712,24 +3038,24 @@
2842
test -z "$as_dir" && as_dir=.
2843
- for ac_exec_ext in '' $ac_executable_extensions; do
2844
+ for ac_exec_ext in '' $ac_executable_extensions; do
2845
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2846
ac_cv_prog_ac_ct_STRIP="strip"
2847
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2848
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2858
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
2859
if test -n "$ac_ct_STRIP"; then
2860
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
2861
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
2862
$as_echo "$ac_ct_STRIP" >&6; }
2864
- { $as_echo "$as_me:$LINENO: result: no" >&5
2865
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2866
$as_echo "no" >&6; }
2869
@@ -2738,7 +3064,7 @@
2871
case $cross_compiling:$ac_tool_warned in
2873
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
2874
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2875
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2876
ac_tool_warned=yes ;;
2878
@@ -2751,10 +3077,10 @@
2880
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
2882
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
2883
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
2884
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
2885
if test -z "$MKDIR_P"; then
2886
- if test "${ac_cv_path_mkdir+set}" = set; then
2887
+ if test "${ac_cv_path_mkdir+set}" = set; then :
2888
$as_echo_n "(cached) " >&6
2890
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2891
@@ -2762,7 +3088,7 @@
2894
test -z "$as_dir" && as_dir=.
2895
- for ac_prog in mkdir gmkdir; do
2896
+ for ac_prog in mkdir gmkdir; do
2897
for ac_exec_ext in '' $ac_executable_extensions; do
2898
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
2899
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
2900
@@ -2774,11 +3100,12 @@
2910
+ test -d ./--version && rmdir ./--version
2911
if test "${ac_cv_path_mkdir+set}" = set; then
2912
MKDIR_P="$ac_cv_path_mkdir -p"
2914
@@ -2786,11 +3113,10 @@
2915
# value for MKDIR_P within a source directory, because that will
2916
# break other packages using the cache if that directory is
2917
# removed, or if the value is a relative name.
2918
- test -d ./--version && rmdir ./--version
2919
MKDIR_P="$ac_install_sh -d"
2922
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
2923
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
2924
$as_echo "$MKDIR_P" >&6; }
2927
@@ -2803,9 +3129,9 @@
2929
# Extract the first word of "$ac_prog", so it can be a program name with args.
2930
set dummy $ac_prog; ac_word=$2
2931
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2932
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2933
$as_echo_n "checking for $ac_word... " >&6; }
2934
-if test "${ac_cv_prog_AWK+set}" = set; then
2935
+if test "${ac_cv_prog_AWK+set}" = set; then :
2936
$as_echo_n "(cached) " >&6
2938
if test -n "$AWK"; then
2939
@@ -2816,24 +3142,24 @@
2942
test -z "$as_dir" && as_dir=.
2943
- for ac_exec_ext in '' $ac_executable_extensions; do
2944
+ for ac_exec_ext in '' $ac_executable_extensions; do
2945
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2946
ac_cv_prog_AWK="$ac_prog"
2947
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2948
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2959
if test -n "$AWK"; then
2960
- { $as_echo "$as_me:$LINENO: result: $AWK" >&5
2961
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
2962
$as_echo "$AWK" >&6; }
2964
- { $as_echo "$as_me:$LINENO: result: no" >&5
2965
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2966
$as_echo "no" >&6; }
2969
@@ -2841,11 +3167,11 @@
2970
test -n "$AWK" && break
2973
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
2974
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
2975
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
2977
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
2978
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
2979
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
2980
$as_echo_n "(cached) " >&6
2982
cat >conftest.make <<\_ACEOF
2983
@@ -2863,11 +3189,11 @@
2986
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
2987
- { $as_echo "$as_me:$LINENO: result: yes" >&5
2988
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2989
$as_echo "yes" >&6; }
2992
- { $as_echo "$as_me:$LINENO: result: no" >&5
2993
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2994
$as_echo "no" >&6; }
2995
SET_MAKE="MAKE=${MAKE-make}"
2997
@@ -2887,9 +3213,7 @@
2998
am__isrc=' -I$(srcdir)'
2999
# test to see if srcdir already configured
3000
if test -f $srcdir/config.status; then
3001
- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
3002
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
3003
- { (exit 1); exit 1; }; }
3004
+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
3008
@@ -2947,7 +3271,7 @@
3011
# Check whether --enable-silent-rules was given.
3012
-if test "${enable_silent_rules+set}" = set; then
3013
+if test "${enable_silent_rules+set}" = set; then :
3014
enableval=$enable_silent_rules;
3017
@@ -2963,7 +3287,7 @@
3020
# Check whether --enable-static was given.
3021
-if test "${enable_static+set}" = set; then
3022
+if test "${enable_static+set}" = set; then :
3023
enableval=$enable_static; p=${PACKAGE-default}
3025
yes) enable_static=yes ;;
3026
@@ -2995,14 +3319,14 @@
3030
- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
3031
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
3032
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
3037
-macro_version='2.2.6'
3038
-macro_revision='1.3012'
2519
@@ -3180,8 +3333,8 @@
2523
-macro_version='2.2.10'
2524
-macro_revision='1.3175'
3039
2525
+macro_version='2.2.6b'
3040
2526
+macro_revision='1.3017'
3044
@@ -3020,35 +3344,27 @@
3046
# Make sure we can run config.sub.
3047
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
3048
- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
3049
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
3050
- { (exit 1); exit 1; }; }
3051
+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
3053
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
3054
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
3055
$as_echo_n "checking build system type... " >&6; }
3056
-if test "${ac_cv_build+set}" = set; then
3057
+if test "${ac_cv_build+set}" = set; then :
3058
$as_echo_n "(cached) " >&6
3060
ac_build_alias=$build_alias
3061
test "x$ac_build_alias" = x &&
3062
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
3063
test "x$ac_build_alias" = x &&
3064
- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
3065
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
3066
- { (exit 1); exit 1; }; }
3067
+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
3068
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
3069
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
3070
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
3071
- { (exit 1); exit 1; }; }
3072
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
3075
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
3076
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
3077
$as_echo "$ac_cv_build" >&6; }
3078
case $ac_cv_build in
3080
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
3081
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
3082
- { (exit 1); exit 1; }; };;
3083
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
3086
ac_save_IFS=$IFS; IFS='-'
3087
@@ -3064,28 +3380,24 @@
3088
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
3091
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
3092
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
3093
$as_echo_n "checking host system type... " >&6; }
3094
-if test "${ac_cv_host+set}" = set; then
3095
+if test "${ac_cv_host+set}" = set; then :
3096
$as_echo_n "(cached) " >&6
3098
if test "x$host_alias" = x; then
3099
ac_cv_host=$ac_cv_build
3101
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
3102
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
3103
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
3104
- { (exit 1); exit 1; }; }
3105
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
3109
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
3110
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
3111
$as_echo "$ac_cv_host" >&6; }
3114
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
3115
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
3116
- { (exit 1); exit 1; }; };;
3117
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
3120
ac_save_IFS=$IFS; IFS='-'
3121
@@ -3113,7 +3425,7 @@
3124
# If we don't find an include directive, just comment out the code.
3125
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
3126
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
3127
$as_echo_n "checking for style of include used by $am_make... " >&6; }
3130
@@ -3141,12 +3453,12 @@
3134
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
3135
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
3136
$as_echo "$_am_result" >&6; }
3137
rm -f confinc confmf
3139
# Check whether --enable-dependency-tracking was given.
3140
-if test "${enable_dependency_tracking+set}" = set; then
3141
+if test "${enable_dependency_tracking+set}" = set; then :
3142
enableval=$enable_dependency_tracking;
3145
@@ -3171,9 +3483,9 @@
3146
if test -n "$ac_tool_prefix"; then
3147
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
3148
set dummy ${ac_tool_prefix}gcc; ac_word=$2
3149
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3150
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3151
$as_echo_n "checking for $ac_word... " >&6; }
3152
-if test "${ac_cv_prog_CC+set}" = set; then
3153
+if test "${ac_cv_prog_CC+set}" = set; then :
3154
$as_echo_n "(cached) " >&6
3156
if test -n "$CC"; then
3157
@@ -3184,24 +3496,24 @@
3160
test -z "$as_dir" && as_dir=.
3161
- for ac_exec_ext in '' $ac_executable_extensions; do
3162
+ for ac_exec_ext in '' $ac_executable_extensions; do
3163
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3164
ac_cv_prog_CC="${ac_tool_prefix}gcc"
3165
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3166
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3177
if test -n "$CC"; then
3178
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
3179
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
3180
$as_echo "$CC" >&6; }
3182
- { $as_echo "$as_me:$LINENO: result: no" >&5
3183
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3184
$as_echo "no" >&6; }
3187
@@ -3211,9 +3523,9 @@
3189
# Extract the first word of "gcc", so it can be a program name with args.
3190
set dummy gcc; ac_word=$2
3191
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3192
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3193
$as_echo_n "checking for $ac_word... " >&6; }
3194
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
3195
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
3196
$as_echo_n "(cached) " >&6
3198
if test -n "$ac_ct_CC"; then
3199
@@ -3224,24 +3536,24 @@
3202
test -z "$as_dir" && as_dir=.
3203
- for ac_exec_ext in '' $ac_executable_extensions; do
3204
+ for ac_exec_ext in '' $ac_executable_extensions; do
3205
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3206
ac_cv_prog_ac_ct_CC="gcc"
3207
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3208
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3218
ac_ct_CC=$ac_cv_prog_ac_ct_CC
3219
if test -n "$ac_ct_CC"; then
3220
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
3221
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
3222
$as_echo "$ac_ct_CC" >&6; }
3224
- { $as_echo "$as_me:$LINENO: result: no" >&5
3225
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3226
$as_echo "no" >&6; }
3229
@@ -3250,7 +3562,7 @@
3231
case $cross_compiling:$ac_tool_warned in
3233
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
3234
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
3235
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3236
ac_tool_warned=yes ;;
3238
@@ -3264,9 +3576,9 @@
3239
if test -n "$ac_tool_prefix"; then
3240
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
3241
set dummy ${ac_tool_prefix}cc; ac_word=$2
3242
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3243
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3244
$as_echo_n "checking for $ac_word... " >&6; }
3245
-if test "${ac_cv_prog_CC+set}" = set; then
3246
+if test "${ac_cv_prog_CC+set}" = set; then :
3247
$as_echo_n "(cached) " >&6
3249
if test -n "$CC"; then
3250
@@ -3277,24 +3589,24 @@
3253
test -z "$as_dir" && as_dir=.
3254
- for ac_exec_ext in '' $ac_executable_extensions; do
3255
+ for ac_exec_ext in '' $ac_executable_extensions; do
3256
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3257
ac_cv_prog_CC="${ac_tool_prefix}cc"
3258
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3259
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3270
if test -n "$CC"; then
3271
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
3272
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
3273
$as_echo "$CC" >&6; }
3275
- { $as_echo "$as_me:$LINENO: result: no" >&5
3276
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3277
$as_echo "no" >&6; }
3280
@@ -3304,9 +3616,9 @@
3281
if test -z "$CC"; then
3282
# Extract the first word of "cc", so it can be a program name with args.
3283
set dummy cc; ac_word=$2
3284
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3285
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3286
$as_echo_n "checking for $ac_word... " >&6; }
3287
-if test "${ac_cv_prog_CC+set}" = set; then
3288
+if test "${ac_cv_prog_CC+set}" = set; then :
3289
$as_echo_n "(cached) " >&6
3291
if test -n "$CC"; then
3292
@@ -3318,18 +3630,18 @@
3295
test -z "$as_dir" && as_dir=.
3296
- for ac_exec_ext in '' $ac_executable_extensions; do
3297
+ for ac_exec_ext in '' $ac_executable_extensions; do
3298
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3299
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
3300
ac_prog_rejected=yes
3304
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3305
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3313
if test $ac_prog_rejected = yes; then
3314
@@ -3348,10 +3660,10 @@
3317
if test -n "$CC"; then
3318
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
3319
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
3320
$as_echo "$CC" >&6; }
3322
- { $as_echo "$as_me:$LINENO: result: no" >&5
3323
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3324
$as_echo "no" >&6; }
3327
@@ -3363,9 +3675,9 @@
3329
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
3330
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
3331
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3332
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3333
$as_echo_n "checking for $ac_word... " >&6; }
3334
-if test "${ac_cv_prog_CC+set}" = set; then
3335
+if test "${ac_cv_prog_CC+set}" = set; then :
3336
$as_echo_n "(cached) " >&6
3338
if test -n "$CC"; then
3339
@@ -3376,24 +3688,24 @@
3342
test -z "$as_dir" && as_dir=.
3343
- for ac_exec_ext in '' $ac_executable_extensions; do
3344
+ for ac_exec_ext in '' $ac_executable_extensions; do
3345
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3346
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
3347
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3348
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3359
if test -n "$CC"; then
3360
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
3361
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
3362
$as_echo "$CC" >&6; }
3364
- { $as_echo "$as_me:$LINENO: result: no" >&5
3365
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3366
$as_echo "no" >&6; }
3369
@@ -3407,9 +3719,9 @@
3371
# Extract the first word of "$ac_prog", so it can be a program name with args.
3372
set dummy $ac_prog; ac_word=$2
3373
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3374
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3375
$as_echo_n "checking for $ac_word... " >&6; }
3376
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
3377
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
3378
$as_echo_n "(cached) " >&6
3380
if test -n "$ac_ct_CC"; then
3381
@@ -3420,24 +3732,24 @@
3384
test -z "$as_dir" && as_dir=.
3385
- for ac_exec_ext in '' $ac_executable_extensions; do
3386
+ for ac_exec_ext in '' $ac_executable_extensions; do
3387
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3388
ac_cv_prog_ac_ct_CC="$ac_prog"
3389
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3390
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3400
ac_ct_CC=$ac_cv_prog_ac_ct_CC
3401
if test -n "$ac_ct_CC"; then
3402
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
3403
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
3404
$as_echo "$ac_ct_CC" >&6; }
3406
- { $as_echo "$as_me:$LINENO: result: no" >&5
3407
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3408
$as_echo "no" >&6; }
3411
@@ -3450,7 +3762,7 @@
3413
case $cross_compiling:$ac_tool_warned in
3415
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
3416
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
3417
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3418
ac_tool_warned=yes ;;
3420
@@ -3461,57 +3773,37 @@
3424
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3425
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3426
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3427
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
3428
-See \`config.log' for more details." >&5
3429
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
3430
-See \`config.log' for more details." >&2;}
3431
- { (exit 1); exit 1; }; }; }
3432
+as_fn_error "no acceptable C compiler found in \$PATH
3433
+See \`config.log' for more details." "$LINENO" 5; }
3435
# Provide some information about the compiler.
3436
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
3437
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
3440
-{ (ac_try="$ac_compiler --version >&5"
3441
-case "(($ac_try" in
3442
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3443
- *) ac_try_echo=$ac_try;;
3445
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3446
-$as_echo "$ac_try_echo") >&5
3447
- (eval "$ac_compiler --version >&5") 2>&5
3449
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3450
- (exit $ac_status); }
3451
-{ (ac_try="$ac_compiler -v >&5"
3452
-case "(($ac_try" in
3453
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3454
- *) ac_try_echo=$ac_try;;
3456
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3457
-$as_echo "$ac_try_echo") >&5
3458
- (eval "$ac_compiler -v >&5") 2>&5
3460
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3461
- (exit $ac_status); }
3462
-{ (ac_try="$ac_compiler -V >&5"
3463
+for ac_option in --version -v -V -qversion; do
3464
+ { { ac_try="$ac_compiler $ac_option >&5"
3466
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3467
*) ac_try_echo=$ac_try;;
3469
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3470
-$as_echo "$ac_try_echo") >&5
3471
- (eval "$ac_compiler -V >&5") 2>&5
3472
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3473
+$as_echo "$ac_try_echo"; } >&5
3474
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
3476
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3477
- (exit $ac_status); }
3478
+ if test -s conftest.err; then
3480
+... rest of stderr output deleted ...
3481
+ 10q' conftest.err >conftest.er1
3482
+ cat conftest.er1 >&5
3484
+ rm -f conftest.er1 conftest.err
3485
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3486
+ test $ac_status = 0; }
3489
-cat >conftest.$ac_ext <<_ACEOF
3492
-cat confdefs.h >>conftest.$ac_ext
3493
-cat >>conftest.$ac_ext <<_ACEOF
3494
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3495
/* end confdefs.h. */
3498
@@ -3527,8 +3819,8 @@
3499
# Try to create an executable without -o first, disregard a.out.
3500
# It will help us diagnose broken compilers, and finding out an intuition
3502
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
3503
-$as_echo_n "checking for C compiler default output file name... " >&6; }
3504
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
3505
+$as_echo_n "checking whether the C compiler works... " >&6; }
3506
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
3508
# The possible output files:
3509
@@ -3544,17 +3836,17 @@
3513
-if { (ac_try="$ac_link_default"
3514
+if { { ac_try="$ac_link_default"
3516
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3517
*) ac_try_echo=$ac_try;;
3519
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3520
-$as_echo "$ac_try_echo") >&5
3521
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3522
+$as_echo "$ac_try_echo"; } >&5
3523
(eval "$ac_link_default") 2>&5
3525
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3526
- (exit $ac_status); }; then
3527
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3528
+ test $ac_status = 0; }; then :
3529
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
3530
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
3531
# in a Makefile. We should not override ac_cv_exeext if it was cached,
3532
@@ -3571,7 +3863,7 @@
3536
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
3537
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
3539
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
3541
@@ -3590,84 +3882,42 @@
3546
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
3547
-$as_echo "$ac_file" >&6; }
3548
-if test -z "$ac_file"; then
3549
- $as_echo "$as_me: failed program was:" >&5
3550
+if test -z "$ac_file"; then :
3551
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3552
+$as_echo "no" >&6; }
3553
+$as_echo "$as_me: failed program was:" >&5
3554
sed 's/^/| /' conftest.$ac_ext >&5
3556
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3557
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3558
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3559
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
3560
-See \`config.log' for more details." >&5
3561
-$as_echo "$as_me: error: C compiler cannot create executables
3562
-See \`config.log' for more details." >&2;}
3563
- { (exit 77); exit 77; }; }; }
3564
+{ as_fn_set_status 77
3565
+as_fn_error "C compiler cannot create executables
3566
+See \`config.log' for more details." "$LINENO" 5; }; }
3568
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3569
+$as_echo "yes" >&6; }
3572
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
3573
+$as_echo_n "checking for C compiler default output file name... " >&6; }
3574
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
3575
+$as_echo "$ac_file" >&6; }
3576
ac_exeext=$ac_cv_exeext
3578
-# Check that the compiler produces executables we can run. If not, either
3579
-# the compiler is broken, or we cross compile.
3580
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
3581
-$as_echo_n "checking whether the C compiler works... " >&6; }
3582
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
3583
-# If not cross compiling, check that we can run a simple program.
3584
-if test "$cross_compiling" != yes; then
3585
- if { ac_try='./$ac_file'
3586
- { (case "(($ac_try" in
3587
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3588
- *) ac_try_echo=$ac_try;;
3590
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3591
-$as_echo "$ac_try_echo") >&5
3592
- (eval "$ac_try") 2>&5
3594
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3595
- (exit $ac_status); }; }; then
3596
- cross_compiling=no
2530
@@ -3268,75 +3421,6 @@
2531
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
2534
-# Backslashify metacharacters that are still active within
2535
-# double-quoted strings.
2536
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
2538
-# Same as above, but do not quote variable references.
2539
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
2541
-# Sed substitution to delay expansion of an escaped shell variable in a
2542
-# double_quote_subst'ed string.
2543
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
2545
-# Sed substitution to delay expansion of an escaped single quote.
2546
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
2548
-# Sed substitution to avoid accidental globbing in evaled expressions
2549
-no_glob_subst='s/\*/\\\*/g'
2551
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
2552
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
2553
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
2555
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
2556
-$as_echo_n "checking how to print strings... " >&6; }
2557
-# Test print first, because it will be a builtin if present.
2558
-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
2559
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
2560
- ECHO='print -r --'
2561
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
2562
- ECHO='printf %s\n'
2564
- # Use this function as a fallback that always works.
2565
- func_fallback_echo ()
2567
- eval 'cat <<_LTECHO_EOF
2571
- ECHO='func_fallback_echo'
2574
-# func_echo_all arg...
2575
-# Invoke $ECHO with all args, space-separated.
2582
- printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
2583
-$as_echo "printf" >&6; } ;;
2584
- print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
2585
-$as_echo "print -r" >&6; } ;;
2586
- *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
2587
-$as_echo "cat" >&6; } ;;
2603
DEPDIR="${am__leading_dot}deps"
2605
ac_config_commands="$ac_config_commands depfiles"
2606
@@ -4782,11 +4866,8 @@
2609
# Didn't find any BSD compatible name lister, look for dumpbin.
2610
- if test -n "$DUMPBIN"; then :
2611
- # Let the user override the test.
3598
- if test "$cross_compiling" = maybe; then
3599
- cross_compiling=yes
3601
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3602
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3603
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
3604
-If you meant to cross compile, use \`--host'.
3605
-See \`config.log' for more details." >&5
3606
-$as_echo "$as_me: error: cannot run C compiled programs.
3607
-If you meant to cross compile, use \`--host'.
3608
-See \`config.log' for more details." >&2;}
3609
- { (exit 1); exit 1; }; }; }
2613
- if test -n "$ac_tool_prefix"; then
2614
- for ac_prog in dumpbin "link -dump"
2615
+ if test -n "$ac_tool_prefix"; then
2616
+ for ac_prog in "dumpbin -symbols" "link -dump -symbols"
2618
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
2619
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
2620
@@ -4830,7 +4911,7 @@
2622
if test -z "$DUMPBIN"; then
2623
ac_ct_DUMPBIN=$DUMPBIN
2624
- for ac_prog in dumpbin "link -dump"
2625
+ for ac_prog in "dumpbin -symbols" "link -dump -symbols"
2627
# Extract the first word of "$ac_prog", so it can be a program name with args.
2628
set dummy $ac_prog; ac_word=$2
2629
@@ -4885,15 +4966,6 @@
2633
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
2635
- DUMPBIN="$DUMPBIN -symbols"
3613
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
3614
-$as_echo "yes" >&6; }
3616
rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
3617
ac_clean_files=$ac_clean_files_save
3618
-# Check that the compiler produces executables we can run. If not, either
3619
-# the compiler is broken, or we cross compile.
3620
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
3621
-$as_echo_n "checking whether we are cross compiling... " >&6; }
3622
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
3623
-$as_echo "$cross_compiling" >&6; }
3625
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
3626
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
3627
$as_echo_n "checking for suffix of executables... " >&6; }
3628
-if { (ac_try="$ac_link"
3629
+if { { ac_try="$ac_link"
3631
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3632
*) ac_try_echo=$ac_try;;
3634
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3635
-$as_echo "$ac_try_echo") >&5
3636
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3637
+$as_echo "$ac_try_echo"; } >&5
3638
(eval "$ac_link") 2>&5
3640
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3641
- (exit $ac_status); }; then
3642
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3643
+ test $ac_status = 0; }; then :
3644
# If both `conftest.exe' and `conftest' are `present' (well, observable)
3645
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
3646
# work properly (i.e., refer to `conftest.exe'), while it won't with
3647
@@ -3682,32 +3932,83 @@
3651
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3652
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3653
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3654
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
3655
-See \`config.log' for more details." >&5
3656
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
3657
-See \`config.log' for more details." >&2;}
3658
- { (exit 1); exit 1; }; }; }
3659
+as_fn_error "cannot compute suffix of executables: cannot compile and link
3660
+See \`config.log' for more details." "$LINENO" 5; }
3663
-rm -f conftest$ac_cv_exeext
3664
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
3665
+rm -f conftest conftest$ac_cv_exeext
3666
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
3667
$as_echo "$ac_cv_exeext" >&6; }
3669
rm -f conftest.$ac_ext
3670
EXEEXT=$ac_cv_exeext
3672
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
3673
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3674
+/* end confdefs.h. */
3679
+FILE *f = fopen ("conftest.out", "w");
3680
+ return ferror (f) || fclose (f) != 0;
3686
+ac_clean_files="$ac_clean_files conftest.out"
3687
+# Check that the compiler produces executables we can run. If not, either
3688
+# the compiler is broken, or we cross compile.
3689
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
3690
+$as_echo_n "checking whether we are cross compiling... " >&6; }
3691
+if test "$cross_compiling" != yes; then
3692
+ { { ac_try="$ac_link"
3693
+case "(($ac_try" in
3694
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3695
+ *) ac_try_echo=$ac_try;;
3697
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3698
+$as_echo "$ac_try_echo"; } >&5
3699
+ (eval "$ac_link") 2>&5
3701
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3702
+ test $ac_status = 0; }
3703
+ if { ac_try='./conftest$ac_cv_exeext'
3704
+ { { case "(($ac_try" in
3705
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3706
+ *) ac_try_echo=$ac_try;;
3708
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3709
+$as_echo "$ac_try_echo"; } >&5
3710
+ (eval "$ac_try") 2>&5
3712
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3713
+ test $ac_status = 0; }; }; then
3714
+ cross_compiling=no
3716
+ if test "$cross_compiling" = maybe; then
3717
+ cross_compiling=yes
3719
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3720
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3721
+as_fn_error "cannot run C compiled programs.
3722
+If you meant to cross compile, use \`--host'.
3723
+See \`config.log' for more details." "$LINENO" 5; }
3727
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
3728
+$as_echo "$cross_compiling" >&6; }
3730
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
3731
+ac_clean_files=$ac_clean_files_save
3732
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
3733
$as_echo_n "checking for suffix of object files... " >&6; }
3734
-if test "${ac_cv_objext+set}" = set; then
3735
+if test "${ac_cv_objext+set}" = set; then :
3736
$as_echo_n "(cached) " >&6
3738
- cat >conftest.$ac_ext <<_ACEOF
3741
-cat confdefs.h >>conftest.$ac_ext
3742
-cat >>conftest.$ac_ext <<_ACEOF
3743
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3744
/* end confdefs.h. */
3747
@@ -3719,17 +4020,17 @@
3750
rm -f conftest.o conftest.obj
3751
-if { (ac_try="$ac_compile"
3752
+if { { ac_try="$ac_compile"
3754
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3755
*) ac_try_echo=$ac_try;;
3757
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3758
-$as_echo "$ac_try_echo") >&5
3759
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3760
+$as_echo "$ac_try_echo"; } >&5
3761
(eval "$ac_compile") 2>&5
3763
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3764
- (exit $ac_status); }; then
3765
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3766
+ test $ac_status = 0; }; then :
3767
for ac_file in conftest.o conftest.obj conftest.*; do
3768
test -f "$ac_file" || continue;
3770
@@ -3742,31 +4043,23 @@
3771
$as_echo "$as_me: failed program was:" >&5
3772
sed 's/^/| /' conftest.$ac_ext >&5
3774
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3775
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3776
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3777
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
3778
-See \`config.log' for more details." >&5
3779
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
3780
-See \`config.log' for more details." >&2;}
3781
- { (exit 1); exit 1; }; }; }
3782
+as_fn_error "cannot compute suffix of object files: cannot compile
3783
+See \`config.log' for more details." "$LINENO" 5; }
3786
rm -f conftest.$ac_cv_objext conftest.$ac_ext
3788
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
3789
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
3790
$as_echo "$ac_cv_objext" >&6; }
3791
OBJEXT=$ac_cv_objext
3793
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
3794
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
3795
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
3796
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
3797
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
3798
$as_echo_n "(cached) " >&6
3800
- cat >conftest.$ac_ext <<_ACEOF
3803
-cat confdefs.h >>conftest.$ac_ext
3804
-cat >>conftest.$ac_ext <<_ACEOF
3805
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3806
/* end confdefs.h. */
3809
@@ -3780,37 +4073,16 @@
3813
-rm -f conftest.$ac_objext
3814
-if { (ac_try="$ac_compile"
3815
-case "(($ac_try" in
3816
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3817
- *) ac_try_echo=$ac_try;;
3819
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3820
-$as_echo "$ac_try_echo") >&5
3821
- (eval "$ac_compile") 2>conftest.er1
3823
- grep -v '^ *+' conftest.er1 >conftest.err
3824
- rm -f conftest.er1
3825
- cat conftest.err >&5
3826
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3827
- (exit $ac_status); } && {
3828
- test -z "$ac_c_werror_flag" ||
3829
- test ! -s conftest.err
3830
- } && test -s conftest.$ac_objext; then
3831
+if ac_fn_c_try_compile "$LINENO"; then :
3834
- $as_echo "$as_me: failed program was:" >&5
3835
-sed 's/^/| /' conftest.$ac_ext >&5
3837
- ac_compiler_gnu=no
3838
+ ac_compiler_gnu=no
3841
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3842
ac_cv_c_compiler_gnu=$ac_compiler_gnu
3845
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
3846
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
3847
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
3848
if test $ac_compiler_gnu = yes; then
3850
@@ -3819,20 +4091,16 @@
3852
ac_test_CFLAGS=${CFLAGS+set}
3853
ac_save_CFLAGS=$CFLAGS
3854
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
3855
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
3856
$as_echo_n "checking whether $CC accepts -g... " >&6; }
3857
-if test "${ac_cv_prog_cc_g+set}" = set; then
3858
+if test "${ac_cv_prog_cc_g+set}" = set; then :
3859
$as_echo_n "(cached) " >&6
3861
ac_save_c_werror_flag=$ac_c_werror_flag
3862
ac_c_werror_flag=yes
3865
- cat >conftest.$ac_ext <<_ACEOF
3868
-cat confdefs.h >>conftest.$ac_ext
3869
-cat >>conftest.$ac_ext <<_ACEOF
3870
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3871
/* end confdefs.h. */
3874
@@ -3843,35 +4111,11 @@
3878
-rm -f conftest.$ac_objext
3879
-if { (ac_try="$ac_compile"
3880
-case "(($ac_try" in
3881
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3882
- *) ac_try_echo=$ac_try;;
3884
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3885
-$as_echo "$ac_try_echo") >&5
3886
- (eval "$ac_compile") 2>conftest.er1
3888
- grep -v '^ *+' conftest.er1 >conftest.err
3889
- rm -f conftest.er1
3890
- cat conftest.err >&5
3891
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3892
- (exit $ac_status); } && {
3893
- test -z "$ac_c_werror_flag" ||
3894
- test ! -s conftest.err
3895
- } && test -s conftest.$ac_objext; then
3896
+if ac_fn_c_try_compile "$LINENO"; then :
3899
- $as_echo "$as_me: failed program was:" >&5
3900
-sed 's/^/| /' conftest.$ac_ext >&5
3903
- cat >conftest.$ac_ext <<_ACEOF
3906
-cat confdefs.h >>conftest.$ac_ext
3907
-cat >>conftest.$ac_ext <<_ACEOF
3909
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3910
/* end confdefs.h. */
3913
@@ -3882,36 +4126,12 @@
3917
-rm -f conftest.$ac_objext
3918
-if { (ac_try="$ac_compile"
3919
-case "(($ac_try" in
3920
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3921
- *) ac_try_echo=$ac_try;;
3923
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3924
-$as_echo "$ac_try_echo") >&5
3925
- (eval "$ac_compile") 2>conftest.er1
3927
- grep -v '^ *+' conftest.er1 >conftest.err
3928
- rm -f conftest.er1
3929
- cat conftest.err >&5
3930
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3931
- (exit $ac_status); } && {
3932
- test -z "$ac_c_werror_flag" ||
3933
- test ! -s conftest.err
3934
- } && test -s conftest.$ac_objext; then
3937
- $as_echo "$as_me: failed program was:" >&5
3938
-sed 's/^/| /' conftest.$ac_ext >&5
3939
+if ac_fn_c_try_compile "$LINENO"; then :
3941
- ac_c_werror_flag=$ac_save_c_werror_flag
3943
+ ac_c_werror_flag=$ac_save_c_werror_flag
3945
- cat >conftest.$ac_ext <<_ACEOF
3948
-cat confdefs.h >>conftest.$ac_ext
3949
-cat >>conftest.$ac_ext <<_ACEOF
3950
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3951
/* end confdefs.h. */
3954
@@ -3922,42 +4142,17 @@
3958
-rm -f conftest.$ac_objext
3959
-if { (ac_try="$ac_compile"
3960
-case "(($ac_try" in
3961
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3962
- *) ac_try_echo=$ac_try;;
3964
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3965
-$as_echo "$ac_try_echo") >&5
3966
- (eval "$ac_compile") 2>conftest.er1
3968
- grep -v '^ *+' conftest.er1 >conftest.err
3969
- rm -f conftest.er1
3970
- cat conftest.err >&5
3971
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3972
- (exit $ac_status); } && {
3973
- test -z "$ac_c_werror_flag" ||
3974
- test ! -s conftest.err
3975
- } && test -s conftest.$ac_objext; then
3976
+if ac_fn_c_try_compile "$LINENO"; then :
3979
- $as_echo "$as_me: failed program was:" >&5
3980
-sed 's/^/| /' conftest.$ac_ext >&5
3985
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3988
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3991
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3992
ac_c_werror_flag=$ac_save_c_werror_flag
3994
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
3995
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
3996
$as_echo "$ac_cv_prog_cc_g" >&6; }
3997
if test "$ac_test_CFLAGS" = set; then
3998
CFLAGS=$ac_save_CFLAGS
3999
@@ -3974,18 +4169,14 @@
4003
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
4004
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
4005
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
4006
-if test "${ac_cv_prog_cc_c89+set}" = set; then
4007
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
4008
$as_echo_n "(cached) " >&6
4010
ac_cv_prog_cc_c89=no
4012
-cat >conftest.$ac_ext <<_ACEOF
4015
-cat confdefs.h >>conftest.$ac_ext
4016
-cat >>conftest.$ac_ext <<_ACEOF
4017
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4018
/* end confdefs.h. */
4021
@@ -4042,32 +4233,9 @@
4022
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
4024
CC="$ac_save_CC $ac_arg"
4025
- rm -f conftest.$ac_objext
4026
-if { (ac_try="$ac_compile"
4027
-case "(($ac_try" in
4028
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4029
- *) ac_try_echo=$ac_try;;
4031
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4032
-$as_echo "$ac_try_echo") >&5
4033
- (eval "$ac_compile") 2>conftest.er1
4035
- grep -v '^ *+' conftest.er1 >conftest.err
4036
- rm -f conftest.er1
4037
- cat conftest.err >&5
4038
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4039
- (exit $ac_status); } && {
4040
- test -z "$ac_c_werror_flag" ||
4041
- test ! -s conftest.err
4042
- } && test -s conftest.$ac_objext; then
4043
+ if ac_fn_c_try_compile "$LINENO"; then :
4044
ac_cv_prog_cc_c89=$ac_arg
4046
- $as_echo "$as_me: failed program was:" >&5
4047
-sed 's/^/| /' conftest.$ac_ext >&5
4052
rm -f core conftest.err conftest.$ac_objext
4053
test "x$ac_cv_prog_cc_c89" != "xno" && break
4055
@@ -4078,17 +4246,19 @@
4057
case "x$ac_cv_prog_cc_c89" in
4059
- { $as_echo "$as_me:$LINENO: result: none needed" >&5
4060
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
4061
$as_echo "none needed" >&6; } ;;
4063
- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
4064
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
4065
$as_echo "unsupported" >&6; } ;;
4067
CC="$CC $ac_cv_prog_cc_c89"
4068
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
4069
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
4070
$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
4072
+if test "x$ac_cv_prog_cc_c89" != xno; then :
4077
ac_cpp='$CPP $CPPFLAGS'
4078
@@ -4098,9 +4268,9 @@
4080
depcc="$CC" am_compiler_list=
4082
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
4083
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
4084
$as_echo_n "checking dependency style of $depcc... " >&6; }
4085
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
4086
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
4087
$as_echo_n "(cached) " >&6
4089
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
4090
@@ -4208,7 +4378,7 @@
4094
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
4095
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
4096
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
4097
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
4099
@@ -4223,9 +4393,9 @@
4103
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
4104
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
4105
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
4106
-if test "${ac_cv_path_SED+set}" = set; then
4107
+if test "${ac_cv_path_SED+set}" = set; then :
4108
$as_echo_n "(cached) " >&6
4110
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
4111
@@ -4233,7 +4403,7 @@
4112
ac_script="$ac_script$as_nl$ac_script"
4114
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
4115
- $as_unset ac_script || ac_script=
4116
+ { ac_script=; unset ac_script;}
4117
if test -z "$SED"; then
4118
ac_path_SED_found=false
4119
# Loop through the user's path and test for each of PROGNAME-LIST
4120
@@ -4242,7 +4412,7 @@
4123
test -z "$as_dir" && as_dir=.
4124
- for ac_prog in sed gsed; do
4125
+ for ac_prog in sed gsed; do
4126
for ac_exec_ext in '' $ac_executable_extensions; do
4127
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
4128
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
4129
@@ -4262,7 +4432,7 @@
4130
$as_echo '' >> "conftest.nl"
4131
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
4132
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
4133
- ac_count=`expr $ac_count + 1`
4134
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
4135
if test $ac_count -gt ${ac_path_SED_max-0}; then
4136
# Best one so far, save it but keep looking for a better one
4137
ac_cv_path_SED="$ac_path_SED"
4138
@@ -4277,19 +4447,17 @@
4139
$ac_path_SED_found && break 3
4145
if test -z "$ac_cv_path_SED"; then
4146
- { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
4147
-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
4148
- { (exit 1); exit 1; }; }
4149
+ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
4156
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
4157
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
4158
$as_echo "$ac_cv_path_SED" >&6; }
4159
SED="$ac_cv_path_SED"
4161
@@ -4307,9 +4475,9 @@
4165
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
4166
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
4167
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
4168
-if test "${ac_cv_path_GREP+set}" = set; then
4169
+if test "${ac_cv_path_GREP+set}" = set; then :
4170
$as_echo_n "(cached) " >&6
4172
if test -z "$GREP"; then
4173
@@ -4320,7 +4488,7 @@
4176
test -z "$as_dir" && as_dir=.
4177
- for ac_prog in grep ggrep; do
4178
+ for ac_prog in grep ggrep; do
4179
for ac_exec_ext in '' $ac_executable_extensions; do
4180
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
4181
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
4182
@@ -4340,7 +4508,7 @@
4183
$as_echo 'GREP' >> "conftest.nl"
4184
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
4185
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
4186
- ac_count=`expr $ac_count + 1`
4187
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
4188
if test $ac_count -gt ${ac_path_GREP_max-0}; then
4189
# Best one so far, save it but keep looking for a better one
4190
ac_cv_path_GREP="$ac_path_GREP"
4191
@@ -4355,26 +4523,24 @@
4192
$ac_path_GREP_found && break 3
4198
if test -z "$ac_cv_path_GREP"; then
4199
- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
4200
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
4201
- { (exit 1); exit 1; }; }
4202
+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4205
ac_cv_path_GREP=$GREP
4209
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
4210
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
4211
$as_echo "$ac_cv_path_GREP" >&6; }
4212
GREP="$ac_cv_path_GREP"
4215
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
4216
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
4217
$as_echo_n "checking for egrep... " >&6; }
4218
-if test "${ac_cv_path_EGREP+set}" = set; then
4219
+if test "${ac_cv_path_EGREP+set}" = set; then :
4220
$as_echo_n "(cached) " >&6
4222
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
4223
@@ -4388,7 +4554,7 @@
4226
test -z "$as_dir" && as_dir=.
4227
- for ac_prog in egrep; do
4228
+ for ac_prog in egrep; do
4229
for ac_exec_ext in '' $ac_executable_extensions; do
4230
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
4231
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
4232
@@ -4408,7 +4574,7 @@
4233
$as_echo 'EGREP' >> "conftest.nl"
4234
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
4235
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
4236
- ac_count=`expr $ac_count + 1`
4237
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
4238
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
4239
# Best one so far, save it but keep looking for a better one
4240
ac_cv_path_EGREP="$ac_path_EGREP"
4241
@@ -4423,12 +4589,10 @@
4242
$ac_path_EGREP_found && break 3
4248
if test -z "$ac_cv_path_EGREP"; then
4249
- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
4250
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
4251
- { (exit 1); exit 1; }; }
4252
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4255
ac_cv_path_EGREP=$EGREP
4256
@@ -4436,14 +4600,14 @@
4260
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
4261
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
4262
$as_echo "$ac_cv_path_EGREP" >&6; }
4263
EGREP="$ac_cv_path_EGREP"
4266
-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
4267
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
4268
$as_echo_n "checking for fgrep... " >&6; }
4269
-if test "${ac_cv_path_FGREP+set}" = set; then
4270
+if test "${ac_cv_path_FGREP+set}" = set; then :
4271
$as_echo_n "(cached) " >&6
4273
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
4274
@@ -4457,7 +4621,7 @@
4277
test -z "$as_dir" && as_dir=.
4278
- for ac_prog in fgrep; do
4279
+ for ac_prog in fgrep; do
4280
for ac_exec_ext in '' $ac_executable_extensions; do
4281
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
4282
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
4283
@@ -4477,7 +4641,7 @@
4284
$as_echo 'FGREP' >> "conftest.nl"
4285
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
4286
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
4287
- ac_count=`expr $ac_count + 1`
4288
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
4289
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
4290
# Best one so far, save it but keep looking for a better one
4291
ac_cv_path_FGREP="$ac_path_FGREP"
4292
@@ -4492,12 +4656,10 @@
4293
$ac_path_FGREP_found && break 3
4299
if test -z "$ac_cv_path_FGREP"; then
4300
- { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
4301
-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
4302
- { (exit 1); exit 1; }; }
4303
+ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4306
ac_cv_path_FGREP=$FGREP
4307
@@ -4505,7 +4667,7 @@
4311
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
4312
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
4313
$as_echo "$ac_cv_path_FGREP" >&6; }
4314
FGREP="$ac_cv_path_FGREP"
4316
@@ -4531,7 +4693,7 @@
4319
# Check whether --with-gnu-ld was given.
4320
-if test "${with_gnu_ld+set}" = set; then
4321
+if test "${with_gnu_ld+set}" = set; then :
4322
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
4325
@@ -4540,7 +4702,7 @@
4327
if test "$GCC" = yes; then
4328
# Check if gcc -print-prog-name=ld gives a path.
4329
- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
4330
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
4331
$as_echo_n "checking for ld used by $CC... " >&6; }
4334
@@ -4570,13 +4732,13 @@
4337
elif test "$with_gnu_ld" = yes; then
4338
- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
4339
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
4340
$as_echo_n "checking for GNU ld... " >&6; }
4342
- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
4343
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
4344
$as_echo_n "checking for non-GNU ld... " >&6; }
4346
-if test "${lt_cv_path_LD+set}" = set; then
4347
+if test "${lt_cv_path_LD+set}" = set; then :
4348
$as_echo_n "(cached) " >&6
4350
if test -z "$LD"; then
4351
@@ -4607,18 +4769,16 @@
4354
if test -n "$LD"; then
4355
- { $as_echo "$as_me:$LINENO: result: $LD" >&5
4356
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
4357
$as_echo "$LD" >&6; }
4359
- { $as_echo "$as_me:$LINENO: result: no" >&5
4360
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4361
$as_echo "no" >&6; }
4363
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
4364
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
4365
- { (exit 1); exit 1; }; }
4366
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
4367
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
4368
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
4369
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
4370
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
4371
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
4372
$as_echo_n "(cached) " >&6
4374
# I'd rather use --version here, but apparently some GNU lds only accept -v.
4375
@@ -4631,7 +4791,7 @@
4379
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
4380
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
4381
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
4382
with_gnu_ld=$lt_cv_prog_gnu_ld
4384
@@ -4643,9 +4803,9 @@
4388
-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
4389
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
4390
$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
4391
-if test "${lt_cv_path_NM+set}" = set; then
4392
+if test "${lt_cv_path_NM+set}" = set; then :
4393
$as_echo_n "(cached) " >&6
4395
if test -n "$NM"; then
4396
@@ -4692,7 +4852,7 @@
4397
: ${lt_cv_path_NM=no}
4400
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
4401
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
4402
$as_echo "$lt_cv_path_NM" >&6; }
4403
if test "$lt_cv_path_NM" != "no"; then
4405
@@ -4703,9 +4863,9 @@
4407
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
4408
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
4409
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4410
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4411
$as_echo_n "checking for $ac_word... " >&6; }
4412
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then
4413
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
4414
$as_echo_n "(cached) " >&6
4416
if test -n "$DUMPBIN"; then
4417
@@ -4716,24 +4876,24 @@
4420
test -z "$as_dir" && as_dir=.
4421
- for ac_exec_ext in '' $ac_executable_extensions; do
4422
+ for ac_exec_ext in '' $ac_executable_extensions; do
4423
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4424
ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
4425
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4426
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4436
DUMPBIN=$ac_cv_prog_DUMPBIN
4437
if test -n "$DUMPBIN"; then
4438
- { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
4439
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
4440
$as_echo "$DUMPBIN" >&6; }
4442
- { $as_echo "$as_me:$LINENO: result: no" >&5
4443
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4444
$as_echo "no" >&6; }
4447
@@ -4747,9 +4907,9 @@
4449
# Extract the first word of "$ac_prog", so it can be a program name with args.
4450
set dummy $ac_prog; ac_word=$2
4451
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4452
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4453
$as_echo_n "checking for $ac_word... " >&6; }
4454
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
4455
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
4456
$as_echo_n "(cached) " >&6
4458
if test -n "$ac_ct_DUMPBIN"; then
4459
@@ -4760,24 +4920,24 @@
4462
test -z "$as_dir" && as_dir=.
4463
- for ac_exec_ext in '' $ac_executable_extensions; do
4464
+ for ac_exec_ext in '' $ac_executable_extensions; do
4465
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4466
ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
4467
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4468
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4478
ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
4479
if test -n "$ac_ct_DUMPBIN"; then
4480
- { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
4481
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
4482
$as_echo "$ac_ct_DUMPBIN" >&6; }
4484
- { $as_echo "$as_me:$LINENO: result: no" >&5
4485
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4486
$as_echo "no" >&6; }
4489
@@ -4790,7 +4950,7 @@
4491
case $cross_compiling:$ac_tool_warned in
4493
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4494
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4495
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4496
ac_tool_warned=yes ;;
4498
@@ -4810,44 +4970,44 @@
4502
-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
4503
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
4504
$as_echo_n "checking the name lister ($NM) interface... " >&6; }
4505
-if test "${lt_cv_nm_interface+set}" = set; then
4506
+if test "${lt_cv_nm_interface+set}" = set; then :
4507
$as_echo_n "(cached) " >&6
2643
if test "$DUMPBIN" != ":"; then
2645
@@ -4913,13 +4985,13 @@
4509
2647
lt_cv_nm_interface="BSD nm"
4510
2648
echo "int some_variable = 0;" > conftest.$ac_ext
4511
- (eval echo "\"\$as_me:4820: $ac_compile\"" >&5)
4512
+ (eval echo "\"\$as_me:4980: $ac_compile\"" >&5)
2649
- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
2650
+ (eval echo "\"\$as_me:4988: $ac_compile\"" >&5)
4513
2651
(eval "$ac_compile" 2>conftest.err)
4514
2652
cat conftest.err >&5
4515
- (eval echo "\"\$as_me:4823: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
4516
+ (eval echo "\"\$as_me:4983: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
2653
- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
2654
+ (eval echo "\"\$as_me:4991: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
4517
2655
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
4518
2656
cat conftest.err >&5
4519
- (eval echo "\"\$as_me:4826: output\"" >&5)
4520
+ (eval echo "\"\$as_me:4986: output\"" >&5)
2657
- (eval echo "\"\$as_me:$LINENO: output\"" >&5)
2658
+ (eval echo "\"\$as_me:4994: output\"" >&5)
4521
2659
cat conftest.out >&5
4522
2660
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
4523
2661
lt_cv_nm_interface="MS dumpbin"
4527
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
4528
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
4529
$as_echo "$lt_cv_nm_interface" >&6; }
4531
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
4532
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
4533
$as_echo_n "checking whether ln -s works... " >&6; }
4535
if test "$LN_S" = "ln -s"; then
4536
- { $as_echo "$as_me:$LINENO: result: yes" >&5
4537
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4538
$as_echo "yes" >&6; }
4540
- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
4541
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
4542
$as_echo "no, using $LN_S" >&6; }
4545
# find the maximum length of command line arguments
4546
-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
4547
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
4548
$as_echo_n "checking the maximum length of command line arguments... " >&6; }
4549
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
4550
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
4551
$as_echo_n "(cached) " >&6
4554
@@ -4965,10 +5125,10 @@
4557
if test -n $lt_cv_sys_max_cmd_len ; then
4558
- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
4559
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
4560
$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
4562
- { $as_echo "$as_me:$LINENO: result: none" >&5
4563
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
4564
$as_echo "none" >&6; }
4566
max_cmd_len=$lt_cv_sys_max_cmd_len
4567
@@ -4982,7 +5142,7 @@
4571
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
4572
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
4573
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
4574
# Try some XSI features
4576
@@ -4992,17 +5152,17 @@
4577
&& eval 'test $(( 1 + 1 )) -eq 2 \
4578
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
4580
-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
4581
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
4582
$as_echo "$xsi_shell" >&6; }
4585
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
4586
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
4587
$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
4589
( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
4591
&& lt_shell_append=yes
4592
-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
4593
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
4594
$as_echo "$lt_shell_append" >&6; }
4597
@@ -5037,14 +5197,14 @@
4601
-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
4602
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
4603
$as_echo_n "checking for $LD option to reload object files... " >&6; }
4604
-if test "${lt_cv_ld_reload_flag+set}" = set; then
4605
+if test "${lt_cv_ld_reload_flag+set}" = set; then :
4606
$as_echo_n "(cached) " >&6
4608
lt_cv_ld_reload_flag='-r'
4610
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
4611
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
4612
$as_echo "$lt_cv_ld_reload_flag" >&6; }
4613
reload_flag=$lt_cv_ld_reload_flag
4614
case $reload_flag in
4615
@@ -5073,9 +5233,9 @@
4616
if test -n "$ac_tool_prefix"; then
4617
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
4618
set dummy ${ac_tool_prefix}objdump; ac_word=$2
4619
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4620
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4621
$as_echo_n "checking for $ac_word... " >&6; }
4622
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then
4623
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
4624
$as_echo_n "(cached) " >&6
4626
if test -n "$OBJDUMP"; then
4627
@@ -5086,24 +5246,24 @@
4630
test -z "$as_dir" && as_dir=.
4631
- for ac_exec_ext in '' $ac_executable_extensions; do
4632
+ for ac_exec_ext in '' $ac_executable_extensions; do
4633
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4634
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
4635
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4636
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4646
OBJDUMP=$ac_cv_prog_OBJDUMP
4647
if test -n "$OBJDUMP"; then
4648
- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
4649
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
4650
$as_echo "$OBJDUMP" >&6; }
4652
- { $as_echo "$as_me:$LINENO: result: no" >&5
4653
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4654
$as_echo "no" >&6; }
4657
@@ -5113,9 +5273,9 @@
4658
ac_ct_OBJDUMP=$OBJDUMP
4659
# Extract the first word of "objdump", so it can be a program name with args.
4660
set dummy objdump; ac_word=$2
4661
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4662
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4663
$as_echo_n "checking for $ac_word... " >&6; }
4664
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
4665
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
4666
$as_echo_n "(cached) " >&6
4668
if test -n "$ac_ct_OBJDUMP"; then
4669
@@ -5126,24 +5286,24 @@
4672
test -z "$as_dir" && as_dir=.
4673
- for ac_exec_ext in '' $ac_executable_extensions; do
4674
+ for ac_exec_ext in '' $ac_executable_extensions; do
4675
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4676
ac_cv_prog_ac_ct_OBJDUMP="objdump"
4677
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4678
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4688
ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
4689
if test -n "$ac_ct_OBJDUMP"; then
4690
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
4691
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
4692
$as_echo "$ac_ct_OBJDUMP" >&6; }
4694
- { $as_echo "$as_me:$LINENO: result: no" >&5
4695
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4696
$as_echo "no" >&6; }
4699
@@ -5152,7 +5312,7 @@
2662
@@ -4976,11 +5048,6 @@
2663
lt_cv_sys_max_cmd_len=8192;
2667
- # On MiNT this can take a long time and run out of memory.
2668
- lt_cv_sys_max_cmd_len=8192;
2672
# On AmigaOS with pdksh, this test takes hours, literally.
2673
# So we just punt and use a minimum line length of 8192.
2674
@@ -5045,8 +5112,8 @@
2675
# If test is not a shell built-in, we'll probably end up computing a
2676
# maximum length that is only half of the actual maximum length, but
2678
- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
2679
- = "X$teststring$teststring"; } >/dev/null 2>&1 &&
2680
+ while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
2681
+ = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
2682
test $i != 17 # 1/2 MB should be enough
2685
@@ -5317,18 +5384,16 @@
2686
# Base MSYS/MinGW do not provide the 'file' command needed by
2687
# func_win32_libid shell function, so use a weaker test based on 'objdump',
2688
# unless we find 'file', for example because we are cross-compiling.
2689
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
2690
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
2691
+ if ( file / ) >/dev/null 2>&1; then
2692
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
2693
lt_cv_file_magic_cmd='func_win32_libid'
4701
case $cross_compiling:$ac_tool_warned in
4703
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4704
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4705
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4706
ac_tool_warned=yes ;;
4708
@@ -5172,9 +5332,9 @@
4712
-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
4713
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
4714
$as_echo_n "checking how to recognize dependent libraries... " >&6; }
4715
-if test "${lt_cv_deplibs_check_method+set}" = set; then
4716
+if test "${lt_cv_deplibs_check_method+set}" = set; then :
4717
$as_echo_n "(cached) " >&6
4719
lt_cv_file_magic_cmd='$MAGIC_CMD'
4720
@@ -5289,11 +5449,11 @@
4723
# This must be Linux ELF.
4724
-linux* | k*bsd*-gnu)
4725
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
2695
- # Keep this pattern in sync with the one in func_win32_libid.
2696
- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
2697
+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
2698
lt_cv_file_magic_cmd='$OBJDUMP -f'
2704
# use the weaker test based on 'objdump'. See mingw*.
2705
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
2706
lt_cv_file_magic_cmd='$OBJDUMP -f'
2707
@@ -5358,10 +5423,6 @@
2708
lt_cv_deplibs_check_method=pass_all
2712
- lt_cv_deplibs_check_method=pass_all
2715
hpux10.20* | hpux11*)
2716
lt_cv_file_magic_cmd=/usr/bin/file
2718
@@ -5370,11 +5431,11 @@
2719
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
2722
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
2723
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
2724
lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
2727
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
2728
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
2729
lt_cv_file_magic_test_file=/usr/lib/libc.sl
2732
@@ -5400,7 +5461,7 @@
4726
2733
lt_cv_deplibs_check_method=pass_all
4731
2738
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
4732
2739
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
4734
@@ -5368,7 +5528,7 @@
4738
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
4739
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
4740
$as_echo "$lt_cv_deplibs_check_method" >&6; }
4741
file_magic_cmd=$lt_cv_file_magic_cmd
4742
deplibs_check_method=$lt_cv_deplibs_check_method
4743
@@ -5388,9 +5548,9 @@
4744
if test -n "$ac_tool_prefix"; then
4745
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
4746
set dummy ${ac_tool_prefix}ar; ac_word=$2
4747
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4748
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4749
$as_echo_n "checking for $ac_word... " >&6; }
4750
-if test "${ac_cv_prog_AR+set}" = set; then
4751
+if test "${ac_cv_prog_AR+set}" = set; then :
4752
$as_echo_n "(cached) " >&6
4754
if test -n "$AR"; then
4755
@@ -5401,24 +5561,24 @@
4758
test -z "$as_dir" && as_dir=.
4759
- for ac_exec_ext in '' $ac_executable_extensions; do
4760
+ for ac_exec_ext in '' $ac_executable_extensions; do
4761
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4762
ac_cv_prog_AR="${ac_tool_prefix}ar"
4763
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4764
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4775
if test -n "$AR"; then
4776
- { $as_echo "$as_me:$LINENO: result: $AR" >&5
4777
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
4778
$as_echo "$AR" >&6; }
4780
- { $as_echo "$as_me:$LINENO: result: no" >&5
4781
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4782
$as_echo "no" >&6; }
4785
@@ -5428,9 +5588,9 @@
4787
# Extract the first word of "ar", so it can be a program name with args.
4788
set dummy ar; ac_word=$2
4789
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4790
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4791
$as_echo_n "checking for $ac_word... " >&6; }
4792
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
4793
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
4794
$as_echo_n "(cached) " >&6
4796
if test -n "$ac_ct_AR"; then
4797
@@ -5441,24 +5601,24 @@
4800
test -z "$as_dir" && as_dir=.
4801
- for ac_exec_ext in '' $ac_executable_extensions; do
4802
+ for ac_exec_ext in '' $ac_executable_extensions; do
4803
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4804
ac_cv_prog_ac_ct_AR="ar"
4805
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4806
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4816
ac_ct_AR=$ac_cv_prog_ac_ct_AR
4817
if test -n "$ac_ct_AR"; then
4818
- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
4819
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
4820
$as_echo "$ac_ct_AR" >&6; }
4822
- { $as_echo "$as_me:$LINENO: result: no" >&5
4823
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4824
$as_echo "no" >&6; }
4827
@@ -5467,7 +5627,7 @@
4829
case $cross_compiling:$ac_tool_warned in
4831
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4832
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4833
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4834
ac_tool_warned=yes ;;
4836
@@ -5493,9 +5653,9 @@
4837
if test -n "$ac_tool_prefix"; then
4838
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
4839
set dummy ${ac_tool_prefix}strip; ac_word=$2
4840
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4841
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4842
$as_echo_n "checking for $ac_word... " >&6; }
4843
-if test "${ac_cv_prog_STRIP+set}" = set; then
4844
+if test "${ac_cv_prog_STRIP+set}" = set; then :
4845
$as_echo_n "(cached) " >&6
4847
if test -n "$STRIP"; then
4848
@@ -5506,24 +5666,24 @@
4851
test -z "$as_dir" && as_dir=.
4852
- for ac_exec_ext in '' $ac_executable_extensions; do
4853
+ for ac_exec_ext in '' $ac_executable_extensions; do
4854
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4855
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
4856
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4857
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4867
STRIP=$ac_cv_prog_STRIP
4868
if test -n "$STRIP"; then
4869
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
4870
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
4871
$as_echo "$STRIP" >&6; }
4873
- { $as_echo "$as_me:$LINENO: result: no" >&5
4874
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4875
$as_echo "no" >&6; }
4878
@@ -5533,9 +5693,9 @@
4880
# Extract the first word of "strip", so it can be a program name with args.
4881
set dummy strip; ac_word=$2
4882
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4883
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4884
$as_echo_n "checking for $ac_word... " >&6; }
4885
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
4886
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
4887
$as_echo_n "(cached) " >&6
4889
if test -n "$ac_ct_STRIP"; then
4890
@@ -5546,24 +5706,24 @@
4893
test -z "$as_dir" && as_dir=.
4894
- for ac_exec_ext in '' $ac_executable_extensions; do
4895
+ for ac_exec_ext in '' $ac_executable_extensions; do
4896
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4897
ac_cv_prog_ac_ct_STRIP="strip"
4898
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4899
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4909
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
4910
if test -n "$ac_ct_STRIP"; then
4911
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
4912
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
4913
$as_echo "$ac_ct_STRIP" >&6; }
4915
- { $as_echo "$as_me:$LINENO: result: no" >&5
4916
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4917
$as_echo "no" >&6; }
4920
@@ -5572,7 +5732,7 @@
4922
case $cross_compiling:$ac_tool_warned in
4924
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4925
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4926
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4927
ac_tool_warned=yes ;;
4929
@@ -5592,9 +5752,9 @@
4930
if test -n "$ac_tool_prefix"; then
4931
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
4932
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
4933
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4934
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4935
$as_echo_n "checking for $ac_word... " >&6; }
4936
-if test "${ac_cv_prog_RANLIB+set}" = set; then
4937
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
4938
$as_echo_n "(cached) " >&6
4940
if test -n "$RANLIB"; then
4941
@@ -5605,24 +5765,24 @@
4944
test -z "$as_dir" && as_dir=.
4945
- for ac_exec_ext in '' $ac_executable_extensions; do
4946
+ for ac_exec_ext in '' $ac_executable_extensions; do
4947
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4948
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
4949
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4950
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4960
RANLIB=$ac_cv_prog_RANLIB
4961
if test -n "$RANLIB"; then
4962
- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
4963
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
4964
$as_echo "$RANLIB" >&6; }
4966
- { $as_echo "$as_me:$LINENO: result: no" >&5
4967
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4968
$as_echo "no" >&6; }
4971
@@ -5632,9 +5792,9 @@
4972
ac_ct_RANLIB=$RANLIB
4973
# Extract the first word of "ranlib", so it can be a program name with args.
4974
set dummy ranlib; ac_word=$2
4975
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4976
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4977
$as_echo_n "checking for $ac_word... " >&6; }
4978
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
4979
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
4980
$as_echo_n "(cached) " >&6
4982
if test -n "$ac_ct_RANLIB"; then
4983
@@ -5645,24 +5805,24 @@
4986
test -z "$as_dir" && as_dir=.
4987
- for ac_exec_ext in '' $ac_executable_extensions; do
4988
+ for ac_exec_ext in '' $ac_executable_extensions; do
4989
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4990
ac_cv_prog_ac_ct_RANLIB="ranlib"
4991
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4992
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5002
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
5003
if test -n "$ac_ct_RANLIB"; then
5004
- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
5005
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
5006
$as_echo "$ac_ct_RANLIB" >&6; }
5008
- { $as_echo "$as_me:$LINENO: result: no" >&5
5009
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5010
$as_echo "no" >&6; }
5013
@@ -5671,7 +5831,7 @@
5015
case $cross_compiling:$ac_tool_warned in
5017
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
5018
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
5019
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
5020
ac_tool_warned=yes ;;
5022
@@ -5749,9 +5909,9 @@
5025
# Check for command to grab the raw symbol name followed by C symbol from nm.
5026
-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
5027
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
5028
$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
5029
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
5030
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
5031
$as_echo_n "(cached) " >&6
5034
@@ -5867,18 +6027,18 @@
5035
int main(){nm_test_var='a';nm_test_func();return(0);}
5038
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5039
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
5040
(eval $ac_compile) 2>&5
5042
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5043
- (exit $ac_status); }; then
5044
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5045
+ test $ac_status = 0; }; then
2741
@@ -5812,18 +5873,6 @@
2742
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
2747
- lock_old_archive_extraction=yes ;;
2749
- lock_old_archive_extraction=no ;;
2760
@@ -5993,8 +6042,8 @@
2761
test $ac_status = 0; }; then
5046
2762
# Now try to grab the symbols.
5047
2763
nlist=conftest.nm
5048
- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
2764
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
2765
- (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
5049
2766
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
5050
(eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
5052
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5053
- (exit $ac_status); } && test -s "$nlist"; then
5054
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5055
+ test $ac_status = 0; } && test -s "$nlist"; then
5056
# Try sorting and uniquifying the output.
5057
if sort "$nlist" | uniq > "$nlist"T; then
5058
mv -f "$nlist"T "$nlist"
5059
@@ -5931,11 +6091,11 @@
5060
lt_save_CFLAGS="$CFLAGS"
5061
LIBS="conftstm.$ac_objext"
5062
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
5063
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5064
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
5065
(eval $ac_link) 2>&5
5067
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5068
- (exit $ac_status); } && test -s conftest${ac_exeext}; then
5069
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5070
+ test $ac_status = 0; } && test -s conftest${ac_exeext}; then
5073
LIBS="$lt_save_LIBS"
5074
@@ -5969,10 +6129,10 @@
5075
lt_cv_sys_global_symbol_to_cdecl=
5077
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
5078
- { $as_echo "$as_me:$LINENO: result: failed" >&5
5079
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
5080
$as_echo "failed" >&6; }
5082
- { $as_echo "$as_me:$LINENO: result: ok" >&5
5083
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
5084
$as_echo "ok" >&6; }
5087
@@ -5999,7 +6159,7 @@
5090
# Check whether --enable-libtool-lock was given.
5091
-if test "${enable_libtool_lock+set}" = set; then
5092
+if test "${enable_libtool_lock+set}" = set; then :
5093
enableval=$enable_libtool_lock;
5096
@@ -6011,11 +6171,11 @@
5098
# Find out which ABI we are using.
5099
echo 'int i;' > conftest.$ac_ext
5100
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5101
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
5102
(eval $ac_compile) 2>&5
5104
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5105
- (exit $ac_status); }; then
5106
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5107
+ test $ac_status = 0; }; then
5108
case `/usr/bin/file conftest.$ac_objext` in
5111
@@ -6029,12 +6189,12 @@
2767
+ (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
2769
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2770
test $ac_status = 0; } && test -s "$nlist"; then
2771
@@ -6148,7 +6197,7 @@
5114
2774
# Find out which ABI we are using.
5115
- echo '#line 6032 "configure"' > conftest.$ac_ext
5116
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5117
+ echo '#line 6192 "configure"' > conftest.$ac_ext
5118
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
5119
(eval $ac_compile) 2>&5
5121
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5122
- (exit $ac_status); }; then
5123
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5124
+ test $ac_status = 0; }; then
5125
if test "$lt_cv_prog_gnu_ld" = yes; then
5126
case `/usr/bin/file conftest.$ac_objext` in
5128
@@ -6068,11 +6228,11 @@
5129
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
5130
# Find out which ABI we are using.
5131
echo 'int i;' > conftest.$ac_ext
5132
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5133
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
5134
(eval $ac_compile) 2>&5
5136
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5137
- (exit $ac_status); }; then
5138
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5139
+ test $ac_status = 0; }; then
5140
case `/usr/bin/file conftest.o` in
5143
@@ -6121,9 +6281,9 @@
5144
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
5145
SAVE_CFLAGS="$CFLAGS"
5146
CFLAGS="$CFLAGS -belf"
5147
- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
5148
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
5149
$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
5150
-if test "${lt_cv_cc_needs_belf+set}" = set; then
5151
+if test "${lt_cv_cc_needs_belf+set}" = set; then :
5152
$as_echo_n "(cached) " >&6
5155
@@ -6132,11 +6292,7 @@
5156
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5157
ac_compiler_gnu=$ac_cv_c_compiler_gnu
5159
- cat >conftest.$ac_ext <<_ACEOF
5162
-cat confdefs.h >>conftest.$ac_ext
5163
-cat >>conftest.$ac_ext <<_ACEOF
5164
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5165
/* end confdefs.h. */
5168
@@ -6147,38 +6303,13 @@
5172
-rm -f conftest.$ac_objext conftest$ac_exeext
5173
-if { (ac_try="$ac_link"
5174
-case "(($ac_try" in
5175
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5176
- *) ac_try_echo=$ac_try;;
5178
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5179
-$as_echo "$ac_try_echo") >&5
5180
- (eval "$ac_link") 2>conftest.er1
5182
- grep -v '^ *+' conftest.er1 >conftest.err
5183
- rm -f conftest.er1
5184
- cat conftest.err >&5
5185
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5186
- (exit $ac_status); } && {
5187
- test -z "$ac_c_werror_flag" ||
5188
- test ! -s conftest.err
5189
- } && test -s conftest$ac_exeext && {
5190
- test "$cross_compiling" = yes ||
5191
- $as_test_x conftest$ac_exeext
5193
+if ac_fn_c_try_link "$LINENO"; then :
5194
lt_cv_cc_needs_belf=yes
5196
- $as_echo "$as_me: failed program was:" >&5
5197
-sed 's/^/| /' conftest.$ac_ext >&5
5199
- lt_cv_cc_needs_belf=no
5200
+ lt_cv_cc_needs_belf=no
5203
-rm -rf conftest.dSYM
5204
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
5205
- conftest$ac_exeext conftest.$ac_ext
5206
+rm -f core conftest.err conftest.$ac_objext \
5207
+ conftest$ac_exeext conftest.$ac_ext
5209
ac_cpp='$CPP $CPPFLAGS'
5210
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5211
@@ -6186,7 +6317,7 @@
5212
ac_compiler_gnu=$ac_cv_c_compiler_gnu
5215
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
5216
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
5217
$as_echo "$lt_cv_cc_needs_belf" >&6; }
5218
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
5219
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
5220
@@ -6196,11 +6327,11 @@
5222
# Find out which ABI we are using.
5223
echo 'int i;' > conftest.$ac_ext
5224
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5225
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
5226
(eval $ac_compile) 2>&5
5228
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5229
- (exit $ac_status); }; then
5230
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5231
+ test $ac_status = 0; }; then
5232
case `/usr/bin/file conftest.o` in
5234
case $lt_cv_prog_gnu_ld in
5235
@@ -6226,9 +6357,9 @@
5236
if test -n "$ac_tool_prefix"; then
5237
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
5238
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
5239
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
5240
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5241
$as_echo_n "checking for $ac_word... " >&6; }
5242
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
5243
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
5244
$as_echo_n "(cached) " >&6
5246
if test -n "$DSYMUTIL"; then
5247
@@ -6239,24 +6370,24 @@
5250
test -z "$as_dir" && as_dir=.
5251
- for ac_exec_ext in '' $ac_executable_extensions; do
5252
+ for ac_exec_ext in '' $ac_executable_extensions; do
5253
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5254
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
5255
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5256
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5266
DSYMUTIL=$ac_cv_prog_DSYMUTIL
5267
if test -n "$DSYMUTIL"; then
5268
- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
5269
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
5270
$as_echo "$DSYMUTIL" >&6; }
5272
- { $as_echo "$as_me:$LINENO: result: no" >&5
5273
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5274
$as_echo "no" >&6; }
5277
@@ -6266,9 +6397,9 @@
5278
ac_ct_DSYMUTIL=$DSYMUTIL
5279
# Extract the first word of "dsymutil", so it can be a program name with args.
5280
set dummy dsymutil; ac_word=$2
5281
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
5282
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5283
$as_echo_n "checking for $ac_word... " >&6; }
5284
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
5285
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
5286
$as_echo_n "(cached) " >&6
5288
if test -n "$ac_ct_DSYMUTIL"; then
5289
@@ -6279,24 +6410,24 @@
5292
test -z "$as_dir" && as_dir=.
5293
- for ac_exec_ext in '' $ac_executable_extensions; do
5294
+ for ac_exec_ext in '' $ac_executable_extensions; do
5295
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5296
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
5297
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5298
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5308
ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
5309
if test -n "$ac_ct_DSYMUTIL"; then
5310
- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
5311
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
5312
$as_echo "$ac_ct_DSYMUTIL" >&6; }
5314
- { $as_echo "$as_me:$LINENO: result: no" >&5
5315
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5316
$as_echo "no" >&6; }
5319
@@ -6305,7 +6436,7 @@
5321
case $cross_compiling:$ac_tool_warned in
5323
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
5324
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
5325
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
5326
ac_tool_warned=yes ;;
5328
@@ -6318,9 +6449,9 @@
5329
if test -n "$ac_tool_prefix"; then
5330
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
5331
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
5332
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
5333
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5334
$as_echo_n "checking for $ac_word... " >&6; }
5335
-if test "${ac_cv_prog_NMEDIT+set}" = set; then
5336
+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
5337
$as_echo_n "(cached) " >&6
5339
if test -n "$NMEDIT"; then
5340
@@ -6331,24 +6462,24 @@
5343
test -z "$as_dir" && as_dir=.
5344
- for ac_exec_ext in '' $ac_executable_extensions; do
5345
+ for ac_exec_ext in '' $ac_executable_extensions; do
5346
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5347
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
5348
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5349
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5359
NMEDIT=$ac_cv_prog_NMEDIT
5360
if test -n "$NMEDIT"; then
5361
- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
5362
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
5363
$as_echo "$NMEDIT" >&6; }
5365
- { $as_echo "$as_me:$LINENO: result: no" >&5
5366
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5367
$as_echo "no" >&6; }
5370
@@ -6358,9 +6489,9 @@
5371
ac_ct_NMEDIT=$NMEDIT
5372
# Extract the first word of "nmedit", so it can be a program name with args.
5373
set dummy nmedit; ac_word=$2
5374
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
5375
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5376
$as_echo_n "checking for $ac_word... " >&6; }
5377
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
5378
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
5379
$as_echo_n "(cached) " >&6
5381
if test -n "$ac_ct_NMEDIT"; then
5382
@@ -6371,24 +6502,24 @@
5385
test -z "$as_dir" && as_dir=.
5386
- for ac_exec_ext in '' $ac_executable_extensions; do
5387
+ for ac_exec_ext in '' $ac_executable_extensions; do
5388
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5389
ac_cv_prog_ac_ct_NMEDIT="nmedit"
5390
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5391
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5401
ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
5402
if test -n "$ac_ct_NMEDIT"; then
5403
- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
5404
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
5405
$as_echo "$ac_ct_NMEDIT" >&6; }
5407
- { $as_echo "$as_me:$LINENO: result: no" >&5
5408
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5409
$as_echo "no" >&6; }
5412
@@ -6397,7 +6528,7 @@
5414
case $cross_compiling:$ac_tool_warned in
5416
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
5417
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
5418
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
5419
ac_tool_warned=yes ;;
5421
@@ -6410,9 +6541,9 @@
5422
if test -n "$ac_tool_prefix"; then
5423
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
5424
set dummy ${ac_tool_prefix}lipo; ac_word=$2
5425
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
5426
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5427
$as_echo_n "checking for $ac_word... " >&6; }
5428
-if test "${ac_cv_prog_LIPO+set}" = set; then
5429
+if test "${ac_cv_prog_LIPO+set}" = set; then :
5430
$as_echo_n "(cached) " >&6
5432
if test -n "$LIPO"; then
5433
@@ -6423,24 +6554,24 @@
5436
test -z "$as_dir" && as_dir=.
5437
- for ac_exec_ext in '' $ac_executable_extensions; do
5438
+ for ac_exec_ext in '' $ac_executable_extensions; do
5439
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5440
ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
5441
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5442
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5452
LIPO=$ac_cv_prog_LIPO
5453
if test -n "$LIPO"; then
5454
- { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
5455
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
5456
$as_echo "$LIPO" >&6; }
5458
- { $as_echo "$as_me:$LINENO: result: no" >&5
5459
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5460
$as_echo "no" >&6; }
5463
@@ -6450,9 +6581,9 @@
5465
# Extract the first word of "lipo", so it can be a program name with args.
5466
set dummy lipo; ac_word=$2
5467
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
5468
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5469
$as_echo_n "checking for $ac_word... " >&6; }
5470
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
5471
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
5472
$as_echo_n "(cached) " >&6
5474
if test -n "$ac_ct_LIPO"; then
5475
@@ -6463,24 +6594,24 @@
5478
test -z "$as_dir" && as_dir=.
5479
- for ac_exec_ext in '' $ac_executable_extensions; do
5480
+ for ac_exec_ext in '' $ac_executable_extensions; do
5481
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5482
ac_cv_prog_ac_ct_LIPO="lipo"
5483
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5484
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5494
ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
5495
if test -n "$ac_ct_LIPO"; then
5496
- { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
5497
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
5498
$as_echo "$ac_ct_LIPO" >&6; }
5500
- { $as_echo "$as_me:$LINENO: result: no" >&5
5501
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5502
$as_echo "no" >&6; }
5505
@@ -6489,7 +6620,7 @@
5507
case $cross_compiling:$ac_tool_warned in
5509
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
5510
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
5511
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
5512
ac_tool_warned=yes ;;
5514
@@ -6502,9 +6633,9 @@
5515
if test -n "$ac_tool_prefix"; then
5516
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
5517
set dummy ${ac_tool_prefix}otool; ac_word=$2
5518
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
5519
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5520
$as_echo_n "checking for $ac_word... " >&6; }
5521
-if test "${ac_cv_prog_OTOOL+set}" = set; then
5522
+if test "${ac_cv_prog_OTOOL+set}" = set; then :
5523
$as_echo_n "(cached) " >&6
5525
if test -n "$OTOOL"; then
5526
@@ -6515,24 +6646,24 @@
5529
test -z "$as_dir" && as_dir=.
5530
- for ac_exec_ext in '' $ac_executable_extensions; do
5531
+ for ac_exec_ext in '' $ac_executable_extensions; do
5532
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5533
ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
5534
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5535
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5545
OTOOL=$ac_cv_prog_OTOOL
5546
if test -n "$OTOOL"; then
5547
- { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
5548
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
5549
$as_echo "$OTOOL" >&6; }
5551
- { $as_echo "$as_me:$LINENO: result: no" >&5
5552
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5553
$as_echo "no" >&6; }
5556
@@ -6542,9 +6673,9 @@
5558
# Extract the first word of "otool", so it can be a program name with args.
5559
set dummy otool; ac_word=$2
5560
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
5561
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5562
$as_echo_n "checking for $ac_word... " >&6; }
5563
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
5564
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
5565
$as_echo_n "(cached) " >&6
5567
if test -n "$ac_ct_OTOOL"; then
5568
@@ -6555,24 +6686,24 @@
5571
test -z "$as_dir" && as_dir=.
5572
- for ac_exec_ext in '' $ac_executable_extensions; do
5573
+ for ac_exec_ext in '' $ac_executable_extensions; do
5574
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5575
ac_cv_prog_ac_ct_OTOOL="otool"
5576
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5577
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5587
ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
5588
if test -n "$ac_ct_OTOOL"; then
5589
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
5590
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
5591
$as_echo "$ac_ct_OTOOL" >&6; }
5593
- { $as_echo "$as_me:$LINENO: result: no" >&5
5594
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5595
$as_echo "no" >&6; }
5598
@@ -6581,7 +6712,7 @@
5600
case $cross_compiling:$ac_tool_warned in
5602
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
5603
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
5604
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
5605
ac_tool_warned=yes ;;
5607
@@ -6594,9 +6725,9 @@
5608
if test -n "$ac_tool_prefix"; then
5609
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
5610
set dummy ${ac_tool_prefix}otool64; ac_word=$2
5611
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
5612
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5613
$as_echo_n "checking for $ac_word... " >&6; }
5614
-if test "${ac_cv_prog_OTOOL64+set}" = set; then
5615
+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
5616
$as_echo_n "(cached) " >&6
5618
if test -n "$OTOOL64"; then
5619
@@ -6607,24 +6738,24 @@
5622
test -z "$as_dir" && as_dir=.
5623
- for ac_exec_ext in '' $ac_executable_extensions; do
5624
+ for ac_exec_ext in '' $ac_executable_extensions; do
5625
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5626
ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
5627
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5628
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5638
OTOOL64=$ac_cv_prog_OTOOL64
5639
if test -n "$OTOOL64"; then
5640
- { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
5641
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
5642
$as_echo "$OTOOL64" >&6; }
5644
- { $as_echo "$as_me:$LINENO: result: no" >&5
5645
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5646
$as_echo "no" >&6; }
5649
@@ -6634,9 +6765,9 @@
5650
ac_ct_OTOOL64=$OTOOL64
5651
# Extract the first word of "otool64", so it can be a program name with args.
5652
set dummy otool64; ac_word=$2
5653
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
5654
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5655
$as_echo_n "checking for $ac_word... " >&6; }
5656
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
5657
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
5658
$as_echo_n "(cached) " >&6
5660
if test -n "$ac_ct_OTOOL64"; then
5661
@@ -6647,24 +6778,24 @@
5664
test -z "$as_dir" && as_dir=.
5665
- for ac_exec_ext in '' $ac_executable_extensions; do
5666
+ for ac_exec_ext in '' $ac_executable_extensions; do
5667
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5668
ac_cv_prog_ac_ct_OTOOL64="otool64"
5669
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5670
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5680
ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
5681
if test -n "$ac_ct_OTOOL64"; then
5682
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
5683
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
5684
$as_echo "$ac_ct_OTOOL64" >&6; }
5686
- { $as_echo "$as_me:$LINENO: result: no" >&5
5687
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5688
$as_echo "no" >&6; }
5691
@@ -6673,7 +6804,7 @@
5693
case $cross_compiling:$ac_tool_warned in
5695
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
5696
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
5697
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
5698
ac_tool_warned=yes ;;
5700
@@ -6709,9 +6840,9 @@
5704
- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
5705
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
5706
$as_echo_n "checking for -single_module linker flag... " >&6; }
5707
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
5708
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
5709
$as_echo_n "(cached) " >&6
5711
lt_cv_apple_cc_single_mod=no
5712
@@ -6736,22 +6867,18 @@
5716
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
5717
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
5718
$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
5719
- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
5720
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
5721
$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
5722
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
5723
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
5724
$as_echo_n "(cached) " >&6
5726
lt_cv_ld_exported_symbols_list=no
5727
save_LDFLAGS=$LDFLAGS
5728
echo "_main" > conftest.sym
5729
LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
5730
- cat >conftest.$ac_ext <<_ACEOF
5733
-cat confdefs.h >>conftest.$ac_ext
5734
-cat >>conftest.$ac_ext <<_ACEOF
5735
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5736
/* end confdefs.h. */
5739
@@ -6762,42 +6889,17 @@
5743
-rm -f conftest.$ac_objext conftest$ac_exeext
5744
-if { (ac_try="$ac_link"
5745
-case "(($ac_try" in
5746
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5747
- *) ac_try_echo=$ac_try;;
5749
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5750
-$as_echo "$ac_try_echo") >&5
5751
- (eval "$ac_link") 2>conftest.er1
5753
- grep -v '^ *+' conftest.er1 >conftest.err
5754
- rm -f conftest.er1
5755
- cat conftest.err >&5
5756
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5757
- (exit $ac_status); } && {
5758
- test -z "$ac_c_werror_flag" ||
5759
- test ! -s conftest.err
5760
- } && test -s conftest$ac_exeext && {
5761
- test "$cross_compiling" = yes ||
5762
- $as_test_x conftest$ac_exeext
5764
+if ac_fn_c_try_link "$LINENO"; then :
5765
lt_cv_ld_exported_symbols_list=yes
5767
- $as_echo "$as_me: failed program was:" >&5
5768
-sed 's/^/| /' conftest.$ac_ext >&5
5770
- lt_cv_ld_exported_symbols_list=no
5771
+ lt_cv_ld_exported_symbols_list=no
5774
-rm -rf conftest.dSYM
5775
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
5776
- conftest$ac_exeext conftest.$ac_ext
5777
+rm -f core conftest.err conftest.$ac_objext \
5778
+ conftest$ac_exeext conftest.$ac_ext
5779
LDFLAGS="$save_LDFLAGS"
5782
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
5783
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
2775
- echo '#line '$LINENO' "configure"' > conftest.$ac_ext
2776
+ echo '#line 6200 "configure"' > conftest.$ac_ext
2777
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
2778
(eval $ac_compile) 2>&5
2780
@@ -6860,38 +6909,6 @@
2782
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
5784
2783
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
2784
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
2785
-$as_echo_n "checking for -force_load linker flag... " >&6; }
2786
-if test "${lt_cv_ld_force_load+set}" = set; then :
2787
- $as_echo_n "(cached) " >&6
2789
- lt_cv_ld_force_load=no
2790
- cat > conftest.c << _LT_EOF
2791
-int forced_loaded() { return 2;}
2793
- echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
2794
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
2795
- echo "$AR cru libconftest.a conftest.o" >&5
2796
- $AR cru libconftest.a conftest.o 2>&5
2797
- echo "$RANLIB libconftest.a" >&5
2798
- $RANLIB libconftest.a 2>&5
2799
- cat > conftest.c << _LT_EOF
2800
-int main() { return 0;}
2802
- echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
2803
- $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
2805
- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
2806
- lt_cv_ld_force_load=yes
2808
- cat conftest.err >&5
2810
- rm -f conftest.err libconftest.a conftest conftest.c
2811
- rm -rf conftest.dSYM
2814
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
2815
-$as_echo "$lt_cv_ld_force_load" >&6; }
5785
2816
case $host_os in
5786
2817
rhapsody* | darwin1.[012])
5787
@@ -6839,14 +6941,14 @@
5788
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5789
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5790
ac_compiler_gnu=$ac_cv_c_compiler_gnu
5791
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
5792
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
5793
$as_echo_n "checking how to run the C preprocessor... " >&6; }
5794
# On Suns, sometimes $CPP names a directory.
5795
if test -n "$CPP" && test -d "$CPP"; then
5798
if test -z "$CPP"; then
5799
- if test "${ac_cv_prog_CPP+set}" = set; then
5800
+ if test "${ac_cv_prog_CPP+set}" = set; then :
5801
$as_echo_n "(cached) " >&6
5803
# Double quotes because CPP needs to be expanded
5804
@@ -6861,11 +6963,7 @@
5805
# <limits.h> exists even on freestanding compilers.
5806
# On the NeXT, cc -E runs the code through the compiler's parser,
5807
# not just through cpp. "Syntax error" is here to catch this case.
5808
- cat >conftest.$ac_ext <<_ACEOF
5811
-cat confdefs.h >>conftest.$ac_ext
5812
-cat >>conftest.$ac_ext <<_ACEOF
5813
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5814
/* end confdefs.h. */
5816
# include <limits.h>
5817
@@ -6874,78 +6972,34 @@
5821
-if { (ac_try="$ac_cpp conftest.$ac_ext"
5822
-case "(($ac_try" in
5823
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5824
- *) ac_try_echo=$ac_try;;
5826
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5827
-$as_echo "$ac_try_echo") >&5
5828
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
5830
- grep -v '^ *+' conftest.er1 >conftest.err
5831
- rm -f conftest.er1
5832
- cat conftest.err >&5
5833
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5834
- (exit $ac_status); } >/dev/null && {
5835
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
5836
- test ! -s conftest.err
5840
- $as_echo "$as_me: failed program was:" >&5
5841
-sed 's/^/| /' conftest.$ac_ext >&5
5842
+if ac_fn_c_try_cpp "$LINENO"; then :
5845
# Broken: fails on valid input.
5849
rm -f conftest.err conftest.$ac_ext
5851
# OK, works on sane cases. Now check whether nonexistent headers
5852
# can be detected and how.
5853
- cat >conftest.$ac_ext <<_ACEOF
5856
-cat confdefs.h >>conftest.$ac_ext
5857
-cat >>conftest.$ac_ext <<_ACEOF
5858
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5859
/* end confdefs.h. */
5860
#include <ac_nonexistent.h>
5862
-if { (ac_try="$ac_cpp conftest.$ac_ext"
5863
-case "(($ac_try" in
5864
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5865
- *) ac_try_echo=$ac_try;;
5867
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5868
-$as_echo "$ac_try_echo") >&5
5869
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
5871
- grep -v '^ *+' conftest.er1 >conftest.err
5872
- rm -f conftest.er1
5873
- cat conftest.err >&5
5874
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5875
- (exit $ac_status); } >/dev/null && {
5876
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
5877
- test ! -s conftest.err
5879
+if ac_fn_c_try_cpp "$LINENO"; then :
5880
# Broken: success on invalid input.
5883
- $as_echo "$as_me: failed program was:" >&5
5884
-sed 's/^/| /' conftest.$ac_ext >&5
5886
# Passes both tests.
5891
rm -f conftest.err conftest.$ac_ext
5894
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
5895
rm -f conftest.err conftest.$ac_ext
5896
-if $ac_preproc_ok; then
5897
+if $ac_preproc_ok; then :
5901
@@ -6957,7 +7011,7 @@
5905
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
5906
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
5907
$as_echo "$CPP" >&6; }
5909
for ac_c_preproc_warn_flag in '' yes
5910
@@ -6968,11 +7022,7 @@
5911
# <limits.h> exists even on freestanding compilers.
5912
# On the NeXT, cc -E runs the code through the compiler's parser,
5913
# not just through cpp. "Syntax error" is here to catch this case.
5914
- cat >conftest.$ac_ext <<_ACEOF
5917
-cat confdefs.h >>conftest.$ac_ext
5918
-cat >>conftest.$ac_ext <<_ACEOF
5919
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5920
/* end confdefs.h. */
5922
# include <limits.h>
5923
@@ -6981,87 +7031,40 @@
5927
-if { (ac_try="$ac_cpp conftest.$ac_ext"
5928
-case "(($ac_try" in
5929
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5930
- *) ac_try_echo=$ac_try;;
5932
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5933
-$as_echo "$ac_try_echo") >&5
5934
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
5936
- grep -v '^ *+' conftest.er1 >conftest.err
5937
- rm -f conftest.er1
5938
- cat conftest.err >&5
5939
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5940
- (exit $ac_status); } >/dev/null && {
5941
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
5942
- test ! -s conftest.err
5946
- $as_echo "$as_me: failed program was:" >&5
5947
-sed 's/^/| /' conftest.$ac_ext >&5
5948
+if ac_fn_c_try_cpp "$LINENO"; then :
5951
# Broken: fails on valid input.
5955
rm -f conftest.err conftest.$ac_ext
5957
# OK, works on sane cases. Now check whether nonexistent headers
5958
# can be detected and how.
5959
- cat >conftest.$ac_ext <<_ACEOF
5962
-cat confdefs.h >>conftest.$ac_ext
5963
-cat >>conftest.$ac_ext <<_ACEOF
5964
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5965
/* end confdefs.h. */
5966
#include <ac_nonexistent.h>
5968
-if { (ac_try="$ac_cpp conftest.$ac_ext"
5969
-case "(($ac_try" in
5970
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5971
- *) ac_try_echo=$ac_try;;
5973
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5974
-$as_echo "$ac_try_echo") >&5
5975
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
5977
- grep -v '^ *+' conftest.er1 >conftest.err
5978
- rm -f conftest.er1
5979
- cat conftest.err >&5
5980
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5981
- (exit $ac_status); } >/dev/null && {
5982
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
5983
- test ! -s conftest.err
5985
+if ac_fn_c_try_cpp "$LINENO"; then :
5986
# Broken: success on invalid input.
5989
- $as_echo "$as_me: failed program was:" >&5
5990
-sed 's/^/| /' conftest.$ac_ext >&5
5992
# Passes both tests.
5997
rm -f conftest.err conftest.$ac_ext
6000
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
6001
rm -f conftest.err conftest.$ac_ext
6002
-if $ac_preproc_ok; then
6004
+if $ac_preproc_ok; then :
6007
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
6008
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
6009
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
6010
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
6011
-See \`config.log' for more details." >&5
6012
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
6013
-See \`config.log' for more details." >&2;}
6014
- { (exit 1); exit 1; }; }; }
6015
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
6016
+See \`config.log' for more details." "$LINENO" 5; }
6020
@@ -7071,16 +7074,12 @@
6021
ac_compiler_gnu=$ac_cv_c_compiler_gnu
6024
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
6025
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
6026
$as_echo_n "checking for ANSI C header files... " >&6; }
6027
-if test "${ac_cv_header_stdc+set}" = set; then
6028
+if test "${ac_cv_header_stdc+set}" = set; then :
6029
$as_echo_n "(cached) " >&6
6031
- cat >conftest.$ac_ext <<_ACEOF
6034
-cat confdefs.h >>conftest.$ac_ext
6035
-cat >>conftest.$ac_ext <<_ACEOF
6036
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6037
/* end confdefs.h. */
6040
@@ -7095,48 +7094,23 @@
6044
-rm -f conftest.$ac_objext
6045
-if { (ac_try="$ac_compile"
6046
-case "(($ac_try" in
6047
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6048
- *) ac_try_echo=$ac_try;;
6050
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6051
-$as_echo "$ac_try_echo") >&5
6052
- (eval "$ac_compile") 2>conftest.er1
6054
- grep -v '^ *+' conftest.er1 >conftest.err
6055
- rm -f conftest.er1
6056
- cat conftest.err >&5
6057
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6058
- (exit $ac_status); } && {
6059
- test -z "$ac_c_werror_flag" ||
6060
- test ! -s conftest.err
6061
- } && test -s conftest.$ac_objext; then
6062
+if ac_fn_c_try_compile "$LINENO"; then :
6063
ac_cv_header_stdc=yes
6065
- $as_echo "$as_me: failed program was:" >&5
6066
-sed 's/^/| /' conftest.$ac_ext >&5
6068
- ac_cv_header_stdc=no
6069
+ ac_cv_header_stdc=no
6072
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6074
if test $ac_cv_header_stdc = yes; then
6075
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
6076
- cat >conftest.$ac_ext <<_ACEOF
6079
-cat confdefs.h >>conftest.$ac_ext
6080
-cat >>conftest.$ac_ext <<_ACEOF
6081
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6082
/* end confdefs.h. */
6086
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
6087
- $EGREP "memchr" >/dev/null 2>&1; then
6089
+ $EGREP "memchr" >/dev/null 2>&1; then :
6092
ac_cv_header_stdc=no
6094
@@ -7146,18 +7120,14 @@
6096
if test $ac_cv_header_stdc = yes; then
6097
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
6098
- cat >conftest.$ac_ext <<_ACEOF
6101
-cat confdefs.h >>conftest.$ac_ext
6102
-cat >>conftest.$ac_ext <<_ACEOF
6103
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6104
/* end confdefs.h. */
6108
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
6109
- $EGREP "free" >/dev/null 2>&1; then
6111
+ $EGREP "free" >/dev/null 2>&1; then :
6114
ac_cv_header_stdc=no
6116
@@ -7167,14 +7137,10 @@
6118
if test $ac_cv_header_stdc = yes; then
6119
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
6120
- if test "$cross_compiling" = yes; then
6121
+ if test "$cross_compiling" = yes; then :
6124
- cat >conftest.$ac_ext <<_ACEOF
6127
-cat confdefs.h >>conftest.$ac_ext
6128
-cat >>conftest.$ac_ext <<_ACEOF
6129
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6130
/* end confdefs.h. */
6133
@@ -7201,118 +7167,34 @@
6137
-rm -f conftest$ac_exeext
6138
-if { (ac_try="$ac_link"
6139
-case "(($ac_try" in
6140
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6141
- *) ac_try_echo=$ac_try;;
6143
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6144
-$as_echo "$ac_try_echo") >&5
6145
- (eval "$ac_link") 2>&5
6147
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6148
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
6149
- { (case "(($ac_try" in
6150
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6151
- *) ac_try_echo=$ac_try;;
6153
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6154
-$as_echo "$ac_try_echo") >&5
6155
- (eval "$ac_try") 2>&5
6157
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6158
- (exit $ac_status); }; }; then
6161
- $as_echo "$as_me: program exited with status $ac_status" >&5
6162
-$as_echo "$as_me: failed program was:" >&5
6163
-sed 's/^/| /' conftest.$ac_ext >&5
6164
+if ac_fn_c_try_run "$LINENO"; then :
6166
-( exit $ac_status )
6167
-ac_cv_header_stdc=no
6169
+ ac_cv_header_stdc=no
6171
-rm -rf conftest.dSYM
6172
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
6173
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
6174
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
6180
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
6181
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
6182
$as_echo "$ac_cv_header_stdc" >&6; }
6183
if test $ac_cv_header_stdc = yes; then
6185
-cat >>confdefs.h <<\_ACEOF
6186
-#define STDC_HEADERS 1
6188
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
6192
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
6202
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
6203
inttypes.h stdint.h unistd.h
6205
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
6206
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
6207
-$as_echo_n "checking for $ac_header... " >&6; }
6208
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
6209
- $as_echo_n "(cached) " >&6
6211
- cat >conftest.$ac_ext <<_ACEOF
6214
-cat confdefs.h >>conftest.$ac_ext
6215
-cat >>conftest.$ac_ext <<_ACEOF
6216
-/* end confdefs.h. */
6217
-$ac_includes_default
6219
-#include <$ac_header>
6221
-rm -f conftest.$ac_objext
6222
-if { (ac_try="$ac_compile"
6223
-case "(($ac_try" in
6224
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6225
- *) ac_try_echo=$ac_try;;
6227
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6228
-$as_echo "$ac_try_echo") >&5
6229
- (eval "$ac_compile") 2>conftest.er1
6231
- grep -v '^ *+' conftest.er1 >conftest.err
6232
- rm -f conftest.er1
6233
- cat conftest.err >&5
6234
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6235
- (exit $ac_status); } && {
6236
- test -z "$ac_c_werror_flag" ||
6237
- test ! -s conftest.err
6238
- } && test -s conftest.$ac_objext; then
6239
- eval "$as_ac_Header=yes"
6241
- $as_echo "$as_me: failed program was:" >&5
6242
-sed 's/^/| /' conftest.$ac_ext >&5
6244
- eval "$as_ac_Header=no"
6247
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6249
-ac_res=`eval 'as_val=${'$as_ac_Header'}
6250
- $as_echo "$as_val"'`
6251
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
6252
-$as_echo "$ac_res" >&6; }
6253
-as_val=`eval 'as_val=${'$as_ac_Header'}
6254
- $as_echo "$as_val"'`
6255
- if test "x$as_val" = x""yes; then
6257
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
6258
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
6260
+eval as_val=\$$as_ac_Header
6261
+ if test "x$as_val" = x""yes; then :
6262
cat >>confdefs.h <<_ACEOF
6263
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
6265
@@ -7322,62 +7204,13 @@
6270
for ac_header in dlfcn.h
6272
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
6273
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
6274
-$as_echo_n "checking for $ac_header... " >&6; }
6275
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
6276
- $as_echo_n "(cached) " >&6
6278
- cat >conftest.$ac_ext <<_ACEOF
6281
-cat confdefs.h >>conftest.$ac_ext
6282
-cat >>conftest.$ac_ext <<_ACEOF
6283
-/* end confdefs.h. */
6284
-$ac_includes_default
6286
-#include <$ac_header>
6288
-rm -f conftest.$ac_objext
6289
-if { (ac_try="$ac_compile"
6290
-case "(($ac_try" in
6291
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6292
- *) ac_try_echo=$ac_try;;
6294
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6295
-$as_echo "$ac_try_echo") >&5
6296
- (eval "$ac_compile") 2>conftest.er1
6298
- grep -v '^ *+' conftest.er1 >conftest.err
6299
- rm -f conftest.er1
6300
- cat conftest.err >&5
6301
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6302
- (exit $ac_status); } && {
6303
- test -z "$ac_c_werror_flag" ||
6304
- test ! -s conftest.err
6305
- } && test -s conftest.$ac_objext; then
6306
- eval "$as_ac_Header=yes"
6308
- $as_echo "$as_me: failed program was:" >&5
6309
-sed 's/^/| /' conftest.$ac_ext >&5
6311
- eval "$as_ac_Header=no"
6314
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6316
-ac_res=`eval 'as_val=${'$as_ac_Header'}
6317
- $as_echo "$as_val"'`
6318
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
6319
-$as_echo "$ac_res" >&6; }
6320
-as_val=`eval 'as_val=${'$as_ac_Header'}
6321
- $as_echo "$as_val"'`
6322
- if test "x$as_val" = x""yes; then
6324
+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
6326
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
6327
cat >>confdefs.h <<_ACEOF
6328
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
6329
+#define HAVE_DLFCN_H 1
6333
@@ -7397,7 +7230,7 @@
6336
# Check whether --enable-shared was given.
6337
-if test "${enable_shared+set}" = set; then
6338
+if test "${enable_shared+set}" = set; then :
6339
enableval=$enable_shared; p=${PACKAGE-default}
6341
yes) enable_shared=yes ;;
6342
@@ -7430,7 +7263,7 @@
6345
# Check whether --with-pic was given.
6346
-if test "${with_pic+set}" = set; then
6347
+if test "${with_pic+set}" = set; then :
6348
withval=$with_pic; pic_mode="$withval"
6351
@@ -7446,7 +7279,7 @@
6354
# Check whether --enable-fast-install was given.
6355
-if test "${enable_fast_install+set}" = set; then
6356
+if test "${enable_fast_install+set}" = set; then :
6357
enableval=$enable_fast_install; p=${PACKAGE-default}
6359
yes) enable_fast_install=yes ;;
6360
@@ -7527,9 +7360,9 @@
6361
setopt NO_GLOB_SUBST
6364
-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
6365
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
6366
$as_echo_n "checking for objdir... " >&6; }
6367
-if test "${lt_cv_objdir+set}" = set; then
6368
+if test "${lt_cv_objdir+set}" = set; then :
6369
$as_echo_n "(cached) " >&6
6371
rm -f .libs 2>/dev/null
6372
@@ -7542,7 +7375,7 @@
6374
rmdir .libs 2>/dev/null
6376
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
6377
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
6378
$as_echo "$lt_cv_objdir" >&6; }
6379
objdir=$lt_cv_objdir
6381
@@ -7635,9 +7468,9 @@
6382
case $deplibs_check_method in
6384
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
6385
- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
6386
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
6387
$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
6388
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
6389
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
6390
$as_echo_n "(cached) " >&6
6393
@@ -7688,10 +7521,10 @@
6395
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
6396
if test -n "$MAGIC_CMD"; then
6397
- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
6398
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
6399
$as_echo "$MAGIC_CMD" >&6; }
6401
- { $as_echo "$as_me:$LINENO: result: no" >&5
6402
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6403
$as_echo "no" >&6; }
6406
@@ -7701,9 +7534,9 @@
6408
if test -z "$lt_cv_path_MAGIC_CMD"; then
6409
if test -n "$ac_tool_prefix"; then
6410
- { $as_echo "$as_me:$LINENO: checking for file" >&5
6411
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
6412
$as_echo_n "checking for file... " >&6; }
6413
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
6414
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
6415
$as_echo_n "(cached) " >&6
6418
@@ -7754,10 +7587,10 @@
6420
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
6421
if test -n "$MAGIC_CMD"; then
6422
- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
6423
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
6424
$as_echo "$MAGIC_CMD" >&6; }
6426
- { $as_echo "$as_me:$LINENO: result: no" >&5
6427
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6428
$as_echo "no" >&6; }
6431
@@ -7834,9 +7667,9 @@
2818
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
2819
@@ -6919,7 +6936,7 @@
2821
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
2823
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
2824
+ if test "$DSYMUTIL" != ":"; then
2825
_lt_dsymutil='~$DSYMUTIL $lib || :'
2828
@@ -7210,8 +7227,6 @@
2837
@@ -7334,7 +7349,6 @@
2842
test -z "$LN_S" && LN_S="ln -s"
2845
@@ -7384,6 +7398,19 @@
2864
# AIX sometimes has problems with the GCC collect2 program. For some
2865
@@ -7396,6 +7423,23 @@
2869
+# Sed substitution that helps us do robust quoting. It backslashifies
2870
+# metacharacters that are still active within double-quoted strings.
2871
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
2873
+# Same as above, but do not quote variable references.
2874
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
2876
+# Sed substitution to delay expansion of an escaped shell variable in a
2877
+# double_quote_subst'ed string.
2878
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
2880
+# Sed substitution to delay expansion of an escaped single quote.
2881
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
2883
+# Sed substitution to avoid accidental globbing in evaled expressions
2884
+no_glob_subst='s/\*/\\\*/g'
2888
can_build_shared=yes
2889
@@ -7424,7 +7468,7 @@
2893
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
2894
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
2897
# Only perform the check for file, if the check method requires it
2898
@@ -7629,12 +7673,7 @@
2899
lt_prog_compiler_no_builtin_flag=
6432
2901
if test "$GCC" = yes; then
6433
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
2902
- case $cc_basename in
2904
- lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
2906
- lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
2908
+ lt_prog_compiler_no_builtin_flag=' -fno-builtin'
6435
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
6436
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
2910
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
6437
2911
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
6438
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
6439
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
6440
$as_echo_n "(cached) " >&6
6442
lt_cv_prog_compiler_rtti_exceptions=no
6443
@@ -7852,11 +7685,11 @@
2912
@@ -7654,15 +7693,15 @@
6444
2913
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6445
2914
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6446
2915
-e 's:$: $lt_compiler_flag:'`
6447
- (eval echo "\"\$as_me:7855: $lt_compile\"" >&5)
6448
+ (eval echo "\"\$as_me:7688: $lt_compile\"" >&5)
2916
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
2917
+ (eval echo "\"\$as_me:7696: $lt_compile\"" >&5)
6449
2918
(eval "$lt_compile" 2>conftest.err)
6451
2920
cat conftest.err >&5
6452
- echo "$as_me:7859: \$? = $ac_status" >&5
6453
+ echo "$as_me:7692: \$? = $ac_status" >&5
2921
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
2922
+ echo "$as_me:7700: \$? = $ac_status" >&5
6454
2923
if (exit $ac_status) && test -s "$ac_outfile"; then
6455
2924
# The compiler can only warn and ignore the option if not recognized
6456
2925
# So say no if there are warnings other than the usual output.
6457
@@ -7869,7 +7702,7 @@
6461
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
6462
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
6463
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
6465
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
6466
@@ -7889,7 +7722,7 @@
6467
lt_prog_compiler_pic=
6468
lt_prog_compiler_static=
6470
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
6471
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
6472
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6474
if test "$GCC" = yes; then
6475
@@ -8021,7 +7854,7 @@
6476
lt_prog_compiler_static='-non_shared'
6479
- linux* | k*bsd*-gnu)
6480
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
2926
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
2927
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
2928
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
2929
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
2930
lt_cv_prog_compiler_rtti_exceptions=yes
2931
@@ -7740,12 +7779,6 @@
2932
lt_prog_compiler_pic='-fno-common'
2936
- # PIC is the default for Haiku.
2937
- # The "-static" flag exists, but is broken.
2938
- lt_prog_compiler_static=
2942
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
2943
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
2944
@@ -7788,13 +7821,6 @@
2945
lt_prog_compiler_pic='-fPIC'
2949
- case $cc_basename in
2950
- nvcc*) # Cuda Compiler Driver 2.2
2951
- lt_prog_compiler_wl='-Xlinker '
2952
- lt_prog_compiler_pic='-Xcompiler -fPIC'
2956
# PORTME Check for flag to pass linker flags through the system compiler.
2958
@@ -7857,7 +7883,7 @@
2959
lt_prog_compiler_pic='--shared'
2960
lt_prog_compiler_static='--static'
2962
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
2963
+ pgcc* | pgf77* | pgf90* | pgf95*)
2964
# Portland Group compilers (*not* the Pentium gcc compiler,
2965
# which looks to be a dead project)
2966
lt_prog_compiler_wl='-Wl,'
2967
@@ -7869,26 +7895,26 @@
2968
# All Alpha code is PIC.
2969
lt_prog_compiler_static='-non_shared'
2971
- xl* | bgxl* | bgf* | mpixl*)
2972
- # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
2974
+ # IBM XL C 8.0/Fortran 10.1 on PPC
2975
lt_prog_compiler_wl='-Wl,'
2976
lt_prog_compiler_pic='-qpic'
2977
lt_prog_compiler_static='-qstaticlink'
2980
case `$CC -V 2>&1 | sed 5q` in
2981
- *Sun\ F* | *Sun*Fortran*)
2982
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
2983
- lt_prog_compiler_pic='-KPIC'
2984
- lt_prog_compiler_static='-Bstatic'
2985
- lt_prog_compiler_wl=''
2989
lt_prog_compiler_pic='-KPIC'
2990
lt_prog_compiler_static='-Bstatic'
2991
lt_prog_compiler_wl='-Wl,'
2994
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
2995
+ lt_prog_compiler_pic='-KPIC'
2996
+ lt_prog_compiler_static='-Bstatic'
2997
+ lt_prog_compiler_wl=''
3002
@@ -7919,7 +7945,7 @@
3003
lt_prog_compiler_pic='-KPIC'
3004
lt_prog_compiler_static='-Bstatic'
6481
3005
case $cc_basename in
6482
# old Intel for x86_64 which still supported -KPIC.
6484
@@ -8161,7 +7994,7 @@
6485
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
6488
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
6489
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
6490
$as_echo "$lt_prog_compiler_pic" >&6; }
6493
@@ -8173,9 +8006,9 @@
6494
# Check to make sure the PIC flag actually works.
6496
if test -n "$lt_prog_compiler_pic"; then
6497
- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
6498
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
6499
$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
6500
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
6501
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
6502
$as_echo_n "(cached) " >&6
6504
lt_cv_prog_compiler_pic_works=no
6505
@@ -8191,11 +8024,11 @@
3006
- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
3007
+ f77* | f90* | f95*)
3008
lt_prog_compiler_wl='-Qoption ld ';;
3010
lt_prog_compiler_wl='-Wl,';;
3011
@@ -8006,15 +8032,15 @@
6506
3012
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6507
3013
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6508
3014
-e 's:$: $lt_compiler_flag:'`
6509
- (eval echo "\"\$as_me:8194: $lt_compile\"" >&5)
6510
+ (eval echo "\"\$as_me:8027: $lt_compile\"" >&5)
3015
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
3016
+ (eval echo "\"\$as_me:8035: $lt_compile\"" >&5)
6511
3017
(eval "$lt_compile" 2>conftest.err)
6513
3019
cat conftest.err >&5
6514
- echo "$as_me:8198: \$? = $ac_status" >&5
6515
+ echo "$as_me:8031: \$? = $ac_status" >&5
3020
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3021
+ echo "$as_me:8039: \$? = $ac_status" >&5
6516
3022
if (exit $ac_status) && test -s "$ac_outfile"; then
6517
3023
# The compiler can only warn and ignore the option if not recognized
6518
3024
# So say no if there are warnings other than the usual output.
6519
@@ -8208,7 +8041,7 @@
6523
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
6524
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
6525
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
6527
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
6528
@@ -8232,9 +8065,9 @@
6529
# Check to make sure the static flag actually works.
6531
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
6532
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
6533
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
6534
$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
6535
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
6536
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
6537
$as_echo_n "(cached) " >&6
6539
lt_cv_prog_compiler_static_works=no
6540
@@ -8260,7 +8093,7 @@
6541
LDFLAGS="$save_LDFLAGS"
6544
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
6545
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
6546
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
6548
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
6549
@@ -8275,9 +8108,9 @@
6553
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
6554
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
6555
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
6556
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
6557
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
6558
$as_echo_n "(cached) " >&6
6560
lt_cv_prog_compiler_c_o=no
6561
@@ -8296,11 +8129,11 @@
6562
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6563
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6564
-e 's:$: $lt_compiler_flag:'`
6565
- (eval echo "\"\$as_me:8299: $lt_compile\"" >&5)
6566
+ (eval echo "\"\$as_me:8132: $lt_compile\"" >&5)
6567
(eval "$lt_compile" 2>out/conftest.err)
6569
cat out/conftest.err >&5
6570
- echo "$as_me:8303: \$? = $ac_status" >&5
6571
+ echo "$as_me:8136: \$? = $ac_status" >&5
6572
if (exit $ac_status) && test -s out/conftest2.$ac_objext
6574
# The compiler can only warn and ignore the option if not recognized
6575
@@ -8322,7 +8155,7 @@
6579
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
6580
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
6581
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
6584
@@ -8330,9 +8163,9 @@
6588
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
6589
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
6590
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
6591
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
6592
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
6593
$as_echo_n "(cached) " >&6
6595
lt_cv_prog_compiler_c_o=no
6596
@@ -8351,11 +8184,11 @@
6597
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6598
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6599
-e 's:$: $lt_compiler_flag:'`
6600
- (eval echo "\"\$as_me:8354: $lt_compile\"" >&5)
6601
+ (eval echo "\"\$as_me:8187: $lt_compile\"" >&5)
6602
(eval "$lt_compile" 2>out/conftest.err)
6604
cat out/conftest.err >&5
6605
- echo "$as_me:8358: \$? = $ac_status" >&5
6606
+ echo "$as_me:8191: \$? = $ac_status" >&5
6607
if (exit $ac_status) && test -s out/conftest2.$ac_objext
6609
# The compiler can only warn and ignore the option if not recognized
6610
@@ -8377,7 +8210,7 @@
6614
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
6615
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
6616
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
6619
@@ -8386,7 +8219,7 @@
6620
hard_links="nottested"
6621
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
6622
# do not overwrite the value of need_locks provided by the user
6623
- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
6624
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
6625
$as_echo_n "checking if we can lock with hard links... " >&6; }
6628
@@ -8394,10 +8227,10 @@
6630
ln conftest.a conftest.b 2>&5 || hard_links=no
6631
ln conftest.a conftest.b 2>/dev/null && hard_links=no
6632
- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
6633
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
6634
$as_echo "$hard_links" >&6; }
6635
if test "$hard_links" = no; then
6636
- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
6637
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
6638
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
6641
@@ -8410,7 +8243,7 @@
6645
- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
6646
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
6647
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
6650
@@ -8470,6 +8303,9 @@
3025
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
3026
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
3027
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
3028
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
3029
lt_cv_prog_compiler_pic_works=yes
3030
@@ -8062,7 +8088,7 @@
3031
if test -s conftest.err; then
3032
# Append any errors to the config.log.
3033
cat conftest.err 1>&5
3034
- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
3035
+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
3036
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
3037
if diff conftest.exp conftest.er2 >/dev/null; then
3038
lt_cv_prog_compiler_static_works=yes
3039
@@ -8111,16 +8137,16 @@
3040
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
3041
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
3042
-e 's:$: $lt_compiler_flag:'`
3043
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
3044
+ (eval echo "\"\$as_me:8140: $lt_compile\"" >&5)
3045
(eval "$lt_compile" 2>out/conftest.err)
3047
cat out/conftest.err >&5
3048
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3049
+ echo "$as_me:8144: \$? = $ac_status" >&5
3050
if (exit $ac_status) && test -s out/conftest2.$ac_objext
3052
# The compiler can only warn and ignore the option if not recognized
3053
# So say no if there are warnings
3054
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
3055
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
3056
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
3057
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
3058
lt_cv_prog_compiler_c_o=yes
3059
@@ -8166,16 +8192,16 @@
3060
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
3061
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
3062
-e 's:$: $lt_compiler_flag:'`
3063
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
3064
+ (eval echo "\"\$as_me:8195: $lt_compile\"" >&5)
3065
(eval "$lt_compile" 2>out/conftest.err)
3067
cat out/conftest.err >&5
3068
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3069
+ echo "$as_me:8199: \$? = $ac_status" >&5
3070
if (exit $ac_status) && test -s out/conftest2.$ac_objext
3072
# The compiler can only warn and ignore the option if not recognized
3073
# So say no if there are warnings
3074
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
3075
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
3076
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
3077
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
3078
lt_cv_prog_compiler_c_o=yes
3079
@@ -8285,36 +8311,13 @@
7021
3738
version_type=sunos
7022
3739
need_lib_prefix=no
7023
@@ -10406,7 +10136,7 @@
7027
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
7028
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
7029
$as_echo "$dynamic_linker" >&6; }
7030
test "$dynamic_linker" = no && can_build_shared=no
7032
@@ -10508,7 +10238,7 @@
7036
- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
7037
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
3740
@@ -10337,11 +10246,6 @@
3749
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
7038
3750
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
7039
3751
hardcode_action=
7040
if test -n "$hardcode_libdir_flag_spec" ||
7041
@@ -10533,7 +10263,7 @@
7043
hardcode_action=unsupported
7045
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
7046
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
7047
$as_echo "$hardcode_action" >&6; }
7049
if test "$hardcode_action" = relink ||
7050
@@ -10578,18 +10308,14 @@
7053
# if libdl is installed we need to link against it
7054
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
7055
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
7056
$as_echo_n "checking for dlopen in -ldl... " >&6; }
7057
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
7058
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
7059
$as_echo_n "(cached) " >&6
7061
ac_check_lib_save_LIBS=$LIBS
7063
-cat >conftest.$ac_ext <<_ACEOF
7066
-cat confdefs.h >>conftest.$ac_ext
7067
-cat >>conftest.$ac_ext <<_ACEOF
7068
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7069
/* end confdefs.h. */
7071
/* Override any GCC internal prototype to avoid an error.
7072
@@ -10607,43 +10333,18 @@
7076
-rm -f conftest.$ac_objext conftest$ac_exeext
7077
-if { (ac_try="$ac_link"
7078
-case "(($ac_try" in
7079
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7080
- *) ac_try_echo=$ac_try;;
7082
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7083
-$as_echo "$ac_try_echo") >&5
7084
- (eval "$ac_link") 2>conftest.er1
7086
- grep -v '^ *+' conftest.er1 >conftest.err
7087
- rm -f conftest.er1
7088
- cat conftest.err >&5
7089
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7090
- (exit $ac_status); } && {
7091
- test -z "$ac_c_werror_flag" ||
7092
- test ! -s conftest.err
7093
- } && test -s conftest$ac_exeext && {
7094
- test "$cross_compiling" = yes ||
7095
- $as_test_x conftest$ac_exeext
7097
+if ac_fn_c_try_link "$LINENO"; then :
7098
ac_cv_lib_dl_dlopen=yes
7100
- $as_echo "$as_me: failed program was:" >&5
7101
-sed 's/^/| /' conftest.$ac_ext >&5
7103
- ac_cv_lib_dl_dlopen=no
7104
+ ac_cv_lib_dl_dlopen=no
7107
-rm -rf conftest.dSYM
7108
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7109
- conftest$ac_exeext conftest.$ac_ext
7110
+rm -f core conftest.err conftest.$ac_objext \
7111
+ conftest$ac_exeext conftest.$ac_ext
7112
LIBS=$ac_check_lib_save_LIBS
7114
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
7115
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
7116
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
7117
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
7118
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
7119
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
7122
@@ -10656,106 +10357,18 @@
7126
- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
7127
-$as_echo_n "checking for shl_load... " >&6; }
7128
-if test "${ac_cv_func_shl_load+set}" = set; then
7129
- $as_echo_n "(cached) " >&6
7131
- cat >conftest.$ac_ext <<_ACEOF
7134
-cat confdefs.h >>conftest.$ac_ext
7135
-cat >>conftest.$ac_ext <<_ACEOF
7136
-/* end confdefs.h. */
7137
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
7138
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
7139
-#define shl_load innocuous_shl_load
7141
-/* System header to define __stub macros and hopefully few prototypes,
7142
- which can conflict with char shl_load (); below.
7143
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
7144
- <limits.h> exists even on freestanding compilers. */
7147
-# include <limits.h>
7149
-# include <assert.h>
7154
-/* Override any GCC internal prototype to avoid an error.
7155
- Use char because int might match the return type of a GCC
7156
- builtin and then its argument prototype would still apply. */
7161
-/* The GNU C library defines this for functions which it implements
7162
- to always fail with ENOSYS. Some functions are actually named
7163
- something starting with __ and the normal name is an alias. */
7164
-#if defined __stub_shl_load || defined __stub___shl_load
7171
-return shl_load ();
7176
-rm -f conftest.$ac_objext conftest$ac_exeext
7177
-if { (ac_try="$ac_link"
7178
-case "(($ac_try" in
7179
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7180
- *) ac_try_echo=$ac_try;;
7182
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7183
-$as_echo "$ac_try_echo") >&5
7184
- (eval "$ac_link") 2>conftest.er1
7186
- grep -v '^ *+' conftest.er1 >conftest.err
7187
- rm -f conftest.er1
7188
- cat conftest.err >&5
7189
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7190
- (exit $ac_status); } && {
7191
- test -z "$ac_c_werror_flag" ||
7192
- test ! -s conftest.err
7193
- } && test -s conftest$ac_exeext && {
7194
- test "$cross_compiling" = yes ||
7195
- $as_test_x conftest$ac_exeext
7197
- ac_cv_func_shl_load=yes
7199
- $as_echo "$as_me: failed program was:" >&5
7200
-sed 's/^/| /' conftest.$ac_ext >&5
7202
- ac_cv_func_shl_load=no
7205
-rm -rf conftest.dSYM
7206
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7207
- conftest$ac_exeext conftest.$ac_ext
7209
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
7210
-$as_echo "$ac_cv_func_shl_load" >&6; }
7211
-if test "x$ac_cv_func_shl_load" = x""yes; then
7212
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
7213
+if test "x$ac_cv_func_shl_load" = x""yes; then :
7214
lt_cv_dlopen="shl_load"
7216
- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
7217
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
7218
$as_echo_n "checking for shl_load in -ldld... " >&6; }
7219
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
7220
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
7221
$as_echo_n "(cached) " >&6
7223
ac_check_lib_save_LIBS=$LIBS
7225
-cat >conftest.$ac_ext <<_ACEOF
7228
-cat confdefs.h >>conftest.$ac_ext
7229
-cat >>conftest.$ac_ext <<_ACEOF
7230
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7231
/* end confdefs.h. */
7233
/* Override any GCC internal prototype to avoid an error.
7234
@@ -10773,145 +10386,32 @@
7238
-rm -f conftest.$ac_objext conftest$ac_exeext
7239
-if { (ac_try="$ac_link"
7240
-case "(($ac_try" in
7241
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7242
- *) ac_try_echo=$ac_try;;
7244
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7245
-$as_echo "$ac_try_echo") >&5
7246
- (eval "$ac_link") 2>conftest.er1
7248
- grep -v '^ *+' conftest.er1 >conftest.err
7249
- rm -f conftest.er1
7250
- cat conftest.err >&5
7251
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7252
- (exit $ac_status); } && {
7253
- test -z "$ac_c_werror_flag" ||
7254
- test ! -s conftest.err
7255
- } && test -s conftest$ac_exeext && {
7256
- test "$cross_compiling" = yes ||
7257
- $as_test_x conftest$ac_exeext
7259
+if ac_fn_c_try_link "$LINENO"; then :
7260
ac_cv_lib_dld_shl_load=yes
7262
- $as_echo "$as_me: failed program was:" >&5
7263
-sed 's/^/| /' conftest.$ac_ext >&5
7265
- ac_cv_lib_dld_shl_load=no
7266
+ ac_cv_lib_dld_shl_load=no
7269
-rm -rf conftest.dSYM
7270
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7271
- conftest$ac_exeext conftest.$ac_ext
7272
+rm -f core conftest.err conftest.$ac_objext \
7273
+ conftest$ac_exeext conftest.$ac_ext
7274
LIBS=$ac_check_lib_save_LIBS
7276
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
7277
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
7278
$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
7279
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
7280
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
7281
lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
7283
- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
7284
-$as_echo_n "checking for dlopen... " >&6; }
7285
-if test "${ac_cv_func_dlopen+set}" = set; then
7286
- $as_echo_n "(cached) " >&6
7288
- cat >conftest.$ac_ext <<_ACEOF
7291
-cat confdefs.h >>conftest.$ac_ext
7292
-cat >>conftest.$ac_ext <<_ACEOF
7293
-/* end confdefs.h. */
7294
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
7295
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
7296
-#define dlopen innocuous_dlopen
7298
-/* System header to define __stub macros and hopefully few prototypes,
7299
- which can conflict with char dlopen (); below.
7300
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
7301
- <limits.h> exists even on freestanding compilers. */
7304
-# include <limits.h>
7306
-# include <assert.h>
7311
-/* Override any GCC internal prototype to avoid an error.
7312
- Use char because int might match the return type of a GCC
7313
- builtin and then its argument prototype would still apply. */
7318
-/* The GNU C library defines this for functions which it implements
7319
- to always fail with ENOSYS. Some functions are actually named
7320
- something starting with __ and the normal name is an alias. */
7321
-#if defined __stub_dlopen || defined __stub___dlopen
7333
-rm -f conftest.$ac_objext conftest$ac_exeext
7334
-if { (ac_try="$ac_link"
7335
-case "(($ac_try" in
7336
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7337
- *) ac_try_echo=$ac_try;;
7339
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7340
-$as_echo "$ac_try_echo") >&5
7341
- (eval "$ac_link") 2>conftest.er1
7343
- grep -v '^ *+' conftest.er1 >conftest.err
7344
- rm -f conftest.er1
7345
- cat conftest.err >&5
7346
- $as_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
- test "$cross_compiling" = yes ||
7352
- $as_test_x conftest$ac_exeext
7354
- ac_cv_func_dlopen=yes
7356
- $as_echo "$as_me: failed program was:" >&5
7357
-sed 's/^/| /' conftest.$ac_ext >&5
7359
- ac_cv_func_dlopen=no
7362
-rm -rf conftest.dSYM
7363
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7364
- conftest$ac_exeext conftest.$ac_ext
7366
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
7367
-$as_echo "$ac_cv_func_dlopen" >&6; }
7368
-if test "x$ac_cv_func_dlopen" = x""yes; then
7369
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
7370
+if test "x$ac_cv_func_dlopen" = x""yes; then :
7371
lt_cv_dlopen="dlopen"
7373
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
7374
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
7375
$as_echo_n "checking for dlopen in -ldl... " >&6; }
7376
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
7377
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
7378
$as_echo_n "(cached) " >&6
7380
ac_check_lib_save_LIBS=$LIBS
7382
-cat >conftest.$ac_ext <<_ACEOF
7385
-cat confdefs.h >>conftest.$ac_ext
7386
-cat >>conftest.$ac_ext <<_ACEOF
7387
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7388
/* end confdefs.h. */
7390
/* Override any GCC internal prototype to avoid an error.
7391
@@ -10929,57 +10429,28 @@
7395
-rm -f conftest.$ac_objext conftest$ac_exeext
7396
-if { (ac_try="$ac_link"
7397
-case "(($ac_try" in
7398
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7399
- *) ac_try_echo=$ac_try;;
7401
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7402
-$as_echo "$ac_try_echo") >&5
7403
- (eval "$ac_link") 2>conftest.er1
7405
- grep -v '^ *+' conftest.er1 >conftest.err
7406
- rm -f conftest.er1
7407
- cat conftest.err >&5
7408
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7409
- (exit $ac_status); } && {
7410
- test -z "$ac_c_werror_flag" ||
7411
- test ! -s conftest.err
7412
- } && test -s conftest$ac_exeext && {
7413
- test "$cross_compiling" = yes ||
7414
- $as_test_x conftest$ac_exeext
7416
+if ac_fn_c_try_link "$LINENO"; then :
7417
ac_cv_lib_dl_dlopen=yes
7419
- $as_echo "$as_me: failed program was:" >&5
7420
-sed 's/^/| /' conftest.$ac_ext >&5
7422
- ac_cv_lib_dl_dlopen=no
7423
+ ac_cv_lib_dl_dlopen=no
7426
-rm -rf conftest.dSYM
7427
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7428
- conftest$ac_exeext conftest.$ac_ext
7429
+rm -f core conftest.err conftest.$ac_objext \
7430
+ conftest$ac_exeext conftest.$ac_ext
7431
LIBS=$ac_check_lib_save_LIBS
7433
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
7434
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
7435
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
7436
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
7437
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
7438
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
7440
- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
7441
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
7442
$as_echo_n "checking for dlopen in -lsvld... " >&6; }
7443
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
7444
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
7445
$as_echo_n "(cached) " >&6
7447
ac_check_lib_save_LIBS=$LIBS
7449
-cat >conftest.$ac_ext <<_ACEOF
7452
-cat confdefs.h >>conftest.$ac_ext
7453
-cat >>conftest.$ac_ext <<_ACEOF
7454
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7455
/* end confdefs.h. */
7457
/* Override any GCC internal prototype to avoid an error.
7458
@@ -10997,57 +10468,28 @@
7462
-rm -f conftest.$ac_objext conftest$ac_exeext
7463
-if { (ac_try="$ac_link"
7464
-case "(($ac_try" in
7465
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7466
- *) ac_try_echo=$ac_try;;
7468
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7469
-$as_echo "$ac_try_echo") >&5
7470
- (eval "$ac_link") 2>conftest.er1
7472
- grep -v '^ *+' conftest.er1 >conftest.err
7473
- rm -f conftest.er1
7474
- cat conftest.err >&5
7475
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7476
- (exit $ac_status); } && {
7477
- test -z "$ac_c_werror_flag" ||
7478
- test ! -s conftest.err
7479
- } && test -s conftest$ac_exeext && {
7480
- test "$cross_compiling" = yes ||
7481
- $as_test_x conftest$ac_exeext
7483
+if ac_fn_c_try_link "$LINENO"; then :
7484
ac_cv_lib_svld_dlopen=yes
7486
- $as_echo "$as_me: failed program was:" >&5
7487
-sed 's/^/| /' conftest.$ac_ext >&5
7489
- ac_cv_lib_svld_dlopen=no
7490
+ ac_cv_lib_svld_dlopen=no
7493
-rm -rf conftest.dSYM
7494
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7495
- conftest$ac_exeext conftest.$ac_ext
7496
+rm -f core conftest.err conftest.$ac_objext \
7497
+ conftest$ac_exeext conftest.$ac_ext
7498
LIBS=$ac_check_lib_save_LIBS
7500
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
7501
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
7502
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
7503
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
7504
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
7505
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
7507
- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
7508
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
7509
$as_echo_n "checking for dld_link in -ldld... " >&6; }
7510
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
7511
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
7512
$as_echo_n "(cached) " >&6
7514
ac_check_lib_save_LIBS=$LIBS
7516
-cat >conftest.$ac_ext <<_ACEOF
7519
-cat confdefs.h >>conftest.$ac_ext
7520
-cat >>conftest.$ac_ext <<_ACEOF
7521
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7522
/* end confdefs.h. */
7524
/* Override any GCC internal prototype to avoid an error.
7525
@@ -11065,43 +10507,18 @@
7529
-rm -f conftest.$ac_objext conftest$ac_exeext
7530
-if { (ac_try="$ac_link"
7531
-case "(($ac_try" in
7532
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7533
- *) ac_try_echo=$ac_try;;
7535
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7536
-$as_echo "$ac_try_echo") >&5
7537
- (eval "$ac_link") 2>conftest.er1
7539
- grep -v '^ *+' conftest.er1 >conftest.err
7540
- rm -f conftest.er1
7541
- cat conftest.err >&5
7542
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7543
- (exit $ac_status); } && {
7544
- test -z "$ac_c_werror_flag" ||
7545
- test ! -s conftest.err
7546
- } && test -s conftest$ac_exeext && {
7547
- test "$cross_compiling" = yes ||
7548
- $as_test_x conftest$ac_exeext
7550
+if ac_fn_c_try_link "$LINENO"; then :
7551
ac_cv_lib_dld_dld_link=yes
7553
- $as_echo "$as_me: failed program was:" >&5
7554
-sed 's/^/| /' conftest.$ac_ext >&5
7556
- ac_cv_lib_dld_dld_link=no
7557
+ ac_cv_lib_dld_dld_link=no
7560
-rm -rf conftest.dSYM
7561
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7562
- conftest$ac_exeext conftest.$ac_ext
7563
+rm -f core conftest.err conftest.$ac_objext \
7564
+ conftest$ac_exeext conftest.$ac_ext
7565
LIBS=$ac_check_lib_save_LIBS
7567
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
7568
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
7569
$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
7570
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
7571
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
7572
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
7575
@@ -11140,9 +10557,9 @@
7577
LIBS="$lt_cv_dlopen_libs $LIBS"
7579
- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
7580
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
7581
$as_echo_n "checking whether a program can dlopen itself... " >&6; }
7582
-if test "${lt_cv_dlopen_self+set}" = set; then
7583
+if test "${lt_cv_dlopen_self+set}" = set; then :
7584
$as_echo_n "(cached) " >&6
7586
if test "$cross_compiling" = yes; then :
7587
@@ -11151,7 +10568,7 @@
7588
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7589
lt_status=$lt_dlunknown
7590
cat > conftest.$ac_ext <<_LT_EOF
7591
-#line 11154 "configure"
7592
+#line 10571 "configure"
7593
#include "confdefs.h"
7596
@@ -11210,11 +10627,11 @@
7600
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7601
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
7602
(eval $ac_link) 2>&5
7604
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7605
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
7606
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7607
+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
7608
(./conftest; exit; ) >&5 2>/dev/null
7611
@@ -11231,14 +10648,14 @@
7615
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
7616
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
7617
$as_echo "$lt_cv_dlopen_self" >&6; }
7619
if test "x$lt_cv_dlopen_self" = xyes; then
7620
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
7621
- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
7622
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
7623
$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
7624
-if test "${lt_cv_dlopen_self_static+set}" = set; then
7625
+if test "${lt_cv_dlopen_self_static+set}" = set; then :
7626
$as_echo_n "(cached) " >&6
7628
if test "$cross_compiling" = yes; then :
7629
@@ -11247,7 +10664,7 @@
7630
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7631
lt_status=$lt_dlunknown
7632
cat > conftest.$ac_ext <<_LT_EOF
7633
-#line 11250 "configure"
7634
+#line 10667 "configure"
7635
#include "confdefs.h"
7638
@@ -11306,11 +10723,11 @@
7642
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7643
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
7644
(eval $ac_link) 2>&5
7646
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7647
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
7648
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7649
+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
7650
(./conftest; exit; ) >&5 2>/dev/null
7653
@@ -11327,7 +10744,7 @@
7657
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
7658
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
7659
$as_echo "$lt_cv_dlopen_self_static" >&6; }
7662
@@ -11366,12 +10783,12 @@
7666
-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
7667
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
7668
$as_echo_n "checking whether stripping libraries is possible... " >&6; }
7669
if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
7670
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
7671
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
7672
- { $as_echo "$as_me:$LINENO: result: yes" >&5
7673
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7674
$as_echo "yes" >&6; }
7676
# FIXME - insert some real tests, host_os isn't really good enough
7677
@@ -11380,15 +10797,15 @@
7678
if test -n "$STRIP" ; then
7679
striplib="$STRIP -x"
7680
old_striplib="$STRIP -S"
7681
- { $as_echo "$as_me:$LINENO: result: yes" >&5
7682
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7683
$as_echo "yes" >&6; }
7685
- { $as_echo "$as_me:$LINENO: result: no" >&5
7686
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7687
$as_echo "no" >&6; }
7691
- { $as_echo "$as_me:$LINENO: result: no" >&5
7692
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7693
$as_echo "no" >&6; }
7696
@@ -11406,12 +10823,12 @@
7699
# Report which library types will actually be built
7700
- { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
7701
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
7702
$as_echo_n "checking if libtool supports shared libraries... " >&6; }
7703
- { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
7704
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
7705
$as_echo "$can_build_shared" >&6; }
7707
- { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
7708
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
7709
$as_echo_n "checking whether to build shared libraries... " >&6; }
7710
test "$can_build_shared" = "no" && enable_shared=no
7712
@@ -11432,14 +10849,14 @@
7716
- { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
7717
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
7718
$as_echo "$enable_shared" >&6; }
7720
- { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
7721
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
7722
$as_echo_n "checking whether to build static libraries... " >&6; }
7723
# Make sure either enable_shared or enable_static is yes.
7724
test "$enable_shared" = yes || enable_static=yes
7725
- { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
7726
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
7727
$as_echo "$enable_static" >&6; }
7730
@@ -11476,16 +10893,16 @@
7734
-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
7735
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
7736
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
7737
# Check whether --enable-maintainer-mode was given.
7738
-if test "${enable_maintainer_mode+set}" = set; then
7739
+if test "${enable_maintainer_mode+set}" = set; then :
7740
enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
7742
USE_MAINTAINER_MODE=no
7745
- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
7746
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
7747
$as_echo "$USE_MAINTAINER_MODE" >&6; }
7748
if test $USE_MAINTAINER_MODE = yes; then
7749
MAINTAINER_MODE_TRUE=
7750
@@ -11506,9 +10923,9 @@
7751
if test -n "$ac_tool_prefix"; then
7752
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
7753
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
7754
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7755
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7756
$as_echo_n "checking for $ac_word... " >&6; }
7757
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
7758
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
7759
$as_echo_n "(cached) " >&6
7762
@@ -11521,14 +10938,14 @@
7765
test -z "$as_dir" && as_dir=.
7766
- for ac_exec_ext in '' $ac_executable_extensions; do
7767
+ for ac_exec_ext in '' $ac_executable_extensions; do
7768
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7769
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
7770
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7771
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7780
@@ -11536,10 +10953,10 @@
7782
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
7783
if test -n "$PKG_CONFIG"; then
7784
- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
7785
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
7786
$as_echo "$PKG_CONFIG" >&6; }
7788
- { $as_echo "$as_me:$LINENO: result: no" >&5
7789
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7790
$as_echo "no" >&6; }
7793
@@ -11549,9 +10966,9 @@
7794
ac_pt_PKG_CONFIG=$PKG_CONFIG
7795
# Extract the first word of "pkg-config", so it can be a program name with args.
7796
set dummy pkg-config; ac_word=$2
7797
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7798
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7799
$as_echo_n "checking for $ac_word... " >&6; }
7800
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
7801
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
7802
$as_echo_n "(cached) " >&6
7804
case $ac_pt_PKG_CONFIG in
7805
@@ -11564,14 +10981,14 @@
7808
test -z "$as_dir" && as_dir=.
7809
- for ac_exec_ext in '' $ac_executable_extensions; do
7810
+ for ac_exec_ext in '' $ac_executable_extensions; do
7811
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7812
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
7813
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7814
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7823
@@ -11579,10 +10996,10 @@
7825
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
7826
if test -n "$ac_pt_PKG_CONFIG"; then
7827
- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
7828
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
7829
$as_echo "$ac_pt_PKG_CONFIG" >&6; }
7831
- { $as_echo "$as_me:$LINENO: result: no" >&5
7832
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7833
$as_echo "no" >&6; }
7836
@@ -11591,7 +11008,7 @@
7838
case $cross_compiling:$ac_tool_warned in
7840
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
7841
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7842
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7843
ac_tool_warned=yes ;;
7845
@@ -11604,13 +11021,13 @@
7847
if test -n "$PKG_CONFIG"; then
7848
_pkg_min_version=0.9.0
7849
- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
7850
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
7851
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
7852
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
7853
- { $as_echo "$as_me:$LINENO: result: yes" >&5
7854
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7855
$as_echo "yes" >&6; }
7857
- { $as_echo "$as_me:$LINENO: result: no" >&5
7858
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7859
$as_echo "no" >&6; }
7862
@@ -11619,35 +11036,33 @@
7864
gdu_cv_version_required=0.3.2
7866
-{ $as_echo "$as_me:$LINENO: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
7867
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
7868
$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
7869
if test -n "$PKG_CONFIG" && \
7870
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
7871
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
7872
($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
7874
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7875
- (exit $ac_status); }; then
7876
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7877
+ test $ac_status = 0; }; then
7883
if test "$gdu_cv_have_gdu" = "yes"; then
7884
- { $as_echo "$as_me:$LINENO: result: yes" >&5
7885
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7886
$as_echo "yes" >&6; }
7889
- { $as_echo "$as_me:$LINENO: result: no" >&5
7890
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7891
$as_echo "no" >&6; }
7892
- { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
7893
-$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
7894
- { (exit 1); exit 1; }; }
7895
+ as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
7900
# Check whether --with-help-dir was given.
7901
-if test "${with_help_dir+set}" = set; then
7902
+if test "${with_help_dir+set}" = set; then :
7903
withval=$with_help_dir;
7905
with_help_dir='${datadir}/gnome/help'
7906
@@ -11658,7 +11073,7 @@
7909
# Check whether --with-omf-dir was given.
7910
-if test "${with_omf_dir+set}" = set; then
7911
+if test "${with_omf_dir+set}" = set; then :
7912
withval=$with_omf_dir;
7914
with_omf_dir='${datadir}/omf'
7915
@@ -11669,7 +11084,7 @@
7918
# Check whether --with-help-formats was given.
7919
-if test "${with_help_formats+set}" = set; then
7920
+if test "${with_help_formats+set}" = set; then :
7921
withval=$with_help_formats;
7923
with_help_formats=''
7924
@@ -11679,7 +11094,7 @@
7927
# Check whether --enable-scrollkeeper was given.
7928
-if test "${enable_scrollkeeper+set}" = set; then
7929
+if test "${enable_scrollkeeper+set}" = set; then :
7930
enableval=$enable_scrollkeeper;
7932
enable_scrollkeeper=yes
7933
@@ -11711,9 +11126,9 @@
7935
# Extract the first word of "gtkdoc-check", so it can be a program name with args.
7936
set dummy gtkdoc-check; ac_word=$2
7937
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7938
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7939
$as_echo_n "checking for $ac_word... " >&6; }
7940
-if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then
7941
+if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
7942
$as_echo_n "(cached) " >&6
7944
case $GTKDOC_CHECK in
7945
@@ -11726,14 +11141,14 @@
7948
test -z "$as_dir" && as_dir=.
7949
- for ac_exec_ext in '' $ac_executable_extensions; do
7950
+ for ac_exec_ext in '' $ac_executable_extensions; do
7951
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7952
ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
7953
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7954
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7963
@@ -11741,10 +11156,10 @@
7965
GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
7966
if test -n "$GTKDOC_CHECK"; then
7967
- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
7968
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
7969
$as_echo "$GTKDOC_CHECK" >&6; }
7971
- { $as_echo "$as_me:$LINENO: result: no" >&5
7972
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7973
$as_echo "no" >&6; }
7976
@@ -11753,9 +11168,9 @@
7978
# Extract the first word of "$ac_prog", so it can be a program name with args.
7979
set dummy $ac_prog; ac_word=$2
7980
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7981
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7982
$as_echo_n "checking for $ac_word... " >&6; }
7983
-if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then
7984
+if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then :
7985
$as_echo_n "(cached) " >&6
7987
case $GTKDOC_REBASE in
7988
@@ -11768,14 +11183,14 @@
7991
test -z "$as_dir" && as_dir=.
7992
- for ac_exec_ext in '' $ac_executable_extensions; do
7993
+ for ac_exec_ext in '' $ac_executable_extensions; do
7994
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7995
ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
7996
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7997
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8006
@@ -11783,10 +11198,10 @@
8008
GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
8009
if test -n "$GTKDOC_REBASE"; then
8010
- { $as_echo "$as_me:$LINENO: result: $GTKDOC_REBASE" >&5
8011
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5
8012
$as_echo "$GTKDOC_REBASE" >&6; }
8014
- { $as_echo "$as_me:$LINENO: result: no" >&5
8015
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8016
$as_echo "no" >&6; }
8019
@@ -11797,9 +11212,9 @@
8021
# Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
8022
set dummy gtkdoc-mkpdf; ac_word=$2
8023
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8024
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8025
$as_echo_n "checking for $ac_word... " >&6; }
8026
-if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then
8027
+if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then :
8028
$as_echo_n "(cached) " >&6
8030
case $GTKDOC_MKPDF in
8031
@@ -11812,14 +11227,14 @@
8034
test -z "$as_dir" && as_dir=.
8035
- for ac_exec_ext in '' $ac_executable_extensions; do
8036
+ for ac_exec_ext in '' $ac_executable_extensions; do
8037
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8038
ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
8039
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8040
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8049
@@ -11827,10 +11242,10 @@
8051
GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
8052
if test -n "$GTKDOC_MKPDF"; then
8053
- { $as_echo "$as_me:$LINENO: result: $GTKDOC_MKPDF" >&5
8054
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5
8055
$as_echo "$GTKDOC_MKPDF" >&6; }
8057
- { $as_echo "$as_me:$LINENO: result: no" >&5
8058
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8059
$as_echo "no" >&6; }
8062
@@ -11838,7 +11253,7 @@
8065
# Check whether --with-html-dir was given.
8066
-if test "${with_html_dir+set}" = set; then
8067
+if test "${with_html_dir+set}" = set; then :
8068
withval=$with_html_dir;
8070
with_html_dir='${datadir}/gtk-doc/html'
8071
@@ -11848,7 +11263,7 @@
8074
# Check whether --enable-gtk-doc was given.
8075
-if test "${enable_gtk_doc+set}" = set; then
8076
+if test "${enable_gtk_doc+set}" = set; then :
8077
enableval=$enable_gtk_doc;
8080
@@ -11857,33 +11272,31 @@
8082
if test x$enable_gtk_doc = xyes; then
3752
@@ -10672,7 +10576,7 @@
3753
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3754
lt_status=$lt_dlunknown
3755
cat > conftest.$ac_ext <<_LT_EOF
3756
-#line $LINENO "configure"
3757
+#line 10579 "configure"
3758
#include "confdefs.h"
3761
@@ -10713,13 +10617,7 @@
3765
-/* When -fvisbility=hidden is used, assume the code has been annotated
3766
- correspondingly for the symbols needed. */
3767
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
3768
-void fnord () __attribute__((visibility("default")));
3771
-void fnord () { int i=42; }
3772
+void fnord() { int i=42;}
3775
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3776
@@ -10728,11 +10626,7 @@
3779
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
3782
- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
3783
- else puts (dlerror ());
3785
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
3786
/* dlclose (self); */
3789
@@ -10778,7 +10672,7 @@
3790
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3791
lt_status=$lt_dlunknown
3792
cat > conftest.$ac_ext <<_LT_EOF
3793
-#line $LINENO "configure"
3794
+#line 10675 "configure"
3795
#include "confdefs.h"
3798
@@ -10819,13 +10713,7 @@
3802
-/* When -fvisbility=hidden is used, assume the code has been annotated
3803
- correspondingly for the symbols needed. */
3804
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
3805
-void fnord () __attribute__((visibility("default")));
3808
-void fnord () { int i=42; }
3809
+void fnord() { int i=42;}
3812
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3813
@@ -10834,11 +10722,7 @@
3816
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
3819
- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
3820
- else puts (dlerror ());
3822
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
3823
/* dlclose (self); */
3826
@@ -13765,16 +13649,19 @@
8083
3827
if test -n "$PKG_CONFIG" && \
8084
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.12\"") >&5
8085
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.12\""; } >&5
8086
($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.12") 2>&5
8088
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8089
- (exit $ac_status); }; then
8090
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8091
+ test $ac_status = 0; }; then
8094
- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.12 installed to build $PACKAGE_NAME" >&5
8095
-$as_echo "$as_me: error: You need to have gtk-doc >= 1.12 installed to build $PACKAGE_NAME" >&2;}
8096
- { (exit 1); exit 1; }; }
8097
+ as_fn_error "You need to have gtk-doc >= 1.12 installed to build $PACKAGE_NAME" "$LINENO" 5
8101
- { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5
8102
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
8103
$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
8104
- { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5
8105
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
8106
$as_echo "$enable_gtk_doc" >&6; }
8108
# Check whether --enable-gtk-doc-html was given.
8109
-if test "${enable_gtk_doc_html+set}" = set; then
8110
+if test "${enable_gtk_doc_html+set}" = set; then :
8111
enableval=$enable_gtk_doc_html;
8113
enable_gtk_doc_html=yes
8116
# Check whether --enable-gtk-doc-pdf was given.
8117
-if test "${enable_gtk_doc_pdf+set}" = set; then
8118
+if test "${enable_gtk_doc_pdf+set}" = set; then :
8119
enableval=$enable_gtk_doc_pdf;
8121
enable_gtk_doc_pdf=no
8122
@@ -11941,7 +11354,7 @@
8125
# Check whether --enable-compile-warnings was given.
8126
-if test "${enable_compile_warnings+set}" = set; then
8127
+if test "${enable_compile_warnings+set}" = set; then :
8128
enableval=$enable_compile_warnings;
8130
enable_compile_warnings="maximum"
8131
@@ -11972,13 +11385,9 @@
8132
for option in -Wno-sign-compare; do
8133
SAVE_CFLAGS="$CFLAGS"
8134
CFLAGS="$CFLAGS $option"
8135
- { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
8136
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5
8137
$as_echo_n "checking whether gcc understands $option... " >&6; }
8138
- cat >conftest.$ac_ext <<_ACEOF
8141
-cat confdefs.h >>conftest.$ac_ext
8142
-cat >>conftest.$ac_ext <<_ACEOF
8143
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8144
/* end confdefs.h. */
8147
@@ -11989,35 +11398,14 @@
8151
-rm -f conftest.$ac_objext
8152
-if { (ac_try="$ac_compile"
8153
-case "(($ac_try" in
8154
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8155
- *) ac_try_echo=$ac_try;;
8157
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8158
-$as_echo "$ac_try_echo") >&5
8159
- (eval "$ac_compile") 2>conftest.er1
8161
- grep -v '^ *+' conftest.er1 >conftest.err
8162
- rm -f conftest.er1
8163
- cat conftest.err >&5
8164
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8165
- (exit $ac_status); } && {
8166
- test -z "$ac_c_werror_flag" ||
8167
- test ! -s conftest.err
8168
- } && test -s conftest.$ac_objext; then
8169
+if ac_fn_c_try_compile "$LINENO"; then :
8172
- $as_echo "$as_me: failed program was:" >&5
8173
-sed 's/^/| /' conftest.$ac_ext >&5
8179
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8180
CFLAGS="$SAVE_CFLAGS"
8181
- { $as_echo "$as_me:$LINENO: result: $has_option" >&5
8182
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5
8183
$as_echo "$has_option" >&6; }
8184
if test $has_option = yes; then
8185
warning_flags="$warning_flags $option"
8186
@@ -12031,26 +11419,24 @@
8190
- { { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
8191
-$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
8192
- { (exit 1); exit 1; }; }
8193
+ as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
8196
CFLAGS="$realsave_CFLAGS"
8197
- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
8198
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
8199
$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
8200
- { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5
8201
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5
8202
$as_echo "$warning_flags" >&6; }
8204
# Check whether --enable-iso-c was given.
8205
-if test "${enable_iso_c+set}" = set; then
8206
+if test "${enable_iso_c+set}" = set; then :
8207
enableval=$enable_iso_c;
8213
- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
8214
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C compiler" >&5
8215
$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
8217
if test "x$enable_iso_c" != "xno"; then
8218
@@ -12065,7 +11451,7 @@
8222
- { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5
8223
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5
8224
$as_echo "$complCFLAGS" >&6; }
8226
WARN_CFLAGS="$warning_flags $complCFLAGS"
8227
@@ -12073,14 +11459,14 @@
8230
# Check whether --enable-cxx-warnings was given.
8231
-if test "${enable_cxx_warnings+set}" = set; then
8232
+if test "${enable_cxx_warnings+set}" = set; then :
8233
enableval=$enable_cxx_warnings;
8235
enable_cxx_warnings="minimum"
8239
- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C++ compiler" >&5
8240
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C++ compiler" >&5
8241
$as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
8243
if test "x$GXX" != xyes; then
8244
@@ -12100,18 +11486,18 @@
8248
- { $as_echo "$as_me:$LINENO: result: $warnCXXFLAGS" >&5
8249
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warnCXXFLAGS" >&5
8250
$as_echo "$warnCXXFLAGS" >&6; }
8252
# Check whether --enable-iso-cxx was given.
8253
-if test "${enable_iso_cxx+set}" = set; then
8254
+if test "${enable_iso_cxx+set}" = set; then :
8255
enableval=$enable_iso_cxx;
8261
- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C++ compiler" >&5
8262
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C++ compiler" >&5
8263
$as_echo_n "checking what language compliance flags to pass to the C++ compiler... " >&6; }
8265
if test "x$enable_iso_cxx" != "xno"; then
8266
@@ -12127,7 +11513,7 @@
8270
- { $as_echo "$as_me:$LINENO: result: $complCXXFLAGS" >&5
8271
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCXXFLAGS" >&5
8272
$as_echo "$complCXXFLAGS" >&6; }
8274
WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
8275
@@ -12158,9 +11544,9 @@
8276
if test -n "$ac_tool_prefix"; then
8277
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
8278
set dummy ${ac_tool_prefix}gcc; ac_word=$2
8279
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8280
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8281
$as_echo_n "checking for $ac_word... " >&6; }
8282
-if test "${ac_cv_prog_CC+set}" = set; then
8283
+if test "${ac_cv_prog_CC+set}" = set; then :
8284
$as_echo_n "(cached) " >&6
8286
if test -n "$CC"; then
8287
@@ -12171,24 +11557,24 @@
8290
test -z "$as_dir" && as_dir=.
8291
- for ac_exec_ext in '' $ac_executable_extensions; do
8292
+ for ac_exec_ext in '' $ac_executable_extensions; do
8293
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8294
ac_cv_prog_CC="${ac_tool_prefix}gcc"
8295
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8296
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8307
if test -n "$CC"; then
8308
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
8309
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
8310
$as_echo "$CC" >&6; }
8312
- { $as_echo "$as_me:$LINENO: result: no" >&5
8313
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8314
$as_echo "no" >&6; }
8317
@@ -12198,9 +11584,9 @@
8319
# Extract the first word of "gcc", so it can be a program name with args.
8320
set dummy gcc; ac_word=$2
8321
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8322
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8323
$as_echo_n "checking for $ac_word... " >&6; }
8324
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
8325
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
8326
$as_echo_n "(cached) " >&6
8328
if test -n "$ac_ct_CC"; then
8329
@@ -12211,24 +11597,24 @@
8332
test -z "$as_dir" && as_dir=.
8333
- for ac_exec_ext in '' $ac_executable_extensions; do
8334
+ for ac_exec_ext in '' $ac_executable_extensions; do
8335
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8336
ac_cv_prog_ac_ct_CC="gcc"
8337
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8338
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8348
ac_ct_CC=$ac_cv_prog_ac_ct_CC
8349
if test -n "$ac_ct_CC"; then
8350
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
8351
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
8352
$as_echo "$ac_ct_CC" >&6; }
8354
- { $as_echo "$as_me:$LINENO: result: no" >&5
8355
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8356
$as_echo "no" >&6; }
8359
@@ -12237,7 +11623,7 @@
8361
case $cross_compiling:$ac_tool_warned in
8363
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
8364
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
8365
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
8366
ac_tool_warned=yes ;;
8368
@@ -12251,9 +11637,9 @@
8369
if test -n "$ac_tool_prefix"; then
8370
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
8371
set dummy ${ac_tool_prefix}cc; ac_word=$2
8372
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8373
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8374
$as_echo_n "checking for $ac_word... " >&6; }
8375
-if test "${ac_cv_prog_CC+set}" = set; then
8376
+if test "${ac_cv_prog_CC+set}" = set; then :
8377
$as_echo_n "(cached) " >&6
8379
if test -n "$CC"; then
8380
@@ -12264,24 +11650,24 @@
8383
test -z "$as_dir" && as_dir=.
8384
- for ac_exec_ext in '' $ac_executable_extensions; do
8385
+ for ac_exec_ext in '' $ac_executable_extensions; do
8386
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8387
ac_cv_prog_CC="${ac_tool_prefix}cc"
8388
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8389
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8400
if test -n "$CC"; then
8401
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
8402
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
8403
$as_echo "$CC" >&6; }
8405
- { $as_echo "$as_me:$LINENO: result: no" >&5
8406
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8407
$as_echo "no" >&6; }
8410
@@ -12291,9 +11677,9 @@
8411
if test -z "$CC"; then
8412
# Extract the first word of "cc", so it can be a program name with args.
8413
set dummy cc; ac_word=$2
8414
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8415
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8416
$as_echo_n "checking for $ac_word... " >&6; }
8417
-if test "${ac_cv_prog_CC+set}" = set; then
8418
+if test "${ac_cv_prog_CC+set}" = set; then :
8419
$as_echo_n "(cached) " >&6
8421
if test -n "$CC"; then
8422
@@ -12305,18 +11691,18 @@
8425
test -z "$as_dir" && as_dir=.
8426
- for ac_exec_ext in '' $ac_executable_extensions; do
8427
+ for ac_exec_ext in '' $ac_executable_extensions; do
8428
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8429
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
8430
ac_prog_rejected=yes
8434
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8435
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8443
if test $ac_prog_rejected = yes; then
8444
@@ -12335,10 +11721,10 @@
8447
if test -n "$CC"; then
8448
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
8449
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
8450
$as_echo "$CC" >&6; }
8452
- { $as_echo "$as_me:$LINENO: result: no" >&5
8453
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8454
$as_echo "no" >&6; }
8457
@@ -12350,9 +11736,9 @@
8459
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
8460
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
8461
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8462
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8463
$as_echo_n "checking for $ac_word... " >&6; }
8464
-if test "${ac_cv_prog_CC+set}" = set; then
8465
+if test "${ac_cv_prog_CC+set}" = set; then :
8466
$as_echo_n "(cached) " >&6
8468
if test -n "$CC"; then
8469
@@ -12363,24 +11749,24 @@
8472
test -z "$as_dir" && as_dir=.
8473
- for ac_exec_ext in '' $ac_executable_extensions; do
8474
+ for ac_exec_ext in '' $ac_executable_extensions; do
8475
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8476
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
8477
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8478
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8489
if test -n "$CC"; then
8490
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
8491
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
8492
$as_echo "$CC" >&6; }
8494
- { $as_echo "$as_me:$LINENO: result: no" >&5
8495
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8496
$as_echo "no" >&6; }
8499
@@ -12394,9 +11780,9 @@
8501
# Extract the first word of "$ac_prog", so it can be a program name with args.
8502
set dummy $ac_prog; ac_word=$2
8503
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8504
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8505
$as_echo_n "checking for $ac_word... " >&6; }
8506
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
8507
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
8508
$as_echo_n "(cached) " >&6
8510
if test -n "$ac_ct_CC"; then
8511
@@ -12407,24 +11793,24 @@
8514
test -z "$as_dir" && as_dir=.
8515
- for ac_exec_ext in '' $ac_executable_extensions; do
8516
+ for ac_exec_ext in '' $ac_executable_extensions; do
8517
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8518
ac_cv_prog_ac_ct_CC="$ac_prog"
8519
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8520
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8530
ac_ct_CC=$ac_cv_prog_ac_ct_CC
8531
if test -n "$ac_ct_CC"; then
8532
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
8533
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
8534
$as_echo "$ac_ct_CC" >&6; }
8536
- { $as_echo "$as_me:$LINENO: result: no" >&5
8537
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8538
$as_echo "no" >&6; }
8541
@@ -12437,7 +11823,7 @@
8543
case $cross_compiling:$ac_tool_warned in
8545
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
8546
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
8547
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
8548
ac_tool_warned=yes ;;
8550
@@ -12448,62 +11834,42 @@
8554
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
8555
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
8556
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
8557
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
8558
-See \`config.log' for more details." >&5
8559
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
8560
-See \`config.log' for more details." >&2;}
8561
- { (exit 1); exit 1; }; }; }
8562
+as_fn_error "no acceptable C compiler found in \$PATH
8563
+See \`config.log' for more details." "$LINENO" 5; }
8565
# Provide some information about the compiler.
8566
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
8567
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
8570
-{ (ac_try="$ac_compiler --version >&5"
8571
-case "(($ac_try" in
8572
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8573
- *) ac_try_echo=$ac_try;;
8575
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8576
-$as_echo "$ac_try_echo") >&5
8577
- (eval "$ac_compiler --version >&5") 2>&5
8579
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8580
- (exit $ac_status); }
8581
-{ (ac_try="$ac_compiler -v >&5"
8582
-case "(($ac_try" in
8583
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8584
- *) ac_try_echo=$ac_try;;
8586
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8587
-$as_echo "$ac_try_echo") >&5
8588
- (eval "$ac_compiler -v >&5") 2>&5
8590
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8591
- (exit $ac_status); }
8592
-{ (ac_try="$ac_compiler -V >&5"
8593
+for ac_option in --version -v -V -qversion; do
8594
+ { { ac_try="$ac_compiler $ac_option >&5"
8596
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8597
*) ac_try_echo=$ac_try;;
8599
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8600
-$as_echo "$ac_try_echo") >&5
8601
- (eval "$ac_compiler -V >&5") 2>&5
8602
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
8603
+$as_echo "$ac_try_echo"; } >&5
8604
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
8606
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8607
- (exit $ac_status); }
8608
+ if test -s conftest.err; then
8610
+... rest of stderr output deleted ...
8611
+ 10q' conftest.err >conftest.er1
8612
+ cat conftest.er1 >&5
8614
+ rm -f conftest.er1 conftest.err
8615
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8616
+ test $ac_status = 0; }
8619
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
8620
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
8621
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
8622
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
8623
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
8624
$as_echo_n "(cached) " >&6
8626
- cat >conftest.$ac_ext <<_ACEOF
8629
-cat confdefs.h >>conftest.$ac_ext
8630
-cat >>conftest.$ac_ext <<_ACEOF
8631
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8632
/* end confdefs.h. */
8635
@@ -12517,37 +11883,16 @@
8639
-rm -f conftest.$ac_objext
8640
-if { (ac_try="$ac_compile"
8641
-case "(($ac_try" in
8642
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8643
- *) ac_try_echo=$ac_try;;
8645
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8646
-$as_echo "$ac_try_echo") >&5
8647
- (eval "$ac_compile") 2>conftest.er1
8649
- grep -v '^ *+' conftest.er1 >conftest.err
8650
- rm -f conftest.er1
8651
- cat conftest.err >&5
8652
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8653
- (exit $ac_status); } && {
8654
- test -z "$ac_c_werror_flag" ||
8655
- test ! -s conftest.err
8656
- } && test -s conftest.$ac_objext; then
8657
+if ac_fn_c_try_compile "$LINENO"; then :
8660
- $as_echo "$as_me: failed program was:" >&5
8661
-sed 's/^/| /' conftest.$ac_ext >&5
8663
- ac_compiler_gnu=no
8664
+ ac_compiler_gnu=no
8667
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8668
ac_cv_c_compiler_gnu=$ac_compiler_gnu
8671
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
8672
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
8673
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
8674
if test $ac_compiler_gnu = yes; then
8676
@@ -12556,20 +11901,16 @@
8678
ac_test_CFLAGS=${CFLAGS+set}
8679
ac_save_CFLAGS=$CFLAGS
8680
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
8681
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
8682
$as_echo_n "checking whether $CC accepts -g... " >&6; }
8683
-if test "${ac_cv_prog_cc_g+set}" = set; then
8684
+if test "${ac_cv_prog_cc_g+set}" = set; then :
8685
$as_echo_n "(cached) " >&6
8687
ac_save_c_werror_flag=$ac_c_werror_flag
8688
ac_c_werror_flag=yes
8691
- cat >conftest.$ac_ext <<_ACEOF
8694
-cat confdefs.h >>conftest.$ac_ext
8695
-cat >>conftest.$ac_ext <<_ACEOF
8696
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8697
/* end confdefs.h. */
8700
@@ -12580,35 +11921,11 @@
8704
-rm -f conftest.$ac_objext
8705
-if { (ac_try="$ac_compile"
8706
-case "(($ac_try" in
8707
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8708
- *) ac_try_echo=$ac_try;;
8710
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8711
-$as_echo "$ac_try_echo") >&5
8712
- (eval "$ac_compile") 2>conftest.er1
8714
- grep -v '^ *+' conftest.er1 >conftest.err
8715
- rm -f conftest.er1
8716
- cat conftest.err >&5
8717
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8718
- (exit $ac_status); } && {
8719
- test -z "$ac_c_werror_flag" ||
8720
- test ! -s conftest.err
8721
- } && test -s conftest.$ac_objext; then
8722
+if ac_fn_c_try_compile "$LINENO"; then :
8725
- $as_echo "$as_me: failed program was:" >&5
8726
-sed 's/^/| /' conftest.$ac_ext >&5
8729
- cat >conftest.$ac_ext <<_ACEOF
8732
-cat confdefs.h >>conftest.$ac_ext
8733
-cat >>conftest.$ac_ext <<_ACEOF
8735
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8736
/* end confdefs.h. */
8739
@@ -12619,36 +11936,12 @@
8743
-rm -f conftest.$ac_objext
8744
-if { (ac_try="$ac_compile"
8745
-case "(($ac_try" in
8746
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8747
- *) ac_try_echo=$ac_try;;
8749
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8750
-$as_echo "$ac_try_echo") >&5
8751
- (eval "$ac_compile") 2>conftest.er1
8753
- grep -v '^ *+' conftest.er1 >conftest.err
8754
- rm -f conftest.er1
8755
- cat conftest.err >&5
8756
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8757
- (exit $ac_status); } && {
8758
- test -z "$ac_c_werror_flag" ||
8759
- test ! -s conftest.err
8760
- } && test -s conftest.$ac_objext; then
8763
- $as_echo "$as_me: failed program was:" >&5
8764
-sed 's/^/| /' conftest.$ac_ext >&5
8765
+if ac_fn_c_try_compile "$LINENO"; then :
8767
- ac_c_werror_flag=$ac_save_c_werror_flag
8769
+ ac_c_werror_flag=$ac_save_c_werror_flag
8771
- cat >conftest.$ac_ext <<_ACEOF
8774
-cat confdefs.h >>conftest.$ac_ext
8775
-cat >>conftest.$ac_ext <<_ACEOF
8776
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8777
/* end confdefs.h. */
8780
@@ -12659,42 +11952,17 @@
8784
-rm -f conftest.$ac_objext
8785
-if { (ac_try="$ac_compile"
8786
-case "(($ac_try" in
8787
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8788
- *) ac_try_echo=$ac_try;;
8790
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8791
-$as_echo "$ac_try_echo") >&5
8792
- (eval "$ac_compile") 2>conftest.er1
8794
- grep -v '^ *+' conftest.er1 >conftest.err
8795
- rm -f conftest.er1
8796
- cat conftest.err >&5
8797
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8798
- (exit $ac_status); } && {
8799
- test -z "$ac_c_werror_flag" ||
8800
- test ! -s conftest.err
8801
- } && test -s conftest.$ac_objext; then
8802
+if ac_fn_c_try_compile "$LINENO"; then :
8805
- $as_echo "$as_me: failed program was:" >&5
8806
-sed 's/^/| /' conftest.$ac_ext >&5
8811
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8814
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8817
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8818
ac_c_werror_flag=$ac_save_c_werror_flag
8820
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
8821
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
8822
$as_echo "$ac_cv_prog_cc_g" >&6; }
8823
if test "$ac_test_CFLAGS" = set; then
8824
CFLAGS=$ac_save_CFLAGS
8825
@@ -12711,18 +11979,14 @@
8829
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
8830
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
8831
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
8832
-if test "${ac_cv_prog_cc_c89+set}" = set; then
8833
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
8834
$as_echo_n "(cached) " >&6
8836
ac_cv_prog_cc_c89=no
8838
-cat >conftest.$ac_ext <<_ACEOF
8841
-cat confdefs.h >>conftest.$ac_ext
8842
-cat >>conftest.$ac_ext <<_ACEOF
8843
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8844
/* end confdefs.h. */
8847
@@ -12779,32 +12043,9 @@
8848
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
8850
CC="$ac_save_CC $ac_arg"
8851
- rm -f conftest.$ac_objext
8852
-if { (ac_try="$ac_compile"
8853
-case "(($ac_try" in
8854
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8855
- *) ac_try_echo=$ac_try;;
8857
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8858
-$as_echo "$ac_try_echo") >&5
8859
- (eval "$ac_compile") 2>conftest.er1
8861
- grep -v '^ *+' conftest.er1 >conftest.err
8862
- rm -f conftest.er1
8863
- cat conftest.err >&5
8864
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8865
- (exit $ac_status); } && {
8866
- test -z "$ac_c_werror_flag" ||
8867
- test ! -s conftest.err
8868
- } && test -s conftest.$ac_objext; then
8869
+ if ac_fn_c_try_compile "$LINENO"; then :
8870
ac_cv_prog_cc_c89=$ac_arg
8872
- $as_echo "$as_me: failed program was:" >&5
8873
-sed 's/^/| /' conftest.$ac_ext >&5
8878
rm -f core conftest.err conftest.$ac_objext
8879
test "x$ac_cv_prog_cc_c89" != "xno" && break
8881
@@ -12815,17 +12056,19 @@
8883
case "x$ac_cv_prog_cc_c89" in
8885
- { $as_echo "$as_me:$LINENO: result: none needed" >&5
8886
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
8887
$as_echo "none needed" >&6; } ;;
8889
- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
8890
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
8891
$as_echo "unsupported" >&6; } ;;
8893
CC="$CC $ac_cv_prog_cc_c89"
8894
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
8895
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
8896
$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
8898
+if test "x$ac_cv_prog_cc_c89" != xno; then :
8903
ac_cpp='$CPP $CPPFLAGS'
8904
@@ -12835,9 +12078,9 @@
8906
depcc="$CC" am_compiler_list=
8908
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
8909
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
8910
$as_echo_n "checking dependency style of $depcc... " >&6; }
8911
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
8912
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
8913
$as_echo_n "(cached) " >&6
8915
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
8916
@@ -12945,7 +12188,7 @@
8920
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
8921
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
8922
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
8923
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
8925
@@ -12960,16 +12203,12 @@
8929
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
8930
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
8931
$as_echo_n "checking for ANSI C header files... " >&6; }
8932
-if test "${ac_cv_header_stdc+set}" = set; then
8933
+if test "${ac_cv_header_stdc+set}" = set; then :
8934
$as_echo_n "(cached) " >&6
8936
- cat >conftest.$ac_ext <<_ACEOF
8939
-cat confdefs.h >>conftest.$ac_ext
8940
-cat >>conftest.$ac_ext <<_ACEOF
8941
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8942
/* end confdefs.h. */
8945
@@ -12984,48 +12223,23 @@
8949
-rm -f conftest.$ac_objext
8950
-if { (ac_try="$ac_compile"
8951
-case "(($ac_try" in
8952
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8953
- *) ac_try_echo=$ac_try;;
8955
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8956
-$as_echo "$ac_try_echo") >&5
8957
- (eval "$ac_compile") 2>conftest.er1
8959
- grep -v '^ *+' conftest.er1 >conftest.err
8960
- rm -f conftest.er1
8961
- cat conftest.err >&5
8962
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8963
- (exit $ac_status); } && {
8964
- test -z "$ac_c_werror_flag" ||
8965
- test ! -s conftest.err
8966
- } && test -s conftest.$ac_objext; then
8967
+if ac_fn_c_try_compile "$LINENO"; then :
8968
ac_cv_header_stdc=yes
8970
- $as_echo "$as_me: failed program was:" >&5
8971
-sed 's/^/| /' conftest.$ac_ext >&5
8973
- ac_cv_header_stdc=no
8974
+ ac_cv_header_stdc=no
8977
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8979
if test $ac_cv_header_stdc = yes; then
8980
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
8981
- cat >conftest.$ac_ext <<_ACEOF
8984
-cat confdefs.h >>conftest.$ac_ext
8985
-cat >>conftest.$ac_ext <<_ACEOF
8986
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8987
/* end confdefs.h. */
8991
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
8992
- $EGREP "memchr" >/dev/null 2>&1; then
8994
+ $EGREP "memchr" >/dev/null 2>&1; then :
8997
ac_cv_header_stdc=no
8999
@@ -13035,18 +12249,14 @@
9001
if test $ac_cv_header_stdc = yes; then
9002
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
9003
- cat >conftest.$ac_ext <<_ACEOF
9006
-cat confdefs.h >>conftest.$ac_ext
9007
-cat >>conftest.$ac_ext <<_ACEOF
9008
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9009
/* end confdefs.h. */
9013
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
9014
- $EGREP "free" >/dev/null 2>&1; then
9016
+ $EGREP "free" >/dev/null 2>&1; then :
9019
ac_cv_header_stdc=no
9021
@@ -13056,14 +12266,10 @@
9023
if test $ac_cv_header_stdc = yes; then
9024
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
9025
- if test "$cross_compiling" = yes; then
9026
+ if test "$cross_compiling" = yes; then :
9029
- cat >conftest.$ac_ext <<_ACEOF
9032
-cat confdefs.h >>conftest.$ac_ext
9033
-cat >>conftest.$ac_ext <<_ACEOF
9034
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9035
/* end confdefs.h. */
9038
@@ -13090,567 +12296,119 @@
9042
-rm -f conftest$ac_exeext
9043
-if { (ac_try="$ac_link"
9044
-case "(($ac_try" in
9045
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9046
- *) ac_try_echo=$ac_try;;
9048
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9049
-$as_echo "$ac_try_echo") >&5
9050
- (eval "$ac_link") 2>&5
9052
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9053
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
9054
- { (case "(($ac_try" in
9055
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9056
- *) ac_try_echo=$ac_try;;
9058
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9059
-$as_echo "$ac_try_echo") >&5
9060
- (eval "$ac_try") 2>&5
9062
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9063
- (exit $ac_status); }; }; then
9066
- $as_echo "$as_me: program exited with status $ac_status" >&5
9067
-$as_echo "$as_me: failed program was:" >&5
9068
-sed 's/^/| /' conftest.$ac_ext >&5
9069
+if ac_fn_c_try_run "$LINENO"; then :
9071
-( exit $ac_status )
9072
-ac_cv_header_stdc=no
9074
+ ac_cv_header_stdc=no
9076
-rm -rf conftest.dSYM
9077
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
9078
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
9079
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
9085
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
9086
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
9087
$as_echo "$ac_cv_header_stdc" >&6; }
9088
if test $ac_cv_header_stdc = yes; then
9090
-cat >>confdefs.h <<\_ACEOF
9091
-#define STDC_HEADERS 1
9096
-if test "x${datadir}" = 'x${prefix}/share'; then
9097
- if test "x${prefix}" = "xNONE"; then
9099
-cat >>confdefs.h <<_ACEOF
9100
-#define PACKAGE_DATA_DIR "${ac_default_prefix}/share/"
9105
-cat >>confdefs.h <<_ACEOF
9106
-#define PACKAGE_DATA_DIR "${prefix}/share/"
9110
- elif test "x${datadir}" = 'x${datarootdir}'; then
9111
- if test "x${datarootdir}" = 'x${prefix}/share'; then
9112
- if test "x${prefix}" = "xNONE"; then
9114
-cat >>confdefs.h <<_ACEOF
9115
-#define PACKAGE_DATA_DIR "${ac_default_prefix}/share/"
9120
-cat >>confdefs.h <<_ACEOF
9121
-#define PACKAGE_DATA_DIR "${prefix}/share/"
9127
-cat >>confdefs.h <<_ACEOF
9128
-#define PACKAGE_DATA_DIR "${datarootdir}/"
9134
-cat >>confdefs.h <<_ACEOF
9135
-#define PACKAGE_DATA_DIR "${datadir}/"
9142
-for ac_header in camlib.h
9144
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
9145
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
9146
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
9147
-$as_echo_n "checking for $ac_header... " >&6; }
9148
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
9149
- $as_echo_n "(cached) " >&6
9151
-ac_res=`eval 'as_val=${'$as_ac_Header'}
9152
- $as_echo "$as_val"'`
9153
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
9154
-$as_echo "$ac_res" >&6; }
9156
- # Is the header compilable?
9157
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
9158
-$as_echo_n "checking $ac_header usability... " >&6; }
9159
-cat >conftest.$ac_ext <<_ACEOF
9162
-cat confdefs.h >>conftest.$ac_ext
9163
-cat >>conftest.$ac_ext <<_ACEOF
9164
-/* end confdefs.h. */
9165
-$ac_includes_default
9166
-#include <$ac_header>
9168
-rm -f conftest.$ac_objext
9169
-if { (ac_try="$ac_compile"
9170
-case "(($ac_try" in
9171
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9172
- *) ac_try_echo=$ac_try;;
9174
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9175
-$as_echo "$ac_try_echo") >&5
9176
- (eval "$ac_compile") 2>conftest.er1
9178
- grep -v '^ *+' conftest.er1 >conftest.err
9179
- rm -f conftest.er1
9180
- cat conftest.err >&5
9181
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9182
- (exit $ac_status); } && {
9183
- test -z "$ac_c_werror_flag" ||
9184
- test ! -s conftest.err
9185
- } && test -s conftest.$ac_objext; then
9186
- ac_header_compiler=yes
9188
- $as_echo "$as_me: failed program was:" >&5
9189
-sed 's/^/| /' conftest.$ac_ext >&5
9191
- ac_header_compiler=no
9194
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9195
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
9196
-$as_echo "$ac_header_compiler" >&6; }
9198
-# Is the header present?
9199
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
9200
-$as_echo_n "checking $ac_header presence... " >&6; }
9201
-cat >conftest.$ac_ext <<_ACEOF
9204
-cat confdefs.h >>conftest.$ac_ext
9205
-cat >>conftest.$ac_ext <<_ACEOF
9206
-/* end confdefs.h. */
9207
-#include <$ac_header>
9209
-if { (ac_try="$ac_cpp conftest.$ac_ext"
9210
-case "(($ac_try" in
9211
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9212
- *) ac_try_echo=$ac_try;;
9214
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9215
-$as_echo "$ac_try_echo") >&5
9216
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
9218
- grep -v '^ *+' conftest.er1 >conftest.err
9219
- rm -f conftest.er1
9220
- cat conftest.err >&5
9221
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9222
- (exit $ac_status); } >/dev/null && {
9223
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
9224
- test ! -s conftest.err
9226
- ac_header_preproc=yes
9228
- $as_echo "$as_me: failed program was:" >&5
9229
-sed 's/^/| /' conftest.$ac_ext >&5
9231
- ac_header_preproc=no
9234
-rm -f conftest.err conftest.$ac_ext
9235
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
9236
-$as_echo "$ac_header_preproc" >&6; }
9238
-# So? What about this header?
9239
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
9241
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
9242
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
9243
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
9244
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
9245
- ac_header_preproc=yes
9248
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
9249
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
9250
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
9251
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
9252
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
9253
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
9254
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
9255
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
9256
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
9257
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
9258
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
9259
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
9263
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
9264
-$as_echo_n "checking for $ac_header... " >&6; }
9265
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
9266
- $as_echo_n "(cached) " >&6
9268
- eval "$as_ac_Header=\$ac_header_preproc"
9270
-ac_res=`eval 'as_val=${'$as_ac_Header'}
9271
- $as_echo "$as_val"'`
9272
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
9273
-$as_echo "$ac_res" >&6; }
9276
-as_val=`eval 'as_val=${'$as_ac_Header'}
9277
- $as_echo "$as_val"'`
9278
- if test "x$as_val" = x""yes; then
9279
- cat >>confdefs.h <<_ACEOF
9280
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
9290
-{ $as_echo "$as_me:$LINENO: checking for sg_io_hdr_t" >&5
9291
-$as_echo_n "checking for sg_io_hdr_t... " >&6; }
9292
-if test "${ac_cv_type_sg_io_hdr_t+set}" = set; then
9293
- $as_echo_n "(cached) " >&6
9295
- ac_cv_type_sg_io_hdr_t=no
9296
-cat >conftest.$ac_ext <<_ACEOF
9299
-cat confdefs.h >>conftest.$ac_ext
9300
-cat >>conftest.$ac_ext <<_ACEOF
9301
-/* end confdefs.h. */
9302
-#include <sys/types.h>
9303
- #include <scsi/sg.h>
9308
-if (sizeof (sg_io_hdr_t))
9314
-rm -f conftest.$ac_objext
9315
-if { (ac_try="$ac_compile"
9316
-case "(($ac_try" in
9317
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9318
- *) ac_try_echo=$ac_try;;
9320
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9321
-$as_echo "$ac_try_echo") >&5
9322
- (eval "$ac_compile") 2>conftest.er1
9324
- grep -v '^ *+' conftest.er1 >conftest.err
9325
- rm -f conftest.er1
9326
- cat conftest.err >&5
9327
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9328
- (exit $ac_status); } && {
9329
- test -z "$ac_c_werror_flag" ||
9330
- test ! -s conftest.err
9331
- } && test -s conftest.$ac_objext; then
9332
- cat >conftest.$ac_ext <<_ACEOF
9335
-cat confdefs.h >>conftest.$ac_ext
9336
-cat >>conftest.$ac_ext <<_ACEOF
9337
-/* end confdefs.h. */
9338
-#include <sys/types.h>
9339
- #include <scsi/sg.h>
9344
-if (sizeof ((sg_io_hdr_t)))
9350
-rm -f conftest.$ac_objext
9351
-if { (ac_try="$ac_compile"
9352
-case "(($ac_try" in
9353
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9354
- *) ac_try_echo=$ac_try;;
9356
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9357
-$as_echo "$ac_try_echo") >&5
9358
- (eval "$ac_compile") 2>conftest.er1
9360
- grep -v '^ *+' conftest.er1 >conftest.err
9361
- rm -f conftest.er1
9362
- cat conftest.err >&5
9363
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9364
- (exit $ac_status); } && {
9365
- test -z "$ac_c_werror_flag" ||
9366
- test ! -s conftest.err
9367
- } && test -s conftest.$ac_objext; then
9370
- $as_echo "$as_me: failed program was:" >&5
9371
-sed 's/^/| /' conftest.$ac_ext >&5
9373
- ac_cv_type_sg_io_hdr_t=yes
9376
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9378
- $as_echo "$as_me: failed program was:" >&5
9379
-sed 's/^/| /' conftest.$ac_ext >&5
9384
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9386
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_sg_io_hdr_t" >&5
9387
-$as_echo "$ac_cv_type_sg_io_hdr_t" >&6; }
9388
-if test "x$ac_cv_type_sg_io_hdr_t" = x""yes; then
9390
-cat >>confdefs.h <<_ACEOF
9391
-#define HAVE_SG_IO_HDR_T 1
9400
-{ $as_echo "$as_me:$LINENO: checking for scsireq_t" >&5
9401
-$as_echo_n "checking for scsireq_t... " >&6; }
9402
-if test "${ac_cv_type_scsireq_t+set}" = set; then
9403
- $as_echo_n "(cached) " >&6
9405
- ac_cv_type_scsireq_t=no
9406
-cat >conftest.$ac_ext <<_ACEOF
9409
-cat confdefs.h >>conftest.$ac_ext
9410
-cat >>conftest.$ac_ext <<_ACEOF
9411
-/* end confdefs.h. */
9412
-#include <sys/types.h>
9413
- #include <sys/scsiio.h>
9418
-if (sizeof (scsireq_t))
9424
-rm -f conftest.$ac_objext
9425
-if { (ac_try="$ac_compile"
9426
-case "(($ac_try" in
9427
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9428
- *) ac_try_echo=$ac_try;;
9430
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9431
-$as_echo "$ac_try_echo") >&5
9432
- (eval "$ac_compile") 2>conftest.er1
9434
- grep -v '^ *+' conftest.er1 >conftest.err
9435
- rm -f conftest.er1
9436
- cat conftest.err >&5
9437
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9438
- (exit $ac_status); } && {
9439
- test -z "$ac_c_werror_flag" ||
9440
- test ! -s conftest.err
9441
- } && test -s conftest.$ac_objext; then
9442
- cat >conftest.$ac_ext <<_ACEOF
9445
-cat confdefs.h >>conftest.$ac_ext
9446
-cat >>conftest.$ac_ext <<_ACEOF
9447
-/* end confdefs.h. */
9448
-#include <sys/types.h>
9449
- #include <sys/scsiio.h>
9454
-if (sizeof ((scsireq_t)))
9460
-rm -f conftest.$ac_objext
9461
-if { (ac_try="$ac_compile"
9462
-case "(($ac_try" in
9463
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9464
- *) ac_try_echo=$ac_try;;
9466
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9467
-$as_echo "$ac_try_echo") >&5
9468
- (eval "$ac_compile") 2>conftest.er1
9470
- grep -v '^ *+' conftest.er1 >conftest.err
9471
- rm -f conftest.er1
9472
- cat conftest.err >&5
9473
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9474
- (exit $ac_status); } && {
9475
- test -z "$ac_c_werror_flag" ||
9476
- test ! -s conftest.err
9477
- } && test -s conftest.$ac_objext; then
9480
- $as_echo "$as_me: failed program was:" >&5
9481
-sed 's/^/| /' conftest.$ac_ext >&5
9483
- ac_cv_type_scsireq_t=yes
9486
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9488
- $as_echo "$as_me: failed program was:" >&5
9489
-sed 's/^/| /' conftest.$ac_ext >&5
9491
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
9495
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9497
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_scsireq_t" >&5
9498
-$as_echo "$ac_cv_type_scsireq_t" >&6; }
9499
-if test "x$ac_cv_type_scsireq_t" = x""yes; then
9500
+if test "x${datadir}" = 'x${prefix}/share'; then
9501
+ if test "x${prefix}" = "xNONE"; then
9503
cat >>confdefs.h <<_ACEOF
9504
-#define HAVE_SCSIREQ_T 1
9505
+#define PACKAGE_DATA_DIR "${ac_default_prefix}/share/"
9514
+cat >>confdefs.h <<_ACEOF
9515
+#define PACKAGE_DATA_DIR "${prefix}/share/"
9518
-{ $as_echo "$as_me:$LINENO: checking for struct uscsi_cmd" >&5
9519
-$as_echo_n "checking for struct uscsi_cmd... " >&6; }
9520
-if test "${ac_cv_type_struct_uscsi_cmd+set}" = set; then
9521
- $as_echo_n "(cached) " >&6
9523
- ac_cv_type_struct_uscsi_cmd=no
9524
-cat >conftest.$ac_ext <<_ACEOF
9527
+ elif test "x${datadir}" = 'x${datarootdir}'; then
9528
+ if test "x${datarootdir}" = 'x${prefix}/share'; then
9529
+ if test "x${prefix}" = "xNONE"; then
9531
+cat >>confdefs.h <<_ACEOF
9532
+#define PACKAGE_DATA_DIR "${ac_default_prefix}/share/"
9534
-cat confdefs.h >>conftest.$ac_ext
9535
-cat >>conftest.$ac_ext <<_ACEOF
9536
-/* end confdefs.h. */
9537
-#include <sys/types.h>
9538
- #include <sys/scsi/impl/uscsi.h>
9543
-if (sizeof (struct uscsi_cmd))
9550
+cat >>confdefs.h <<_ACEOF
9551
+#define PACKAGE_DATA_DIR "${prefix}/share/"
9553
-rm -f conftest.$ac_objext
9554
-if { (ac_try="$ac_compile"
9555
-case "(($ac_try" in
9556
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9557
- *) ac_try_echo=$ac_try;;
9559
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9560
-$as_echo "$ac_try_echo") >&5
9561
- (eval "$ac_compile") 2>conftest.er1
9563
- grep -v '^ *+' conftest.er1 >conftest.err
9564
- rm -f conftest.er1
9565
- cat conftest.err >&5
9566
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9567
- (exit $ac_status); } && {
9568
- test -z "$ac_c_werror_flag" ||
9569
- test ! -s conftest.err
9570
- } && test -s conftest.$ac_objext; then
9571
- cat >conftest.$ac_ext <<_ACEOF
9577
+cat >>confdefs.h <<_ACEOF
9578
+#define PACKAGE_DATA_DIR "${datarootdir}/"
9580
-cat confdefs.h >>conftest.$ac_ext
9581
-cat >>conftest.$ac_ext <<_ACEOF
9582
-/* end confdefs.h. */
9583
-#include <sys/types.h>
9584
- #include <sys/scsi/impl/uscsi.h>
9589
-if (sizeof ((struct uscsi_cmd)))
9597
+cat >>confdefs.h <<_ACEOF
9598
+#define PACKAGE_DATA_DIR "${datadir}/"
9600
-rm -f conftest.$ac_objext
9601
-if { (ac_try="$ac_compile"
9602
-case "(($ac_try" in
9603
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9604
- *) ac_try_echo=$ac_try;;
9606
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9607
-$as_echo "$ac_try_echo") >&5
9608
- (eval "$ac_compile") 2>conftest.er1
9610
- grep -v '^ *+' conftest.er1 >conftest.err
9611
- rm -f conftest.er1
9612
- cat conftest.err >&5
9613
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9614
- (exit $ac_status); } && {
9615
- test -z "$ac_c_werror_flag" ||
9616
- test ! -s conftest.err
9617
- } && test -s conftest.$ac_objext; then
9620
- $as_echo "$as_me: failed program was:" >&5
9621
-sed 's/^/| /' conftest.$ac_ext >&5
9623
- ac_cv_type_struct_uscsi_cmd=yes
9626
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9628
+for ac_header in camlib.h
9630
+ ac_fn_c_check_header_mongrel "$LINENO" "camlib.h" "ac_cv_header_camlib_h" "$ac_includes_default"
9631
+if test "x$ac_cv_header_camlib_h" = x""yes; then :
9632
+ cat >>confdefs.h <<_ACEOF
9633
+#define HAVE_CAMLIB_H 1
9637
- $as_echo "$as_me: failed program was:" >&5
9638
-sed 's/^/| /' conftest.$ac_ext >&5
9645
+ac_fn_c_check_type "$LINENO" "sg_io_hdr_t" "ac_cv_type_sg_io_hdr_t" "#include <sys/types.h>
9646
+ #include <scsi/sg.h>
9648
+if test "x$ac_cv_type_sg_io_hdr_t" = x""yes; then :
9650
+cat >>confdefs.h <<_ACEOF
9651
+#define HAVE_SG_IO_HDR_T 1
9659
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9661
+ac_fn_c_check_type "$LINENO" "scsireq_t" "ac_cv_type_scsireq_t" "#include <sys/types.h>
9662
+ #include <sys/scsiio.h>
9664
+if test "x$ac_cv_type_scsireq_t" = x""yes; then :
9666
+cat >>confdefs.h <<_ACEOF
9667
+#define HAVE_SCSIREQ_T 1
9674
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_uscsi_cmd" >&5
9675
-$as_echo "$ac_cv_type_struct_uscsi_cmd" >&6; }
9676
-if test "x$ac_cv_type_struct_uscsi_cmd" = x""yes; then
9679
+ac_fn_c_check_type "$LINENO" "struct uscsi_cmd" "ac_cv_type_struct_uscsi_cmd" "#include <sys/types.h>
9680
+ #include <sys/scsi/impl/uscsi.h>
9682
+if test "x$ac_cv_type_struct_uscsi_cmd" = x""yes; then :
9684
cat >>confdefs.h <<_ACEOF
9685
#define HAVE_STRUCT_USCSI_CMD 1
9686
@@ -13671,9 +12429,7 @@
9687
elif test x"$has_uscsi" = x"yes"; then
9690
- { { $as_echo "$as_me:$LINENO: error: Support Linux SG, FreeBSD CAM, NetBSD SCSIPI, Solaris USCSI. No supported SCSI interface headers could not be found." >&5
9691
-$as_echo "$as_me: error: Support Linux SG, FreeBSD CAM, NetBSD SCSIPI, Solaris USCSI. No supported SCSI interface headers could not be found." >&2;}
9692
- { (exit 1); exit 1; }; }
9693
+ as_fn_error "Support Linux SG, FreeBSD CAM, NetBSD SCSIPI, Solaris USCSI. No supported SCSI interface headers could not be found." "$LINENO" 5
9696
if test x"$has_cam" = "xyes"; then
9697
@@ -13711,15 +12467,15 @@
9700
# Check whether --enable-largefile was given.
9701
-if test "${enable_largefile+set}" = set; then
9702
+if test "${enable_largefile+set}" = set; then :
9703
enableval=$enable_largefile;
9706
if test "$enable_largefile" != no; then
9708
- { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
9709
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
9710
$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
9711
-if test "${ac_cv_sys_largefile_CC+set}" = set; then
9712
+if test "${ac_cv_sys_largefile_CC+set}" = set; then :
9713
$as_echo_n "(cached) " >&6
9715
ac_cv_sys_largefile_CC=no
9716
@@ -13728,11 +12484,7 @@
9718
# IRIX 6.2 and later do not support large files by default,
9719
# so use the C compiler's -n32 option if that helps.
9720
- cat >conftest.$ac_ext <<_ACEOF
9723
-cat confdefs.h >>conftest.$ac_ext
9724
-cat >>conftest.$ac_ext <<_ACEOF
9725
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9726
/* end confdefs.h. */
9727
#include <sys/types.h>
9728
/* Check that off_t can represent 2**63 - 1 correctly.
9729
@@ -13751,60 +12503,14 @@
9733
- rm -f conftest.$ac_objext
9734
-if { (ac_try="$ac_compile"
9735
-case "(($ac_try" in
9736
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9737
- *) ac_try_echo=$ac_try;;
9739
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9740
-$as_echo "$ac_try_echo") >&5
9741
- (eval "$ac_compile") 2>conftest.er1
9743
- grep -v '^ *+' conftest.er1 >conftest.err
9744
- rm -f conftest.er1
9745
- cat conftest.err >&5
9746
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9747
- (exit $ac_status); } && {
9748
- test -z "$ac_c_werror_flag" ||
9749
- test ! -s conftest.err
9750
- } && test -s conftest.$ac_objext; then
9751
+ if ac_fn_c_try_compile "$LINENO"; then :
9754
- $as_echo "$as_me: failed program was:" >&5
9755
-sed 's/^/| /' conftest.$ac_ext >&5
9760
rm -f core conftest.err conftest.$ac_objext
9762
- rm -f conftest.$ac_objext
9763
-if { (ac_try="$ac_compile"
9764
-case "(($ac_try" in
9765
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9766
- *) ac_try_echo=$ac_try;;
9768
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9769
-$as_echo "$ac_try_echo") >&5
9770
- (eval "$ac_compile") 2>conftest.er1
9772
- grep -v '^ *+' conftest.er1 >conftest.err
9773
- rm -f conftest.er1
9774
- cat conftest.err >&5
9775
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9776
- (exit $ac_status); } && {
9777
- test -z "$ac_c_werror_flag" ||
9778
- test ! -s conftest.err
9779
- } && test -s conftest.$ac_objext; then
9780
+ if ac_fn_c_try_compile "$LINENO"; then :
9781
ac_cv_sys_largefile_CC=' -n32'; break
9783
- $as_echo "$as_me: failed program was:" >&5
9784
-sed 's/^/| /' conftest.$ac_ext >&5
9789
rm -f core conftest.err conftest.$ac_objext
9792
@@ -13812,23 +12518,19 @@
9793
rm -f conftest.$ac_ext
9796
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
9797
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
9798
$as_echo "$ac_cv_sys_largefile_CC" >&6; }
9799
if test "$ac_cv_sys_largefile_CC" != no; then
9800
CC=$CC$ac_cv_sys_largefile_CC
9803
- { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
9804
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
9805
$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
9806
-if test "${ac_cv_sys_file_offset_bits+set}" = set; then
9807
+if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
9808
$as_echo_n "(cached) " >&6
9811
- cat >conftest.$ac_ext <<_ACEOF
9814
-cat confdefs.h >>conftest.$ac_ext
9815
-cat >>conftest.$ac_ext <<_ACEOF
9816
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9817
/* end confdefs.h. */
9818
#include <sys/types.h>
9819
/* Check that off_t can represent 2**63 - 1 correctly.
9820
@@ -13847,38 +12549,11 @@
9824
-rm -f conftest.$ac_objext
9825
-if { (ac_try="$ac_compile"
9826
-case "(($ac_try" in
9827
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9828
- *) ac_try_echo=$ac_try;;
9830
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9831
-$as_echo "$ac_try_echo") >&5
9832
- (eval "$ac_compile") 2>conftest.er1
9834
- grep -v '^ *+' conftest.er1 >conftest.err
9835
- rm -f conftest.er1
9836
- cat conftest.err >&5
9837
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9838
- (exit $ac_status); } && {
9839
- test -z "$ac_c_werror_flag" ||
9840
- test ! -s conftest.err
9841
- } && test -s conftest.$ac_objext; then
9842
+if ac_fn_c_try_compile "$LINENO"; then :
9843
ac_cv_sys_file_offset_bits=no; break
9845
- $as_echo "$as_me: failed program was:" >&5
9846
-sed 's/^/| /' conftest.$ac_ext >&5
9851
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9852
- cat >conftest.$ac_ext <<_ACEOF
9855
-cat confdefs.h >>conftest.$ac_ext
9856
-cat >>conftest.$ac_ext <<_ACEOF
9857
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9858
/* end confdefs.h. */
9859
#define _FILE_OFFSET_BITS 64
9860
#include <sys/types.h>
9861
@@ -13898,38 +12573,15 @@
9865
-rm -f conftest.$ac_objext
9866
-if { (ac_try="$ac_compile"
9867
-case "(($ac_try" in
9868
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9869
- *) ac_try_echo=$ac_try;;
9871
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9872
-$as_echo "$ac_try_echo") >&5
9873
- (eval "$ac_compile") 2>conftest.er1
9875
- grep -v '^ *+' conftest.er1 >conftest.err
9876
- rm -f conftest.er1
9877
- cat conftest.err >&5
9878
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9879
- (exit $ac_status); } && {
9880
- test -z "$ac_c_werror_flag" ||
9881
- test ! -s conftest.err
9882
- } && test -s conftest.$ac_objext; then
9883
+if ac_fn_c_try_compile "$LINENO"; then :
9884
ac_cv_sys_file_offset_bits=64; break
9886
- $as_echo "$as_me: failed program was:" >&5
9887
-sed 's/^/| /' conftest.$ac_ext >&5
9892
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9893
ac_cv_sys_file_offset_bits=unknown
9897
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
9898
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
9899
$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
9900
case $ac_cv_sys_file_offset_bits in #(
9902
@@ -13941,17 +12593,13 @@
9905
if test $ac_cv_sys_file_offset_bits = unknown; then
9906
- { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
9907
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
9908
$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
9909
-if test "${ac_cv_sys_large_files+set}" = set; then
9910
+if test "${ac_cv_sys_large_files+set}" = set; then :
9911
$as_echo_n "(cached) " >&6
9914
- cat >conftest.$ac_ext <<_ACEOF
9917
-cat confdefs.h >>conftest.$ac_ext
9918
-cat >>conftest.$ac_ext <<_ACEOF
9919
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9920
/* end confdefs.h. */
9921
#include <sys/types.h>
9922
/* Check that off_t can represent 2**63 - 1 correctly.
9923
@@ -13970,38 +12618,11 @@
9927
-rm -f conftest.$ac_objext
9928
-if { (ac_try="$ac_compile"
9929
-case "(($ac_try" in
9930
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9931
- *) ac_try_echo=$ac_try;;
9933
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9934
-$as_echo "$ac_try_echo") >&5
9935
- (eval "$ac_compile") 2>conftest.er1
9937
- grep -v '^ *+' conftest.er1 >conftest.err
9938
- rm -f conftest.er1
9939
- cat conftest.err >&5
9940
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9941
- (exit $ac_status); } && {
9942
- test -z "$ac_c_werror_flag" ||
9943
- test ! -s conftest.err
9944
- } && test -s conftest.$ac_objext; then
9945
+if ac_fn_c_try_compile "$LINENO"; then :
9946
ac_cv_sys_large_files=no; break
9948
- $as_echo "$as_me: failed program was:" >&5
9949
-sed 's/^/| /' conftest.$ac_ext >&5
9954
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9955
- cat >conftest.$ac_ext <<_ACEOF
9958
-cat confdefs.h >>conftest.$ac_ext
9959
-cat >>conftest.$ac_ext <<_ACEOF
9960
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9961
/* end confdefs.h. */
9962
#define _LARGE_FILES 1
9963
#include <sys/types.h>
9964
@@ -14021,38 +12642,15 @@
9968
-rm -f conftest.$ac_objext
9969
-if { (ac_try="$ac_compile"
9970
-case "(($ac_try" in
9971
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9972
- *) ac_try_echo=$ac_try;;
9974
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9975
-$as_echo "$ac_try_echo") >&5
9976
- (eval "$ac_compile") 2>conftest.er1
9978
- grep -v '^ *+' conftest.er1 >conftest.err
9979
- rm -f conftest.er1
9980
- cat conftest.err >&5
9981
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9982
- (exit $ac_status); } && {
9983
- test -z "$ac_c_werror_flag" ||
9984
- test ! -s conftest.err
9985
- } && test -s conftest.$ac_objext; then
9986
+if ac_fn_c_try_compile "$LINENO"; then :
9987
ac_cv_sys_large_files=1; break
9989
- $as_echo "$as_me: failed program was:" >&5
9990
-sed 's/^/| /' conftest.$ac_ext >&5
9995
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9996
ac_cv_sys_large_files=unknown
10000
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
10001
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
10002
$as_echo "$ac_cv_sys_large_files" >&6; }
10003
case $ac_cv_sys_large_files in #(
10005
@@ -14084,24 +12682,25 @@
10009
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_GSTREAMER" >&5
10010
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_GSTREAMER" >&5
10011
$as_echo_n "checking for BRASERO_GSTREAMER... " >&6; }
10013
-if test -n "$BRASERO_GSTREAMER_CFLAGS"; then
10014
- pkg_cv_BRASERO_GSTREAMER_CFLAGS="$BRASERO_GSTREAMER_CFLAGS"
10015
- elif test -n "$PKG_CONFIG"; then
10016
- if test -n "$PKG_CONFIG" && \
10017
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10018
+if test -n "$PKG_CONFIG"; then
10019
+ if test -n "$BRASERO_GSTREAMER_CFLAGS"; then
10020
+ pkg_cv_BRASERO_GSTREAMER_CFLAGS="$BRASERO_GSTREAMER_CFLAGS"
10022
+ if test -n "$PKG_CONFIG" && \
10023
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10024
gstreamer-0.10 >= \$GSTREAMER_REQUIRED \\
10025
gstreamer-interfaces-0.10 \\
10026
- gstreamer-plugins-base-0.10 >= \$GSTREAMER_BASE_REQUIRED\"") >&5
10027
+ gstreamer-plugins-base-0.10 >= \$GSTREAMER_BASE_REQUIRED\""; } >&5
10028
($PKG_CONFIG --exists --print-errors "\
10029
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
10030
gstreamer-interfaces-0.10 \
10031
gstreamer-plugins-base-0.10 >= $GSTREAMER_BASE_REQUIRED") 2>&5
10033
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10034
- (exit $ac_status); }; then
10035
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10036
+ test $ac_status = 0; }; then
10037
pkg_cv_BRASERO_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "\
10038
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
10039
gstreamer-interfaces-0.10 \
10040
@@ -14109,24 +12708,26 @@
10045
- pkg_failed=untried
10048
+ pkg_failed=untried
10050
-if test -n "$BRASERO_GSTREAMER_LIBS"; then
10051
- pkg_cv_BRASERO_GSTREAMER_LIBS="$BRASERO_GSTREAMER_LIBS"
10052
- elif test -n "$PKG_CONFIG"; then
10053
- if test -n "$PKG_CONFIG" && \
10054
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10055
+if test -n "$PKG_CONFIG"; then
10056
+ if test -n "$BRASERO_GSTREAMER_LIBS"; then
10057
+ pkg_cv_BRASERO_GSTREAMER_LIBS="$BRASERO_GSTREAMER_LIBS"
10059
+ if test -n "$PKG_CONFIG" && \
10060
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10061
gstreamer-0.10 >= \$GSTREAMER_REQUIRED \\
10062
gstreamer-interfaces-0.10 \\
10063
- gstreamer-plugins-base-0.10 >= \$GSTREAMER_BASE_REQUIRED\"") >&5
10064
+ gstreamer-plugins-base-0.10 >= \$GSTREAMER_BASE_REQUIRED\""; } >&5
10065
($PKG_CONFIG --exists --print-errors "\
10066
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
10067
gstreamer-interfaces-0.10 \
10068
gstreamer-plugins-base-0.10 >= $GSTREAMER_BASE_REQUIRED") 2>&5
10070
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10071
- (exit $ac_status); }; then
10072
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10073
+ test $ac_status = 0; }; then
10074
pkg_cv_BRASERO_GSTREAMER_LIBS=`$PKG_CONFIG --libs "\
10075
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
10076
gstreamer-interfaces-0.10 \
10077
@@ -14134,8 +12735,9 @@
10082
- pkg_failed=untried
10085
+ pkg_failed=untried
10089
@@ -14148,34 +12750,20 @@
10090
_pkg_short_errors_supported=no
10092
if test $_pkg_short_errors_supported = yes; then
10093
- BRASERO_GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
10094
+ BRASERO_GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
10095
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
10096
gstreamer-interfaces-0.10 \
10097
- gstreamer-plugins-base-0.10 >= $GSTREAMER_BASE_REQUIRED" 2>&1`
10098
+ gstreamer-plugins-base-0.10 >= $GSTREAMER_BASE_REQUIRED"`
10100
- BRASERO_GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
10101
+ BRASERO_GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
10102
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
10103
gstreamer-interfaces-0.10 \
10104
- gstreamer-plugins-base-0.10 >= $GSTREAMER_BASE_REQUIRED" 2>&1`
10105
+ gstreamer-plugins-base-0.10 >= $GSTREAMER_BASE_REQUIRED"`
10107
# Put the nasty error message in config.log where it belongs
10108
echo "$BRASERO_GSTREAMER_PKG_ERRORS" >&5
10110
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
10111
- gstreamer-0.10 >= $GSTREAMER_REQUIRED \
10112
- gstreamer-interfaces-0.10 \
10113
- gstreamer-plugins-base-0.10 >= $GSTREAMER_BASE_REQUIRED) were not met:
10115
-$BRASERO_GSTREAMER_PKG_ERRORS
10117
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
10118
-installed software in a non-standard prefix.
10120
-Alternatively, you may set the environment variables BRASERO_GSTREAMER_CFLAGS
10121
-and BRASERO_GSTREAMER_LIBS to avoid the need to call pkg-config.
10122
-See the pkg-config man page for more details.
10124
-$as_echo "$as_me: error: Package requirements (\
10125
+ as_fn_error "Package requirements (\
10126
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
10127
gstreamer-interfaces-0.10 \
10128
gstreamer-plugins-base-0.10 >= $GSTREAMER_BASE_REQUIRED) were not met:
10129
@@ -14188,22 +12776,11 @@
10130
Alternatively, you may set the environment variables BRASERO_GSTREAMER_CFLAGS
10131
and BRASERO_GSTREAMER_LIBS to avoid the need to call pkg-config.
10132
See the pkg-config man page for more details.
10134
- { (exit 1); exit 1; }; }
10136
elif test $pkg_failed = untried; then
10137
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
10138
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10139
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10140
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
10141
-is in your PATH or set the PKG_CONFIG environment variable to the full
10142
-path to pkg-config.
10144
-Alternatively, you may set the environment variables BRASERO_GSTREAMER_CFLAGS
10145
-and BRASERO_GSTREAMER_LIBS to avoid the need to call pkg-config.
10146
-See the pkg-config man page for more details.
10148
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10149
-See \`config.log' for more details." >&5
10150
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
10151
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
10152
is in your PATH or set the PKG_CONFIG environment variable to the full
10153
path to pkg-config.
10155
@@ -14212,12 +12789,11 @@
10156
See the pkg-config man page for more details.
10158
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10159
-See \`config.log' for more details." >&2;}
10160
- { (exit 1); exit 1; }; }; }
10161
+See \`config.log' for more details." "$LINENO" 5; }
10163
BRASERO_GSTREAMER_CFLAGS=$pkg_cv_BRASERO_GSTREAMER_CFLAGS
10164
BRASERO_GSTREAMER_LIBS=$pkg_cv_BRASERO_GSTREAMER_LIBS
10165
- { $as_echo "$as_me:$LINENO: result: yes" >&5
10166
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10167
$as_echo "yes" >&6; }
10170
@@ -14229,46 +12805,50 @@
10174
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_GIO" >&5
10175
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_GIO" >&5
10176
$as_echo_n "checking for BRASERO_GIO... " >&6; }
10178
-if test -n "$BRASERO_GIO_CFLAGS"; then
10179
- pkg_cv_BRASERO_GIO_CFLAGS="$BRASERO_GIO_CFLAGS"
10180
- elif test -n "$PKG_CONFIG"; then
10181
- if test -n "$PKG_CONFIG" && \
10182
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10183
- gio-2.0 >= \$GIO_REQUIRED\"") >&5
10184
+if test -n "$PKG_CONFIG"; then
10185
+ if test -n "$BRASERO_GIO_CFLAGS"; then
10186
+ pkg_cv_BRASERO_GIO_CFLAGS="$BRASERO_GIO_CFLAGS"
10188
+ if test -n "$PKG_CONFIG" && \
10189
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10190
+ gio-2.0 >= \$GIO_REQUIRED\""; } >&5
10191
($PKG_CONFIG --exists --print-errors "\
10192
gio-2.0 >= $GIO_REQUIRED") 2>&5
10194
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10195
- (exit $ac_status); }; then
10196
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10197
+ test $ac_status = 0; }; then
10198
pkg_cv_BRASERO_GIO_CFLAGS=`$PKG_CONFIG --cflags "\
10199
gio-2.0 >= $GIO_REQUIRED" 2>/dev/null`
10204
- pkg_failed=untried
10207
+ pkg_failed=untried
10209
-if test -n "$BRASERO_GIO_LIBS"; then
10210
- pkg_cv_BRASERO_GIO_LIBS="$BRASERO_GIO_LIBS"
10211
- elif test -n "$PKG_CONFIG"; then
10212
- if test -n "$PKG_CONFIG" && \
10213
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10214
- gio-2.0 >= \$GIO_REQUIRED\"") >&5
10215
+if test -n "$PKG_CONFIG"; then
10216
+ if test -n "$BRASERO_GIO_LIBS"; then
10217
+ pkg_cv_BRASERO_GIO_LIBS="$BRASERO_GIO_LIBS"
10219
+ if test -n "$PKG_CONFIG" && \
10220
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10221
+ gio-2.0 >= \$GIO_REQUIRED\""; } >&5
10222
($PKG_CONFIG --exists --print-errors "\
10223
gio-2.0 >= $GIO_REQUIRED") 2>&5
10225
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10226
- (exit $ac_status); }; then
10227
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10228
+ test $ac_status = 0; }; then
10229
pkg_cv_BRASERO_GIO_LIBS=`$PKG_CONFIG --libs "\
10230
gio-2.0 >= $GIO_REQUIRED" 2>/dev/null`
10235
- pkg_failed=untried
10238
+ pkg_failed=untried
10242
@@ -14281,28 +12861,16 @@
10243
_pkg_short_errors_supported=no
10245
if test $_pkg_short_errors_supported = yes; then
10246
- BRASERO_GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
10247
- gio-2.0 >= $GIO_REQUIRED" 2>&1`
10248
+ BRASERO_GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
10249
+ gio-2.0 >= $GIO_REQUIRED"`
10251
- BRASERO_GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
10252
- gio-2.0 >= $GIO_REQUIRED" 2>&1`
10253
+ BRASERO_GIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
10254
+ gio-2.0 >= $GIO_REQUIRED"`
10256
- # Put the nasty error message in config.log where it belongs
10257
- echo "$BRASERO_GIO_PKG_ERRORS" >&5
10259
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
10260
- gio-2.0 >= $GIO_REQUIRED) were not met:
10262
-$BRASERO_GIO_PKG_ERRORS
10264
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
10265
-installed software in a non-standard prefix.
10266
+ # Put the nasty error message in config.log where it belongs
10267
+ echo "$BRASERO_GIO_PKG_ERRORS" >&5
10269
-Alternatively, you may set the environment variables BRASERO_GIO_CFLAGS
10270
-and BRASERO_GIO_LIBS to avoid the need to call pkg-config.
10271
-See the pkg-config man page for more details.
10273
-$as_echo "$as_me: error: Package requirements (\
10274
+ as_fn_error "Package requirements (\
10275
gio-2.0 >= $GIO_REQUIRED) were not met:
10277
$BRASERO_GIO_PKG_ERRORS
10278
@@ -14313,22 +12881,11 @@
10279
Alternatively, you may set the environment variables BRASERO_GIO_CFLAGS
10280
and BRASERO_GIO_LIBS to avoid the need to call pkg-config.
10281
See the pkg-config man page for more details.
10283
- { (exit 1); exit 1; }; }
10285
elif test $pkg_failed = untried; then
10286
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
10287
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10288
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10289
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
10290
-is in your PATH or set the PKG_CONFIG environment variable to the full
10291
-path to pkg-config.
10293
-Alternatively, you may set the environment variables BRASERO_GIO_CFLAGS
10294
-and BRASERO_GIO_LIBS to avoid the need to call pkg-config.
10295
-See the pkg-config man page for more details.
10297
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10298
-See \`config.log' for more details." >&5
10299
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
10300
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
10301
is in your PATH or set the PKG_CONFIG environment variable to the full
10302
path to pkg-config.
10304
@@ -14337,12 +12894,11 @@
10305
See the pkg-config man page for more details.
10307
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10308
-See \`config.log' for more details." >&2;}
10309
- { (exit 1); exit 1; }; }; }
10310
+See \`config.log' for more details." "$LINENO" 5; }
10312
BRASERO_GIO_CFLAGS=$pkg_cv_BRASERO_GIO_CFLAGS
10313
BRASERO_GIO_LIBS=$pkg_cv_BRASERO_GIO_LIBS
10314
- { $as_echo "$as_me:$LINENO: result: yes" >&5
10315
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10316
$as_echo "yes" >&6; }
10319
@@ -14352,46 +12908,50 @@
10323
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_LIBXML" >&5
10324
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_LIBXML" >&5
10325
$as_echo_n "checking for BRASERO_LIBXML... " >&6; }
10327
-if test -n "$BRASERO_LIBXML_CFLAGS"; then
10328
- pkg_cv_BRASERO_LIBXML_CFLAGS="$BRASERO_LIBXML_CFLAGS"
10329
- elif test -n "$PKG_CONFIG"; then
10330
- if test -n "$PKG_CONFIG" && \
10331
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10332
- libxml-2.0 >= \$LIBXML2_REQUIRED\"") >&5
10333
+if test -n "$PKG_CONFIG"; then
10334
+ if test -n "$BRASERO_LIBXML_CFLAGS"; then
10335
+ pkg_cv_BRASERO_LIBXML_CFLAGS="$BRASERO_LIBXML_CFLAGS"
10337
+ if test -n "$PKG_CONFIG" && \
10338
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10339
+ libxml-2.0 >= \$LIBXML2_REQUIRED\""; } >&5
10340
($PKG_CONFIG --exists --print-errors "\
10341
libxml-2.0 >= $LIBXML2_REQUIRED") 2>&5
10343
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10344
- (exit $ac_status); }; then
10345
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10346
+ test $ac_status = 0; }; then
10347
pkg_cv_BRASERO_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "\
10348
libxml-2.0 >= $LIBXML2_REQUIRED" 2>/dev/null`
10353
- pkg_failed=untried
10356
+ pkg_failed=untried
10358
-if test -n "$BRASERO_LIBXML_LIBS"; then
10359
- pkg_cv_BRASERO_LIBXML_LIBS="$BRASERO_LIBXML_LIBS"
10360
- elif test -n "$PKG_CONFIG"; then
10361
- if test -n "$PKG_CONFIG" && \
10362
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10363
- libxml-2.0 >= \$LIBXML2_REQUIRED\"") >&5
10364
+if test -n "$PKG_CONFIG"; then
10365
+ if test -n "$BRASERO_LIBXML_LIBS"; then
10366
+ pkg_cv_BRASERO_LIBXML_LIBS="$BRASERO_LIBXML_LIBS"
10368
+ if test -n "$PKG_CONFIG" && \
10369
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10370
+ libxml-2.0 >= \$LIBXML2_REQUIRED\""; } >&5
10371
($PKG_CONFIG --exists --print-errors "\
10372
libxml-2.0 >= $LIBXML2_REQUIRED") 2>&5
10374
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10375
- (exit $ac_status); }; then
10376
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10377
+ test $ac_status = 0; }; then
10378
pkg_cv_BRASERO_LIBXML_LIBS=`$PKG_CONFIG --libs "\
10379
libxml-2.0 >= $LIBXML2_REQUIRED" 2>/dev/null`
10384
- pkg_failed=untried
10387
+ pkg_failed=untried
10391
@@ -14404,28 +12964,16 @@
10392
_pkg_short_errors_supported=no
10394
if test $_pkg_short_errors_supported = yes; then
10395
- BRASERO_LIBXML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
10396
- libxml-2.0 >= $LIBXML2_REQUIRED" 2>&1`
10397
+ BRASERO_LIBXML_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
10398
+ libxml-2.0 >= $LIBXML2_REQUIRED"`
10400
- BRASERO_LIBXML_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
10401
- libxml-2.0 >= $LIBXML2_REQUIRED" 2>&1`
10402
+ BRASERO_LIBXML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
10403
+ libxml-2.0 >= $LIBXML2_REQUIRED"`
10405
# Put the nasty error message in config.log where it belongs
10406
echo "$BRASERO_LIBXML_PKG_ERRORS" >&5
10408
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
10409
- libxml-2.0 >= $LIBXML2_REQUIRED) were not met:
10411
-$BRASERO_LIBXML_PKG_ERRORS
10413
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
10414
-installed software in a non-standard prefix.
10416
-Alternatively, you may set the environment variables BRASERO_LIBXML_CFLAGS
10417
-and BRASERO_LIBXML_LIBS to avoid the need to call pkg-config.
10418
-See the pkg-config man page for more details.
10420
-$as_echo "$as_me: error: Package requirements (\
10421
+ as_fn_error "Package requirements (\
10422
libxml-2.0 >= $LIBXML2_REQUIRED) were not met:
10424
$BRASERO_LIBXML_PKG_ERRORS
10425
@@ -14436,22 +12984,11 @@
10426
Alternatively, you may set the environment variables BRASERO_LIBXML_CFLAGS
10427
and BRASERO_LIBXML_LIBS to avoid the need to call pkg-config.
10428
See the pkg-config man page for more details.
10430
- { (exit 1); exit 1; }; }
10432
elif test $pkg_failed = untried; then
10433
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
10434
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10435
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10436
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
10437
-is in your PATH or set the PKG_CONFIG environment variable to the full
10438
-path to pkg-config.
10440
-Alternatively, you may set the environment variables BRASERO_LIBXML_CFLAGS
10441
-and BRASERO_LIBXML_LIBS to avoid the need to call pkg-config.
10442
-See the pkg-config man page for more details.
10444
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10445
-See \`config.log' for more details." >&5
10446
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
10447
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
10448
is in your PATH or set the PKG_CONFIG environment variable to the full
10449
path to pkg-config.
10451
@@ -14460,12 +12997,11 @@
10452
See the pkg-config man page for more details.
10454
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10455
-See \`config.log' for more details." >&2;}
10456
- { (exit 1); exit 1; }; }; }
10457
+See \`config.log' for more details." "$LINENO" 5; }
10459
BRASERO_LIBXML_CFLAGS=$pkg_cv_BRASERO_LIBXML_CFLAGS
10460
BRASERO_LIBXML_LIBS=$pkg_cv_BRASERO_LIBXML_LIBS
10461
- { $as_echo "$as_me:$LINENO: result: yes" >&5
10462
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10463
$as_echo "yes" >&6; }
10466
@@ -14475,46 +13011,50 @@
10470
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_LIBUNIQUE" >&5
10471
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_LIBUNIQUE" >&5
10472
$as_echo_n "checking for BRASERO_LIBUNIQUE... " >&6; }
10474
-if test -n "$BRASERO_LIBUNIQUE_CFLAGS"; then
10475
- pkg_cv_BRASERO_LIBUNIQUE_CFLAGS="$BRASERO_LIBUNIQUE_CFLAGS"
10476
- elif test -n "$PKG_CONFIG"; then
10477
- if test -n "$PKG_CONFIG" && \
10478
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10479
- unique-1.0 >= \$LIBUNIQUE_REQUIRED\"") >&5
10480
+if test -n "$PKG_CONFIG"; then
10481
+ if test -n "$BRASERO_LIBUNIQUE_CFLAGS"; then
10482
+ pkg_cv_BRASERO_LIBUNIQUE_CFLAGS="$BRASERO_LIBUNIQUE_CFLAGS"
10484
+ if test -n "$PKG_CONFIG" && \
10485
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10486
+ unique-1.0 >= \$LIBUNIQUE_REQUIRED\""; } >&5
10487
($PKG_CONFIG --exists --print-errors "\
10488
unique-1.0 >= $LIBUNIQUE_REQUIRED") 2>&5
10490
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10491
- (exit $ac_status); }; then
10492
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10493
+ test $ac_status = 0; }; then
10494
pkg_cv_BRASERO_LIBUNIQUE_CFLAGS=`$PKG_CONFIG --cflags "\
10495
unique-1.0 >= $LIBUNIQUE_REQUIRED" 2>/dev/null`
10500
- pkg_failed=untried
10503
+ pkg_failed=untried
10505
-if test -n "$BRASERO_LIBUNIQUE_LIBS"; then
10506
- pkg_cv_BRASERO_LIBUNIQUE_LIBS="$BRASERO_LIBUNIQUE_LIBS"
10507
- elif test -n "$PKG_CONFIG"; then
10508
- if test -n "$PKG_CONFIG" && \
10509
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10510
- unique-1.0 >= \$LIBUNIQUE_REQUIRED\"") >&5
10511
+if test -n "$PKG_CONFIG"; then
10512
+ if test -n "$BRASERO_LIBUNIQUE_LIBS"; then
10513
+ pkg_cv_BRASERO_LIBUNIQUE_LIBS="$BRASERO_LIBUNIQUE_LIBS"
10515
+ if test -n "$PKG_CONFIG" && \
10516
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10517
+ unique-1.0 >= \$LIBUNIQUE_REQUIRED\""; } >&5
10518
($PKG_CONFIG --exists --print-errors "\
10519
unique-1.0 >= $LIBUNIQUE_REQUIRED") 2>&5
10521
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10522
- (exit $ac_status); }; then
10523
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10524
+ test $ac_status = 0; }; then
10525
pkg_cv_BRASERO_LIBUNIQUE_LIBS=`$PKG_CONFIG --libs "\
10526
unique-1.0 >= $LIBUNIQUE_REQUIRED" 2>/dev/null`
10531
- pkg_failed=untried
10534
+ pkg_failed=untried
10538
@@ -14527,28 +13067,16 @@
10539
_pkg_short_errors_supported=no
10541
if test $_pkg_short_errors_supported = yes; then
10542
- BRASERO_LIBUNIQUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
10543
- unique-1.0 >= $LIBUNIQUE_REQUIRED" 2>&1`
10544
+ BRASERO_LIBUNIQUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
10545
+ unique-1.0 >= $LIBUNIQUE_REQUIRED"`
10547
- BRASERO_LIBUNIQUE_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
10548
- unique-1.0 >= $LIBUNIQUE_REQUIRED" 2>&1`
10549
+ BRASERO_LIBUNIQUE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
10550
+ unique-1.0 >= $LIBUNIQUE_REQUIRED"`
10552
# Put the nasty error message in config.log where it belongs
10553
echo "$BRASERO_LIBUNIQUE_PKG_ERRORS" >&5
10555
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
10556
- unique-1.0 >= $LIBUNIQUE_REQUIRED) were not met:
10558
-$BRASERO_LIBUNIQUE_PKG_ERRORS
10560
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
10561
-installed software in a non-standard prefix.
10563
-Alternatively, you may set the environment variables BRASERO_LIBUNIQUE_CFLAGS
10564
-and BRASERO_LIBUNIQUE_LIBS to avoid the need to call pkg-config.
10565
-See the pkg-config man page for more details.
10567
-$as_echo "$as_me: error: Package requirements (\
10568
+ as_fn_error "Package requirements (\
10569
unique-1.0 >= $LIBUNIQUE_REQUIRED) were not met:
10571
$BRASERO_LIBUNIQUE_PKG_ERRORS
10572
@@ -14559,22 +13087,11 @@
10573
Alternatively, you may set the environment variables BRASERO_LIBUNIQUE_CFLAGS
10574
and BRASERO_LIBUNIQUE_LIBS to avoid the need to call pkg-config.
10575
See the pkg-config man page for more details.
10577
- { (exit 1); exit 1; }; }
10579
elif test $pkg_failed = untried; then
10580
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
10581
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10582
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10583
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
10584
-is in your PATH or set the PKG_CONFIG environment variable to the full
10585
-path to pkg-config.
10587
-Alternatively, you may set the environment variables BRASERO_LIBUNIQUE_CFLAGS
10588
-and BRASERO_LIBUNIQUE_LIBS to avoid the need to call pkg-config.
10589
-See the pkg-config man page for more details.
10591
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10592
-See \`config.log' for more details." >&5
10593
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
10594
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
10595
is in your PATH or set the PKG_CONFIG environment variable to the full
10596
path to pkg-config.
10598
@@ -14583,12 +13100,11 @@
10599
See the pkg-config man page for more details.
10601
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10602
-See \`config.log' for more details." >&2;}
10603
- { (exit 1); exit 1; }; }; }
10604
+See \`config.log' for more details." "$LINENO" 5; }
10606
BRASERO_LIBUNIQUE_CFLAGS=$pkg_cv_BRASERO_LIBUNIQUE_CFLAGS
10607
BRASERO_LIBUNIQUE_LIBS=$pkg_cv_BRASERO_LIBUNIQUE_LIBS
10608
- { $as_echo "$as_me:$LINENO: result: yes" >&5
10609
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10610
$as_echo "yes" >&6; }
10613
@@ -14598,46 +13114,50 @@
10617
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_GTHREAD" >&5
10618
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_GTHREAD" >&5
10619
$as_echo_n "checking for BRASERO_GTHREAD... " >&6; }
10621
-if test -n "$BRASERO_GTHREAD_CFLAGS"; then
10622
- pkg_cv_BRASERO_GTHREAD_CFLAGS="$BRASERO_GTHREAD_CFLAGS"
10623
- elif test -n "$PKG_CONFIG"; then
10624
- if test -n "$PKG_CONFIG" && \
10625
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10626
- gthread-2.0 >= \$GTHREAD_REQUIRED\"") >&5
10627
+if test -n "$PKG_CONFIG"; then
10628
+ if test -n "$BRASERO_GTHREAD_CFLAGS"; then
10629
+ pkg_cv_BRASERO_GTHREAD_CFLAGS="$BRASERO_GTHREAD_CFLAGS"
10631
+ if test -n "$PKG_CONFIG" && \
10632
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10633
+ gthread-2.0 >= \$GTHREAD_REQUIRED\""; } >&5
10634
($PKG_CONFIG --exists --print-errors "\
10635
gthread-2.0 >= $GTHREAD_REQUIRED") 2>&5
10637
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10638
- (exit $ac_status); }; then
10639
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10640
+ test $ac_status = 0; }; then
10641
pkg_cv_BRASERO_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "\
10642
gthread-2.0 >= $GTHREAD_REQUIRED" 2>/dev/null`
10647
- pkg_failed=untried
10650
+ pkg_failed=untried
10652
-if test -n "$BRASERO_GTHREAD_LIBS"; then
10653
- pkg_cv_BRASERO_GTHREAD_LIBS="$BRASERO_GTHREAD_LIBS"
10654
- elif test -n "$PKG_CONFIG"; then
10655
- if test -n "$PKG_CONFIG" && \
10656
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10657
- gthread-2.0 >= \$GTHREAD_REQUIRED\"") >&5
10658
+if test -n "$PKG_CONFIG"; then
10659
+ if test -n "$BRASERO_GTHREAD_LIBS"; then
10660
+ pkg_cv_BRASERO_GTHREAD_LIBS="$BRASERO_GTHREAD_LIBS"
10662
+ if test -n "$PKG_CONFIG" && \
10663
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10664
+ gthread-2.0 >= \$GTHREAD_REQUIRED\""; } >&5
10665
($PKG_CONFIG --exists --print-errors "\
10666
gthread-2.0 >= $GTHREAD_REQUIRED") 2>&5
10668
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10669
- (exit $ac_status); }; then
10670
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10671
+ test $ac_status = 0; }; then
10672
pkg_cv_BRASERO_GTHREAD_LIBS=`$PKG_CONFIG --libs "\
10673
gthread-2.0 >= $GTHREAD_REQUIRED" 2>/dev/null`
10678
- pkg_failed=untried
10681
+ pkg_failed=untried
10685
@@ -14650,28 +13170,16 @@
10686
_pkg_short_errors_supported=no
10688
if test $_pkg_short_errors_supported = yes; then
10689
- BRASERO_GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
10690
- gthread-2.0 >= $GTHREAD_REQUIRED" 2>&1`
10691
+ BRASERO_GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
10692
+ gthread-2.0 >= $GTHREAD_REQUIRED"`
10694
- BRASERO_GTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
10695
- gthread-2.0 >= $GTHREAD_REQUIRED" 2>&1`
10696
+ BRASERO_GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
10697
+ gthread-2.0 >= $GTHREAD_REQUIRED"`
10699
# Put the nasty error message in config.log where it belongs
10700
echo "$BRASERO_GTHREAD_PKG_ERRORS" >&5
10702
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
10703
- gthread-2.0 >= $GTHREAD_REQUIRED) were not met:
10705
-$BRASERO_GTHREAD_PKG_ERRORS
10707
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
10708
-installed software in a non-standard prefix.
10710
-Alternatively, you may set the environment variables BRASERO_GTHREAD_CFLAGS
10711
-and BRASERO_GTHREAD_LIBS to avoid the need to call pkg-config.
10712
-See the pkg-config man page for more details.
10714
-$as_echo "$as_me: error: Package requirements (\
10715
+ as_fn_error "Package requirements (\
10716
gthread-2.0 >= $GTHREAD_REQUIRED) were not met:
10718
$BRASERO_GTHREAD_PKG_ERRORS
10719
@@ -14682,22 +13190,11 @@
10720
Alternatively, you may set the environment variables BRASERO_GTHREAD_CFLAGS
10721
and BRASERO_GTHREAD_LIBS to avoid the need to call pkg-config.
10722
See the pkg-config man page for more details.
10724
- { (exit 1); exit 1; }; }
10726
elif test $pkg_failed = untried; then
10727
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
10728
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10729
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10730
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
10731
-is in your PATH or set the PKG_CONFIG environment variable to the full
10732
-path to pkg-config.
10734
-Alternatively, you may set the environment variables BRASERO_GTHREAD_CFLAGS
10735
-and BRASERO_GTHREAD_LIBS to avoid the need to call pkg-config.
10736
-See the pkg-config man page for more details.
10738
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10739
-See \`config.log' for more details." >&5
10740
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
10741
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
10742
is in your PATH or set the PKG_CONFIG environment variable to the full
10743
path to pkg-config.
10745
@@ -14706,12 +13203,11 @@
10746
See the pkg-config man page for more details.
10748
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10749
-See \`config.log' for more details." >&2;}
10750
- { (exit 1); exit 1; }; }; }
10751
+See \`config.log' for more details." "$LINENO" 5; }
10753
BRASERO_GTHREAD_CFLAGS=$pkg_cv_BRASERO_GTHREAD_CFLAGS
10754
BRASERO_GTHREAD_LIBS=$pkg_cv_BRASERO_GTHREAD_LIBS
10755
- { $as_echo "$as_me:$LINENO: result: yes" >&5
10756
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10757
$as_echo "yes" >&6; }
10760
@@ -14721,52 +13217,56 @@
10764
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_GLIB" >&5
10765
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_GLIB" >&5
10766
$as_echo_n "checking for BRASERO_GLIB... " >&6; }
10768
-if test -n "$BRASERO_GLIB_CFLAGS"; then
10769
- pkg_cv_BRASERO_GLIB_CFLAGS="$BRASERO_GLIB_CFLAGS"
10770
- elif test -n "$PKG_CONFIG"; then
10771
- if test -n "$PKG_CONFIG" && \
10772
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10773
+if test -n "$PKG_CONFIG"; then
10774
+ if test -n "$BRASERO_GLIB_CFLAGS"; then
10775
+ pkg_cv_BRASERO_GLIB_CFLAGS="$BRASERO_GLIB_CFLAGS"
10777
+ if test -n "$PKG_CONFIG" && \
10778
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10779
gobject-2.0 >= \$GLIB_REQUIRED \\
10780
- glib-2.0 >= \$GLIB_REQUIRED\"") >&5
10781
+ glib-2.0 >= \$GLIB_REQUIRED\""; } >&5
10782
($PKG_CONFIG --exists --print-errors "\
10783
gobject-2.0 >= $GLIB_REQUIRED \
10784
glib-2.0 >= $GLIB_REQUIRED") 2>&5
10786
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10787
- (exit $ac_status); }; then
10788
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10789
+ test $ac_status = 0; }; then
10790
pkg_cv_BRASERO_GLIB_CFLAGS=`$PKG_CONFIG --cflags "\
10791
gobject-2.0 >= $GLIB_REQUIRED \
10792
glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
10797
- pkg_failed=untried
10800
+ pkg_failed=untried
10802
-if test -n "$BRASERO_GLIB_LIBS"; then
10803
- pkg_cv_BRASERO_GLIB_LIBS="$BRASERO_GLIB_LIBS"
10804
- elif test -n "$PKG_CONFIG"; then
10805
- if test -n "$PKG_CONFIG" && \
10806
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10807
+if test -n "$PKG_CONFIG"; then
10808
+ if test -n "$BRASERO_GLIB_LIBS"; then
10809
+ pkg_cv_BRASERO_GLIB_LIBS="$BRASERO_GLIB_LIBS"
10811
+ if test -n "$PKG_CONFIG" && \
10812
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10813
gobject-2.0 >= \$GLIB_REQUIRED \\
10814
- glib-2.0 >= \$GLIB_REQUIRED\"") >&5
10815
+ glib-2.0 >= \$GLIB_REQUIRED\""; } >&5
10816
($PKG_CONFIG --exists --print-errors "\
10817
gobject-2.0 >= $GLIB_REQUIRED \
10818
glib-2.0 >= $GLIB_REQUIRED") 2>&5
10820
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10821
- (exit $ac_status); }; then
10822
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10823
+ test $ac_status = 0; }; then
10824
pkg_cv_BRASERO_GLIB_LIBS=`$PKG_CONFIG --libs "\
10825
gobject-2.0 >= $GLIB_REQUIRED \
10826
glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
10831
- pkg_failed=untried
10834
+ pkg_failed=untried
10838
@@ -14779,31 +13279,18 @@
10839
_pkg_short_errors_supported=no
10841
if test $_pkg_short_errors_supported = yes; then
10842
- BRASERO_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
10843
+ BRASERO_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
10844
gobject-2.0 >= $GLIB_REQUIRED \
10845
- glib-2.0 >= $GLIB_REQUIRED" 2>&1`
10846
+ glib-2.0 >= $GLIB_REQUIRED"`
10848
- BRASERO_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
10849
+ BRASERO_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
10850
gobject-2.0 >= $GLIB_REQUIRED \
10851
- glib-2.0 >= $GLIB_REQUIRED" 2>&1`
10852
+ glib-2.0 >= $GLIB_REQUIRED"`
10854
# Put the nasty error message in config.log where it belongs
10855
echo "$BRASERO_GLIB_PKG_ERRORS" >&5
10857
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
10858
- gobject-2.0 >= $GLIB_REQUIRED \
10859
- glib-2.0 >= $GLIB_REQUIRED) were not met:
10861
-$BRASERO_GLIB_PKG_ERRORS
10863
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
10864
-installed software in a non-standard prefix.
10866
-Alternatively, you may set the environment variables BRASERO_GLIB_CFLAGS
10867
-and BRASERO_GLIB_LIBS to avoid the need to call pkg-config.
10868
-See the pkg-config man page for more details.
10870
-$as_echo "$as_me: error: Package requirements (\
10871
+ as_fn_error "Package requirements (\
10872
gobject-2.0 >= $GLIB_REQUIRED \
10873
glib-2.0 >= $GLIB_REQUIRED) were not met:
10875
@@ -14815,22 +13302,11 @@
10876
Alternatively, you may set the environment variables BRASERO_GLIB_CFLAGS
10877
and BRASERO_GLIB_LIBS to avoid the need to call pkg-config.
10878
See the pkg-config man page for more details.
10880
- { (exit 1); exit 1; }; }
10882
elif test $pkg_failed = untried; then
10883
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
10884
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10885
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10886
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
10887
-is in your PATH or set the PKG_CONFIG environment variable to the full
10888
-path to pkg-config.
10890
-Alternatively, you may set the environment variables BRASERO_GLIB_CFLAGS
10891
-and BRASERO_GLIB_LIBS to avoid the need to call pkg-config.
10892
-See the pkg-config man page for more details.
10894
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10895
-See \`config.log' for more details." >&5
10896
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
10897
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
10898
is in your PATH or set the PKG_CONFIG environment variable to the full
10899
path to pkg-config.
10901
@@ -14839,12 +13315,11 @@
10902
See the pkg-config man page for more details.
10904
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10905
-See \`config.log' for more details." >&2;}
10906
- { (exit 1); exit 1; }; }; }
10907
+See \`config.log' for more details." "$LINENO" 5; }
10909
BRASERO_GLIB_CFLAGS=$pkg_cv_BRASERO_GLIB_CFLAGS
10910
BRASERO_GLIB_LIBS=$pkg_cv_BRASERO_GLIB_LIBS
10911
- { $as_echo "$as_me:$LINENO: result: yes" >&5
10912
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10913
$as_echo "yes" >&6; }
10916
@@ -14854,46 +13329,50 @@
10920
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_GCONF" >&5
10921
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_GCONF" >&5
10922
$as_echo_n "checking for BRASERO_GCONF... " >&6; }
10924
-if test -n "$BRASERO_GCONF_CFLAGS"; then
10925
- pkg_cv_BRASERO_GCONF_CFLAGS="$BRASERO_GCONF_CFLAGS"
10926
- elif test -n "$PKG_CONFIG"; then
10927
- if test -n "$PKG_CONFIG" && \
10928
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10929
- gconf-2.0 >= \$GCONF_REQUIRED\"") >&5
10930
+if test -n "$PKG_CONFIG"; then
10931
+ if test -n "$BRASERO_GCONF_CFLAGS"; then
10932
+ pkg_cv_BRASERO_GCONF_CFLAGS="$BRASERO_GCONF_CFLAGS"
10934
+ if test -n "$PKG_CONFIG" && \
10935
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10936
+ gconf-2.0 >= \$GCONF_REQUIRED\""; } >&5
10937
($PKG_CONFIG --exists --print-errors "\
10938
gconf-2.0 >= $GCONF_REQUIRED") 2>&5
10940
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10941
- (exit $ac_status); }; then
10942
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10943
+ test $ac_status = 0; }; then
10944
pkg_cv_BRASERO_GCONF_CFLAGS=`$PKG_CONFIG --cflags "\
10945
gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null`
10950
- pkg_failed=untried
10953
+ pkg_failed=untried
10955
-if test -n "$BRASERO_GCONF_LIBS"; then
10956
- pkg_cv_BRASERO_GCONF_LIBS="$BRASERO_GCONF_LIBS"
10957
- elif test -n "$PKG_CONFIG"; then
10958
- if test -n "$PKG_CONFIG" && \
10959
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10960
- gconf-2.0 >= \$GCONF_REQUIRED\"") >&5
10961
+if test -n "$PKG_CONFIG"; then
10962
+ if test -n "$BRASERO_GCONF_LIBS"; then
10963
+ pkg_cv_BRASERO_GCONF_LIBS="$BRASERO_GCONF_LIBS"
10965
+ if test -n "$PKG_CONFIG" && \
10966
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10967
+ gconf-2.0 >= \$GCONF_REQUIRED\""; } >&5
10968
($PKG_CONFIG --exists --print-errors "\
10969
gconf-2.0 >= $GCONF_REQUIRED") 2>&5
10971
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10972
- (exit $ac_status); }; then
10973
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10974
+ test $ac_status = 0; }; then
10975
pkg_cv_BRASERO_GCONF_LIBS=`$PKG_CONFIG --libs "\
10976
gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null`
10981
- pkg_failed=untried
10984
+ pkg_failed=untried
10988
@@ -14906,28 +13385,16 @@
10989
_pkg_short_errors_supported=no
10991
if test $_pkg_short_errors_supported = yes; then
10992
- BRASERO_GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
10993
- gconf-2.0 >= $GCONF_REQUIRED" 2>&1`
10994
+ BRASERO_GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
10995
+ gconf-2.0 >= $GCONF_REQUIRED"`
10997
- BRASERO_GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
10998
- gconf-2.0 >= $GCONF_REQUIRED" 2>&1`
10999
+ BRASERO_GCONF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
11000
+ gconf-2.0 >= $GCONF_REQUIRED"`
11002
# Put the nasty error message in config.log where it belongs
11003
echo "$BRASERO_GCONF_PKG_ERRORS" >&5
11005
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
11006
- gconf-2.0 >= $GCONF_REQUIRED) were not met:
11008
-$BRASERO_GCONF_PKG_ERRORS
11010
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
11011
-installed software in a non-standard prefix.
11013
-Alternatively, you may set the environment variables BRASERO_GCONF_CFLAGS
11014
-and BRASERO_GCONF_LIBS to avoid the need to call pkg-config.
11015
-See the pkg-config man page for more details.
11017
-$as_echo "$as_me: error: Package requirements (\
11018
+ as_fn_error "Package requirements (\
11019
gconf-2.0 >= $GCONF_REQUIRED) were not met:
11021
$BRASERO_GCONF_PKG_ERRORS
11022
@@ -14938,22 +13405,11 @@
11023
Alternatively, you may set the environment variables BRASERO_GCONF_CFLAGS
11024
and BRASERO_GCONF_LIBS to avoid the need to call pkg-config.
11025
See the pkg-config man page for more details.
11027
- { (exit 1); exit 1; }; }
11029
elif test $pkg_failed = untried; then
11030
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
11031
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11032
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11033
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
11034
-is in your PATH or set the PKG_CONFIG environment variable to the full
11035
-path to pkg-config.
11037
-Alternatively, you may set the environment variables BRASERO_GCONF_CFLAGS
11038
-and BRASERO_GCONF_LIBS to avoid the need to call pkg-config.
11039
-See the pkg-config man page for more details.
11041
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11042
-See \`config.log' for more details." >&5
11043
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
11044
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
11045
is in your PATH or set the PKG_CONFIG environment variable to the full
11046
path to pkg-config.
11048
@@ -14962,12 +13418,11 @@
11049
See the pkg-config man page for more details.
11051
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11052
-See \`config.log' for more details." >&2;}
11053
- { (exit 1); exit 1; }; }; }
11054
+See \`config.log' for more details." "$LINENO" 5; }
11056
BRASERO_GCONF_CFLAGS=$pkg_cv_BRASERO_GCONF_CFLAGS
11057
BRASERO_GCONF_LIBS=$pkg_cv_BRASERO_GCONF_LIBS
11058
- { $as_echo "$as_me:$LINENO: result: yes" >&5
11059
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
11060
$as_echo "yes" >&6; }
11063
@@ -14977,46 +13432,50 @@
11067
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_GMODULE" >&5
11068
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_GMODULE" >&5
11069
$as_echo_n "checking for BRASERO_GMODULE... " >&6; }
11071
-if test -n "$BRASERO_GMODULE_CFLAGS"; then
11072
- pkg_cv_BRASERO_GMODULE_CFLAGS="$BRASERO_GMODULE_CFLAGS"
11073
- elif test -n "$PKG_CONFIG"; then
11074
- if test -n "$PKG_CONFIG" && \
11075
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11076
- gmodule-2.0 >= \$GMODULE_REQUIRED\"") >&5
11077
+if test -n "$PKG_CONFIG"; then
11078
+ if test -n "$BRASERO_GMODULE_CFLAGS"; then
11079
+ pkg_cv_BRASERO_GMODULE_CFLAGS="$BRASERO_GMODULE_CFLAGS"
11081
+ if test -n "$PKG_CONFIG" && \
11082
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11083
+ gmodule-2.0 >= \$GMODULE_REQUIRED\""; } >&5
11084
($PKG_CONFIG --exists --print-errors "\
11085
gmodule-2.0 >= $GMODULE_REQUIRED") 2>&5
11087
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11088
- (exit $ac_status); }; then
11089
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11090
+ test $ac_status = 0; }; then
11091
pkg_cv_BRASERO_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "\
11092
gmodule-2.0 >= $GMODULE_REQUIRED" 2>/dev/null`
11097
- pkg_failed=untried
11100
+ pkg_failed=untried
11102
-if test -n "$BRASERO_GMODULE_LIBS"; then
11103
- pkg_cv_BRASERO_GMODULE_LIBS="$BRASERO_GMODULE_LIBS"
11104
- elif test -n "$PKG_CONFIG"; then
11105
- if test -n "$PKG_CONFIG" && \
11106
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11107
- gmodule-2.0 >= \$GMODULE_REQUIRED\"") >&5
11108
+if test -n "$PKG_CONFIG"; then
11109
+ if test -n "$BRASERO_GMODULE_LIBS"; then
11110
+ pkg_cv_BRASERO_GMODULE_LIBS="$BRASERO_GMODULE_LIBS"
11112
+ if test -n "$PKG_CONFIG" && \
11113
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11114
+ gmodule-2.0 >= \$GMODULE_REQUIRED\""; } >&5
11115
($PKG_CONFIG --exists --print-errors "\
11116
gmodule-2.0 >= $GMODULE_REQUIRED") 2>&5
11118
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11119
- (exit $ac_status); }; then
11120
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11121
+ test $ac_status = 0; }; then
11122
pkg_cv_BRASERO_GMODULE_LIBS=`$PKG_CONFIG --libs "\
11123
gmodule-2.0 >= $GMODULE_REQUIRED" 2>/dev/null`
11128
- pkg_failed=untried
11131
+ pkg_failed=untried
11135
@@ -15029,16 +13488,16 @@
11136
_pkg_short_errors_supported=no
11138
if test $_pkg_short_errors_supported = yes; then
11139
- BRASERO_GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
11140
- gmodule-2.0 >= $GMODULE_REQUIRED" 2>&1`
11141
+ BRASERO_GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
11142
+ gmodule-2.0 >= $GMODULE_REQUIRED"`
11144
- BRASERO_GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
11145
- gmodule-2.0 >= $GMODULE_REQUIRED" 2>&1`
11146
+ BRASERO_GMODULE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
11147
+ gmodule-2.0 >= $GMODULE_REQUIRED"`
11149
# Put the nasty error message in config.log where it belongs
11150
echo "$BRASERO_GMODULE_PKG_ERRORS" >&5
11152
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
11153
+ as_fn_error "Package requirements (\
11154
gmodule-2.0 >= $GMODULE_REQUIRED) were not met:
11156
$BRASERO_GMODULE_PKG_ERRORS
11157
@@ -15049,34 +13508,11 @@
11158
Alternatively, you may set the environment variables BRASERO_GMODULE_CFLAGS
11159
and BRASERO_GMODULE_LIBS to avoid the need to call pkg-config.
11160
See the pkg-config man page for more details.
11162
-$as_echo "$as_me: error: Package requirements (\
11163
- gmodule-2.0 >= $GMODULE_REQUIRED) were not met:
11165
-$BRASERO_GMODULE_PKG_ERRORS
11167
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
11168
-installed software in a non-standard prefix.
11170
-Alternatively, you may set the environment variables BRASERO_GMODULE_CFLAGS
11171
-and BRASERO_GMODULE_LIBS to avoid the need to call pkg-config.
11172
-See the pkg-config man page for more details.
11174
- { (exit 1); exit 1; }; }
11176
elif test $pkg_failed = untried; then
11177
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
11178
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11179
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11180
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
11181
-is in your PATH or set the PKG_CONFIG environment variable to the full
11182
-path to pkg-config.
11184
-Alternatively, you may set the environment variables BRASERO_GMODULE_CFLAGS
11185
-and BRASERO_GMODULE_LIBS to avoid the need to call pkg-config.
11186
-See the pkg-config man page for more details.
11188
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11189
-See \`config.log' for more details." >&5
11190
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
11191
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
11192
is in your PATH or set the PKG_CONFIG environment variable to the full
11193
path to pkg-config.
11195
@@ -15085,12 +13521,11 @@
11196
See the pkg-config man page for more details.
11198
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11199
-See \`config.log' for more details." >&2;}
11200
- { (exit 1); exit 1; }; }; }
11201
+See \`config.log' for more details." "$LINENO" 5; }
11203
BRASERO_GMODULE_CFLAGS=$pkg_cv_BRASERO_GMODULE_CFLAGS
11204
BRASERO_GMODULE_LIBS=$pkg_cv_BRASERO_GMODULE_LIBS
11205
- { $as_echo "$as_me:$LINENO: result: yes" >&5
11206
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
11207
$as_echo "yes" >&6; }
11210
@@ -15100,46 +13535,50 @@
11214
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_GMODULE_EXPORT" >&5
11215
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_GMODULE_EXPORT" >&5
11216
$as_echo_n "checking for BRASERO_GMODULE_EXPORT... " >&6; }
11218
-if test -n "$BRASERO_GMODULE_EXPORT_CFLAGS"; then
11219
- pkg_cv_BRASERO_GMODULE_EXPORT_CFLAGS="$BRASERO_GMODULE_EXPORT_CFLAGS"
11220
- elif test -n "$PKG_CONFIG"; then
11221
- if test -n "$PKG_CONFIG" && \
11222
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11223
- gmodule-export-2.0 >= \$GMODULE_EXPORT_REQUIRED\"") >&5
11224
+if test -n "$PKG_CONFIG"; then
11225
+ if test -n "$BRASERO_GMODULE_EXPORT_CFLAGS"; then
11226
+ pkg_cv_BRASERO_GMODULE_EXPORT_CFLAGS="$BRASERO_GMODULE_EXPORT_CFLAGS"
11228
+ if test -n "$PKG_CONFIG" && \
11229
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11230
+ gmodule-export-2.0 >= \$GMODULE_EXPORT_REQUIRED\""; } >&5
11231
($PKG_CONFIG --exists --print-errors "\
11232
gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED") 2>&5
11234
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11235
- (exit $ac_status); }; then
11236
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11237
+ test $ac_status = 0; }; then
11238
pkg_cv_BRASERO_GMODULE_EXPORT_CFLAGS=`$PKG_CONFIG --cflags "\
11239
gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED" 2>/dev/null`
11244
- pkg_failed=untried
11247
+ pkg_failed=untried
11249
-if test -n "$BRASERO_GMODULE_EXPORT_LIBS"; then
11250
- pkg_cv_BRASERO_GMODULE_EXPORT_LIBS="$BRASERO_GMODULE_EXPORT_LIBS"
11251
- elif test -n "$PKG_CONFIG"; then
11252
- if test -n "$PKG_CONFIG" && \
11253
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11254
- gmodule-export-2.0 >= \$GMODULE_EXPORT_REQUIRED\"") >&5
11255
+if test -n "$PKG_CONFIG"; then
11256
+ if test -n "$BRASERO_GMODULE_EXPORT_LIBS"; then
11257
+ pkg_cv_BRASERO_GMODULE_EXPORT_LIBS="$BRASERO_GMODULE_EXPORT_LIBS"
11259
+ if test -n "$PKG_CONFIG" && \
11260
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11261
+ gmodule-export-2.0 >= \$GMODULE_EXPORT_REQUIRED\""; } >&5
11262
($PKG_CONFIG --exists --print-errors "\
11263
gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED") 2>&5
11265
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11266
- (exit $ac_status); }; then
11267
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11268
+ test $ac_status = 0; }; then
11269
pkg_cv_BRASERO_GMODULE_EXPORT_LIBS=`$PKG_CONFIG --libs "\
11270
gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED" 2>/dev/null`
11275
- pkg_failed=untried
11278
+ pkg_failed=untried
11282
@@ -15152,28 +13591,16 @@
11283
_pkg_short_errors_supported=no
11285
if test $_pkg_short_errors_supported = yes; then
11286
- BRASERO_GMODULE_EXPORT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
11287
- gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED" 2>&1`
11288
+ BRASERO_GMODULE_EXPORT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
11289
+ gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED"`
11291
- BRASERO_GMODULE_EXPORT_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
11292
- gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED" 2>&1`
11293
+ BRASERO_GMODULE_EXPORT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
11294
+ gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED"`
11296
# Put the nasty error message in config.log where it belongs
11297
echo "$BRASERO_GMODULE_EXPORT_PKG_ERRORS" >&5
11299
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
11300
- gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED) were not met:
11302
-$BRASERO_GMODULE_EXPORT_PKG_ERRORS
11304
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
11305
-installed software in a non-standard prefix.
11307
-Alternatively, you may set the environment variables BRASERO_GMODULE_EXPORT_CFLAGS
11308
-and BRASERO_GMODULE_EXPORT_LIBS to avoid the need to call pkg-config.
11309
-See the pkg-config man page for more details.
11311
-$as_echo "$as_me: error: Package requirements (\
11312
+ as_fn_error "Package requirements (\
11313
gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED) were not met:
11315
$BRASERO_GMODULE_EXPORT_PKG_ERRORS
11316
@@ -15184,22 +13611,11 @@
11317
Alternatively, you may set the environment variables BRASERO_GMODULE_EXPORT_CFLAGS
11318
and BRASERO_GMODULE_EXPORT_LIBS to avoid the need to call pkg-config.
11319
See the pkg-config man page for more details.
11321
- { (exit 1); exit 1; }; }
11323
elif test $pkg_failed = untried; then
11324
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
11325
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11326
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11327
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
11328
-is in your PATH or set the PKG_CONFIG environment variable to the full
11329
-path to pkg-config.
11331
-Alternatively, you may set the environment variables BRASERO_GMODULE_EXPORT_CFLAGS
11332
-and BRASERO_GMODULE_EXPORT_LIBS to avoid the need to call pkg-config.
11333
-See the pkg-config man page for more details.
11335
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11336
-See \`config.log' for more details." >&5
11337
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
11338
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
11339
is in your PATH or set the PKG_CONFIG environment variable to the full
11340
path to pkg-config.
11342
@@ -15208,12 +13624,11 @@
11343
See the pkg-config man page for more details.
11345
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11346
-See \`config.log' for more details." >&2;}
11347
- { (exit 1); exit 1; }; }; }
11348
+See \`config.log' for more details." "$LINENO" 5; }
11350
BRASERO_GMODULE_EXPORT_CFLAGS=$pkg_cv_BRASERO_GMODULE_EXPORT_CFLAGS
11351
BRASERO_GMODULE_EXPORT_LIBS=$pkg_cv_BRASERO_GMODULE_EXPORT_LIBS
11352
- { $as_echo "$as_me:$LINENO: result: yes" >&5
11353
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
11354
$as_echo "yes" >&6; }
11357
@@ -15223,52 +13638,62 @@
11361
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_GTK" >&5
11362
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_GTK" >&5
11363
$as_echo_n "checking for BRASERO_GTK... " >&6; }
11365
-if test -n "$BRASERO_GTK_CFLAGS"; then
11366
- pkg_cv_BRASERO_GTK_CFLAGS="$BRASERO_GTK_CFLAGS"
11367
- elif test -n "$PKG_CONFIG"; then
11368
- if test -n "$PKG_CONFIG" && \
11369
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11370
+if test -n "$PKG_CONFIG"; then
11371
+ if test -n "$BRASERO_GTK_CFLAGS"; then
11372
+ pkg_cv_BRASERO_GTK_CFLAGS="$BRASERO_GTK_CFLAGS"
11374
+ if test -n "$PKG_CONFIG" && \
11375
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
3828
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11376
3829
gdk-2.0 >= \$GDK_REQUIRED \\
11377
- gtk+-2.0 >= \$GTK_REQUIRED\"") >&5
3830
- gtk+-2.0 >= \$GTK_REQUIRED\""; } >&5
11378
3831
+ gtk+-2.0 >= \$GTK_REQUIRED \\
11379
3832
+ launchpad-integration\""; } >&5
11380
3833
($PKG_CONFIG --exists --print-errors "\
11486
3895
$BRASERO_GTK_PKG_ERRORS
11488
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
11489
-installed software in a non-standard prefix.
11491
-Alternatively, you may set the environment variables BRASERO_GTK_CFLAGS
11492
-and BRASERO_GTK_LIBS to avoid the need to call pkg-config.
11493
-See the pkg-config man page for more details.
11495
- { (exit 1); exit 1; }; }
11496
-elif test $pkg_failed = untried; then
11497
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
11498
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11499
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
11500
-is in your PATH or set the PKG_CONFIG environment variable to the full
11501
-path to pkg-config.
11502
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
11503
+installed software in a non-standard prefix.
11505
Alternatively, you may set the environment variables BRASERO_GTK_CFLAGS
11506
and BRASERO_GTK_LIBS to avoid the need to call pkg-config.
11507
See the pkg-config man page for more details.
11509
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11510
-See \`config.log' for more details." >&5
11511
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
11513
+elif test $pkg_failed = untried; then
11514
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11515
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11516
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
11517
is in your PATH or set the PKG_CONFIG environment variable to the full
11518
path to pkg-config.
11520
@@ -15341,12 +13745,11 @@
11521
See the pkg-config man page for more details.
11523
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11524
-See \`config.log' for more details." >&2;}
11525
- { (exit 1); exit 1; }; }; }
11526
+See \`config.log' for more details." "$LINENO" 5; }
11528
BRASERO_GTK_CFLAGS=$pkg_cv_BRASERO_GTK_CFLAGS
11529
BRASERO_GTK_LIBS=$pkg_cv_BRASERO_GTK_LIBS
11530
- { $as_echo "$as_me:$LINENO: result: yes" >&5
11531
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
11532
$as_echo "yes" >&6; }
11535
@@ -15356,46 +13759,50 @@
11539
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_DBUS" >&5
11540
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_DBUS" >&5
11541
$as_echo_n "checking for BRASERO_DBUS... " >&6; }
11543
-if test -n "$BRASERO_DBUS_CFLAGS"; then
11544
- pkg_cv_BRASERO_DBUS_CFLAGS="$BRASERO_DBUS_CFLAGS"
11545
- elif test -n "$PKG_CONFIG"; then
11546
- if test -n "$PKG_CONFIG" && \
11547
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11548
- dbus-glib-1 >= \$DBUS_REQUIRED\"") >&5
11549
+if test -n "$PKG_CONFIG"; then
11550
+ if test -n "$BRASERO_DBUS_CFLAGS"; then
11551
+ pkg_cv_BRASERO_DBUS_CFLAGS="$BRASERO_DBUS_CFLAGS"
11553
+ if test -n "$PKG_CONFIG" && \
11554
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11555
+ dbus-glib-1 >= \$DBUS_REQUIRED\""; } >&5
11556
($PKG_CONFIG --exists --print-errors "\
11557
dbus-glib-1 >= $DBUS_REQUIRED") 2>&5
11559
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11560
- (exit $ac_status); }; then
11561
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11562
+ test $ac_status = 0; }; then
11563
pkg_cv_BRASERO_DBUS_CFLAGS=`$PKG_CONFIG --cflags "\
11564
dbus-glib-1 >= $DBUS_REQUIRED" 2>/dev/null`
11569
- pkg_failed=untried
11572
+ pkg_failed=untried
11574
-if test -n "$BRASERO_DBUS_LIBS"; then
11575
- pkg_cv_BRASERO_DBUS_LIBS="$BRASERO_DBUS_LIBS"
11576
- elif test -n "$PKG_CONFIG"; then
11577
- if test -n "$PKG_CONFIG" && \
11578
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11579
- dbus-glib-1 >= \$DBUS_REQUIRED\"") >&5
11580
+if test -n "$PKG_CONFIG"; then
11581
+ if test -n "$BRASERO_DBUS_LIBS"; then
11582
+ pkg_cv_BRASERO_DBUS_LIBS="$BRASERO_DBUS_LIBS"
11584
+ if test -n "$PKG_CONFIG" && \
11585
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11586
+ dbus-glib-1 >= \$DBUS_REQUIRED\""; } >&5
11587
($PKG_CONFIG --exists --print-errors "\
11588
dbus-glib-1 >= $DBUS_REQUIRED") 2>&5
11590
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11591
- (exit $ac_status); }; then
11592
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11593
+ test $ac_status = 0; }; then
11594
pkg_cv_BRASERO_DBUS_LIBS=`$PKG_CONFIG --libs "\
11595
dbus-glib-1 >= $DBUS_REQUIRED" 2>/dev/null`
11600
- pkg_failed=untried
11603
+ pkg_failed=untried
11607
@@ -15408,28 +13815,16 @@
11608
_pkg_short_errors_supported=no
11610
if test $_pkg_short_errors_supported = yes; then
11611
- BRASERO_DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
11612
- dbus-glib-1 >= $DBUS_REQUIRED" 2>&1`
11613
+ BRASERO_DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
11614
+ dbus-glib-1 >= $DBUS_REQUIRED"`
11616
- BRASERO_DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
11617
- dbus-glib-1 >= $DBUS_REQUIRED" 2>&1`
11618
+ BRASERO_DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
11619
+ dbus-glib-1 >= $DBUS_REQUIRED"`
11621
# Put the nasty error message in config.log where it belongs
11622
echo "$BRASERO_DBUS_PKG_ERRORS" >&5
11624
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
11625
- dbus-glib-1 >= $DBUS_REQUIRED) were not met:
11627
-$BRASERO_DBUS_PKG_ERRORS
11629
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
11630
-installed software in a non-standard prefix.
11632
-Alternatively, you may set the environment variables BRASERO_DBUS_CFLAGS
11633
-and BRASERO_DBUS_LIBS to avoid the need to call pkg-config.
11634
-See the pkg-config man page for more details.
11636
-$as_echo "$as_me: error: Package requirements (\
11637
+ as_fn_error "Package requirements (\
11638
dbus-glib-1 >= $DBUS_REQUIRED) were not met:
11640
$BRASERO_DBUS_PKG_ERRORS
11641
@@ -15440,22 +13835,11 @@
11642
Alternatively, you may set the environment variables BRASERO_DBUS_CFLAGS
11643
and BRASERO_DBUS_LIBS to avoid the need to call pkg-config.
11644
See the pkg-config man page for more details.
11646
- { (exit 1); exit 1; }; }
11648
elif test $pkg_failed = untried; then
11649
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
11650
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11651
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11652
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
11653
-is in your PATH or set the PKG_CONFIG environment variable to the full
11654
-path to pkg-config.
11656
-Alternatively, you may set the environment variables BRASERO_DBUS_CFLAGS
11657
-and BRASERO_DBUS_LIBS to avoid the need to call pkg-config.
11658
-See the pkg-config man page for more details.
11660
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11661
-See \`config.log' for more details." >&5
11662
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
11663
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
11664
is in your PATH or set the PKG_CONFIG environment variable to the full
11665
path to pkg-config.
11667
@@ -15464,12 +13848,11 @@
11668
See the pkg-config man page for more details.
11670
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11671
-See \`config.log' for more details." >&2;}
11672
- { (exit 1); exit 1; }; }; }
11673
+See \`config.log' for more details." "$LINENO" 5; }
11675
BRASERO_DBUS_CFLAGS=$pkg_cv_BRASERO_DBUS_CFLAGS
11676
BRASERO_DBUS_LIBS=$pkg_cv_BRASERO_DBUS_LIBS
11677
- { $as_echo "$as_me:$LINENO: result: yes" >&5
11678
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
11679
$as_echo "yes" >&6; }
11682
@@ -15479,46 +13862,50 @@
11686
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_SM" >&5
11687
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_SM" >&5
11688
$as_echo_n "checking for BRASERO_SM... " >&6; }
11690
-if test -n "$BRASERO_SM_CFLAGS"; then
11691
- pkg_cv_BRASERO_SM_CFLAGS="$BRASERO_SM_CFLAGS"
11692
- elif test -n "$PKG_CONFIG"; then
11693
- if test -n "$PKG_CONFIG" && \
11694
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11696
+if test -n "$PKG_CONFIG"; then
11697
+ if test -n "$BRASERO_SM_CFLAGS"; then
11698
+ pkg_cv_BRASERO_SM_CFLAGS="$BRASERO_SM_CFLAGS"
11700
+ if test -n "$PKG_CONFIG" && \
11701
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11703
($PKG_CONFIG --exists --print-errors "\
11706
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11707
- (exit $ac_status); }; then
11708
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11709
+ test $ac_status = 0; }; then
11710
pkg_cv_BRASERO_SM_CFLAGS=`$PKG_CONFIG --cflags "\
11716
- pkg_failed=untried
11719
+ pkg_failed=untried
11721
-if test -n "$BRASERO_SM_LIBS"; then
11722
- pkg_cv_BRASERO_SM_LIBS="$BRASERO_SM_LIBS"
11723
- elif test -n "$PKG_CONFIG"; then
11724
- if test -n "$PKG_CONFIG" && \
11725
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11727
+if test -n "$PKG_CONFIG"; then
11728
+ if test -n "$BRASERO_SM_LIBS"; then
11729
+ pkg_cv_BRASERO_SM_LIBS="$BRASERO_SM_LIBS"
11731
+ if test -n "$PKG_CONFIG" && \
11732
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11734
($PKG_CONFIG --exists --print-errors "\
11737
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11738
- (exit $ac_status); }; then
11739
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11740
+ test $ac_status = 0; }; then
11741
pkg_cv_BRASERO_SM_LIBS=`$PKG_CONFIG --libs "\
11747
- pkg_failed=untried
11750
+ pkg_failed=untried
11754
@@ -15531,16 +13918,16 @@
11755
_pkg_short_errors_supported=no
11757
if test $_pkg_short_errors_supported = yes; then
11758
- BRASERO_SM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
11760
+ BRASERO_SM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
11763
- BRASERO_SM_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
11765
+ BRASERO_SM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
11768
# Put the nasty error message in config.log where it belongs
11769
echo "$BRASERO_SM_PKG_ERRORS" >&5
11771
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
11772
+ as_fn_error "Package requirements (\
11775
$BRASERO_SM_PKG_ERRORS
11776
@@ -15551,34 +13938,11 @@
11777
Alternatively, you may set the environment variables BRASERO_SM_CFLAGS
11778
and BRASERO_SM_LIBS to avoid the need to call pkg-config.
11779
See the pkg-config man page for more details.
11781
-$as_echo "$as_me: error: Package requirements (\
11782
- sm) were not met:
11784
-$BRASERO_SM_PKG_ERRORS
11786
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
11787
-installed software in a non-standard prefix.
11789
-Alternatively, you may set the environment variables BRASERO_SM_CFLAGS
11790
-and BRASERO_SM_LIBS to avoid the need to call pkg-config.
11791
-See the pkg-config man page for more details.
11793
- { (exit 1); exit 1; }; }
11795
elif test $pkg_failed = untried; then
11796
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
11797
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11798
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11799
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
11800
-is in your PATH or set the PKG_CONFIG environment variable to the full
11801
-path to pkg-config.
11803
-Alternatively, you may set the environment variables BRASERO_SM_CFLAGS
11804
-and BRASERO_SM_LIBS to avoid the need to call pkg-config.
11805
-See the pkg-config man page for more details.
11807
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11808
-See \`config.log' for more details." >&5
11809
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
11810
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
11811
is in your PATH or set the PKG_CONFIG environment variable to the full
11812
path to pkg-config.
11814
@@ -15587,12 +13951,11 @@
11815
See the pkg-config man page for more details.
11817
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11818
-See \`config.log' for more details." >&2;}
11819
- { (exit 1); exit 1; }; }; }
11820
+See \`config.log' for more details." "$LINENO" 5; }
11822
BRASERO_SM_CFLAGS=$pkg_cv_BRASERO_SM_CFLAGS
11823
BRASERO_SM_LIBS=$pkg_cv_BRASERO_SM_LIBS
11824
- { $as_echo "$as_me:$LINENO: result: yes" >&5
11825
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
11826
$as_echo "yes" >&6; }
11829
@@ -15602,52 +13965,56 @@
11833
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_CANBERRA" >&5
11834
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_CANBERRA" >&5
11835
$as_echo_n "checking for BRASERO_CANBERRA... " >&6; }
11837
-if test -n "$BRASERO_CANBERRA_CFLAGS"; then
11838
- pkg_cv_BRASERO_CANBERRA_CFLAGS="$BRASERO_CANBERRA_CFLAGS"
11839
- elif test -n "$PKG_CONFIG"; then
11840
- if test -n "$PKG_CONFIG" && \
11841
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11842
+if test -n "$PKG_CONFIG"; then
11843
+ if test -n "$BRASERO_CANBERRA_CFLAGS"; then
11844
+ pkg_cv_BRASERO_CANBERRA_CFLAGS="$BRASERO_CANBERRA_CFLAGS"
11846
+ if test -n "$PKG_CONFIG" && \
11847
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11848
libcanberra >= \$CANBERRA_REQUIRED \\
11849
- libcanberra-gtk >= \$CANBERRA_REQUIRED\"") >&5
11850
+ libcanberra-gtk >= \$CANBERRA_REQUIRED\""; } >&5
11851
($PKG_CONFIG --exists --print-errors "\
11852
libcanberra >= $CANBERRA_REQUIRED \
11853
libcanberra-gtk >= $CANBERRA_REQUIRED") 2>&5
11855
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11856
- (exit $ac_status); }; then
11857
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11858
+ test $ac_status = 0; }; then
11859
pkg_cv_BRASERO_CANBERRA_CFLAGS=`$PKG_CONFIG --cflags "\
11860
libcanberra >= $CANBERRA_REQUIRED \
11861
libcanberra-gtk >= $CANBERRA_REQUIRED" 2>/dev/null`
11866
- pkg_failed=untried
11869
+ pkg_failed=untried
11871
-if test -n "$BRASERO_CANBERRA_LIBS"; then
11872
- pkg_cv_BRASERO_CANBERRA_LIBS="$BRASERO_CANBERRA_LIBS"
11873
- elif test -n "$PKG_CONFIG"; then
11874
- if test -n "$PKG_CONFIG" && \
11875
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11876
+if test -n "$PKG_CONFIG"; then
11877
+ if test -n "$BRASERO_CANBERRA_LIBS"; then
11878
+ pkg_cv_BRASERO_CANBERRA_LIBS="$BRASERO_CANBERRA_LIBS"
11880
+ if test -n "$PKG_CONFIG" && \
11881
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11882
libcanberra >= \$CANBERRA_REQUIRED \\
11883
- libcanberra-gtk >= \$CANBERRA_REQUIRED\"") >&5
11884
+ libcanberra-gtk >= \$CANBERRA_REQUIRED\""; } >&5
11885
($PKG_CONFIG --exists --print-errors "\
11886
libcanberra >= $CANBERRA_REQUIRED \
11887
libcanberra-gtk >= $CANBERRA_REQUIRED") 2>&5
11889
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11890
- (exit $ac_status); }; then
11891
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11892
+ test $ac_status = 0; }; then
11893
pkg_cv_BRASERO_CANBERRA_LIBS=`$PKG_CONFIG --libs "\
11894
libcanberra >= $CANBERRA_REQUIRED \
11895
libcanberra-gtk >= $CANBERRA_REQUIRED" 2>/dev/null`
11900
- pkg_failed=untried
11903
+ pkg_failed=untried
11907
@@ -15660,31 +14027,18 @@
11908
_pkg_short_errors_supported=no
11910
if test $_pkg_short_errors_supported = yes; then
11911
- BRASERO_CANBERRA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
11912
+ BRASERO_CANBERRA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
11913
libcanberra >= $CANBERRA_REQUIRED \
11914
- libcanberra-gtk >= $CANBERRA_REQUIRED" 2>&1`
11915
+ libcanberra-gtk >= $CANBERRA_REQUIRED"`
11917
- BRASERO_CANBERRA_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
11918
+ BRASERO_CANBERRA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
11919
libcanberra >= $CANBERRA_REQUIRED \
11920
- libcanberra-gtk >= $CANBERRA_REQUIRED" 2>&1`
11921
+ libcanberra-gtk >= $CANBERRA_REQUIRED"`
11923
# Put the nasty error message in config.log where it belongs
11924
echo "$BRASERO_CANBERRA_PKG_ERRORS" >&5
11926
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
11927
- libcanberra >= $CANBERRA_REQUIRED \
11928
- libcanberra-gtk >= $CANBERRA_REQUIRED) were not met:
11930
-$BRASERO_CANBERRA_PKG_ERRORS
11932
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
11933
-installed software in a non-standard prefix.
11935
-Alternatively, you may set the environment variables BRASERO_CANBERRA_CFLAGS
11936
-and BRASERO_CANBERRA_LIBS to avoid the need to call pkg-config.
11937
-See the pkg-config man page for more details.
11939
-$as_echo "$as_me: error: Package requirements (\
11940
+ as_fn_error "Package requirements (\
11941
libcanberra >= $CANBERRA_REQUIRED \
11942
libcanberra-gtk >= $CANBERRA_REQUIRED) were not met:
11944
@@ -15696,22 +14050,11 @@
11945
Alternatively, you may set the environment variables BRASERO_CANBERRA_CFLAGS
11946
and BRASERO_CANBERRA_LIBS to avoid the need to call pkg-config.
11947
See the pkg-config man page for more details.
11949
- { (exit 1); exit 1; }; }
11951
elif test $pkg_failed = untried; then
11952
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
11953
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11954
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11955
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
11956
-is in your PATH or set the PKG_CONFIG environment variable to the full
11957
-path to pkg-config.
11959
-Alternatively, you may set the environment variables BRASERO_CANBERRA_CFLAGS
11960
-and BRASERO_CANBERRA_LIBS to avoid the need to call pkg-config.
11961
-See the pkg-config man page for more details.
11963
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11964
-See \`config.log' for more details." >&5
11965
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
11966
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
11967
is in your PATH or set the PKG_CONFIG environment variable to the full
11968
path to pkg-config.
11970
@@ -15720,12 +14063,11 @@
11971
See the pkg-config man page for more details.
11973
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11974
-See \`config.log' for more details." >&2;}
11975
- { (exit 1); exit 1; }; }; }
11976
+See \`config.log' for more details." "$LINENO" 5; }
11978
BRASERO_CANBERRA_CFLAGS=$pkg_cv_BRASERO_CANBERRA_CFLAGS
11979
BRASERO_CANBERRA_LIBS=$pkg_cv_BRASERO_CANBERRA_LIBS
11980
- { $as_echo "$as_me:$LINENO: result: yes" >&5
11981
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
11982
$as_echo "yes" >&6; }
11985
@@ -15736,7 +14078,7 @@
11986
NAUTILUS_REQUIRED=2.22.2
11988
# Check whether --enable-nautilus was given.
11989
-if test "${enable_nautilus+set}" = set; then
11990
+if test "${enable_nautilus+set}" = set; then :
11991
enableval=$enable_nautilus; enable_nautilus=$enableval
11993
enable_nautilus="yes"
11994
@@ -15745,7 +14087,7 @@
11997
# Check whether --with-nautilusdir was given.
11998
-if test "${with_nautilusdir+set}" = set; then
11999
+if test "${with_nautilusdir+set}" = set; then :
12000
withval=$with_nautilusdir; ac_with_nautilusdir=$withval
12002
ac_with_nautilusdir=""
12003
@@ -15755,40 +14097,44 @@
12004
if test x"$enable_nautilus" = "xyes"; then
12007
-{ $as_echo "$as_me:$LINENO: checking for NAUTILUS_EXTENSION" >&5
12008
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NAUTILUS_EXTENSION" >&5
12009
$as_echo_n "checking for NAUTILUS_EXTENSION... " >&6; }
12011
-if test -n "$NAUTILUS_EXTENSION_CFLAGS"; then
12012
- pkg_cv_NAUTILUS_EXTENSION_CFLAGS="$NAUTILUS_EXTENSION_CFLAGS"
12013
- elif test -n "$PKG_CONFIG"; then
12014
- if test -n "$PKG_CONFIG" && \
12015
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= \$NAUTILUS_REQUIRED\"") >&5
12016
+if test -n "$PKG_CONFIG"; then
12017
+ if test -n "$NAUTILUS_EXTENSION_CFLAGS"; then
12018
+ pkg_cv_NAUTILUS_EXTENSION_CFLAGS="$NAUTILUS_EXTENSION_CFLAGS"
12020
+ if test -n "$PKG_CONFIG" && \
12021
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= \$NAUTILUS_REQUIRED\""; } >&5
12022
($PKG_CONFIG --exists --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED") 2>&5
12024
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12025
- (exit $ac_status); }; then
12026
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
12027
+ test $ac_status = 0; }; then
12028
pkg_cv_NAUTILUS_EXTENSION_CFLAGS=`$PKG_CONFIG --cflags "libnautilus-extension >= $NAUTILUS_REQUIRED" 2>/dev/null`
12033
- pkg_failed=untried
12036
+ pkg_failed=untried
12038
-if test -n "$NAUTILUS_EXTENSION_LIBS"; then
12039
- pkg_cv_NAUTILUS_EXTENSION_LIBS="$NAUTILUS_EXTENSION_LIBS"
12040
- elif test -n "$PKG_CONFIG"; then
12041
- if test -n "$PKG_CONFIG" && \
12042
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= \$NAUTILUS_REQUIRED\"") >&5
12043
+if test -n "$PKG_CONFIG"; then
12044
+ if test -n "$NAUTILUS_EXTENSION_LIBS"; then
12045
+ pkg_cv_NAUTILUS_EXTENSION_LIBS="$NAUTILUS_EXTENSION_LIBS"
12047
+ if test -n "$PKG_CONFIG" && \
12048
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= \$NAUTILUS_REQUIRED\""; } >&5
12049
($PKG_CONFIG --exists --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED") 2>&5
12051
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12052
- (exit $ac_status); }; then
12053
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
12054
+ test $ac_status = 0; }; then
12055
pkg_cv_NAUTILUS_EXTENSION_LIBS=`$PKG_CONFIG --libs "libnautilus-extension >= $NAUTILUS_REQUIRED" 2>/dev/null`
12060
- pkg_failed=untried
12063
+ pkg_failed=untried
12067
@@ -15801,14 +14147,14 @@
12068
_pkg_short_errors_supported=no
12070
if test $_pkg_short_errors_supported = yes; then
12071
- NAUTILUS_EXTENSION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED" 2>&1`
12072
+ NAUTILUS_EXTENSION_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED"`
12074
- NAUTILUS_EXTENSION_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED" 2>&1`
12075
+ NAUTILUS_EXTENSION_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED"`
12077
# Put the nasty error message in config.log where it belongs
12078
echo "$NAUTILUS_EXTENSION_PKG_ERRORS" >&5
12080
- { $as_echo "$as_me:$LINENO: result: no" >&5
12081
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12082
$as_echo "no" >&6; }
12084
elif test $pkg_failed = untried; then
12085
@@ -15816,7 +14162,7 @@
12087
NAUTILUS_EXTENSION_CFLAGS=$pkg_cv_NAUTILUS_EXTENSION_CFLAGS
12088
NAUTILUS_EXTENSION_LIBS=$pkg_cv_NAUTILUS_EXTENSION_LIBS
12089
- { $as_echo "$as_me:$LINENO: result: yes" >&5
12090
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
12091
$as_echo "yes" >&6; }
12094
@@ -15832,152 +14178,18 @@
12095
ac_with_nautilusdir=`pkg-config --variable=extensiondir libnautilus-extension`
12098
- { $as_echo "$as_me:$LINENO: installing plugin in ${ac_with_nautilusdir}" >&5
12099
+ { $as_echo "$as_me:${as_lineno-$LINENO}: installing plugin in ${ac_with_nautilusdir}" >&5
12100
$as_echo "$as_me: installing plugin in ${ac_with_nautilusdir}" >&6;}
12101
NAUTILUSDIR=${ac_with_nautilusdir}
12106
-for ac_header in locale.h
12108
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
12109
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
12110
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
12111
-$as_echo_n "checking for $ac_header... " >&6; }
12112
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
12113
- $as_echo_n "(cached) " >&6
12115
-ac_res=`eval 'as_val=${'$as_ac_Header'}
12116
- $as_echo "$as_val"'`
12117
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
12118
-$as_echo "$ac_res" >&6; }
12120
- # Is the header compilable?
12121
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
12122
-$as_echo_n "checking $ac_header usability... " >&6; }
12123
-cat >conftest.$ac_ext <<_ACEOF
12126
-cat confdefs.h >>conftest.$ac_ext
12127
-cat >>conftest.$ac_ext <<_ACEOF
12128
-/* end confdefs.h. */
12129
-$ac_includes_default
12130
-#include <$ac_header>
12132
-rm -f conftest.$ac_objext
12133
-if { (ac_try="$ac_compile"
12134
-case "(($ac_try" in
12135
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12136
- *) ac_try_echo=$ac_try;;
12138
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12139
-$as_echo "$ac_try_echo") >&5
12140
- (eval "$ac_compile") 2>conftest.er1
12142
- grep -v '^ *+' conftest.er1 >conftest.err
12143
- rm -f conftest.er1
12144
- cat conftest.err >&5
12145
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12146
- (exit $ac_status); } && {
12147
- test -z "$ac_c_werror_flag" ||
12148
- test ! -s conftest.err
12149
- } && test -s conftest.$ac_objext; then
12150
- ac_header_compiler=yes
12152
- $as_echo "$as_me: failed program was:" >&5
12153
-sed 's/^/| /' conftest.$ac_ext >&5
12155
- ac_header_compiler=no
12158
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12159
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
12160
-$as_echo "$ac_header_compiler" >&6; }
12162
-# Is the header present?
12163
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
12164
-$as_echo_n "checking $ac_header presence... " >&6; }
12165
-cat >conftest.$ac_ext <<_ACEOF
12168
-cat confdefs.h >>conftest.$ac_ext
12169
-cat >>conftest.$ac_ext <<_ACEOF
12170
-/* end confdefs.h. */
12171
-#include <$ac_header>
12173
-if { (ac_try="$ac_cpp conftest.$ac_ext"
12174
-case "(($ac_try" in
12175
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12176
- *) ac_try_echo=$ac_try;;
12178
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12179
-$as_echo "$ac_try_echo") >&5
12180
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
12182
- grep -v '^ *+' conftest.er1 >conftest.err
12183
- rm -f conftest.er1
12184
- cat conftest.err >&5
12185
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12186
- (exit $ac_status); } >/dev/null && {
12187
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
12188
- test ! -s conftest.err
12190
- ac_header_preproc=yes
12192
- $as_echo "$as_me: failed program was:" >&5
12193
-sed 's/^/| /' conftest.$ac_ext >&5
12195
- ac_header_preproc=no
12198
-rm -f conftest.err conftest.$ac_ext
12199
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
12200
-$as_echo "$ac_header_preproc" >&6; }
12202
-# So? What about this header?
12203
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
12205
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
12206
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
12207
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
12208
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
12209
- ac_header_preproc=yes
12212
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
12213
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
12214
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
12215
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
12216
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
12217
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
12218
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
12219
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
12220
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
12221
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
12222
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
12223
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
12227
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
12228
-$as_echo_n "checking for $ac_header... " >&6; }
12229
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
12230
- $as_echo_n "(cached) " >&6
12232
- eval "$as_ac_Header=\$ac_header_preproc"
12234
-ac_res=`eval 'as_val=${'$as_ac_Header'}
12235
- $as_echo "$as_val"'`
12236
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
12237
-$as_echo "$ac_res" >&6; }
12240
-as_val=`eval 'as_val=${'$as_ac_Header'}
12241
- $as_echo "$as_val"'`
12242
- if test "x$as_val" = x""yes; then
12243
+ for ac_header in locale.h
12245
+ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
12246
+if test "x$ac_cv_header_locale_h" = x""yes; then :
12247
cat >>confdefs.h <<_ACEOF
12248
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
12249
+#define HAVE_LOCALE_H 1
12253
@@ -15985,16 +14197,12 @@
12256
if test $ac_cv_header_locale_h = yes; then
12257
- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
12258
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
12259
$as_echo_n "checking for LC_MESSAGES... " >&6; }
12260
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then
12261
+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
12262
$as_echo_n "(cached) " >&6
12264
- cat >conftest.$ac_ext <<_ACEOF
12267
-cat confdefs.h >>conftest.$ac_ext
12268
-cat >>conftest.$ac_ext <<_ACEOF
12269
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12270
/* end confdefs.h. */
12271
#include <locale.h>
12273
@@ -16005,46 +14213,19 @@
12277
-rm -f conftest.$ac_objext conftest$ac_exeext
12278
-if { (ac_try="$ac_link"
12279
-case "(($ac_try" in
12280
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12281
- *) ac_try_echo=$ac_try;;
12283
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12284
-$as_echo "$ac_try_echo") >&5
12285
- (eval "$ac_link") 2>conftest.er1
12287
- grep -v '^ *+' conftest.er1 >conftest.err
12288
- rm -f conftest.er1
12289
- cat conftest.err >&5
12290
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12291
- (exit $ac_status); } && {
12292
- test -z "$ac_c_werror_flag" ||
12293
- test ! -s conftest.err
12294
- } && test -s conftest$ac_exeext && {
12295
- test "$cross_compiling" = yes ||
12296
- $as_test_x conftest$ac_exeext
12298
+if ac_fn_c_try_link "$LINENO"; then :
12299
am_cv_val_LC_MESSAGES=yes
12301
- $as_echo "$as_me: failed program was:" >&5
12302
-sed 's/^/| /' conftest.$ac_ext >&5
12304
- am_cv_val_LC_MESSAGES=no
12305
+ am_cv_val_LC_MESSAGES=no
12308
-rm -rf conftest.dSYM
12309
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12310
- conftest$ac_exeext conftest.$ac_ext
12311
+rm -f core conftest.err conftest.$ac_objext \
12312
+ conftest$ac_exeext conftest.$ac_ext
12314
-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
12315
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
12316
$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
12317
if test $am_cv_val_LC_MESSAGES = yes; then
12319
-cat >>confdefs.h <<\_ACEOF
12320
-#define HAVE_LC_MESSAGES 1
12322
+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
12326
@@ -16053,154 +14234,24 @@
12328
gt_cv_have_gettext=no
12334
- if test "${ac_cv_header_libintl_h+set}" = set; then
12335
- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
12336
-$as_echo_n "checking for libintl.h... " >&6; }
12337
-if test "${ac_cv_header_libintl_h+set}" = set; then
12338
- $as_echo_n "(cached) " >&6
12340
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
12341
-$as_echo "$ac_cv_header_libintl_h" >&6; }
12343
- # Is the header compilable?
12344
-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
12345
-$as_echo_n "checking libintl.h usability... " >&6; }
12346
-cat >conftest.$ac_ext <<_ACEOF
12349
-cat confdefs.h >>conftest.$ac_ext
12350
-cat >>conftest.$ac_ext <<_ACEOF
12351
-/* end confdefs.h. */
12352
-$ac_includes_default
12353
-#include <libintl.h>
12355
-rm -f conftest.$ac_objext
12356
-if { (ac_try="$ac_compile"
12357
-case "(($ac_try" in
12358
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12359
- *) ac_try_echo=$ac_try;;
12361
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12362
-$as_echo "$ac_try_echo") >&5
12363
- (eval "$ac_compile") 2>conftest.er1
12365
- grep -v '^ *+' conftest.er1 >conftest.err
12366
- rm -f conftest.er1
12367
- cat conftest.err >&5
12368
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12369
- (exit $ac_status); } && {
12370
- test -z "$ac_c_werror_flag" ||
12371
- test ! -s conftest.err
12372
- } && test -s conftest.$ac_objext; then
12373
- ac_header_compiler=yes
12375
- $as_echo "$as_me: failed program was:" >&5
12376
-sed 's/^/| /' conftest.$ac_ext >&5
12378
- ac_header_compiler=no
12381
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12382
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
12383
-$as_echo "$ac_header_compiler" >&6; }
12385
-# Is the header present?
12386
-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5
12387
-$as_echo_n "checking libintl.h presence... " >&6; }
12388
-cat >conftest.$ac_ext <<_ACEOF
12391
-cat confdefs.h >>conftest.$ac_ext
12392
-cat >>conftest.$ac_ext <<_ACEOF
12393
-/* end confdefs.h. */
12394
-#include <libintl.h>
12396
-if { (ac_try="$ac_cpp conftest.$ac_ext"
12397
-case "(($ac_try" in
12398
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12399
- *) ac_try_echo=$ac_try;;
12401
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12402
-$as_echo "$ac_try_echo") >&5
12403
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
12405
- grep -v '^ *+' conftest.er1 >conftest.err
12406
- rm -f conftest.er1
12407
- cat conftest.err >&5
12408
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12409
- (exit $ac_status); } >/dev/null && {
12410
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
12411
- test ! -s conftest.err
12413
- ac_header_preproc=yes
12415
- $as_echo "$as_me: failed program was:" >&5
12416
-sed 's/^/| /' conftest.$ac_ext >&5
12418
- ac_header_preproc=no
12421
-rm -f conftest.err conftest.$ac_ext
12422
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
12423
-$as_echo "$ac_header_preproc" >&6; }
12425
-# So? What about this header?
12426
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
12428
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
12429
-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
12430
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
12431
-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
12432
- ac_header_preproc=yes
12435
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
12436
-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
12437
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
12438
-$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
12439
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
12440
-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
12441
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5
12442
-$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}
12443
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
12444
-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
12445
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
12446
-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
12450
-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
12451
-$as_echo_n "checking for libintl.h... " >&6; }
12452
-if test "${ac_cv_header_libintl_h+set}" = set; then
12453
- $as_echo_n "(cached) " >&6
12455
- ac_cv_header_libintl_h=$ac_header_preproc
12457
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
12458
-$as_echo "$ac_cv_header_libintl_h" >&6; }
12461
-if test "x$ac_cv_header_libintl_h" = x""yes; then
12466
+ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
12467
+if test "x$ac_cv_header_libintl_h" = x""yes; then :
12468
gt_cv_func_dgettext_libintl="no"
12469
libintl_extra_libs=""
12472
# First check in libc
12474
- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5
12475
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
12476
$as_echo_n "checking for ngettext in libc... " >&6; }
12477
-if test "${gt_cv_func_ngettext_libc+set}" = set; then
12478
+if test "${gt_cv_func_ngettext_libc+set}" = set; then :
12479
$as_echo_n "(cached) " >&6
12481
- cat >conftest.$ac_ext <<_ACEOF
12484
-cat confdefs.h >>conftest.$ac_ext
12485
-cat >>conftest.$ac_ext <<_ACEOF
12486
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12487
/* end confdefs.h. */
12489
#include <libintl.h>
12490
@@ -16213,54 +14264,25 @@
12494
-rm -f conftest.$ac_objext conftest$ac_exeext
12495
-if { (ac_try="$ac_link"
12496
-case "(($ac_try" in
12497
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12498
- *) ac_try_echo=$ac_try;;
12500
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12501
-$as_echo "$ac_try_echo") >&5
12502
- (eval "$ac_link") 2>conftest.er1
12504
- grep -v '^ *+' conftest.er1 >conftest.err
12505
- rm -f conftest.er1
12506
- cat conftest.err >&5
12507
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12508
- (exit $ac_status); } && {
12509
- test -z "$ac_c_werror_flag" ||
12510
- test ! -s conftest.err
12511
- } && test -s conftest$ac_exeext && {
12512
- test "$cross_compiling" = yes ||
12513
- $as_test_x conftest$ac_exeext
12515
+if ac_fn_c_try_link "$LINENO"; then :
12516
gt_cv_func_ngettext_libc=yes
12518
- $as_echo "$as_me: failed program was:" >&5
12519
-sed 's/^/| /' conftest.$ac_ext >&5
12521
- gt_cv_func_ngettext_libc=no
12522
+ gt_cv_func_ngettext_libc=no
12525
-rm -rf conftest.dSYM
12526
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12527
- conftest$ac_exeext conftest.$ac_ext
12528
+rm -f core conftest.err conftest.$ac_objext \
12529
+ conftest$ac_exeext conftest.$ac_ext
12532
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
12533
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
12534
$as_echo "$gt_cv_func_ngettext_libc" >&6; }
12536
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
12537
- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
12538
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
12539
$as_echo_n "checking for dgettext in libc... " >&6; }
12540
-if test "${gt_cv_func_dgettext_libc+set}" = set; then
12541
+if test "${gt_cv_func_dgettext_libc+set}" = set; then :
12542
$as_echo_n "(cached) " >&6
12544
- cat >conftest.$ac_ext <<_ACEOF
12547
-cat confdefs.h >>conftest.$ac_ext
12548
-cat >>conftest.$ac_ext <<_ACEOF
12549
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12550
/* end confdefs.h. */
12552
#include <libintl.h>
12553
@@ -16273,141 +14295,26 @@
12557
-rm -f conftest.$ac_objext conftest$ac_exeext
12558
-if { (ac_try="$ac_link"
12559
-case "(($ac_try" in
12560
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12561
- *) ac_try_echo=$ac_try;;
12563
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12564
-$as_echo "$ac_try_echo") >&5
12565
- (eval "$ac_link") 2>conftest.er1
12567
- grep -v '^ *+' conftest.er1 >conftest.err
12568
- rm -f conftest.er1
12569
- cat conftest.err >&5
12570
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12571
- (exit $ac_status); } && {
12572
- test -z "$ac_c_werror_flag" ||
12573
- test ! -s conftest.err
12574
- } && test -s conftest$ac_exeext && {
12575
- test "$cross_compiling" = yes ||
12576
- $as_test_x conftest$ac_exeext
12578
+if ac_fn_c_try_link "$LINENO"; then :
12579
gt_cv_func_dgettext_libc=yes
12581
- $as_echo "$as_me: failed program was:" >&5
12582
-sed 's/^/| /' conftest.$ac_ext >&5
12584
- gt_cv_func_dgettext_libc=no
12585
+ gt_cv_func_dgettext_libc=no
12588
-rm -rf conftest.dSYM
12589
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12590
- conftest$ac_exeext conftest.$ac_ext
12591
+rm -f core conftest.err conftest.$ac_objext \
12592
+ conftest$ac_exeext conftest.$ac_ext
12595
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
12596
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
12597
$as_echo "$gt_cv_func_dgettext_libc" >&6; }
12600
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
12602
-for ac_func in bind_textdomain_codeset
12604
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
12605
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
12606
-$as_echo_n "checking for $ac_func... " >&6; }
12607
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
12608
- $as_echo_n "(cached) " >&6
12610
- cat >conftest.$ac_ext <<_ACEOF
12613
-cat confdefs.h >>conftest.$ac_ext
12614
-cat >>conftest.$ac_ext <<_ACEOF
12615
-/* end confdefs.h. */
12616
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
12617
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
12618
-#define $ac_func innocuous_$ac_func
12620
-/* System header to define __stub macros and hopefully few prototypes,
12621
- which can conflict with char $ac_func (); below.
12622
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
12623
- <limits.h> exists even on freestanding compilers. */
12626
-# include <limits.h>
12628
-# include <assert.h>
12633
-/* Override any GCC internal prototype to avoid an error.
12634
- Use char because int might match the return type of a GCC
12635
- builtin and then its argument prototype would still apply. */
12636
-#ifdef __cplusplus
12640
-/* The GNU C library defines this for functions which it implements
12641
- to always fail with ENOSYS. Some functions are actually named
12642
- something starting with __ and the normal name is an alias. */
12643
-#if defined __stub_$ac_func || defined __stub___$ac_func
12650
-return $ac_func ();
12655
-rm -f conftest.$ac_objext conftest$ac_exeext
12656
-if { (ac_try="$ac_link"
12657
-case "(($ac_try" in
12658
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12659
- *) ac_try_echo=$ac_try;;
12661
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12662
-$as_echo "$ac_try_echo") >&5
12663
- (eval "$ac_link") 2>conftest.er1
12665
- grep -v '^ *+' conftest.er1 >conftest.err
12666
- rm -f conftest.er1
12667
- cat conftest.err >&5
12668
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12669
- (exit $ac_status); } && {
12670
- test -z "$ac_c_werror_flag" ||
12671
- test ! -s conftest.err
12672
- } && test -s conftest$ac_exeext && {
12673
- test "$cross_compiling" = yes ||
12674
- $as_test_x conftest$ac_exeext
12676
- eval "$as_ac_var=yes"
12678
- $as_echo "$as_me: failed program was:" >&5
12679
-sed 's/^/| /' conftest.$ac_ext >&5
12681
- eval "$as_ac_var=no"
12684
-rm -rf conftest.dSYM
12685
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12686
- conftest$ac_exeext conftest.$ac_ext
12688
-ac_res=`eval 'as_val=${'$as_ac_var'}
12689
- $as_echo "$as_val"'`
12690
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
12691
-$as_echo "$ac_res" >&6; }
12692
-as_val=`eval 'as_val=${'$as_ac_var'}
12693
- $as_echo "$as_val"'`
12694
- if test "x$as_val" = x""yes; then
12695
+ for ac_func in bind_textdomain_codeset
12697
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
12698
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
12699
cat >>confdefs.h <<_ACEOF
12700
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
12701
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
12705
@@ -16422,18 +14329,14 @@
12706
|| test "$gt_cv_func_ngettext_libc" != "yes" \
12707
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
12709
- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
12710
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
12711
$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
12712
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
12713
+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
12714
$as_echo_n "(cached) " >&6
12716
ac_check_lib_save_LIBS=$LIBS
12717
LIBS="-lintl $LIBS"
12718
-cat >conftest.$ac_ext <<_ACEOF
12721
-cat confdefs.h >>conftest.$ac_ext
12722
-cat >>conftest.$ac_ext <<_ACEOF
12723
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12724
/* end confdefs.h. */
12726
/* Override any GCC internal prototype to avoid an error.
12727
@@ -16451,55 +14354,26 @@
12731
-rm -f conftest.$ac_objext conftest$ac_exeext
12732
-if { (ac_try="$ac_link"
12733
-case "(($ac_try" in
12734
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12735
- *) ac_try_echo=$ac_try;;
12737
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12738
-$as_echo "$ac_try_echo") >&5
12739
- (eval "$ac_link") 2>conftest.er1
12741
- grep -v '^ *+' conftest.er1 >conftest.err
12742
- rm -f conftest.er1
12743
- cat conftest.err >&5
12744
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12745
- (exit $ac_status); } && {
12746
- test -z "$ac_c_werror_flag" ||
12747
- test ! -s conftest.err
12748
- } && test -s conftest$ac_exeext && {
12749
- test "$cross_compiling" = yes ||
12750
- $as_test_x conftest$ac_exeext
12752
+if ac_fn_c_try_link "$LINENO"; then :
12753
ac_cv_lib_intl_bindtextdomain=yes
12755
- $as_echo "$as_me: failed program was:" >&5
12756
-sed 's/^/| /' conftest.$ac_ext >&5
12758
- ac_cv_lib_intl_bindtextdomain=no
12759
+ ac_cv_lib_intl_bindtextdomain=no
12762
-rm -rf conftest.dSYM
12763
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12764
- conftest$ac_exeext conftest.$ac_ext
12765
+rm -f core conftest.err conftest.$ac_objext \
12766
+ conftest$ac_exeext conftest.$ac_ext
12767
LIBS=$ac_check_lib_save_LIBS
12769
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
12770
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
12771
$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
12772
-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
12773
- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
12774
+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
12775
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
12776
$as_echo_n "checking for ngettext in -lintl... " >&6; }
12777
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
12778
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
12779
$as_echo_n "(cached) " >&6
12781
ac_check_lib_save_LIBS=$LIBS
12782
LIBS="-lintl $LIBS"
12783
-cat >conftest.$ac_ext <<_ACEOF
12786
-cat confdefs.h >>conftest.$ac_ext
12787
-cat >>conftest.$ac_ext <<_ACEOF
12788
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12789
/* end confdefs.h. */
12791
/* Override any GCC internal prototype to avoid an error.
12792
@@ -16517,55 +14391,26 @@
12796
-rm -f conftest.$ac_objext conftest$ac_exeext
12797
-if { (ac_try="$ac_link"
12798
-case "(($ac_try" in
12799
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12800
- *) ac_try_echo=$ac_try;;
12802
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12803
-$as_echo "$ac_try_echo") >&5
12804
- (eval "$ac_link") 2>conftest.er1
12806
- grep -v '^ *+' conftest.er1 >conftest.err
12807
- rm -f conftest.er1
12808
- cat conftest.err >&5
12809
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12810
- (exit $ac_status); } && {
12811
- test -z "$ac_c_werror_flag" ||
12812
- test ! -s conftest.err
12813
- } && test -s conftest$ac_exeext && {
12814
- test "$cross_compiling" = yes ||
12815
- $as_test_x conftest$ac_exeext
12817
+if ac_fn_c_try_link "$LINENO"; then :
12818
ac_cv_lib_intl_ngettext=yes
12820
- $as_echo "$as_me: failed program was:" >&5
12821
-sed 's/^/| /' conftest.$ac_ext >&5
12823
- ac_cv_lib_intl_ngettext=no
12824
+ ac_cv_lib_intl_ngettext=no
12827
-rm -rf conftest.dSYM
12828
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12829
- conftest$ac_exeext conftest.$ac_ext
12830
+rm -f core conftest.err conftest.$ac_objext \
12831
+ conftest$ac_exeext conftest.$ac_ext
12832
LIBS=$ac_check_lib_save_LIBS
12834
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
12835
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
12836
$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
12837
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
12838
- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
12839
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
12840
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
12841
$as_echo_n "checking for dgettext in -lintl... " >&6; }
12842
-if test "${ac_cv_lib_intl_dgettext+set}" = set; then
12843
+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
12844
$as_echo_n "(cached) " >&6
12846
ac_check_lib_save_LIBS=$LIBS
12847
LIBS="-lintl $LIBS"
12848
-cat >conftest.$ac_ext <<_ACEOF
12851
-cat confdefs.h >>conftest.$ac_ext
12852
-cat >>conftest.$ac_ext <<_ACEOF
12853
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12854
/* end confdefs.h. */
12856
/* Override any GCC internal prototype to avoid an error.
12857
@@ -16583,43 +14428,18 @@
12861
-rm -f conftest.$ac_objext conftest$ac_exeext
12862
-if { (ac_try="$ac_link"
12863
-case "(($ac_try" in
12864
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12865
- *) ac_try_echo=$ac_try;;
12867
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12868
-$as_echo "$ac_try_echo") >&5
12869
- (eval "$ac_link") 2>conftest.er1
12871
- grep -v '^ *+' conftest.er1 >conftest.err
12872
- rm -f conftest.er1
12873
- cat conftest.err >&5
12874
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12875
- (exit $ac_status); } && {
12876
- test -z "$ac_c_werror_flag" ||
12877
- test ! -s conftest.err
12878
- } && test -s conftest$ac_exeext && {
12879
- test "$cross_compiling" = yes ||
12880
- $as_test_x conftest$ac_exeext
12882
+if ac_fn_c_try_link "$LINENO"; then :
12883
ac_cv_lib_intl_dgettext=yes
12885
- $as_echo "$as_me: failed program was:" >&5
12886
-sed 's/^/| /' conftest.$ac_ext >&5
12888
- ac_cv_lib_intl_dgettext=no
12889
+ ac_cv_lib_intl_dgettext=no
12892
-rm -rf conftest.dSYM
12893
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12894
- conftest$ac_exeext conftest.$ac_ext
12895
+rm -f core conftest.err conftest.$ac_objext \
12896
+ conftest$ac_exeext conftest.$ac_ext
12897
LIBS=$ac_check_lib_save_LIBS
12899
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
12900
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
12901
$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
12902
-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
12903
+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
12904
gt_cv_func_dgettext_libintl=yes
12907
@@ -16629,22 +14449,18 @@
12910
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
12911
- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
12912
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
12913
$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
12914
- { $as_echo "$as_me:$LINENO: result: " >&5
12915
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
12917
- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
12918
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
12919
$as_echo_n "checking for ngettext in -lintl... " >&6; }
12920
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
12921
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
12922
$as_echo_n "(cached) " >&6
12924
ac_check_lib_save_LIBS=$LIBS
12925
LIBS="-lintl -liconv $LIBS"
12926
-cat >conftest.$ac_ext <<_ACEOF
12929
-cat confdefs.h >>conftest.$ac_ext
12930
-cat >>conftest.$ac_ext <<_ACEOF
12931
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12932
/* end confdefs.h. */
12934
/* Override any GCC internal prototype to avoid an error.
12935
@@ -16662,55 +14478,26 @@
12939
-rm -f conftest.$ac_objext conftest$ac_exeext
12940
-if { (ac_try="$ac_link"
12941
-case "(($ac_try" in
12942
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12943
- *) ac_try_echo=$ac_try;;
12945
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12946
-$as_echo "$ac_try_echo") >&5
12947
- (eval "$ac_link") 2>conftest.er1
12949
- grep -v '^ *+' conftest.er1 >conftest.err
12950
- rm -f conftest.er1
12951
- cat conftest.err >&5
12952
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12953
- (exit $ac_status); } && {
12954
- test -z "$ac_c_werror_flag" ||
12955
- test ! -s conftest.err
12956
- } && test -s conftest$ac_exeext && {
12957
- test "$cross_compiling" = yes ||
12958
- $as_test_x conftest$ac_exeext
12960
+if ac_fn_c_try_link "$LINENO"; then :
12961
ac_cv_lib_intl_ngettext=yes
12963
- $as_echo "$as_me: failed program was:" >&5
12964
-sed 's/^/| /' conftest.$ac_ext >&5
12966
- ac_cv_lib_intl_ngettext=no
12967
+ ac_cv_lib_intl_ngettext=no
12970
-rm -rf conftest.dSYM
12971
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12972
- conftest$ac_exeext conftest.$ac_ext
12973
+rm -f core conftest.err conftest.$ac_objext \
12974
+ conftest$ac_exeext conftest.$ac_ext
12975
LIBS=$ac_check_lib_save_LIBS
12977
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
12978
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
12979
$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
12980
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
12981
- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
12982
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
12983
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
12984
$as_echo_n "checking for dcgettext in -lintl... " >&6; }
12985
-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
12986
+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
12987
$as_echo_n "(cached) " >&6
12989
ac_check_lib_save_LIBS=$LIBS
12990
LIBS="-lintl -liconv $LIBS"
12991
-cat >conftest.$ac_ext <<_ACEOF
12994
-cat confdefs.h >>conftest.$ac_ext
12995
-cat >>conftest.$ac_ext <<_ACEOF
12996
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12997
/* end confdefs.h. */
12999
/* Override any GCC internal prototype to avoid an error.
13000
@@ -16722,166 +14509,51 @@
13005
-return dcgettext ();
13010
-rm -f conftest.$ac_objext conftest$ac_exeext
13011
-if { (ac_try="$ac_link"
13012
-case "(($ac_try" in
13013
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13014
- *) ac_try_echo=$ac_try;;
13016
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13017
-$as_echo "$ac_try_echo") >&5
13018
- (eval "$ac_link") 2>conftest.er1
13020
- grep -v '^ *+' conftest.er1 >conftest.err
13021
- rm -f conftest.er1
13022
- cat conftest.err >&5
13023
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13024
- (exit $ac_status); } && {
13025
- test -z "$ac_c_werror_flag" ||
13026
- test ! -s conftest.err
13027
- } && test -s conftest$ac_exeext && {
13028
- test "$cross_compiling" = yes ||
13029
- $as_test_x conftest$ac_exeext
13031
- ac_cv_lib_intl_dcgettext=yes
13033
- $as_echo "$as_me: failed program was:" >&5
13034
-sed 's/^/| /' conftest.$ac_ext >&5
13036
- ac_cv_lib_intl_dcgettext=no
13039
-rm -rf conftest.dSYM
13040
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13041
- conftest$ac_exeext conftest.$ac_ext
13042
-LIBS=$ac_check_lib_save_LIBS
13044
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
13045
-$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
13046
-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
13047
- gt_cv_func_dgettext_libintl=yes
13048
- libintl_extra_libs=-liconv
13060
- # If we found libintl, then check in it for bind_textdomain_codeset();
13061
- # we'll prefer libc if neither have bind_textdomain_codeset(),
13062
- # and both have dgettext and ngettext
13064
- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
13065
- glib_save_LIBS="$LIBS"
13066
- LIBS="$LIBS -lintl $libintl_extra_libs"
13067
- unset ac_cv_func_bind_textdomain_codeset
13069
-for ac_func in bind_textdomain_codeset
13071
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
13072
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
13073
-$as_echo_n "checking for $ac_func... " >&6; }
13074
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
13075
- $as_echo_n "(cached) " >&6
13077
- cat >conftest.$ac_ext <<_ACEOF
13080
-cat confdefs.h >>conftest.$ac_ext
13081
-cat >>conftest.$ac_ext <<_ACEOF
13082
-/* end confdefs.h. */
13083
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
13084
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
13085
-#define $ac_func innocuous_$ac_func
13087
-/* System header to define __stub macros and hopefully few prototypes,
13088
- which can conflict with char $ac_func (); below.
13089
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
13090
- <limits.h> exists even on freestanding compilers. */
13093
-# include <limits.h>
13095
-# include <assert.h>
13100
-/* Override any GCC internal prototype to avoid an error.
13101
- Use char because int might match the return type of a GCC
13102
- builtin and then its argument prototype would still apply. */
13103
-#ifdef __cplusplus
13107
-/* The GNU C library defines this for functions which it implements
13108
- to always fail with ENOSYS. Some functions are actually named
13109
- something starting with __ and the normal name is an alias. */
13110
-#if defined __stub_$ac_func || defined __stub___$ac_func
13117
-return $ac_func ();
13122
-rm -f conftest.$ac_objext conftest$ac_exeext
13123
-if { (ac_try="$ac_link"
13124
-case "(($ac_try" in
13125
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13126
- *) ac_try_echo=$ac_try;;
13128
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13129
-$as_echo "$ac_try_echo") >&5
13130
- (eval "$ac_link") 2>conftest.er1
13132
- grep -v '^ *+' conftest.er1 >conftest.err
13133
- rm -f conftest.er1
13134
- cat conftest.err >&5
13135
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13136
- (exit $ac_status); } && {
13137
- test -z "$ac_c_werror_flag" ||
13138
- test ! -s conftest.err
13139
- } && test -s conftest$ac_exeext && {
13140
- test "$cross_compiling" = yes ||
13141
- $as_test_x conftest$ac_exeext
13143
- eval "$as_ac_var=yes"
13145
+return dcgettext ();
13150
+if ac_fn_c_try_link "$LINENO"; then :
13151
+ ac_cv_lib_intl_dcgettext=yes
13153
- $as_echo "$as_me: failed program was:" >&5
13154
-sed 's/^/| /' conftest.$ac_ext >&5
13156
- eval "$as_ac_var=no"
13157
+ ac_cv_lib_intl_dcgettext=no
13159
+rm -f core conftest.err conftest.$ac_objext \
13160
+ conftest$ac_exeext conftest.$ac_ext
13161
+LIBS=$ac_check_lib_save_LIBS
13163
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
13164
+$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
13165
+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
13166
+ gt_cv_func_dgettext_libintl=yes
13167
+ libintl_extra_libs=-liconv
13172
-rm -rf conftest.dSYM
13173
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13174
- conftest$ac_exeext conftest.$ac_ext
13178
-ac_res=`eval 'as_val=${'$as_ac_var'}
13179
- $as_echo "$as_val"'`
13180
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
13181
-$as_echo "$ac_res" >&6; }
13182
-as_val=`eval 'as_val=${'$as_ac_var'}
13183
- $as_echo "$as_val"'`
13184
- if test "x$as_val" = x""yes; then
13189
+ # If we found libintl, then check in it for bind_textdomain_codeset();
13190
+ # we'll prefer libc if neither have bind_textdomain_codeset(),
13191
+ # and both have dgettext and ngettext
13193
+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
13194
+ glib_save_LIBS="$LIBS"
13195
+ LIBS="$LIBS -lintl $libintl_extra_libs"
13196
+ unset ac_cv_func_bind_textdomain_codeset
13197
+ for ac_func in bind_textdomain_codeset
13199
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
13200
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
13201
cat >>confdefs.h <<_ACEOF
13202
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
13203
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
13207
@@ -16911,15 +14583,13 @@
13209
if test "$gt_cv_have_gettext" = "yes"; then
13211
-cat >>confdefs.h <<\_ACEOF
13212
-#define HAVE_GETTEXT 1
13214
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
13216
# Extract the first word of "msgfmt", so it can be a program name with args.
13217
set dummy msgfmt; ac_word=$2
13218
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
13219
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13220
$as_echo_n "checking for $ac_word... " >&6; }
13221
-if test "${ac_cv_path_MSGFMT+set}" = set; then
13222
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
13223
$as_echo_n "(cached) " >&6
13226
@@ -16944,118 +14614,28 @@
13228
MSGFMT="$ac_cv_path_MSGFMT"
13229
if test "$MSGFMT" != "no"; then
13230
- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
13231
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
13232
$as_echo "$MSGFMT" >&6; }
13234
- { $as_echo "$as_me:$LINENO: result: no" >&5
13235
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13236
$as_echo "no" >&6; }
13238
if test "$MSGFMT" != "no"; then
13239
glib_save_LIBS="$LIBS"
13240
LIBS="$LIBS $INTLLIBS"
13242
-for ac_func in dcgettext
13244
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
13245
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
13246
-$as_echo_n "checking for $ac_func... " >&6; }
13247
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
13248
- $as_echo_n "(cached) " >&6
13250
- cat >conftest.$ac_ext <<_ACEOF
13253
-cat confdefs.h >>conftest.$ac_ext
13254
-cat >>conftest.$ac_ext <<_ACEOF
13255
-/* end confdefs.h. */
13256
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
13257
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
13258
-#define $ac_func innocuous_$ac_func
13260
-/* System header to define __stub macros and hopefully few prototypes,
13261
- which can conflict with char $ac_func (); below.
13262
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
13263
- <limits.h> exists even on freestanding compilers. */
13266
-# include <limits.h>
13268
-# include <assert.h>
13273
-/* Override any GCC internal prototype to avoid an error.
13274
- Use char because int might match the return type of a GCC
13275
- builtin and then its argument prototype would still apply. */
13276
-#ifdef __cplusplus
13280
-/* The GNU C library defines this for functions which it implements
13281
- to always fail with ENOSYS. Some functions are actually named
13282
- something starting with __ and the normal name is an alias. */
13283
-#if defined __stub_$ac_func || defined __stub___$ac_func
13290
-return $ac_func ();
13295
-rm -f conftest.$ac_objext conftest$ac_exeext
13296
-if { (ac_try="$ac_link"
13297
-case "(($ac_try" in
13298
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13299
- *) ac_try_echo=$ac_try;;
13301
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13302
-$as_echo "$ac_try_echo") >&5
13303
- (eval "$ac_link") 2>conftest.er1
13305
- grep -v '^ *+' conftest.er1 >conftest.err
13306
- rm -f conftest.er1
13307
- cat conftest.err >&5
13308
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13309
- (exit $ac_status); } && {
13310
- test -z "$ac_c_werror_flag" ||
13311
- test ! -s conftest.err
13312
- } && test -s conftest$ac_exeext && {
13313
- test "$cross_compiling" = yes ||
13314
- $as_test_x conftest$ac_exeext
13316
- eval "$as_ac_var=yes"
13318
- $as_echo "$as_me: failed program was:" >&5
13319
-sed 's/^/| /' conftest.$ac_ext >&5
13321
- eval "$as_ac_var=no"
13324
-rm -rf conftest.dSYM
13325
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13326
- conftest$ac_exeext conftest.$ac_ext
13328
-ac_res=`eval 'as_val=${'$as_ac_var'}
13329
- $as_echo "$as_val"'`
13330
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
13331
-$as_echo "$ac_res" >&6; }
13332
-as_val=`eval 'as_val=${'$as_ac_var'}
13333
- $as_echo "$as_val"'`
13334
- if test "x$as_val" = x""yes; then
13335
+ for ac_func in dcgettext
13337
+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
13338
+if test "x$ac_cv_func_dcgettext" = x""yes; then :
13339
cat >>confdefs.h <<_ACEOF
13340
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
13341
+#define HAVE_DCGETTEXT 1
13348
- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
13349
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
13350
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
13351
cat >conftest.foo <<_ACEOF
13353
@@ -17070,14 +14650,14 @@
13354
"Content-Transfer-Encoding: 8bit\n"
13357
-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
13358
+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
13359
($MSGFMT -c -o /dev/null conftest.foo) 2>&5
13361
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13362
- (exit $ac_status); }; then
13363
- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
13364
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13365
+ test $ac_status = 0; }; then
13366
+ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13367
$as_echo "yes" >&6; }
13368
-else { $as_echo "$as_me:$LINENO: result: no" >&5
13369
+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13370
$as_echo "no" >&6; }
13371
echo "$as_me: failed input was:" >&5
13372
sed 's/^/| /' conftest.foo >&5
13373
@@ -17085,9 +14665,9 @@
13375
# Extract the first word of "gmsgfmt", so it can be a program name with args.
13376
set dummy gmsgfmt; ac_word=$2
13377
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
13378
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13379
$as_echo_n "checking for $ac_word... " >&6; }
13380
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
13381
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
13382
$as_echo_n "(cached) " >&6
13385
@@ -17100,14 +14680,14 @@
13388
test -z "$as_dir" && as_dir=.
13389
- for ac_exec_ext in '' $ac_executable_extensions; do
13390
+ for ac_exec_ext in '' $ac_executable_extensions; do
13391
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13392
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
13393
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
13394
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13402
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
13403
@@ -17116,19 +14696,19 @@
13405
GMSGFMT=$ac_cv_path_GMSGFMT
13406
if test -n "$GMSGFMT"; then
13407
- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
13408
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
13409
$as_echo "$GMSGFMT" >&6; }
13411
- { $as_echo "$as_me:$LINENO: result: no" >&5
13412
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13413
$as_echo "no" >&6; }
13417
# Extract the first word of "xgettext", so it can be a program name with args.
13418
set dummy xgettext; ac_word=$2
13419
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
13420
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13421
$as_echo_n "checking for $ac_word... " >&6; }
13422
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
13423
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
13424
$as_echo_n "(cached) " >&6
13426
case "$XGETTEXT" in
13427
@@ -17153,18 +14733,14 @@
13429
XGETTEXT="$ac_cv_path_XGETTEXT"
13430
if test "$XGETTEXT" != ":"; then
13431
- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
13432
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
13433
$as_echo "$XGETTEXT" >&6; }
13435
- { $as_echo "$as_me:$LINENO: result: no" >&5
13436
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13437
$as_echo "no" >&6; }
13440
- cat >conftest.$ac_ext <<_ACEOF
13443
-cat confdefs.h >>conftest.$ac_ext
13444
-cat >>conftest.$ac_ext <<_ACEOF
13445
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13446
/* end confdefs.h. */
13449
@@ -17176,121 +14752,14 @@
13453
-rm -f conftest.$ac_objext conftest$ac_exeext
13454
-if { (ac_try="$ac_link"
13455
-case "(($ac_try" in
13456
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13457
- *) ac_try_echo=$ac_try;;
13459
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13460
-$as_echo "$ac_try_echo") >&5
13461
- (eval "$ac_link") 2>conftest.er1
13463
- grep -v '^ *+' conftest.er1 >conftest.err
13464
- rm -f conftest.er1
13465
- cat conftest.err >&5
13466
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13467
- (exit $ac_status); } && {
13468
- test -z "$ac_c_werror_flag" ||
13469
- test ! -s conftest.err
13470
- } && test -s conftest$ac_exeext && {
13471
- test "$cross_compiling" = yes ||
13472
- $as_test_x conftest$ac_exeext
13474
+if ac_fn_c_try_link "$LINENO"; then :
13478
- $as_echo "$as_me: failed program was:" >&5
13479
-sed 's/^/| /' conftest.$ac_ext >&5
13484
- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
13485
-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
13486
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
13487
- $as_echo_n "(cached) " >&6
13489
- cat >conftest.$ac_ext <<_ACEOF
13492
-cat confdefs.h >>conftest.$ac_ext
13493
-cat >>conftest.$ac_ext <<_ACEOF
13494
-/* end confdefs.h. */
13495
-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
13496
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
13497
-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
13499
-/* System header to define __stub macros and hopefully few prototypes,
13500
- which can conflict with char bind_textdomain_codeset (); below.
13501
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
13502
- <limits.h> exists even on freestanding compilers. */
13505
-# include <limits.h>
13507
-# include <assert.h>
13510
-#undef bind_textdomain_codeset
13512
-/* Override any GCC internal prototype to avoid an error.
13513
- Use char because int might match the return type of a GCC
13514
- builtin and then its argument prototype would still apply. */
13515
-#ifdef __cplusplus
13518
-char bind_textdomain_codeset ();
13519
-/* The GNU C library defines this for functions which it implements
13520
- to always fail with ENOSYS. Some functions are actually named
13521
- something starting with __ and the normal name is an alias. */
13522
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
13529
-return bind_textdomain_codeset ();
13534
-rm -f conftest.$ac_objext conftest$ac_exeext
13535
-if { (ac_try="$ac_link"
13536
-case "(($ac_try" in
13537
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13538
- *) ac_try_echo=$ac_try;;
13540
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13541
-$as_echo "$ac_try_echo") >&5
13542
- (eval "$ac_link") 2>conftest.er1
13544
- grep -v '^ *+' conftest.er1 >conftest.err
13545
- rm -f conftest.er1
13546
- cat conftest.err >&5
13547
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13548
- (exit $ac_status); } && {
13549
- test -z "$ac_c_werror_flag" ||
13550
- test ! -s conftest.err
13551
- } && test -s conftest$ac_exeext && {
13552
- test "$cross_compiling" = yes ||
13553
- $as_test_x conftest$ac_exeext
13555
- ac_cv_func_bind_textdomain_codeset=yes
13557
- $as_echo "$as_me: failed program was:" >&5
13558
-sed 's/^/| /' conftest.$ac_ext >&5
13560
- ac_cv_func_bind_textdomain_codeset=no
13563
-rm -rf conftest.dSYM
13564
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13565
- conftest$ac_exeext conftest.$ac_ext
13567
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
13568
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
13569
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
13570
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
13571
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
13575
@@ -17305,10 +14774,8 @@
13580
-rm -rf conftest.dSYM
13581
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13582
- conftest$ac_exeext conftest.$ac_ext
13583
+rm -f core conftest.err conftest.$ac_objext \
13584
+ conftest$ac_exeext conftest.$ac_ext
13585
LIBS="$glib_save_LIBS"
13588
@@ -17322,9 +14789,7 @@
13590
if test "$gt_cv_have_gettext" = "yes" ; then
13592
-cat >>confdefs.h <<\_ACEOF
13593
-#define ENABLE_NLS 1
13595
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
13599
@@ -17332,7 +14797,7 @@
13600
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
13603
- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
13604
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
13605
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
13608
@@ -17365,7 +14830,7 @@
13609
if test "x$ALL_LINGUAS" = "x"; then
13612
- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
13613
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
13614
$as_echo_n "checking for catalogs to be installed... " >&6; }
13616
for presentlang in $ALL_LINGUAS; do
13617
@@ -17390,7 +14855,7 @@
13620
LINGUAS=$NEW_LINGUAS
13621
- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
13622
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
13623
$as_echo "$LINGUAS" >&6; }
13626
@@ -17457,7 +14922,7 @@
13627
LIBISOFS_REQUIRED=0.6.4
13629
# Check whether --enable-libburnia was given.
13630
-if test "${enable_libburnia+set}" = set; then
13631
+if test "${enable_libburnia+set}" = set; then :
13632
enableval=$enable_libburnia; enable_libburnia=$enableval
13634
enable_libburnia="yes"
13635
@@ -17467,40 +14932,44 @@
13636
if test x"$enable_libburnia" = "xyes"; then
13639
-{ $as_echo "$as_me:$LINENO: checking for LIBBURNIA" >&5
13640
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBBURNIA" >&5
13641
$as_echo_n "checking for LIBBURNIA... " >&6; }
13643
-if test -n "$LIBBURNIA_CFLAGS"; then
13644
- pkg_cv_LIBBURNIA_CFLAGS="$LIBBURNIA_CFLAGS"
13645
- elif test -n "$PKG_CONFIG"; then
13646
- if test -n "$PKG_CONFIG" && \
13647
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libburn-1 >= \$LIBBURN_REQUIRED libisofs-1 >= \$LIBISOFS_REQUIRED\"") >&5
13648
+if test -n "$PKG_CONFIG"; then
13649
+ if test -n "$LIBBURNIA_CFLAGS"; then
13650
+ pkg_cv_LIBBURNIA_CFLAGS="$LIBBURNIA_CFLAGS"
13652
+ if test -n "$PKG_CONFIG" && \
13653
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libburn-1 >= \$LIBBURN_REQUIRED libisofs-1 >= \$LIBISOFS_REQUIRED\""; } >&5
13654
($PKG_CONFIG --exists --print-errors "libburn-1 >= $LIBBURN_REQUIRED libisofs-1 >= $LIBISOFS_REQUIRED") 2>&5
13656
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13657
- (exit $ac_status); }; then
13658
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13659
+ test $ac_status = 0; }; then
13660
pkg_cv_LIBBURNIA_CFLAGS=`$PKG_CONFIG --cflags "libburn-1 >= $LIBBURN_REQUIRED libisofs-1 >= $LIBISOFS_REQUIRED" 2>/dev/null`
13665
- pkg_failed=untried
13668
+ pkg_failed=untried
13670
-if test -n "$LIBBURNIA_LIBS"; then
13671
- pkg_cv_LIBBURNIA_LIBS="$LIBBURNIA_LIBS"
13672
- elif test -n "$PKG_CONFIG"; then
13673
- if test -n "$PKG_CONFIG" && \
13674
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libburn-1 >= \$LIBBURN_REQUIRED libisofs-1 >= \$LIBISOFS_REQUIRED\"") >&5
13675
+if test -n "$PKG_CONFIG"; then
13676
+ if test -n "$LIBBURNIA_LIBS"; then
13677
+ pkg_cv_LIBBURNIA_LIBS="$LIBBURNIA_LIBS"
13679
+ if test -n "$PKG_CONFIG" && \
13680
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libburn-1 >= \$LIBBURN_REQUIRED libisofs-1 >= \$LIBISOFS_REQUIRED\""; } >&5
13681
($PKG_CONFIG --exists --print-errors "libburn-1 >= $LIBBURN_REQUIRED libisofs-1 >= $LIBISOFS_REQUIRED") 2>&5
13683
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13684
- (exit $ac_status); }; then
13685
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13686
+ test $ac_status = 0; }; then
13687
pkg_cv_LIBBURNIA_LIBS=`$PKG_CONFIG --libs "libburn-1 >= $LIBBURN_REQUIRED libisofs-1 >= $LIBISOFS_REQUIRED" 2>/dev/null`
13692
- pkg_failed=untried
13695
+ pkg_failed=untried
13699
@@ -17513,14 +14982,14 @@
13700
_pkg_short_errors_supported=no
13702
if test $_pkg_short_errors_supported = yes; then
13703
- LIBBURNIA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libburn-1 >= $LIBBURN_REQUIRED libisofs-1 >= $LIBISOFS_REQUIRED" 2>&1`
13704
+ LIBBURNIA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libburn-1 >= $LIBBURN_REQUIRED libisofs-1 >= $LIBISOFS_REQUIRED"`
13706
- LIBBURNIA_PKG_ERRORS=`$PKG_CONFIG --print-errors "libburn-1 >= $LIBBURN_REQUIRED libisofs-1 >= $LIBISOFS_REQUIRED" 2>&1`
13707
+ LIBBURNIA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libburn-1 >= $LIBBURN_REQUIRED libisofs-1 >= $LIBISOFS_REQUIRED"`
13709
# Put the nasty error message in config.log where it belongs
13710
echo "$LIBBURNIA_PKG_ERRORS" >&5
13712
- { $as_echo "$as_me:$LINENO: result: no" >&5
13713
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13714
$as_echo "no" >&6; }
13716
elif test $pkg_failed = untried; then
13717
@@ -17528,7 +14997,7 @@
13719
LIBBURNIA_CFLAGS=$pkg_cv_LIBBURNIA_CFLAGS
13720
LIBBURNIA_LIBS=$pkg_cv_LIBBURNIA_LIBS
13721
- { $as_echo "$as_me:$LINENO: result: yes" >&5
13722
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13723
$as_echo "yes" >&6; }
13724
build_libburnia=yes
13726
@@ -17543,9 +15012,7 @@
13727
BRASERO_LIBBURNIA_CFLAGS="$LIBBURNIA_CFLAGS"
13728
BRASERO_LIBBURNIA_LIBS="$LIBBURNIA_LIBS"
13730
-cat >>confdefs.h <<\_ACEOF
13731
-#define BUILD_LIBBURNIA 1
13733
+$as_echo "#define BUILD_LIBBURNIA 1" >>confdefs.h
13736
if test x"$build_libburnia" = "xyes"; then
13737
@@ -17558,7 +15025,7 @@
13740
# Check whether --enable-cdrtools was given.
13741
-if test "${enable_cdrtools+set}" = set; then
13742
+if test "${enable_cdrtools+set}" = set; then :
13743
enableval=$enable_cdrtools; build_cdrtools=$enableval
13745
build_cdrtools="yes"
13746
@@ -17567,9 +15034,7 @@
13748
if test x"$build_cdrtools" = "xyes"; then
13750
-cat >>confdefs.h <<\_ACEOF
13751
-#define BUILD_CDRTOOLS 1
13753
+$as_echo "#define BUILD_CDRTOOLS 1" >>confdefs.h
13756
build_cdrtools="no"
13757
@@ -17584,7 +15049,7 @@
13760
# Check whether --enable-cdrdao was given.
13761
-if test "${enable_cdrdao+set}" = set; then
13762
+if test "${enable_cdrdao+set}" = set; then :
13763
enableval=$enable_cdrdao; build_cdrdao=$enableval
13766
@@ -17593,9 +15058,7 @@
13768
if test x"$build_cdrdao" = "xyes"; then
13770
-cat >>confdefs.h <<\_ACEOF
13771
-#define BUILD_CDRDAO 1
13773
+$as_echo "#define BUILD_CDRDAO 1" >>confdefs.h
13777
@@ -17610,7 +15073,7 @@
13780
# Check whether --enable-cdrkit was given.
13781
-if test "${enable_cdrkit+set}" = set; then
13782
+if test "${enable_cdrkit+set}" = set; then :
13783
enableval=$enable_cdrkit; build_cdrkit=$enableval
13786
@@ -17619,9 +15082,7 @@
13788
if test x"$build_cdrkit" = "xyes"; then
13790
-cat >>confdefs.h <<\_ACEOF
13791
-#define BUILD_CDRKIT 1
13793
+$as_echo "#define BUILD_CDRKIT 1" >>confdefs.h
13797
@@ -17636,7 +15097,7 @@
13800
# Check whether --enable-growisofs was given.
13801
-if test "${enable_growisofs+set}" = set; then
13802
+if test "${enable_growisofs+set}" = set; then :
13803
enableval=$enable_growisofs; build_growisofs=$enableval
13805
build_growisofs="yes"
13806
@@ -17645,9 +15106,7 @@
13808
if test x"$build_growisofs" = "xyes"; then
13810
-cat >>confdefs.h <<\_ACEOF
13811
-#define BUILD_GROWISOFS 1
13813
+$as_echo "#define BUILD_GROWISOFS 1" >>confdefs.h
13816
build_growisofs="no"
13817
@@ -17665,11 +15124,127 @@
3897
@@ -15225,6 +15118,121 @@
13937
4016
BEAGLE_REQUIRED=0.3.0
13938
4017
TRACKER_REQUIRED=0.8.0
13940
# Check whether --enable-search was given.
13941
-if test "${enable_search+set}" = set; then
13942
+if test "${enable_search+set}" = set; then :
13943
enableval=$enable_search; case "$enableval" in
13944
"auto") enable_search="yes" ;;
13945
"yes") enable_search="yes" ;;
13946
@@ -17686,40 +15261,44 @@
13947
if test x"$enable_search" = "xtracker"; then
13950
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_SEARCH" >&5
13951
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_SEARCH" >&5
13952
$as_echo_n "checking for BRASERO_SEARCH... " >&6; }
13954
-if test -n "$BRASERO_SEARCH_CFLAGS"; then
13955
- pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
13956
- elif test -n "$PKG_CONFIG"; then
13957
- if test -n "$PKG_CONFIG" && \
13958
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\"") >&5
13959
+if test -n "$PKG_CONFIG"; then
13960
+ if test -n "$BRASERO_SEARCH_CFLAGS"; then
13961
+ pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
13963
+ if test -n "$PKG_CONFIG" && \
13964
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\""; } >&5
13965
($PKG_CONFIG --exists --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED") 2>&5
13967
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13968
- (exit $ac_status); }; then
13969
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13970
+ test $ac_status = 0; }; then
13971
pkg_cv_BRASERO_SEARCH_CFLAGS=`$PKG_CONFIG --cflags "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>/dev/null`
13976
- pkg_failed=untried
13979
+ pkg_failed=untried
13981
-if test -n "$BRASERO_SEARCH_LIBS"; then
13982
- pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
13983
- elif test -n "$PKG_CONFIG"; then
13984
- if test -n "$PKG_CONFIG" && \
13985
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\"") >&5
13986
+if test -n "$PKG_CONFIG"; then
13987
+ if test -n "$BRASERO_SEARCH_LIBS"; then
13988
+ pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
13990
+ if test -n "$PKG_CONFIG" && \
13991
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\""; } >&5
13992
($PKG_CONFIG --exists --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED") 2>&5
13994
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13995
- (exit $ac_status); }; then
13996
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13997
+ test $ac_status = 0; }; then
13998
pkg_cv_BRASERO_SEARCH_LIBS=`$PKG_CONFIG --libs "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>/dev/null`
14003
- pkg_failed=untried
14006
+ pkg_failed=untried
14010
@@ -17732,25 +15311,14 @@
14011
_pkg_short_errors_supported=no
14013
if test $_pkg_short_errors_supported = yes; then
14014
- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>&1`
14015
+ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED"`
14017
- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>&1`
14018
+ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED"`
14020
# Put the nasty error message in config.log where it belongs
14021
echo "$BRASERO_SEARCH_PKG_ERRORS" >&5
14023
- { { $as_echo "$as_me:$LINENO: error: Package requirements (tracker-client-0.8 >= $TRACKER_REQUIRED) were not met:
14025
-$BRASERO_SEARCH_PKG_ERRORS
14027
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
14028
-installed software in a non-standard prefix.
14030
-Alternatively, you may set the environment variables BRASERO_SEARCH_CFLAGS
14031
-and BRASERO_SEARCH_LIBS to avoid the need to call pkg-config.
14032
-See the pkg-config man page for more details.
14034
-$as_echo "$as_me: error: Package requirements (tracker-client-0.8 >= $TRACKER_REQUIRED) were not met:
14035
+ as_fn_error "Package requirements (tracker-client-0.8 >= $TRACKER_REQUIRED) were not met:
14037
$BRASERO_SEARCH_PKG_ERRORS
14039
@@ -17760,22 +15328,11 @@
14040
Alternatively, you may set the environment variables BRASERO_SEARCH_CFLAGS
14041
and BRASERO_SEARCH_LIBS to avoid the need to call pkg-config.
14042
See the pkg-config man page for more details.
14044
- { (exit 1); exit 1; }; }
14046
elif test $pkg_failed = untried; then
14047
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
14048
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
14049
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
14050
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
14051
-is in your PATH or set the PKG_CONFIG environment variable to the full
14052
-path to pkg-config.
14054
-Alternatively, you may set the environment variables BRASERO_SEARCH_CFLAGS
14055
-and BRASERO_SEARCH_LIBS to avoid the need to call pkg-config.
14056
-See the pkg-config man page for more details.
14058
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14059
-See \`config.log' for more details." >&5
14060
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
14061
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
14062
is in your PATH or set the PKG_CONFIG environment variable to the full
14063
path to pkg-config.
14065
@@ -17784,24 +15341,19 @@
14066
See the pkg-config man page for more details.
14068
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14069
-See \`config.log' for more details." >&2;}
14070
- { (exit 1); exit 1; }; }; }
14071
+See \`config.log' for more details." "$LINENO" 5; }
14073
BRASERO_SEARCH_CFLAGS=$pkg_cv_BRASERO_SEARCH_CFLAGS
14074
BRASERO_SEARCH_LIBS=$pkg_cv_BRASERO_SEARCH_LIBS
14075
- { $as_echo "$as_me:$LINENO: result: yes" >&5
14076
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14077
$as_echo "yes" >&6; }
14081
-cat >>confdefs.h <<\_ACEOF
14082
-#define BUILD_SEARCH 1
14084
+$as_echo "#define BUILD_SEARCH 1" >>confdefs.h
14087
-cat >>confdefs.h <<\_ACEOF
14088
-#define BUILD_TRACKER 1
14090
+$as_echo "#define BUILD_TRACKER 1" >>confdefs.h
14094
@@ -17811,40 +15363,44 @@
14095
elif test x"$enable_search" = "xbeagle"; then
14098
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_SEARCH" >&5
14099
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_SEARCH" >&5
14100
$as_echo_n "checking for BRASERO_SEARCH... " >&6; }
14102
-if test -n "$BRASERO_SEARCH_CFLAGS"; then
14103
- pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
14104
- elif test -n "$PKG_CONFIG"; then
14105
- if test -n "$PKG_CONFIG" && \
14106
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\"") >&5
14107
+if test -n "$PKG_CONFIG"; then
14108
+ if test -n "$BRASERO_SEARCH_CFLAGS"; then
14109
+ pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
14111
+ if test -n "$PKG_CONFIG" && \
14112
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\""; } >&5
14113
($PKG_CONFIG --exists --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED") 2>&5
14115
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14116
- (exit $ac_status); }; then
14117
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14118
+ test $ac_status = 0; }; then
14119
pkg_cv_BRASERO_SEARCH_CFLAGS=`$PKG_CONFIG --cflags "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>/dev/null`
14124
- pkg_failed=untried
14127
+ pkg_failed=untried
14129
-if test -n "$BRASERO_SEARCH_LIBS"; then
14130
- pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
14131
- elif test -n "$PKG_CONFIG"; then
14132
- if test -n "$PKG_CONFIG" && \
14133
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\"") >&5
14134
+if test -n "$PKG_CONFIG"; then
14135
+ if test -n "$BRASERO_SEARCH_LIBS"; then
14136
+ pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
14138
+ if test -n "$PKG_CONFIG" && \
14139
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\""; } >&5
14140
($PKG_CONFIG --exists --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED") 2>&5
14142
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14143
- (exit $ac_status); }; then
14144
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14145
+ test $ac_status = 0; }; then
14146
pkg_cv_BRASERO_SEARCH_LIBS=`$PKG_CONFIG --libs "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>/dev/null`
14151
- pkg_failed=untried
14154
+ pkg_failed=untried
14158
@@ -17857,25 +15413,14 @@
14159
_pkg_short_errors_supported=no
14161
if test $_pkg_short_errors_supported = yes; then
14162
- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>&1`
14163
+ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED"`
14165
- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>&1`
14166
+ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED"`
14168
# Put the nasty error message in config.log where it belongs
14169
echo "$BRASERO_SEARCH_PKG_ERRORS" >&5
14171
- { { $as_echo "$as_me:$LINENO: error: Package requirements (libbeagle-1.0 >= $BEAGLE_REQUIRED) were not met:
14173
-$BRASERO_SEARCH_PKG_ERRORS
14175
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
14176
-installed software in a non-standard prefix.
14178
-Alternatively, you may set the environment variables BRASERO_SEARCH_CFLAGS
14179
-and BRASERO_SEARCH_LIBS to avoid the need to call pkg-config.
14180
-See the pkg-config man page for more details.
14182
-$as_echo "$as_me: error: Package requirements (libbeagle-1.0 >= $BEAGLE_REQUIRED) were not met:
14183
+ as_fn_error "Package requirements (libbeagle-1.0 >= $BEAGLE_REQUIRED) were not met:
14185
$BRASERO_SEARCH_PKG_ERRORS
14187
@@ -17885,22 +15430,11 @@
14188
Alternatively, you may set the environment variables BRASERO_SEARCH_CFLAGS
14189
and BRASERO_SEARCH_LIBS to avoid the need to call pkg-config.
14190
See the pkg-config man page for more details.
14192
- { (exit 1); exit 1; }; }
14194
elif test $pkg_failed = untried; then
14195
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
14196
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
14197
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
14198
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
14199
-is in your PATH or set the PKG_CONFIG environment variable to the full
14200
-path to pkg-config.
14202
-Alternatively, you may set the environment variables BRASERO_SEARCH_CFLAGS
14203
-and BRASERO_SEARCH_LIBS to avoid the need to call pkg-config.
14204
-See the pkg-config man page for more details.
14206
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14207
-See \`config.log' for more details." >&5
14208
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
14209
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
14210
is in your PATH or set the PKG_CONFIG environment variable to the full
14211
path to pkg-config.
14213
@@ -17909,24 +15443,19 @@
14214
See the pkg-config man page for more details.
14216
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14217
-See \`config.log' for more details." >&2;}
14218
- { (exit 1); exit 1; }; }; }
14219
+See \`config.log' for more details." "$LINENO" 5; }
14221
BRASERO_SEARCH_CFLAGS=$pkg_cv_BRASERO_SEARCH_CFLAGS
14222
BRASERO_SEARCH_LIBS=$pkg_cv_BRASERO_SEARCH_LIBS
14223
- { $as_echo "$as_me:$LINENO: result: yes" >&5
14224
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14225
$as_echo "yes" >&6; }
14229
-cat >>confdefs.h <<\_ACEOF
14230
-#define BUILD_SEARCH 1
14232
+$as_echo "#define BUILD_SEARCH 1" >>confdefs.h
14235
-cat >>confdefs.h <<\_ACEOF
14236
-#define BUILD_BEAGLE 1
14238
+$as_echo "#define BUILD_BEAGLE 1" >>confdefs.h
14242
@@ -17936,40 +15465,44 @@
14243
elif test x"$enable_search" = "xyes"; then
14246
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_SEARCH" >&5
14247
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_SEARCH" >&5
14248
$as_echo_n "checking for BRASERO_SEARCH... " >&6; }
14250
-if test -n "$BRASERO_SEARCH_CFLAGS"; then
14251
- pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
14252
- elif test -n "$PKG_CONFIG"; then
14253
- if test -n "$PKG_CONFIG" && \
14254
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\"") >&5
14255
+if test -n "$PKG_CONFIG"; then
14256
+ if test -n "$BRASERO_SEARCH_CFLAGS"; then
14257
+ pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
14259
+ if test -n "$PKG_CONFIG" && \
14260
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\""; } >&5
14261
($PKG_CONFIG --exists --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED") 2>&5
14263
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14264
- (exit $ac_status); }; then
14265
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14266
+ test $ac_status = 0; }; then
14267
pkg_cv_BRASERO_SEARCH_CFLAGS=`$PKG_CONFIG --cflags "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>/dev/null`
14272
- pkg_failed=untried
14275
+ pkg_failed=untried
14277
-if test -n "$BRASERO_SEARCH_LIBS"; then
14278
- pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
14279
- elif test -n "$PKG_CONFIG"; then
14280
- if test -n "$PKG_CONFIG" && \
14281
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\"") >&5
14282
+if test -n "$PKG_CONFIG"; then
14283
+ if test -n "$BRASERO_SEARCH_LIBS"; then
14284
+ pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
14286
+ if test -n "$PKG_CONFIG" && \
14287
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\""; } >&5
14288
($PKG_CONFIG --exists --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED") 2>&5
14290
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14291
- (exit $ac_status); }; then
14292
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14293
+ test $ac_status = 0; }; then
14294
pkg_cv_BRASERO_SEARCH_LIBS=`$PKG_CONFIG --libs "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>/dev/null`
14299
- pkg_failed=untried
14302
+ pkg_failed=untried
14306
@@ -17982,14 +15515,14 @@
14307
_pkg_short_errors_supported=no
14309
if test $_pkg_short_errors_supported = yes; then
14310
- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>&1`
14311
+ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED"`
14313
- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>&1`
14314
+ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED"`
14316
# Put the nasty error message in config.log where it belongs
14317
echo "$BRASERO_SEARCH_PKG_ERRORS" >&5
14319
- { $as_echo "$as_me:$LINENO: result: no" >&5
14320
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14321
$as_echo "no" >&6; }
14323
elif test $pkg_failed = untried; then
14324
@@ -17997,20 +15530,16 @@
14326
BRASERO_SEARCH_CFLAGS=$pkg_cv_BRASERO_SEARCH_CFLAGS
14327
BRASERO_SEARCH_LIBS=$pkg_cv_BRASERO_SEARCH_LIBS
14328
- { $as_echo "$as_me:$LINENO: result: yes" >&5
14329
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14330
$as_echo "yes" >&6; }
14333
if test x"$build_search" = "xyes"; then
14335
-cat >>confdefs.h <<\_ACEOF
14336
-#define BUILD_SEARCH 1
14338
+$as_echo "#define BUILD_SEARCH 1" >>confdefs.h
14341
-cat >>confdefs.h <<\_ACEOF
14342
-#define BUILD_TRACKER 1
14344
+$as_echo "#define BUILD_TRACKER 1" >>confdefs.h
14348
@@ -18021,40 +15550,44 @@
14352
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_SEARCH" >&5
14353
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_SEARCH" >&5
14354
$as_echo_n "checking for BRASERO_SEARCH... " >&6; }
14356
-if test -n "$BRASERO_SEARCH_CFLAGS"; then
14357
- pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
14358
- elif test -n "$PKG_CONFIG"; then
14359
- if test -n "$PKG_CONFIG" && \
14360
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\"") >&5
14361
+if test -n "$PKG_CONFIG"; then
14362
+ if test -n "$BRASERO_SEARCH_CFLAGS"; then
14363
+ pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
14365
+ if test -n "$PKG_CONFIG" && \
14366
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\""; } >&5
14367
($PKG_CONFIG --exists --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED") 2>&5
14369
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14370
- (exit $ac_status); }; then
14371
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14372
+ test $ac_status = 0; }; then
14373
pkg_cv_BRASERO_SEARCH_CFLAGS=`$PKG_CONFIG --cflags "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>/dev/null`
14378
- pkg_failed=untried
14381
+ pkg_failed=untried
14383
-if test -n "$BRASERO_SEARCH_LIBS"; then
14384
- pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
14385
- elif test -n "$PKG_CONFIG"; then
14386
- if test -n "$PKG_CONFIG" && \
14387
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\"") >&5
14388
+if test -n "$PKG_CONFIG"; then
14389
+ if test -n "$BRASERO_SEARCH_LIBS"; then
14390
+ pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
14392
+ if test -n "$PKG_CONFIG" && \
14393
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\""; } >&5
14394
($PKG_CONFIG --exists --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED") 2>&5
14396
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14397
- (exit $ac_status); }; then
14398
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14399
+ test $ac_status = 0; }; then
14400
pkg_cv_BRASERO_SEARCH_LIBS=`$PKG_CONFIG --libs "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>/dev/null`
14405
- pkg_failed=untried
14408
+ pkg_failed=untried
14412
@@ -18067,14 +15600,14 @@
14413
_pkg_short_errors_supported=no
14415
if test $_pkg_short_errors_supported = yes; then
14416
- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>&1`
14417
+ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED"`
14419
- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>&1`
14420
+ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED"`
14422
# Put the nasty error message in config.log where it belongs
14423
echo "$BRASERO_SEARCH_PKG_ERRORS" >&5
14425
- { $as_echo "$as_me:$LINENO: result: no" >&5
14426
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14427
$as_echo "no" >&6; }
14429
elif test $pkg_failed = untried; then
14430
@@ -18082,20 +15615,16 @@
14432
BRASERO_SEARCH_CFLAGS=$pkg_cv_BRASERO_SEARCH_CFLAGS
14433
BRASERO_SEARCH_LIBS=$pkg_cv_BRASERO_SEARCH_LIBS
14434
- { $as_echo "$as_me:$LINENO: result: yes" >&5
14435
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14436
$as_echo "yes" >&6; }
14439
if test x"$build_search" = "xyes"; then
14441
-cat >>confdefs.h <<\_ACEOF
14442
-#define BUILD_SEARCH 1
14444
+$as_echo "#define BUILD_SEARCH 1" >>confdefs.h
14447
-cat >>confdefs.h <<\_ACEOF
14448
-#define BUILD_BEAGLE 1
14450
+$as_echo "#define BUILD_BEAGLE 1" >>confdefs.h
14454
@@ -18137,7 +15666,7 @@
14455
TOTEM_REQUIRED=2.29.1
14457
# Check whether --enable-playlist was given.
14458
-if test "${enable_playlist+set}" = set; then
14459
+if test "${enable_playlist+set}" = set; then :
14460
enableval=$enable_playlist; enable_playlist=$enableval
14462
enable_playlist="yes"
14463
@@ -18147,40 +15676,44 @@
14464
if test x"$enable_playlist" = "xyes"; then
14467
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_PL_PARSER" >&5
14468
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_PL_PARSER" >&5
14469
$as_echo_n "checking for BRASERO_PL_PARSER... " >&6; }
14471
-if test -n "$BRASERO_PL_PARSER_CFLAGS"; then
14472
- pkg_cv_BRASERO_PL_PARSER_CFLAGS="$BRASERO_PL_PARSER_CFLAGS"
14473
- elif test -n "$PKG_CONFIG"; then
14474
- if test -n "$PKG_CONFIG" && \
14475
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"totem-plparser >= \$TOTEM_REQUIRED\"") >&5
14476
+if test -n "$PKG_CONFIG"; then
14477
+ if test -n "$BRASERO_PL_PARSER_CFLAGS"; then
14478
+ pkg_cv_BRASERO_PL_PARSER_CFLAGS="$BRASERO_PL_PARSER_CFLAGS"
14480
+ if test -n "$PKG_CONFIG" && \
14481
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"totem-plparser >= \$TOTEM_REQUIRED\""; } >&5
14482
($PKG_CONFIG --exists --print-errors "totem-plparser >= $TOTEM_REQUIRED") 2>&5
14484
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14485
- (exit $ac_status); }; then
14486
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14487
+ test $ac_status = 0; }; then
14488
pkg_cv_BRASERO_PL_PARSER_CFLAGS=`$PKG_CONFIG --cflags "totem-plparser >= $TOTEM_REQUIRED" 2>/dev/null`
14493
- pkg_failed=untried
14496
+ pkg_failed=untried
14498
-if test -n "$BRASERO_PL_PARSER_LIBS"; then
14499
- pkg_cv_BRASERO_PL_PARSER_LIBS="$BRASERO_PL_PARSER_LIBS"
14500
- elif test -n "$PKG_CONFIG"; then
14501
- if test -n "$PKG_CONFIG" && \
14502
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"totem-plparser >= \$TOTEM_REQUIRED\"") >&5
14503
+if test -n "$PKG_CONFIG"; then
14504
+ if test -n "$BRASERO_PL_PARSER_LIBS"; then
14505
+ pkg_cv_BRASERO_PL_PARSER_LIBS="$BRASERO_PL_PARSER_LIBS"
14507
+ if test -n "$PKG_CONFIG" && \
14508
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"totem-plparser >= \$TOTEM_REQUIRED\""; } >&5
14509
($PKG_CONFIG --exists --print-errors "totem-plparser >= $TOTEM_REQUIRED") 2>&5
14511
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14512
- (exit $ac_status); }; then
14513
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14514
+ test $ac_status = 0; }; then
14515
pkg_cv_BRASERO_PL_PARSER_LIBS=`$PKG_CONFIG --libs "totem-plparser >= $TOTEM_REQUIRED" 2>/dev/null`
14520
- pkg_failed=untried
14523
+ pkg_failed=untried
14527
@@ -18193,14 +15726,14 @@
14528
_pkg_short_errors_supported=no
14530
if test $_pkg_short_errors_supported = yes; then
14531
- BRASERO_PL_PARSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "totem-plparser >= $TOTEM_REQUIRED" 2>&1`
14532
+ BRASERO_PL_PARSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "totem-plparser >= $TOTEM_REQUIRED"`
14534
- BRASERO_PL_PARSER_PKG_ERRORS=`$PKG_CONFIG --print-errors "totem-plparser >= $TOTEM_REQUIRED" 2>&1`
14535
+ BRASERO_PL_PARSER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "totem-plparser >= $TOTEM_REQUIRED"`
14537
# Put the nasty error message in config.log where it belongs
14538
echo "$BRASERO_PL_PARSER_PKG_ERRORS" >&5
14540
- { $as_echo "$as_me:$LINENO: result: no" >&5
14541
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14542
$as_echo "no" >&6; }
14544
elif test $pkg_failed = untried; then
14545
@@ -18208,7 +15741,7 @@
14547
BRASERO_PL_PARSER_CFLAGS=$pkg_cv_BRASERO_PL_PARSER_CFLAGS
14548
BRASERO_PL_PARSER_LIBS=$pkg_cv_BRASERO_PL_PARSER_LIBS
14549
- { $as_echo "$as_me:$LINENO: result: yes" >&5
14550
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14551
$as_echo "yes" >&6; }
14554
@@ -18218,9 +15751,7 @@
14556
if test x"$build_totem" = "xyes"; then
14558
-cat >>confdefs.h <<\_ACEOF
14559
-#define BUILD_PLAYLIST 1
14561
+$as_echo "#define BUILD_PLAYLIST 1" >>confdefs.h
14565
@@ -18238,7 +15769,7 @@
14567
GSTREAMER_MODULE_REQUIRED=0.10.0
14568
# Check whether --enable-preview was given.
14569
-if test "${enable_preview+set}" = set; then
14570
+if test "${enable_preview+set}" = set; then :
14571
enableval=$enable_preview; enable_preview=$enableval
14573
enable_preview="yes"
14574
@@ -18248,40 +15779,44 @@
14575
if test x"$enable_preview" = "xyes"; then
14578
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_GSTREAMER_BASE" >&5
14579
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_GSTREAMER_BASE" >&5
14580
$as_echo_n "checking for BRASERO_GSTREAMER_BASE... " >&6; }
14582
-if test -n "$BRASERO_GSTREAMER_BASE_CFLAGS"; then
14583
- pkg_cv_BRASERO_GSTREAMER_BASE_CFLAGS="$BRASERO_GSTREAMER_BASE_CFLAGS"
14584
- elif test -n "$PKG_CONFIG"; then
14585
- if test -n "$PKG_CONFIG" && \
14586
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10 >= \$GSTREAMER_MODULE_REQUIRED\"") >&5
14587
+if test -n "$PKG_CONFIG"; then
14588
+ if test -n "$BRASERO_GSTREAMER_BASE_CFLAGS"; then
14589
+ pkg_cv_BRASERO_GSTREAMER_BASE_CFLAGS="$BRASERO_GSTREAMER_BASE_CFLAGS"
14591
+ if test -n "$PKG_CONFIG" && \
14592
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10 >= \$GSTREAMER_MODULE_REQUIRED\""; } >&5
14593
($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10 >= $GSTREAMER_MODULE_REQUIRED") 2>&5
14595
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14596
- (exit $ac_status); }; then
14597
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14598
+ test $ac_status = 0; }; then
14599
pkg_cv_BRASERO_GSTREAMER_BASE_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-plugins-base-0.10 >= $GSTREAMER_MODULE_REQUIRED" 2>/dev/null`
14604
- pkg_failed=untried
14607
+ pkg_failed=untried
14609
-if test -n "$BRASERO_GSTREAMER_BASE_LIBS"; then
14610
- pkg_cv_BRASERO_GSTREAMER_BASE_LIBS="$BRASERO_GSTREAMER_BASE_LIBS"
14611
- elif test -n "$PKG_CONFIG"; then
14612
- if test -n "$PKG_CONFIG" && \
14613
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10 >= \$GSTREAMER_MODULE_REQUIRED\"") >&5
14614
+if test -n "$PKG_CONFIG"; then
14615
+ if test -n "$BRASERO_GSTREAMER_BASE_LIBS"; then
14616
+ pkg_cv_BRASERO_GSTREAMER_BASE_LIBS="$BRASERO_GSTREAMER_BASE_LIBS"
14618
+ if test -n "$PKG_CONFIG" && \
14619
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10 >= \$GSTREAMER_MODULE_REQUIRED\""; } >&5
14620
($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10 >= $GSTREAMER_MODULE_REQUIRED") 2>&5
14622
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14623
- (exit $ac_status); }; then
14624
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14625
+ test $ac_status = 0; }; then
14626
pkg_cv_BRASERO_GSTREAMER_BASE_LIBS=`$PKG_CONFIG --libs "gstreamer-plugins-base-0.10 >= $GSTREAMER_MODULE_REQUIRED" 2>/dev/null`
14631
- pkg_failed=untried
14634
+ pkg_failed=untried
14638
@@ -18294,14 +15829,14 @@
14639
_pkg_short_errors_supported=no
14641
if test $_pkg_short_errors_supported = yes; then
14642
- BRASERO_GSTREAMER_BASE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gstreamer-plugins-base-0.10 >= $GSTREAMER_MODULE_REQUIRED" 2>&1`
14643
+ BRASERO_GSTREAMER_BASE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-plugins-base-0.10 >= $GSTREAMER_MODULE_REQUIRED"`
14645
- BRASERO_GSTREAMER_BASE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gstreamer-plugins-base-0.10 >= $GSTREAMER_MODULE_REQUIRED" 2>&1`
14646
+ BRASERO_GSTREAMER_BASE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-plugins-base-0.10 >= $GSTREAMER_MODULE_REQUIRED"`
14648
# Put the nasty error message in config.log where it belongs
14649
echo "$BRASERO_GSTREAMER_BASE_PKG_ERRORS" >&5
14651
- { $as_echo "$as_me:$LINENO: result: no" >&5
14652
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14653
$as_echo "no" >&6; }
14655
elif test $pkg_failed = untried; then
14656
@@ -18309,7 +15844,7 @@
14658
BRASERO_GSTREAMER_BASE_CFLAGS=$pkg_cv_BRASERO_GSTREAMER_BASE_CFLAGS
14659
BRASERO_GSTREAMER_BASE_LIBS=$pkg_cv_BRASERO_GSTREAMER_BASE_LIBS
14660
- { $as_echo "$as_me:$LINENO: result: yes" >&5
14661
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14662
$as_echo "yes" >&6; }
14665
@@ -18319,9 +15854,7 @@
14667
if test x"$build_preview" = "xyes"; then
14669
-cat >>confdefs.h <<\_ACEOF
14670
-#define BUILD_PREVIEW 1
14672
+$as_echo "#define BUILD_PREVIEW 1" >>confdefs.h
14676
@@ -18338,7 +15871,7 @@
14679
# Check whether --enable-inotify was given.
14680
-if test "${enable_inotify+set}" = set; then
14681
+if test "${enable_inotify+set}" = set; then :
14682
enableval=$enable_inotify; enable_inotify=$enableval
14684
enable_inotify="yes"
14685
@@ -18347,9 +15880,7 @@
14687
if test x"$enable_inotify" = "xyes"; then
14689
-cat >>confdefs.h <<\_ACEOF
14690
-#define BUILD_INOTIFY 1
14692
+$as_echo "#define BUILD_INOTIFY 1" >>confdefs.h
14695
if test x"$enable_inotify" = "xyes"; then
14696
@@ -18365,7 +15896,7 @@
14697
GOBJECT_INTROSPECTION_REQUIRED=0.6.3
14699
# Check whether --enable-introspection was given.
14700
-if test "${enable_introspection+set}" = set; then
14701
+if test "${enable_introspection+set}" = set; then :
14702
enableval=$enable_introspection; enable_introspection=$enableval
14704
enable_introspection="auto"
14705
@@ -18374,7 +15905,7 @@
14708
# Check whether --with-girdir was given.
14709
-if test "${with_girdir+set}" = set; then
14710
+if test "${with_girdir+set}" = set; then :
14711
withval=$with_girdir; ac_with_girdir=$withval
14714
@@ -18383,62 +15914,59 @@
14717
# Check whether --with-typelibdir was given.
14718
-if test "${with_typelibdir+set}" = set; then
14719
+if test "${with_typelibdir+set}" = set; then :
14720
withval=$with_typelibdir; ac_with_typelibdir=$withval
14722
ac_with_typelibdir=""
14726
-{ $as_echo "$as_me:$LINENO: checking for gobject-introspection" >&5
14727
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5
14728
$as_echo_n "checking for gobject-introspection... " >&6; }
14730
-case $enable_introspection in
14731
- no) found_introspection="no (disabled, use --enable-introspection to enable)"
14733
- yes) if test -n "$PKG_CONFIG" && \
14734
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\"") >&5
14735
+case $enable_introspection in #(
14737
+ found_introspection="no (disabled, use --enable-introspection to enable)"
14740
+ if test -n "$PKG_CONFIG" && \
14741
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5
14742
($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5
14744
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14745
- (exit $ac_status); }; then
14746
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14747
+ test $ac_status = 0; }; then
14750
- { { $as_echo "$as_me:$LINENO: error: gobject-introspection-1.0 is not installed" >&5
14751
-$as_echo "$as_me: error: gobject-introspection-1.0 is not installed" >&2;}
14752
- { (exit 1); exit 1; }; }
14753
+ as_fn_error "gobject-introspection-1.0 is not installed" "$LINENO" 5
14755
if test -n "$PKG_CONFIG" && \
14756
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\"") >&5
14757
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5
14758
($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5
14760
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14761
- (exit $ac_status); }; then
14762
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14763
+ test $ac_status = 0; }; then
14764
found_introspection=yes
14766
- { { $as_echo "$as_me:$LINENO: error: You need to have gobject-introspection >= $1 installed to build brasero" >&5
14767
-$as_echo "$as_me: error: You need to have gobject-introspection >= $1 installed to build brasero" >&2;}
14768
- { (exit 1); exit 1; }; }
14769
+ as_fn_error "You need to have gobject-introspection >= $1 installed to build brasero" "$LINENO" 5
14772
- auto) if test -n "$PKG_CONFIG" && \
14773
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\"") >&5
14776
+ if test -n "$PKG_CONFIG" && \
14777
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5
14778
($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5
14780
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14781
- (exit $ac_status); }; then
14782
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14783
+ test $ac_status = 0; }; then
14784
found_introspection=yes
14786
found_introspection=no
14789
- *) { { $as_echo "$as_me:$LINENO: error: invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" >&5
14790
-$as_echo "$as_me: error: invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" >&2;}
14791
- { (exit 1); exit 1; }; }
14794
+ as_fn_error "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
14798
-{ $as_echo "$as_me:$LINENO: result: $found_introspection" >&5
14799
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5
14800
$as_echo "$found_introspection" >&6; }
14802
INTROSPECTION_SCANNER=
14803
@@ -18455,14 +15983,14 @@
14804
ac_with_girdir=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
14806
INTROSPECTION_GIRDIR=${ac_with_girdir}
14807
- { $as_echo "$as_me:$LINENO: installing .gir files in ${INTROSPECTION_GIRDIR}" >&5
14808
+ { $as_echo "$as_me:${as_lineno-$LINENO}: installing .gir files in ${INTROSPECTION_GIRDIR}" >&5
14809
$as_echo "$as_me: installing .gir files in ${INTROSPECTION_GIRDIR}" >&6;}
14811
if test "${ac_with_typelibdir}" = ""; then
14812
ac_with_typelibdir="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
14814
INTROSPECTION_TYPELIBDIR=${ac_with_typelibdir}
14815
- { $as_echo "$as_me:$LINENO: installing .typelib files in ${INTROSPECTION_TYPELIBDIR}" >&5
14816
+ { $as_echo "$as_me:${as_lineno-$LINENO}: installing .typelib files in ${INTROSPECTION_TYPELIBDIR}" >&5
14817
$as_echo "$as_me: installing .typelib files in ${INTROSPECTION_TYPELIBDIR}" >&6;}
14820
@@ -18481,7 +16009,7 @@
14823
# Check whether --enable-caches was given.
14824
-if test "${enable_caches+set}" = set; then
14825
+if test "${enable_caches+set}" = set; then :
14826
enableval=$enable_caches; enable_caches=$enableval
14828
enable_caches="yes"
14829
@@ -18506,146 +16034,12 @@
14834
-for ac_header in locale.h
14836
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
14837
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
14838
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
14839
-$as_echo_n "checking for $ac_header... " >&6; }
14840
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
14841
- $as_echo_n "(cached) " >&6
14843
-ac_res=`eval 'as_val=${'$as_ac_Header'}
14844
- $as_echo "$as_val"'`
14845
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
14846
-$as_echo "$ac_res" >&6; }
14848
- # Is the header compilable?
14849
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
14850
-$as_echo_n "checking $ac_header usability... " >&6; }
14851
-cat >conftest.$ac_ext <<_ACEOF
14854
-cat confdefs.h >>conftest.$ac_ext
14855
-cat >>conftest.$ac_ext <<_ACEOF
14856
-/* end confdefs.h. */
14857
-$ac_includes_default
14858
-#include <$ac_header>
14860
-rm -f conftest.$ac_objext
14861
-if { (ac_try="$ac_compile"
14862
-case "(($ac_try" in
14863
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14864
- *) ac_try_echo=$ac_try;;
14866
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
14867
-$as_echo "$ac_try_echo") >&5
14868
- (eval "$ac_compile") 2>conftest.er1
14870
- grep -v '^ *+' conftest.er1 >conftest.err
14871
- rm -f conftest.er1
14872
- cat conftest.err >&5
14873
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14874
- (exit $ac_status); } && {
14875
- test -z "$ac_c_werror_flag" ||
14876
- test ! -s conftest.err
14877
- } && test -s conftest.$ac_objext; then
14878
- ac_header_compiler=yes
14880
- $as_echo "$as_me: failed program was:" >&5
14881
-sed 's/^/| /' conftest.$ac_ext >&5
14883
- ac_header_compiler=no
14886
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14887
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
14888
-$as_echo "$ac_header_compiler" >&6; }
14890
-# Is the header present?
14891
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
14892
-$as_echo_n "checking $ac_header presence... " >&6; }
14893
-cat >conftest.$ac_ext <<_ACEOF
14896
-cat confdefs.h >>conftest.$ac_ext
14897
-cat >>conftest.$ac_ext <<_ACEOF
14898
-/* end confdefs.h. */
14899
-#include <$ac_header>
14901
-if { (ac_try="$ac_cpp conftest.$ac_ext"
14902
-case "(($ac_try" in
14903
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14904
- *) ac_try_echo=$ac_try;;
14906
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
14907
-$as_echo "$ac_try_echo") >&5
14908
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
14910
- grep -v '^ *+' conftest.er1 >conftest.err
14911
- rm -f conftest.er1
14912
- cat conftest.err >&5
14913
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14914
- (exit $ac_status); } >/dev/null && {
14915
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
14916
- test ! -s conftest.err
14918
- ac_header_preproc=yes
14920
- $as_echo "$as_me: failed program was:" >&5
14921
-sed 's/^/| /' conftest.$ac_ext >&5
14923
- ac_header_preproc=no
14926
-rm -f conftest.err conftest.$ac_ext
14927
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
14928
-$as_echo "$ac_header_preproc" >&6; }
14930
-# So? What about this header?
14931
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
14933
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
14934
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
14935
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
14936
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
14937
- ac_header_preproc=yes
14940
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
14941
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
14942
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
14943
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
14944
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
14945
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
14946
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
14947
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
14948
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
14949
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
14950
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
14951
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
14955
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
14956
-$as_echo_n "checking for $ac_header... " >&6; }
14957
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
14958
- $as_echo_n "(cached) " >&6
14960
- eval "$as_ac_Header=\$ac_header_preproc"
14962
-ac_res=`eval 'as_val=${'$as_ac_Header'}
14963
- $as_echo "$as_val"'`
14964
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
14965
-$as_echo "$ac_res" >&6; }
14968
-as_val=`eval 'as_val=${'$as_ac_Header'}
14969
- $as_echo "$as_val"'`
14970
- if test "x$as_val" = x""yes; then
14971
+ for ac_header in locale.h
14973
+ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
14974
+if test "x$ac_cv_header_locale_h" = x""yes; then :
14975
cat >>confdefs.h <<_ACEOF
14976
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
14977
+#define HAVE_LOCALE_H 1
14981
@@ -18653,16 +16047,12 @@
14984
if test $ac_cv_header_locale_h = yes; then
14985
- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
14986
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
14987
$as_echo_n "checking for LC_MESSAGES... " >&6; }
14988
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then
14989
+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
14990
$as_echo_n "(cached) " >&6
14992
- cat >conftest.$ac_ext <<_ACEOF
14995
-cat confdefs.h >>conftest.$ac_ext
14996
-cat >>conftest.$ac_ext <<_ACEOF
14997
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14998
/* end confdefs.h. */
14999
#include <locale.h>
15001
@@ -18673,202 +16063,45 @@
15005
-rm -f conftest.$ac_objext conftest$ac_exeext
15006
-if { (ac_try="$ac_link"
15007
-case "(($ac_try" in
15008
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15009
- *) ac_try_echo=$ac_try;;
15011
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15012
-$as_echo "$ac_try_echo") >&5
15013
- (eval "$ac_link") 2>conftest.er1
15015
- grep -v '^ *+' conftest.er1 >conftest.err
15016
- rm -f conftest.er1
15017
- cat conftest.err >&5
15018
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15019
- (exit $ac_status); } && {
15020
- test -z "$ac_c_werror_flag" ||
15021
- test ! -s conftest.err
15022
- } && test -s conftest$ac_exeext && {
15023
- test "$cross_compiling" = yes ||
15024
- $as_test_x conftest$ac_exeext
15026
+if ac_fn_c_try_link "$LINENO"; then :
15027
am_cv_val_LC_MESSAGES=yes
15029
- $as_echo "$as_me: failed program was:" >&5
15030
-sed 's/^/| /' conftest.$ac_ext >&5
15032
- am_cv_val_LC_MESSAGES=no
15033
+ am_cv_val_LC_MESSAGES=no
15036
-rm -rf conftest.dSYM
15037
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15038
- conftest$ac_exeext conftest.$ac_ext
15039
+rm -f core conftest.err conftest.$ac_objext \
15040
+ conftest$ac_exeext conftest.$ac_ext
15042
-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
15043
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
15044
$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
15045
if test $am_cv_val_LC_MESSAGES = yes; then
15047
-cat >>confdefs.h <<\_ACEOF
15048
-#define HAVE_LC_MESSAGES 1
15050
+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
15057
- gt_cv_have_gettext=no
15063
- if test "${ac_cv_header_libintl_h+set}" = set; then
15064
- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
15065
-$as_echo_n "checking for libintl.h... " >&6; }
15066
-if test "${ac_cv_header_libintl_h+set}" = set; then
15067
- $as_echo_n "(cached) " >&6
15069
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
15070
-$as_echo "$ac_cv_header_libintl_h" >&6; }
15072
- # Is the header compilable?
15073
-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
15074
-$as_echo_n "checking libintl.h usability... " >&6; }
15075
-cat >conftest.$ac_ext <<_ACEOF
15078
-cat confdefs.h >>conftest.$ac_ext
15079
-cat >>conftest.$ac_ext <<_ACEOF
15080
-/* end confdefs.h. */
15081
-$ac_includes_default
15082
-#include <libintl.h>
15084
-rm -f conftest.$ac_objext
15085
-if { (ac_try="$ac_compile"
15086
-case "(($ac_try" in
15087
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15088
- *) ac_try_echo=$ac_try;;
15090
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15091
-$as_echo "$ac_try_echo") >&5
15092
- (eval "$ac_compile") 2>conftest.er1
15094
- grep -v '^ *+' conftest.er1 >conftest.err
15095
- rm -f conftest.er1
15096
- cat conftest.err >&5
15097
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15098
- (exit $ac_status); } && {
15099
- test -z "$ac_c_werror_flag" ||
15100
- test ! -s conftest.err
15101
- } && test -s conftest.$ac_objext; then
15102
- ac_header_compiler=yes
15104
- $as_echo "$as_me: failed program was:" >&5
15105
-sed 's/^/| /' conftest.$ac_ext >&5
15107
- ac_header_compiler=no
15110
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
15111
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
15112
-$as_echo "$ac_header_compiler" >&6; }
15114
-# Is the header present?
15115
-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5
15116
-$as_echo_n "checking libintl.h presence... " >&6; }
15117
-cat >conftest.$ac_ext <<_ACEOF
15120
-cat confdefs.h >>conftest.$ac_ext
15121
-cat >>conftest.$ac_ext <<_ACEOF
15122
-/* end confdefs.h. */
15123
-#include <libintl.h>
15125
-if { (ac_try="$ac_cpp conftest.$ac_ext"
15126
-case "(($ac_try" in
15127
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15128
- *) ac_try_echo=$ac_try;;
15130
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15131
-$as_echo "$ac_try_echo") >&5
15132
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
15134
- grep -v '^ *+' conftest.er1 >conftest.err
15135
- rm -f conftest.er1
15136
- cat conftest.err >&5
15137
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15138
- (exit $ac_status); } >/dev/null && {
15139
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
15140
- test ! -s conftest.err
15142
- ac_header_preproc=yes
15144
- $as_echo "$as_me: failed program was:" >&5
15145
-sed 's/^/| /' conftest.$ac_ext >&5
15147
- ac_header_preproc=no
15151
-rm -f conftest.err conftest.$ac_ext
15152
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
15153
-$as_echo "$ac_header_preproc" >&6; }
15155
-# So? What about this header?
15156
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
15158
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
15159
-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
15160
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
15161
-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
15162
- ac_header_preproc=yes
15165
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
15166
-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
15167
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
15168
-$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
15169
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
15170
-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
15171
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5
15172
-$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}
15173
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
15174
-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
15175
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
15176
-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
15177
+ gt_cv_have_gettext=no
15181
-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
15182
-$as_echo_n "checking for libintl.h... " >&6; }
15183
-if test "${ac_cv_header_libintl_h+set}" = set; then
15184
- $as_echo_n "(cached) " >&6
15186
- ac_cv_header_libintl_h=$ac_header_preproc
15188
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
15189
-$as_echo "$ac_cv_header_libintl_h" >&6; }
15195
-if test "x$ac_cv_header_libintl_h" = x""yes; then
15196
+ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
15197
+if test "x$ac_cv_header_libintl_h" = x""yes; then :
15198
gt_cv_func_dgettext_libintl="no"
15199
libintl_extra_libs=""
15202
# First check in libc
15204
- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5
15205
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
15206
$as_echo_n "checking for ngettext in libc... " >&6; }
15207
-if test "${gt_cv_func_ngettext_libc+set}" = set; then
15208
+if test "${gt_cv_func_ngettext_libc+set}" = set; then :
15209
$as_echo_n "(cached) " >&6
15211
- cat >conftest.$ac_ext <<_ACEOF
15214
-cat confdefs.h >>conftest.$ac_ext
15215
-cat >>conftest.$ac_ext <<_ACEOF
15216
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15217
/* end confdefs.h. */
15219
#include <libintl.h>
15220
@@ -18881,54 +16114,25 @@
15224
-rm -f conftest.$ac_objext conftest$ac_exeext
15225
-if { (ac_try="$ac_link"
15226
-case "(($ac_try" in
15227
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15228
- *) ac_try_echo=$ac_try;;
15230
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15231
-$as_echo "$ac_try_echo") >&5
15232
- (eval "$ac_link") 2>conftest.er1
15234
- grep -v '^ *+' conftest.er1 >conftest.err
15235
- rm -f conftest.er1
15236
- cat conftest.err >&5
15237
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15238
- (exit $ac_status); } && {
15239
- test -z "$ac_c_werror_flag" ||
15240
- test ! -s conftest.err
15241
- } && test -s conftest$ac_exeext && {
15242
- test "$cross_compiling" = yes ||
15243
- $as_test_x conftest$ac_exeext
15245
+if ac_fn_c_try_link "$LINENO"; then :
15246
gt_cv_func_ngettext_libc=yes
15248
- $as_echo "$as_me: failed program was:" >&5
15249
-sed 's/^/| /' conftest.$ac_ext >&5
15251
- gt_cv_func_ngettext_libc=no
15252
+ gt_cv_func_ngettext_libc=no
15255
-rm -rf conftest.dSYM
15256
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15257
- conftest$ac_exeext conftest.$ac_ext
15258
+rm -f core conftest.err conftest.$ac_objext \
15259
+ conftest$ac_exeext conftest.$ac_ext
15262
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
15263
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
15264
$as_echo "$gt_cv_func_ngettext_libc" >&6; }
15266
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
15267
- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
15268
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
15269
$as_echo_n "checking for dgettext in libc... " >&6; }
15270
-if test "${gt_cv_func_dgettext_libc+set}" = set; then
15271
+if test "${gt_cv_func_dgettext_libc+set}" = set; then :
15272
$as_echo_n "(cached) " >&6
15274
- cat >conftest.$ac_ext <<_ACEOF
15277
-cat confdefs.h >>conftest.$ac_ext
15278
-cat >>conftest.$ac_ext <<_ACEOF
15279
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15280
/* end confdefs.h. */
15282
#include <libintl.h>
15283
@@ -18941,141 +16145,26 @@
15287
-rm -f conftest.$ac_objext conftest$ac_exeext
15288
-if { (ac_try="$ac_link"
15289
-case "(($ac_try" in
15290
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15291
- *) ac_try_echo=$ac_try;;
15293
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15294
-$as_echo "$ac_try_echo") >&5
15295
- (eval "$ac_link") 2>conftest.er1
15297
- grep -v '^ *+' conftest.er1 >conftest.err
15298
- rm -f conftest.er1
15299
- cat conftest.err >&5
15300
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15301
- (exit $ac_status); } && {
15302
- test -z "$ac_c_werror_flag" ||
15303
- test ! -s conftest.err
15304
- } && test -s conftest$ac_exeext && {
15305
- test "$cross_compiling" = yes ||
15306
- $as_test_x conftest$ac_exeext
15308
+if ac_fn_c_try_link "$LINENO"; then :
15309
gt_cv_func_dgettext_libc=yes
15311
- $as_echo "$as_me: failed program was:" >&5
15312
-sed 's/^/| /' conftest.$ac_ext >&5
15314
- gt_cv_func_dgettext_libc=no
15315
+ gt_cv_func_dgettext_libc=no
15318
-rm -rf conftest.dSYM
15319
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15320
- conftest$ac_exeext conftest.$ac_ext
15321
+rm -f core conftest.err conftest.$ac_objext \
15322
+ conftest$ac_exeext conftest.$ac_ext
15325
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
15326
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
15327
$as_echo "$gt_cv_func_dgettext_libc" >&6; }
15330
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
15332
-for ac_func in bind_textdomain_codeset
15334
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
15335
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
15336
-$as_echo_n "checking for $ac_func... " >&6; }
15337
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
15338
- $as_echo_n "(cached) " >&6
15340
- cat >conftest.$ac_ext <<_ACEOF
15343
-cat confdefs.h >>conftest.$ac_ext
15344
-cat >>conftest.$ac_ext <<_ACEOF
15345
-/* end confdefs.h. */
15346
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
15347
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
15348
-#define $ac_func innocuous_$ac_func
15350
-/* System header to define __stub macros and hopefully few prototypes,
15351
- which can conflict with char $ac_func (); below.
15352
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
15353
- <limits.h> exists even on freestanding compilers. */
15356
-# include <limits.h>
15358
-# include <assert.h>
15363
-/* Override any GCC internal prototype to avoid an error.
15364
- Use char because int might match the return type of a GCC
15365
- builtin and then its argument prototype would still apply. */
15366
-#ifdef __cplusplus
15370
-/* The GNU C library defines this for functions which it implements
15371
- to always fail with ENOSYS. Some functions are actually named
15372
- something starting with __ and the normal name is an alias. */
15373
-#if defined __stub_$ac_func || defined __stub___$ac_func
15380
-return $ac_func ();
15385
-rm -f conftest.$ac_objext conftest$ac_exeext
15386
-if { (ac_try="$ac_link"
15387
-case "(($ac_try" in
15388
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15389
- *) ac_try_echo=$ac_try;;
15391
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15392
-$as_echo "$ac_try_echo") >&5
15393
- (eval "$ac_link") 2>conftest.er1
15395
- grep -v '^ *+' conftest.er1 >conftest.err
15396
- rm -f conftest.er1
15397
- cat conftest.err >&5
15398
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15399
- (exit $ac_status); } && {
15400
- test -z "$ac_c_werror_flag" ||
15401
- test ! -s conftest.err
15402
- } && test -s conftest$ac_exeext && {
15403
- test "$cross_compiling" = yes ||
15404
- $as_test_x conftest$ac_exeext
15406
- eval "$as_ac_var=yes"
15408
- $as_echo "$as_me: failed program was:" >&5
15409
-sed 's/^/| /' conftest.$ac_ext >&5
15411
- eval "$as_ac_var=no"
15414
-rm -rf conftest.dSYM
15415
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15416
- conftest$ac_exeext conftest.$ac_ext
15418
-ac_res=`eval 'as_val=${'$as_ac_var'}
15419
- $as_echo "$as_val"'`
15420
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
15421
-$as_echo "$ac_res" >&6; }
15422
-as_val=`eval 'as_val=${'$as_ac_var'}
15423
- $as_echo "$as_val"'`
15424
- if test "x$as_val" = x""yes; then
15425
+ for ac_func in bind_textdomain_codeset
15427
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
15428
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
15429
cat >>confdefs.h <<_ACEOF
15430
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
15431
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
15435
@@ -19090,18 +16179,14 @@
15436
|| test "$gt_cv_func_ngettext_libc" != "yes" \
15437
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
15439
- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
15440
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
15441
$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
15442
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
15443
+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
15444
$as_echo_n "(cached) " >&6
15446
ac_check_lib_save_LIBS=$LIBS
15447
LIBS="-lintl $LIBS"
15448
-cat >conftest.$ac_ext <<_ACEOF
15451
-cat confdefs.h >>conftest.$ac_ext
15452
-cat >>conftest.$ac_ext <<_ACEOF
15453
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15454
/* end confdefs.h. */
15456
/* Override any GCC internal prototype to avoid an error.
15457
@@ -19119,55 +16204,26 @@
15461
-rm -f conftest.$ac_objext conftest$ac_exeext
15462
-if { (ac_try="$ac_link"
15463
-case "(($ac_try" in
15464
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15465
- *) ac_try_echo=$ac_try;;
15467
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15468
-$as_echo "$ac_try_echo") >&5
15469
- (eval "$ac_link") 2>conftest.er1
15471
- grep -v '^ *+' conftest.er1 >conftest.err
15472
- rm -f conftest.er1
15473
- cat conftest.err >&5
15474
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15475
- (exit $ac_status); } && {
15476
- test -z "$ac_c_werror_flag" ||
15477
- test ! -s conftest.err
15478
- } && test -s conftest$ac_exeext && {
15479
- test "$cross_compiling" = yes ||
15480
- $as_test_x conftest$ac_exeext
15482
+if ac_fn_c_try_link "$LINENO"; then :
15483
ac_cv_lib_intl_bindtextdomain=yes
15485
- $as_echo "$as_me: failed program was:" >&5
15486
-sed 's/^/| /' conftest.$ac_ext >&5
15488
- ac_cv_lib_intl_bindtextdomain=no
15489
+ ac_cv_lib_intl_bindtextdomain=no
15492
-rm -rf conftest.dSYM
15493
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15494
- conftest$ac_exeext conftest.$ac_ext
15495
+rm -f core conftest.err conftest.$ac_objext \
15496
+ conftest$ac_exeext conftest.$ac_ext
15497
LIBS=$ac_check_lib_save_LIBS
15499
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
15500
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
15501
$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
15502
-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
15503
- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
15504
+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
15505
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
15506
$as_echo_n "checking for ngettext in -lintl... " >&6; }
15507
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
15508
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
15509
$as_echo_n "(cached) " >&6
15511
ac_check_lib_save_LIBS=$LIBS
15512
LIBS="-lintl $LIBS"
15513
-cat >conftest.$ac_ext <<_ACEOF
15516
-cat confdefs.h >>conftest.$ac_ext
15517
-cat >>conftest.$ac_ext <<_ACEOF
15518
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15519
/* end confdefs.h. */
15521
/* Override any GCC internal prototype to avoid an error.
15522
@@ -19185,55 +16241,26 @@
15526
-rm -f conftest.$ac_objext conftest$ac_exeext
15527
-if { (ac_try="$ac_link"
15528
-case "(($ac_try" in
15529
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15530
- *) ac_try_echo=$ac_try;;
15532
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15533
-$as_echo "$ac_try_echo") >&5
15534
- (eval "$ac_link") 2>conftest.er1
15536
- grep -v '^ *+' conftest.er1 >conftest.err
15537
- rm -f conftest.er1
15538
- cat conftest.err >&5
15539
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15540
- (exit $ac_status); } && {
15541
- test -z "$ac_c_werror_flag" ||
15542
- test ! -s conftest.err
15543
- } && test -s conftest$ac_exeext && {
15544
- test "$cross_compiling" = yes ||
15545
- $as_test_x conftest$ac_exeext
15547
+if ac_fn_c_try_link "$LINENO"; then :
15548
ac_cv_lib_intl_ngettext=yes
15550
- $as_echo "$as_me: failed program was:" >&5
15551
-sed 's/^/| /' conftest.$ac_ext >&5
15553
- ac_cv_lib_intl_ngettext=no
15554
+ ac_cv_lib_intl_ngettext=no
15557
-rm -rf conftest.dSYM
15558
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15559
- conftest$ac_exeext conftest.$ac_ext
15560
+rm -f core conftest.err conftest.$ac_objext \
15561
+ conftest$ac_exeext conftest.$ac_ext
15562
LIBS=$ac_check_lib_save_LIBS
15564
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
15565
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
15566
$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
15567
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
15568
- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
15569
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
15570
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
15571
$as_echo_n "checking for dgettext in -lintl... " >&6; }
15572
-if test "${ac_cv_lib_intl_dgettext+set}" = set; then
15573
+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
15574
$as_echo_n "(cached) " >&6
15576
ac_check_lib_save_LIBS=$LIBS
15577
LIBS="-lintl $LIBS"
15578
-cat >conftest.$ac_ext <<_ACEOF
15581
-cat confdefs.h >>conftest.$ac_ext
15582
-cat >>conftest.$ac_ext <<_ACEOF
15583
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15584
/* end confdefs.h. */
15586
/* Override any GCC internal prototype to avoid an error.
15587
@@ -19251,43 +16278,18 @@
15591
-rm -f conftest.$ac_objext conftest$ac_exeext
15592
-if { (ac_try="$ac_link"
15593
-case "(($ac_try" in
15594
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15595
- *) ac_try_echo=$ac_try;;
15597
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15598
-$as_echo "$ac_try_echo") >&5
15599
- (eval "$ac_link") 2>conftest.er1
15601
- grep -v '^ *+' conftest.er1 >conftest.err
15602
- rm -f conftest.er1
15603
- cat conftest.err >&5
15604
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15605
- (exit $ac_status); } && {
15606
- test -z "$ac_c_werror_flag" ||
15607
- test ! -s conftest.err
15608
- } && test -s conftest$ac_exeext && {
15609
- test "$cross_compiling" = yes ||
15610
- $as_test_x conftest$ac_exeext
15612
+if ac_fn_c_try_link "$LINENO"; then :
15613
ac_cv_lib_intl_dgettext=yes
15615
- $as_echo "$as_me: failed program was:" >&5
15616
-sed 's/^/| /' conftest.$ac_ext >&5
15618
- ac_cv_lib_intl_dgettext=no
15619
+ ac_cv_lib_intl_dgettext=no
15622
-rm -rf conftest.dSYM
15623
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15624
- conftest$ac_exeext conftest.$ac_ext
15625
+rm -f core conftest.err conftest.$ac_objext \
15626
+ conftest$ac_exeext conftest.$ac_ext
15627
LIBS=$ac_check_lib_save_LIBS
15629
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
15630
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
15631
$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
15632
-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
15633
+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
15634
gt_cv_func_dgettext_libintl=yes
15637
@@ -19297,22 +16299,18 @@
15640
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
15641
- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
15642
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
15643
$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
15644
- { $as_echo "$as_me:$LINENO: result: " >&5
15645
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
15647
- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
15648
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
15649
$as_echo_n "checking for ngettext in -lintl... " >&6; }
15650
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
15651
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
15652
$as_echo_n "(cached) " >&6
15654
ac_check_lib_save_LIBS=$LIBS
15655
LIBS="-lintl -liconv $LIBS"
15656
-cat >conftest.$ac_ext <<_ACEOF
15659
-cat confdefs.h >>conftest.$ac_ext
15660
-cat >>conftest.$ac_ext <<_ACEOF
15661
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15662
/* end confdefs.h. */
15664
/* Override any GCC internal prototype to avoid an error.
15665
@@ -19330,226 +16328,82 @@
15669
-rm -f conftest.$ac_objext conftest$ac_exeext
15670
-if { (ac_try="$ac_link"
15671
-case "(($ac_try" in
15672
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15673
- *) ac_try_echo=$ac_try;;
15675
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15676
-$as_echo "$ac_try_echo") >&5
15677
- (eval "$ac_link") 2>conftest.er1
15679
- grep -v '^ *+' conftest.er1 >conftest.err
15680
- rm -f conftest.er1
15681
- cat conftest.err >&5
15682
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15683
- (exit $ac_status); } && {
15684
- test -z "$ac_c_werror_flag" ||
15685
- test ! -s conftest.err
15686
- } && test -s conftest$ac_exeext && {
15687
- test "$cross_compiling" = yes ||
15688
- $as_test_x conftest$ac_exeext
15690
+if ac_fn_c_try_link "$LINENO"; then :
15691
ac_cv_lib_intl_ngettext=yes
15693
- $as_echo "$as_me: failed program was:" >&5
15694
-sed 's/^/| /' conftest.$ac_ext >&5
15696
- ac_cv_lib_intl_ngettext=no
15697
+ ac_cv_lib_intl_ngettext=no
15700
-rm -rf conftest.dSYM
15701
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15702
- conftest$ac_exeext conftest.$ac_ext
15703
+rm -f core conftest.err conftest.$ac_objext \
15704
+ conftest$ac_exeext conftest.$ac_ext
15705
LIBS=$ac_check_lib_save_LIBS
15707
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
15708
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
15709
$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
15710
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
15711
- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
15712
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
15713
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
15714
$as_echo_n "checking for dcgettext in -lintl... " >&6; }
15715
-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
15716
+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
15717
$as_echo_n "(cached) " >&6
15719
ac_check_lib_save_LIBS=$LIBS
15720
LIBS="-lintl -liconv $LIBS"
15721
-cat >conftest.$ac_ext <<_ACEOF
15724
-cat confdefs.h >>conftest.$ac_ext
15725
-cat >>conftest.$ac_ext <<_ACEOF
15726
-/* end confdefs.h. */
15728
-/* Override any GCC internal prototype to avoid an error.
15729
- Use char because int might match the return type of a GCC
15730
- builtin and then its argument prototype would still apply. */
15731
-#ifdef __cplusplus
15734
-char dcgettext ();
15738
-return dcgettext ();
15743
-rm -f conftest.$ac_objext conftest$ac_exeext
15744
-if { (ac_try="$ac_link"
15745
-case "(($ac_try" in
15746
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15747
- *) ac_try_echo=$ac_try;;
15749
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15750
-$as_echo "$ac_try_echo") >&5
15751
- (eval "$ac_link") 2>conftest.er1
15753
- grep -v '^ *+' conftest.er1 >conftest.err
15754
- rm -f conftest.er1
15755
- cat conftest.err >&5
15756
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15757
- (exit $ac_status); } && {
15758
- test -z "$ac_c_werror_flag" ||
15759
- test ! -s conftest.err
15760
- } && test -s conftest$ac_exeext && {
15761
- test "$cross_compiling" = yes ||
15762
- $as_test_x conftest$ac_exeext
15764
- ac_cv_lib_intl_dcgettext=yes
15766
- $as_echo "$as_me: failed program was:" >&5
15767
-sed 's/^/| /' conftest.$ac_ext >&5
15769
- ac_cv_lib_intl_dcgettext=no
15772
-rm -rf conftest.dSYM
15773
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15774
- conftest$ac_exeext conftest.$ac_ext
15775
-LIBS=$ac_check_lib_save_LIBS
15777
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
15778
-$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
15779
-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
15780
- gt_cv_func_dgettext_libintl=yes
15781
- libintl_extra_libs=-liconv
15793
- # If we found libintl, then check in it for bind_textdomain_codeset();
15794
- # we'll prefer libc if neither have bind_textdomain_codeset(),
15795
- # and both have dgettext and ngettext
15797
- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
15798
- glib_save_LIBS="$LIBS"
15799
- LIBS="$LIBS -lintl $libintl_extra_libs"
15800
- unset ac_cv_func_bind_textdomain_codeset
15802
-for ac_func in bind_textdomain_codeset
15804
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
15805
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
15806
-$as_echo_n "checking for $ac_func... " >&6; }
15807
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
15808
- $as_echo_n "(cached) " >&6
15810
- cat >conftest.$ac_ext <<_ACEOF
15813
-cat confdefs.h >>conftest.$ac_ext
15814
-cat >>conftest.$ac_ext <<_ACEOF
15815
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15816
/* end confdefs.h. */
15817
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
15818
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
15819
-#define $ac_func innocuous_$ac_func
15821
-/* System header to define __stub macros and hopefully few prototypes,
15822
- which can conflict with char $ac_func (); below.
15823
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
15824
- <limits.h> exists even on freestanding compilers. */
15827
-# include <limits.h>
15829
-# include <assert.h>
15834
/* Override any GCC internal prototype to avoid an error.
15835
- Use char because int might match the return type of a GCC
15836
- builtin and then its argument prototype would still apply. */
15837
-#ifdef __cplusplus
15841
-/* The GNU C library defines this for functions which it implements
15842
- to always fail with ENOSYS. Some functions are actually named
15843
- something starting with __ and the normal name is an alias. */
15844
-#if defined __stub_$ac_func || defined __stub___$ac_func
15846
+ Use char because int might match the return type of a GCC
15847
+ builtin and then its argument prototype would still apply. */
15848
+#ifdef __cplusplus
15852
+char dcgettext ();
15856
-return $ac_func ();
15857
+return dcgettext ();
15862
-rm -f conftest.$ac_objext conftest$ac_exeext
15863
-if { (ac_try="$ac_link"
15864
-case "(($ac_try" in
15865
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15866
- *) ac_try_echo=$ac_try;;
15868
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15869
-$as_echo "$ac_try_echo") >&5
15870
- (eval "$ac_link") 2>conftest.er1
15872
- grep -v '^ *+' conftest.er1 >conftest.err
15873
- rm -f conftest.er1
15874
- cat conftest.err >&5
15875
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15876
- (exit $ac_status); } && {
15877
- test -z "$ac_c_werror_flag" ||
15878
- test ! -s conftest.err
15879
- } && test -s conftest$ac_exeext && {
15880
- test "$cross_compiling" = yes ||
15881
- $as_test_x conftest$ac_exeext
15883
- eval "$as_ac_var=yes"
15884
+if ac_fn_c_try_link "$LINENO"; then :
15885
+ ac_cv_lib_intl_dcgettext=yes
15887
- $as_echo "$as_me: failed program was:" >&5
15888
-sed 's/^/| /' conftest.$ac_ext >&5
15890
- eval "$as_ac_var=no"
15891
+ ac_cv_lib_intl_dcgettext=no
15893
+rm -f core conftest.err conftest.$ac_objext \
15894
+ conftest$ac_exeext conftest.$ac_ext
15895
+LIBS=$ac_check_lib_save_LIBS
15897
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
15898
+$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
15899
+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
15900
+ gt_cv_func_dgettext_libintl=yes
15901
+ libintl_extra_libs=-liconv
15906
-rm -rf conftest.dSYM
15907
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15908
- conftest$ac_exeext conftest.$ac_ext
15912
-ac_res=`eval 'as_val=${'$as_ac_var'}
15913
- $as_echo "$as_val"'`
15914
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
15915
-$as_echo "$ac_res" >&6; }
15916
-as_val=`eval 'as_val=${'$as_ac_var'}
15917
- $as_echo "$as_val"'`
15918
- if test "x$as_val" = x""yes; then
15923
+ # If we found libintl, then check in it for bind_textdomain_codeset();
15924
+ # we'll prefer libc if neither have bind_textdomain_codeset(),
15925
+ # and both have dgettext and ngettext
15927
+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
15928
+ glib_save_LIBS="$LIBS"
15929
+ LIBS="$LIBS -lintl $libintl_extra_libs"
15930
+ unset ac_cv_func_bind_textdomain_codeset
15931
+ for ac_func in bind_textdomain_codeset
15933
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
15934
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
15935
cat >>confdefs.h <<_ACEOF
15936
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
15937
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
15941
@@ -19579,15 +16433,13 @@
15943
if test "$gt_cv_have_gettext" = "yes"; then
15945
-cat >>confdefs.h <<\_ACEOF
15946
-#define HAVE_GETTEXT 1
15948
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
15950
# Extract the first word of "msgfmt", so it can be a program name with args.
15951
set dummy msgfmt; ac_word=$2
15952
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
15953
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15954
$as_echo_n "checking for $ac_word... " >&6; }
15955
-if test "${ac_cv_path_MSGFMT+set}" = set; then
15956
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
15957
$as_echo_n "(cached) " >&6
15960
@@ -19612,118 +16464,28 @@
15962
MSGFMT="$ac_cv_path_MSGFMT"
15963
if test "$MSGFMT" != "no"; then
15964
- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
15965
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
15966
$as_echo "$MSGFMT" >&6; }
15968
- { $as_echo "$as_me:$LINENO: result: no" >&5
15969
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15970
$as_echo "no" >&6; }
15972
if test "$MSGFMT" != "no"; then
15973
glib_save_LIBS="$LIBS"
15974
LIBS="$LIBS $INTLLIBS"
15976
-for ac_func in dcgettext
15978
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
15979
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
15980
-$as_echo_n "checking for $ac_func... " >&6; }
15981
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
15982
- $as_echo_n "(cached) " >&6
15984
- cat >conftest.$ac_ext <<_ACEOF
15987
-cat confdefs.h >>conftest.$ac_ext
15988
-cat >>conftest.$ac_ext <<_ACEOF
15989
-/* end confdefs.h. */
15990
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
15991
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
15992
-#define $ac_func innocuous_$ac_func
15994
-/* System header to define __stub macros and hopefully few prototypes,
15995
- which can conflict with char $ac_func (); below.
15996
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
15997
- <limits.h> exists even on freestanding compilers. */
16000
-# include <limits.h>
16002
-# include <assert.h>
16007
-/* Override any GCC internal prototype to avoid an error.
16008
- Use char because int might match the return type of a GCC
16009
- builtin and then its argument prototype would still apply. */
16010
-#ifdef __cplusplus
16014
-/* The GNU C library defines this for functions which it implements
16015
- to always fail with ENOSYS. Some functions are actually named
16016
- something starting with __ and the normal name is an alias. */
16017
-#if defined __stub_$ac_func || defined __stub___$ac_func
16024
-return $ac_func ();
16029
-rm -f conftest.$ac_objext conftest$ac_exeext
16030
-if { (ac_try="$ac_link"
16031
-case "(($ac_try" in
16032
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16033
- *) ac_try_echo=$ac_try;;
16035
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16036
-$as_echo "$ac_try_echo") >&5
16037
- (eval "$ac_link") 2>conftest.er1
16039
- grep -v '^ *+' conftest.er1 >conftest.err
16040
- rm -f conftest.er1
16041
- cat conftest.err >&5
16042
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16043
- (exit $ac_status); } && {
16044
- test -z "$ac_c_werror_flag" ||
16045
- test ! -s conftest.err
16046
- } && test -s conftest$ac_exeext && {
16047
- test "$cross_compiling" = yes ||
16048
- $as_test_x conftest$ac_exeext
16050
- eval "$as_ac_var=yes"
16052
- $as_echo "$as_me: failed program was:" >&5
16053
-sed 's/^/| /' conftest.$ac_ext >&5
16055
- eval "$as_ac_var=no"
16058
-rm -rf conftest.dSYM
16059
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16060
- conftest$ac_exeext conftest.$ac_ext
16062
-ac_res=`eval 'as_val=${'$as_ac_var'}
16063
- $as_echo "$as_val"'`
16064
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
16065
-$as_echo "$ac_res" >&6; }
16066
-as_val=`eval 'as_val=${'$as_ac_var'}
16067
- $as_echo "$as_val"'`
16068
- if test "x$as_val" = x""yes; then
16069
+ for ac_func in dcgettext
16071
+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
16072
+if test "x$ac_cv_func_dcgettext" = x""yes; then :
16073
cat >>confdefs.h <<_ACEOF
16074
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
16075
+#define HAVE_DCGETTEXT 1
16082
- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
16083
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
16084
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
16085
cat >conftest.foo <<_ACEOF
16087
@@ -19738,14 +16500,14 @@
16088
"Content-Transfer-Encoding: 8bit\n"
16091
-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
16092
+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
16093
($MSGFMT -c -o /dev/null conftest.foo) 2>&5
16095
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16096
- (exit $ac_status); }; then
16097
- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
16098
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
16099
+ test $ac_status = 0; }; then
16100
+ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
16101
$as_echo "yes" >&6; }
16102
-else { $as_echo "$as_me:$LINENO: result: no" >&5
16103
+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16104
$as_echo "no" >&6; }
16105
echo "$as_me: failed input was:" >&5
16106
sed 's/^/| /' conftest.foo >&5
16107
@@ -19753,9 +16515,9 @@
16109
# Extract the first word of "gmsgfmt", so it can be a program name with args.
16110
set dummy gmsgfmt; ac_word=$2
16111
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16112
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16113
$as_echo_n "checking for $ac_word... " >&6; }
16114
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
16115
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
16116
$as_echo_n "(cached) " >&6
16119
@@ -19768,14 +16530,14 @@
16122
test -z "$as_dir" && as_dir=.
16123
- for ac_exec_ext in '' $ac_executable_extensions; do
16124
+ for ac_exec_ext in '' $ac_executable_extensions; do
16125
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16126
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
16127
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16128
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16136
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
16137
@@ -19784,19 +16546,19 @@
16139
GMSGFMT=$ac_cv_path_GMSGFMT
16140
if test -n "$GMSGFMT"; then
16141
- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
16142
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
16143
$as_echo "$GMSGFMT" >&6; }
16145
- { $as_echo "$as_me:$LINENO: result: no" >&5
16146
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16147
$as_echo "no" >&6; }
16151
# Extract the first word of "xgettext", so it can be a program name with args.
16152
set dummy xgettext; ac_word=$2
16153
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16154
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16155
$as_echo_n "checking for $ac_word... " >&6; }
16156
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
16157
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
16158
$as_echo_n "(cached) " >&6
16160
case "$XGETTEXT" in
16161
@@ -19821,18 +16583,14 @@
16163
XGETTEXT="$ac_cv_path_XGETTEXT"
16164
if test "$XGETTEXT" != ":"; then
16165
- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
16166
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
16167
$as_echo "$XGETTEXT" >&6; }
16169
- { $as_echo "$as_me:$LINENO: result: no" >&5
16170
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16171
$as_echo "no" >&6; }
16174
- cat >conftest.$ac_ext <<_ACEOF
16177
-cat confdefs.h >>conftest.$ac_ext
16178
-cat >>conftest.$ac_ext <<_ACEOF
16179
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16180
/* end confdefs.h. */
16183
@@ -19844,121 +16602,14 @@
16187
-rm -f conftest.$ac_objext conftest$ac_exeext
16188
-if { (ac_try="$ac_link"
16189
-case "(($ac_try" in
16190
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16191
- *) ac_try_echo=$ac_try;;
16193
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16194
-$as_echo "$ac_try_echo") >&5
16195
- (eval "$ac_link") 2>conftest.er1
16197
- grep -v '^ *+' conftest.er1 >conftest.err
16198
- rm -f conftest.er1
16199
- cat conftest.err >&5
16200
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16201
- (exit $ac_status); } && {
16202
- test -z "$ac_c_werror_flag" ||
16203
- test ! -s conftest.err
16204
- } && test -s conftest$ac_exeext && {
16205
- test "$cross_compiling" = yes ||
16206
- $as_test_x conftest$ac_exeext
16208
+if ac_fn_c_try_link "$LINENO"; then :
16212
- $as_echo "$as_me: failed program was:" >&5
16213
-sed 's/^/| /' conftest.$ac_ext >&5
16218
- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
16219
-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
16220
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
16221
- $as_echo_n "(cached) " >&6
16223
- cat >conftest.$ac_ext <<_ACEOF
16226
-cat confdefs.h >>conftest.$ac_ext
16227
-cat >>conftest.$ac_ext <<_ACEOF
16228
-/* end confdefs.h. */
16229
-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
16230
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
16231
-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
16233
-/* System header to define __stub macros and hopefully few prototypes,
16234
- which can conflict with char bind_textdomain_codeset (); below.
16235
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
16236
- <limits.h> exists even on freestanding compilers. */
16239
-# include <limits.h>
16241
-# include <assert.h>
16244
-#undef bind_textdomain_codeset
16246
-/* Override any GCC internal prototype to avoid an error.
16247
- Use char because int might match the return type of a GCC
16248
- builtin and then its argument prototype would still apply. */
16249
-#ifdef __cplusplus
16252
-char bind_textdomain_codeset ();
16253
-/* The GNU C library defines this for functions which it implements
16254
- to always fail with ENOSYS. Some functions are actually named
16255
- something starting with __ and the normal name is an alias. */
16256
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
16263
-return bind_textdomain_codeset ();
16268
-rm -f conftest.$ac_objext conftest$ac_exeext
16269
-if { (ac_try="$ac_link"
16270
-case "(($ac_try" in
16271
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16272
- *) ac_try_echo=$ac_try;;
16274
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16275
-$as_echo "$ac_try_echo") >&5
16276
- (eval "$ac_link") 2>conftest.er1
16278
- grep -v '^ *+' conftest.er1 >conftest.err
16279
- rm -f conftest.er1
16280
- cat conftest.err >&5
16281
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16282
- (exit $ac_status); } && {
16283
- test -z "$ac_c_werror_flag" ||
16284
- test ! -s conftest.err
16285
- } && test -s conftest$ac_exeext && {
16286
- test "$cross_compiling" = yes ||
16287
- $as_test_x conftest$ac_exeext
16289
- ac_cv_func_bind_textdomain_codeset=yes
16291
- $as_echo "$as_me: failed program was:" >&5
16292
-sed 's/^/| /' conftest.$ac_ext >&5
16294
- ac_cv_func_bind_textdomain_codeset=no
16297
-rm -rf conftest.dSYM
16298
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16299
- conftest$ac_exeext conftest.$ac_ext
16301
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
16302
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
16303
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
16304
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
16305
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
16309
@@ -19973,10 +16624,8 @@
16314
-rm -rf conftest.dSYM
16315
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16316
- conftest$ac_exeext conftest.$ac_ext
16317
+rm -f core conftest.err conftest.$ac_objext \
16318
+ conftest$ac_exeext conftest.$ac_ext
16319
LIBS="$glib_save_LIBS"
16322
@@ -19990,9 +16639,7 @@
16324
if test "$gt_cv_have_gettext" = "yes" ; then
16326
-cat >>confdefs.h <<\_ACEOF
16327
-#define ENABLE_NLS 1
16329
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
16333
@@ -20000,7 +16647,7 @@
16334
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
16337
- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
16338
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
16339
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
16342
@@ -20033,7 +16680,7 @@
16343
if test "x$ALL_LINGUAS" = "x"; then
16346
- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
16347
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
16348
$as_echo_n "checking for catalogs to be installed... " >&6; }
16350
for presentlang in $ALL_LINGUAS; do
16351
@@ -20058,7 +16705,7 @@
16354
LINGUAS=$NEW_LINGUAS
16355
- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
16356
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
16357
$as_echo "$LINGUAS" >&6; }
16360
@@ -20092,16 +16739,16 @@
16364
- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
16365
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
16366
$as_echo_n "checking whether NLS is requested... " >&6; }
16367
# Check whether --enable-nls was given.
16368
-if test "${enable_nls+set}" = set; then
16369
+if test "${enable_nls+set}" = set; then :
16370
enableval=$enable_nls; USE_NLS=$enableval
16375
- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
16376
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
16377
$as_echo "$USE_NLS" >&6; }
16380
@@ -20109,35 +16756,31 @@
16382
case "$am__api_version" in
16384
- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
16385
-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
16386
- { (exit 1); exit 1; }; }
16387
+ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
16393
if test -n "0.35.0"; then
16394
- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5
16395
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5
16396
$as_echo_n "checking for intltool >= 0.35.0... " >&6; }
16398
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
16399
INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
16400
INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
16402
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
16403
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
16404
$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
16405
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
16406
- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5
16407
-$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}
16408
- { (exit 1); exit 1; }; }
16409
+ as_fn_error "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5
16412
# Extract the first word of "intltool-update", so it can be a program name with args.
16413
set dummy intltool-update; ac_word=$2
16414
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16415
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16416
$as_echo_n "checking for $ac_word... " >&6; }
16417
-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
16418
+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
16419
$as_echo_n "(cached) " >&6
16421
case $INTLTOOL_UPDATE in
16422
@@ -20150,14 +16793,14 @@
16425
test -z "$as_dir" && as_dir=.
16426
- for ac_exec_ext in '' $ac_executable_extensions; do
16427
+ for ac_exec_ext in '' $ac_executable_extensions; do
16428
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16429
ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
16430
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16431
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16440
@@ -20165,19 +16808,19 @@
16442
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
16443
if test -n "$INTLTOOL_UPDATE"; then
16444
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
16445
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
16446
$as_echo "$INTLTOOL_UPDATE" >&6; }
16448
- { $as_echo "$as_me:$LINENO: result: no" >&5
16449
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16450
$as_echo "no" >&6; }
16454
# Extract the first word of "intltool-merge", so it can be a program name with args.
16455
set dummy intltool-merge; ac_word=$2
16456
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16457
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16458
$as_echo_n "checking for $ac_word... " >&6; }
16459
-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
16460
+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
16461
$as_echo_n "(cached) " >&6
16463
case $INTLTOOL_MERGE in
16464
@@ -20190,14 +16833,14 @@
16467
test -z "$as_dir" && as_dir=.
16468
- for ac_exec_ext in '' $ac_executable_extensions; do
16469
+ for ac_exec_ext in '' $ac_executable_extensions; do
16470
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16471
ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
16472
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16473
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16482
@@ -20205,19 +16848,19 @@
16484
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
16485
if test -n "$INTLTOOL_MERGE"; then
16486
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
16487
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
16488
$as_echo "$INTLTOOL_MERGE" >&6; }
16490
- { $as_echo "$as_me:$LINENO: result: no" >&5
16491
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16492
$as_echo "no" >&6; }
16496
# Extract the first word of "intltool-extract", so it can be a program name with args.
16497
set dummy intltool-extract; ac_word=$2
16498
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16499
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16500
$as_echo_n "checking for $ac_word... " >&6; }
16501
-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
16502
+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
16503
$as_echo_n "(cached) " >&6
16505
case $INTLTOOL_EXTRACT in
16506
@@ -20230,14 +16873,14 @@
16509
test -z "$as_dir" && as_dir=.
16510
- for ac_exec_ext in '' $ac_executable_extensions; do
16511
+ for ac_exec_ext in '' $ac_executable_extensions; do
16512
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16513
ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
16514
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16515
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16524
@@ -20245,18 +16888,16 @@
16526
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
16527
if test -n "$INTLTOOL_EXTRACT"; then
16528
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
16529
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
16530
$as_echo "$INTLTOOL_EXTRACT" >&6; }
16532
- { $as_echo "$as_me:$LINENO: result: no" >&5
16533
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16534
$as_echo "no" >&6; }
16538
if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
16539
- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
16540
-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
16541
- { (exit 1); exit 1; }; }
16542
+ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
16545
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
16546
@@ -20378,9 +17019,9 @@
16547
# Check the gettext tools to make sure they are GNU
16548
# Extract the first word of "xgettext", so it can be a program name with args.
16549
set dummy xgettext; ac_word=$2
16550
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16551
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16552
$as_echo_n "checking for $ac_word... " >&6; }
16553
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
16554
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
16555
$as_echo_n "(cached) " >&6
16558
@@ -20393,14 +17034,14 @@
16561
test -z "$as_dir" && as_dir=.
16562
- for ac_exec_ext in '' $ac_executable_extensions; do
16563
+ for ac_exec_ext in '' $ac_executable_extensions; do
16564
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16565
ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
16566
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16567
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16576
@@ -20408,19 +17049,19 @@
16578
XGETTEXT=$ac_cv_path_XGETTEXT
16579
if test -n "$XGETTEXT"; then
16580
- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
16581
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
16582
$as_echo "$XGETTEXT" >&6; }
16584
- { $as_echo "$as_me:$LINENO: result: no" >&5
16585
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16586
$as_echo "no" >&6; }
16590
# Extract the first word of "msgmerge", so it can be a program name with args.
16591
set dummy msgmerge; ac_word=$2
16592
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16593
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16594
$as_echo_n "checking for $ac_word... " >&6; }
16595
-if test "${ac_cv_path_MSGMERGE+set}" = set; then
16596
+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
16597
$as_echo_n "(cached) " >&6
16600
@@ -20433,14 +17074,14 @@
16603
test -z "$as_dir" && as_dir=.
16604
- for ac_exec_ext in '' $ac_executable_extensions; do
16605
+ for ac_exec_ext in '' $ac_executable_extensions; do
16606
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16607
ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
16608
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16609
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16618
@@ -20448,19 +17089,19 @@
16620
MSGMERGE=$ac_cv_path_MSGMERGE
16621
if test -n "$MSGMERGE"; then
16622
- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
16623
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
16624
$as_echo "$MSGMERGE" >&6; }
16626
- { $as_echo "$as_me:$LINENO: result: no" >&5
16627
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16628
$as_echo "no" >&6; }
16632
# Extract the first word of "msgfmt", so it can be a program name with args.
16633
set dummy msgfmt; ac_word=$2
16634
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16635
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16636
$as_echo_n "checking for $ac_word... " >&6; }
16637
-if test "${ac_cv_path_MSGFMT+set}" = set; then
16638
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
16639
$as_echo_n "(cached) " >&6
16642
@@ -20473,14 +17114,14 @@
16645
test -z "$as_dir" && as_dir=.
16646
- for ac_exec_ext in '' $ac_executable_extensions; do
16647
+ for ac_exec_ext in '' $ac_executable_extensions; do
16648
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16649
ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
16650
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16651
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16660
@@ -20488,19 +17129,19 @@
16662
MSGFMT=$ac_cv_path_MSGFMT
16663
if test -n "$MSGFMT"; then
16664
- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
16665
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
16666
$as_echo "$MSGFMT" >&6; }
16668
- { $as_echo "$as_me:$LINENO: result: no" >&5
16669
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16670
$as_echo "no" >&6; }
16674
# Extract the first word of "gmsgfmt", so it can be a program name with args.
16675
set dummy gmsgfmt; ac_word=$2
16676
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16677
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16678
$as_echo_n "checking for $ac_word... " >&6; }
16679
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
16680
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
16681
$as_echo_n "(cached) " >&6
16684
@@ -20513,14 +17154,14 @@
16687
test -z "$as_dir" && as_dir=.
16688
- for ac_exec_ext in '' $ac_executable_extensions; do
16689
+ for ac_exec_ext in '' $ac_executable_extensions; do
16690
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16691
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
16692
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16693
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16701
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
16702
@@ -20529,33 +17170,29 @@
16704
GMSGFMT=$ac_cv_path_GMSGFMT
16705
if test -n "$GMSGFMT"; then
16706
- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
16707
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
16708
$as_echo "$GMSGFMT" >&6; }
16710
- { $as_echo "$as_me:$LINENO: result: no" >&5
16711
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16712
$as_echo "no" >&6; }
16716
if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
16717
- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
16718
-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
16719
- { (exit 1); exit 1; }; }
16720
+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
16722
xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
16723
mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
16724
mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
16725
if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
16726
- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
16727
-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
16728
- { (exit 1); exit 1; }; }
16729
+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
16732
# Extract the first word of "perl", so it can be a program name with args.
16733
set dummy perl; ac_word=$2
16734
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16735
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16736
$as_echo_n "checking for $ac_word... " >&6; }
16737
-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
16738
+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
16739
$as_echo_n "(cached) " >&6
16741
case $INTLTOOL_PERL in
16742
@@ -20568,14 +17205,14 @@
16745
test -z "$as_dir" && as_dir=.
16746
- for ac_exec_ext in '' $ac_executable_extensions; do
16747
+ for ac_exec_ext in '' $ac_executable_extensions; do
16748
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16749
ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
16750
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16751
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16760
@@ -20583,180 +17220,63 @@
16762
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
16763
if test -n "$INTLTOOL_PERL"; then
16764
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
16765
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
16766
$as_echo "$INTLTOOL_PERL" >&6; }
16768
- { $as_echo "$as_me:$LINENO: result: no" >&5
16769
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16770
$as_echo "no" >&6; }
16774
if test -z "$INTLTOOL_PERL"; then
16775
- { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
16776
-$as_echo "$as_me: error: perl not found" >&2;}
16777
- { (exit 1); exit 1; }; }
16778
+ as_fn_error "perl not found" "$LINENO" 5
16780
-{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
16781
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
16782
$as_echo_n "checking for perl >= 5.8.1... " >&6; }
16783
$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
16784
if test $? -ne 0; then
16785
- { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
16786
-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
16787
- { (exit 1); exit 1; }; }
16788
+ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
16790
IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
16791
- { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
16792
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
16793
$as_echo "$IT_PERL_VERSION" >&6; }
16795
if test "x" != "xno-xml"; then
16796
- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
16797
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
16798
$as_echo_n "checking for XML::Parser... " >&6; }
16799
if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
16800
- { $as_echo "$as_me:$LINENO: result: ok" >&5
16801
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
16802
$as_echo "ok" >&6; }
16804
- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
16805
-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
16806
- { (exit 1); exit 1; }; }
16807
+ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
16811
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
16814
-# Set DATADIRNAME correctly if it is not set yet
16815
-# (copied from glib-gettext.m4)
16816
-if test -z "$DATADIRNAME"; then
16817
- cat >conftest.$ac_ext <<_ACEOF
16820
-cat confdefs.h >>conftest.$ac_ext
16821
-cat >>conftest.$ac_ext <<_ACEOF
16822
-/* end confdefs.h. */
16827
-extern int _nl_msg_cat_cntr;
16828
- return _nl_msg_cat_cntr
16833
-rm -f conftest.$ac_objext conftest$ac_exeext
16834
-if { (ac_try="$ac_link"
16835
-case "(($ac_try" in
16836
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16837
- *) ac_try_echo=$ac_try;;
16839
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16840
-$as_echo "$ac_try_echo") >&5
16841
- (eval "$ac_link") 2>conftest.er1
16843
- grep -v '^ *+' conftest.er1 >conftest.err
16844
- rm -f conftest.er1
16845
- cat conftest.err >&5
16846
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16847
- (exit $ac_status); } && {
16848
- test -z "$ac_c_werror_flag" ||
16849
- test ! -s conftest.err
16850
- } && test -s conftest$ac_exeext && {
16851
- test "$cross_compiling" = yes ||
16852
- $as_test_x conftest$ac_exeext
16854
- DATADIRNAME=share
16856
- $as_echo "$as_me: failed program was:" >&5
16857
-sed 's/^/| /' conftest.$ac_ext >&5
16861
- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
16862
-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
16863
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
16864
- $as_echo_n "(cached) " >&6
16866
- cat >conftest.$ac_ext <<_ACEOF
16869
-cat confdefs.h >>conftest.$ac_ext
16870
-cat >>conftest.$ac_ext <<_ACEOF
16871
-/* end confdefs.h. */
16872
-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
16873
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
16874
-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
16876
-/* System header to define __stub macros and hopefully few prototypes,
16877
- which can conflict with char bind_textdomain_codeset (); below.
16878
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
16879
- <limits.h> exists even on freestanding compilers. */
16882
-# include <limits.h>
16884
-# include <assert.h>
16888
-#undef bind_textdomain_codeset
16889
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
16891
-/* Override any GCC internal prototype to avoid an error.
16892
- Use char because int might match the return type of a GCC
16893
- builtin and then its argument prototype would still apply. */
16894
-#ifdef __cplusplus
16897
-char bind_textdomain_codeset ();
16898
-/* The GNU C library defines this for functions which it implements
16899
- to always fail with ENOSYS. Some functions are actually named
16900
- something starting with __ and the normal name is an alias. */
16901
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
16905
+# Set DATADIRNAME correctly if it is not set yet
16906
+# (copied from glib-gettext.m4)
16907
+if test -z "$DATADIRNAME"; then
16908
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16909
+/* end confdefs.h. */
16914
-return bind_textdomain_codeset ();
16915
+extern int _nl_msg_cat_cntr;
16916
+ return _nl_msg_cat_cntr
16921
-rm -f conftest.$ac_objext conftest$ac_exeext
16922
-if { (ac_try="$ac_link"
16923
-case "(($ac_try" in
16924
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16925
- *) ac_try_echo=$ac_try;;
16927
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16928
-$as_echo "$ac_try_echo") >&5
16929
- (eval "$ac_link") 2>conftest.er1
16931
- grep -v '^ *+' conftest.er1 >conftest.err
16932
- rm -f conftest.er1
16933
- cat conftest.err >&5
16934
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16935
- (exit $ac_status); } && {
16936
- test -z "$ac_c_werror_flag" ||
16937
- test ! -s conftest.err
16938
- } && test -s conftest$ac_exeext && {
16939
- test "$cross_compiling" = yes ||
16940
- $as_test_x conftest$ac_exeext
16942
- ac_cv_func_bind_textdomain_codeset=yes
16943
+if ac_fn_c_try_link "$LINENO"; then :
16944
+ DATADIRNAME=share
16946
- $as_echo "$as_me: failed program was:" >&5
16947
-sed 's/^/| /' conftest.$ac_ext >&5
16949
- ac_cv_func_bind_textdomain_codeset=no
16952
-rm -rf conftest.dSYM
16953
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16954
- conftest$ac_exeext conftest.$ac_ext
16956
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
16957
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
16958
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
16961
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
16962
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
16966
@@ -20768,10 +17288,8 @@
16971
-rm -rf conftest.dSYM
16972
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16973
- conftest$ac_exeext conftest.$ac_ext
16974
+rm -f core conftest.err conftest.$ac_objext \
16975
+ conftest$ac_exeext conftest.$ac_ext
16979
@@ -20795,7 +17313,7 @@
16982
# Check whether --enable-schemas-install was given.
16983
-if test "${enable_schemas_install+set}" = set; then
16984
+if test "${enable_schemas_install+set}" = set; then :
16985
enableval=$enable_schemas_install;
16988
@@ -20811,9 +17329,9 @@
16990
# Extract the first word of "gconftool-2", so it can be a program name with args.
16991
set dummy gconftool-2; ac_word=$2
16992
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16993
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16994
$as_echo_n "checking for $ac_word... " >&6; }
16995
-if test "${ac_cv_path_GCONFTOOL+set}" = set; then
16996
+if test "${ac_cv_path_GCONFTOOL+set}" = set; then :
16997
$as_echo_n "(cached) " >&6
17000
@@ -20826,14 +17344,14 @@
17003
test -z "$as_dir" && as_dir=.
17004
- for ac_exec_ext in '' $ac_executable_extensions; do
17005
+ for ac_exec_ext in '' $ac_executable_extensions; do
17006
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17007
ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
17008
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
17009
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17017
test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
17018
@@ -20842,18 +17360,16 @@
17020
GCONFTOOL=$ac_cv_path_GCONFTOOL
17021
if test -n "$GCONFTOOL"; then
17022
- { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
17023
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5
17024
$as_echo "$GCONFTOOL" >&6; }
17026
- { $as_echo "$as_me:$LINENO: result: no" >&5
17027
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17028
$as_echo "no" >&6; }
17032
if test x"$GCONFTOOL" = "xno"; then
17033
- { { $as_echo "$as_me:$LINENO: error: gconftool-2 executable not found in your path - should be installed with GConf" >&5
17034
-$as_echo "$as_me: error: gconftool-2 executable not found in your path - should be installed with GConf" >&2;}
17035
- { (exit 1); exit 1; }; }
17036
+ as_fn_error "gconftool-2 executable not found in your path - should be installed with GConf" "$LINENO" 5
17039
if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
17040
@@ -20864,13 +17380,13 @@
17043
# Check whether --with-gconf-source was given.
17044
-if test "${with_gconf_source+set}" = set; then
17045
+if test "${with_gconf_source+set}" = set; then :
17046
withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
17051
- { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
17052
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
17053
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
17055
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
17056
@@ -20879,22 +17395,20 @@
17059
# Check whether --with-gconf-schema-file-dir was given.
17060
-if test "${with_gconf_schema_file_dir+set}" = set; then
17061
+if test "${with_gconf_schema_file_dir+set}" = set; then :
17062
withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
17067
- { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
17068
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
17069
$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
17071
# Check whether --enable-schemas-install was given.
17072
-if test "${enable_schemas_install+set}" = set; then
17073
+if test "${enable_schemas_install+set}" = set; then :
17074
enableval=$enable_schemas_install; case ${enableval} in
17076
- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
17077
-$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
17078
- { (exit 1); exit 1; }; } ;;
17079
+ *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
17083
@@ -20938,13 +17452,13 @@
17087
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
17088
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
17089
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
17092
_ | IFS | as_nl) ;; #(
17093
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
17094
- *) $as_unset $ac_var ;;
17095
+ *) { eval $ac_var=; unset $ac_var;} ;;
17099
@@ -20952,8 +17466,8 @@
17101
case $as_nl`(ac_space=' '; set) 2>&1` in #(
17102
*${as_nl}ac_space=\ *)
17103
- # `set' does not quote correctly, so add quotes (double-quote
17104
- # substitution turns \\\\ into \\, and sed turns \\ into \).
17105
+ # `set' does not quote correctly, so add quotes: double-quote
17106
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
17109
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
17110
@@ -20976,11 +17490,11 @@
17111
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
17112
if test -w "$cache_file"; then
17113
test "x$cache_file" != "x/dev/null" &&
17114
- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
17115
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
17116
$as_echo "$as_me: updating cache $cache_file" >&6;}
17117
cat confcache >$cache_file
17119
- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
17120
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
17121
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
17124
@@ -21000,8 +17514,8 @@
17125
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
17126
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
17127
# will be set to the directory where LIBOBJS objects are built.
17128
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
17129
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
17130
+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
17131
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
17133
LIBOBJS=$ac_libobjs
17135
@@ -21017,234 +17531,146 @@
17138
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
17139
- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
17140
-Usually this means the macro was only invoked conditionally." >&5
17141
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
17142
-Usually this means the macro was only invoked conditionally." >&2;}
17143
- { (exit 1); exit 1; }; }
17144
+ as_fn_error "conditional \"AMDEP\" was never defined.
17145
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17147
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
17148
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
17149
-Usually this means the macro was only invoked conditionally." >&5
17150
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
17151
-Usually this means the macro was only invoked conditionally." >&2;}
17152
- { (exit 1); exit 1; }; }
17153
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
17154
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17156
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
17157
- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
17158
-Usually this means the macro was only invoked conditionally." >&5
17159
-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
17160
-Usually this means the macro was only invoked conditionally." >&2;}
17161
- { (exit 1); exit 1; }; }
17162
+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
17163
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17165
if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
17166
- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
17167
-Usually this means the macro was only invoked conditionally." >&5
17168
-$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
17169
-Usually this means the macro was only invoked conditionally." >&2;}
17170
- { (exit 1); exit 1; }; }
17171
+ as_fn_error "conditional \"ENABLE_SK\" was never defined.
17172
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17174
if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
17175
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
17176
-Usually this means the macro was only invoked conditionally." >&5
17177
-$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
17178
-Usually this means the macro was only invoked conditionally." >&2;}
17179
- { (exit 1); exit 1; }; }
17180
+ as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
17181
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17183
if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
17184
- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.
17185
-Usually this means the macro was only invoked conditionally." >&5
17186
-$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined.
17187
-Usually this means the macro was only invoked conditionally." >&2;}
17188
- { (exit 1); exit 1; }; }
17189
+ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
17190
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17192
if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
17193
- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
17194
-Usually this means the macro was only invoked conditionally." >&5
17195
-$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
17196
-Usually this means the macro was only invoked conditionally." >&2;}
17197
- { (exit 1); exit 1; }; }
17198
+ as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
17199
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17201
if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
17202
- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
17203
-Usually this means the macro was only invoked conditionally." >&5
17204
-$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
17205
-Usually this means the macro was only invoked conditionally." >&2;}
17206
- { (exit 1); exit 1; }; }
17207
+ as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
17208
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17210
if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
17211
- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
17212
-Usually this means the macro was only invoked conditionally." >&5
17213
-$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
17214
-Usually this means the macro was only invoked conditionally." >&2;}
17215
- { (exit 1); exit 1; }; }
17216
+ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
17217
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17219
if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
17220
- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_REBASE\" was never defined.
17221
-Usually this means the macro was only invoked conditionally." >&5
17222
-$as_echo "$as_me: error: conditional \"GTK_DOC_USE_REBASE\" was never defined.
17223
-Usually this means the macro was only invoked conditionally." >&2;}
17224
- { (exit 1); exit 1; }; }
17225
+ as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
17226
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17228
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
17229
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
17230
-Usually this means the macro was only invoked conditionally." >&5
17231
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
17232
-Usually this means the macro was only invoked conditionally." >&2;}
17233
- { (exit 1); exit 1; }; }
17234
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
17235
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17237
if test -z "${HAVE_CAM_LIB_H_TRUE}" && test -z "${HAVE_CAM_LIB_H_FALSE}"; then
17238
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CAM_LIB_H\" was never defined.
17239
-Usually this means the macro was only invoked conditionally." >&5
17240
-$as_echo "$as_me: error: conditional \"HAVE_CAM_LIB_H\" was never defined.
17241
-Usually this means the macro was only invoked conditionally." >&2;}
17242
- { (exit 1); exit 1; }; }
17243
+ as_fn_error "conditional \"HAVE_CAM_LIB_H\" was never defined.
17244
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17246
if test -z "${HAVE_SG_IO_HDR_T_TRUE}" && test -z "${HAVE_SG_IO_HDR_T_FALSE}"; then
17247
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_SG_IO_HDR_T\" was never defined.
17248
-Usually this means the macro was only invoked conditionally." >&5
17249
-$as_echo "$as_me: error: conditional \"HAVE_SG_IO_HDR_T\" was never defined.
17250
-Usually this means the macro was only invoked conditionally." >&2;}
17251
- { (exit 1); exit 1; }; }
17252
+ as_fn_error "conditional \"HAVE_SG_IO_HDR_T\" was never defined.
17253
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17255
if test -z "${HAVE_USCSI_H_TRUE}" && test -z "${HAVE_USCSI_H_FALSE}"; then
17256
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_USCSI_H\" was never defined.
17257
-Usually this means the macro was only invoked conditionally." >&5
17258
-$as_echo "$as_me: error: conditional \"HAVE_USCSI_H\" was never defined.
17259
-Usually this means the macro was only invoked conditionally." >&2;}
17260
- { (exit 1); exit 1; }; }
17261
+ as_fn_error "conditional \"HAVE_USCSI_H\" was never defined.
17262
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17264
if test -z "${HAVE_SCSIIO_H_TRUE}" && test -z "${HAVE_SCSIIO_H_FALSE}"; then
17265
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_SCSIIO_H\" was never defined.
17266
-Usually this means the macro was only invoked conditionally." >&5
17267
-$as_echo "$as_me: error: conditional \"HAVE_SCSIIO_H\" was never defined.
17268
-Usually this means the macro was only invoked conditionally." >&2;}
17269
- { (exit 1); exit 1; }; }
17270
+ as_fn_error "conditional \"HAVE_SCSIIO_H\" was never defined.
17271
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17273
if test -z "${BUILD_NAUTILUS_TRUE}" && test -z "${BUILD_NAUTILUS_FALSE}"; then
17274
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_NAUTILUS\" was never defined.
17275
-Usually this means the macro was only invoked conditionally." >&5
17276
-$as_echo "$as_me: error: conditional \"BUILD_NAUTILUS\" was never defined.
17277
-Usually this means the macro was only invoked conditionally." >&2;}
17278
- { (exit 1); exit 1; }; }
17279
+ as_fn_error "conditional \"BUILD_NAUTILUS\" was never defined.
17280
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17282
if test -z "${BUILD_LIBBURNIA_TRUE}" && test -z "${BUILD_LIBBURNIA_FALSE}"; then
17283
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_LIBBURNIA\" was never defined.
17284
-Usually this means the macro was only invoked conditionally." >&5
17285
-$as_echo "$as_me: error: conditional \"BUILD_LIBBURNIA\" was never defined.
17286
-Usually this means the macro was only invoked conditionally." >&2;}
17287
- { (exit 1); exit 1; }; }
17288
+ as_fn_error "conditional \"BUILD_LIBBURNIA\" was never defined.
17289
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17291
if test -z "${BUILD_CDRTOOLS_TRUE}" && test -z "${BUILD_CDRTOOLS_FALSE}"; then
17292
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_CDRTOOLS\" was never defined.
17293
-Usually this means the macro was only invoked conditionally." >&5
17294
-$as_echo "$as_me: error: conditional \"BUILD_CDRTOOLS\" was never defined.
17295
-Usually this means the macro was only invoked conditionally." >&2;}
17296
- { (exit 1); exit 1; }; }
17297
+ as_fn_error "conditional \"BUILD_CDRTOOLS\" was never defined.
17298
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17300
if test -z "${BUILD_CDRDAO_TRUE}" && test -z "${BUILD_CDRDAO_FALSE}"; then
17301
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_CDRDAO\" was never defined.
17302
-Usually this means the macro was only invoked conditionally." >&5
17303
-$as_echo "$as_me: error: conditional \"BUILD_CDRDAO\" was never defined.
17304
-Usually this means the macro was only invoked conditionally." >&2;}
17305
- { (exit 1); exit 1; }; }
17306
+ as_fn_error "conditional \"BUILD_CDRDAO\" was never defined.
17307
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17309
if test -z "${BUILD_CDRKIT_TRUE}" && test -z "${BUILD_CDRKIT_FALSE}"; then
17310
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_CDRKIT\" was never defined.
17311
-Usually this means the macro was only invoked conditionally." >&5
17312
-$as_echo "$as_me: error: conditional \"BUILD_CDRKIT\" was never defined.
17313
-Usually this means the macro was only invoked conditionally." >&2;}
17314
- { (exit 1); exit 1; }; }
17315
+ as_fn_error "conditional \"BUILD_CDRKIT\" was never defined.
17316
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17318
if test -z "${BUILD_GROWISOFS_TRUE}" && test -z "${BUILD_GROWISOFS_FALSE}"; then
17319
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GROWISOFS\" was never defined.
17320
-Usually this means the macro was only invoked conditionally." >&5
17321
-$as_echo "$as_me: error: conditional \"BUILD_GROWISOFS\" was never defined.
17322
-Usually this means the macro was only invoked conditionally." >&2;}
17323
- { (exit 1); exit 1; }; }
17324
+ as_fn_error "conditional \"BUILD_GROWISOFS\" was never defined.
17325
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
4019
@@ -17589,6 +17597,10 @@
4020
as_fn_error "conditional \"BUILD_GROWISOFS\" was never defined.
4021
Usually this means the macro was only invoked conditionally." "$LINENO" 5
17327
4023
+if test -z "${HAVE_APP_INDICATOR_TRUE}" && test -z "${HAVE_APP_INDICATOR_FALSE}"; then
17328
4024
+ as_fn_error "conditional \"HAVE_APP_INDICATOR\" was never defined.
17329
4025
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17331
4027
if test -z "${BUILD_SEARCH_TRUE}" && test -z "${BUILD_SEARCH_FALSE}"; then
17332
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_SEARCH\" was never defined.
17333
-Usually this means the macro was only invoked conditionally." >&5
17334
-$as_echo "$as_me: error: conditional \"BUILD_SEARCH\" was never defined.
17335
-Usually this means the macro was only invoked conditionally." >&2;}
17336
- { (exit 1); exit 1; }; }
17337
+ as_fn_error "conditional \"BUILD_SEARCH\" was never defined.
17338
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17340
if test -z "${BUILD_BEAGLE_TRUE}" && test -z "${BUILD_BEAGLE_FALSE}"; then
17341
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_BEAGLE\" was never defined.
17342
-Usually this means the macro was only invoked conditionally." >&5
17343
-$as_echo "$as_me: error: conditional \"BUILD_BEAGLE\" was never defined.
17344
-Usually this means the macro was only invoked conditionally." >&2;}
17345
- { (exit 1); exit 1; }; }
17346
+ as_fn_error "conditional \"BUILD_BEAGLE\" was never defined.
17347
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17349
if test -z "${BUILD_TRACKER_TRUE}" && test -z "${BUILD_TRACKER_FALSE}"; then
17350
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_TRACKER\" was never defined.
17351
-Usually this means the macro was only invoked conditionally." >&5
17352
-$as_echo "$as_me: error: conditional \"BUILD_TRACKER\" was never defined.
17353
-Usually this means the macro was only invoked conditionally." >&2;}
17354
- { (exit 1); exit 1; }; }
17355
+ as_fn_error "conditional \"BUILD_TRACKER\" was never defined.
17356
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17358
if test -z "${BUILD_PLAYLIST_TRUE}" && test -z "${BUILD_PLAYLIST_FALSE}"; then
17359
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PLAYLIST\" was never defined.
17360
-Usually this means the macro was only invoked conditionally." >&5
17361
-$as_echo "$as_me: error: conditional \"BUILD_PLAYLIST\" was never defined.
17362
-Usually this means the macro was only invoked conditionally." >&2;}
17363
- { (exit 1); exit 1; }; }
17364
+ as_fn_error "conditional \"BUILD_PLAYLIST\" was never defined.
17365
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17367
if test -z "${BUILD_PREVIEW_TRUE}" && test -z "${BUILD_PREVIEW_FALSE}"; then
17368
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PREVIEW\" was never defined.
17369
-Usually this means the macro was only invoked conditionally." >&5
17370
-$as_echo "$as_me: error: conditional \"BUILD_PREVIEW\" was never defined.
17371
-Usually this means the macro was only invoked conditionally." >&2;}
17372
- { (exit 1); exit 1; }; }
17373
+ as_fn_error "conditional \"BUILD_PREVIEW\" was never defined.
17374
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17376
if test -z "${BUILD_INOTIFY_TRUE}" && test -z "${BUILD_INOTIFY_FALSE}"; then
17377
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_INOTIFY\" was never defined.
17378
-Usually this means the macro was only invoked conditionally." >&5
17379
-$as_echo "$as_me: error: conditional \"BUILD_INOTIFY\" was never defined.
17380
-Usually this means the macro was only invoked conditionally." >&2;}
17381
- { (exit 1); exit 1; }; }
17382
+ as_fn_error "conditional \"BUILD_INOTIFY\" was never defined.
17383
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17385
if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
17386
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_INTROSPECTION\" was never defined.
17387
-Usually this means the macro was only invoked conditionally." >&5
17388
-$as_echo "$as_me: error: conditional \"HAVE_INTROSPECTION\" was never defined.
17389
-Usually this means the macro was only invoked conditionally." >&2;}
17390
- { (exit 1); exit 1; }; }
17391
+ as_fn_error "conditional \"HAVE_INTROSPECTION\" was never defined.
17392
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17394
if test -z "${UPDATE_CACHES_TRUE}" && test -z "${UPDATE_CACHES_FALSE}"; then
17395
- { { $as_echo "$as_me:$LINENO: error: conditional \"UPDATE_CACHES\" was never defined.
17396
-Usually this means the macro was only invoked conditionally." >&5
17397
-$as_echo "$as_me: error: conditional \"UPDATE_CACHES\" was never defined.
17398
-Usually this means the macro was only invoked conditionally." >&2;}
17399
- { (exit 1); exit 1; }; }
17400
+ as_fn_error "conditional \"UPDATE_CACHES\" was never defined.
17401
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17404
ac_config_commands="$ac_config_commands po/stamp-it"
17407
if test -z "${SCHEMAS_INSTALL_TRUE}" && test -z "${SCHEMAS_INSTALL_FALSE}"; then
17408
- { { $as_echo "$as_me:$LINENO: error: conditional \"SCHEMAS_INSTALL\" was never defined.
17409
-Usually this means the macro was only invoked conditionally." >&5
17410
-$as_echo "$as_me: error: conditional \"SCHEMAS_INSTALL\" was never defined.
17411
-Usually this means the macro was only invoked conditionally." >&2;}
17412
- { (exit 1); exit 1; }; }
17413
+ as_fn_error "conditional \"SCHEMAS_INSTALL\" was never defined.
17414
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17416
if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
17417
- { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
17418
-Usually this means the macro was only invoked conditionally." >&5
17419
-$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
17420
-Usually this means the macro was only invoked conditionally." >&2;}
17421
- { (exit 1); exit 1; }; }
17422
+ as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
17423
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17426
: ${CONFIG_STATUS=./config.status}
17428
ac_clean_files_save=$ac_clean_files
17429
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
17430
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
17431
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
17432
$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
17433
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
17435
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
17437
# Generated by $as_me.
17438
# Run this file to recreate the current configuration.
17439
@@ -21254,17 +17680,18 @@
17441
ac_cs_recheck=false
17443
-SHELL=\${CONFIG_SHELL-$SHELL}
17446
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
17447
-## --------------------- ##
17448
-## M4sh Initialization. ##
17449
-## --------------------- ##
17450
+SHELL=\${CONFIG_SHELL-$SHELL}
17453
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
17454
+## -------------------- ##
17455
+## M4sh Initialization. ##
17456
+## -------------------- ##
17458
# Be more Bourne compatible
17459
DUALCASE=1; export DUALCASE # for MKS sh
17460
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
17461
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
17464
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
17465
@@ -21272,23 +17699,15 @@
17466
alias -g '${1+"$@"}'='"$@"'
17467
setopt NO_GLOB_SUBST
17469
- case `(set -o) 2>/dev/null` in
17470
- *posix*) set -o posix ;;
17471
+ case `(set -o) 2>/dev/null` in #(
17473
+ set -o posix ;; #(
17484
-# Avoid depending upon Character Ranges.
17485
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
17486
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
17487
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
17488
-as_cr_digits='0123456789'
17489
-as_cr_alnum=$as_cr_Letters$as_cr_digits
17494
@@ -21296,7 +17715,13 @@
17495
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
17496
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
17497
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
17498
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
17499
+# Prefer a ksh shell builtin over an external printf program on Solaris,
17500
+# but without wasting forks for bash or zsh.
17501
+if test -z "$BASH_VERSION$ZSH_VERSION" \
17502
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
17503
+ as_echo='print -r --'
17504
+ as_echo_n='print -rn --'
17505
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
17506
as_echo='printf %s\n'
17507
as_echo_n='printf %s'
17509
@@ -21307,7 +17732,7 @@
17510
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
17511
as_echo_n_body='eval
17516
expr "X$arg" : "X\\(.*\\)$as_nl";
17517
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
17518
@@ -21330,13 +17755,6 @@
17522
-# Support unset when possible.
17523
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
17531
# We need space, tab and new line, in precisely that order. Quoting is
17532
@@ -21346,15 +17764,15 @@
17535
# Find who we are. Look in the path if we contain no directory separator.
17538
*[\\/]* ) as_myself=$0 ;;
17539
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17540
for as_dir in $PATH
17543
test -z "$as_dir" && as_dir=.
17544
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
17546
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
17551
@@ -21366,12 +17784,16 @@
17553
if test ! -f "$as_myself"; then
17554
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
17555
- { (exit 1); exit 1; }
17559
-# Work around bugs in pre-3.0 UWIN ksh.
17560
-for as_var in ENV MAIL MAILPATH
17561
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
17562
+# Unset variables that we do not need and which cause bugs (e.g. in
17563
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
17564
+# suppresses any "Segmentation fault" message there. '((' could
17565
+# trigger a bug in pdksh 5.2.14.
17566
+for as_var in BASH_ENV ENV MAIL MAILPATH
17567
+do eval test x\${$as_var+set} = xset \
17568
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
17572
@@ -21383,7 +17805,89 @@
17576
-# Required to use basename.
17578
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
17581
+# as_fn_error ERROR [LINENO LOG_FD]
17582
+# ---------------------------------
17583
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
17584
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
17585
+# script with status $?, using 1 if that was 0.
17588
+ as_status=$?; test $as_status -eq 0 && as_status=1
17589
+ if test "$3"; then
17590
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
17591
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
17593
+ $as_echo "$as_me: error: $1" >&2
17594
+ as_fn_exit $as_status
17598
+# as_fn_set_status STATUS
17599
+# -----------------------
17600
+# Set $? to STATUS, without forking.
17601
+as_fn_set_status ()
17604
+} # as_fn_set_status
17606
+# as_fn_exit STATUS
17607
+# -----------------
17608
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
17612
+ as_fn_set_status $1
17618
+# Portably unset VAR.
17621
+ { eval $1=; unset $1;}
17623
+as_unset=as_fn_unset
17624
+# as_fn_append VAR VALUE
17625
+# ----------------------
17626
+# Append the text in VALUE to the end of the definition contained in VAR. Take
17627
+# advantage of any shell optimizations that allow amortized linear growth over
17628
+# repeated appends, instead of the typical quadratic growth present in naive
17629
+# implementations.
17630
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
17631
+ eval 'as_fn_append ()
17642
+# as_fn_arith ARG...
17643
+# ------------------
17644
+# Perform arithmetic evaluation on the ARGs, and store the result in the
17645
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
17646
+# must be portable across $(()) and expr.
17647
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
17648
+ eval 'as_fn_arith ()
17655
+ as_val=`expr "$@" || test $? -eq 1`
17660
if expr a : '\(a\)' >/dev/null 2>&1 &&
17661
test "X`expr 00001 : '.*\(...\)'`" = X001; then
17663
@@ -21397,8 +17901,12 @@
17667
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
17668
+ as_dirname=dirname
17673
-# Name of the executable.
17674
as_me=`$as_basename -- "$0" ||
17675
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
17676
X"$0" : 'X\(//\)$' \| \
17677
@@ -21418,76 +17926,25 @@
17686
- as_lineno_1=$LINENO
17687
- as_lineno_2=$LINENO
17688
- test "x$as_lineno_1" != "x$as_lineno_2" &&
17689
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
17691
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
17692
- # uniformly replaced by the line number. The first 'sed' inserts a
17693
- # line-number line after each line using $LINENO; the second 'sed'
17694
- # does the real work. The second script uses 'N' to pair each
17695
- # line-number line with the line containing $LINENO, and appends
17696
- # trailing '-' during substitution so that $LINENO is not a special
17697
- # case at line end.
17698
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
17699
- # scripts with optimization help from Paolo Bonzini. Blame Lee
17700
- # E. McMahon (1931-1989) for sed's syntax. :-)
17706
- s/[$]LINENO.*/&-/
17712
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
17715
- ' >$as_me.lineno &&
17716
- chmod +x "$as_me.lineno" ||
17717
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
17718
- { (exit 1); exit 1; }; }
17720
- # Don't try to exec as it changes $[0], causing all sort of problems
17721
- # (the dirname of $[0] is not the place where we might find the
17722
- # original and so on. Autoconf is especially sensitive to this).
17723
- . "./$as_me.lineno"
17724
- # Exit status is that of the last command.
17729
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
17730
- as_dirname=dirname
17734
+# Avoid depending upon Character Ranges.
17735
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
17736
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
17737
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
17738
+as_cr_digits='0123456789'
17739
+as_cr_alnum=$as_cr_Letters$as_cr_digits
17741
ECHO_C= ECHO_N= ECHO_T=
17742
-case `echo -n x` in
17743
+case `echo -n x` in #(((((
17745
- case `echo 'x\c'` in
17746
+ case `echo 'xy\c'` in
17747
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
17749
+ xy) ECHO_C='\c';;
17750
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
17756
-if expr a : '\(a\)' >/dev/null 2>&1 &&
17757
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
17763
rm -f conf$$ conf$$.exe conf$$.file
17764
if test -d conf$$.dir; then
17765
@@ -21516,8 +17973,56 @@
17766
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
17767
rmdir conf$$.dir 2>/dev/null
17772
+# Create "$as_dir" as a directory, including parents if necessary.
17776
+ case $as_dir in #(
17777
+ -*) as_dir=./$as_dir;;
17779
+ test -d "$as_dir" || eval $as_mkdir_p || {
17782
+ case $as_dir in #(
17783
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
17784
+ *) as_qdir=$as_dir;;
17786
+ as_dirs="'$as_qdir' $as_dirs"
17787
+ as_dir=`$as_dirname -- "$as_dir" ||
17788
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
17789
+ X"$as_dir" : 'X\(//\)[^/]' \| \
17790
+ X"$as_dir" : 'X\(//\)$' \| \
17791
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
17792
+$as_echo X"$as_dir" |
17793
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
17797
+ /^X\(\/\/\)[^/].*/{
17810
+ test -d "$as_dir" && break
17812
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
17813
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
17817
if mkdir -p . 2>/dev/null; then
17819
+ as_mkdir_p='mkdir -p "$as_dir"'
17821
test -d ./-p && rmdir ./-p
17823
@@ -21536,10 +18041,10 @@
17824
if test -d "$1"; then
17831
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
17832
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
17833
???[sx]*):;;*)false;;esac;fi
17836
@@ -21554,13 +18059,19 @@
17840
+## ----------------------------------- ##
17841
+## Main body of $CONFIG_STATUS script. ##
17842
+## ----------------------------------- ##
17844
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
17846
-# Save the log message, to keep $[0] and so on meaningful, and to
17847
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
17848
+# Save the log message, to keep $0 and so on meaningful, and to
17849
# report actual input values of CONFIG_FILES etc. instead of their
17850
# values after options handling.
17852
This file was extended by brasero $as_me 2.30.1, which was
17853
-generated by GNU Autoconf 2.63. Invocation command line was
17854
+generated by GNU Autoconf 2.65. Invocation command line was
17856
CONFIG_FILES = $CONFIG_FILES
17857
CONFIG_HEADERS = $CONFIG_HEADERS
17858
@@ -21592,13 +18103,15 @@
17860
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
17862
-\`$as_me' instantiates files from templates according to the
17863
-current configuration.
17864
+\`$as_me' instantiates files and other configuration actions
17865
+from templates according to the current configuration. Unless the files
17866
+and actions are specified as TAGs, all are instantiated by default.
17868
-Usage: $0 [OPTION]... [FILE]...
17869
+Usage: $0 [OPTION]... [TAG]...
17871
-h, --help print this help, then exit
17872
-V, --version print version number and configuration settings, then exit
17873
+ --config print configuration, then exit
17874
-q, --quiet, --silent
17875
do not print progress messages
17876
-d, --debug don't remove temporary files
17877
@@ -21617,16 +18130,17 @@
17878
Configuration commands:
17881
-Report bugs to <bug-autoconf@gnu.org>."
17882
+Report bugs to the package provider."
17885
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
17886
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
17888
brasero config.status 2.30.1
17889
-configured by $0, generated by GNU Autoconf 2.63,
17890
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
17891
+configured by $0, generated by GNU Autoconf 2.65,
17892
+ with options \\"\$ac_cs_config\\"
17894
-Copyright (C) 2008 Free Software Foundation, Inc.
17895
+Copyright (C) 2009 Free Software Foundation, Inc.
17896
This config.status script is free software; the Free Software Foundation
17897
gives unlimited permission to copy, distribute and modify it."
17899
@@ -21662,6 +18176,8 @@
17901
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
17902
$as_echo "$ac_cs_version"; exit ;;
17903
+ --config | --confi | --conf | --con | --co | --c )
17904
+ $as_echo "$ac_cs_config"; exit ;;
17905
--debug | --debu | --deb | --de | --d | -d )
17907
--file | --fil | --fi | --f )
17908
@@ -21669,20 +18185,19 @@
17910
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
17912
- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
17913
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
17914
ac_need_defaults=false;;
17915
--header | --heade | --head | --hea )
17918
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
17920
- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
17921
+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"
17922
ac_need_defaults=false;;
17924
# Conflict between --help and --header
17925
- { $as_echo "$as_me: error: ambiguous option: $1
17926
-Try \`$0 --help' for more information." >&2
17927
- { (exit 1); exit 1; }; };;
17928
+ as_fn_error "ambiguous option: \`$1'
17929
+Try \`$0 --help' for more information.";;
17930
--help | --hel | -h )
17931
$as_echo "$ac_cs_usage"; exit ;;
17932
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
17933
@@ -21690,11 +18205,10 @@
17936
# This is an error.
17937
- -*) { $as_echo "$as_me: error: unrecognized option: $1
17938
-Try \`$0 --help' for more information." >&2
17939
- { (exit 1); exit 1; }; } ;;
17940
+ -*) as_fn_error "unrecognized option: \`$1'
17941
+Try \`$0 --help' for more information." ;;
17943
- *) ac_config_targets="$ac_config_targets $1"
17944
+ *) as_fn_append ac_config_targets " $1"
17945
ac_need_defaults=false ;;
17948
@@ -22045,9 +18559,7 @@
17949
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
17950
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
17952
- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
17953
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
17954
- { (exit 1); exit 1; }; };;
17955
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
17959
@@ -22074,7 +18586,7 @@
17960
trap 'exit_status=$?
17961
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
17963
- trap '{ (exit 1); exit 1; }' 1 2 13 15
17964
+ trap 'as_fn_exit 1' 1 2 13 15
17966
# Create a (secure) tmp directory for tmp files.
17968
@@ -22085,11 +18597,7 @@
17970
tmp=./conf$$-$RANDOM
17971
(umask 077 && mkdir "$tmp")
4028
as_fn_error "conditional \"BUILD_SEARCH\" was never defined.
4029
Usually this means the macro was only invoked conditionally." "$LINENO" 5
4030
@@ -18230,143 +18242,131 @@
4031
sed_quote_subst='$sed_quote_subst'
4032
double_quote_subst='$double_quote_subst'
4033
delay_variable_subst='$delay_variable_subst'
4034
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
4035
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
4036
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
4037
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
4038
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
4039
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
4040
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
4041
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
4042
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
4043
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
4044
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
4045
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
4046
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
4047
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
4048
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
4049
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
4050
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
4051
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
4052
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
4053
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
4054
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
4055
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
4056
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
4057
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
4058
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
4059
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
4060
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
4061
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
4062
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
4063
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
4064
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
4065
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
4066
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
4067
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
4068
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
4069
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
4070
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
4071
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
4072
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
4073
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
4074
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
4075
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
4076
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
4077
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
4078
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
4079
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
4080
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
4081
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
4082
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
4083
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
4084
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
4085
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
4086
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
4087
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
4088
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
4089
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
4090
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
4091
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
4092
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
4093
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
4094
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
4095
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
4096
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
4097
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
4098
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
4099
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
4100
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
4101
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
4102
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
4103
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
4104
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
4105
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
4106
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
4107
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
4108
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
4109
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
4110
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
4111
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
4112
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
4113
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
4114
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
4115
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
4116
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
4117
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
4118
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
4119
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
4120
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
4121
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
4122
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
4123
-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
4124
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
4125
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
4126
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
4127
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
4128
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
4129
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
4130
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
4131
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
4132
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
4133
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
4134
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
4135
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
4136
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
4137
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
4138
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
4139
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
4140
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
4141
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
4142
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
4143
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
4144
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
4145
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
4146
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
4147
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
4148
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
4149
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
4150
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
4151
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
4152
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
4153
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
4154
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
4155
+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
4156
+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
4157
+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
4158
+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
4159
+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
4160
+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
4161
+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
4162
+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
4163
+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
4164
+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
4165
+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
4166
+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
4167
+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
4168
+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
4169
+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
4170
+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
4171
+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
4172
+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
4173
+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
4174
+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
4175
+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
4176
+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
4177
+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
4178
+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
4179
+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
4180
+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
4181
+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4182
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
4183
+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
4184
+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
4185
+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
4186
+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
4187
+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
4188
+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
4189
+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4190
+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4191
+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4192
+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
4193
+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
4194
+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
4195
+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
4196
+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
4197
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
4198
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
4199
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
4200
+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
4201
+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
4202
+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
4203
+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
4204
+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
4205
+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
4206
+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
4207
+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
4208
+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
4209
+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
4210
+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
4211
+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
4212
+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
4213
+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
4214
+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
4215
+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
4216
+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4217
+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4218
+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
4219
+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
4220
+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
4221
+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
4222
+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
4223
+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4224
+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4225
+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4226
+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4227
+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4228
+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4229
+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
4230
+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
4231
+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
4232
+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
4233
+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
4234
+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
4235
+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
4236
+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
4237
+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
4238
+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
4239
+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
4240
+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
4241
+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
4242
+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
4243
+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
4244
+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4245
+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
4246
+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
4247
+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4248
+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
4249
+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
4250
+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
4251
+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
4252
+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
4253
+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
4254
+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
4255
+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
4256
+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
4257
+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
4258
+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
4259
+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4260
+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4261
+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4262
+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
4263
+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
4264
+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
4265
+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
4266
+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
4267
+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
4268
+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
4269
+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
4270
+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
4271
+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
4274
LTCFLAGS='$LTCFLAGS'
4275
compiler='$compiler_DEFAULT'
4277
-# A function that is used when there is no print builtin or printf.
4278
-func_fallback_echo ()
17974
- $as_echo "$as_me: cannot create a temporary directory in ." >&2
17975
- { (exit 1); exit 1; }
4280
- eval 'cat <<_LTECHO_EOF
17977
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
17979
# Set up the scripts for CONFIG_FILES section.
17980
# No need to generate them if there are no CONFIG_FILES.
17981
@@ -22097,10 +18605,16 @@
17982
if test -n "$CONFIG_FILES"; then
17986
+ac_cr=`echo X | tr X '\015'`
17987
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
17988
+# But we know of no other shell where ac_cr would be empty at this
17989
+# point, so we can use a bashism as a fallback.
17990
+if test "x$ac_cr" = x; then
17991
+ eval ac_cr=\$\'\\r\'
17993
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
17994
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
17995
- ac_cs_awk_cr='\\r'
17996
+ ac_cs_awk_cr='\r'
17998
ac_cs_awk_cr=$ac_cr
18000
@@ -22114,24 +18628,18 @@
18001
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
18003
} >conf$$subs.sh ||
18004
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
18005
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
18006
- { (exit 1); exit 1; }; }
18007
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
18008
ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
18010
for ac_last_try in false false false false false :; do
18011
. ./conf$$subs.sh ||
18012
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
18013
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
18014
- { (exit 1); exit 1; }; }
18015
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
18017
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
18018
if test $ac_delim_n = $ac_delim_num; then
18020
elif $ac_last_try; then
18021
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
18022
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
18023
- { (exit 1); exit 1; }; }
18024
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
18026
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
18028
@@ -22153,7 +18661,7 @@
18032
-s/\(.\{148\}\).*/\1/
18033
+s/\(.\{148\}\)..*/\1/
18035
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
18037
@@ -22167,7 +18675,7 @@
18041
-s/\(.\{148\}\).*/\1/
18042
+s/\(.\{148\}\)..*/\1/
18044
s/["\\]/\\&/g; s/^/"/; s/$/"/
18046
@@ -22220,9 +18728,7 @@
18049
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
18050
- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
18051
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
18052
- { (exit 1); exit 1; }; }
18053
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
18056
# VPATH may cause trouble with some makes, so we remove $(srcdir),
18057
@@ -22263,9 +18769,7 @@
18058
if test -z "$ac_t"; then
18060
elif $ac_last_try; then
18061
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
18062
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
18063
- { (exit 1); exit 1; }; }
18064
+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
18066
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
18068
@@ -22350,9 +18854,7 @@
18071
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
18072
- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
18073
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
18074
- { (exit 1); exit 1; }; }
18075
+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
18076
fi # test -n "$CONFIG_HEADERS"
18079
@@ -22365,9 +18867,7 @@
18081
case $ac_mode$ac_tag in
18083
- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
18084
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
18085
- { (exit 1); exit 1; }; };;
18086
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
18087
:[FH]-) ac_tag=-:-;;
18088
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
18090
@@ -22395,12 +18895,10 @@
18092
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
18094
- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
18095
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
18096
- { (exit 1); exit 1; }; };;
18097
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
18099
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
18100
- ac_file_inputs="$ac_file_inputs '$ac_f'"
18101
+ as_fn_append ac_file_inputs " '$ac_f'"
18104
# Let's still pretend it is `configure' which instantiates (i.e., don't
18105
@@ -22411,7 +18909,7 @@
18107
if test x"$ac_file" != x-; then
18108
configure_input="$ac_file. $configure_input"
18109
- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
18110
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
18111
$as_echo "$as_me: creating $ac_file" >&6;}
18113
# Neutralize special characters interpreted by sed in replacement strings.
18114
@@ -22424,9 +18922,7 @@
18117
*:-:* | *:-) cat >"$tmp/stdin" \
18118
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
18119
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
18120
- { (exit 1); exit 1; }; } ;;
18121
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
4285
# Quote evaled strings.
4293
@@ -18390,6 +18390,8 @@
4294
lt_cv_sys_global_symbol_to_cdecl \
4295
lt_cv_sys_global_symbol_to_c_name_address \
4296
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
4299
lt_prog_compiler_no_builtin_flag \
4300
lt_prog_compiler_wl \
4301
lt_prog_compiler_pic \
4302
@@ -18419,13 +18421,12 @@
4304
library_names_spec \
4306
-install_override_mode \
4310
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
4311
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
4312
*[\\\\\\\`\\"\\\$]*)
4313
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
4314
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
4317
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
4318
@@ -18452,9 +18453,9 @@
4320
sys_lib_search_path_spec \
4321
sys_lib_dlsearch_path_spec; do
4322
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
4323
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
4324
*[\\\\\\\`\\"\\\$]*)
4325
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
4326
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
4329
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
4330
@@ -18462,6 +18463,12 @@
18125
@@ -22454,47 +18950,7 @@
18129
- { as_dir="$ac_dir"
18130
- case $as_dir in #(
18131
- -*) as_dir=./$as_dir;;
18133
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
18136
- case $as_dir in #(
18137
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
18138
- *) as_qdir=$as_dir;;
18140
- as_dirs="'$as_qdir' $as_dirs"
18141
- as_dir=`$as_dirname -- "$as_dir" ||
18142
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
18143
- X"$as_dir" : 'X\(//\)[^/]' \| \
18144
- X"$as_dir" : 'X\(//\)$' \| \
18145
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
18146
-$as_echo X"$as_dir" |
18147
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
18151
- /^X\(\/\/\)[^/].*/{
18164
- test -d "$as_dir" && break
18166
- test -z "$as_dirs" || eval "mkdir $as_dirs"
18167
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
18168
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
18169
- { (exit 1); exit 1; }; }; }
18170
+ as_dir="$ac_dir"; as_fn_mkdir_p
18174
@@ -22551,7 +19007,6 @@
18175
# If the template does not know about datarootdir, expand it.
18176
# FIXME: This hack should be removed a few years after 2.60.
18177
ac_datarootdir_hack=; ac_datarootdir_seen=
18182
@@ -22561,12 +19016,11 @@
18189
case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
18190
*datarootdir*) ac_datarootdir_seen=yes;;
18191
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
18192
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
18193
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
18194
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
18196
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
18197
@@ -22576,7 +19030,7 @@
18198
s&@infodir@&$infodir&g
18199
s&@localedir@&$localedir&g
18200
s&@mandir@&$mandir&g
18201
- s&\\\${datarootdir}&$datarootdir&g' ;;
18202
+ s&\\\${datarootdir}&$datarootdir&g' ;;
18206
@@ -22605,14 +19059,12 @@
18207
$ac_datarootdir_hack
18209
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
18210
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
18211
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
18212
- { (exit 1); exit 1; }; }
18213
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
18215
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
18216
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
18217
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
18218
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
18219
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
18220
which seems to be undefined. Please make sure it is defined." >&5
18221
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
18222
which seems to be undefined. Please make sure it is defined." >&2;}
18223
@@ -22622,9 +19074,7 @@
18224
-) cat "$tmp/out" && rm -f "$tmp/out";;
18225
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
18227
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
18228
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
18229
- { (exit 1); exit 1; }; }
18230
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
18234
@@ -22635,25 +19085,19 @@
18235
$as_echo "/* $configure_input */" \
18236
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
18237
} >"$tmp/config.h" \
18238
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
18239
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
18240
- { (exit 1); exit 1; }; }
18241
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
18242
if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
18243
- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
18244
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
18245
$as_echo "$as_me: $ac_file is unchanged" >&6;}
18248
mv "$tmp/config.h" "$ac_file" \
18249
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
18250
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
18251
- { (exit 1); exit 1; }; }
18252
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
4334
+# Fix-up fallback echo if it was mangled by the above quoting rules.
4336
+*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
4340
ac_aux_dir='$ac_aux_dir'
4341
xsi_shell='$xsi_shell'
4342
lt_shell_append='$lt_shell_append'
4343
@@ -19234,8 +19241,7 @@
4344
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
4346
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
4347
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
4349
+# 2006, 2007, 2008 Free Software Foundation, Inc.
4350
# Written by Gordon Matzigkeit, 1996
4352
# This file is part of GNU Libtool.
4353
@@ -19283,12 +19289,6 @@
4354
# Whether or not to optimize for fast installation.
4355
fast_install=$enable_fast_install
4357
-# Shell to use when invoking shell scripts.
4360
-# An echo program that protects backslashes.
4364
host_alias=$host_alias
4366
@@ -19338,6 +19338,10 @@
4367
# turn newlines into spaces.
4370
+# How to create reloadable object files.
4371
+reload_flag=$lt_reload_flag
4372
+reload_cmds=$lt_reload_cmds
4374
# An object symbol dumper.
4377
@@ -19359,9 +19363,6 @@
4378
old_postinstall_cmds=$lt_old_postinstall_cmds
4379
old_postuninstall_cmds=$lt_old_postuninstall_cmds
4381
-# Whether to use a lock for old archive extraction.
4382
-lock_old_archive_extraction=$lock_old_archive_extraction
4387
@@ -19383,6 +19384,12 @@
4388
# The name of the directory that contains temporary libtool files.
4391
+# Shell to use when invoking shell scripts.
4394
+# An echo program that does not interpret backslashes.
4397
# Used to examine libraries when file_magic_cmd begins with "file".
4398
MAGIC_CMD=$MAGIC_CMD
4400
@@ -19445,9 +19452,6 @@
4401
# The coded name of the library, if different from the real name.
4402
soname_spec=$lt_soname_spec
4404
-# Permission mode override for installation of shared libraries.
4405
-install_override_mode=$lt_install_override_mode
4407
# Command to use after installation of a shared archive.
4408
postinstall_cmds=$lt_postinstall_cmds
4410
@@ -19487,10 +19491,6 @@
4411
# The linker used to build libraries.
4414
-# How to create reloadable object files.
4415
-reload_flag=$lt_reload_flag
4416
-reload_cmds=$lt_reload_cmds
4418
# Commands used to build an old-style archive.
4419
old_archive_cmds=$lt_old_archive_cmds
4421
@@ -19750,7 +19750,7 @@
4424
# Extract subdirectory from the argument.
4425
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
4426
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
4427
if test "X$func_dirname_result" = "X${1}"; then
4428
func_dirname_result="${3}"
18255
$as_echo "/* $configure_input */" \
18256
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
18257
- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
18258
-$as_echo "$as_me: error: could not create -" >&2;}
18259
- { (exit 1); exit 1; }; }
18260
+ || as_fn_error "could not create -" "$LINENO" 5
18262
# Compute "$ac_file"'s index in $config_headers.
18264
@@ -22691,7 +19135,7 @@
18265
s/.*/./; q'`/stamp-h$_am_stamp_count
18268
- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
18269
+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
18270
$as_echo "$as_me: executing $ac_file commands" >&6;}
4430
@@ -19761,7 +19761,7 @@
4431
# func_basename file
4434
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
4435
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
4439
@@ -19774,8 +19774,10 @@
4443
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
4444
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
4445
+ .*) func_stripname_result=`$ECHO "X${3}" \
4446
+ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
4447
+ *) func_stripname_result=`$ECHO "X${3}" \
4448
+ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
18273
@@ -22786,47 +19230,7 @@
18277
- { as_dir=$dirpart/$fdir
18278
- case $as_dir in #(
18279
- -*) as_dir=./$as_dir;;
18281
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
18284
- case $as_dir in #(
18285
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
18286
- *) as_qdir=$as_dir;;
18288
- as_dirs="'$as_qdir' $as_dirs"
18289
- as_dir=`$as_dirname -- "$as_dir" ||
18290
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
18291
- X"$as_dir" : 'X\(//\)[^/]' \| \
18292
- X"$as_dir" : 'X\(//\)$' \| \
18293
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
18294
-$as_echo X"$as_dir" |
18295
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
18299
- /^X\(\/\/\)[^/].*/{
18312
- test -d "$as_dir" && break
18314
- test -z "$as_dirs" || eval "mkdir $as_dirs"
18315
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
18316
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
18317
- { (exit 1); exit 1; }; }; }
18318
+ as_dir=$dirpart/$fdir; as_fn_mkdir_p
18319
# echo "creating $dirpart/$file"
18320
echo '# dummy' > "$dirpart/$file"
18322
@@ -23476,9 +19880,7 @@
18325
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
18326
- { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
18327
-$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
18328
- { (exit 1); exit 1; }; }
18329
+ as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
18331
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
18333
@@ -23501,15 +19903,12 @@
18337
-{ (exit 0); exit 0; }
18340
-chmod +x $CONFIG_STATUS
18341
ac_clean_files=$ac_clean_files_save
18343
test $ac_write_fail = 0 ||
18344
- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
18345
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
18346
- { (exit 1); exit 1; }; }
18347
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
18350
# configure is writing to config.log, and then calls config.status.
18351
@@ -23530,10 +19929,10 @@
18353
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
18354
# would make configure fail if this is the last instruction.
18355
- $ac_cs_success || { (exit 1); exit 1; }
18356
+ $ac_cs_success || as_fn_exit $?
18358
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
18359
- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
18360
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
18361
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
18364
@@ -23557,6 +19956,7 @@
4452
@@ -19786,20 +19788,20 @@
4456
- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
4457
- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
4458
+ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
4459
+ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
4465
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
4466
+ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
4469
# func_xform libobj-or-source
4472
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
4473
+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
4476
# func_arith arithmetic-term...
4477
@@ -19937,6 +19939,7 @@
18365
4478
Build growisofs plugins : ${build_growisofs}
18366
4479
Build libburnia plugins : ${build_libburnia}
18367
4480
Build GObject-Introspection : ${found_introspection}
18870
5291
: ${MKDIR="mkdir"}
18871
5292
: ${MV="mv -f"}
18872
5293
: ${RM="rm -f"}
18873
-: ${SED="/opt/local/bin/gsed"}
18874
5295
+: ${SED="/bin/sed"}
18875
5296
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
18876
5297
: ${Xsed="$SED -e 1s/^X//"}
18878
@@ -5033,7 +5033,10 @@
5299
@@ -178,168 +159,32 @@
5300
func_dirname_and_basename ()
5302
# Extract subdirectory from the argument.
5303
- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
5304
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
5305
if test "X$func_dirname_result" = "X${1}"; then
5306
func_dirname_result="${3}"
5308
func_dirname_result="$func_dirname_result${2}"
5310
- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
5311
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
5314
# Generated shell functions inserted here.
5316
-# These SED scripts presuppose an absolute path with a trailing slash.
5317
-pathcar='s,^/\([^/]*\).*$,\1,'
5318
-pathcdr='s,^/[^/]*,,'
5319
-removedotparts=':dotsl
5323
-collapseslashes='s@/\{1,\}@/@g'
5324
-finalslash='s,/*$,/,'
5326
-# func_normal_abspath PATH
5327
-# Remove doubled-up and trailing slashes, "." path components,
5328
-# and cancel out any ".." path components in PATH after making
5329
-# it an absolute path.
5330
-# value returned in "$func_normal_abspath_result"
5331
-func_normal_abspath ()
5333
- # Start from root dir and reassemble the path.
5334
- func_normal_abspath_result=
5335
- func_normal_abspath_tpath=$1
5336
- func_normal_abspath_altnamespace=
5337
- case $func_normal_abspath_tpath in
5339
- # Empty path, that just means $cwd.
5340
- func_stripname '' '/' "`pwd`"
5341
- func_normal_abspath_result=$func_stripname_result
5344
- # The next three entries are used to spot a run of precisely
5345
- # two leading slashes without using negated character classes;
5346
- # we take advantage of case's first-match behaviour.
5348
- # Unusual form of absolute path, do nothing.
5351
- # Not necessarily an ordinary path; POSIX reserves leading '//'
5352
- # and for example Cygwin uses it to access remote file shares
5353
- # over CIFS/SMB, so we conserve a leading double slash if found.
5354
- func_normal_abspath_altnamespace=/
5357
- # Absolute path, do nothing.
5360
- # Relative path, prepend $cwd.
5361
- func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
5364
- # Cancel out all the simple stuff to save iterations. We also want
5365
- # the path to end with a slash for ease of parsing, so make sure
5366
- # there is one (and only one) here.
5367
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
5368
- -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
5370
- # Processed it all yet?
5371
- if test "$func_normal_abspath_tpath" = / ; then
5372
- # If we ascended to the root using ".." the result may be empty now.
5373
- if test -z "$func_normal_abspath_result" ; then
5374
- func_normal_abspath_result=/
5378
- func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
5380
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
5382
- # Figure out what to do with it
5383
- case $func_normal_abspath_tcomponent in
5385
- # Trailing empty path component, ignore it.
5388
- # Parent dir; strip last assembled component from result.
5389
- func_dirname "$func_normal_abspath_result"
5390
- func_normal_abspath_result=$func_dirname_result
5393
- # Actual path component, append it.
5394
- func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
5398
- # Restore leading double-slash if one was found on entry.
5399
- func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
5402
-# func_relative_path SRCDIR DSTDIR
5403
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
5404
-# slash if non-empty, suitable for immediately appending a filename
5405
-# without needing to append a separator.
5406
-# value returned in "$func_relative_path_result"
5407
-func_relative_path ()
5409
- func_relative_path_result=
5410
- func_normal_abspath "$1"
5411
- func_relative_path_tlibdir=$func_normal_abspath_result
5412
- func_normal_abspath "$2"
5413
- func_relative_path_tbindir=$func_normal_abspath_result
5415
- # Ascend the tree starting from libdir
5417
- # check if we have found a prefix of bindir
5418
- case $func_relative_path_tbindir in
5419
- $func_relative_path_tlibdir)
5420
- # found an exact match
5421
- func_relative_path_tcancelled=
5424
- $func_relative_path_tlibdir*)
5425
- # found a matching prefix
5426
- func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
5427
- func_relative_path_tcancelled=$func_stripname_result
5428
- if test -z "$func_relative_path_result"; then
5429
- func_relative_path_result=.
5434
- func_dirname $func_relative_path_tlibdir
5435
- func_relative_path_tlibdir=${func_dirname_result}
5436
- if test "x$func_relative_path_tlibdir" = x ; then
5437
- # Have to descend all the way to the root!
5438
- func_relative_path_result=../$func_relative_path_result
5439
- func_relative_path_tcancelled=$func_relative_path_tbindir
5442
- func_relative_path_result=../$func_relative_path_result
5447
- # Now calculate path; take care to avoid doubling-up slashes.
5448
- func_stripname '' '/' "$func_relative_path_result"
5449
- func_relative_path_result=$func_stripname_result
5450
- func_stripname '/' '/' "$func_relative_path_tcancelled"
5451
- if test "x$func_stripname_result" != x ; then
5452
- func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
5455
- # Normalisation. If bindir is libdir, return empty string,
5456
- # else relative path ending with a slash; either way, target
5457
- # file name can be directly appended.
5458
- if test ! -z "$func_relative_path_result"; then
5459
- func_stripname './' '' "$func_relative_path_result/"
5460
- func_relative_path_result=$func_stripname_result
5463
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
5464
+# is ksh but when the shell is invoked as "sh" and the current value of
5465
+# the _XPG environment variable is not equal to 1 (one), the special
5466
+# positional parameter $0, within a function call, is the name of the
5470
# The name of this program:
5471
+# In the unlikely event $progname began with a '-', it would play havoc with
5472
+# func_echo (imagine progname=-n), so we prepend ./ in that case:
5473
func_dirname_and_basename "$progpath"
5474
progname=$func_basename_result
5476
+ -*) progname=./$progname ;;
5479
# Make sure we have an absolute path for reexecution:
5481
@@ -413,13 +258,6 @@
5485
-# func_echo_all arg...
5486
-# Invoke $ECHO with all args, space-separated.
5493
# Echo program name prefixed message to standard error.
5496
case $my_directory_path in */*) ;; *) break ;; esac
5498
# ...otherwise throw away the child directory and loop
5499
- my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
5500
+ my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
5502
- my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
5503
+ my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
5505
save_mkdir_p_IFS="$IFS"; IFS=':'
5506
for my_dir in $my_dir_list; do
5508
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
5511
- $ECHO "$my_tmpdir"
5512
+ $ECHO "X$my_tmpdir" | $Xsed
5520
- func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
5521
+ func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
5523
func_quote_for_eval_unquoted_result="$1" ;;
5529
- my_arg=`$ECHO "$1" | $SED \
5530
+ my_arg=`$ECHO "X$1" | $Xsed \
5531
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
5534
@@ -651,19 +489,14 @@
5542
# Echo version message to standard output and exit.
5545
- $SED -n '/(C)/!b go
5553
- /^# '$PROGRAM' (GNU /,/# warranty; / {
5554
+ $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
5557
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
5558
@@ -676,20 +509,19 @@
5559
# Echo short help message to standard output and exit.
5562
- $SED -n '/^# Usage:/,/^# *.*--help/ {
5563
+ $SED -n '/^# Usage:/,/# -h/ {
5566
s/\$progname/'$progname'/
5571
$ECHO "run \`$progname --help | more' for full usage"
5575
-# func_help [NOEXIT]
5576
-# Echo long help message to standard output and exit,
5577
-# unless 'noexit' is passed as argument.
5579
+# Echo long help message to standard output and exit.
5582
$SED -n '/^# Usage:/,/# Report bugs to/ {
5583
@@ -706,10 +538,7 @@
5584
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
5588
- if test -z "$1"; then
5594
# func_missing_arg argname
5599
- func_error "missing argument for $1."
5600
+ func_error "missing argument for $1"
5604
@@ -727,6 +556,29 @@
5608
+# Check that we have a working $ECHO.
5609
+if test "X$1" = X--no-reexec; then
5610
+ # Discard the --no-reexec flag, and continue.
5612
+elif test "X$1" = X--fallback-echo; then
5613
+ # Avoid inline document here, it may be left over
5615
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
5616
+ # Yippee, $ECHO works!
5619
+ # Restart under the correct shell, and then maybe $ECHO will work.
5620
+ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
5623
+if test "X$1" = X--fallback-echo; then
5624
+ # used as fallback echo
5629
+ exit $EXIT_SUCCESS
5632
magic="%%%MAGIC variable%%%"
5633
magic_exe="%%%MAGIC EXE variable%%%"
5634
@@ -784,16 +636,16 @@
5635
# Display the features supported by this script.
5638
- echo "host: $host"
5639
+ $ECHO "host: $host"
5640
if test "$build_libtool_libs" = yes; then
5641
- echo "enable shared libraries"
5642
+ $ECHO "enable shared libraries"
5644
- echo "disable shared libraries"
5645
+ $ECHO "disable shared libraries"
5647
if test "$build_old_libs" = yes; then
5648
- echo "enable static libraries"
5649
+ $ECHO "enable static libraries"
5651
- echo "disable static libraries"
5652
+ $ECHO "disable static libraries"
5656
@@ -920,21 +772,10 @@
5658
--quiet|--silent) preserve_args="$preserve_args $opt"
5663
- --no-quiet|--no-silent)
5664
- preserve_args="$preserve_args $opt"
5668
--verbose| -v) preserve_args="$preserve_args $opt"
5673
- --no-verbose) preserve_args="$preserve_args $opt"
5677
--tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
5680
-\?|-h) func_usage ;;
5681
--help) opt_help=: ;;
5682
- --help-all) opt_help=': help-all' ;;
5683
--version) func_version ;;
5685
-*) func_fatal_help "unrecognized option \`$opt'" ;;
5686
@@ -1176,13 +1016,10 @@
5687
func_quote_for_eval "$arg"
5688
CC_quoted="$CC_quoted $func_quote_for_eval_result"
5690
- CC_expanded=`func_echo_all $CC`
5691
- CC_quoted_expanded=`func_echo_all $CC_quoted`
5693
# Blanks in the command may have been stripped by the calling shell,
5694
# but not from the CC environment variable when configure was run.
5695
- " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
5696
- " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
5697
+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
5698
# Blanks at the start of $base_compile will cause this to fail
5699
# if we don't check for them as well.
5701
@@ -1196,11 +1033,8 @@
5702
func_quote_for_eval "$arg"
5703
CC_quoted="$CC_quoted $func_quote_for_eval_result"
5705
- CC_expanded=`func_echo_all $CC`
5706
- CC_quoted_expanded=`func_echo_all $CC_quoted`
5708
- " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
5709
- " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
5710
+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
5711
# The compiler in the base compile command matches
5712
# the one in the tagged configuration.
5713
# Assume this is the tagged configuration we want.
5714
@@ -1379,7 +1213,7 @@
5716
*.ada | *.adb | *.ads | *.asm | \
5717
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
5718
- *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
5719
+ *.[fF][09]? | *.for | *.java | *.obj | *.sx)
5720
func_xform "$libobj"
5721
libobj=$func_xform_result
5723
@@ -1454,7 +1288,7 @@
5724
# Calculate the filename of the output object if compiler does
5725
# not support -o with -c
5726
if test "$compiler_c_o" = no; then
5727
- output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
5728
+ output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
5729
lockfile="$output_obj.lock"
5732
@@ -1611,7 +1445,7 @@
5736
- test "$mode" = compile && func_mode_compile ${1+"$@"}
5737
+test "$mode" = compile && func_mode_compile ${1+"$@"}
5741
@@ -1648,11 +1482,10 @@
5743
-o OUTPUT-FILE set the output file name to OUTPUT-FILE
5744
-no-suppress do not suppress compiler output for multiple passes
5745
- -prefer-pic try to build PIC objects only
5746
- -prefer-non-pic try to build non-PIC objects only
5747
+ -prefer-pic try to building PIC objects only
5748
+ -prefer-non-pic try to building non-PIC objects only
5749
-shared do not build a \`.o' file suitable for static linking
5750
-static only build a \`.o' file suitable for static linking
5751
- -Wc,FLAG pass FLAG directly to the compiler
5753
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
5754
from the given SOURCEFILE.
5755
@@ -1705,7 +1538,7 @@
5757
The following components of INSTALL-COMMAND are treated specially:
5759
- -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation
5760
+ -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
5762
The rest of the components are interpreted as arguments to that command (only
5763
BSD-compatible install options are recognized)."
5764
@@ -1725,8 +1558,6 @@
5766
-all-static do not do any dynamic linking at all
5767
-avoid-version do not add a version suffix if possible
5768
- -bindir BINDIR specify path to binaries directory (for systems where
5769
- libraries must be found in the PATH setting at runtime)
5770
-dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
5771
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
5772
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
5773
@@ -1755,11 +1586,6 @@
5774
-version-info CURRENT[:REVISION[:AGE]]
5775
specify library version info [each variable defaults to 0]
5776
-weak LIBNAME declare that the target provides the LIBNAME interface
5778
- -Xcompiler FLAG pass linker-specific FLAG directly to the compiler
5780
- -Xlinker FLAG pass linker-specific FLAG directly to the linker
5781
- -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
5783
All other options (arguments beginning with \`-') are ignored.
5785
@@ -1797,40 +1623,14 @@
5791
$ECHO "Try \`$progname --help' for more information about other modes."
5796
-# Now that we've collected a possible --mode arg, show help if necessary
5798
- if test "$opt_help" = :; then
5803
- for mode in compile link execute install finish uninstall clean; do
5806
- } | sed -n '1p; 2,$s/^Usage:/ or: /p'
5809
- for mode in compile link execute install finish uninstall clean; do
5815
- /^When reporting/,/^Report/{
5820
- /information about other modes/d
5821
- /more detailed .*MODE/d
5822
- s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
5826
+ # Now that we've collected a possible --mode arg, show help if necessary
5827
+ $opt_help && func_mode_help
5830
# func_mode_execute arg...
5831
@@ -1912,7 +1712,7 @@
5835
- -* | *.la | *.lo ) ;;
5838
# Do a test to see if this is really a libtool program.
5839
if func_ltwrapper_script_p "$file"; then
5840
@@ -1954,7 +1754,7 @@
5841
# Display what would be done.
5842
if test -n "$shlibpath_var"; then
5843
eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
5844
- echo "export $shlibpath_var"
5845
+ $ECHO "export $shlibpath_var"
5849
@@ -1995,23 +1795,23 @@
5850
# Exit here if they wanted silent mode.
5851
$opt_silent && exit $EXIT_SUCCESS
5853
- echo "----------------------------------------------------------------------"
5854
- echo "Libraries have been installed in:"
5855
+ $ECHO "X----------------------------------------------------------------------" | $Xsed
5856
+ $ECHO "Libraries have been installed in:"
5857
for libdir in $libdirs; do
5861
- echo "If you ever happen to want to link against installed libraries"
5862
- echo "in a given directory, LIBDIR, you must either use libtool, and"
5863
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
5864
- echo "flag during linking and do at least one of the following:"
5866
+ $ECHO "If you ever happen to want to link against installed libraries"
5867
+ $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
5868
+ $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
5869
+ $ECHO "flag during linking and do at least one of the following:"
5870
if test -n "$shlibpath_var"; then
5871
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
5872
- echo " during execution"
5873
+ $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"
5874
+ $ECHO " during execution"
5876
if test -n "$runpath_var"; then
5877
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
5878
- echo " during linking"
5879
+ $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"
5880
+ $ECHO " during linking"
5882
if test -n "$hardcode_libdir_flag_spec"; then
5884
@@ -2023,21 +1823,21 @@
5885
$ECHO " - have your system administrator run these commands:$admincmds"
5887
if test -f /etc/ld.so.conf; then
5888
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
5889
+ $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
5894
- echo "See any operating system documentation about shared libraries for"
5895
+ $ECHO "See any operating system documentation about shared libraries for"
5897
solaris2.[6789]|solaris2.1[0-9])
5898
- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
5900
+ $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
5904
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
5905
+ $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
5908
- echo "----------------------------------------------------------------------"
5909
+ $ECHO "X----------------------------------------------------------------------" | $Xsed
5913
@@ -2052,7 +1852,7 @@
5914
# install_prog (especially on Windows NT).
5915
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
5916
# Allow the use of GNU shtool's install command.
5917
- case $nonopt in *shtool*) :;; *) false;; esac; then
5918
+ $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
5919
# Aesthetically quote it.
5920
func_quote_for_eval "$nonopt"
5921
install_prog="$func_quote_for_eval_result "
5922
@@ -2067,11 +1867,6 @@
5923
# Aesthetically quote it.
5924
func_quote_for_eval "$arg"
5925
install_prog="$install_prog$func_quote_for_eval_result"
5926
- install_shared_prog=$install_prog
5927
- case " $install_prog " in
5928
- *[\\\ /]cp\ *) install_cp=: ;;
5929
- *) install_cp=false ;;
5932
# We need to accept at least all the BSD install flags.
5934
@@ -2081,10 +1876,8 @@
5942
if test -n "$dest"; then
5943
files="$files $dest"
5945
@@ -2094,9 +1887,10 @@
5949
- if $install_cp; then :; else
5952
+ case " $install_prog " in
5959
@@ -2110,10 +1904,6 @@
5961
# If the previous option needed an argument, then skip it.
5962
if test -n "$prev"; then
5963
- if test "x$prev" = x-m && test -n "$install_override_mode"; then
5964
- arg2=$install_override_mode
5970
@@ -2125,10 +1915,6 @@
5971
# Aesthetically quote the argument.
5972
func_quote_for_eval "$arg"
5973
install_prog="$install_prog $func_quote_for_eval_result"
5974
- if test -n "$arg2"; then
5975
- func_quote_for_eval "$arg2"
5977
- install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
5980
test -z "$install_prog" && \
5981
@@ -2137,13 +1923,6 @@
5982
test -n "$prev" && \
5983
func_fatal_help "the \`$prev' option requires an argument"
5985
- if test -n "$install_override_mode" && $no_mode; then
5986
- if $install_cp; then :; else
5987
- func_quote_for_eval "$install_override_mode"
5988
- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
5992
if test -z "$files"; then
5993
if test -z "$dest"; then
5994
func_fatal_help "no file or destination specified"
5995
@@ -2231,7 +2010,7 @@
5997
if test -n "$relink_command"; then
5998
# Determine the prefix the user has applied to our future dir.
5999
- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
6000
+ inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
6002
# Don't allow the user to place us outside of our expected
6003
# location b/c this prevents finding dependent libraries that
6004
@@ -2244,9 +2023,9 @@
6006
if test -n "$inst_prefix_dir"; then
6007
# Stick the inst_prefix_dir data into the link command.
6008
- relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
6009
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
6011
- relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
6012
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
6015
func_warning "relinking \`$file'"
6016
@@ -2264,7 +2043,7 @@
6017
test -n "$relink_command" && srcname="$realname"T
6019
# Install the shared library and build the symlinks.
6020
- func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
6021
+ func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
6025
@@ -2404,7 +2183,7 @@
6026
if test -f "$lib"; then
6029
- libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
6030
+ libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
6031
if test -n "$libdir" && test ! -f "$libfile"; then
6032
func_warning "\`$lib' has not been installed in \`$libdir'"
6034
@@ -2423,7 +2202,7 @@
6035
file="$func_basename_result"
6036
outputname="$tmpdir/$file"
6037
# Replace the output file specification.
6038
- relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
6039
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
6042
func_quote_for_expand "$relink_command"
6043
@@ -2442,7 +2221,7 @@
6046
# Install the binary that we compiled earlier.
6047
- file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
6048
+ file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
6052
@@ -2544,10 +2323,6 @@
6056
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
6057
-#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
6060
/* External symbol declarations for the compiler. */\
6063
@@ -2557,7 +2332,7 @@
6064
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
6066
# Add our own program objects to the symbol list.
6067
- progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
6068
+ progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
6069
for progfile in $progfiles; do
6070
func_verbose "extracting global C symbols from \`$progfile'"
6071
$opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
6072
@@ -2596,7 +2371,7 @@
6073
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
6074
eval '$MV "$nlist"T "$nlist"'
6076
- *cygwin* | *mingw* | *cegcc* )
6077
+ *cygwin | *mingw* | *cegcc* )
6078
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
6079
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
6081
@@ -2640,10 +2415,10 @@
6082
if test -f "$nlist"S; then
6083
eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
6085
- echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
6086
+ $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
6089
- echo >> "$output_objdir/$my_dlsyms" "\
6090
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
6092
/* The mapping between symbol names and symbols. */
6094
@@ -2653,7 +2428,7 @@
6097
*cygwin* | *mingw* | *cegcc* )
6098
- echo >> "$output_objdir/$my_dlsyms" "\
6099
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
6100
/* DATA imports from DLLs on WIN32 con't be const, because
6101
runtime relocations are performed -- see ld's documentation
6102
on pseudo-relocs. */"
6103
@@ -2666,7 +2441,7 @@
6104
lt_dlsym_const=const ;;
6107
- echo >> "$output_objdir/$my_dlsyms" "\
6108
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
6109
extern $lt_dlsym_const lt_dlsymlist
6110
lt_${my_prefix}_LTX_preloaded_symbols[];
6111
$lt_dlsym_const lt_dlsymlist
6112
@@ -2682,7 +2457,7 @@
6113
eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
6116
- echo >> "$output_objdir/$my_dlsyms" "\
6117
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
6121
@@ -2740,16 +2515,16 @@
6123
*cygwin* | *mingw* | *cegcc* )
6124
if test -f "$output_objdir/$my_outputname.def"; then
6125
- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
6126
- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
6127
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
6128
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
6130
- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
6131
- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
6132
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
6133
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
6137
- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
6138
- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
6139
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
6140
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
6144
@@ -2763,8 +2538,8 @@
6145
# really was required.
6147
# Nullify the symbol file.
6148
- compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
6149
- finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
6150
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
6151
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
6155
@@ -2774,7 +2549,6 @@
6156
# Need a lot of goo to handle *both* DLLs and import libs
6157
# Has to be a shell function in order to 'eat' the argument
6158
# that is supplied when $file_magic_command is called.
6159
-# Despite the name, also deal with 64 bit binaries.
6163
@@ -2785,9 +2559,8 @@
6164
win32_libid_type="x86 archive import"
6166
*ar\ archive*) # could be an import, or static
6167
- # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
6168
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
6169
- $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
6170
+ $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
6171
win32_nmres=`eval $NM -f posix -A $1 |
6174
@@ -2825,18 +2598,7 @@
6176
f_ex_an_ar_dir="$1"; shift
6177
f_ex_an_ar_oldlib="$1"
6178
- if test "$lock_old_archive_extraction" = yes; then
6179
- lockfile=$f_ex_an_ar_oldlib.lock
6180
- until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
6181
- func_echo "Waiting for $lockfile to be removed"
6185
- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
6186
- 'stat=$?; rm -f "$lockfile"; exit $stat'
6187
- if test "$lock_old_archive_extraction" = yes; then
6188
- $opt_dry_run || rm -f "$lockfile"
6190
+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
6191
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
6194
@@ -2907,7 +2669,7 @@
6197
for darwin_file in $darwin_filelist; do
6198
- darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
6199
+ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
6200
$LIPO -create -output "$darwin_file" $darwin_files
6201
done # $darwin_filelist
6203
@@ -2922,30 +2684,25 @@
6204
func_extract_an_archive "$my_xdir" "$my_xabs"
6207
- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
6208
+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
6211
func_extract_archives_result="$my_oldobjs"
6215
-# func_emit_wrapper [arg=no]
6217
-# Emit a libtool wrapper script on stdout.
6218
-# Don't directly open a file because we may want to
6219
-# incorporate the script contents within a cygwin/mingw
6220
-# wrapper executable. Must ONLY be called from within
6221
-# func_mode_link because it depends on a number of variables
6224
+# func_emit_wrapper_part1 [arg=no]
6226
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
6227
-# variable will take. If 'yes', then the emitted script
6228
-# will assume that the directory in which it is stored is
6229
-# the $objdir directory. This is a cygwin/mingw-specific
6231
-func_emit_wrapper ()
6233
- func_emit_wrapper_arg1=${1-no}
6234
+# Emit the first part of a libtool wrapper script on stdout.
6235
+# For more information, see the description associated with
6236
+# func_emit_wrapper(), below.
6237
+func_emit_wrapper_part1 ()
6239
+ func_emit_wrapper_part1_arg1=no
6240
+ if test -n "$1" ; then
6241
+ func_emit_wrapper_part1_arg1=$1
6246
@@ -2961,6 +2718,7 @@
6248
# Sed substitution that helps us do robust quoting. It backslashifies
6249
# metacharacters that are still active within double-quoted strings.
6250
+Xsed='${SED} -e 1s/^X//'
6251
sed_quote_subst='$sed_quote_subst'
6253
# Be Bourne compatible
6254
@@ -2991,132 +2749,31 @@
6256
# When we are sourced in execute mode, \$file and \$ECHO are already set.
6257
if test \"\$libtool_execute_magic\" != \"$magic\"; then
6260
- qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
6263
-# A function that is used when there is no print builtin or printf.
6264
-func_fallback_echo ()
6266
- eval 'cat <<_LTECHO_EOF
6273
-# Very basic option parsing. These options are (a) specific to
6274
-# the libtool wrapper, (b) are identical between the wrapper
6275
-# /script/ and the wrapper /executable/ which is used only on
6276
-# windows platforms, and (c) all begin with the string "--lt-"
6277
-# (application programs are unlikely to have options which match
6280
-# There are only two supported options: --lt-debug and
6281
-# --lt-dump-script. There is, deliberately, no --lt-help.
6283
-# The first argument to this parsing function should be the
6284
-# script's $0 value, followed by "$@".
6286
-func_parse_lt_options ()
6288
- lt_script_arg0=\$0
6292
- case \"\$lt_opt\" in
6293
- --lt-debug) lt_option_debug=1 ;;
6295
- lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
6296
- test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
6297
- lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
6298
- cat \"\$lt_dump_D/\$lt_dump_F\"
6302
- \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
6308
- # Print the debug banner immediately:
6309
- if test -n \"\$lt_option_debug\"; then
6310
- echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
6314
-# Used when --lt-debug. Prints its arguments to stdout
6315
-# (redirection is the responsibility of the caller)
6316
-func_lt_dump_args ()
6321
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
6322
- lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
6326
-# Core function for launching the target application
6327
-func_exec_program_core ()
6331
- # Backslashes separate directories on plain windows
6332
- *-*-mingw | *-*-os2* | *-cegcc*)
6334
- if test -n \"\$lt_option_debug\"; then
6335
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
6336
- func_lt_dump_args \${1+\"\$@\"} 1>&2
6338
- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
6344
- if test -n \"\$lt_option_debug\"; then
6345
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
6346
- func_lt_dump_args \${1+\"\$@\"} 1>&2
6348
- exec \"\$progdir/\$program\" \${1+\"\$@\"}
6351
+ # Make sure echo works.
6352
+ if test \"X\$1\" = X--no-reexec; then
6353
+ # Discard the --no-reexec flag, and continue.
6355
+ elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
6356
+ # Yippee, \$ECHO works!
6359
+ # Restart under the correct shell, and then maybe \$ECHO will work.
6360
+ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
6367
- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
6371
-# A function to encapsulate launching the target application
6372
-# Strips options in the --lt-* namespace from \$@ and
6373
-# launches target application with the remaining arguments.
6374
-func_exec_program ()
6378
- case \$lt_wr_arg in
6380
- *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
6384
- func_exec_program_core \${1+\"\$@\"}
6388
- func_parse_lt_options \"\$0\" \${1+\"\$@\"}
6391
# Find the directory that this script lives in.
6392
- thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
6393
+ thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
6394
test \"x\$thisdir\" = \"x\$file\" && thisdir=.
6396
# Follow symbolic links until we get to the real thisdir.
6397
- file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
6398
+ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
6399
while test -n \"\$file\"; do
6400
- destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
6401
+ destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
6403
# If there was a directory component, then change thisdir.
6404
if test \"x\$destdir\" != \"x\$file\"; then
6405
@@ -3126,13 +2783,30 @@
6409
- file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
6410
- file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
6411
+ file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
6412
+ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
6416
+# end: func_emit_wrapper_part1
6418
+# func_emit_wrapper_part2 [arg=no]
6420
+# Emit the second part of a libtool wrapper script on stdout.
6421
+# For more information, see the description associated with
6422
+# func_emit_wrapper(), below.
6423
+func_emit_wrapper_part2 ()
6425
+ func_emit_wrapper_part2_arg1=no
6426
+ if test -n "$1" ; then
6427
+ func_emit_wrapper_part2_arg1=$1
6432
# Usually 'no', except on cygwin/mingw when embedded into
6434
- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
6435
+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
6436
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
6437
# special case for '.'
6438
if test \"\$thisdir\" = \".\"; then
6439
@@ -3140,7 +2814,7 @@
6441
# remove .libs from thisdir
6442
case \"\$thisdir\" in
6443
- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
6444
+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
6445
$objdir ) thisdir=. ;;
6448
@@ -3203,7 +2877,7 @@
6450
# Some systems cannot cope with colon-terminated $shlibpath_var
6451
# The second colon is a workaround for a bug in BeOS R4 sed
6452
- $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
6453
+ $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
6455
export $shlibpath_var
6457
@@ -3220,18 +2894,64 @@
6459
if test \"\$libtool_execute_magic\" != \"$magic\"; then
6460
# Run the actual program with our arguments.
6461
- func_exec_program \${1+\"\$@\"}
6464
+ # Backslashes separate directories on plain windows
6465
+ *-*-mingw | *-*-os2* | *-cegcc*)
6467
+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
6473
+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
6478
+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
6482
# The program doesn't exist.
6483
\$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
6484
\$ECHO \"This script is just a wrapper for \$program.\" 1>&2
6485
- \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
6486
+ $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
6492
+# end: func_emit_wrapper_part2
6495
+# func_emit_wrapper [arg=no]
6497
+# Emit a libtool wrapper script on stdout.
6498
+# Don't directly open a file because we may want to
6499
+# incorporate the script contents within a cygwin/mingw
6500
+# wrapper executable. Must ONLY be called from within
6501
+# func_mode_link because it depends on a number of variables
6504
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
6505
+# variable will take. If 'yes', then the emitted script
6506
+# will assume that the directory in which it is stored is
6507
+# the $objdir directory. This is a cygwin/mingw-specific
6509
+func_emit_wrapper ()
6511
+ func_emit_wrapper_arg1=no
6512
+ if test -n "$1" ; then
6513
+ func_emit_wrapper_arg1=$1
6516
+ # split this up so that func_emit_cwrapperexe_src
6517
+ # can call each part independently.
6518
+ func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
6519
+ func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
6523
# func_to_host_path arg
6524
@@ -3258,19 +2978,23 @@
6525
func_to_host_path ()
6527
func_to_host_path_result="$1"
6528
- if test -n "$1"; then
6529
+ if test -n "$1" ; then
6532
lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
6534
*mingw* ) # actually, msys
6535
# awkward: cmd appends spaces to result
6536
- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
6537
- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
6538
+ lt_sed_strip_trailing_spaces="s/[ ]*\$//"
6539
+ func_to_host_path_tmp1=`( cmd //c echo "$1" |\
6540
+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
6541
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
6542
+ $SED -e "$lt_sed_naive_backslashify"`
6545
- func_to_host_path_result=`cygpath -w "$1" |
6546
- $SED -e "$lt_sed_naive_backslashify"`
6547
+ func_to_host_path_tmp1=`cygpath -w "$1"`
6548
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
6549
+ $SED -e "$lt_sed_naive_backslashify"`
6552
# Unfortunately, winepath does not exit with a non-zero
6553
@@ -3282,17 +3006,17 @@
6554
# the odd construction:
6555
func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
6556
if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
6557
- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
6558
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
6559
$SED -e "$lt_sed_naive_backslashify"`
6561
# Allow warning below.
6562
- func_to_host_path_result=
6563
+ func_to_host_path_result=""
6567
if test -z "$func_to_host_path_result" ; then
6568
func_error "Could not determine host path corresponding to"
6569
- func_error " \`$1'"
6570
+ func_error " '$1'"
6571
func_error "Continuing, but uninstalled executables may not work."
6573
func_to_host_path_result="$1"
6574
@@ -3325,24 +3049,30 @@
6575
func_to_host_pathlist ()
6577
func_to_host_pathlist_result="$1"
6578
- if test -n "$1"; then
6579
+ if test -n "$1" ; then
6582
lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
6583
# Remove leading and trailing path separator characters from
6584
# ARG. msys behavior is inconsistent here, cygpath turns them
6585
# into '.;' and ';.', and winepath ignores them completely.
6586
- func_stripname : : "$1"
6587
- func_to_host_pathlist_tmp1=$func_stripname_result
6588
+ func_to_host_pathlist_tmp2="$1"
6589
+ # Once set for this call, this variable should not be
6590
+ # reassigned. It is used in tha fallback case.
6591
+ func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
6592
+ $SED -e 's|^:*||' -e 's|:*$||'`
6594
*mingw* ) # Actually, msys.
6595
# Awkward: cmd appends spaces to result.
6596
- func_to_host_pathlist_result=`
6597
- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
6598
- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
6599
+ lt_sed_strip_trailing_spaces="s/[ ]*\$//"
6600
+ func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
6601
+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
6602
+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
6603
+ $SED -e "$lt_sed_naive_backslashify"`
6606
- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
6607
+ func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
6608
+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
6609
$SED -e "$lt_sed_naive_backslashify"`
6612
@@ -3358,17 +3088,18 @@
6613
if test -z "$func_to_host_pathlist_result" ; then
6614
func_to_host_pathlist_result="$func_to_host_path_result"
6616
- func_append func_to_host_pathlist_result ";$func_to_host_path_result"
6617
+ func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
6623
IFS=$func_to_host_pathlist_oldIFS
6626
- if test -z "$func_to_host_pathlist_result"; then
6627
+ if test -z "$func_to_host_pathlist_result" ; then
6628
func_error "Could not determine the host path(s) corresponding to"
6629
- func_error " \`$1'"
6630
+ func_error " '$1'"
6631
func_error "Continuing, but uninstalled executables may not work."
6632
# Fallback. This may break if $1 contains DOS-style drive
6633
# specifications. The fix is not to complicate the expression
6634
@@ -3385,7 +3116,7 @@
6638
- *: ) func_append func_to_host_pathlist_result ";"
6639
+ *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
6643
@@ -3410,23 +3141,31 @@
6645
This wrapper executable should never be moved out of the build directory.
6646
If it is, it will not operate correctly.
6648
+ Currently, it simply execs the wrapper *script* "$SHELL $output",
6649
+ but could eventually absorb all of the scripts functionality and
6650
+ exec $objdir/$outputname directly.
6655
-# define _CRT_SECURE_NO_DEPRECATE 1
6660
# include <direct.h>
6661
# include <process.h>
6663
+# define setmode _setmode
6665
# include <unistd.h>
6666
# include <stdint.h>
6669
+# define HAVE_SETENV
6670
+# ifdef __STRICT_ANSI__
6671
+char *realpath (const char *, char *);
6672
+int putenv (char *);
6673
+int setenv (const char *, const char *, int);
6678
@@ -3438,44 +3177,6 @@
6680
#include <sys/stat.h>
6682
-/* declarations of non-ANSI functions */
6683
-#if defined(__MINGW32__)
6684
-# ifdef __STRICT_ANSI__
6685
-int _putenv (const char *);
6687
-#elif defined(__CYGWIN__)
6688
-# ifdef __STRICT_ANSI__
6689
-char *realpath (const char *, char *);
6690
-int putenv (char *);
6691
-int setenv (const char *, const char *, int);
6693
-/* #elif defined (other platforms) ... */
6696
-/* portability defines, excluding path handling macros */
6697
-#if defined(_MSC_VER)
6698
-# define setmode _setmode
6699
-# define stat _stat
6700
-# define chmod _chmod
6701
-# define getcwd _getcwd
6702
-# define putenv _putenv
6703
-# define S_IXUSR _S_IEXEC
6704
-# ifndef _INTPTR_T_DEFINED
6705
-# define _INTPTR_T_DEFINED
6706
-# define intptr_t int
6708
-#elif defined(__MINGW32__)
6709
-# define setmode _setmode
6710
-# define stat _stat
6711
-# define chmod _chmod
6712
-# define getcwd _getcwd
6713
-# define putenv _putenv
6714
-#elif defined(__CYGWIN__)
6715
-# define HAVE_SETENV
6716
-# define FOPEN_WB "wb"
6717
-/* #elif defined (other platforms) ... */
6720
#if defined(PATH_MAX)
6721
# define LT_PATHMAX PATH_MAX
6722
#elif defined(MAXPATHLEN)
6723
@@ -3491,7 +3192,14 @@
6727
-/* path handling portability macros */
6729
+# define S_IXUSR _S_IEXEC
6730
+# define stat _stat
6731
+# ifndef _INTPTR_T_DEFINED
6732
+# define intptr_t int
6736
#ifndef DIR_SEPARATOR
6737
# define DIR_SEPARATOR '/'
6738
# define PATH_SEPARATOR ':'
6739
@@ -3522,6 +3230,10 @@
6740
# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
6741
#endif /* PATH_SEPARATOR_2 */
6744
+# define FOPEN_WB "wb"
6748
# define FOPEN_WB "w"
6750
@@ -3534,13 +3246,22 @@
6751
if (stale) { free ((void *) stale); stale = 0; } \
6754
-#if defined(LT_DEBUGWRAPPER)
6755
-static int lt_debug = 1;
6756
+#undef LTWRAPPER_DEBUGPRINTF
6757
+#if defined DEBUGWRAPPER
6758
+# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
6760
+ltwrapper_debugprintf (const char *fmt, ...)
6763
+ va_start (args, fmt);
6764
+ (void) vfprintf (stderr, fmt, args);
6768
-static int lt_debug = 0;
6769
+# define LTWRAPPER_DEBUGPRINTF(args)
6772
-const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
6773
+const char *program_name = NULL;
6775
void *xmalloc (size_t num);
6776
char *xstrdup (const char *string);
6777
@@ -3550,17 +3271,31 @@
6778
int make_executable (const char *path);
6779
int check_executable (const char *path);
6780
char *strendzap (char *str, const char *pat);
6781
-void lt_debugprintf (const char *file, int line, const char *fmt, ...);
6782
-void lt_fatal (const char *file, int line, const char *message, ...);
6783
-static const char *nonnull (const char *s);
6784
-static const char *nonempty (const char *s);
6785
+void lt_fatal (const char *message, ...);
6786
void lt_setenv (const char *name, const char *value);
6787
char *lt_extend_str (const char *orig_value, const char *add, int to_end);
6788
+void lt_opt_process_env_set (const char *arg);
6789
+void lt_opt_process_env_prepend (const char *arg);
6790
+void lt_opt_process_env_append (const char *arg);
6791
+int lt_split_name_value (const char *arg, char** name, char** value);
6792
void lt_update_exe_path (const char *name, const char *value);
6793
void lt_update_lib_path (const char *name, const char *value);
6794
-char **prepare_spawn (char **argv);
6795
-void lt_dump_script (FILE *f);
6797
+static const char *script_text_part1 =
6800
+ func_emit_wrapper_part1 yes |
6801
+ $SED -e 's/\([\\"]\)/\\\1/g' \
6802
+ -e 's/^/ "/' -e 's/$/\\n"/'
6806
+static const char *script_text_part2 =
6808
+ func_emit_wrapper_part2 yes |
6809
+ $SED -e 's/\([\\"]\)/\\\1/g' \
6810
+ -e 's/^/ "/' -e 's/$/\\n"/'
6814
const char * MAGIC_EXE = "$magic_exe";
6815
@@ -3605,10 +3340,24 @@
6818
#define LTWRAPPER_OPTION_PREFIX "--lt-"
6819
+#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
6821
+static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
6822
static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
6824
static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
6825
-static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
6827
+static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
6828
+static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";
6829
+ /* argument is putenv-style "foo=bar", value of foo is set to bar */
6831
+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
6832
+static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";
6833
+ /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
6835
+static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
6836
+static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";
6837
+ /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
6840
main (int argc, char *argv[])
6841
@@ -3625,13 +3374,10 @@
6844
program_name = (char *) xstrdup (base_name (argv[0]));
6845
- newargz = XMALLOC (char *, argc + 1);
6846
+ LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
6847
+ LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
6849
- /* very simple arg parsing; don't want to rely on getopt
6850
- * also, copy all non cwrapper options to newargz, except
6851
- * argz[0], which is handled differently
6854
+ /* very simple arg parsing; don't want to rely on getopt */
6855
for (i = 1; i < argc; i++)
6857
if (strcmp (argv[i], dumpscript_opt) == 0)
6858
@@ -3645,57 +3391,25 @@
6862
- lt_dump_script (stdout);
6863
+ printf ("%s", script_text_part1);
6864
+ printf ("%s", script_text_part2);
6867
- if (strcmp (argv[i], debug_opt) == 0)
6872
- if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
6874
- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
6875
- namespace, but it is not one of the ones we know about and
6876
- have already dealt with, above (inluding dump-script), then
6877
- report an error. Otherwise, targets might begin to believe
6878
- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
6879
- namespace. The first time any user complains about this, we'll
6880
- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
6881
- or a configure.ac-settable value.
6883
- lt_fatal (__FILE__, __LINE__,
6884
- "unrecognized %s option: '%s'",
6885
- ltwrapper_option_prefix, argv[i]);
6887
- /* otherwise ... */
6888
- newargz[++newargc] = xstrdup (argv[i]);
6890
- newargz[++newargc] = NULL;
6894
- /* The GNU banner must be the first non-error debug message */
6895
- lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
6898
- lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
6899
- lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
6901
+ newargz = XMALLOC (char *, argc + 1);
6902
tmp_pathspec = find_executable (argv[0]);
6903
if (tmp_pathspec == NULL)
6904
- lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
6905
- lt_debugprintf (__FILE__, __LINE__,
6906
- "(main) found exe (before symlink chase) at: %s\n",
6908
+ lt_fatal ("Couldn't find %s", argv[0]);
6909
+ LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
6912
actual_cwrapper_path = chase_symlinks (tmp_pathspec);
6913
- lt_debugprintf (__FILE__, __LINE__,
6914
- "(main) found exe (after symlink chase) at: %s\n",
6915
- actual_cwrapper_path);
6916
+ LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
6917
+ actual_cwrapper_path));
6918
XFREE (tmp_pathspec);
6920
- actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
6921
+ actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
6922
strendzap (actual_cwrapper_path, actual_cwrapper_name);
6924
/* wrapper name transforms */
6925
@@ -3713,9 +3427,8 @@
6926
target_name = tmp_pathspec;
6929
- lt_debugprintf (__FILE__, __LINE__,
6930
- "(main) libtool target name: %s\n",
6932
+ LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
6937
@@ -3768,12 +3481,77 @@
6938
lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
6939
lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
6941
- lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
6942
- nonnull (lt_argv_zero));
6944
+ for (i = 1; i < argc; i++)
6946
+ if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
6948
+ if (argv[i][env_set_opt_len] == '=')
6950
+ const char *p = argv[i] + env_set_opt_len + 1;
6951
+ lt_opt_process_env_set (p);
6953
+ else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
6955
+ lt_opt_process_env_set (argv[++i]); /* don't copy */
6958
+ lt_fatal ("%s missing required argument", env_set_opt);
6961
+ if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
6963
+ if (argv[i][env_prepend_opt_len] == '=')
6965
+ const char *p = argv[i] + env_prepend_opt_len + 1;
6966
+ lt_opt_process_env_prepend (p);
6968
+ else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
6970
+ lt_opt_process_env_prepend (argv[++i]); /* don't copy */
6973
+ lt_fatal ("%s missing required argument", env_prepend_opt);
6976
+ if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
6978
+ if (argv[i][env_append_opt_len] == '=')
6980
+ const char *p = argv[i] + env_append_opt_len + 1;
6981
+ lt_opt_process_env_append (p);
6983
+ else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
6985
+ lt_opt_process_env_append (argv[++i]); /* don't copy */
6988
+ lt_fatal ("%s missing required argument", env_append_opt);
6991
+ if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
6993
+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
6994
+ namespace, but it is not one of the ones we know about and
6995
+ have already dealt with, above (inluding dump-script), then
6996
+ report an error. Otherwise, targets might begin to believe
6997
+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
6998
+ namespace. The first time any user complains about this, we'll
6999
+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
7000
+ or a configure.ac-settable value.
7002
+ lt_fatal ("Unrecognized option in %s namespace: '%s'",
7003
+ ltwrapper_option_prefix, argv[i]);
7005
+ /* otherwise ... */
7006
+ newargz[++newargc] = xstrdup (argv[i]);
7008
+ newargz[++newargc] = NULL;
7010
+ LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
7011
for (i = 0; i < newargc; i++)
7013
- lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
7014
- i, nonnull (newargz[i]));
7015
+ LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
7019
@@ -3782,14 +3560,11 @@
7022
/* execv doesn't actually work on mingw as expected on unix */
7023
- newargz = prepare_spawn (newargz);
7024
rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
7027
/* failed to start process */
7028
- lt_debugprintf (__FILE__, __LINE__,
7029
- "(main) failed to launch target \"%s\": %s\n",
7030
- lt_argv_zero, nonnull (strerror (errno)));
7031
+ LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
7035
@@ -3811,7 +3586,7 @@
7037
void *p = (void *) malloc (num);
7039
- lt_fatal (__FILE__, __LINE__, "memory exhausted");
7040
+ lt_fatal ("Memory exhausted");
7044
@@ -3845,8 +3620,8 @@
7048
- lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
7050
+ LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
7051
+ path ? (*path ? path : "EMPTY!") : "NULL!"));
7052
if ((!path) || (!*path))
7055
@@ -3863,8 +3638,8 @@
7059
- lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
7061
+ LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
7062
+ path ? (*path ? path : "EMPTY!") : "NULL!"));
7063
if ((!path) || (!*path))
7066
@@ -3890,8 +3665,8 @@
7070
- lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
7071
- nonempty (wrapper));
7072
+ LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
7073
+ wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
7075
if ((wrapper == NULL) || (*wrapper == '\0'))
7077
@@ -3944,8 +3719,7 @@
7079
/* empty path: current directory */
7080
if (getcwd (tmp, LT_PATHMAX) == NULL)
7081
- lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
7082
- nonnull (strerror (errno)));
7083
+ lt_fatal ("getcwd failed");
7084
tmp_len = strlen (tmp);
7086
XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
7087
@@ -3970,8 +3744,7 @@
7089
/* Relative path | not found in path: prepend cwd */
7090
if (getcwd (tmp, LT_PATHMAX) == NULL)
7091
- lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
7092
- nonnull (strerror (errno)));
7093
+ lt_fatal ("getcwd failed");
7094
tmp_len = strlen (tmp);
7095
concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
7096
memcpy (concat_name, tmp, tmp_len);
7097
@@ -3997,9 +3770,8 @@
7098
int has_symlinks = 0;
7099
while (strlen (tmp_pathspec) && !has_symlinks)
7101
- lt_debugprintf (__FILE__, __LINE__,
7102
- "checking path component for symlinks: %s\n",
7104
+ LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
7106
if (lstat (tmp_pathspec, &s) == 0)
7108
if (S_ISLNK (s.st_mode) != 0)
7109
@@ -4021,9 +3793,8 @@
7113
- lt_fatal (__FILE__, __LINE__,
7114
- "error accessing file \"%s\": %s",
7115
- tmp_pathspec, nonnull (strerror (errno)));
7116
+ char *errstr = strerror (errno);
7117
+ lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
7120
XFREE (tmp_pathspec);
7121
@@ -4036,8 +3807,7 @@
7122
tmp_pathspec = realpath (pathspec, buf);
7123
if (tmp_pathspec == 0)
7125
- lt_fatal (__FILE__, __LINE__,
7126
- "could not follow symlinks for %s", pathspec);
7127
+ lt_fatal ("Could not follow symlinks for %s", pathspec);
7129
return xstrdup (tmp_pathspec);
7131
@@ -4063,25 +3833,11 @@
7136
-lt_debugprintf (const char *file, int line, const char *fmt, ...)
7141
- (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
7142
- va_start (args, fmt);
7143
- (void) vfprintf (stderr, fmt, args);
7149
-lt_error_core (int exit_status, const char *file,
7150
- int line, const char *mode,
7151
+lt_error_core (int exit_status, const char *mode,
7152
const char *message, va_list ap)
7154
- fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
7155
+ fprintf (stderr, "%s: %s: ", program_name, mode);
7156
vfprintf (stderr, message, ap);
7157
fprintf (stderr, ".\n");
7159
@@ -4090,32 +3846,20 @@
7163
-lt_fatal (const char *file, int line, const char *message, ...)
7164
+lt_fatal (const char *message, ...)
7167
va_start (ap, message);
7168
- lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
7169
+ lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
7173
-static const char *
7174
-nonnull (const char *s)
7176
- return s ? s : "(null)";
7179
-static const char *
7180
-nonempty (const char *s)
7182
- return (s && !*s) ? "(empty)" : nonnull (s);
7186
lt_setenv (const char *name, const char *value)
7188
- lt_debugprintf (__FILE__, __LINE__,
7189
- "(lt_setenv) setting '%s' to '%s'\n",
7190
- nonnull (name), nonnull (value));
7191
+ LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
7192
+ (name ? name : "<NULL>"),
7193
+ (value ? value : "<NULL>")));
7196
/* always make a copy, for consistency with !HAVE_SETENV */
7197
@@ -4160,12 +3904,95 @@
7202
+lt_split_name_value (const char *arg, char** name, char** value)
7206
+ if (!arg || !*arg)
7209
+ p = strchr (arg, (int)'=');
7214
+ *value = xstrdup (++p);
7216
+ len = strlen (arg) - strlen (*value);
7217
+ *name = XMALLOC (char, len);
7218
+ strncpy (*name, arg, len-1);
7219
+ (*name)[len - 1] = '\0';
7225
+lt_opt_process_env_set (const char *arg)
7227
+ char *name = NULL;
7228
+ char *value = NULL;
7230
+ if (lt_split_name_value (arg, &name, &value) != 0)
7234
+ lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
7237
+ lt_setenv (name, value);
7243
+lt_opt_process_env_prepend (const char *arg)
7245
+ char *name = NULL;
7246
+ char *value = NULL;
7247
+ char *new_value = NULL;
7249
+ if (lt_split_name_value (arg, &name, &value) != 0)
7253
+ lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
7256
+ new_value = lt_extend_str (getenv (name), value, 0);
7257
+ lt_setenv (name, new_value);
7258
+ XFREE (new_value);
7264
+lt_opt_process_env_append (const char *arg)
7266
+ char *name = NULL;
7267
+ char *value = NULL;
7268
+ char *new_value = NULL;
7270
+ if (lt_split_name_value (arg, &name, &value) != 0)
7274
+ lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
7277
+ new_value = lt_extend_str (getenv (name), value, 1);
7278
+ lt_setenv (name, new_value);
7279
+ XFREE (new_value);
7285
lt_update_exe_path (const char *name, const char *value)
7287
- lt_debugprintf (__FILE__, __LINE__,
7288
- "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
7289
- nonnull (name), nonnull (value));
7290
+ LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
7291
+ (name ? name : "<NULL>"),
7292
+ (value ? value : "<NULL>")));
7294
if (name && *name && value && *value)
7296
@@ -4184,9 +4011,9 @@
7298
lt_update_lib_path (const char *name, const char *value)
7300
- lt_debugprintf (__FILE__, __LINE__,
7301
- "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
7302
- nonnull (name), nonnull (value));
7303
+ LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
7304
+ (name ? name : "<NULL>"),
7305
+ (value ? value : "<NULL>")));
7307
if (name && *name && value && *value)
7309
@@ -4196,152 +4023,11 @@
7318
-/* Prepares an argument vector before calling spawn().
7319
- Note that spawn() does not by itself call the command interpreter
7320
- (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
7321
- ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
7323
- v.dwPlatformId == VER_PLATFORM_WIN32_NT;
7324
- }) ? "cmd.exe" : "command.com").
7325
- Instead it simply concatenates the arguments, separated by ' ', and calls
7326
- CreateProcess(). We must quote the arguments since Win32 CreateProcess()
7327
- interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
7329
- - Space and tab are interpreted as delimiters. They are not treated as
7330
- delimiters if they are surrounded by double quotes: "...".
7331
- - Unescaped double quotes are removed from the input. Their only effect is
7332
- that within double quotes, space and tab are treated like normal
7334
- - Backslashes not followed by double quotes are not special.
7335
- - But 2*n+1 backslashes followed by a double quote become
7336
- n backslashes followed by a double quote (n >= 0):
7341
-#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
7342
-#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
7344
-prepare_spawn (char **argv)
7350
- /* Count number of arguments. */
7351
- for (argc = 0; argv[argc] != NULL; argc++)
7354
- /* Allocate new argument vector. */
7355
- new_argv = XMALLOC (char *, argc + 1);
7357
- /* Put quoted arguments into the new argument vector. */
7358
- for (i = 0; i < argc; i++)
7360
- const char *string = argv[i];
7362
- if (string[0] == '\0')
7363
- new_argv[i] = xstrdup ("\"\"");
7364
- else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
7366
- int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
7368
- unsigned int backslashes;
7370
- char *quoted_string;
7377
- for (s = string; *s != '\0'; s++)
7381
- length += backslashes + 1;
7389
- length += backslashes + 1;
7391
- quoted_string = XMALLOC (char, length + 1);
7393
- p = quoted_string;
7397
- for (s = string; *s != '\0'; s++)
7403
- for (j = backslashes + 1; j > 0; j--)
7415
- for (j = backslashes; j > 0; j--)
7421
- new_argv[i] = quoted_string;
7424
- new_argv[i] = (char *) string;
7426
- new_argv[argc] = NULL;
7435
-void lt_dump_script (FILE* f)
7438
- func_emit_wrapper yes |
7439
- $SED -e 's/\([\\"]\)/\\\1/g' \
7440
- -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
7446
# end: func_emit_cwrapperexe_src
7448
-# func_win32_import_lib_p ARG
7449
-# True if ARG is an import lib, as indicated by $file_magic_cmd
7450
-func_win32_import_lib_p ()
7453
- case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
7459
# func_mode_link arg...
7462
@@ -4386,7 +4072,6 @@
7463
new_inherited_linker_flags=
7470
@@ -4479,11 +4164,6 @@
7480
if test "$preload" = no; then
7481
# Add the symbol object into the linking commands.
7482
@@ -4745,11 +4425,6 @@
7494
@@ -4828,7 +4503,7 @@
7497
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
7498
- testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
7499
+ testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
7500
case :$dllsearchpath: in
7502
::) dllsearchpath=$dir;;
7503
@@ -4847,7 +4522,7 @@
7505
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
7507
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
7508
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
7509
# These systems don't actually have a C or math library (as such)
7512
@@ -5033,7 +4708,7 @@
7513
for flag in $args; do
7515
func_quote_for_eval "$flag"
7516
- arg="$arg $func_quote_for_eval_result"
7517
+ arg="$arg $wl$func_quote_for_eval_result"
7518
compiler_flags="$compiler_flags $func_quote_for_eval_result"
7521
@@ -5079,19 +4754,18 @@
7522
arg="$func_quote_for_eval_result"
7525
- # Flags to be passed through unchanged, with rationale:
7526
- # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
7527
- # -r[0-9][0-9]* specify processor for the SGI compiler
7528
- # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
7529
- # +DA*, +DD* enable 64-bit mode for the HP compiler
7530
- # -q* compiler args for the IBM compiler
7531
- # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
7532
- # -F/path path to uninstalled frameworks, gcc on darwin
7533
- # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
7534
- # @file GCC response files
7535
- # -tp=* Portland pgcc target processor selection
7536
+ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
7537
+ # -r[0-9][0-9]* specifies the processor on the SGI compiler
7538
+ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
7539
+ # +DA*, +DD* enable 64-bit mode on the HP compiler
7540
+ # -q* pass through compiler args for the IBM compiler
7541
+ # -m*, -t[45]*, -txscale* pass through architecture-specific
7542
+ # compiler args for GCC
7543
+ # -F/path gives path to uninstalled frameworks, gcc on darwin
7544
+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
7545
+ # @file GCC response files
7546
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
7547
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
7548
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
7549
func_quote_for_eval "$arg"
7550
arg="$func_quote_for_eval_result"
7551
func_append compile_command " $arg"
7552
@@ -5251,7 +4925,7 @@
7554
if test -n "$shlibpath_var"; then
7555
# get the directories listed in $shlibpath_var
7556
- eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
7557
+ eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
7561
@@ -5359,7 +5033,10 @@
18880
7563
dlopen) libs="$dlfiles" ;;
18881
7564
dlpreopen) libs="$dlprefiles" ;;
18938
Index: brasero-2.30.1/nautilus/Makefile.in
18939
===================================================================
18940
--- brasero-2.30.1.orig/nautilus/Makefile.in 2010-04-29 10:36:23.855306309 +1000
18941
+++ brasero-2.30.1/nautilus/Makefile.in 2010-04-29 10:36:19.492807583 +1000
18943
-# Makefile.in generated by automake 1.11 from Makefile.am.
18944
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
18945
# @configure_input@
18947
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18948
@@ -122,6 +122,8 @@
18949
ALL_LINGUAS = @ALL_LINGUAS@
18951
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
18952
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
18953
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
18955
AUTOCONF = @AUTOCONF@
18956
AUTOHEADER = @AUTOHEADER@
18957
@@ -252,6 +254,7 @@
18958
PACKAGE_NAME = @PACKAGE_NAME@
18959
PACKAGE_STRING = @PACKAGE_STRING@
18960
PACKAGE_TARNAME = @PACKAGE_TARNAME@
18961
+PACKAGE_URL = @PACKAGE_URL@
18962
PACKAGE_VERSION = @PACKAGE_VERSION@
18963
PATH_SEPARATOR = @PATH_SEPARATOR@
18964
PKG_CONFIG = @PKG_CONFIG@
18965
Index: brasero-2.30.1/plugins/Makefile.in
18966
===================================================================
18967
--- brasero-2.30.1.orig/plugins/Makefile.in 2010-04-29 10:36:24.885307049 +1000
18968
+++ brasero-2.30.1/plugins/Makefile.in 2010-04-29 10:36:19.572806858 +1000
18970
-# Makefile.in generated by automake 1.11 from Makefile.am.
18971
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
18972
# @configure_input@
18974
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18975
@@ -102,6 +102,8 @@
18976
ALL_LINGUAS = @ALL_LINGUAS@
18978
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
18979
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
18980
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
18982
AUTOCONF = @AUTOCONF@
18983
AUTOHEADER = @AUTOHEADER@
18984
@@ -232,6 +234,7 @@
18985
PACKAGE_NAME = @PACKAGE_NAME@
18986
PACKAGE_STRING = @PACKAGE_STRING@
18987
PACKAGE_TARNAME = @PACKAGE_TARNAME@
18988
+PACKAGE_URL = @PACKAGE_URL@
18989
PACKAGE_VERSION = @PACKAGE_VERSION@
18990
PATH_SEPARATOR = @PATH_SEPARATOR@
18991
PKG_CONFIG = @PKG_CONFIG@
18992
@@ -351,7 +354,7 @@
18993
# (which will cause the Makefiles to be regenerated when you run `make');
18994
# (2) otherwise, pass the desired values on the `make' command line.
18995
$(RECURSIVE_TARGETS):
18996
- @failcom='exit 1'; \
18997
+ @fail= failcom='exit 1'; \
18998
for f in x $$MAKEFLAGS; do \
19001
@@ -376,7 +379,7 @@
19002
fi; test -z "$$fail"
19004
$(RECURSIVE_CLEAN_TARGETS):
19005
- @failcom='exit 1'; \
19006
+ @fail= failcom='exit 1'; \
19007
for f in x $$MAKEFLAGS; do \
19010
Index: brasero-2.30.1/plugins/audio2cue/Makefile.in
19011
===================================================================
19012
--- brasero-2.30.1.orig/plugins/audio2cue/Makefile.in 2010-04-29 10:36:24.915307719 +1000
19013
+++ brasero-2.30.1/plugins/audio2cue/Makefile.in 2010-04-29 10:36:19.662808175 +1000
19015
-# Makefile.in generated by automake 1.11 from Makefile.am.
19016
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
19017
# @configure_input@
19019
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19020
@@ -115,6 +115,8 @@
19021
ALL_LINGUAS = @ALL_LINGUAS@
19023
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
19024
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
19025
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
19027
AUTOCONF = @AUTOCONF@
19028
AUTOHEADER = @AUTOHEADER@
19029
@@ -245,6 +247,7 @@
19030
PACKAGE_NAME = @PACKAGE_NAME@
19031
PACKAGE_STRING = @PACKAGE_STRING@
19032
PACKAGE_TARNAME = @PACKAGE_TARNAME@
19033
+PACKAGE_URL = @PACKAGE_URL@
19034
PACKAGE_VERSION = @PACKAGE_VERSION@
19035
PATH_SEPARATOR = @PATH_SEPARATOR@
19036
PKG_CONFIG = @PKG_CONFIG@
19037
Index: brasero-2.30.1/plugins/cdrdao/Makefile.in
19038
===================================================================
19039
--- brasero-2.30.1.orig/plugins/cdrdao/Makefile.in 2010-04-29 10:36:24.975308360 +1000
19040
+++ brasero-2.30.1/plugins/cdrdao/Makefile.in 2010-04-29 10:36:19.742806680 +1000
19042
-# Makefile.in generated by automake 1.11 from Makefile.am.
19043
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
19044
# @configure_input@
19046
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19047
@@ -116,6 +116,8 @@
19048
ALL_LINGUAS = @ALL_LINGUAS@
19050
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
19051
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
19052
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
19054
AUTOCONF = @AUTOCONF@
19055
AUTOHEADER = @AUTOHEADER@
19056
@@ -246,6 +248,7 @@
19057
PACKAGE_NAME = @PACKAGE_NAME@
19058
PACKAGE_STRING = @PACKAGE_STRING@
19059
PACKAGE_TARNAME = @PACKAGE_TARNAME@
19060
+PACKAGE_URL = @PACKAGE_URL@
19061
PACKAGE_VERSION = @PACKAGE_VERSION@
19062
PATH_SEPARATOR = @PATH_SEPARATOR@
19063
PKG_CONFIG = @PKG_CONFIG@
19064
Index: brasero-2.30.1/plugins/cdrkit/Makefile.in
19065
===================================================================
19066
--- brasero-2.30.1.orig/plugins/cdrkit/Makefile.in 2010-04-29 10:36:24.625307247 +1000
19067
+++ brasero-2.30.1/plugins/cdrkit/Makefile.in 2010-04-29 10:36:19.842807584 +1000
19069
-# Makefile.in generated by automake 1.11 from Makefile.am.
19070
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
19071
# @configure_input@
19073
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19074
@@ -138,6 +138,8 @@
19075
ALL_LINGUAS = @ALL_LINGUAS@
19077
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
19078
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
19079
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
19081
AUTOCONF = @AUTOCONF@
19082
AUTOHEADER = @AUTOHEADER@
19083
@@ -268,6 +270,7 @@
19084
PACKAGE_NAME = @PACKAGE_NAME@
19085
PACKAGE_STRING = @PACKAGE_STRING@
19086
PACKAGE_TARNAME = @PACKAGE_TARNAME@
19087
+PACKAGE_URL = @PACKAGE_URL@
19088
PACKAGE_VERSION = @PACKAGE_VERSION@
19089
PATH_SEPARATOR = @PATH_SEPARATOR@
19090
PKG_CONFIG = @PKG_CONFIG@
19091
Index: brasero-2.30.1/plugins/cdrtools/Makefile.in
19092
===================================================================
19093
--- brasero-2.30.1.orig/plugins/cdrtools/Makefile.in 2010-04-29 10:36:24.805305822 +1000
19094
+++ brasero-2.30.1/plugins/cdrtools/Makefile.in 2010-04-29 10:36:19.952806827 +1000
19096
-# Makefile.in generated by automake 1.11 from Makefile.am.
19097
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
19098
# @configure_input@
19100
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19101
@@ -149,6 +149,8 @@
19102
ALL_LINGUAS = @ALL_LINGUAS@
19104
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
19105
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
19106
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
19108
AUTOCONF = @AUTOCONF@
19109
AUTOHEADER = @AUTOHEADER@
19110
@@ -279,6 +281,7 @@
19111
PACKAGE_NAME = @PACKAGE_NAME@
19112
PACKAGE_STRING = @PACKAGE_STRING@
19113
PACKAGE_TARNAME = @PACKAGE_TARNAME@
19114
+PACKAGE_URL = @PACKAGE_URL@
19115
PACKAGE_VERSION = @PACKAGE_VERSION@
19116
PATH_SEPARATOR = @PATH_SEPARATOR@
19117
PKG_CONFIG = @PKG_CONFIG@
19118
Index: brasero-2.30.1/plugins/checksum/Makefile.in
19119
===================================================================
19120
--- brasero-2.30.1.orig/plugins/checksum/Makefile.in 2010-04-29 10:36:25.015307928 +1000
19121
+++ brasero-2.30.1/plugins/checksum/Makefile.in 2010-04-29 10:36:20.052807177 +1000
19123
-# Makefile.in generated by automake 1.11 from Makefile.am.
19124
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
19125
# @configure_input@
19127
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19128
@@ -131,6 +131,8 @@
19129
ALL_LINGUAS = @ALL_LINGUAS@
19131
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
19132
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
19133
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
19135
AUTOCONF = @AUTOCONF@
19136
AUTOHEADER = @AUTOHEADER@
19137
@@ -261,6 +263,7 @@
19138
PACKAGE_NAME = @PACKAGE_NAME@
19139
PACKAGE_STRING = @PACKAGE_STRING@
19140
PACKAGE_TARNAME = @PACKAGE_TARNAME@
19141
+PACKAGE_URL = @PACKAGE_URL@
19142
PACKAGE_VERSION = @PACKAGE_VERSION@
19143
PATH_SEPARATOR = @PATH_SEPARATOR@
19144
PKG_CONFIG = @PKG_CONFIG@
19145
Index: brasero-2.30.1/plugins/dvdauthor/Makefile.in
19146
===================================================================
19147
--- brasero-2.30.1.orig/plugins/dvdauthor/Makefile.in 2010-04-29 10:36:24.695308394 +1000
19148
+++ brasero-2.30.1/plugins/dvdauthor/Makefile.in 2010-04-29 10:36:20.142805979 +1000
19150
-# Makefile.in generated by automake 1.11 from Makefile.am.
19151
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
19152
# @configure_input@
19154
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19155
@@ -115,6 +115,8 @@
19156
ALL_LINGUAS = @ALL_LINGUAS@
19158
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
19159
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
19160
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
19162
AUTOCONF = @AUTOCONF@
19163
AUTOHEADER = @AUTOHEADER@
19164
@@ -245,6 +247,7 @@
19165
PACKAGE_NAME = @PACKAGE_NAME@
19166
PACKAGE_STRING = @PACKAGE_STRING@
19167
PACKAGE_TARNAME = @PACKAGE_TARNAME@
19168
+PACKAGE_URL = @PACKAGE_URL@
19169
PACKAGE_VERSION = @PACKAGE_VERSION@
19170
PATH_SEPARATOR = @PATH_SEPARATOR@
19171
PKG_CONFIG = @PKG_CONFIG@
19172
Index: brasero-2.30.1/plugins/dvdcss/Makefile.in
19173
===================================================================
19174
--- brasero-2.30.1.orig/plugins/dvdcss/Makefile.in 2010-04-29 10:36:24.655307500 +1000
19175
+++ brasero-2.30.1/plugins/dvdcss/Makefile.in 2010-04-29 10:36:20.222807908 +1000
19177
-# Makefile.in generated by automake 1.11 from Makefile.am.
19178
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
19179
# @configure_input@
19181
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19182
@@ -116,6 +116,8 @@
19183
ALL_LINGUAS = @ALL_LINGUAS@
19185
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
19186
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
19187
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
19189
AUTOCONF = @AUTOCONF@
19190
AUTOHEADER = @AUTOHEADER@
19191
@@ -246,6 +248,7 @@
19192
PACKAGE_NAME = @PACKAGE_NAME@
19193
PACKAGE_STRING = @PACKAGE_STRING@
19194
PACKAGE_TARNAME = @PACKAGE_TARNAME@
19195
+PACKAGE_URL = @PACKAGE_URL@
19196
PACKAGE_VERSION = @PACKAGE_VERSION@
19197
PATH_SEPARATOR = @PATH_SEPARATOR@
19198
PKG_CONFIG = @PKG_CONFIG@
19199
Index: brasero-2.30.1/plugins/growisofs/Makefile.in
19200
===================================================================
19201
--- brasero-2.30.1.orig/plugins/growisofs/Makefile.in 2010-04-29 10:36:24.735308380 +1000
19202
+++ brasero-2.30.1/plugins/growisofs/Makefile.in 2010-04-29 10:36:20.322807068 +1000
19204
-# Makefile.in generated by automake 1.11 from Makefile.am.
19205
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
19206
# @configure_input@
19208
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19209
@@ -127,6 +127,8 @@
19210
ALL_LINGUAS = @ALL_LINGUAS@
19212
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
19213
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
19214
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
19216
AUTOCONF = @AUTOCONF@
19217
AUTOHEADER = @AUTOHEADER@
19218
@@ -257,6 +259,7 @@
19219
PACKAGE_NAME = @PACKAGE_NAME@
19220
PACKAGE_STRING = @PACKAGE_STRING@
19221
PACKAGE_TARNAME = @PACKAGE_TARNAME@
19222
+PACKAGE_URL = @PACKAGE_URL@
19223
PACKAGE_VERSION = @PACKAGE_VERSION@
19224
PATH_SEPARATOR = @PATH_SEPARATOR@
19225
PKG_CONFIG = @PKG_CONFIG@
19226
Index: brasero-2.30.1/plugins/libburnia/Makefile.in
19227
===================================================================
19228
--- brasero-2.30.1.orig/plugins/libburnia/Makefile.in 2010-04-29 10:36:24.945306851 +1000
19229
+++ brasero-2.30.1/plugins/libburnia/Makefile.in 2010-04-29 10:36:20.412807751 +1000
19231
-# Makefile.in generated by automake 1.11 from Makefile.am.
19232
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
19233
# @configure_input@
19235
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19236
@@ -126,6 +126,8 @@
19237
ALL_LINGUAS = @ALL_LINGUAS@
19239
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
19240
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
19241
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
19243
AUTOCONF = @AUTOCONF@
19244
AUTOHEADER = @AUTOHEADER@
19245
@@ -256,6 +258,7 @@
19246
PACKAGE_NAME = @PACKAGE_NAME@
19247
PACKAGE_STRING = @PACKAGE_STRING@
19248
PACKAGE_TARNAME = @PACKAGE_TARNAME@
19249
+PACKAGE_URL = @PACKAGE_URL@
19250
PACKAGE_VERSION = @PACKAGE_VERSION@
19251
PATH_SEPARATOR = @PATH_SEPARATOR@
19252
PKG_CONFIG = @PKG_CONFIG@
19253
Index: brasero-2.30.1/plugins/local-track/Makefile.in
19254
===================================================================
19255
--- brasero-2.30.1.orig/plugins/local-track/Makefile.in 2010-04-29 10:36:24.765307863 +1000
19256
+++ brasero-2.30.1/plugins/local-track/Makefile.in 2010-04-29 10:36:20.512807192 +1000
19258
-# Makefile.in generated by automake 1.11 from Makefile.am.
19259
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
19260
# @configure_input@
19262
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19263
@@ -126,6 +126,8 @@
19264
ALL_LINGUAS = @ALL_LINGUAS@
19266
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
19267
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
19268
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
19270
AUTOCONF = @AUTOCONF@
19271
AUTOHEADER = @AUTOHEADER@
19272
@@ -256,6 +258,7 @@
19273
PACKAGE_NAME = @PACKAGE_NAME@
19274
PACKAGE_STRING = @PACKAGE_STRING@
19275
PACKAGE_TARNAME = @PACKAGE_TARNAME@
19276
+PACKAGE_URL = @PACKAGE_URL@
19277
PACKAGE_VERSION = @PACKAGE_VERSION@
19278
PATH_SEPARATOR = @PATH_SEPARATOR@
19279
PKG_CONFIG = @PKG_CONFIG@
19280
Index: brasero-2.30.1/plugins/transcode/Makefile.in
19281
===================================================================
19282
--- brasero-2.30.1.orig/plugins/transcode/Makefile.in 2010-04-29 10:36:24.585307609 +1000
19283
+++ brasero-2.30.1/plugins/transcode/Makefile.in 2010-04-29 10:36:20.602807111 +1000
19285
-# Makefile.in generated by automake 1.11 from Makefile.am.
19286
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
19287
# @configure_input@
19289
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19290
@@ -138,6 +138,8 @@
19291
ALL_LINGUAS = @ALL_LINGUAS@
19293
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
19294
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
19295
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
19297
AUTOCONF = @AUTOCONF@
19298
AUTOHEADER = @AUTOHEADER@
19299
@@ -268,6 +270,7 @@
19300
PACKAGE_NAME = @PACKAGE_NAME@
19301
PACKAGE_STRING = @PACKAGE_STRING@
19302
PACKAGE_TARNAME = @PACKAGE_TARNAME@
19303
+PACKAGE_URL = @PACKAGE_URL@
19304
PACKAGE_VERSION = @PACKAGE_VERSION@
19305
PATH_SEPARATOR = @PATH_SEPARATOR@
19306
PKG_CONFIG = @PKG_CONFIG@
19307
Index: brasero-2.30.1/plugins/vcdimager/Makefile.in
19308
===================================================================
19309
--- brasero-2.30.1.orig/plugins/vcdimager/Makefile.in 2010-04-29 10:36:24.845308321 +1000
19310
+++ brasero-2.30.1/plugins/vcdimager/Makefile.in 2010-04-29 10:36:21.292807306 +1000
19312
-# Makefile.in generated by automake 1.11 from Makefile.am.
19313
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
19314
# @configure_input@
19316
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19317
@@ -115,6 +115,8 @@
19318
ALL_LINGUAS = @ALL_LINGUAS@
19320
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
19321
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
19322
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
19324
AUTOCONF = @AUTOCONF@
19325
AUTOHEADER = @AUTOHEADER@
19326
@@ -245,6 +247,7 @@
19327
PACKAGE_NAME = @PACKAGE_NAME@
19328
PACKAGE_STRING = @PACKAGE_STRING@
19329
PACKAGE_TARNAME = @PACKAGE_TARNAME@
19330
+PACKAGE_URL = @PACKAGE_URL@
19331
PACKAGE_VERSION = @PACKAGE_VERSION@
19332
PATH_SEPARATOR = @PATH_SEPARATOR@
19333
PKG_CONFIG = @PKG_CONFIG@
19334
Index: brasero-2.30.1/src/Makefile.in
19335
===================================================================
19336
--- brasero-2.30.1.orig/src/Makefile.in 2010-04-29 10:36:25.105307498 +1000
19337
+++ brasero-2.30.1/src/Makefile.in 2010-04-29 10:36:21.402805852 +1000
19339
-# Makefile.in generated by automake 1.11 from Makefile.am.
19340
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
19341
# @configure_input@
19343
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19344
@@ -190,6 +190,8 @@
19345
ALL_LINGUAS = @ALL_LINGUAS@
19347
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
19348
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
19349
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
19351
AUTOCONF = @AUTOCONF@
19352
AUTOHEADER = @AUTOHEADER@
19353
@@ -320,6 +322,7 @@
19354
PACKAGE_NAME = @PACKAGE_NAME@
19355
PACKAGE_STRING = @PACKAGE_STRING@
19356
PACKAGE_TARNAME = @PACKAGE_TARNAME@
19357
+PACKAGE_URL = @PACKAGE_URL@
19358
PACKAGE_VERSION = @PACKAGE_VERSION@
19359
PATH_SEPARATOR = @PATH_SEPARATOR@
19360
PKG_CONFIG = @PKG_CONFIG@
7756
@@ -6756,14 +6435,14 @@
7757
oldlibs="$oldlibs $output_objdir/$libname.$libext"
7759
# Transform .lo files to .o files.
7760
- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
7761
+ oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
7764
# Eliminate all temporary directories.
7765
#for path in $notinst_path; do
7766
- # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
7767
- # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
7768
- # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
7769
+ # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
7770
+ # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
7771
+ # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
7774
if test -n "$xrpath"; then
7775
@@ -6804,7 +6483,7 @@
7776
if test "$build_libtool_libs" = yes; then
7777
if test -n "$rpath"; then
7779
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
7780
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
7781
# these systems don't actually have a c library (as such)!
7783
*-*-rhapsody* | *-*-darwin1.[012])
7784
@@ -6889,13 +6568,13 @@
7785
newdeplibs="$newdeplibs $i"
7790
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
7791
- echo "*** I have the capability to make that library automatically link in when"
7792
- echo "*** you link to this library. But I can only do this if you have a"
7793
- echo "*** shared version of the library, which I believe you do not have"
7794
- echo "*** because a test_compile did reveal that the linker did not use it for"
7795
- echo "*** its dynamic dependency list that programs get resolved with at runtime."
7796
+ $ECHO "*** I have the capability to make that library automatically link in when"
7797
+ $ECHO "*** you link to this library. But I can only do this if you have a"
7798
+ $ECHO "*** shared version of the library, which I believe you do not have"
7799
+ $ECHO "*** because a test_compile did reveal that the linker did not use it for"
7800
+ $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
7804
@@ -6932,22 +6611,22 @@
7805
newdeplibs="$newdeplibs $i"
7810
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
7811
- echo "*** I have the capability to make that library automatically link in when"
7812
- echo "*** you link to this library. But I can only do this if you have a"
7813
- echo "*** shared version of the library, which you do not appear to have"
7814
- echo "*** because a test_compile did reveal that the linker did not use this one"
7815
- echo "*** as a dynamic dependency that programs can get resolved with at runtime."
7816
+ $ECHO "*** I have the capability to make that library automatically link in when"
7817
+ $ECHO "*** you link to this library. But I can only do this if you have a"
7818
+ $ECHO "*** shared version of the library, which you do not appear to have"
7819
+ $ECHO "*** because a test_compile did reveal that the linker did not use this one"
7820
+ $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
7827
$ECHO "*** Warning! Library $i is needed by this library but I was not able to"
7828
- echo "*** make it link in! You will probably need to install it or some"
7829
- echo "*** library that it depends on before this library will be fully"
7830
- echo "*** functional. Installing it before continuing would be even better."
7831
+ $ECHO "*** make it link in! You will probably need to install it or some"
7832
+ $ECHO "*** library that it depends on before this library will be fully"
7833
+ $ECHO "*** functional. Installing it before continuing would be even better."
7837
@@ -6993,7 +6672,7 @@
7838
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
7840
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
7841
- *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
7842
+ *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
7845
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
7846
@@ -7008,12 +6687,12 @@
7848
if test -n "$a_deplib" ; then
7852
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
7853
- echo "*** I have the capability to make that library automatically link in when"
7854
- echo "*** you link to this library. But I can only do this if you have a"
7855
- echo "*** shared version of the library, which you do not appear to have"
7856
- echo "*** because I did check the linker path looking for a file starting"
7857
+ $ECHO "*** I have the capability to make that library automatically link in when"
7858
+ $ECHO "*** you link to this library. But I can only do this if you have a"
7859
+ $ECHO "*** shared version of the library, which you do not appear to have"
7860
+ $ECHO "*** because I did check the linker path looking for a file starting"
7861
if test -z "$potlib" ; then
7862
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
7864
@@ -7051,7 +6730,7 @@
7865
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
7866
for potent_lib in $potential_libs; do
7867
potlib="$potent_lib" # see symlink-check above in file_magic test
7868
- if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
7869
+ if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
7870
$EGREP "$match_pattern_regex" > /dev/null; then
7871
newdeplibs="$newdeplibs $a_deplib"
7873
@@ -7062,12 +6741,12 @@
7875
if test -n "$a_deplib" ; then
7879
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
7880
- echo "*** I have the capability to make that library automatically link in when"
7881
- echo "*** you link to this library. But I can only do this if you have a"
7882
- echo "*** shared version of the library, which you do not appear to have"
7883
- echo "*** because I did check the linker path looking for a file starting"
7884
+ $ECHO "*** I have the capability to make that library automatically link in when"
7885
+ $ECHO "*** you link to this library. But I can only do this if you have a"
7886
+ $ECHO "*** shared version of the library, which you do not appear to have"
7887
+ $ECHO "*** because I did check the linker path looking for a file starting"
7888
if test -z "$potlib" ; then
7889
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
7891
@@ -7085,25 +6764,25 @@
7895
- tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
7896
+ tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
7897
+ -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
7898
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
7899
for i in $predeps $postdeps ; do
7900
# can't use Xsed below, because $i might contain '/'
7901
- tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
7902
+ tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
7905
- case $tmp_deplibs in
7908
+ if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
7909
+ $GREP . >/dev/null; then
7911
if test "X$deplibs_check_method" = "Xnone"; then
7912
- echo "*** Warning: inter-library dependencies are not supported in this platform."
7913
+ $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
7915
- echo "*** Warning: inter-library dependencies are not known to be supported."
7916
+ $ECHO "*** Warning: inter-library dependencies are not known to be supported."
7918
- echo "*** All declared inter-library dependencies are being dropped."
7919
+ $ECHO "*** All declared inter-library dependencies are being dropped."
7926
versuffix=$versuffix_save
7927
@@ -7115,23 +6794,23 @@
7929
*-*-rhapsody* | *-*-darwin1.[012])
7930
# On Rhapsody replace the C library with the System framework
7931
- newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
7932
+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
7936
if test "$droppeddeps" = yes; then
7937
if test "$module" = yes; then
7939
- echo "*** Warning: libtool could not satisfy all declared inter-library"
7941
+ $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
7942
$ECHO "*** dependencies of module $libname. Therefore, libtool will create"
7943
- echo "*** a static module, that should work as long as the dlopening"
7944
- echo "*** application is linked with the -dlopen flag."
7945
+ $ECHO "*** a static module, that should work as long as the dlopening"
7946
+ $ECHO "*** application is linked with the -dlopen flag."
7947
if test -z "$global_symbol_pipe"; then
7949
- echo "*** However, this would only work if libtool was able to extract symbol"
7950
- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
7951
- echo "*** not find such a program. So, this module is probably useless."
7952
- echo "*** \`nm' from GNU binutils and a full rebuild may help."
7954
+ $ECHO "*** However, this would only work if libtool was able to extract symbol"
7955
+ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
7956
+ $ECHO "*** not find such a program. So, this module is probably useless."
7957
+ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
7959
if test "$build_old_libs" = no; then
7960
oldlibs="$output_objdir/$libname.$libext"
7961
@@ -7141,16 +6820,16 @@
7962
build_libtool_libs=no
7965
- echo "*** The inter-library dependencies that have been dropped here will be"
7966
- echo "*** automatically added whenever a program is linked with this library"
7967
- echo "*** or is declared to -dlopen it."
7968
+ $ECHO "*** The inter-library dependencies that have been dropped here will be"
7969
+ $ECHO "*** automatically added whenever a program is linked with this library"
7970
+ $ECHO "*** or is declared to -dlopen it."
7972
if test "$allow_undefined" = no; then
7974
- echo "*** Since this library must not contain undefined symbols,"
7975
- echo "*** because either the platform does not support them or"
7976
- echo "*** it was explicitly requested with -no-undefined,"
7977
- echo "*** libtool will only create a static version of it."
7979
+ $ECHO "*** Since this library must not contain undefined symbols,"
7980
+ $ECHO "*** because either the platform does not support them or"
7981
+ $ECHO "*** it was explicitly requested with -no-undefined,"
7982
+ $ECHO "*** libtool will only create a static version of it."
7983
if test "$build_old_libs" = no; then
7984
oldlibs="$output_objdir/$libname.$libext"
7985
build_libtool_libs=module
7986
@@ -7167,9 +6846,9 @@
7987
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
7990
- newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
7991
- new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
7992
- deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
7993
+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
7994
+ new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
7995
+ deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
7999
@@ -7291,7 +6970,7 @@
8002
# Use standard objects if they are pic
8003
- test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
8004
+ test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
8005
test "X$libobjs" = "X " && libobjs=
8008
@@ -7357,7 +7036,7 @@
8009
if test -n "$export_symbols" && test -n "$include_expsyms"; then
8010
tmp_export_symbols="$export_symbols"
8011
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
8012
- $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
8013
+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
8016
if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
8017
@@ -7458,8 +7137,7 @@
8018
save_libobjs=$libobjs
8021
- func_basename "$output"
8022
- output_la=$func_basename_result
8023
+ output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
8025
# Clear the reloadable object creation command queue and
8026
# initialize k to one.
8027
@@ -7472,12 +7150,12 @@
8028
if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
8029
output=${output_objdir}/${output_la}.lnkscript
8030
func_verbose "creating GNU ld script: $output"
8031
- echo 'INPUT (' > $output
8032
+ $ECHO 'INPUT (' > $output
8033
for obj in $save_libobjs
8035
$ECHO "$obj" >> $output
8037
- echo ')' >> $output
8038
+ $ECHO ')' >> $output
8039
delfiles="$delfiles $output"
8040
elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
8041
output=${output_objdir}/${output_la}.lnk
8042
@@ -7519,19 +7197,17 @@
8043
# command to the queue.
8044
if test "$k" -eq 1 ; then
8045
# The first file doesn't have a previous command to add.
8046
- reload_objs=$objlist
8047
- eval concat_cmds=\"$reload_cmds\"
8048
+ eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
8050
# All subsequent reloadable object files will link in
8051
# the last one created.
8052
- reload_objs="$objlist $last_robj"
8053
- eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
8054
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
8056
last_robj=$output_objdir/$output_la-${k}.$objext
8058
k=$func_arith_result
8059
output=$output_objdir/$output_la-${k}.$objext
8062
func_len " $last_robj"
8063
func_arith $len0 + $func_len_result
8064
len=$func_arith_result
8065
@@ -7541,8 +7217,7 @@
8066
# reloadable object file. All subsequent reloadable object
8067
# files will link in the last one created.
8068
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
8069
- reload_objs="$objlist $last_robj"
8070
- eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
8071
+ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
8072
if test -n "$last_robj"; then
8073
eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
8075
@@ -7601,7 +7276,7 @@
8076
if test -n "$export_symbols" && test -n "$include_expsyms"; then
8077
tmp_export_symbols="$export_symbols"
8078
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
8079
- $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
8080
+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
8083
if test -n "$orig_export_symbols"; then
8084
@@ -7766,7 +7441,7 @@
8085
if test -n "$convenience"; then
8086
if test -n "$whole_archive_flag_spec"; then
8087
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
8088
- reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
8089
+ reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
8091
gentop="$output_objdir/${obj}x"
8092
generated="$generated $gentop"
8093
@@ -7777,7 +7452,7 @@
8096
# Create the old-style object.
8097
- reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
8098
+ reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
8101
func_execute_cmds "$reload_cmds" 'exit $?'
8102
@@ -7837,8 +7512,8 @@
8104
*-*-rhapsody* | *-*-darwin1.[012])
8105
# On Rhapsody replace the C library is the System framework
8106
- compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
8107
- finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
8108
+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
8109
+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
8113
@@ -7855,8 +7530,8 @@
8116
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
8117
- compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
8118
- finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
8119
+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
8120
+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
8124
@@ -7993,8 +7668,8 @@
8126
if test -n "$libobjs" && test "$build_old_libs" = yes; then
8127
# Transform all the library objects into standard objects.
8128
- compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
8129
- finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
8130
+ compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
8131
+ finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
8134
func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
8135
@@ -8006,15 +7681,15 @@
8137
wrappers_required=yes
8139
- *cegcc* | *mingw32ce*)
8140
- # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
8141
- wrappers_required=no
8143
*cygwin* | *mingw* )
8144
if test "$build_libtool_libs" != yes; then
8145
wrappers_required=no
8149
+ # Disable wrappers for cegcc, we are cross compiling anyway.
8150
+ wrappers_required=no
8153
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
8154
wrappers_required=no
8155
@@ -8023,7 +7698,7 @@
8157
if test "$wrappers_required" = no; then
8158
# Replace the output file specification.
8159
- compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
8160
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
8161
link_command="$compile_command$compile_rpath"
8163
# We have no uninstalled library dependencies, so finalize right now.
8164
@@ -8070,7 +7745,7 @@
8165
# We don't need to create a wrapper script.
8166
link_command="$compile_var$compile_command$compile_rpath"
8167
# Replace the output file specification.
8168
- link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
8169
+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
8170
# Delete the old output file.
8171
$opt_dry_run || $RM $output
8172
# Link the executable and exit
8173
@@ -8089,7 +7764,7 @@
8174
if test "$fast_install" != no; then
8175
link_command="$finalize_var$compile_command$finalize_rpath"
8176
if test "$fast_install" = yes; then
8177
- relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
8178
+ relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
8180
# fast_install is set to needless
8182
@@ -8101,7 +7776,7 @@
8185
# Replace the output file specification.
8186
- link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
8187
+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
8189
# Delete the old output files.
8190
$opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
8191
@@ -8125,7 +7800,18 @@
8194
relink_command="(cd `pwd`; $relink_command)"
8195
- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
8196
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
8199
+ # Quote $ECHO for shipping.
8200
+ if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
8202
+ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
8203
+ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
8205
+ qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
8207
+ qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
8210
# Only actually do things if not in dry run mode.
8211
@@ -8246,7 +7932,7 @@
8212
done | sort | sort -uc >/dev/null 2>&1); then
8215
- echo "copying selected object files to avoid basename conflicts..."
8216
+ $ECHO "copying selected object files to avoid basename conflicts..."
8217
gentop="$output_objdir/${outputname}x"
8218
generated="$generated $gentop"
8219
func_mkdir_p "$gentop"
8220
@@ -8357,7 +8043,7 @@
8222
# Quote the link command for shipping.
8223
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
8224
- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
8225
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
8226
if test "$hardcode_automatic" = yes ; then
8229
@@ -8442,27 +8128,9 @@
8232
# place dlname in correct position for cygwin
8233
- # In fact, it would be nice if we could use this code for all target
8234
- # systems that can't hard-code library paths into their executables
8235
- # and that have no shared library path variable independent of PATH,
8236
- # but it turns out we can't easily determine that from inspecting
8237
- # libtool variables, so we have to hard-code the OSs to which it
8238
- # applies here; at the moment, that means platforms that use the PE
8239
- # object format with DLL files. See the long comment at the top of
8240
- # tests/bindir.at for full details.
8242
case $host,$output,$installed,$module,$dlname in
8243
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
8244
- # If a -bindir argument was supplied, place the dll there.
8245
- if test "x$bindir" != x ;
8247
- func_relative_path "$install_libdir" "$bindir"
8248
- tdlname=$func_relative_path_result$dlname
8250
- # Otherwise fall back on heuristic.
8251
- tdlname=../bin/$dlname
8254
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
8257
# $outputname - a libtool library file