r19184 - in /desktop/experimental/pango1.0/debian: changelog control control.in libpango1.0-0.symbols patches/13_pango-view-undefined-references.patch patches/90_relibtoolize.patch patches/series rules
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Sun Mar 22 14:20:08 UTC 2009
Author: slomo
Date: Sun Mar 22 14:20:08 2009
New Revision: 19184
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19184
Log:
* New upstream release:
+ debian/patches/90_relibtoolize.patch:
- Updated for the new version.
+ debian/control.in:
- Update build dependencies.
+ debian/rules,
debian/libpango1.0-0.symbols:
- Update for API additions.
* debian/patches/13_pango-view-undefined-references.patch:
+ Fix linking of pango-view for the udeb.
Added:
desktop/experimental/pango1.0/debian/patches/13_pango-view-undefined-references.patch
Modified:
desktop/experimental/pango1.0/debian/changelog
desktop/experimental/pango1.0/debian/control
desktop/experimental/pango1.0/debian/control.in
desktop/experimental/pango1.0/debian/libpango1.0-0.symbols
desktop/experimental/pango1.0/debian/patches/90_relibtoolize.patch
desktop/experimental/pango1.0/debian/patches/series
desktop/experimental/pango1.0/debian/rules
Modified: desktop/experimental/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/changelog?rev=19184&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/changelog (original)
+++ desktop/experimental/pango1.0/debian/changelog Sun Mar 22 14:20:08 2009
@@ -1,3 +1,18 @@
+pango1.0 (1.24.0-1) experimental; urgency=low
+
+ * New upstream release:
+ + debian/patches/90_relibtoolize.patch:
+ - Updated for the new version.
+ + debian/control.in:
+ - Update build dependencies.
+ + debian/rules,
+ debian/libpango1.0-0.symbols:
+ - Update for API additions.
+ * debian/patches/13_pango-view-undefined-references.patch:
+ + Fix linking of pango-view for the udeb.
+
+ -- Sebastian Dröge <slomo at debian.org> Sun, 22 Mar 2009 15:11:40 +0100
+
pango1.0 (1.22.4-3) unstable; urgency=low
[ Loic Minier ]
Modified: desktop/experimental/pango1.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/control?rev=19184&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/control (original)
+++ desktop/experimental/pango1.0/debian/control Sun Mar 22 14:20:08 2009
@@ -12,7 +12,7 @@
pkg-config,
defoma (>= 0.11.1),
libxft-dev (>= 2.0.0),
- libfontconfig1-dev (>= 2.1.91),
+ libfontconfig1-dev (>= 2.5.0),
autotools-dev,
po-debconf,
gnome-pkg-tools (>= 0.11),
Modified: desktop/experimental/pango1.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/control.in?rev=19184&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/control.in (original)
+++ desktop/experimental/pango1.0/debian/control.in Sun Mar 22 14:20:08 2009
@@ -12,7 +12,7 @@
pkg-config,
defoma (>= 0.11.1),
libxft-dev (>= 2.0.0),
- libfontconfig1-dev (>= 2.1.91),
+ libfontconfig1-dev (>= 2.5.0),
autotools-dev,
po-debconf,
gnome-pkg-tools (>= 0.11),
Modified: desktop/experimental/pango1.0/debian/libpango1.0-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/libpango1.0-0.symbols?rev=19184&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/libpango1.0-0.symbols (original)
+++ desktop/experimental/pango1.0/debian/libpango1.0-0.symbols Sun Mar 22 14:20:08 2009
@@ -440,13 +440,23 @@
pango_fc_font_get_unknown_glyph at Base 1.14.0
pango_fc_font_has_char at Base 1.14.0
pango_fc_font_kern_glyphs at Base 1.14.0
+ pango_fc_font_key_get_context_key at Base 1.24.0
+ pango_fc_font_key_get_matrix at Base 1.24.0
+ pango_fc_font_key_get_pattern at Base 1.24.0
pango_fc_font_lock_face at Base 1.14.0
pango_fc_font_map_add_decoder_find_func at Base 1.14.0
pango_fc_font_map_cache_clear at Base 1.14.0
pango_fc_font_map_create_context at Base 1.14.0
+ pango_fc_font_map_find_decoder at Base 1.24.0
pango_fc_font_map_get_type at Base 1.14.0
pango_fc_font_map_shutdown at Base 1.14.0
pango_fc_font_unlock_face at Base 1.14.0
+ pango_fc_fontset_key_get_absolute_size at Base 1.24.0
+ pango_fc_fontset_key_get_context_key at Base 1.24.0
+ pango_fc_fontset_key_get_description at Base 1.24.0
+ pango_fc_fontset_key_get_language at Base 1.24.0
+ pango_fc_fontset_key_get_matrix at Base 1.24.0
+ pango_fc_fontset_key_get_resolution at Base 1.24.0
pango_ft2_font_get_coverage at Base 1.14.0
pango_ft2_font_get_face at Base 1.14.0
pango_ft2_font_get_kerning at Base 1.14.0
@@ -514,7 +524,6 @@
pango_x_face_get_type at Base 1.14.0
pango_x_face_remove at Base 1.14.0
pango_x_fallback_shape at Base 1.14.0
- pango_x_family_get_name at Base 1.14.0
pango_x_family_get_type at Base 1.14.0
pango_x_find_first_subfont at Base 1.14.0
pango_x_font_cache_free at Base 1.14.0
Added: desktop/experimental/pango1.0/debian/patches/13_pango-view-undefined-references.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/patches/13_pango-view-undefined-references.patch?rev=19184&op=file
==============================================================================
--- desktop/experimental/pango1.0/debian/patches/13_pango-view-undefined-references.patch (added)
+++ desktop/experimental/pango1.0/debian/patches/13_pango-view-undefined-references.patch Sun Mar 22 14:20:08 2009
@@ -1,0 +1,43 @@
+--- pango/pango-view/viewer-cairo.c.old 2009-03-22 15:06:45.000000000 +0100
++++ pango/pango-view/viewer-cairo.c 2009-03-22 15:07:39.000000000 +0100
+@@ -30,6 +30,7 @@
+
+
+ #ifdef HAVE_CAIRO_XLIB
++#ifdef HAVE_X
+ #include "viewer-x.h"
+ #include <cairo-xlib.h>
+
+@@ -72,6 +73,7 @@
+ cairo_x_view_iface_create_surface,
+ cairo_x_view_iface_paint_background
+ };
++#endif /* HAVE_X */
+ #endif /* HAVE_CAIRO_XLIB */
+
+
+@@ -348,11 +350,13 @@
+ return ret;
+
+ #ifdef HAVE_CAIRO_XLIB
++#ifdef HAVE_X
+ if (opt_display)
+ {
+ *iface = &cairo_x_viewer_iface;
+ return (*iface)->backend_class->create ((*iface)->backend_class);
+ }
++#endif /* HAVE_X */
+ #endif /* HAVE_CAIRO_XLIB */
+
+ *iface = &cairo_image_viewer_iface;
+--- pango/pango-view/pango-view.c.old 2009-03-22 15:09:48.000000000 +0100
++++ pango/pango-view/pango-view.c 2009-03-22 15:09:51.000000000 +0100
+@@ -7,7 +7,7 @@
+ extern const PangoViewer pangox_viewer;
+
+ const PangoViewer *viewers[] = {
+-#ifdef HAVE_CAIRO_XLIB
++#ifdef HAVE_CAIRO
+ &pangocairo_viewer,
+ #endif
+ #ifdef HAVE_XFT
Modified: desktop/experimental/pango1.0/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/patches/90_relibtoolize.patch?rev=19184&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/patches/90_relibtoolize.patch (original)
+++ desktop/experimental/pango1.0/debian/patches/90_relibtoolize.patch Sun Mar 22 14:20:08 2009
@@ -1,56 +1,37 @@
-libtoolize --force --copy
-aclocal
-automake -acf
-autoconf
-rm -rf autom4te.cache
-
-diff -pruN pango-1.22.4.orig/aclocal.m4 pango-1.22.4/aclocal.m4
---- pango-1.22.4.orig/aclocal.m4 2008-12-16 07:14:27.000000000 +0100
-+++ pango-1.22.4/aclocal.m4 2009-01-06 16:41:24.488690811 +0100
-@@ -13,8 +13,8 @@
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/aclocal.m4 pango1.0-1.24.0/aclocal.m4
+--- pango1.0-1.24.0.old/aclocal.m4 2009-03-16 23:34:43.000000000 +0100
++++ pango1.0-1.24.0/aclocal.m4 2009-03-22 14:58:01.000000000 +0100
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
++# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+@@ -13,7 +13,7 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(AC_AUTOCONF_VERSION, [2.63],,
--[m4_warning([this file was generated for autoconf 2.63.
-+m4_if(AC_AUTOCONF_VERSION, [2.61],,
-+[m4_warning([this file was generated for autoconf 2.61.
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
++m4_if(AC_AUTOCONF_VERSION, [2.63],,
+ [m4_warning([this file was generated for autoconf 2.63.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
- To do so, use the procedure documented by the package, typically `autoreconf'.])])
-@@ -61,7 +61,7 @@ AC_DEFUN([GTK_DOC_CHECK],
-
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
--# serial 52 AC_PROG_LIBTOOL
-+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
-
-
- # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -685,7 +685,6 @@ s390*-*linux*|sparc*-*linux*)
- esac
- ;;
- *64-bit*)
-- libsuff=64
- case $host in
- x86_64-*kfreebsd*-gnu)
- LD="${LD-ld} -m elf_x86_64_fbsd"
-@@ -1748,13 +1747,11 @@ linux* | k*bsd*-gnu)
- # Some rework will be needed to allow for fast_install
+@@ -2525,13 +2525,10 @@
# before this can be enabled.
hardcode_into_libs=yes
-- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-
+
+- # Add ABI-specific directories to the system library path.
+- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- 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' ' '`
+ 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' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -1766,6 +1763,18 @@ linux* | k*bsd*-gnu)
+@@ -2543,6 +2540,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -69,68 +50,61 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -2547,7 +2556,7 @@ linux* | k*bsd*-gnu)
+@@ -3134,7 +3143,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -3554,7 +3563,7 @@ case $host_os in
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- wlarc=
-@@ -5246,7 +5255,7 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -3815,7 +3824,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
- osf3* | osf4* | osf5*)
- case $cc_basename in
-@@ -5623,6 +5632,9 @@ ifelse([$1],[CXX],[
- cygwin* | mingw*)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ *qnx* | *nto*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -4240,6 +4249,9 @@
+ cygwin* | mingw* | cegcc*)
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
+ linux* | k*bsd*-gnu)
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
*)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -5831,12 +5843,13 @@ EOF
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -4486,7 +4498,7 @@
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -6267,7 +6280,7 @@ _LT_EOF
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+@@ -4661,6 +4673,7 @@
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
++ _LT_TAGVAR(link_all_deplibs, $1)=no
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -4899,7 +4912,7 @@
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -6766,14 +6779,16 @@ fi])
+@@ -8076,14 +8089,16 @@
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
@@ -155,7 +129,7 @@
fi[]dnl
])# _PKG_CONFIG
-@@ -6817,9 +6832,9 @@ See the pkg-config man page for more det
+@@ -8127,9 +8142,9 @@
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
@@ -167,5784 +141,348 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-diff -pruN pango-1.22.4.orig/config.guess pango-1.22.4/config.guess
---- pango-1.22.4.orig/config.guess 2008-12-16 07:14:36.000000000 +0100
-+++ pango-1.22.4/config.guess 2009-01-06 16:41:30.472193882 +0100
+@@ -8164,7 +8179,7 @@
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+
+-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -8179,7 +8194,7 @@
+ [am__api_version='1.10'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version. Point them to the right macro.
+-m4_if([$1], [1.10.2], [],
++m4_if([$1], [1.10.1], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+
+@@ -8193,12 +8208,12 @@
+ # AM_SET_CURRENT_AUTOMAKE_VERSION
+ # -------------------------------
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.10.2])dnl
++[AM_AUTOMAKE_VERSION([1.10.1])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
++_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+
+ # AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+@@ -8448,28 +8463,19 @@
+
+ # Generate code to set up dependency tracking. -*- Autoconf -*-
+
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-#serial 4
++#serial 3
+
+ # _AM_OUTPUT_DEPENDENCY_COMMANDS
+ # ------------------------------
+ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[# Autoconf 2.62 quotes --file arguments for eval, but not when files
+-# are listed without --file. Let's play safe and only enable the eval
+-# if we detect the quoting.
+-case $CONFIG_FILES in
+-*\'*) eval set x "$CONFIG_FILES" ;;
+-*) set x $CONFIG_FILES ;;
+-esac
+-shift
+-for mf
+-do
++[for mf in $CONFIG_FILES; do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+@@ -8813,13 +8819,13 @@
+
+ # Helper functions for option handling. -*- Autoconf -*-
+
+-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 4
++# serial 3
+
+ # _AM_MANGLE_OPTION(NAME)
+ # -----------------------
+@@ -8836,7 +8842,7 @@
+ # ----------------------------------
+ # OPTIONS is a space-separated list of Automake options.
+ AC_DEFUN([_AM_SET_OPTIONS],
+-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+ # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+ # -------------------------------------------
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/config.guess pango1.0-1.24.0/config.guess
+--- pango1.0-1.24.0.old/config.guess 2009-02-07 00:50:27.000000000 +0100
++++ pango1.0-1.24.0/config.guess 2009-03-22 14:58:12.000000000 +0100
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
--timestamp='2008-01-08'
+-timestamp='2008-11-15'
+timestamp='2008-01-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-@@ -1484,9 +1484,9 @@ This script, last modified $timestamp, h
- the operating system you are using. It is advised that you
- download the most up to date version of the config scripts from
-
-- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
- and
-- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
- If the version you run ($0) is already up to date, please
- send the following data and any information you think might be
-diff -pruN pango-1.22.4.orig/configure pango-1.22.4/configure
---- pango-1.22.4.orig/configure 2008-12-16 07:14:30.000000000 +0100
-+++ pango-1.22.4/configure 2009-01-06 16:41:31.840190722 +0100
-@@ -1,11 +1,11 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for pango 1.22.4.
-+# Generated by GNU Autoconf 2.61 for pango 1.22.4.
- #
- # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=pango>.
- #
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
-@@ -17,7 +17,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
-- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-@@ -39,45 +39,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
- as_cr_digits='0123456789'
- as_cr_alnum=$as_cr_Letters$as_cr_digits
-
--as_nl='
--'
--export as_nl
--# Printing a long string crashes Solaris 7 /usr/bin/printf.
--as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
--as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
--as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
--if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-- as_echo='printf %s\n'
-- as_echo_n='printf %s'
--else
-- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-- as_echo_n='/usr/ucb/echo -n'
-- else
-- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-- as_echo_n_body='eval
-- arg=$1;
-- case $arg in
-- *"$as_nl"*)
-- expr "X$arg" : "X\\(.*\\)$as_nl";
-- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-- esac;
-- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-- '
-- export as_echo_n_body
-- as_echo_n='sh -c $as_echo_n_body as_echo'
-- fi
-- export as_echo_body
-- as_echo='sh -c $as_echo_body as_echo'
--fi
--
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
-- PATH_SEPARATOR=:
-- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-- PATH_SEPARATOR=';'
-- }
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
- fi
-
- # Support unset when possible.
-@@ -93,6 +65,8 @@ fi
- # there to prevent editors from complaining about space-tab.
- # (If _AS_PATH_WALK were called with IFS unset, it would disable word
- # splitting by setting IFS to empty value.)
-+as_nl='
-+'
- IFS=" "" $as_nl"
-
- # Find who we are. Look in the path if we contain no directory separator.
-@@ -115,7 +89,7 @@ if test "x$as_myself" = x; then
- as_myself=$0
- fi
- if test ! -f "$as_myself"; then
-- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
- fi
-
-@@ -128,10 +102,17 @@ PS2='> '
- PS4='+ '
-
- # NLS nuisances.
--LC_ALL=C
--export LC_ALL
--LANGUAGE=C
--export LANGUAGE
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ fi
-+done
-
- # Required to use basename.
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -153,7 +134,7 @@ as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X/"$0" |
-+echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
-@@ -179,7 +160,7 @@ else
- as_have_required=no
- fi
-
-- if test $as_have_required = yes && (eval ":
-+ if test $as_have_required = yes && (eval ":
- (as_func_return () {
- (exit \$1)
- }
-@@ -261,7 +242,7 @@ IFS=$as_save_IFS
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
-- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-@@ -282,7 +263,7 @@ _ASEOF
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
-- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-@@ -362,10 +343,10 @@ fi
-
- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
-- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-- done
-- export CONFIG_SHELL
-- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ done
-+ export CONFIG_SHELL
-+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
- fi
-
-
-@@ -434,10 +415,9 @@ fi
-
- test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
-- echo Please tell bug-autoconf at gnu.org about your system,
-- echo including any error possibly output before this message.
-- echo This can help us improve future autoconf versions.
-- echo Configuration will now proceed without shell functions.
-+ echo Please tell autoconf at gnu.org about your system,
-+ echo including any error possibly output before this
-+ echo message
- }
-
-
-@@ -473,7 +453,7 @@ test \$exitcode = 0") || {
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
-- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
-@@ -501,6 +481,7 @@ case `echo -n x` in
- *)
- ECHO_N='-n';;
- esac
-+
- if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-@@ -513,22 +494,19 @@ if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
- else
- rm -f conf$$.dir
-- mkdir conf$$.dir 2>/dev/null
-+ mkdir conf$$.dir
- fi
--if (echo >conf$$.file) 2>/dev/null; then
-- if ln -s conf$$.file conf$$ 2>/dev/null; then
-- as_ln_s='ln -s'
-- # ... but there are two gotchas:
-- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-- # In both cases, we have to default to `cp -p'.
-- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-- as_ln_s='cp -p'
-- elif ln conf$$.file conf$$ 2>/dev/null; then
-- as_ln_s=ln
-- else
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+ as_ln_s='ln -s'
-+ # ... but there are two gotchas:
-+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+ # In both cases, we have to default to `cp -p'.
-+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
-- fi
-+elif ln conf$$.file conf$$ 2>/dev/null; then
-+ as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
-@@ -553,10 +531,10 @@ else
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-- test -d "$1/.";
-+ test -d "$1/.";
- else
- case $1 in
-- -*)set "./$1";;
-+ -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
-@@ -791,297 +769,274 @@ ac_includes_default="\
- # include <unistd.h>
- #endif"
-
--ac_subst_vars='LTLIBOBJS
--LIBOBJS
--DISABLE_EXPLICIT_DEPS_FALSE
--DISABLE_EXPLICIT_DEPS_TRUE
--PKGCONFIG_CAIRO_REQUIRES
--PKGCONFIG_MATH_LIBS
--MODULE_LIBTOOL_OPTIONS
--LIBRARY_LIBTOOL_OPTIONS
--ENABLE_DOC_CROSS_REFERENCES_FALSE
--ENABLE_DOC_CROSS_REFERENCES_TRUE
--CAIRO_PREFIX
--GLIB_PREFIX
--ENABLE_MAN_FALSE
--ENABLE_MAN_TRUE
--XMLCATALOG
--XML_CATALOG_FILE
--XSLTPROC
--GTK_DOC_USE_LIBTOOL_FALSE
--GTK_DOC_USE_LIBTOOL_TRUE
--ENABLE_GTK_DOC_FALSE
--ENABLE_GTK_DOC_TRUE
--GTKDOC_CHECK
--HTML_DIR
--DYNAMIC_TIBETAN_FC_FALSE
--DYNAMIC_TIBETAN_FC_TRUE
--DYNAMIC_THAI_LANG_FALSE
--DYNAMIC_THAI_LANG_TRUE
--DYNAMIC_THAI_FC_FALSE
--DYNAMIC_THAI_FC_TRUE
--DYNAMIC_SYRIAC_FC_FALSE
--DYNAMIC_SYRIAC_FC_TRUE
--DYNAMIC_KHMER_FC_FALSE
--DYNAMIC_KHMER_FC_TRUE
--DYNAMIC_INDIC_LANG_FALSE
--DYNAMIC_INDIC_LANG_TRUE
--DYNAMIC_INDIC_FC_FALSE
--DYNAMIC_INDIC_FC_TRUE
--DYNAMIC_HEBREW_FC_FALSE
--DYNAMIC_HEBREW_FC_TRUE
--DYNAMIC_HANGUL_FC_FALSE
--DYNAMIC_HANGUL_FC_TRUE
--DYNAMIC_BASIC_ATSUI_FALSE
--DYNAMIC_BASIC_ATSUI_TRUE
--DYNAMIC_BASIC_X_FALSE
--DYNAMIC_BASIC_X_TRUE
--DYNAMIC_BASIC_WIN32_FALSE
--DYNAMIC_BASIC_WIN32_TRUE
--DYNAMIC_BASIC_FC_FALSE
--DYNAMIC_BASIC_FC_TRUE
--DYNAMIC_ARABIC_LANG_FALSE
--DYNAMIC_ARABIC_LANG_TRUE
--DYNAMIC_ARABIC_FC_FALSE
--DYNAMIC_ARABIC_FC_TRUE
--INCLUDE_TIBETAN_FC_FALSE
--INCLUDE_TIBETAN_FC_TRUE
--INCLUDE_THAI_LANG_FALSE
--INCLUDE_THAI_LANG_TRUE
--INCLUDE_THAI_FC_FALSE
--INCLUDE_THAI_FC_TRUE
--INCLUDE_SYRIAC_FC_FALSE
--INCLUDE_SYRIAC_FC_TRUE
--INCLUDE_KHMER_FC_FALSE
--INCLUDE_KHMER_FC_TRUE
--INCLUDE_INDIC_LANG_FALSE
--INCLUDE_INDIC_LANG_TRUE
--INCLUDE_INDIC_FC_FALSE
--INCLUDE_INDIC_FC_TRUE
--INCLUDE_HEBREW_FC_FALSE
--INCLUDE_HEBREW_FC_TRUE
--INCLUDE_HANGUL_FC_FALSE
--INCLUDE_HANGUL_FC_TRUE
--INCLUDE_BASIC_ATSUI_FALSE
--INCLUDE_BASIC_ATSUI_TRUE
--INCLUDE_BASIC_X_FALSE
--INCLUDE_BASIC_X_TRUE
--INCLUDE_BASIC_WIN32_FALSE
--INCLUDE_BASIC_WIN32_TRUE
--INCLUDE_BASIC_FC_FALSE
--INCLUDE_BASIC_FC_TRUE
--INCLUDE_ARABIC_LANG_FALSE
--INCLUDE_ARABIC_LANG_TRUE
--INCLUDE_ARABIC_FC_FALSE
--INCLUDE_ARABIC_FC_TRUE
--INCLUDED_LANG_MODULES
--INCLUDED_ATSUI_MODULES
--INCLUDED_WIN32_MODULES
--INCLUDED_FC_MODULES
--INCLUDED_X_MODULES
--HAVE_DYNAMIC_MODULES_FALSE
--HAVE_DYNAMIC_MODULES_TRUE
--HAVE_INCLUDED_MODULES_FALSE
--HAVE_INCLUDED_MODULES_TRUE
--LIBTHAI_LIBS
--LIBTHAI_CFLAGS
--GLIB_LIBS
--GLIB_CFLAGS
--HAVE_CAIRO_ATSUI_FALSE
--HAVE_CAIRO_ATSUI_TRUE
--HAVE_CAIRO_FREETYPE_FALSE
--HAVE_CAIRO_FREETYPE_TRUE
--HAVE_CAIRO_WIN32_FALSE
--HAVE_CAIRO_WIN32_TRUE
--HAVE_CAIRO_XLIB_FALSE
--HAVE_CAIRO_XLIB_TRUE
--HAVE_CAIRO_PDF_FALSE
--HAVE_CAIRO_PDF_TRUE
--HAVE_CAIRO_PS_FALSE
--HAVE_CAIRO_PS_TRUE
--HAVE_CAIRO_PNG_FALSE
--HAVE_CAIRO_PNG_TRUE
--HAVE_CAIRO_FALSE
--HAVE_CAIRO_TRUE
--CAIRO_LIBS
--CAIRO_CFLAGS
--HAVE_WIN32_FALSE
--HAVE_WIN32_TRUE
--WIN32_LIBS
--HAVE_XFT_FALSE
--HAVE_XFT_TRUE
--XFT_LIBS
--XFT_CFLAGS
--HAVE_FREETYPE_FALSE
--HAVE_FREETYPE_TRUE
--FREETYPE_LIBS
--FREETYPE_CFLAGS
--FONTCONFIG_LIBS
--FONTCONFIG_CFLAGS
--PKG_CONFIG
--HAVE_X_FALSE
--HAVE_X_TRUE
--X_EXTRA_LIBS
--X_LIBS
--X_PRE_LIBS
--X_CFLAGS
--XMKMF
--REBUILD
--PERL
--CROSS_COMPILING_FALSE
--CROSS_COMPILING_TRUE
--PANGO_DEBUG_FLAGS
--MS_LIB_AVAILABLE_FALSE
--MS_LIB_AVAILABLE_TRUE
--ms_librarian
--WINDRES
--PLATFORM_WIN32_FALSE
--PLATFORM_WIN32_TRUE
--LIBTOOL
--ac_ct_F77
--FFLAGS
--F77
--CXXCPP
--CPP
--OBJDUMP
--AS
--DLLTOOL
--NMEDIT
--DSYMUTIL
--RANLIB
--AR
--ECHO
--LN_S
--EGREP
--GREP
--SED
--HAVE_CXX_FALSE
--HAVE_CXX_TRUE
--am__fastdepCXX_FALSE
--am__fastdepCXX_TRUE
--CXXDEPMODE
--ac_ct_CXX
--CXXFLAGS
--CXX
--am__fastdepCC_FALSE
--am__fastdepCC_TRUE
--CCDEPMODE
--AMDEPBACKSLASH
--AMDEP_FALSE
--AMDEP_TRUE
--am__quote
--am__include
--DEPDIR
--OBJEXT
--EXEEXT
--ac_ct_CC
--CPPFLAGS
--LDFLAGS
--CFLAGS
--CC
--OS_WIN32_FALSE
--OS_WIN32_TRUE
--LIB_EXE_MACHINE_FLAG
--host_os
--host_vendor
--host_cpu
--host
--build_os
--build_vendor
--build_cpu
--build
--PANGO_CURRENT_MINUS_AGE
--PANGO_MODULE_VERSION
--PANGO_BINARY_AGE
--PANGO_INTERFACE_AGE
--PANGO_API_VERSION
--PANGO_VERSION
--PANGO_VERSION_MICRO
--PANGO_VERSION_MINOR
--PANGO_VERSION_MAJOR
--am__untar
--am__tar
--AMTAR
--am__leading_dot
--SET_MAKE
--AWK
--mkdir_p
--MKDIR_P
--INSTALL_STRIP_PROGRAM
--STRIP
--install_sh
--MAKEINFO
--AUTOHEADER
--AUTOMAKE
--AUTOCONF
--ACLOCAL
--VERSION
--PACKAGE
--CYGPATH_W
--am__isrc
--INSTALL_DATA
--INSTALL_SCRIPT
--INSTALL_PROGRAM
--target_alias
--host_alias
--build_alias
--LIBS
--ECHO_T
--ECHO_N
--ECHO_C
--DEFS
--mandir
--localedir
--libdir
--psdir
--pdfdir
--dvidir
--htmldir
--infodir
--docdir
--oldincludedir
--includedir
--localstatedir
--sharedstatedir
--sysconfdir
--datadir
--datarootdir
--libexecdir
--sbindir
--bindir
--program_transform_name
--prefix
--exec_prefix
--PACKAGE_BUGREPORT
--PACKAGE_STRING
--PACKAGE_VERSION
--PACKAGE_TARNAME
--PACKAGE_NAME
-+ac_subst_vars='SHELL
- PATH_SEPARATOR
--SHELL'
-+PACKAGE_NAME
-+PACKAGE_TARNAME
-+PACKAGE_VERSION
-+PACKAGE_STRING
-+PACKAGE_BUGREPORT
-+exec_prefix
-+prefix
-+program_transform_name
-+bindir
-+sbindir
-+libexecdir
-+datarootdir
-+datadir
-+sysconfdir
-+sharedstatedir
-+localstatedir
-+includedir
-+oldincludedir
-+docdir
-+infodir
-+htmldir
-+dvidir
-+pdfdir
-+psdir
-+libdir
-+localedir
-+mandir
-+DEFS
-+ECHO_C
-+ECHO_N
-+ECHO_T
-+LIBS
-+build_alias
-+host_alias
-+target_alias
-+INSTALL_PROGRAM
-+INSTALL_SCRIPT
-+INSTALL_DATA
-+am__isrc
-+CYGPATH_W
-+PACKAGE
-+VERSION
-+ACLOCAL
-+AUTOCONF
-+AUTOMAKE
-+AUTOHEADER
-+MAKEINFO
-+install_sh
-+STRIP
-+INSTALL_STRIP_PROGRAM
-+mkdir_p
-+AWK
-+SET_MAKE
-+am__leading_dot
-+AMTAR
-+am__tar
-+am__untar
-+PANGO_VERSION_MAJOR
-+PANGO_VERSION_MINOR
-+PANGO_VERSION_MICRO
-+PANGO_VERSION
-+PANGO_API_VERSION
-+PANGO_INTERFACE_AGE
-+PANGO_BINARY_AGE
-+PANGO_MODULE_VERSION
-+PANGO_CURRENT_MINUS_AGE
-+build
-+build_cpu
-+build_vendor
-+build_os
-+host
-+host_cpu
-+host_vendor
-+host_os
-+LIB_EXE_MACHINE_FLAG
-+OS_WIN32_TRUE
-+OS_WIN32_FALSE
-+CC
-+CFLAGS
-+LDFLAGS
-+CPPFLAGS
-+ac_ct_CC
-+EXEEXT
-+OBJEXT
-+DEPDIR
-+am__include
-+am__quote
-+AMDEP_TRUE
-+AMDEP_FALSE
-+AMDEPBACKSLASH
-+CCDEPMODE
-+am__fastdepCC_TRUE
-+am__fastdepCC_FALSE
-+CXX
-+CXXFLAGS
-+ac_ct_CXX
-+CXXDEPMODE
-+am__fastdepCXX_TRUE
-+am__fastdepCXX_FALSE
-+HAVE_CXX_TRUE
-+HAVE_CXX_FALSE
-+SED
-+GREP
-+EGREP
-+LN_S
-+ECHO
-+AR
-+RANLIB
-+DSYMUTIL
-+NMEDIT
-+DLLTOOL
-+AS
-+OBJDUMP
-+CPP
-+CXXCPP
-+F77
-+FFLAGS
-+ac_ct_F77
-+LIBTOOL
-+PLATFORM_WIN32_TRUE
-+PLATFORM_WIN32_FALSE
-+WINDRES
-+ms_librarian
-+MS_LIB_AVAILABLE_TRUE
-+MS_LIB_AVAILABLE_FALSE
-+PANGO_DEBUG_FLAGS
-+CROSS_COMPILING_TRUE
-+CROSS_COMPILING_FALSE
-+PERL
-+REBUILD
-+XMKMF
-+X_CFLAGS
-+X_PRE_LIBS
-+X_LIBS
-+X_EXTRA_LIBS
-+HAVE_X_TRUE
-+HAVE_X_FALSE
-+PKG_CONFIG
-+FONTCONFIG_CFLAGS
-+FONTCONFIG_LIBS
-+FREETYPE_CFLAGS
-+FREETYPE_LIBS
-+HAVE_FREETYPE_TRUE
-+HAVE_FREETYPE_FALSE
-+XFT_CFLAGS
-+XFT_LIBS
-+HAVE_XFT_TRUE
-+HAVE_XFT_FALSE
-+WIN32_LIBS
-+HAVE_WIN32_TRUE
-+HAVE_WIN32_FALSE
-+CAIRO_CFLAGS
-+CAIRO_LIBS
-+HAVE_CAIRO_TRUE
-+HAVE_CAIRO_FALSE
-+HAVE_CAIRO_PNG_TRUE
-+HAVE_CAIRO_PNG_FALSE
-+HAVE_CAIRO_PS_TRUE
-+HAVE_CAIRO_PS_FALSE
-+HAVE_CAIRO_PDF_TRUE
-+HAVE_CAIRO_PDF_FALSE
-+HAVE_CAIRO_XLIB_TRUE
-+HAVE_CAIRO_XLIB_FALSE
-+HAVE_CAIRO_WIN32_TRUE
-+HAVE_CAIRO_WIN32_FALSE
-+HAVE_CAIRO_FREETYPE_TRUE
-+HAVE_CAIRO_FREETYPE_FALSE
-+HAVE_CAIRO_ATSUI_TRUE
-+HAVE_CAIRO_ATSUI_FALSE
-+GLIB_CFLAGS
-+GLIB_LIBS
-+LIBTHAI_CFLAGS
-+LIBTHAI_LIBS
-+HAVE_INCLUDED_MODULES_TRUE
-+HAVE_INCLUDED_MODULES_FALSE
-+HAVE_DYNAMIC_MODULES_TRUE
-+HAVE_DYNAMIC_MODULES_FALSE
-+INCLUDED_X_MODULES
-+INCLUDED_FC_MODULES
-+INCLUDED_WIN32_MODULES
-+INCLUDED_ATSUI_MODULES
-+INCLUDED_LANG_MODULES
-+INCLUDE_ARABIC_FC_TRUE
-+INCLUDE_ARABIC_FC_FALSE
-+INCLUDE_ARABIC_LANG_TRUE
-+INCLUDE_ARABIC_LANG_FALSE
-+INCLUDE_BASIC_FC_TRUE
-+INCLUDE_BASIC_FC_FALSE
-+INCLUDE_BASIC_WIN32_TRUE
-+INCLUDE_BASIC_WIN32_FALSE
-+INCLUDE_BASIC_X_TRUE
-+INCLUDE_BASIC_X_FALSE
-+INCLUDE_BASIC_ATSUI_TRUE
-+INCLUDE_BASIC_ATSUI_FALSE
-+INCLUDE_HANGUL_FC_TRUE
-+INCLUDE_HANGUL_FC_FALSE
-+INCLUDE_HEBREW_FC_TRUE
-+INCLUDE_HEBREW_FC_FALSE
-+INCLUDE_INDIC_FC_TRUE
-+INCLUDE_INDIC_FC_FALSE
-+INCLUDE_INDIC_LANG_TRUE
-+INCLUDE_INDIC_LANG_FALSE
-+INCLUDE_KHMER_FC_TRUE
-+INCLUDE_KHMER_FC_FALSE
-+INCLUDE_SYRIAC_FC_TRUE
-+INCLUDE_SYRIAC_FC_FALSE
-+INCLUDE_THAI_FC_TRUE
-+INCLUDE_THAI_FC_FALSE
-+INCLUDE_THAI_LANG_TRUE
-+INCLUDE_THAI_LANG_FALSE
-+INCLUDE_TIBETAN_FC_TRUE
-+INCLUDE_TIBETAN_FC_FALSE
-+DYNAMIC_ARABIC_FC_TRUE
-+DYNAMIC_ARABIC_FC_FALSE
-+DYNAMIC_ARABIC_LANG_TRUE
-+DYNAMIC_ARABIC_LANG_FALSE
-+DYNAMIC_BASIC_FC_TRUE
-+DYNAMIC_BASIC_FC_FALSE
-+DYNAMIC_BASIC_WIN32_TRUE
-+DYNAMIC_BASIC_WIN32_FALSE
-+DYNAMIC_BASIC_X_TRUE
-+DYNAMIC_BASIC_X_FALSE
-+DYNAMIC_BASIC_ATSUI_TRUE
-+DYNAMIC_BASIC_ATSUI_FALSE
-+DYNAMIC_HANGUL_FC_TRUE
-+DYNAMIC_HANGUL_FC_FALSE
-+DYNAMIC_HEBREW_FC_TRUE
-+DYNAMIC_HEBREW_FC_FALSE
-+DYNAMIC_INDIC_FC_TRUE
-+DYNAMIC_INDIC_FC_FALSE
-+DYNAMIC_INDIC_LANG_TRUE
-+DYNAMIC_INDIC_LANG_FALSE
-+DYNAMIC_KHMER_FC_TRUE
-+DYNAMIC_KHMER_FC_FALSE
-+DYNAMIC_SYRIAC_FC_TRUE
-+DYNAMIC_SYRIAC_FC_FALSE
-+DYNAMIC_THAI_FC_TRUE
-+DYNAMIC_THAI_FC_FALSE
-+DYNAMIC_THAI_LANG_TRUE
-+DYNAMIC_THAI_LANG_FALSE
-+DYNAMIC_TIBETAN_FC_TRUE
-+DYNAMIC_TIBETAN_FC_FALSE
-+HTML_DIR
-+GTKDOC_CHECK
-+ENABLE_GTK_DOC_TRUE
-+ENABLE_GTK_DOC_FALSE
-+GTK_DOC_USE_LIBTOOL_TRUE
-+GTK_DOC_USE_LIBTOOL_FALSE
-+XSLTPROC
-+XML_CATALOG_FILE
-+XMLCATALOG
-+ENABLE_MAN_TRUE
-+ENABLE_MAN_FALSE
-+GLIB_PREFIX
-+CAIRO_PREFIX
-+ENABLE_DOC_CROSS_REFERENCES_TRUE
-+ENABLE_DOC_CROSS_REFERENCES_FALSE
-+LIBRARY_LIBTOOL_OPTIONS
-+MODULE_LIBTOOL_OPTIONS
-+PKGCONFIG_MATH_LIBS
-+PKGCONFIG_CAIRO_REQUIRES
-+DISABLE_EXPLICIT_DEPS_TRUE
-+DISABLE_EXPLICIT_DEPS_FALSE
-+LIBOBJS
-+LTLIBOBJS'
- ac_subst_files=''
--ac_user_opts='
--enable_option_checking
--enable_dependency_tracking
--enable_static
--enable_shared
--enable_fast_install
--with_gnu_ld
--enable_libtool_lock
--with_pic
--with_tags
--enable_debug
--enable_rebuilds
--with_x
--with_included_modules
--with_dynamic_modules
--with_html_dir
--enable_gtk_doc
--enable_man
--with_xml_catalog
--enable_doc_cross_references
--enable_explicit_deps
--'
- ac_precious_vars='build_alias
- host_alias
- target_alias
-@@ -1116,8 +1071,6 @@ LIBTHAI_LIBS'
- # Initialize some variables set by options.
- ac_init_help=
- ac_init_version=false
--ac_unrecognized_opts=
--ac_unrecognized_sep=
- # The variables have the same names as the options, with
- # dashes changed to underlines.
- cache_file=/dev/null
-@@ -1216,21 +1169,13 @@ do
- datarootdir=$ac_optarg ;;
-
- -disable-* | --disable-*)
-- ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
-- ac_useropt_orig=$ac_useropt
-- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-- case $ac_user_opts in
-- *"
--"enable_$ac_useropt"
--"*) ;;
-- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-- ac_unrecognized_sep=', ';;
-- esac
-- eval enable_$ac_useropt=no ;;
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+ eval enable_$ac_feature=no ;;
-
- -docdir | --docdir | --docdi | --doc | --do)
- ac_prev=docdir ;;
-@@ -1243,21 +1188,13 @@ do
- dvidir=$ac_optarg ;;
-
- -enable-* | --enable-*)
-- ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
-- ac_useropt_orig=$ac_useropt
-- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-- case $ac_user_opts in
-- *"
--"enable_$ac_useropt"
--"*) ;;
-- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-- ac_unrecognized_sep=', ';;
-- esac
-- eval enable_$ac_useropt=\$ac_optarg ;;
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+ eval enable_$ac_feature=\$ac_optarg ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -1448,38 +1385,22 @@ do
- ac_init_version=: ;;
-
- -with-* | --with-*)
-- ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-+ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
-- ac_useropt_orig=$ac_useropt
-- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-- case $ac_user_opts in
-- *"
--"with_$ac_useropt"
--"*) ;;
-- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-- ac_unrecognized_sep=', ';;
-- esac
-- eval with_$ac_useropt=\$ac_optarg ;;
-+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+ eval with_$ac_package=\$ac_optarg ;;
-
- -without-* | --without-*)
-- ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
-- ac_useropt_orig=$ac_useropt
-- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-- case $ac_user_opts in
-- *"
--"with_$ac_useropt"
--"*) ;;
-- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-- ac_unrecognized_sep=', ';;
-- esac
-- eval with_$ac_useropt=no ;;
-+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+ eval with_$ac_package=no ;;
-
- --x)
- # Obsolete; use --with-x.
-@@ -1499,7 +1420,7 @@ do
- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
- x_libraries=$ac_optarg ;;
-
-- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-+ -*) { echo "$as_me: error: unrecognized option: $ac_option
- Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; }
- ;;
-@@ -1508,16 +1429,16 @@ Try \`$0 --help' for more information."
- ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
- # Reject names that are not valid shell variable names.
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
- eval $ac_envvar=\$ac_optarg
- export $ac_envvar ;;
-
- *)
- # FIXME: should be removed in autoconf 3.0.
-- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2
- expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+ echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
- ;;
-
-@@ -1526,38 +1447,22 @@ done
-
- if test -n "$ac_prev"; then
- ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
-+ { echo "$as_me: error: missing argument to $ac_option" >&2
- { (exit 1); exit 1; }; }
- fi
-
--if test -n "$ac_unrecognized_opts"; then
-- case $enable_option_checking in
-- no) ;;
-- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
-- { (exit 1); exit 1; }; } ;;
-- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-- esac
--fi
--
--# Check all directory arguments for consistency.
-+# Be sure to have absolute directory names.
- for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
- datadir sysconfdir sharedstatedir localstatedir includedir \
- oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
- do
- eval ac_val=\$$ac_var
-- # Remove trailing slashes.
-- case $ac_val in
-- */ )
-- ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-- eval $ac_var=\$ac_val;;
-- esac
-- # Be sure to have absolute directory names.
- case $ac_val in
- [\\/$]* | ?:[\\/]* ) continue;;
- NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
- esac
-- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; }
- done
-
-@@ -1572,7 +1477,7 @@ target=$target_alias
- if test "x$host_alias" != x; then
- if test "x$build_alias" = x; then
- cross_compiling=maybe
-- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used." >&2
- elif test "x$build_alias" != "x$host_alias"; then
- cross_compiling=yes
-@@ -1588,10 +1493,10 @@ test "$silent" = yes && exec 6>/dev/null
- ac_pwd=`pwd` && test -n "$ac_pwd" &&
- ac_ls_di=`ls -di .` &&
- ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-- { $as_echo "$as_me: error: working directory cannot be determined" >&2
-+ { echo "$as_me: error: Working directory cannot be determined" >&2
- { (exit 1); exit 1; }; }
- test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-+ { echo "$as_me: error: pwd does not report name of working directory" >&2
- { (exit 1); exit 1; }; }
-
-
-@@ -1599,12 +1504,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- if test -z "$srcdir"; then
- ac_srcdir_defaulted=yes
- # Try the directory containing this script, then the parent directory.
-- ac_confdir=`$as_dirname -- "$as_myself" ||
--$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$as_myself" : 'X\(//\)[^/]' \| \
-- X"$as_myself" : 'X\(//\)$' \| \
-- X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$as_myself" |
-+ ac_confdir=`$as_dirname -- "$0" ||
-+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$0" : 'X\(//\)[^/]' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$0" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -1631,12 +1536,12 @@ else
- fi
- if test ! -r "$srcdir/$ac_unique_file"; then
- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
- fi
- ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
- ac_abs_confdir=`(
-- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
-+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
- { (exit 1); exit 1; }; }
- pwd)`
- # When building in place, set srcdir=.
-@@ -1685,9 +1590,9 @@ Configuration:
-
- Installation directories:
- --prefix=PREFIX install architecture-independent files in PREFIX
-- [$ac_default_prefix]
-+ [$ac_default_prefix]
- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
-- [PREFIX]
-+ [PREFIX]
-
- By default, \`make install' will install all the files in
- \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-@@ -1697,25 +1602,25 @@ for instance \`--prefix=\$HOME'.
- For better control, use the options below.
-
- Fine tuning of the installation directories:
-- --bindir=DIR user executables [EPREFIX/bin]
-- --sbindir=DIR system admin executables [EPREFIX/sbin]
-- --libexecdir=DIR program executables [EPREFIX/libexec]
-- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
-- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
-- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
-- --libdir=DIR object code libraries [EPREFIX/lib]
-- --includedir=DIR C header files [PREFIX/include]
-- --oldincludedir=DIR C header files for non-gcc [/usr/include]
-- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
-- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
-- --infodir=DIR info documentation [DATAROOTDIR/info]
-- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
-- --mandir=DIR man documentation [DATAROOTDIR/man]
-- --docdir=DIR documentation root [DATAROOTDIR/doc/pango]
-- --htmldir=DIR html documentation [DOCDIR]
-- --dvidir=DIR dvi documentation [DOCDIR]
-- --pdfdir=DIR pdf documentation [DOCDIR]
-- --psdir=DIR ps documentation [DOCDIR]
-+ --bindir=DIR user executables [EPREFIX/bin]
-+ --sbindir=DIR system admin executables [EPREFIX/sbin]
-+ --libexecdir=DIR program executables [EPREFIX/libexec]
-+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
-+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
-+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
-+ --libdir=DIR object code libraries [EPREFIX/lib]
-+ --includedir=DIR C header files [PREFIX/include]
-+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
-+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
-+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
-+ --infodir=DIR info documentation [DATAROOTDIR/info]
-+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
-+ --mandir=DIR man documentation [DATAROOTDIR/man]
-+ --docdir=DIR documentation root [DATAROOTDIR/doc/pango]
-+ --htmldir=DIR html documentation [DOCDIR]
-+ --dvidir=DIR dvi documentation [DOCDIR]
-+ --pdfdir=DIR pdf documentation [DOCDIR]
-+ --psdir=DIR ps documentation [DOCDIR]
- _ACEOF
-
- cat <<\_ACEOF
-@@ -1742,7 +1647,6 @@ if test -n "$ac_init_help"; then
- cat <<\_ACEOF
-
- Optional Features:
-- --disable-option-checking ignore unrecognized --enable/--with options
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --disable-dependency-tracking speeds up one-time build
-@@ -1826,17 +1730,15 @@ fi
- if test "$ac_init_help" = "recursive"; then
- # If there are subdirs, report their specific --help.
- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-- test -d "$ac_dir" ||
-- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-- continue
-+ test -d "$ac_dir" || continue
- ac_builddir=.
-
- case "$ac_dir" in
- .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *)
-- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A ".." for each directory in $ac_dir_suffix.
-- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-@@ -1872,7 +1774,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
- echo &&
- $SHELL "$ac_srcdir/configure" --help=recursive
- else
-- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi || ac_status=$?
- cd "$ac_pwd" || { ac_status=$?; break; }
- done
-@@ -1882,10 +1784,10 @@ test -n "$ac_init_help" && exit $ac_stat
- if $ac_init_version; then
- cat <<\_ACEOF
- pango configure 1.22.4
--generated by GNU Autoconf 2.63
-+generated by GNU Autoconf 2.61
-
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1896,7 +1798,7 @@ This file contains any messages produced
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by pango $as_me 1.22.4, which was
--generated by GNU Autoconf 2.63. Invocation command line was
-+generated by GNU Autoconf 2.61. Invocation command line was
-
- $ $0 $@
-
-@@ -1932,7 +1834,7 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- $as_echo "PATH: $as_dir"
-+ echo "PATH: $as_dir"
- done
- IFS=$as_save_IFS
-
-@@ -1967,7 +1869,7 @@ do
- | -silent | --silent | --silen | --sile | --sil)
- continue ;;
- *\'*)
-- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- case $ac_pass in
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-@@ -2019,12 +1921,11 @@ _ASBOX
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
-- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
--$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
-- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) $as_unset $ac_var ;;
- esac ;;
- esac
-@@ -2054,9 +1955,9 @@ _ASBOX
- do
- eval ac_val=\$$ac_var
- case $ac_val in
-- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
-- $as_echo "$ac_var='\''$ac_val'\''"
-+ echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
-
-@@ -2071,9 +1972,9 @@ _ASBOX
- do
- eval ac_val=\$$ac_var
- case $ac_val in
-- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
-- $as_echo "$ac_var='\''$ac_val'\''"
-+ echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
- fi
-@@ -2089,8 +1990,8 @@ _ASBOX
- echo
- fi
- test "$ac_signal" != 0 &&
-- $as_echo "$as_me: caught signal $ac_signal"
-- $as_echo "$as_me: exit $exit_status"
-+ echo "$as_me: caught signal $ac_signal"
-+ echo "$as_me: exit $exit_status"
- } >&5
- rm -f core *.core core.conftest.* &&
- rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-@@ -2132,24 +2033,21 @@ _ACEOF
-
-
- # Let the site file select an alternate cache file if it wants to.
--# Prefer an explicitly selected file to automatically selected ones.
--ac_site_file1=NONE
--ac_site_file2=NONE
-+# Prefer explicitly selected file to automatically selected ones.
- if test -n "$CONFIG_SITE"; then
-- ac_site_file1=$CONFIG_SITE
-+ set x "$CONFIG_SITE"
- elif test "x$prefix" != xNONE; then
-- ac_site_file1=$prefix/share/config.site
-- ac_site_file2=$prefix/etc/config.site
-+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
- else
-- ac_site_file1=$ac_default_prefix/share/config.site
-- ac_site_file2=$ac_default_prefix/etc/config.site
-+ set x "$ac_default_prefix/share/config.site" \
-+ "$ac_default_prefix/etc/config.site"
- fi
--for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-+shift
-+for ac_site_file
- do
-- test "x$ac_site_file" = xNONE && continue
- if test -r "$ac_site_file"; then
-- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
--$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-+echo "$as_me: loading site script $ac_site_file" >&6;}
- sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file"
- fi
-@@ -2159,16 +2057,16 @@ if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
-- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
--$as_echo "$as_me: loading cache $cache_file" >&6;}
-+ { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-+echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
- [\\/]* | ?:[\\/]* ) . "$cache_file";;
- *) . "./$cache_file";;
- esac
- fi
- else
-- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
--$as_echo "$as_me: creating cache $cache_file" >&6;}
-+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-+echo "$as_me: creating cache $cache_file" >&6;}
- >$cache_file
- fi
-
-@@ -2182,38 +2080,29 @@ for ac_var in $ac_precious_vars; do
- eval ac_new_val=\$ac_env_${ac_var}_value
- case $ac_old_set,$ac_new_set in
- set,)
-- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
--$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,set)
-- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
--$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-+ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,);;
- *)
- if test "x$ac_old_val" != "x$ac_new_val"; then
-- # differences in whitespace do not lead to failure.
-- ac_old_val_w=`echo x $ac_old_val`
-- ac_new_val_w=`echo x $ac_new_val`
-- if test "$ac_old_val_w" != "$ac_new_val_w"; then
-- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
--$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-- ac_cache_corrupted=:
-- else
-- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
--$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-- eval $ac_var=\$ac_old_val
+@@ -331,20 +331,7 @@
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+- eval $set_cc_for_build
+- SUN_ARCH="i386"
+- # If there is a compiler, see if it is configured for 64-bit objects.
+- # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+- # This test works for both compilers.
+- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+- if echo '\n#ifdef __amd64\nIS_64BIT_ARCH\n#endif' | \
+- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+- grep IS_64BIT_ARCH >/dev/null
+- then
+- SUN_ARCH="x86_64"
+- fi
- fi
-- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
--$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
-- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
--$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
-+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-+echo "$as_me: former value: $ac_old_val" >&2;}
-+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-+echo "$as_me: current value: $ac_new_val" >&2;}
-+ ac_cache_corrupted=:
- fi;;
- esac
- # Pass precious variables to config.status.
- if test "$ac_new_set" = set; then
- case $ac_new_val in
-- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
- *) ac_arg=$ac_var=$ac_new_val ;;
- esac
- case " $ac_configure_args " in
-@@ -2223,12 +2112,10 @@ $as_echo "$as_me: current value: \`$ac
- fi
- done
- if $ac_cache_corrupted; then
-- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
--$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
--$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-+ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-+ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -2285,8 +2172,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
- fi
- done
- if test -z "$ac_aux_dir"; then
-- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
--$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -2312,12 +2199,11 @@ ac_configure="$SHELL $ac_aux_dir/configu
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
--# Reject install programs that cannot install multiple files.
--{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--$as_echo_n "checking for a BSD-compatible install... " >&6; }
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
-@@ -2346,29 +2232,17 @@ case $as_dir/ in
- # program-specific install script used by HP pwplus--don't use.
- :
- else
-- rm -rf conftest.one conftest.two conftest.dir
-- echo one > conftest.one
-- echo two > conftest.two
-- mkdir conftest.dir
-- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-- test -s conftest.one && test -s conftest.two &&
-- test -s conftest.dir/conftest.one &&
-- test -s conftest.dir/conftest.two
-- then
-- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-- break 3
-- fi
-+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+ break 3
- fi
- fi
- done
- done
- ;;
- esac
--
- done
- IFS=$as_save_IFS
-
--rm -rf conftest.one conftest.two conftest.dir
-
- fi
- if test "${ac_cv_path_install+set}" = set; then
-@@ -2381,8 +2255,8 @@ fi
- INSTALL=$ac_install_sh
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
--$as_echo "$INSTALL" >&6; }
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6; }
-
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-@@ -2392,8 +2266,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
-
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
--{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
--$as_echo_n "checking whether build environment is sane... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
- # Just in case
- sleep 1
- echo timestamp > conftest.file
-@@ -2416,9 +2290,9 @@ if (
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
-- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
-+ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
- alias in your environment" >&5
--$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
-+echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
- alias in your environment" >&2;}
- { (exit 1); exit 1; }; }
- fi
-@@ -2429,23 +2303,26 @@ then
- # Ok.
- :
- else
-- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-+ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
- Check your system clock" >&5
--$as_echo "$as_me: error: newly created file is older than distributed files!
-+echo "$as_me: error: newly created file is older than distributed files!
- Check your system clock" >&2;}
- { (exit 1); exit 1; }; }
- fi
--{ $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- test "$program_prefix" != NONE &&
- program_transform_name="s&^&$program_prefix&;$program_transform_name"
- # Use a double $ so make ignores it.
- test "$program_suffix" != NONE &&
- program_transform_name="s&\$&$program_suffix&;$program_transform_name"
--# Double any \ or $.
-+# Double any \ or $. echo might interpret backslashes.
- # By default was `s,x,x', remove it if useless.
--ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
--program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-+cat <<\_ACEOF >conftest.sed
-+s/[\\$]/&&/g;s/;s,x,x,$//
-+_ACEOF
-+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-+rm -f conftest.sed
-
- # expand $ac_aux_dir to an absolute path
- am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -2456,15 +2333,15 @@ if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
- else
- am_missing_run=
-- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
--$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
-
--{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
--$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
- if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-@@ -2499,8 +2376,8 @@ fi
- MKDIR_P="$ac_install_sh -d"
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
--$as_echo "$MKDIR_P" >&6; }
-+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-+echo "${ECHO_T}$MKDIR_P" >&6; }
-
- mkdir_p="$MKDIR_P"
- case $mkdir_p in
-@@ -2512,10 +2389,10 @@ for ac_prog in gawk mawk nawk awk
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AWK+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$AWK"; then
- ac_cv_prog_AWK="$AWK" # Let the user override the test.
-@@ -2528,7 +2405,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AWK="$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -2539,23 +2416,22 @@ fi
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
-- { $as_echo "$as_me:$LINENO: result: $AWK" >&5
--$as_echo "$AWK" >&6; }
-+ { echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
- test -n "$AWK" && break
- done
-
--{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
--$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
--set x ${MAKE-make}
--ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
- if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.make <<\_ACEOF
- SHELL = /bin/sh
-@@ -2572,12 +2448,12 @@ esac
- rm -f conftest.make
- fi
- if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- SET_MAKE=
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
- fi
-
-@@ -2596,8 +2472,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
- am__isrc=' -I$(srcdir)'
- # test to see if srcdir already configured
- if test -f $srcdir/config.status; then
-- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
--$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
-@@ -2652,10 +2528,10 @@ if test "$cross_compiling" != no; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-@@ -2668,7 +2544,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -2679,11 +2555,11 @@ fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
-- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
--$as_echo "$STRIP" >&6; }
-+ { echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -2692,10 +2568,10 @@ if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
- set dummy strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-@@ -2708,7 +2584,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -2719,11 +2595,11 @@ fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--$as_echo "$ac_ct_STRIP" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_ct_STRIP" = x; then
-@@ -2731,8 +2607,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- STRIP=$ac_ct_STRIP
-@@ -2820,34 +2700,34 @@ PANGO_CURRENT_MINUS_AGE=0
-
- # Make sure we can run config.sub.
- $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
--$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
- { (exit 1); exit 1; }; }
-
--{ $as_echo "$as_me:$LINENO: checking build system type" >&5
--$as_echo_n "checking build system type... " >&6; }
-+{ echo "$as_me:$LINENO: checking build system type" >&5
-+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
- if test "${ac_cv_build+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_build_alias=$build_alias
- test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
- test "x$ac_build_alias" = x &&
-- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
--$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
- ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
--$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
--$as_echo "$ac_cv_build" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$ac_cv_build" >&6; }
- case $ac_cv_build in
- *-*-*) ;;
--*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
--$as_echo "$as_me: error: invalid value of canonical build" >&2;}
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-+echo "$as_me: error: invalid value of canonical build" >&2;}
- { (exit 1); exit 1; }; };;
- esac
- build=$ac_cv_build
-@@ -2864,27 +2744,27 @@ IFS=$ac_save_IFS
- case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
--{ $as_echo "$as_me:$LINENO: checking host system type" >&5
--$as_echo_n "checking host system type... " >&6; }
-+{ echo "$as_me:$LINENO: checking host system type" >&5
-+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
- if test "${ac_cv_host+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test "x$host_alias" = x; then
- ac_cv_host=$ac_cv_build
- else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
--$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
--$as_echo "$ac_cv_host" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$ac_cv_host" >&6; }
- case $ac_cv_host in
- *-*-*) ;;
--*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
--$as_echo "$as_me: error: invalid value of canonical host" >&2;}
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-+echo "$as_me: error: invalid value of canonical host" >&2;}
- { (exit 1); exit 1; }; };;
- esac
- host=$ac_cv_host
-@@ -2902,8 +2782,8 @@ case $host_os in *\ *) host_os=`echo "$h
-
-
-
--{ $as_echo "$as_me:$LINENO: checking for native Win32" >&5
--$as_echo_n "checking for native Win32... " >&6; }
-+{ echo "$as_me:$LINENO: checking for native Win32" >&5
-+echo $ECHO_N "checking for native Win32... $ECHO_C" >&6; }
- case "$host" in
- *-*-mingw*)
- pango_os_win32=yes
-@@ -2920,8 +2800,8 @@ case "$host" in
- pango_os_win32=no
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $pango_os_win32" >&5
--$as_echo "$pango_os_win32" >&6; }
-+{ echo "$as_me:$LINENO: result: $pango_os_win32" >&5
-+echo "${ECHO_T}$pango_os_win32" >&6; }
-
-
-
-@@ -2942,10 +2822,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2958,7 +2838,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -2969,11 +2849,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
--$as_echo "$CC" >&6; }
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -2982,10 +2862,10 @@ if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -2998,7 +2878,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -3009,11 +2889,11 @@ fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--$as_echo "$ac_ct_CC" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_ct_CC" = x; then
-@@ -3021,8 +2901,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- CC=$ac_ct_CC
-@@ -3035,10 +2919,10 @@ if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3051,7 +2935,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -3062,11 +2946,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
--$as_echo "$CC" >&6; }
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -3075,10 +2959,10 @@ fi
- if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3096,7 +2980,7 @@ do
- continue
- fi
- ac_cv_prog_CC="cc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -3119,11 +3003,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
--$as_echo "$CC" >&6; }
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -3134,10 +3018,10 @@ if test -z "$CC"; then
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3150,7 +3034,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -3161,11 +3045,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
--$as_echo "$CC" >&6; }
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -3178,10 +3062,10 @@ if test -z "$CC"; then
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -3194,7 +3078,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -3205,11 +3089,11 @@ fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--$as_echo "$ac_ct_CC" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -3221,8 +3105,12 @@ done
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- CC=$ac_ct_CC
-@@ -3232,50 +3120,44 @@ fi
- fi
-
-
--test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-+echo "$as_me: error: no acceptable C compiler found in \$PATH
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+ { (exit 1); exit 1; }; }
-
- # Provide some information about the compiler.
--$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
--set X $ac_compile
--ac_compiler=$2
-+echo "$as_me:$LINENO: checking for C compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
- { (ac_try="$ac_compiler --version >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- { (ac_try="$ac_compiler -v >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- { (ac_try="$ac_compiler -V >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-
- cat >conftest.$ac_ext <<_ACEOF
-@@ -3294,22 +3176,27 @@ main ()
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-+ac_clean_files="$ac_clean_files a.out a.exe b.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
--$as_echo_n "checking for C compiler default output file name... " >&6; }
--ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--
--# The possible output files:
--ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
--
-+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-+#
-+# List of possible output files, starting from the most likely.
-+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-+# only as a last resort. b.out is created by i960 compilers.
-+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-+#
-+# The IRIX 6 linker writes into existing files which may not be
-+# executable, retaining their permissions. Remove them first so a
-+# subsequent execution test works.
- ac_rmfiles=
- for ac_file in $ac_files
- do
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
- * ) ac_rmfiles="$ac_rmfiles $ac_file";;
- esac
- done
-@@ -3320,11 +3207,10 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link_default") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
- # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-@@ -3335,7 +3221,7 @@ for ac_file in $ac_files ''
- do
- test -f "$ac_file" || continue
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
- ;;
- [ab].out )
- # We found the default executable, but exeext='' is most
-@@ -3362,27 +3248,25 @@ else
- ac_file=''
- fi
-
--{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
--$as_echo "$ac_file" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
- if test -z "$ac_file"; then
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: C compiler cannot create executables
-+echo "$as_me: error: C compiler cannot create executables
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }; }
-+ { (exit 77); exit 77; }; }
- fi
-
- ac_exeext=$ac_cv_exeext
-
- # Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--$as_echo_n "checking whether the C compiler works... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-@@ -3391,53 +3275,49 @@ if test "$cross_compiling" != yes; then
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-+ { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run C compiled programs.
-+echo "$as_me: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+ { (exit 1); exit 1; }; }
- fi
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-+rm -f a.out a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
- # Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
--$as_echo_n "checking whether we are cross compiling... " >&6; }
--{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
--$as_echo "$cross_compiling" >&6; }
-+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+echo "${ECHO_T}$cross_compiling" >&6; }
-
--{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
--$as_echo_n "checking for suffix of executables... " >&6; }
-+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
- if { (ac_try="$ac_link"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- # If both `conftest.exe' and `conftest' are `present' (well, observable)
- # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-@@ -3446,33 +3326,31 @@ $as_echo "$ac_try_echo") >&5
- for ac_file in conftest.exe conftest conftest.*; do
- test -f "$ac_file" || continue
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- break;;
- * ) break;;
- esac
- done
- else
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+ { (exit 1); exit 1; }; }
- fi
-
- rm -f conftest$ac_cv_exeext
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--$as_echo "$ac_cv_exeext" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6; }
-
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
--$as_echo_n "checking for suffix of object files... " >&6; }
-+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
- if test "${ac_cv_objext+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -3495,43 +3373,40 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- for ac_file in conftest.o conftest.obj conftest.*; do
- test -f "$ac_file" || continue;
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
- break;;
- esac
- done
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-+echo "$as_me: error: cannot compute suffix of object files: cannot compile
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+ { (exit 1); exit 1; }; }
- fi
-
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
--$as_echo "$ac_cv_objext" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+echo "${ECHO_T}$ac_cv_objext" >&6; }
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -3557,21 +3432,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
-@@ -3581,19 +3455,15 @@ rm -f core conftest.err conftest.$ac_obj
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--$as_echo "$ac_cv_c_compiler_gnu" >&6; }
--if test $ac_compiler_gnu = yes; then
-- GCC=yes
--else
-- GCC=
--fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-+GCC=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--$as_echo_n "checking whether $CC accepts -g... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_save_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
-@@ -3620,21 +3490,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- CFLAGS=""
-@@ -3659,21 +3528,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_c_werror_flag=$ac_save_c_werror_flag
-@@ -3699,21 +3567,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
-@@ -3728,8 +3595,8 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--$as_echo "$ac_cv_prog_cc_g" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
- if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-@@ -3745,10 +3612,10 @@ else
- CFLAGS=
- fi
- fi
--{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
--$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cc_c89+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
-@@ -3819,21 +3686,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_c89=$ac_arg
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
-@@ -3849,15 +3715,15 @@ fi
- # AC_CACHE_VAL
- case "x$ac_cv_prog_cc_c89" in
- x)
-- { $as_echo "$as_me:$LINENO: result: none needed" >&5
--$as_echo "none needed" >&6; } ;;
-+ { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
- xno)
-- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
--$as_echo "unsupported" >&6; } ;;
-+ { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
-- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
--$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
- esac
-
-
-@@ -3878,8 +3744,8 @@ am__doit:
- .PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
--{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
--$as_echo_n "checking for style of include used by $am_make... " >&6; }
-+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
- am__include="#"
- am__quote=
- _am_result=none
-@@ -3906,8 +3772,8 @@ if test "$am__include" = "#"; then
- fi
-
-
--{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
--$as_echo "$_am_result" >&6; }
-+{ echo "$as_me:$LINENO: result: $_am_result" >&5
-+echo "${ECHO_T}$_am_result" >&6; }
- rm -f confinc confmf
-
- # Check whether --enable-dependency-tracking was given.
-@@ -3931,10 +3797,10 @@ fi
-
- depcc="$CC" am_compiler_list=
-
--{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--$as_echo_n "checking dependency style of $depcc... " >&6; }
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
- if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
-@@ -4022,8 +3888,8 @@ else
- fi
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
--$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-@@ -4042,10 +3908,10 @@ for ac_prog in $CCC c++ g++ gcc CC cxx c
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CXX+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$CXX"; then
- ac_cv_prog_CXX="$CXX" # Let the user override the test.
-@@ -4058,7 +3924,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CXX="$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -4069,11 +3935,11 @@ fi
- fi
- CXX=$ac_cv_prog_CXX
- if test -n "$CXX"; then
-- { $as_echo "$as_me:$LINENO: result: $CXX" >&5
--$as_echo "$CXX" >&6; }
-+ { echo "$as_me:$LINENO: result: $CXX" >&5
-+echo "${ECHO_T}$CXX" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -4102,10 +3968,10 @@ if test -z "$CXX"; then
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CXX+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$CXX"; then
- ac_cv_prog_CXX="$CXX" # Let the user override the test.
-@@ -4118,7 +3984,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -4129,11 +3995,11 @@ fi
- fi
- CXX=$ac_cv_prog_CXX
- if test -n "$CXX"; then
-- { $as_echo "$as_me:$LINENO: result: $CXX" >&5
--$as_echo "$CXX" >&6; }
-+ { echo "$as_me:$LINENO: result: $CXX" >&5
-+echo "${ECHO_T}$CXX" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -4146,10 +4012,10 @@ if test -z "$CXX"; then
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_CXX"; then
- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-@@ -4162,7 +4028,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CXX="$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -4173,11 +4039,11 @@ fi
- fi
- ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
- if test -n "$ac_ct_CXX"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
--$as_echo "$ac_ct_CXX" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-+echo "${ECHO_T}$ac_ct_CXX" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -4189,8 +4055,12 @@ done
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- CXX=$ac_ct_CXX
-@@ -4200,47 +4070,43 @@ fi
- fi
- fi
- # Provide some information about the compiler.
--$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
--set X $ac_compile
--ac_compiler=$2
-+echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
- { (ac_try="$ac_compiler --version >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- { (ac_try="$ac_compiler -v >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- { (ac_try="$ac_compiler -V >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-
--{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
--$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
- if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -4266,21 +4132,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
-@@ -4290,19 +4155,15 @@ rm -f core conftest.err conftest.$ac_obj
- ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
--$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
--if test $ac_compiler_gnu = yes; then
-- GXX=yes
--else
-- GXX=
--fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-+GXX=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CXXFLAGS=${CXXFLAGS+set}
- ac_save_CXXFLAGS=$CXXFLAGS
--{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
--$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cxx_g+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_save_cxx_werror_flag=$ac_cxx_werror_flag
- ac_cxx_werror_flag=yes
-@@ -4329,21 +4190,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cxx_g=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- CXXFLAGS=""
-@@ -4368,21 +4228,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-@@ -4408,21 +4267,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cxx_g=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
-@@ -4437,8 +4295,8 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
--$as_echo "$ac_cv_prog_cxx_g" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
- if test "$ac_test_CXXFLAGS" = set; then
- CXXFLAGS=$ac_save_CXXFLAGS
- elif test $ac_cv_prog_cxx_g = yes; then
-@@ -4462,10 +4320,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- depcc="$CXX" am_compiler_list=
-
--{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--$as_echo_n "checking dependency style of $depcc... " >&6; }
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
- if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
-@@ -4553,8 +4411,8 @@ else
- fi
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
--$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
- CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
- if
-@@ -4590,21 +4448,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- CXX=
-@@ -4656,13 +4513,13 @@ fi
-
- if test "$pango_os_win32" = "yes"; then
- if test x$enable_static = xyes -o x$enable_static = x; then
-- { $as_echo "$as_me:$LINENO: WARNING: Disabling static library build, must build as DLL on Windows." >&5
--$as_echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;}
-+ { echo "$as_me:$LINENO: WARNING: Disabling static library build, must build as DLL on Windows." >&5
-+echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;}
- enable_static=no
- fi
- if test x$enable_shared = xno; then
-- { $as_echo "$as_me:$LINENO: WARNING: Enabling shared library build, must build as DLL on Windows." >&5
--$as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;}
-+ { echo "$as_me:$LINENO: WARNING: Enabling shared library build, must build as DLL on Windows." >&5
-+echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;}
- fi
- enable_shared=yes
- fi
-@@ -4715,10 +4572,10 @@ else
- fi
-
-
--{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
--$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
- if test "${lt_cv_path_SED+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # Loop through the user's path and test for sed and gsed.
- # Then use that list of sed's as ones to test for truncation.
-@@ -4771,40 +4628,45 @@ fi
-
- SED=$lt_cv_path_SED
-
--{ $as_echo "$as_me:$LINENO: result: $SED" >&5
--$as_echo "$SED" >&6; }
-+{ echo "$as_me:$LINENO: result: $SED" >&5
-+echo "${ECHO_T}$SED" >&6; }
-
--{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
--$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ # Extract the first word of "grep ggrep" to use in msg output
-+if test -z "$GREP"; then
-+set dummy grep ggrep; ac_prog_name=$2
- if test "${ac_cv_path_GREP+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if test -z "$GREP"; then
- ac_path_GREP_found=false
-- # Loop through the user's path and test for each of PROGNAME-LIST
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in grep ggrep; do
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
--# Check for GNU ac_path_GREP and select it if it is found.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-+ # Check for GNU ac_path_GREP and select it if it is found.
- # Check for GNU $ac_path_GREP
- case `"$ac_path_GREP" --version 2>&1` in
- *GNU*)
- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
- *)
- ac_count=0
-- $as_echo_n 0123456789 >"conftest.in"
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
-- $as_echo 'GREP' >> "conftest.nl"
-+ echo 'GREP' >> "conftest.nl"
- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
-@@ -4819,60 +4681,74 @@ case `"$ac_path_GREP" --version 2>&1` in
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
- esac
-
-- $ac_path_GREP_found && break 3
-- done
-+
-+ $ac_path_GREP_found && break 3
- done
- done
-+
-+done
- IFS=$as_save_IFS
-- if test -z "$ac_cv_path_GREP"; then
-- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
--$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+
-+
-+fi
-+
-+GREP="$ac_cv_path_GREP"
-+if test -z "$GREP"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
-- fi
-+fi
-+
- else
- ac_cv_path_GREP=$GREP
- fi
-
-+
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
--$as_echo "$ac_cv_path_GREP" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
--{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
--$as_echo_n "checking for egrep... " >&6; }
-+{ echo "$as_me:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
- if test "${ac_cv_path_EGREP+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
- then ac_cv_path_EGREP="$GREP -E"
- else
-- if test -z "$EGREP"; then
-+ # Extract the first word of "egrep" to use in msg output
-+if test -z "$EGREP"; then
-+set dummy egrep; ac_prog_name=$2
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- ac_path_EGREP_found=false
-- # Loop through the user's path and test for each of PROGNAME-LIST
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in egrep; do
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
--# Check for GNU ac_path_EGREP and select it if it is found.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-+ # Check for GNU ac_path_EGREP and select it if it is found.
- # Check for GNU $ac_path_EGREP
- case `"$ac_path_EGREP" --version 2>&1` in
- *GNU*)
- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
- *)
- ac_count=0
-- $as_echo_n 0123456789 >"conftest.in"
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
-- $as_echo 'EGREP' >> "conftest.nl"
-+ echo 'EGREP' >> "conftest.nl"
- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
-@@ -4887,24 +4763,33 @@ case `"$ac_path_EGREP" --version 2>&1` i
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
- esac
-
-- $ac_path_EGREP_found && break 3
-- done
-+
-+ $ac_path_EGREP_found && break 3
- done
- done
-+
-+done
- IFS=$as_save_IFS
-- if test -z "$ac_cv_path_EGREP"; then
-- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
--$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+
-+
-+fi
-+
-+EGREP="$ac_cv_path_EGREP"
-+if test -z "$EGREP"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
-- fi
-+fi
-+
- else
- ac_cv_path_EGREP=$EGREP
- fi
-
-+
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
--$as_echo "$ac_cv_path_EGREP" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-@@ -4919,8 +4804,8 @@ fi
- ac_prog=ld
- if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
-- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--$as_echo_n "checking for ld used by $CC... " >&6; }
-+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
-@@ -4949,14 +4834,14 @@ $as_echo_n "checking for ld used by $CC.
- ;;
- esac
- elif test "$with_gnu_ld" = yes; then
-- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
--$as_echo_n "checking for GNU ld... " >&6; }
-+ { echo "$as_me:$LINENO: checking for GNU ld" >&5
-+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
--$as_echo_n "checking for non-GNU ld... " >&6; }
-+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
- fi
- if test "${lt_cv_path_LD+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -4986,19 +4871,19 @@ fi
-
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
-- { $as_echo "$as_me:$LINENO: result: $LD" >&5
--$as_echo "$LD" >&6; }
-+ { echo "$as_me:$LINENO: result: $LD" >&5
-+echo "${ECHO_T}$LD" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
--$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
--{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
--$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
-@@ -5010,20 +4895,20 @@ case `$LD -v 2>&1 </dev/null` in
- ;;
- esac
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
--$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
--{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
--$as_echo_n "checking for $LD option to reload object files... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
- if test "${lt_cv_ld_reload_flag+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_ld_reload_flag='-r'
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
--$as_echo "$lt_cv_ld_reload_flag" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
- reload_flag=$lt_cv_ld_reload_flag
- case $reload_flag in
- "" | " "*) ;;
-@@ -5040,10 +4925,10 @@ case $host_os in
- ;;
- esac
-
--{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
--$as_echo_n "checking for BSD-compatible nm... " >&6; }
-+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
- if test "${lt_cv_path_NM+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$NM"; then
- # Let the user override the test.
-@@ -5089,25 +4974,25 @@ else
- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
--$as_echo "$lt_cv_path_NM" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-+echo "${ECHO_T}$lt_cv_path_NM" >&6; }
- NM="$lt_cv_path_NM"
-
--{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
--$as_echo_n "checking whether ln -s works... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
- LN_S=$as_ln_s
- if test "$LN_S" = "ln -s"; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
--$as_echo "no, using $LN_S" >&6; }
-+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+echo "${ECHO_T}no, using $LN_S" >&6; }
- fi
-
--{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
--$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
- if test "${lt_cv_deplibs_check_method+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_file_magic_cmd='$MAGIC_CMD'
- lt_cv_file_magic_test_file=
-@@ -5219,7 +5104,7 @@ linux* | k*bsd*-gnu)
+- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4*:SunOS:6*:*)
+ # According to config.sub, this is the proper way to canonicalize
+@@ -809,7 +796,7 @@
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+- EM64T | authenticamd | genuineintel)
++ EM64T | authenticamd)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+@@ -948,9 +935,6 @@
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit ;;
+- padre:Linux:*:*)
+- echo sparc-unknown-linux-gnu
+- exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -1001,6 +985,9 @@
+ a.out-i386-linux)
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ exit ;;
++ coff-i386)
++ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
++ exit ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+@@ -1229,9 +1216,6 @@
+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
+ echo i586-pc-beos
+ exit ;;
+- BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
+- echo i586-pc-haiku
+- exit ;;
+ SX-4:SUPER-UX:*:*)
+ echo sx4-nec-superux${UNAME_RELEASE}
+ exit ;;
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/config.sub pango1.0-1.24.0/config.sub
+--- pango1.0-1.24.0.old/config.sub 2009-02-07 00:50:27.000000000 +0100
++++ pango1.0-1.24.0/config.sub 2009-03-22 14:58:12.000000000 +0100
+@@ -4,7 +4,7 @@
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ # Free Software Foundation, Inc.
+
+-timestamp='2008-09-08'
++timestamp='2008-01-16'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -250,14 +250,12 @@
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+- | maxq | mb | microblaze | mcore | mep | metag \
++ | maxq | mb | microblaze | mcore | mep \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+- | mips64octeon | mips64octeonel \
+- | mips64orion | mips64orionel \
+- | mips64r5900 | mips64r5900el \
+ | mips64vr | mips64vrel \
++ | mips64orion | mips64orionel \
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
+@@ -288,7 +286,7 @@
+ | v850 | v850e \
+ | we32k \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+- | z8k | z80)
++ | z8k)
+ basic_machine=$basic_machine-unknown
+ ;;
+ m6811 | m68hc11 | m6812 | m68hc12)
+@@ -333,14 +331,12 @@
+ | ip2k-* | iq2000-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
++ | m88110-* | m88k-* | maxq-* | mcore-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+- | mips64octeon-* | mips64octeonel-* \
+- | mips64orion-* | mips64orionel-* \
+- | mips64r5900-* | mips64r5900el-* \
+ | mips64vr-* | mips64vrel-* \
++ | mips64orion-* | mips64orionel-* \
+ | mips64vr4100-* | mips64vr4100el-* \
+ | mips64vr4300-* | mips64vr4300el-* \
+ | mips64vr5000-* | mips64vr5000el-* \
+@@ -368,14 +364,14 @@
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tron-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | xstormy16-* | xtensa*-* \
+ | ymp-* \
+- | z8k-* | z80-*)
++ | z8k-*)
+ ;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+@@ -463,10 +459,6 @@
+ basic_machine=c90-cray
+ os=-unicos
+ ;;
+- cegcc)
+- basic_machine=arm-unknown
+- os=-cegcc
+- ;;
+ convex-c1)
+ basic_machine=c1-convex
+ os=-bsd
+@@ -534,10 +526,6 @@
+ basic_machine=m88k-motorola
+ os=-sysv3
+ ;;
+- dicos)
+- basic_machine=i686-pc
+- os=-dicos
+- ;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+@@ -1140,10 +1128,6 @@
+ basic_machine=z8k-unknown
+ os=-sim
+ ;;
+- z80-*-coff)
+- basic_machine=z80-unknown
+- os=-sim
+- ;;
+ none)
+ basic_machine=none-none
+ os=-none
+@@ -1264,7 +1248,7 @@
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+- | -chorusos* | -chorusrdb* | -cegcc* \
++ | -chorusos* | -chorusrdb* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+@@ -1404,9 +1388,6 @@
+ -zvmoe)
+ os=-zvmoe
+ ;;
+- -dicos*)
+- os=-dicos
+- ;;
+ -none)
+ ;;
+ *)
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/configure pango1.0-1.24.0/configure
+--- pango1.0-1.24.0.old/configure 2009-03-16 23:35:07.000000000 +0100
++++ pango1.0-1.24.0/configure 2009-03-22 14:58:15.000000000 +0100
+@@ -6075,7 +6075,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -5290,8 +5175,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware*
- esac
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
--$as_echo "$lt_cv_deplibs_check_method" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
- test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -5325,7 +5210,7 @@ ia64-*-hpux*)
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *ELF-32*)
-@@ -5340,11 +5225,11 @@ ia64-*-hpux*)
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 5343 "configure"' > conftest.$ac_ext
-+ echo '#line 5228 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- if test "$lt_cv_prog_gnu_ld" = yes; then
- case `/usr/bin/file conftest.$ac_objext` in
-@@ -5382,7 +5267,7 @@ s390*-*linux*|sparc*-*linux*)
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.o` in
- *32-bit*)
-@@ -5405,7 +5290,6 @@ s390*-*linux*|sparc*-*linux*)
- esac
+@@ -10150,7 +10150,7 @@
+ fi
;;
- *64-bit*)
-- libsuff=64
- case $host in
- x86_64-*kfreebsd*-gnu)
- LD="${LD-ld} -m elf_x86_64_fbsd"
-@@ -5433,10 +5317,10 @@ s390*-*linux*|sparc*-*linux*)
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -belf"
-- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
--$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-+ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
- if test "${lt_cv_cc_needs_belf+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -5465,30 +5349,26 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- lt_cv_cc_needs_belf=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- lt_cv_cc_needs_belf=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- ac_ext=c
-@@ -5498,8 +5378,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
--$as_echo "$lt_cv_cc_needs_belf" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
-@@ -5511,7 +5391,7 @@ sparc*-*solaris*)
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.o` in
- *64-bit*)
-@@ -5533,10 +5413,10 @@ sparc*-*solaris*)
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
- set dummy ${ac_tool_prefix}dlltool; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_DLLTOOL+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$DLLTOOL"; then
- ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-@@ -5549,7 +5429,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -5560,11 +5440,11 @@ fi
- fi
- DLLTOOL=$ac_cv_prog_DLLTOOL
- if test -n "$DLLTOOL"; then
-- { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
--$as_echo "$DLLTOOL" >&6; }
-+ { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
-+echo "${ECHO_T}$DLLTOOL" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -5573,10 +5453,10 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
- ac_ct_DLLTOOL=$DLLTOOL
- # Extract the first word of "dlltool", so it can be a program name with args.
- set dummy dlltool; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_DLLTOOL"; then
- ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-@@ -5589,7 +5469,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -5600,11 +5480,11 @@ fi
- fi
- ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
- if test -n "$ac_ct_DLLTOOL"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
--$as_echo "$ac_ct_DLLTOOL" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
-+echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_ct_DLLTOOL" = x; then
-@@ -5612,8 +5492,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- DLLTOOL=$ac_ct_DLLTOOL
-@@ -5625,10 +5509,10 @@ fi
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
- set dummy ${ac_tool_prefix}as; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AS+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$AS"; then
- ac_cv_prog_AS="$AS" # Let the user override the test.
-@@ -5641,7 +5525,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AS="${ac_tool_prefix}as"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -5652,11 +5536,11 @@ fi
- fi
- AS=$ac_cv_prog_AS
- if test -n "$AS"; then
-- { $as_echo "$as_me:$LINENO: result: $AS" >&5
--$as_echo "$AS" >&6; }
-+ { echo "$as_me:$LINENO: result: $AS" >&5
-+echo "${ECHO_T}$AS" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -5665,10 +5549,10 @@ if test -z "$ac_cv_prog_AS"; then
- ac_ct_AS=$AS
- # Extract the first word of "as", so it can be a program name with args.
- set dummy as; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_AS"; then
- ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
-@@ -5681,7 +5565,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_AS="as"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -5692,11 +5576,11 @@ fi
- fi
- ac_ct_AS=$ac_cv_prog_ac_ct_AS
- if test -n "$ac_ct_AS"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
--$as_echo "$ac_ct_AS" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
-+echo "${ECHO_T}$ac_ct_AS" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_ct_AS" = x; then
-@@ -5704,8 +5588,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- AS=$ac_ct_AS
-@@ -5717,10 +5605,10 @@ fi
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
- set dummy ${ac_tool_prefix}objdump; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_OBJDUMP+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$OBJDUMP"; then
- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-@@ -5733,7 +5621,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -5744,11 +5632,11 @@ fi
- fi
- OBJDUMP=$ac_cv_prog_OBJDUMP
- if test -n "$OBJDUMP"; then
-- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
--$as_echo "$OBJDUMP" >&6; }
-+ { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
-+echo "${ECHO_T}$OBJDUMP" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -5757,10 +5645,10 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
- ac_ct_OBJDUMP=$OBJDUMP
- # Extract the first word of "objdump", so it can be a program name with args.
- set dummy objdump; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_OBJDUMP"; then
- ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-@@ -5773,7 +5661,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_OBJDUMP="objdump"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -5784,11 +5672,11 @@ fi
- fi
- ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
- if test -n "$ac_ct_OBJDUMP"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
--$as_echo "$ac_ct_OBJDUMP" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
-+echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_ct_OBJDUMP" = x; then
-@@ -5796,8 +5684,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- OBJDUMP=$ac_ct_OBJDUMP
-@@ -5818,15 +5710,15 @@ ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
--{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
--$as_echo_n "checking how to run the C preprocessor... " >&6; }
-+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
- CPP=
- fi
- if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # Double quotes because CPP needs to be expanded
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-@@ -5858,21 +5750,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- # Broken: fails on valid input.
-@@ -5896,14 +5787,13 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
-@@ -5911,7 +5801,7 @@ $as_echo "$ac_try_echo") >&5
- # Broken: success on invalid input.
- continue
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- # Passes both tests.
-@@ -5936,8 +5826,8 @@ fi
- else
- ac_cv_prog_CPP=$CPP
- fi
--{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
--$as_echo "$CPP" >&6; }
-+{ echo "$as_me:$LINENO: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6; }
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
- do
-@@ -5965,21 +5855,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- # Broken: fails on valid input.
-@@ -6003,14 +5892,13 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
-@@ -6018,7 +5906,7 @@ $as_echo "$ac_try_echo") >&5
- # Broken: success on invalid input.
- continue
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- # Passes both tests.
-@@ -6034,13 +5922,11 @@ rm -f conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then
- :
- else
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+ { (exit 1); exit 1; }; }
- fi
-
- ac_ext=c
-@@ -6050,10 +5936,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
--{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--$as_echo_n "checking for ANSI C header files... " >&6; }
-+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -6080,21 +5966,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_stdc=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_stdc=no
-@@ -6186,40 +6071,37 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
- else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-
-
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--$as_echo "$ac_cv_header_stdc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -6241,11 +6123,11 @@ fi
- for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
- do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -6263,21 +6145,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Header=no"
-@@ -6285,15 +6166,12 @@ fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -6304,21 +6182,20 @@ done
-
- for ac_header in dlfcn.h
- do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -6334,33 +6211,32 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -6374,52 +6250,51 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
- fi
-
- rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
- ## -------------------------------------------------------------------- ##
- ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=pango ##
-@@ -6428,24 +6303,21 @@ _ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -6462,11 +6334,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
--$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
- if test -z "$CXXCPP"; then
- if test "${ac_cv_prog_CXXCPP+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # Double quotes because CXXCPP needs to be expanded
- for CXXCPP in "$CXX -E" "/lib/cpp"
-@@ -6498,21 +6370,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- # Broken: fails on valid input.
-@@ -6536,14 +6407,13 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
-@@ -6551,7 +6421,7 @@ $as_echo "$ac_try_echo") >&5
- # Broken: success on invalid input.
- continue
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- # Passes both tests.
-@@ -6576,8 +6446,8 @@ fi
- else
- ac_cv_prog_CXXCPP=$CXXCPP
- fi
--{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
--$as_echo "$CXXCPP" >&6; }
-+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-+echo "${ECHO_T}$CXXCPP" >&6; }
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
- do
-@@ -6605,21 +6475,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- # Broken: fails on valid input.
-@@ -6643,14 +6512,13 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
-@@ -6658,7 +6526,7 @@ $as_echo "$ac_try_echo") >&5
- # Broken: success on invalid input.
- continue
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- # Passes both tests.
-@@ -6674,13 +6542,11 @@ rm -f conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then
- :
- else
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-+ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+ { (exit 1); exit 1; }; }
- fi
-
- ac_ext=cpp
-@@ -6700,10 +6566,10 @@ if test -n "$ac_tool_prefix"; then
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_F77+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$F77"; then
- ac_cv_prog_F77="$F77" # Let the user override the test.
-@@ -6716,7 +6582,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -6727,11 +6593,11 @@ fi
- fi
- F77=$ac_cv_prog_F77
- if test -n "$F77"; then
-- { $as_echo "$as_me:$LINENO: result: $F77" >&5
--$as_echo "$F77" >&6; }
-+ { echo "$as_me:$LINENO: result: $F77" >&5
-+echo "${ECHO_T}$F77" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -6744,10 +6610,10 @@ if test -z "$F77"; then
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_F77"; then
- ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-@@ -6760,7 +6626,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_F77="$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -6771,11 +6637,11 @@ fi
- fi
- ac_ct_F77=$ac_cv_prog_ac_ct_F77
- if test -n "$ac_ct_F77"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
--$as_echo "$ac_ct_F77" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-+echo "${ECHO_T}$ac_ct_F77" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -6787,8 +6653,12 @@ done
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- F77=$ac_ct_F77
-@@ -6797,41 +6667,37 @@ fi
-
-
- # Provide some information about the compiler.
--$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
--set X $ac_compile
--ac_compiler=$2
-+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
- { (ac_try="$ac_compiler --version >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- { (ac_try="$ac_compiler -v >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- { (ac_try="$ac_compiler -V >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- rm -f a.out
-
-@@ -6839,10 +6705,10 @@ rm -f a.out
- # input file. (Note that this only needs to work for GNU compilers.)
- ac_save_ext=$ac_ext
- ac_ext=F
--{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
--$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
- if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- program main
-@@ -6858,21 +6724,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_f77_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
-@@ -6882,16 +6747,16 @@ rm -f core conftest.err conftest.$ac_obj
- ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
--$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
- ac_ext=$ac_save_ext
- ac_test_FFLAGS=${FFLAGS+set}
- ac_save_FFLAGS=$FFLAGS
- FFLAGS=
--{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
--$as_echo_n "checking whether $F77 accepts -g... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_f77_g+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- FFLAGS=-g
- cat >conftest.$ac_ext <<_ACEOF
-@@ -6905,21 +6770,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_f77_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_f77_g=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_prog_f77_g=no
-@@ -6928,8 +6792,8 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
--$as_echo "$ac_cv_prog_f77_g" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
- if test "$ac_test_FFLAGS" = set; then
- FFLAGS=$ac_save_FFLAGS
- elif test $ac_cv_prog_f77_g = yes; then
-@@ -6946,11 +6810,7 @@ else
- fi
- fi
-
--if test $ac_compiler_gnu = yes; then
-- G77=yes
--else
-- G77=
--fi
-+G77=`test $ac_compiler_gnu = yes && echo yes`
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -6961,10 +6821,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
- # find the maximum length of command line arguments
--{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
--$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
- if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- i=0
- teststring="ABCD"
-@@ -7073,11 +6933,11 @@ else
- fi
-
- if test -n $lt_cv_sys_max_cmd_len ; then
-- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
--$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-+ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: none" >&5
--$as_echo "none" >&6; }
-+ { echo "$as_me:$LINENO: result: none" >&5
-+echo "${ECHO_T}none" >&6; }
- fi
-
-
-@@ -7085,10 +6945,10 @@ fi
-
-
- # Check for command to grab the raw symbol name followed by C symbol from nm.
--{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
--$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-+{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
- if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-
- # These are sane defaults that work on at least a few old systems.
-@@ -7193,14 +7053,14 @@ EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- # Now try to grab the symbols.
- nlist=conftest.nm
- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s "$nlist"; then
- # Try sorting and uniquifying the output.
- if sort "$nlist" | uniq > "$nlist"T; then
-@@ -7255,7 +7115,7 @@ EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext}; then
- pipe_works=yes
- fi
-@@ -7290,17 +7150,17 @@ if test -z "$lt_cv_sys_global_symbol_pip
- lt_cv_sys_global_symbol_to_cdecl=
- fi
- if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-- { $as_echo "$as_me:$LINENO: result: failed" >&5
--$as_echo "failed" >&6; }
-+ { echo "$as_me:$LINENO: result: failed" >&5
-+echo "${ECHO_T}failed" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: ok" >&5
--$as_echo "ok" >&6; }
-+ { echo "$as_me:$LINENO: result: ok" >&5
-+echo "${ECHO_T}ok" >&6; }
- fi
-
--{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
--$as_echo_n "checking for objdir... " >&6; }
-+{ echo "$as_me:$LINENO: checking for objdir" >&5
-+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
- if test "${lt_cv_objdir+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- rm -f .libs 2>/dev/null
- mkdir .libs 2>/dev/null
-@@ -7312,8 +7172,8 @@ else
- fi
- rmdir .libs 2>/dev/null
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
--$as_echo "$lt_cv_objdir" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-+echo "${ECHO_T}$lt_cv_objdir" >&6; }
- objdir=$lt_cv_objdir
-
-
-@@ -7364,10 +7224,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AR+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$AR"; then
- ac_cv_prog_AR="$AR" # Let the user override the test.
-@@ -7380,7 +7240,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AR="${ac_tool_prefix}ar"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7391,11 +7251,11 @@ fi
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
-- { $as_echo "$as_me:$LINENO: result: $AR" >&5
--$as_echo "$AR" >&6; }
-+ { echo "$as_me:$LINENO: result: $AR" >&5
-+echo "${ECHO_T}$AR" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -7404,10 +7264,10 @@ if test -z "$ac_cv_prog_AR"; then
- ac_ct_AR=$AR
- # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_AR"; then
- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-@@ -7420,7 +7280,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_AR="ar"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7431,11 +7291,11 @@ fi
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
--$as_echo "$ac_ct_AR" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-+echo "${ECHO_T}$ac_ct_AR" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_ct_AR" = x; then
-@@ -7443,8 +7303,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- AR=$ac_ct_AR
-@@ -7456,10 +7320,10 @@ fi
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_RANLIB+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-@@ -7472,7 +7336,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7483,11 +7347,11 @@ fi
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
-- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
--$as_echo "$RANLIB" >&6; }
-+ { echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -7496,10 +7360,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
- ac_ct_RANLIB=$RANLIB
- # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_RANLIB"; then
- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-@@ -7512,7 +7376,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_RANLIB="ranlib"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7523,11 +7387,11 @@ fi
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
--$as_echo "$ac_ct_RANLIB" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_ct_RANLIB" = x; then
-@@ -7535,8 +7399,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- RANLIB=$ac_ct_RANLIB
-@@ -7548,10 +7416,10 @@ fi
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-@@ -7564,7 +7432,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7575,11 +7443,11 @@ fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
-- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
--$as_echo "$STRIP" >&6; }
-+ { echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -7588,10 +7456,10 @@ if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
- set dummy strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-@@ -7604,7 +7472,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7615,11 +7483,11 @@ fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--$as_echo "$ac_ct_STRIP" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_ct_STRIP" = x; then
-@@ -7627,8 +7495,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- STRIP=$ac_ct_STRIP
-@@ -7691,10 +7563,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
- case $deplibs_check_method in
- file_magic*)
- if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
--$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-+ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
- if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $MAGIC_CMD in
- [\\/*] | ?:[\\/]*)
-@@ -7744,19 +7616,19 @@ fi
-
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
-- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
--$as_echo "$MAGIC_CMD" >&6; }
-+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+echo "${ECHO_T}$MAGIC_CMD" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test -z "$lt_cv_path_MAGIC_CMD"; then
- if test -n "$ac_tool_prefix"; then
-- { $as_echo "$as_me:$LINENO: checking for file" >&5
--$as_echo_n "checking for file... " >&6; }
-+ { echo "$as_me:$LINENO: checking for file" >&5
-+echo $ECHO_N "checking for file... $ECHO_C" >&6; }
- if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $MAGIC_CMD in
- [\\/*] | ?:[\\/]*)
-@@ -7806,11 +7678,11 @@ fi
-
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
-- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
--$as_echo "$MAGIC_CMD" >&6; }
-+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+echo "${ECHO_T}$MAGIC_CMD" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- else
-@@ -7828,10 +7700,10 @@ esac
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
- set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$DSYMUTIL"; then
- ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-@@ -7844,7 +7716,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7855,11 +7727,11 @@ fi
- fi
- DSYMUTIL=$ac_cv_prog_DSYMUTIL
- if test -n "$DSYMUTIL"; then
-- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
--$as_echo "$DSYMUTIL" >&6; }
-+ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-+echo "${ECHO_T}$DSYMUTIL" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -7868,10 +7740,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
- ac_ct_DSYMUTIL=$DSYMUTIL
- # Extract the first word of "dsymutil", so it can be a program name with args.
- set dummy dsymutil; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_DSYMUTIL"; then
- ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-@@ -7884,7 +7756,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7895,11 +7767,11 @@ fi
- fi
- ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
- if test -n "$ac_ct_DSYMUTIL"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
--$as_echo "$ac_ct_DSYMUTIL" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_ct_DSYMUTIL" = x; then
-@@ -7907,8 +7779,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- DSYMUTIL=$ac_ct_DSYMUTIL
-@@ -7920,10 +7796,10 @@ fi
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
- set dummy ${ac_tool_prefix}nmedit; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_NMEDIT+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$NMEDIT"; then
- ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-@@ -7936,7 +7812,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7947,11 +7823,11 @@ fi
- fi
- NMEDIT=$ac_cv_prog_NMEDIT
- if test -n "$NMEDIT"; then
-- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
--$as_echo "$NMEDIT" >&6; }
-+ { echo "$as_me:$LINENO: result: $NMEDIT" >&5
-+echo "${ECHO_T}$NMEDIT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -7960,10 +7836,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then
- ac_ct_NMEDIT=$NMEDIT
- # Extract the first word of "nmedit", so it can be a program name with args.
- set dummy nmedit; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_NMEDIT"; then
- ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-@@ -7976,7 +7852,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_NMEDIT="nmedit"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -7987,11 +7863,11 @@ fi
- fi
- ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
- if test -n "$ac_ct_NMEDIT"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
--$as_echo "$ac_ct_NMEDIT" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_ct_NMEDIT" = x; then
-@@ -7999,8 +7875,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- NMEDIT=$ac_ct_NMEDIT
-@@ -8010,10 +7890,10 @@ else
- fi
-
-
-- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
--$as_echo_n "checking for -single_module linker flag... " >&6; }
-+ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
- if test "${lt_cv_apple_cc_single_mod+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
-@@ -8031,12 +7911,12 @@ else
- rm conftest.c
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
--$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
--$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
-+ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
- if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_ld_exported_symbols_list=no
- save_LDFLAGS=$LDFLAGS
-@@ -8063,37 +7943,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- lt_cv_ld_exported_symbols_list=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- lt_cv_ld_exported_symbols_list=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
--$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
- case $host_os in
- rhapsody* | darwin1.[0123])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -8205,10 +8081,10 @@ if test "$GCC" = yes; then
- lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-
-
--{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
--$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_rtti_exceptions=no
- ac_outfile=conftest.$ac_objext
-@@ -8223,11 +8099,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8226: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8102: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8230: \$? = $ac_status" >&5
-+ echo "$as_me:8106: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -8240,8 +8116,8 @@ else
- $rm conftest*
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
--$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
- if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
- lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -8255,8 +8131,8 @@ lt_prog_compiler_wl=
- lt_prog_compiler_pic=
- lt_prog_compiler_static=
-
--{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-
- if test "$GCC" = yes; then
- lt_prog_compiler_wl='-Wl,'
-@@ -8487,18 +8363,18 @@ $as_echo_n "checking for $compiler optio
- esac
- fi
-
--{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
--$as_echo "$lt_prog_compiler_pic" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
-
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic"; then
-
--{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
--$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_pic_works=no
- ac_outfile=conftest.$ac_objext
-@@ -8513,11 +8389,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8516: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8392: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8520: \$? = $ac_status" >&5
-+ echo "$as_me:8396: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -8530,8 +8406,8 @@ else
- $rm conftest*
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
--$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
-
- if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
- case $lt_prog_compiler_pic in
-@@ -8558,10 +8434,10 @@ esac
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
--{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_static_works+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
-@@ -8586,8 +8462,8 @@ else
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
--$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
-
- if test x"$lt_cv_prog_compiler_static_works" = xyes; then
- :
-@@ -8596,10 +8472,10 @@ else
- fi
-
-
--{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_c_o=no
- $rm -r conftest 2>/dev/null
-@@ -8617,11 +8493,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8620: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8496: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:8624: \$? = $ac_status" >&5
-+ echo "$as_me:8500: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -8643,34 +8519,34 @@ else
- $rm conftest*
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
--$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
-
-
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
- # do not overwrite the value of need_locks provided by the user
-- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--$as_echo_n "checking if we can lock with hard links... " >&6; }
-+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
- hard_links=yes
- $rm conftest*
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- touch conftest.a
- ln conftest.a conftest.b 2>&5 || hard_links=no
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
-- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
--$as_echo "$hard_links" >&6; }
-+ { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
- if test "$hard_links" = no; then
-- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
--$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
- need_locks=warn
- fi
- else
- need_locks=no
- fi
-
--{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-
- runpath_var=
- allow_undefined_flag=
-@@ -8882,12 +8758,13 @@ EOF
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -10325,6 +10325,7 @@
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
fi
+ link_all_deplibs=no
else
- ld_shlibs=no
- fi
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -10739,7 +10740,7 @@
+ link_all_deplibs=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -9100,21 +8977,18 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -9129,13 +9003,12 @@ if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -9170,21 +9043,18 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -9199,13 +9069,12 @@ if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -9438,7 +9307,7 @@ if test -z "$aix_libpath"; then aix_libp
- link_all_deplibs=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9657,8 +9526,8 @@ if test -z "$aix_libpath"; then aix_libp
- esac
- fi
-
--{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
--$as_echo "$ld_shlibs" >&6; }
-+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-+echo "${ECHO_T}$ld_shlibs" >&6; }
- test "$ld_shlibs" = no && can_build_shared=no
-
- #
-@@ -9678,15 +9547,15 @@ x|xyes)
- # Test whether the compiler implicitly links with -lc since on some
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
- # to ld, don't add -lc before -lgcc.
-- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
- soname=conftest
- lib=conftest
-@@ -9704,7 +9573,7 @@ $as_echo_n "checking whether -lc should
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
- (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- then
- archive_cmds_need_lc=no
-@@ -9716,16 +9585,16 @@ $as_echo_n "checking whether -lc should
- cat conftest.err 1>&5
- fi
- $rm conftest*
-- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
--$as_echo "$archive_cmds_need_lc" >&6; }
-+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
- ;;
- esac
- fi
- ;;
- esac
-
--{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--$as_echo_n "checking dynamic linker characteristics... " >&6; }
-+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -10133,13 +10002,11 @@ linux* | k*bsd*-gnu)
- # Some rework will be needed to allow for fast_install
+@@ -11701,13 +11702,10 @@
# before this can be enabled.
hardcode_into_libs=yes
-- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-
+
+- # Add ABI-specific directories to the system library path.
+- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- 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' ' '`
+ 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' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10151,6 +10018,18 @@ linux* | k*bsd*-gnu)
+@@ -11719,6 +11717,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5963,1030 +501,78 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10328,19 +10207,19 @@ uts4*)
- dynamic_linker=no
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--$as_echo "$dynamic_linker" >&6; }
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
- if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
- fi
-
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
- fi
-@@ -10352,8 +10231,8 @@ if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
-
--{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
- hardcode_action=
- if test -n "$hardcode_libdir_flag_spec" || \
- test -n "$runpath_var" || \
-@@ -10377,8 +10256,8 @@ else
- # directories.
- hardcode_action=unsupported
- fi
--{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
--$as_echo "$hardcode_action" >&6; }
-+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
-+echo "${ECHO_T}$hardcode_action" >&6; }
-
- if test "$hardcode_action" = relink; then
- # Fast installation is not supported
-@@ -10391,13 +10270,13 @@ fi
-
- striplib=
- old_striplib=
--{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
- if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
- # FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
-@@ -10405,16 +10284,16 @@ else
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- old_striplib="$STRIP -S"
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- ;;
- *)
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- ;;
- esac
- fi
-@@ -10446,10 +10325,10 @@ else
-
- darwin*)
- # if libdl is installed we need to link against it
-- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl $LIBS"
-@@ -10481,37 +10360,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlopen=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
--if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-+if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
-
-@@ -10524,10 +10399,10 @@ fi
- ;;
-
- *)
-- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
--$as_echo_n "checking for shl_load... " >&6; }
-+ { echo "$as_me:$LINENO: checking for shl_load" >&5
-+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
- if test "${ac_cv_func_shl_load+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -10580,42 +10455,38 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_shl_load=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_shl_load=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
--$as_echo "$ac_cv_func_shl_load" >&6; }
--if test "x$ac_cv_func_shl_load" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-+if test $ac_cv_func_shl_load = yes; then
- lt_cv_dlopen="shl_load"
- else
-- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--$as_echo_n "checking for shl_load in -ldld... " >&6; }
-+ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld $LIBS"
-@@ -10647,43 +10518,39 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dld_shl_load=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dld_shl_load=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
--if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-+if test $ac_cv_lib_dld_shl_load = yes; then
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
- else
-- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
--$as_echo_n "checking for dlopen... " >&6; }
-+ { echo "$as_me:$LINENO: checking for dlopen" >&5
-+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
- if test "${ac_cv_func_dlopen+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -10736,42 +10603,38 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_dlopen=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_dlopen=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
--$as_echo "$ac_cv_func_dlopen" >&6; }
--if test "x$ac_cv_func_dlopen" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-+if test $ac_cv_func_dlopen = yes; then
- lt_cv_dlopen="dlopen"
- else
-- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl $LIBS"
-@@ -10803,43 +10666,39 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlopen=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
--if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-+if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
-- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
--$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-+ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsvld $LIBS"
-@@ -10871,43 +10730,39 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_svld_dlopen=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_svld_dlopen=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
--$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
--if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-+if test $ac_cv_lib_svld_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
- else
-- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
--$as_echo_n "checking for dld_link in -ldld... " >&6; }
-+ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld $LIBS"
-@@ -10939,37 +10794,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dld_dld_link=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dld_dld_link=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
--$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
--if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-+if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
- fi
-
-@@ -11008,10 +10859,10 @@ fi
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-
-- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
--$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-+ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
- if test "${lt_cv_dlopen_self+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self=cross
-@@ -11019,7 +10870,7 @@ else
+@@ -12652,7 +12662,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 11022 "configure"
-+#line 10873 "configure"
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 12655 "configure"
++#line 12665 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11085,7 +10936,7 @@ EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) >&5 2>/dev/null
- lt_status=$?
-@@ -11103,15 +10954,15 @@ rm -fr conftest*
-
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--$as_echo "$lt_cv_dlopen_self" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
-
- if test "x$lt_cv_dlopen_self" = xyes; then
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-+ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
- if test "${lt_cv_dlopen_self_static+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self_static=cross
-@@ -11119,7 +10970,7 @@ else
+@@ -12748,7 +12758,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 11122 "configure"
-+#line 10973 "configure"
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 12751 "configure"
++#line 12761 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11185,7 +11036,7 @@ EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) >&5 2>/dev/null
- lt_status=$?
-@@ -11203,8 +11054,8 @@ rm -fr conftest*
-
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--$as_echo "$lt_cv_dlopen_self_static" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
- fi
-
- CPPFLAGS="$save_CPPFLAGS"
-@@ -11226,13 +11077,13 @@ fi
-
-
- # Report which library types will actually be built
--{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
--$as_echo_n "checking if libtool supports shared libraries... " >&6; }
--{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
--$as_echo "$can_build_shared" >&6; }
-+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-+echo "${ECHO_T}$can_build_shared" >&6; }
-
--{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--$as_echo_n "checking whether to build shared libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
- test "$can_build_shared" = "no" && enable_shared=no
-
- # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -11252,15 +11103,15 @@ aix[4-9]*)
- fi
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
--$as_echo "$enable_shared" >&6; }
-+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-+echo "${ECHO_T}$enable_shared" >&6; }
-
--{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
--$as_echo_n "checking whether to build static libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
--{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
--$as_echo "$enable_static" >&6; }
-+{ echo "$as_me:$LINENO: result: $enable_static" >&5
-+echo "${ECHO_T}$enable_static" >&6; }
-
- # The else clause should only fire when bootstrapping the
- # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -11353,8 +11204,8 @@ if test -f "$ltmain"; then
- cfgfile="${ofile}T"
- trap "$rm \"$cfgfile\"; exit 1" 1 2 15
- $rm -f "$cfgfile"
-- { $as_echo "$as_me:$LINENO: creating $ofile" >&5
--$as_echo "$as_me: creating $ofile" >&6;}
-+ { echo "$as_me:$LINENO: creating $ofile" >&5
-+echo "$as_me: creating $ofile" >&6;}
-
- cat <<__EOF__ >> "$cfgfile"
- #! $SHELL
-@@ -11766,18 +11617,18 @@ fi
-
- if test -f "$ltmain" && test -n "$tagnames"; then
- if test ! -f "${ofile}"; then
-- { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
--$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-+echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
- fi
-
- if test -z "$LTCC"; then
- eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
- if test -z "$LTCC"; then
-- { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
--$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-+echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
- else
-- { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
--$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-+echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
- fi
- fi
- if test -z "$LTCFLAGS"; then
-@@ -11794,16 +11645,16 @@ $as_echo "$as_me: WARNING: using \`LTCC=
- # Check whether tagname contains only valid characters
- case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
- "") ;;
-- *) { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
--$as_echo "$as_me: error: invalid tag name: $tagname" >&2;}
-+ *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-+echo "$as_me: error: invalid tag name: $tagname" >&2;}
- { (exit 1); exit 1; }; }
- ;;
- esac
-
- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
- then
-- { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
--$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
-+ { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-+echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -11946,8 +11797,8 @@ fi
- ac_prog=ld
- if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
-- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--$as_echo_n "checking for ld used by $CC... " >&6; }
-+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
-@@ -11976,14 +11827,14 @@ $as_echo_n "checking for ld used by $CC.
- ;;
- esac
- elif test "$with_gnu_ld" = yes; then
-- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
--$as_echo_n "checking for GNU ld... " >&6; }
-+ { echo "$as_me:$LINENO: checking for GNU ld" >&5
-+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
--$as_echo_n "checking for non-GNU ld... " >&6; }
-+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
- fi
- if test "${lt_cv_path_LD+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -12013,19 +11864,19 @@ fi
-
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
-- { $as_echo "$as_me:$LINENO: result: $LD" >&5
--$as_echo "$LD" >&6; }
-+ { echo "$as_me:$LINENO: result: $LD" >&5
-+echo "${ECHO_T}$LD" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
--$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
--{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
--$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
-@@ -12037,8 +11888,8 @@ case `$LD -v 2>&1 </dev/null` in
- ;;
- esac
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
--$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-@@ -12088,8 +11939,8 @@ else
- fi
-
- # PORTME: fill in a description of your system's C++ link characteristics
--{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
- ld_shlibs_CXX=yes
- case $host_os in
- aix3*)
-@@ -12206,21 +12057,18 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -12235,13 +12083,12 @@ if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -12277,21 +12124,18 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -12306,13 +12150,12 @@ if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -12715,7 +12558,7 @@ if test -z "$aix_libpath"; then aix_libp
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- wlarc=
-@@ -13042,8 +12885,8 @@ if test -z "$aix_libpath"; then aix_libp
- ld_shlibs_CXX=no
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
--$as_echo "$ld_shlibs_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
- test "$ld_shlibs_CXX" = no && can_build_shared=no
-
- GCC_CXX="$GXX"
-@@ -13062,7 +12905,7 @@ EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- # Parse the compiler output and extract the necessary
- # objects, libraries and library flags.
-@@ -13218,8 +13061,8 @@ lt_prog_compiler_wl_CXX=
- lt_prog_compiler_pic_CXX=
- lt_prog_compiler_static_CXX=
-
--{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-
- # C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
-@@ -13419,7 +13262,7 @@ $as_echo_n "checking for $compiler optio
+@@ -14644,7 +14654,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
- osf3* | osf4* | osf5*)
- case $cc_basename in
-@@ -13502,18 +13345,18 @@ $as_echo_n "checking for $compiler optio
- esac
- fi
-
--{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
--$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
-
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_CXX"; then
-
--{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
--$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_pic_works_CXX=no
- ac_outfile=conftest.$ac_objext
-@@ -13528,11 +13371,11 @@ else
+ *qnx* | *nto*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -14768,11 +14778,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13531: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13374: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14771: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14781: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13535: \$? = $ac_status" >&5
-+ echo "$as_me:13378: \$? = $ac_status" >&5
+- echo "$as_me:14775: \$? = $ac_status" >&5
++ echo "$as_me:14785: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -13545,8 +13388,8 @@ else
- $rm conftest*
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
--$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-
- if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
- case $lt_prog_compiler_pic_CXX in
-@@ -13573,10 +13416,10 @@ esac
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
--{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_static_works_CXX=no
- save_LDFLAGS="$LDFLAGS"
-@@ -13601,8 +13444,8 @@ else
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
--$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
-
- if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
- :
-@@ -13611,10 +13454,10 @@ else
- fi
-
-
--{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_c_o_CXX=no
- $rm -r conftest 2>/dev/null
-@@ -13632,11 +13475,11 @@ else
+@@ -14867,11 +14877,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13635: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13478: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14870: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14880: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13639: \$? = $ac_status" >&5
-+ echo "$as_me:13482: \$? = $ac_status" >&5
+- echo "$as_me:14874: \$? = $ac_status" >&5
++ echo "$as_me:14884: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -13658,34 +13501,34 @@ else
- $rm conftest*
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
--$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
-
-
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
- # do not overwrite the value of need_locks provided by the user
-- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--$as_echo_n "checking if we can lock with hard links... " >&6; }
-+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
- hard_links=yes
- $rm conftest*
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- touch conftest.a
- ln conftest.a conftest.b 2>&5 || hard_links=no
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
-- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
--$as_echo "$hard_links" >&6; }
-+ { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
- if test "$hard_links" = no; then
-- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
--$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
- need_locks=warn
- fi
- else
- need_locks=no
- fi
-
--{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- case $host_os in
-@@ -13704,14 +13547,17 @@ $as_echo_n "checking whether the $compil
- cygwin* | mingw*)
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+@@ -14919,11 +14929,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14922: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14932: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:14926: \$? = $ac_status" >&5
++ echo "$as_me:14936: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -14995,6 +15005,9 @@
+ cygwin* | mingw* | cegcc*)
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
+ linux* | k*bsd*-gnu)
+ link_all_deplibs_CXX=no
@@ -6994,81 +580,22 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
- esac
- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-
--{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
--$as_echo "$ld_shlibs_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
- test "$ld_shlibs_CXX" = no && can_build_shared=no
-
- #
-@@ -13731,15 +13577,15 @@ x|xyes)
- # Test whether the compiler implicitly links with -lc since on some
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
- # to ld, don't add -lc before -lgcc.
-- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
- soname=conftest
- lib=conftest
-@@ -13757,7 +13603,7 @@ $as_echo_n "checking whether -lc should
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
- (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- then
- archive_cmds_need_lc_CXX=no
-@@ -13769,16 +13615,16 @@ $as_echo_n "checking whether -lc should
- cat conftest.err 1>&5
- fi
- $rm conftest*
-- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
--$as_echo "$archive_cmds_need_lc_CXX" >&6; }
-+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
- ;;
- esac
- fi
- ;;
- esac
-
--{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--$as_echo_n "checking dynamic linker characteristics... " >&6; }
-+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -14134,13 +13980,11 @@ linux* | k*bsd*-gnu)
- # Some rework will be needed to allow for fast_install
+@@ -15566,13 +15579,10 @@
# before this can be enabled.
hardcode_into_libs=yes
-- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-
+
+- # Add ABI-specific directories to the system library path.
+- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- 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' ' '`
+ 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' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -14152,6 +13996,18 @@ linux* | k*bsd*-gnu)
+@@ -15584,6 +15594,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -7087,2260 +614,23 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14329,19 +14185,19 @@ uts4*)
- dynamic_linker=no
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--$as_echo "$dynamic_linker" >&6; }
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
- if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
- fi
-
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
- fi
-@@ -14353,8 +14209,8 @@ if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
-
--{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
- hardcode_action_CXX=
- if test -n "$hardcode_libdir_flag_spec_CXX" || \
- test -n "$runpath_var_CXX" || \
-@@ -14378,8 +14234,8 @@ else
- # directories.
- hardcode_action_CXX=unsupported
- fi
--{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
--$as_echo "$hardcode_action_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-+echo "${ECHO_T}$hardcode_action_CXX" >&6; }
-
- if test "$hardcode_action_CXX" = relink; then
- # Fast installation is not supported
-@@ -14917,13 +14773,13 @@ done
- cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
--{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
--$as_echo_n "checking if libtool supports shared libraries... " >&6; }
--{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
--$as_echo "$can_build_shared" >&6; }
-+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-+echo "${ECHO_T}$can_build_shared" >&6; }
-
--{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--$as_echo_n "checking whether to build shared libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
- test "$can_build_shared" = "no" && enable_shared=no
-
- # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -14942,15 +14798,15 @@ aix[4-9]*)
- fi
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
--$as_echo "$enable_shared" >&6; }
-+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-+echo "${ECHO_T}$enable_shared" >&6; }
-
--{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
--$as_echo_n "checking whether to build static libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
--{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
--$as_echo "$enable_static" >&6; }
-+{ echo "$as_me:$LINENO: result: $enable_static" >&5
-+echo "${ECHO_T}$enable_static" >&6; }
-
- GCC_F77="$G77"
- LD_F77="$LD"
-@@ -14959,8 +14815,8 @@ lt_prog_compiler_wl_F77=
- lt_prog_compiler_pic_F77=
- lt_prog_compiler_static_F77=
-
--{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-
- if test "$GCC" = yes; then
- lt_prog_compiler_wl_F77='-Wl,'
-@@ -15191,18 +15047,18 @@ $as_echo_n "checking for $compiler optio
- esac
- fi
-
--{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
--$as_echo "$lt_prog_compiler_pic_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
-
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_F77"; then
-
--{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
--$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_pic_works_F77=no
- ac_outfile=conftest.$ac_objext
-@@ -15217,11 +15073,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15220: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15076: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:15224: \$? = $ac_status" >&5
-+ echo "$as_me:15080: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -15234,8 +15090,8 @@ else
- $rm conftest*
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
--$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
-
- if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
- case $lt_prog_compiler_pic_F77 in
-@@ -15262,10 +15118,10 @@ esac
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
--{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_static_works_F77=no
- save_LDFLAGS="$LDFLAGS"
-@@ -15290,8 +15146,8 @@ else
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
--$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
-
- if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
- :
-@@ -15300,10 +15156,10 @@ else
- fi
-
-
--{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_c_o_F77=no
- $rm -r conftest 2>/dev/null
-@@ -15321,11 +15177,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15324: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15180: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:15328: \$? = $ac_status" >&5
-+ echo "$as_me:15184: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -15347,34 +15203,34 @@ else
- $rm conftest*
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
--$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
-
-
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
- # do not overwrite the value of need_locks provided by the user
-- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--$as_echo_n "checking if we can lock with hard links... " >&6; }
-+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
- hard_links=yes
- $rm conftest*
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- touch conftest.a
- ln conftest.a conftest.b 2>&5 || hard_links=no
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
-- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
--$as_echo "$hard_links" >&6; }
-+ { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
- if test "$hard_links" = no; then
-- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
--$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
- need_locks=warn
- fi
- else
- need_locks=no
- fi
-
--{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-
- runpath_var=
- allow_undefined_flag_F77=
-@@ -15586,12 +15442,13 @@ EOF
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-+ link_all_deplibs_F77=no
- else
- ld_shlibs_F77=no
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -15794,21 +15651,18 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_f77_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -15823,13 +15677,12 @@ if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -15854,21 +15707,18 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_f77_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -15883,13 +15733,12 @@ if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16122,7 +15971,7 @@ if test -z "$aix_libpath"; then aix_libp
- link_all_deplibs_F77=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -16341,8 +16190,8 @@ if test -z "$aix_libpath"; then aix_libp
- esac
- fi
-
--{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
--$as_echo "$ld_shlibs_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-+echo "${ECHO_T}$ld_shlibs_F77" >&6; }
- test "$ld_shlibs_F77" = no && can_build_shared=no
-
- #
-@@ -16362,15 +16211,15 @@ x|xyes)
- # Test whether the compiler implicitly links with -lc since on some
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
- # to ld, don't add -lc before -lgcc.
-- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
- soname=conftest
- lib=conftest
-@@ -16388,7 +16237,7 @@ $as_echo_n "checking whether -lc should
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
- (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- then
- archive_cmds_need_lc_F77=no
-@@ -16400,16 +16249,16 @@ $as_echo_n "checking whether -lc should
- cat conftest.err 1>&5
- fi
- $rm conftest*
-- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
--$as_echo "$archive_cmds_need_lc_F77" >&6; }
-+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
- ;;
- esac
- fi
- ;;
- esac
-
--{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--$as_echo_n "checking dynamic linker characteristics... " >&6; }
-+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -16765,13 +16614,11 @@ linux* | k*bsd*-gnu)
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- 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' ' '`
-- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -16783,6 +16630,18 @@ linux* | k*bsd*-gnu)
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -16960,19 +16819,19 @@ uts4*)
- dynamic_linker=no
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--$as_echo "$dynamic_linker" >&6; }
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
- if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
- fi
-
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
- fi
-@@ -16984,8 +16843,8 @@ if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
-
--{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
- hardcode_action_F77=
- if test -n "$hardcode_libdir_flag_spec_F77" || \
- test -n "$runpath_var_F77" || \
-@@ -17009,8 +16868,8 @@ else
- # directories.
- hardcode_action_F77=unsupported
- fi
--{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
--$as_echo "$hardcode_action_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-+echo "${ECHO_T}$hardcode_action_F77" >&6; }
-
- if test "$hardcode_action_F77" = relink; then
- # Fast installation is not supported
-@@ -17520,10 +17379,10 @@ if test "$GCC" = yes; then
- lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-
-
--{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
--$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_rtti_exceptions=no
- ac_outfile=conftest.$ac_objext
-@@ -17538,11 +17397,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17541: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17400: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:17545: \$? = $ac_status" >&5
-+ echo "$as_me:17404: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -17555,8 +17414,8 @@ else
- $rm conftest*
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
--$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
- if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
- lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -17570,8 +17429,8 @@ lt_prog_compiler_wl_GCJ=
- lt_prog_compiler_pic_GCJ=
- lt_prog_compiler_static_GCJ=
-
--{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-
- if test "$GCC" = yes; then
- lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -17802,18 +17661,18 @@ $as_echo_n "checking for $compiler optio
- esac
- fi
-
--{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
--$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
-
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_GCJ"; then
-
--{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
--$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_pic_works_GCJ=no
- ac_outfile=conftest.$ac_objext
-@@ -17828,11 +17687,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17831: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17690: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:17835: \$? = $ac_status" >&5
-+ echo "$as_me:17694: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -17845,8 +17704,8 @@ else
- $rm conftest*
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
--$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
-
- if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
- case $lt_prog_compiler_pic_GCJ in
-@@ -17873,10 +17732,10 @@ esac
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
--{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_static_works_GCJ=no
- save_LDFLAGS="$LDFLAGS"
-@@ -17901,8 +17760,8 @@ else
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
--$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
-
- if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
- :
-@@ -17911,10 +17770,10 @@ else
- fi
-
-
--{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_prog_compiler_c_o_GCJ=no
- $rm -r conftest 2>/dev/null
-@@ -17932,11 +17791,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17935: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17794: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:17939: \$? = $ac_status" >&5
-+ echo "$as_me:17798: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -17958,34 +17817,34 @@ else
- $rm conftest*
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
--$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
-
-
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
- # do not overwrite the value of need_locks provided by the user
-- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--$as_echo_n "checking if we can lock with hard links... " >&6; }
-+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
- hard_links=yes
- $rm conftest*
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- touch conftest.a
- ln conftest.a conftest.b 2>&5 || hard_links=no
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
-- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
--$as_echo "$hard_links" >&6; }
-+ { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
- if test "$hard_links" = no; then
-- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
--$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
- need_locks=warn
- fi
- else
- need_locks=no
- fi
-
--{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-
- runpath_var=
- allow_undefined_flag_GCJ=
-@@ -18197,12 +18056,13 @@ EOF
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-+ link_all_deplibs_GCJ=no
- else
- ld_shlibs_GCJ=no
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -18415,21 +18275,18 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -18444,13 +18301,12 @@ if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -18485,21 +18341,18 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-@@ -18514,13 +18367,12 @@ if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -18753,7 +18605,7 @@ if test -z "$aix_libpath"; then aix_libp
- link_all_deplibs_GCJ=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -18972,8 +18824,8 @@ if test -z "$aix_libpath"; then aix_libp
- esac
- fi
-
--{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
--$as_echo "$ld_shlibs_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
- test "$ld_shlibs_GCJ" = no && can_build_shared=no
-
- #
-@@ -18993,15 +18845,15 @@ x|xyes)
- # Test whether the compiler implicitly links with -lc since on some
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
- # to ld, don't add -lc before -lgcc.
-- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
- soname=conftest
- lib=conftest
-@@ -19019,7 +18871,7 @@ $as_echo_n "checking whether -lc should
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
- (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- then
- archive_cmds_need_lc_GCJ=no
-@@ -19031,16 +18883,16 @@ $as_echo_n "checking whether -lc should
- cat conftest.err 1>&5
- fi
- $rm conftest*
-- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
--$as_echo "$archive_cmds_need_lc_GCJ" >&6; }
-+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
- ;;
- esac
- fi
- ;;
- esac
-
--{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--$as_echo_n "checking dynamic linker characteristics... " >&6; }
-+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -19396,13 +19248,11 @@ linux* | k*bsd*-gnu)
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- 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' ' '`
-- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -19414,6 +19264,18 @@ linux* | k*bsd*-gnu)
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -19591,19 +19453,19 @@ uts4*)
- dynamic_linker=no
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--$as_echo "$dynamic_linker" >&6; }
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
- if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
- fi
-
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
- fi
-@@ -19615,8 +19477,8 @@ if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
-
--{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
- hardcode_action_GCJ=
- if test -n "$hardcode_libdir_flag_spec_GCJ" || \
- test -n "$runpath_var_GCJ" || \
-@@ -19640,8 +19502,8 @@ else
- # directories.
- hardcode_action_GCJ=unsupported
- fi
--{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
--$as_echo "$hardcode_action_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
-
- if test "$hardcode_action_GCJ" = relink; then
- # Fast installation is not supported
-@@ -20564,8 +20426,8 @@ CC="$lt_save_CC"
- ;;
-
- *)
-- { { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
--$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-+ { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-+echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
- { (exit 1); exit 1; }; }
- ;;
- esac
-@@ -20584,8 +20446,8 @@ $as_echo "$as_me: error: Unsupported tag
- chmod +x "$ofile"
- else
- rm -f "${ofile}T"
-- { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
--$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-+ { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-+echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
-@@ -20621,8 +20483,8 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
-
-
-
--{ $as_echo "$as_me:$LINENO: checking for some Win32 platform" >&5
--$as_echo_n "checking for some Win32 platform... " >&6; }
-+{ echo "$as_me:$LINENO: checking for some Win32 platform" >&5
-+echo $ECHO_N "checking for some Win32 platform... $ECHO_C" >&6; }
- case "$host" in
- *-*-mingw*|*-*-cygwin*)
- pango_platform_win32=yes
-@@ -20631,8 +20493,8 @@ case "$host" in
- pango_platform_win32=no
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $pango_platform_win32" >&5
--$as_echo "$pango_platform_win32" >&6; }
-+{ echo "$as_me:$LINENO: result: $pango_platform_win32" >&5
-+echo "${ECHO_T}$pango_platform_win32" >&6; }
- if test "$pango_platform_win32" = "yes"; then
- PLATFORM_WIN32_TRUE=
- PLATFORM_WIN32_FALSE='#'
-@@ -20646,10 +20508,10 @@ if test "$pango_os_win32" = "yes"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
- set dummy ${ac_tool_prefix}windres; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_WINDRES+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$WINDRES"; then
- ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
-@@ -20662,7 +20524,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -20673,11 +20535,11 @@ fi
- fi
- WINDRES=$ac_cv_prog_WINDRES
- if test -n "$WINDRES"; then
-- { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5
--$as_echo "$WINDRES" >&6; }
-+ { echo "$as_me:$LINENO: result: $WINDRES" >&5
-+echo "${ECHO_T}$WINDRES" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -20686,10 +20548,10 @@ if test -z "$ac_cv_prog_WINDRES"; then
- ac_ct_WINDRES=$WINDRES
- # Extract the first word of "windres", so it can be a program name with args.
- set dummy windres; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ac_ct_WINDRES"; then
- ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
-@@ -20702,7 +20564,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_WINDRES="windres"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -20713,11 +20575,11 @@ fi
- fi
- ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
- if test -n "$ac_ct_WINDRES"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
--$as_echo "$ac_ct_WINDRES" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
-+echo "${ECHO_T}$ac_ct_WINDRES" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_ct_WINDRES" = x; then
-@@ -20725,8 +20587,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- WINDRES=$ac_ct_WINDRES
-@@ -20736,16 +20602,16 @@ else
- fi
-
- if test "$WINDRES" = no; then
-- { { $as_echo "$as_me:$LINENO: error: *** Could not find an implementation of windres in your PATH." >&5
--$as_echo "$as_me: error: *** Could not find an implementation of windres in your PATH." >&2;}
-+ { { echo "$as_me:$LINENO: error: *** Could not find an implementation of windres in your PATH." >&5
-+echo "$as_me: error: *** Could not find an implementation of windres in your PATH." >&2;}
- { (exit 1); exit 1; }; }
- fi
- # Extract the first word of "lib.exe", so it can be a program name with args.
- set dummy lib.exe; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ms_librarian+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$ms_librarian"; then
- ac_cv_prog_ms_librarian="$ms_librarian" # Let the user override the test.
-@@ -20758,7 +20624,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ms_librarian="yes"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -20770,11 +20636,11 @@ fi
- fi
- ms_librarian=$ac_cv_prog_ms_librarian
- if test -n "$ms_librarian"; then
-- { $as_echo "$as_me:$LINENO: result: $ms_librarian" >&5
--$as_echo "$ms_librarian" >&6; }
-+ { echo "$as_me:$LINENO: result: $ms_librarian" >&5
-+echo "${ECHO_T}$ms_librarian" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -20842,10 +20708,10 @@ for ac_prog in perl5 perl
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_PERL+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$PERL"; then
- ac_cv_prog_PERL="$PERL" # Let the user override the test.
-@@ -20858,7 +20724,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_PERL="$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -20869,11 +20735,11 @@ fi
- fi
- PERL=$ac_cv_prog_PERL
- if test -n "$PERL"; then
-- { $as_echo "$as_me:$LINENO: result: $PERL" >&5
--$as_echo "$PERL" >&6; }
-+ { echo "$as_me:$LINENO: result: $PERL" >&5
-+echo "${ECHO_T}$PERL" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -20891,8 +20757,8 @@ fi
-
- have_x=false
- if test "x$pango_os_win32" != xyes; then
-- { $as_echo "$as_me:$LINENO: checking for X" >&5
--$as_echo_n "checking for X... " >&6; }
-+ { echo "$as_me:$LINENO: checking for X" >&5
-+echo $ECHO_N "checking for X... $ECHO_C" >&6; }
-
-
- # Check whether --with-x was given.
-@@ -20906,11 +20772,11 @@ if test "x$with_x" = xno; then
- have_x=disabled
- else
- case $x_includes,$x_libraries in #(
-- *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5
--$as_echo "$as_me: error: cannot use X directory names containing '" >&2;}
-+ *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
-+echo "$as_me: error: Cannot use X directory names containing '" >&2;}
- { (exit 1); exit 1; }; };; #(
- *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # One or both of the vars are not set, and there is no cached value.
- ac_x_includes=no ac_x_libraries=no
-@@ -20931,7 +20797,7 @@ _ACEOF
- eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
- done
- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-- for ac_extension in a so sl dylib la dll; do
-+ for ac_extension in a so sl; do
- if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
- test -f "$ac_im_libdir/libX11.$ac_extension"; then
- ac_im_usrlibdir=$ac_im_libdir; break
-@@ -20945,7 +20811,7 @@ _ACEOF
- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
- esac
- case $ac_im_usrlibdir in
-- /usr/lib | /usr/lib64 | /lib | /lib64) ;;
-+ /usr/lib | /lib) ;;
- *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
- esac
- fi
-@@ -21006,14 +20872,13 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
-@@ -21021,7 +20886,7 @@ $as_echo "$ac_try_echo") >&5
- # We can compile using X headers with no special include directory.
- ac_x_includes=
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- for ac_dir in $ac_x_header_dirs; do
-@@ -21062,33 +20927,30 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- LIBS=$ac_save_LIBS
- # We can link X programs with no special library path.
- ac_x_libraries=
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- LIBS=$ac_save_LIBS
--for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
-+for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
- do
- # Don't even attempt the hair of trying to link an X program!
-- for ac_extension in a so sl dylib la dll; do
-+ for ac_extension in a so sl; do
- if test -r "$ac_dir/libX11.$ac_extension"; then
- ac_x_libraries=$ac_dir
- break 2
-@@ -21097,7 +20959,6 @@ do
- done
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi # $ac_x_libraries = no
-@@ -21120,8 +20981,8 @@ fi
- fi # $with_x != no
-
- if test "$have_x" != yes; then
-- { $as_echo "$as_me:$LINENO: result: $have_x" >&5
--$as_echo "$have_x" >&6; }
-+ { echo "$as_me:$LINENO: result: $have_x" >&5
-+echo "${ECHO_T}$have_x" >&6; }
- no_x=yes
- else
- # If each of the values was on the command line, it overrides each guess.
-@@ -21131,8 +20992,8 @@ else
- ac_cv_have_x="have_x=yes\
- ac_x_includes='$x_includes'\
- ac_x_libraries='$x_libraries'"
-- { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
--$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
-+ { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
- fi
-
- if test "$no_x" = yes; then
-@@ -21153,8 +21014,8 @@ else
- X_LIBS="$X_LIBS -L$x_libraries"
- # For Solaris; some versions of Sun CC require a space after -R and
- # others require no space. Words are not sufficient . . . .
-- { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
--$as_echo_n "checking whether -R must be followed by a space... " >&6; }
-+ { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-+echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
- ac_xsave_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
-@@ -21179,26 +21040,23 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- X_LIBS="$X_LIBS -R$x_libraries"
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- LIBS="$ac_xsave_LIBS -R $x_libraries"
-@@ -21223,38 +21081,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- X_LIBS="$X_LIBS -R $x_libraries"
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- { $as_echo "$as_me:$LINENO: result: neither works" >&5
--$as_echo "neither works" >&6; }
-+ { echo "$as_me:$LINENO: result: neither works" >&5
-+echo "${ECHO_T}neither works" >&6; }
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- ac_c_werror_flag=$ac_xsave_c_werror_flag
-@@ -21300,30 +21153,27 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- :
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
--$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-+ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet $LIBS"
-@@ -21355,45 +21205,41 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dnet_dnet_ntoa=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dnet_dnet_ntoa=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
--$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
--if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-+if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
- fi
-
- if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
--$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
-+ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet_stub $LIBS"
-@@ -21425,44 +21271,39 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dnet_stub_dnet_ntoa=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dnet_stub_dnet_ntoa=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
--$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
--if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-+if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
- fi
-
- fi
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_xsave_LIBS"
-@@ -21475,10 +21316,10 @@ rm -f core conftest.err conftest.$ac_obj
- # on Irix 5.2, according to T.E. Dickey.
- # The functions gethostbyname, getservbyname, and inet_addr are
- # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-- { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
--$as_echo_n "checking for gethostbyname... " >&6; }
-+ { echo "$as_me:$LINENO: checking for gethostbyname" >&5
-+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
- if test "${ac_cv_func_gethostbyname+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -21531,41 +21372,37 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_gethostbyname=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_gethostbyname=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
--$as_echo "$ac_cv_func_gethostbyname" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
-
- if test $ac_cv_func_gethostbyname = no; then
-- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
--$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-+ { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl $LIBS"
-@@ -21597,45 +21434,41 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_nsl_gethostbyname=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_nsl_gethostbyname=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
--$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
--if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
-+if test $ac_cv_lib_nsl_gethostbyname = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
- fi
-
- if test $ac_cv_lib_nsl_gethostbyname = no; then
-- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
--$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-+ { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
- if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd $LIBS"
-@@ -21667,37 +21500,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_bsd_gethostbyname=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_bsd_gethostbyname=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
--$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
--if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
-+if test $ac_cv_lib_bsd_gethostbyname = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
- fi
-
-@@ -21711,10 +21540,10 @@ fi
- # variants that don't use the name server (or something). -lsocket
- # must be given before -lnsl if both are needed. We assume that
- # if connect needs -lnsl, so does gethostbyname.
-- { $as_echo "$as_me:$LINENO: checking for connect" >&5
--$as_echo_n "checking for connect... " >&6; }
-+ { echo "$as_me:$LINENO: checking for connect" >&5
-+echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
- if test "${ac_cv_func_connect+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -21767,41 +21596,37 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_connect=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_connect=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
--$as_echo "$ac_cv_func_connect" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_connect" >&6; }
-
- if test $ac_cv_func_connect = no; then
-- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
--$as_echo_n "checking for connect in -lsocket... " >&6; }
-+ { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
- if test "${ac_cv_lib_socket_connect+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-@@ -21833,47 +21658,43 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_socket_connect=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_socket_connect=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
--$as_echo "$ac_cv_lib_socket_connect" >&6; }
--if test "x$ac_cv_lib_socket_connect" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
-+if test $ac_cv_lib_socket_connect = yes; then
- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
- fi
-
- fi
-
- # Guillermo Gomez says -lposix is necessary on A/UX.
-- { $as_echo "$as_me:$LINENO: checking for remove" >&5
--$as_echo_n "checking for remove... " >&6; }
-+ { echo "$as_me:$LINENO: checking for remove" >&5
-+echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
- if test "${ac_cv_func_remove+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -21926,41 +21747,37 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_remove=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_remove=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
--$as_echo "$ac_cv_func_remove" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-+echo "${ECHO_T}$ac_cv_func_remove" >&6; }
-
- if test $ac_cv_func_remove = no; then
-- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
--$as_echo_n "checking for remove in -lposix... " >&6; }
-+ { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
- if test "${ac_cv_lib_posix_remove+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lposix $LIBS"
-@@ -21992,47 +21809,43 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_posix_remove=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_posix_remove=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
--$as_echo "$ac_cv_lib_posix_remove" >&6; }
--if test "x$ac_cv_lib_posix_remove" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
-+if test $ac_cv_lib_posix_remove = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
- fi
-
- fi
-
- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-- { $as_echo "$as_me:$LINENO: checking for shmat" >&5
--$as_echo_n "checking for shmat... " >&6; }
-+ { echo "$as_me:$LINENO: checking for shmat" >&5
-+echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
- if test "${ac_cv_func_shmat+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -22085,41 +21898,37 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_shmat=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_shmat=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
--$as_echo "$ac_cv_func_shmat" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-+echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
-
- if test $ac_cv_func_shmat = no; then
-- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
--$as_echo_n "checking for shmat in -lipc... " >&6; }
-+ { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lipc $LIBS"
-@@ -22151,37 +21960,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_ipc_shmat=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_ipc_shmat=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
--$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
--if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
-+if test $ac_cv_lib_ipc_shmat = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
- fi
-
-@@ -22197,10 +22002,10 @@ fi
- # These have to be linked with before -lX11, unlike the other
- # libraries we check for below, so use a different variable.
- # John Interrante, Karl Berry
-- { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
--$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-+ { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-@@ -22232,37 +22037,33 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_ICE_IceConnectionNumber=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_ICE_IceConnectionNumber=no
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
--$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
--if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-+if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
- fi
-
-@@ -22272,8 +22073,8 @@ fi
-
-
- if test x$no_x = xyes ; then
-- { $as_echo "$as_me:$LINENO: WARNING: X development libraries not found" >&5
--$as_echo "$as_me: WARNING: X development libraries not found" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: X development libraries not found" >&5
-+echo "$as_me: WARNING: X development libraries not found" >&2;}
- have_x=false
- else
- X_LIBS="$X_LIBS -lX11"
-@@ -22307,10 +22108,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
- set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
-@@ -22325,7 +22126,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -22337,11 +22138,11 @@ esac
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
-+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -22350,10 +22151,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
- ac_pt_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $ac_pt_PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
-@@ -22368,7 +22169,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -22380,11 +22181,11 @@ esac
- fi
- ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
- if test -n "$ac_pt_PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
--$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test "x$ac_pt_PKG_CONFIG" = x; then
-@@ -22392,8 +22193,12 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
- PKG_CONFIG=$ac_pt_PKG_CONFIG
-@@ -22405,54 +22210,58 @@ fi
- fi
- if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.9.0
-- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
--$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- PKG_CONFIG=""
- fi
-
- fi
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for FONTCONFIG" >&5
--$as_echo_n "checking for FONTCONFIG... " >&6; }
-+{ echo "$as_me:$LINENO: checking for FONTCONFIG" >&5
-+echo $ECHO_N "checking for FONTCONFIG... $ECHO_C" >&6; }
+@@ -19265,10 +19287,11 @@
+ { $as_echo "$as_me:$LINENO: checking for FONTCONFIG" >&5
+ $as_echo_n "checking for FONTCONFIG... " >&6; }
-if test -n "$FONTCONFIG_CFLAGS"; then
- pkg_cv_FONTCONFIG_CFLAGS="$FONTCONFIG_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 1.0.1\"") >&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$FONTCONFIG_CFLAGS"; then
+ pkg_cv_FONTCONFIG_CFLAGS="$FONTCONFIG_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 1.0.1\"") >&5
- ($PKG_CONFIG --exists --print-errors "fontconfig >= 1.0.1") 2>&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.5.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "fontconfig >= 2.5.0") 2>&5
ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig >= 1.0.1" 2>/dev/null`
+@@ -19278,13 +19301,15 @@
else
pkg_failed=yes
fi
@@ -9354,19 +644,15 @@
- pkg_cv_FONTCONFIG_LIBS="$FONTCONFIG_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 1.0.1\"") >&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$FONTCONFIG_LIBS"; then
+ pkg_cv_FONTCONFIG_LIBS="$FONTCONFIG_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 1.0.1\"") >&5
- ($PKG_CONFIG --exists --print-errors "fontconfig >= 1.0.1") 2>&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.5.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "fontconfig >= 2.5.0") 2>&5
ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig >= 1.0.1" 2>/dev/null`
+@@ -19294,8 +19319,9 @@
else
pkg_failed=yes
fi
@@ -9378,68 +664,35 @@
fi
-@@ -22465,25 +22274,25 @@ else
+@@ -19308,9 +19334,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
-- FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fontconfig >= 1.0.1" 2>&1`
-+ FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "fontconfig >= 1.0.1"`
+- FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fontconfig >= 2.5.0" 2>&1`
++ FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "fontconfig >= 2.5.0"`
else
-- FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --print-errors "fontconfig >= 1.0.1" 2>&1`
-+ FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fontconfig >= 1.0.1"`
+- FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --print-errors "fontconfig >= 2.5.0" 2>&1`
++ FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fontconfig >= 2.5.0"`
fi
# Put the nasty error message in config.log where it belongs
echo "$FONTCONFIG_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- elif test $pkg_failed = untried; then
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- else
- FONTCONFIG_CFLAGS=$pkg_cv_FONTCONFIG_CFLAGS
- FONTCONFIG_LIBS=$pkg_cv_FONTCONFIG_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- have_fontconfig=true
- fi
-
-@@ -22495,40 +22304,44 @@ if $have_fontconfig ; then
- # enough for all the functions we use I guess. No version check needed.
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for FREETYPE" >&5
--$as_echo_n "checking for FREETYPE... " >&6; }
-+{ echo "$as_me:$LINENO: checking for FREETYPE" >&5
-+echo $ECHO_N "checking for FREETYPE... $ECHO_C" >&6; }
+@@ -19341,10 +19367,11 @@
+ { $as_echo "$as_me:$LINENO: checking for FREETYPE" >&5
+ $as_echo_n "checking for FREETYPE... " >&6; }
-if test -n "$FREETYPE_CFLAGS"; then
- pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"freetype2\"") >&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$FREETYPE_CFLAGS"; then
+ pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"freetype2\"") >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"freetype2\"") >&5
($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2" 2>/dev/null`
+@@ -19354,13 +19381,15 @@
else
pkg_failed=yes
fi
@@ -9453,19 +706,15 @@
- pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"freetype2\"") >&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$FREETYPE_LIBS"; then
+ pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"freetype2\"") >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"freetype2\"") >&5
($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2" 2>/dev/null`
+@@ -19370,8 +19399,9 @@
else
pkg_failed=yes
fi
@@ -9477,7 +726,7 @@
fi
-@@ -22541,25 +22354,25 @@ else
+@@ -19384,9 +19414,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9489,56 +738,23 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$FREETYPE_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- elif test $pkg_failed = untried; then
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- else
- FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS
- FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- have_freetype=true
- fi
- fi
-@@ -22588,40 +22401,44 @@ fi
- if $have_x && $have_freetype ; then
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for XFT" >&5
--$as_echo_n "checking for XFT... " >&6; }
-+{ echo "$as_me:$LINENO: checking for XFT" >&5
-+echo $ECHO_N "checking for XFT... $ECHO_C" >&6; }
+@@ -19434,10 +19464,11 @@
+ { $as_echo "$as_me:$LINENO: checking for XFT" >&5
+ $as_echo_n "checking for XFT... " >&6; }
-if test -n "$XFT_CFLAGS"; then
- pkg_cv_XFT_CFLAGS="$XFT_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xft >= 2.0.0 xrender\"") >&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XFT_CFLAGS"; then
+ pkg_cv_XFT_CFLAGS="$XFT_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xft >= 2.0.0 xrender\"") >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xft >= 2.0.0 xrender\"") >&5
($PKG_CONFIG --exists --print-errors "xft >= 2.0.0 xrender") 2>&5
ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft >= 2.0.0 xrender" 2>/dev/null`
+@@ -19447,13 +19478,15 @@
else
pkg_failed=yes
fi
@@ -9552,19 +768,15 @@
- pkg_cv_XFT_LIBS="$XFT_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xft >= 2.0.0 xrender\"") >&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XFT_LIBS"; then
+ pkg_cv_XFT_LIBS="$XFT_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xft >= 2.0.0 xrender\"") >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xft >= 2.0.0 xrender\"") >&5
($PKG_CONFIG --exists --print-errors "xft >= 2.0.0 xrender") 2>&5
ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_XFT_LIBS=`$PKG_CONFIG --libs "xft >= 2.0.0 xrender" 2>/dev/null`
+@@ -19463,8 +19496,9 @@
else
pkg_failed=yes
fi
@@ -9576,7 +788,7 @@
fi
-@@ -22634,25 +22451,25 @@ else
+@@ -19477,9 +19511,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9588,253 +800,23 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$XFT_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- elif test $pkg_failed = untried; then
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- else
- XFT_CFLAGS=$pkg_cv_XFT_CFLAGS
- XFT_LIBS=$pkg_cv_XFT_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- have_xft=true
- fi
- fi
-@@ -22706,8 +22523,8 @@ fi
- if test "$pango_os_win32" = "yes"; then
- if test x"$GCC" = xyes; then
- msnative_struct=''
-- { $as_echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5
--$as_echo_n "checking how to get MSVC-compatible struct packing... " >&6; }
-+ { echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5
-+echo $ECHO_N "checking how to get MSVC-compatible struct packing... $ECHO_C" >&6; }
- if test -z "$ac_cv_prog_CC"; then
- our_gcc="$CC"
- else
-@@ -22726,14 +22543,14 @@ $as_echo_n "checking how to get MSVC-com
- ;;
- esac
- if test x"$msnative_struct" = x ; then
-- { $as_echo "$as_me:$LINENO: result: no way" >&5
--$as_echo "no way" >&6; }
-- { $as_echo "$as_me:$LINENO: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&5
--$as_echo "$as_me: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&2;}
-+ { echo "$as_me:$LINENO: result: no way" >&5
-+echo "${ECHO_T}no way" >&6; }
-+ { echo "$as_me:$LINENO: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&5
-+echo "$as_me: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&2;}
- else
- CFLAGS="$CFLAGS $msnative_struct"
-- { $as_echo "$as_me:$LINENO: result: ${msnative_struct}" >&5
--$as_echo "${msnative_struct}" >&6; }
-+ { echo "$as_me:$LINENO: result: ${msnative_struct}" >&5
-+echo "${ECHO_T}${msnative_struct}" >&6; }
- fi
- fi
- fi
-@@ -22742,17 +22559,17 @@ fi
- # Checks for ATSUI
- #
- if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
-- { $as_echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
--$as_echo_n "checking for Carbon/Carbon.h... " >&6; }
-+ { echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
-+echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5
--$as_echo "$ac_cv_header_Carbon_Carbon_h" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5
-+echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6; }
- else
- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking Carbon/Carbon.h usability" >&5
--$as_echo_n "checking Carbon/Carbon.h usability... " >&6; }
-+{ echo "$as_me:$LINENO: checking Carbon/Carbon.h usability" >&5
-+echo $ECHO_N "checking Carbon/Carbon.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -22768,33 +22585,32 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--{ $as_echo "$as_me:$LINENO: checking Carbon/Carbon.h presence" >&5
--$as_echo_n "checking Carbon/Carbon.h presence... " >&6; }
-+{ echo "$as_me:$LINENO: checking Carbon/Carbon.h presence" >&5
-+echo $ECHO_N "checking Carbon/Carbon.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -22808,52 +22624,51 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
- fi
-
- rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
-- { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: Carbon/Carbon.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: Carbon/Carbon.h: proceeding with the compiler's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: Carbon/Carbon.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: Carbon/Carbon.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: Carbon/Carbon.h: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: Carbon/Carbon.h: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: Carbon/Carbon.h: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: Carbon/Carbon.h: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: Carbon/Carbon.h: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: Carbon/Carbon.h: in the future, the compiler will take precedence" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: Carbon/Carbon.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: Carbon/Carbon.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: Carbon/Carbon.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: Carbon/Carbon.h: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: Carbon/Carbon.h: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: Carbon/Carbon.h: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
- ## -------------------------------------------------------------------- ##
- ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=pango ##
-@@ -22862,18 +22677,18 @@ _ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
--$as_echo_n "checking for Carbon/Carbon.h... " >&6; }
-+{ echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
-+echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_Carbon_Carbon_h=$ac_header_preproc
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5
--$as_echo "$ac_cv_header_Carbon_Carbon_h" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5
-+echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6; }
-
- fi
--if test "x$ac_cv_header_Carbon_Carbon_h" = x""yes; then
-+if test $ac_cv_header_Carbon_Carbon_h = yes; then
- have_atsui=true
- else
- have_atsui=false
-@@ -22896,40 +22711,44 @@ cairo_required=1.7.6
-
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for CAIRO" >&5
--$as_echo_n "checking for CAIRO... " >&6; }
-+{ echo "$as_me:$LINENO: checking for CAIRO" >&5
-+echo $ECHO_N "checking for CAIRO... $ECHO_C" >&6; }
+@@ -19742,10 +19776,11 @@
+ { $as_echo "$as_me:$LINENO: checking for CAIRO" >&5
+ $as_echo_n "checking for CAIRO... " >&6; }
-if test -n "$CAIRO_CFLAGS"; then
- pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo >= \$cairo_required\"") >&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$CAIRO_CFLAGS"; then
+ pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo >= \$cairo_required\"") >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo >= \$cairo_required\"") >&5
($PKG_CONFIG --exists --print-errors "cairo >= $cairo_required") 2>&5
ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $cairo_required" 2>/dev/null`
+@@ -19755,13 +19790,15 @@
else
pkg_failed=yes
fi
@@ -9848,19 +830,15 @@
- pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo >= \$cairo_required\"") >&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$CAIRO_LIBS"; then
+ pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo >= \$cairo_required\"") >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo >= \$cairo_required\"") >&5
($PKG_CONFIG --exists --print-errors "cairo >= $cairo_required") 2>&5
ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= $cairo_required" 2>/dev/null`
+@@ -19771,8 +19808,9 @@
else
pkg_failed=yes
fi
@@ -9872,7 +850,7 @@
fi
-@@ -22942,25 +22761,25 @@ else
+@@ -19785,9 +19823,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9884,184 +862,23 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$CAIRO_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- elif test $pkg_failed = untried; then
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- else
- CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS
- CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- have_cairo=true
- fi
-
-@@ -22977,10 +22796,10 @@ if $have_cairo ; then
-
- if $have_freetype; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-ft >= \$cairo_required\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-ft >= \$cairo_required\"") >&5
- ($PKG_CONFIG --exists --print-errors "cairo-ft >= $cairo_required") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- have_cairo_freetype=true
- else
-@@ -22999,10 +22818,10 @@ _ACEOF
-
- if $have_win32; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-win32 >= \$cairo_required\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-win32 >= \$cairo_required\"") >&5
- ($PKG_CONFIG --exists --print-errors "cairo-win32 >= $cairo_required") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- have_cairo_win32=true
- else
-@@ -23021,10 +22840,10 @@ _ACEOF
-
- if $have_atsui; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-quartz-font >= \$cairo_required\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-quartz-font >= \$cairo_required\"") >&5
- ($PKG_CONFIG --exists --print-errors "cairo-quartz-font >= $cairo_required") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- have_cairo_atsui=true
- else
-@@ -23041,16 +22860,16 @@ _ACEOF
- have_cairo=true
- fi
-
-- { $as_echo "$as_me:$LINENO: checking which cairo font backends could be used" >&5
--$as_echo_n "checking which cairo font backends could be used... " >&6; }
-+ { echo "$as_me:$LINENO: checking which cairo font backends could be used" >&5
-+echo $ECHO_N "checking which cairo font backends could be used... $ECHO_C" >&6; }
- if $have_cairo ; then
-- { $as_echo "$as_me:$LINENO: result: $cairo_font_backends" >&5
--$as_echo "$cairo_font_backends" >&6; }
-+ { echo "$as_me:$LINENO: result: $cairo_font_backends" >&5
-+echo "${ECHO_T}$cairo_font_backends" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: none" >&5
--$as_echo "none" >&6; }
-- { $as_echo "$as_me:$LINENO: Disabling cairo support" >&5
--$as_echo "$as_me: Disabling cairo support" >&6;}
-+ { echo "$as_me:$LINENO: result: none" >&5
-+echo "${ECHO_T}none" >&6; }
-+ { echo "$as_me:$LINENO: Disabling cairo support" >&5
-+echo "$as_me: Disabling cairo support" >&6;}
- fi
-
- if $have_cairo ; then
-@@ -23061,10 +22880,10 @@ _ACEOF
-
-
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-png >= \$cairo_required\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-png >= \$cairo_required\"") >&5
- ($PKG_CONFIG --exists --print-errors "cairo-png >= $cairo_required") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- have_cairo_png=true
- else
-@@ -23079,10 +22898,10 @@ _ACEOF
- fi
-
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-ps >= \$cairo_required\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-ps >= \$cairo_required\"") >&5
- ($PKG_CONFIG --exists --print-errors "cairo-ps >= $cairo_required") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- have_cairo_ps=true
- else
-@@ -23097,10 +22916,10 @@ _ACEOF
- fi
-
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-pdf >= \$cairo_required\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-pdf >= \$cairo_required\"") >&5
- ($PKG_CONFIG --exists --print-errors "cairo-pdf >= $cairo_required") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- have_cairo_pdf=true
- else
-@@ -23115,10 +22934,10 @@ _ACEOF
- fi
-
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-xlib >= \$cairo_required\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-xlib >= \$cairo_required\"") >&5
- ($PKG_CONFIG --exists --print-errors "cairo-xlib >= $cairo_required") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- have_cairo_xlib=true
- else
-@@ -23209,9 +23028,9 @@ fi
- # patch to fix that rule. :-)
- #
- if $have_freetype || $have_x || $have_xft || $have_cairo || $have_win32 ; then : ; else
-- { { $as_echo "$as_me:$LINENO: error: *** Could not enable any of FreeType, X11, Cairo, or Win32 backends.
-+ { { echo "$as_me:$LINENO: error: *** Could not enable any of FreeType, X11, Cairo, or Win32 backends.
- *** Must have at least one backend to build Pango." >&5
--$as_echo "$as_me: error: *** Could not enable any of FreeType, X11, Cairo, or Win32 backends.
-+echo "$as_me: error: *** Could not enable any of FreeType, X11, Cairo, or Win32 backends.
- *** Must have at least one backend to build Pango." >&2;}
- { (exit 1); exit 1; }; }
- fi
-@@ -23224,40 +23043,44 @@ GLIB_MODULES="glib-2.0 >= $GLIB_REQUIRED
-
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5
--$as_echo_n "checking for GLIB... " >&6; }
-+{ echo "$as_me:$LINENO: checking for GLIB" >&5
-+echo $ECHO_N "checking for GLIB... $ECHO_C" >&6; }
+@@ -20070,10 +20108,11 @@
+ { $as_echo "$as_me:$LINENO: checking for GLIB" >&5
+ $as_echo_n "checking for GLIB... " >&6; }
-if test -n "$GLIB_CFLAGS"; then
- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLIB_MODULES\"") >&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GLIB_CFLAGS"; then
+ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLIB_MODULES\"") >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLIB_MODULES\"") >&5
($PKG_CONFIG --exists --print-errors "$GLIB_MODULES") 2>&5
ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "$GLIB_MODULES" 2>/dev/null`
+@@ -20083,13 +20122,15 @@
else
pkg_failed=yes
fi
@@ -10075,19 +892,15 @@
- pkg_cv_GLIB_LIBS="$GLIB_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLIB_MODULES\"") >&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GLIB_LIBS"; then
+ pkg_cv_GLIB_LIBS="$GLIB_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLIB_MODULES\"") >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLIB_MODULES\"") >&5
($PKG_CONFIG --exists --print-errors "$GLIB_MODULES") 2>&5
ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "$GLIB_MODULES" 2>/dev/null`
+@@ -20099,8 +20140,9 @@
else
pkg_failed=yes
fi
@@ -10099,7 +912,7 @@
fi
-@@ -23270,35 +23093,35 @@ else
+@@ -20113,9 +20155,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -10111,66 +924,23 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$GLIB_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- { { $as_echo "$as_me:$LINENO: error:
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ { { echo "$as_me:$LINENO: error:
- *** Glib $GLIB_REQUIRED_VERSION or better is required. The latest version of
- *** Glib is always available from ftp://ftp.gtk.org/." >&5
--$as_echo "$as_me: error:
-+echo "$as_me: error:
- *** Glib $GLIB_REQUIRED_VERSION or better is required. The latest version of
- *** Glib is always available from ftp://ftp.gtk.org/." >&2;}
- { (exit 1); exit 1; }; }
- elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$LINENO: error:
-+ { { echo "$as_me:$LINENO: error:
- *** Glib $GLIB_REQUIRED_VERSION or better is required. The latest version of
- *** Glib is always available from ftp://ftp.gtk.org/." >&5
--$as_echo "$as_me: error:
-+echo "$as_me: error:
- *** Glib $GLIB_REQUIRED_VERSION or better is required. The latest version of
- *** Glib is always available from ftp://ftp.gtk.org/." >&2;}
- { (exit 1); exit 1; }; }
- else
- GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
- GLIB_LIBS=$pkg_cv_GLIB_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- :
- fi
-
-@@ -23320,40 +23143,44 @@ have_libthai=false
- LIBTHAI_REQUIRED_VERSION=0.1.9
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for LIBTHAI" >&5
--$as_echo_n "checking for LIBTHAI... " >&6; }
-+{ echo "$as_me:$LINENO: checking for LIBTHAI" >&5
-+echo $ECHO_N "checking for LIBTHAI... $ECHO_C" >&6; }
+@@ -20166,10 +20208,11 @@
+ { $as_echo "$as_me:$LINENO: checking for LIBTHAI" >&5
+ $as_echo_n "checking for LIBTHAI... " >&6; }
-if test -n "$LIBTHAI_CFLAGS"; then
- pkg_cv_LIBTHAI_CFLAGS="$LIBTHAI_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libthai >= \$LIBTHAI_REQUIRED_VERSION\"") >&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBTHAI_CFLAGS"; then
+ pkg_cv_LIBTHAI_CFLAGS="$LIBTHAI_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libthai >= \$LIBTHAI_REQUIRED_VERSION\"") >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libthai >= \$LIBTHAI_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "libthai >= $LIBTHAI_REQUIRED_VERSION") 2>&5
ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_LIBTHAI_CFLAGS=`$PKG_CONFIG --cflags "libthai >= $LIBTHAI_REQUIRED_VERSION" 2>/dev/null`
+@@ -20179,13 +20222,15 @@
else
pkg_failed=yes
fi
@@ -10184,19 +954,15 @@
- pkg_cv_LIBTHAI_LIBS="$LIBTHAI_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libthai >= \$LIBTHAI_REQUIRED_VERSION\"") >&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBTHAI_LIBS"; then
+ pkg_cv_LIBTHAI_LIBS="$LIBTHAI_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libthai >= \$LIBTHAI_REQUIRED_VERSION\"") >&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libthai >= \$LIBTHAI_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "libthai >= $LIBTHAI_REQUIRED_VERSION") 2>&5
ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_LIBTHAI_LIBS=`$PKG_CONFIG --libs "libthai >= $LIBTHAI_REQUIRED_VERSION" 2>/dev/null`
+@@ -20195,8 +20240,9 @@
else
pkg_failed=yes
fi
@@ -10208,7 +974,7 @@
fi
-@@ -23366,25 +23193,25 @@ else
+@@ -20209,9 +20255,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -10220,2844 +986,237 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBTHAI_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- elif test $pkg_failed = untried; then
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
+@@ -20240,10 +20286,11 @@
+ { $as_echo "$as_me:$LINENO: checking for INTROSPECTION" >&5
+ $as_echo_n "checking for INTROSPECTION... " >&6; }
+
+-if test -n "$INTROSPECTION_CFLAGS"; then
+- pkg_cv_INTROSPECTION_CFLAGS="$INTROSPECTION_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$INTROSPECTION_CFLAGS"; then
++ pkg_cv_INTROSPECTION_CFLAGS="$INTROSPECTION_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.2\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.2") 2>&5
+ ac_status=$?
+@@ -20253,13 +20300,15 @@
else
- LIBTHAI_CFLAGS=$pkg_cv_LIBTHAI_CFLAGS
- LIBTHAI_LIBS=$pkg_cv_LIBTHAI_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- have_libthai=true
- fi
-
-@@ -23410,8 +23237,8 @@ all_modules="$arabic_modules,$basic_modu
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$INTROSPECTION_LIBS"; then
+- pkg_cv_INTROSPECTION_LIBS="$INTROSPECTION_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$INTROSPECTION_LIBS"; then
++ pkg_cv_INTROSPECTION_LIBS="$INTROSPECTION_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.2\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.2") 2>&5
+ ac_status=$?
+@@ -20269,8 +20318,9 @@
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -20283,9 +20333,9 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-introspection-1.0 >= 0.6.2" 2>&1`
++ INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gobject-introspection-1.0 >= 0.6.2"`
+ else
+- INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-introspection-1.0 >= 0.6.2" 2>&1`
++ INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gobject-introspection-1.0 >= 0.6.2"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$INTROSPECTION_PKG_ERRORS" >&5
+@@ -23709,16 +23759,7 @@
+
+
+ case $ac_file$ac_mode in
+- "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
+-# are listed without --file. Let's play safe and only enable the eval
+-# if we detect the quoting.
+-case $CONFIG_FILES in
+-*\'*) eval set x "$CONFIG_FILES" ;;
+-*) set x $CONFIG_FILES ;;
+-esac
+-shift
+-for mf
+-do
++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/docs/Makefile.in pango1.0-1.24.0/docs/Makefile.in
+--- pango1.0-1.24.0.old/docs/Makefile.in 2009-03-16 23:35:01.000000000 +0100
++++ pango1.0-1.24.0/docs/Makefile.in 2009-03-22 14:58:12.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -367,8 +367,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -411,8 +411,8 @@
+ esac; \
+ done; \
+ for i in $$list; do \
+- if test -f $$i; then file=$$i; \
+- else file=$(srcdir)/$$i; fi; \
++ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
++ else file=$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 1*) ;; \
+@@ -453,7 +453,7 @@
+
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -464,7 +464,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -476,7 +476,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -490,36 +490,23 @@
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/examples/Makefile.in pango1.0-1.24.0/examples/Makefile.in
+--- pango1.0-1.24.0.old/examples/Makefile.in 2009-03-16 23:35:01.000000000 +0100
++++ pango1.0-1.24.0/examples/Makefile.in 2009-03-22 14:58:12.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -285,8 +285,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -369,7 +369,7 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/ltmain.sh pango1.0-1.24.0/ltmain.sh
+--- pango1.0-1.24.0.old/ltmain.sh 2009-02-07 00:50:08.000000000 +0100
++++ pango1.0-1.24.0/ltmain.sh 2009-03-22 14:58:08.000000000 +0100
+@@ -65,7 +65,7 @@
+ # compiler: $LTCC
+ # compiler flags: $LTCFLAGS
+ # linker: $LD (gnu? $with_gnu_ld)
+-# $progname: (GNU libtool) 2.2.6
++# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1
+ # automake: $automake_version
+ # autoconf: $autoconf_version
#
- # Allow building some or all modules included
- #
--{ $as_echo "$as_me:$LINENO: checking modules to link statically" >&5
--$as_echo_n "checking modules to link statically... " >&6; }
-+{ echo "$as_me:$LINENO: checking modules to link statically" >&5
-+echo $ECHO_N "checking modules to link statically... $ECHO_C" >&6; }
-
-
- # Check whether --with-included_modules was given.
-@@ -23426,8 +23253,8 @@ case x$with_included_modules in
- xno|x) included_modules="" ;;
- *) included_modules=$with_included_modules ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $included_modules" >&5
--$as_echo "$included_modules" >&6; }
-+{ echo "$as_me:$LINENO: result: $included_modules" >&5
-+echo "${ECHO_T}$included_modules" >&6; }
- if test "x$included_modules" != x; then
- HAVE_INCLUDED_MODULES_TRUE=
- HAVE_INCLUDED_MODULES_FALSE='#'
-@@ -23440,8 +23267,8 @@ fi
- #
- # Allow building only some or none of modules dynamic
- #
--{ $as_echo "$as_me:$LINENO: checking dynamic modules to build" >&5
--$as_echo_n "checking dynamic modules to build... " >&6; }
-+{ echo "$as_me:$LINENO: checking dynamic modules to build" >&5
-+echo $ECHO_N "checking dynamic modules to build... $ECHO_C" >&6; }
-
-
- # Check whether --with-dynamic_modules was given.
-@@ -23456,8 +23283,8 @@ case x$with_dynamic_modules in
- xno) dynamic_modules="" ;;
- *) dynamic_modules=$with_dynamic_modules ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $dynamic_modules (those built into Pango will be excluded)" >&5
--$as_echo "$dynamic_modules (those built into Pango will be excluded)" >&6; }
-+{ echo "$as_me:$LINENO: result: $dynamic_modules (those built into Pango will be excluded)" >&5
-+echo "${ECHO_T}$dynamic_modules (those built into Pango will be excluded)" >&6; }
- if test "x$dynamic_modules" != x; then
- HAVE_DYNAMIC_MODULES_TRUE=
- HAVE_DYNAMIC_MODULES_FALSE='#'
-@@ -23494,8 +23321,8 @@ for module in $included_modules; do
- *-win32) INCLUDED_WIN32_MODULES="$INCLUDED_WIN32_MODULES $included_path" ;;
- *-atsui) INCLUDED_ATSUI_MODULES="$INCLUDED_ATSUI_MODULES $included_path" ;;
- *-lang) INCLUDED_LANG_MODULES="$INCLUDED_LANG_MODULES $included_path" ;;
-- *) { { $as_echo "$as_me:$LINENO: error: specified module $module not recognized" >&5
--$as_echo "$as_me: error: specified module $module not recognized" >&2;}
-+ *) { { echo "$as_me:$LINENO: error: specified module $module not recognized" >&5
-+echo "$as_me: error: specified module $module not recognized" >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
- done
-@@ -23751,11 +23578,11 @@ fi
-
- for ac_func in flockfile strtok_r
- do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -23808,42 +23635,35 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -23853,8 +23673,8 @@ done
-
- if $have_cairo ; then : ; else
- if test x$enable_gtk_doc = xyes ; then
-- { $as_echo "$as_me:$LINENO: WARNING: Cairo not present, disabling doc building" >&5
--$as_echo "$as_me: WARNING: Cairo not present, disabling doc building" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: Cairo not present, disabling doc building" >&5
-+echo "$as_me: WARNING: Cairo not present, disabling doc building" >&2;}
- enable_gtk_doc=no
- fi
- fi
-@@ -23881,32 +23701,32 @@ fi
-
- if test x$enable_gtk_doc = xyes; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\"") >&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- :
- else
-- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&5
--$as_echo "$as_me: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&2;}
-+ { { echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&5
-+echo "$as_me: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
-
-- { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5
--$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
-- { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5
--$as_echo "$enable_gtk_doc" >&6; }
-+ { echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5
-+echo $ECHO_N "checking whether to build gtk-doc documentation... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5
-+echo "${ECHO_T}$enable_gtk_doc" >&6; }
-
- for ac_prog in gtkdoc-check
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $GTKDOC_CHECK in
- [\\/]* | ?:[\\/]*)
-@@ -23921,7 +23741,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -23933,11 +23753,11 @@ esac
- fi
- GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
- if test -n "$GTKDOC_CHECK"; then
-- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
--$as_echo "$GTKDOC_CHECK" >&6; }
-+ { echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
-+echo "${ECHO_T}$GTKDOC_CHECK" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -23974,10 +23794,10 @@ fi
- if test "x$enable_man" != xno ; then
- # Extract the first word of "xsltproc", so it can be a program name with args.
- set dummy xsltproc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_XSLTPROC+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $XSLTPROC in
- [\\/]* | ?:[\\/]*)
-@@ -23992,7 +23812,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -24004,11 +23824,11 @@ esac
- fi
- XSLTPROC=$ac_cv_path_XSLTPROC
- if test -n "$XSLTPROC"; then
-- { $as_echo "$as_me:$LINENO: result: $XSLTPROC" >&5
--$as_echo "$XSLTPROC" >&6; }
-+ { echo "$as_me:$LINENO: result: $XSLTPROC" >&5
-+echo "${ECHO_T}$XSLTPROC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -24031,24 +23851,24 @@ fi
- jh_found_xmlcatalog=true
- XML_CATALOG_FILE="$with_xml_catalog"
-
-- { $as_echo "$as_me:$LINENO: checking for XML catalog ($XML_CATALOG_FILE)" >&5
--$as_echo_n "checking for XML catalog ($XML_CATALOG_FILE)... " >&6; }
-+ { echo "$as_me:$LINENO: checking for XML catalog ($XML_CATALOG_FILE)" >&5
-+echo $ECHO_N "checking for XML catalog ($XML_CATALOG_FILE)... $ECHO_C" >&6; }
- if test -f "$XML_CATALOG_FILE"; then
-- { $as_echo "$as_me:$LINENO: result: found" >&5
--$as_echo "found" >&6; }
-+ { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
- else
- jh_found_xmlcatalog=false
-- { $as_echo "$as_me:$LINENO: result: not found" >&5
--$as_echo "not found" >&6; }
-+ { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- fi
-
- # check for the xmlcatalog program
- # Extract the first word of "xmlcatalog", so it can be a program name with args.
- set dummy xmlcatalog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_XMLCATALOG+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $XMLCATALOG in
- [\\/]* | ?:[\\/]*)
-@@ -24063,7 +23883,7 @@ do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_XMLCATALOG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
-@@ -24076,11 +23896,11 @@ esac
- fi
- XMLCATALOG=$ac_cv_path_XMLCATALOG
- if test -n "$XMLCATALOG"; then
-- { $as_echo "$as_me:$LINENO: result: $XMLCATALOG" >&5
--$as_echo "$XMLCATALOG" >&6; }
-+ { echo "$as_me:$LINENO: result: $XMLCATALOG" >&5
-+echo "${ECHO_T}$XMLCATALOG" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -24095,36 +23915,36 @@ fi
- fi
-
-
-- { $as_echo "$as_me:$LINENO: checking for DocBook XML DTD V4.1.2 in XML catalog" >&5
--$as_echo_n "checking for DocBook XML DTD V4.1.2 in XML catalog... " >&6; }
-+ { echo "$as_me:$LINENO: checking for DocBook XML DTD V4.1.2 in XML catalog" >&5
-+echo $ECHO_N "checking for DocBook XML DTD V4.1.2 in XML catalog... $ECHO_C" >&6; }
- if $jh_found_xmlcatalog && \
-- { ($as_echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"-//OASIS//DTD DocBook XML V4.1.2//EN\" >&2") >&5
-+ { (echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"-//OASIS//DTD DocBook XML V4.1.2//EN\" >&2") >&5
- ($XMLCATALOG --noout "$XML_CATALOG_FILE" "-//OASIS//DTD DocBook XML V4.1.2//EN" >&2) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- { $as_echo "$as_me:$LINENO: result: found" >&5
--$as_echo "found" >&6; }
-+ { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: not found" >&5
--$as_echo "not found" >&6; }
-+ { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- enable_man=no
- fi
-
-
-- { $as_echo "$as_me:$LINENO: checking for DocBook XSL Stylesheets in XML catalog" >&5
--$as_echo_n "checking for DocBook XSL Stylesheets in XML catalog... " >&6; }
-+ { echo "$as_me:$LINENO: checking for DocBook XSL Stylesheets in XML catalog" >&5
-+echo $ECHO_N "checking for DocBook XSL Stylesheets in XML catalog... $ECHO_C" >&6; }
- if $jh_found_xmlcatalog && \
-- { ($as_echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl\" >&2") >&5
-+ { (echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl\" >&2") >&5
- ($XMLCATALOG --noout "$XML_CATALOG_FILE" "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" >&2) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- { $as_echo "$as_me:$LINENO: result: found" >&5
--$as_echo "found" >&6; }
-+ { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: not found" >&5
--$as_echo "not found" >&6; }
-+ { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- enable_man=no
- fi
-
-@@ -24204,8 +24024,8 @@ else
- fi
-
-
--{ $as_echo "$as_me:$LINENO: checking Whether to write dependencies into .pc files" >&5
--$as_echo_n "checking Whether to write dependencies into .pc files... " >&6; }
-+{ echo "$as_me:$LINENO: checking Whether to write dependencies into .pc files" >&5
-+echo $ECHO_N "checking Whether to write dependencies into .pc files... $ECHO_C" >&6; }
- case $enable_explicit_deps in
- auto)
- export SED
-@@ -24218,13 +24038,13 @@ case $enable_explicit_deps in
- ;;
- yes|no)
- ;;
-- *) { { $as_echo "$as_me:$LINENO: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&5
--$as_echo "$as_me: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&2;}
-+ *) { { echo "$as_me:$LINENO: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&5
-+echo "$as_me: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&2;}
- { (exit 1); exit 1; }; }
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5
--$as_echo "$enable_explicit_deps" >&6; }
-+{ echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5
-+echo "${ECHO_T}$enable_explicit_deps" >&6; }
-
- PKGCONFIG_MATH_LIBS=
- PKGCONFIG_CAIRO_REQUIRES=
-@@ -24279,11 +24099,11 @@ ac_config_commands="$ac_config_commands
-
- ac_header_dirent=no
- for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-- as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
--$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-+ as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-+echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -24309,21 +24129,20 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Header=no"
-@@ -24331,15 +24150,12 @@ fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
- _ACEOF
-
- ac_header_dirent=$ac_hdr; break
-@@ -24348,10 +24164,10 @@ fi
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
-- { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
--$as_echo_n "checking for library containing opendir... " >&6; }
-+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
- if test "${ac_cv_search_opendir+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
- cat >conftest.$ac_ext <<_ACEOF
-@@ -24389,30 +24205,26 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_search_opendir=$ac_res
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext
- if test "${ac_cv_search_opendir+set}" = set; then
-@@ -24427,8 +24239,8 @@ fi
- rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
--$as_echo "$ac_cv_search_opendir" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
- ac_res=$ac_cv_search_opendir
- if test "$ac_res" != no; then
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -24436,10 +24248,10 @@ if test "$ac_res" != no; then
- fi
-
- else
-- { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
--$as_echo_n "checking for library containing opendir... " >&6; }
-+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
- if test "${ac_cv_search_opendir+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
- cat >conftest.$ac_ext <<_ACEOF
-@@ -24477,30 +24289,26 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_search_opendir=$ac_res
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
-
--rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext
- if test "${ac_cv_search_opendir+set}" = set; then
-@@ -24515,8 +24323,8 @@ fi
- rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
--$as_echo "$ac_cv_search_opendir" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
- ac_res=$ac_cv_search_opendir
- if test "$ac_res" != no; then
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -24528,21 +24336,20 @@ fi
-
- for ac_header in unistd.h
- do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -24558,33 +24365,32 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -24598,52 +24404,51 @@ case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
- fi
-
- rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
- ## -------------------------------------------------------------------- ##
- ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=pango ##
-@@ -24652,24 +24457,21 @@ _ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -24715,12 +24517,11 @@ _ACEOF
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
-- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
--$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
-- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) $as_unset $ac_var ;;
- esac ;;
- esac
-@@ -24753,12 +24554,12 @@ $as_echo "$as_me: WARNING: cache variabl
- if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
- if test -w "$cache_file"; then
- test "x$cache_file" != "x/dev/null" &&
-- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
--$as_echo "$as_me: updating cache $cache_file" >&6;}
-+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
- else
-- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
--$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
- fi
- fi
- rm -f confcache
-@@ -24774,7 +24575,7 @@ ac_ltlibobjs=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
- # 1. Remove the extension, and $U if already installed.
- ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-- ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-+ ac_i=`echo "$ac_i" | sed "$ac_script"`
- # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
- # will be set to the directory where LIBOBJS objects are built.
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-@@ -24786,412 +24587,411 @@ LTLIBOBJS=$ac_ltlibobjs
-
-
- if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"OS_WIN32\" was never defined.
-+echo "$as_me: error: conditional \"OS_WIN32\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
-+echo "$as_me: error: conditional \"AMDEP\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_CXX_TRUE}" && test -z "${HAVE_CXX_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CXX\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CXX\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_CXX\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_CXX\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined.
-+echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${MS_LIB_AVAILABLE_TRUE}" && test -z "${MS_LIB_AVAILABLE_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"MS_LIB_AVAILABLE\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"MS_LIB_AVAILABLE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"MS_LIB_AVAILABLE\" was never defined.
-+echo "$as_me: error: conditional \"MS_LIB_AVAILABLE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined.
-+echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_X_TRUE}" && test -z "${HAVE_X_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_X\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_X\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_X\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_X\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_FREETYPE_TRUE}" && test -z "${HAVE_FREETYPE_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_FREETYPE\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_FREETYPE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_FREETYPE\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_FREETYPE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_XFT_TRUE}" && test -z "${HAVE_XFT_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XFT\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_XFT\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_XFT\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_XFT\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_WIN32_TRUE}" && test -z "${HAVE_WIN32_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_WIN32\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_WIN32\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_WIN32\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_WIN32\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_CAIRO_TRUE}" && test -z "${HAVE_CAIRO_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CAIRO\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CAIRO\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_CAIRO\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_CAIRO\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_CAIRO_PNG_TRUE}" && test -z "${HAVE_CAIRO_PNG_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CAIRO_PNG\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CAIRO_PNG\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_CAIRO_PNG\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_CAIRO_PNG\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_CAIRO_PS_TRUE}" && test -z "${HAVE_CAIRO_PS_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CAIRO_PS\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CAIRO_PS\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_CAIRO_PS\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_CAIRO_PS\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_CAIRO_PDF_TRUE}" && test -z "${HAVE_CAIRO_PDF_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CAIRO_PDF\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CAIRO_PDF\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_CAIRO_PDF\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_CAIRO_PDF\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_CAIRO_XLIB_TRUE}" && test -z "${HAVE_CAIRO_XLIB_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CAIRO_XLIB\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CAIRO_XLIB\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_CAIRO_XLIB\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_CAIRO_XLIB\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_CAIRO_WIN32_TRUE}" && test -z "${HAVE_CAIRO_WIN32_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CAIRO_WIN32\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CAIRO_WIN32\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_CAIRO_WIN32\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_CAIRO_WIN32\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_CAIRO_FREETYPE_TRUE}" && test -z "${HAVE_CAIRO_FREETYPE_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CAIRO_FREETYPE\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CAIRO_FREETYPE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_CAIRO_FREETYPE\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_CAIRO_FREETYPE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_CAIRO_ATSUI_TRUE}" && test -z "${HAVE_CAIRO_ATSUI_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CAIRO_ATSUI\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CAIRO_ATSUI\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_CAIRO_ATSUI\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_CAIRO_ATSUI\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_INCLUDED_MODULES_TRUE}" && test -z "${HAVE_INCLUDED_MODULES_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_INCLUDED_MODULES\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_INCLUDED_MODULES\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_INCLUDED_MODULES\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_INCLUDED_MODULES\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${HAVE_DYNAMIC_MODULES_TRUE}" && test -z "${HAVE_DYNAMIC_MODULES_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_DYNAMIC_MODULES\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_DYNAMIC_MODULES\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_DYNAMIC_MODULES\" was never defined.
-+echo "$as_me: error: conditional \"HAVE_DYNAMIC_MODULES\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${INCLUDE_ARABIC_FC_TRUE}" && test -z "${INCLUDE_ARABIC_FC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_ARABIC_FC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_ARABIC_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"INCLUDE_ARABIC_FC\" was never defined.
-+echo "$as_me: error: conditional \"INCLUDE_ARABIC_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${INCLUDE_ARABIC_LANG_TRUE}" && test -z "${INCLUDE_ARABIC_LANG_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_ARABIC_LANG\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_ARABIC_LANG\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"INCLUDE_ARABIC_LANG\" was never defined.
-+echo "$as_me: error: conditional \"INCLUDE_ARABIC_LANG\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${INCLUDE_BASIC_FC_TRUE}" && test -z "${INCLUDE_BASIC_FC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_BASIC_FC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_BASIC_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"INCLUDE_BASIC_FC\" was never defined.
-+echo "$as_me: error: conditional \"INCLUDE_BASIC_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${INCLUDE_BASIC_WIN32_TRUE}" && test -z "${INCLUDE_BASIC_WIN32_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_BASIC_WIN32\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_BASIC_WIN32\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"INCLUDE_BASIC_WIN32\" was never defined.
-+echo "$as_me: error: conditional \"INCLUDE_BASIC_WIN32\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${INCLUDE_BASIC_X_TRUE}" && test -z "${INCLUDE_BASIC_X_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_BASIC_X\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_BASIC_X\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"INCLUDE_BASIC_X\" was never defined.
-+echo "$as_me: error: conditional \"INCLUDE_BASIC_X\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${INCLUDE_BASIC_ATSUI_TRUE}" && test -z "${INCLUDE_BASIC_ATSUI_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_BASIC_ATSUI\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_BASIC_ATSUI\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"INCLUDE_BASIC_ATSUI\" was never defined.
-+echo "$as_me: error: conditional \"INCLUDE_BASIC_ATSUI\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${INCLUDE_HANGUL_FC_TRUE}" && test -z "${INCLUDE_HANGUL_FC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_HANGUL_FC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_HANGUL_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"INCLUDE_HANGUL_FC\" was never defined.
-+echo "$as_me: error: conditional \"INCLUDE_HANGUL_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${INCLUDE_HEBREW_FC_TRUE}" && test -z "${INCLUDE_HEBREW_FC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_HEBREW_FC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_HEBREW_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"INCLUDE_HEBREW_FC\" was never defined.
-+echo "$as_me: error: conditional \"INCLUDE_HEBREW_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${INCLUDE_INDIC_FC_TRUE}" && test -z "${INCLUDE_INDIC_FC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_INDIC_FC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_INDIC_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"INCLUDE_INDIC_FC\" was never defined.
-+echo "$as_me: error: conditional \"INCLUDE_INDIC_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${INCLUDE_INDIC_LANG_TRUE}" && test -z "${INCLUDE_INDIC_LANG_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_INDIC_LANG\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_INDIC_LANG\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"INCLUDE_INDIC_LANG\" was never defined.
-+echo "$as_me: error: conditional \"INCLUDE_INDIC_LANG\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${INCLUDE_KHMER_FC_TRUE}" && test -z "${INCLUDE_KHMER_FC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_KHMER_FC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_KHMER_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"INCLUDE_KHMER_FC\" was never defined.
-+echo "$as_me: error: conditional \"INCLUDE_KHMER_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${INCLUDE_SYRIAC_FC_TRUE}" && test -z "${INCLUDE_SYRIAC_FC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_SYRIAC_FC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_SYRIAC_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"INCLUDE_SYRIAC_FC\" was never defined.
-+echo "$as_me: error: conditional \"INCLUDE_SYRIAC_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${INCLUDE_THAI_FC_TRUE}" && test -z "${INCLUDE_THAI_FC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_THAI_FC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_THAI_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"INCLUDE_THAI_FC\" was never defined.
-+echo "$as_me: error: conditional \"INCLUDE_THAI_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${INCLUDE_THAI_LANG_TRUE}" && test -z "${INCLUDE_THAI_LANG_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_THAI_LANG\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_THAI_LANG\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"INCLUDE_THAI_LANG\" was never defined.
-+echo "$as_me: error: conditional \"INCLUDE_THAI_LANG\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${INCLUDE_TIBETAN_FC_TRUE}" && test -z "${INCLUDE_TIBETAN_FC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_TIBETAN_FC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_TIBETAN_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"INCLUDE_TIBETAN_FC\" was never defined.
-+echo "$as_me: error: conditional \"INCLUDE_TIBETAN_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${DYNAMIC_ARABIC_FC_TRUE}" && test -z "${DYNAMIC_ARABIC_FC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"DYNAMIC_ARABIC_FC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"DYNAMIC_ARABIC_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"DYNAMIC_ARABIC_FC\" was never defined.
-+echo "$as_me: error: conditional \"DYNAMIC_ARABIC_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${DYNAMIC_ARABIC_LANG_TRUE}" && test -z "${DYNAMIC_ARABIC_LANG_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"DYNAMIC_ARABIC_LANG\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"DYNAMIC_ARABIC_LANG\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"DYNAMIC_ARABIC_LANG\" was never defined.
-+echo "$as_me: error: conditional \"DYNAMIC_ARABIC_LANG\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${DYNAMIC_BASIC_FC_TRUE}" && test -z "${DYNAMIC_BASIC_FC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"DYNAMIC_BASIC_FC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"DYNAMIC_BASIC_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"DYNAMIC_BASIC_FC\" was never defined.
-+echo "$as_me: error: conditional \"DYNAMIC_BASIC_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${DYNAMIC_BASIC_WIN32_TRUE}" && test -z "${DYNAMIC_BASIC_WIN32_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"DYNAMIC_BASIC_WIN32\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"DYNAMIC_BASIC_WIN32\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"DYNAMIC_BASIC_WIN32\" was never defined.
-+echo "$as_me: error: conditional \"DYNAMIC_BASIC_WIN32\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${DYNAMIC_BASIC_X_TRUE}" && test -z "${DYNAMIC_BASIC_X_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"DYNAMIC_BASIC_X\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"DYNAMIC_BASIC_X\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"DYNAMIC_BASIC_X\" was never defined.
-+echo "$as_me: error: conditional \"DYNAMIC_BASIC_X\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${DYNAMIC_BASIC_ATSUI_TRUE}" && test -z "${DYNAMIC_BASIC_ATSUI_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"DYNAMIC_BASIC_ATSUI\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"DYNAMIC_BASIC_ATSUI\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"DYNAMIC_BASIC_ATSUI\" was never defined.
-+echo "$as_me: error: conditional \"DYNAMIC_BASIC_ATSUI\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${DYNAMIC_HANGUL_FC_TRUE}" && test -z "${DYNAMIC_HANGUL_FC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"DYNAMIC_HANGUL_FC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"DYNAMIC_HANGUL_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"DYNAMIC_HANGUL_FC\" was never defined.
-+echo "$as_me: error: conditional \"DYNAMIC_HANGUL_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${DYNAMIC_HEBREW_FC_TRUE}" && test -z "${DYNAMIC_HEBREW_FC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"DYNAMIC_HEBREW_FC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"DYNAMIC_HEBREW_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"DYNAMIC_HEBREW_FC\" was never defined.
-+echo "$as_me: error: conditional \"DYNAMIC_HEBREW_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${DYNAMIC_INDIC_FC_TRUE}" && test -z "${DYNAMIC_INDIC_FC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"DYNAMIC_INDIC_FC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"DYNAMIC_INDIC_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"DYNAMIC_INDIC_FC\" was never defined.
-+echo "$as_me: error: conditional \"DYNAMIC_INDIC_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${DYNAMIC_INDIC_LANG_TRUE}" && test -z "${DYNAMIC_INDIC_LANG_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"DYNAMIC_INDIC_LANG\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"DYNAMIC_INDIC_LANG\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"DYNAMIC_INDIC_LANG\" was never defined.
-+echo "$as_me: error: conditional \"DYNAMIC_INDIC_LANG\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${DYNAMIC_KHMER_FC_TRUE}" && test -z "${DYNAMIC_KHMER_FC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"DYNAMIC_KHMER_FC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"DYNAMIC_KHMER_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"DYNAMIC_KHMER_FC\" was never defined.
-+echo "$as_me: error: conditional \"DYNAMIC_KHMER_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${DYNAMIC_SYRIAC_FC_TRUE}" && test -z "${DYNAMIC_SYRIAC_FC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"DYNAMIC_SYRIAC_FC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"DYNAMIC_SYRIAC_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"DYNAMIC_SYRIAC_FC\" was never defined.
-+echo "$as_me: error: conditional \"DYNAMIC_SYRIAC_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${DYNAMIC_THAI_FC_TRUE}" && test -z "${DYNAMIC_THAI_FC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"DYNAMIC_THAI_FC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"DYNAMIC_THAI_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"DYNAMIC_THAI_FC\" was never defined.
-+echo "$as_me: error: conditional \"DYNAMIC_THAI_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${DYNAMIC_THAI_LANG_TRUE}" && test -z "${DYNAMIC_THAI_LANG_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"DYNAMIC_THAI_LANG\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"DYNAMIC_THAI_LANG\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"DYNAMIC_THAI_LANG\" was never defined.
-+echo "$as_me: error: conditional \"DYNAMIC_THAI_LANG\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${DYNAMIC_TIBETAN_FC_TRUE}" && test -z "${DYNAMIC_TIBETAN_FC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"DYNAMIC_TIBETAN_FC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"DYNAMIC_TIBETAN_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"DYNAMIC_TIBETAN_FC\" was never defined.
-+echo "$as_me: error: conditional \"DYNAMIC_TIBETAN_FC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined.
-+echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
-+echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${ENABLE_MAN_TRUE}" && test -z "${ENABLE_MAN_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_MAN\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_MAN\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"ENABLE_MAN\" was never defined.
-+echo "$as_me: error: conditional \"ENABLE_MAN\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${ENABLE_DOC_CROSS_REFERENCES_TRUE}" && test -z "${ENABLE_DOC_CROSS_REFERENCES_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_DOC_CROSS_REFERENCES\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_DOC_CROSS_REFERENCES\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"ENABLE_DOC_CROSS_REFERENCES\" was never defined.
-+echo "$as_me: error: conditional \"ENABLE_DOC_CROSS_REFERENCES\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test -z "${DISABLE_EXPLICIT_DEPS_TRUE}" && test -z "${DISABLE_EXPLICIT_DEPS_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined.
-+ { { echo "$as_me:$LINENO: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined.
-+echo "$as_me: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- : ${CONFIG_STATUS=./config.status}
--ac_write_fail=0
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
--$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
--cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-+echo "$as_me: creating $CONFIG_STATUS" >&6;}
-+cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
- # Generated by $as_me.
- # Run this file to recreate the current configuration.
-@@ -25204,7 +25004,7 @@ ac_cs_silent=false
- SHELL=\${CONFIG_SHELL-$SHELL}
- _ACEOF
-
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<\_ACEOF
- ## --------------------- ##
- ## M4sh Initialization. ##
- ## --------------------- ##
-@@ -25214,7 +25014,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
-- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-@@ -25236,45 +25036,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
- as_cr_digits='0123456789'
- as_cr_alnum=$as_cr_Letters$as_cr_digits
-
--as_nl='
--'
--export as_nl
--# Printing a long string crashes Solaris 7 /usr/bin/printf.
--as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
--as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
--as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
--if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-- as_echo='printf %s\n'
-- as_echo_n='printf %s'
--else
-- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-- as_echo_n='/usr/ucb/echo -n'
-- else
-- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-- as_echo_n_body='eval
-- arg=$1;
-- case $arg in
-- *"$as_nl"*)
-- expr "X$arg" : "X\\(.*\\)$as_nl";
-- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-- esac;
-- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-- '
-- export as_echo_n_body
-- as_echo_n='sh -c $as_echo_n_body as_echo'
-- fi
-- export as_echo_body
-- as_echo='sh -c $as_echo_body as_echo'
--fi
--
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
-- PATH_SEPARATOR=:
-- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-- PATH_SEPARATOR=';'
-- }
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
- fi
-
- # Support unset when possible.
-@@ -25290,6 +25062,8 @@ fi
- # there to prevent editors from complaining about space-tab.
- # (If _AS_PATH_WALK were called with IFS unset, it would disable word
- # splitting by setting IFS to empty value.)
-+as_nl='
-+'
- IFS=" "" $as_nl"
-
- # Find who we are. Look in the path if we contain no directory separator.
-@@ -25312,7 +25086,7 @@ if test "x$as_myself" = x; then
- as_myself=$0
- fi
- if test ! -f "$as_myself"; then
-- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
- fi
-
-@@ -25325,10 +25099,17 @@ PS2='> '
- PS4='+ '
-
- # NLS nuisances.
--LC_ALL=C
--export LC_ALL
--LANGUAGE=C
--export LANGUAGE
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ fi
-+done
-
- # Required to use basename.
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -25350,7 +25131,7 @@ as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X/"$0" |
-+echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
-@@ -25401,7 +25182,7 @@ $as_unset CDPATH
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
-- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
-@@ -25429,6 +25210,7 @@ case `echo -n x` in
- *)
- ECHO_N='-n';;
- esac
-+
- if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-@@ -25441,22 +25223,19 @@ if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
- else
- rm -f conf$$.dir
-- mkdir conf$$.dir 2>/dev/null
-+ mkdir conf$$.dir
- fi
--if (echo >conf$$.file) 2>/dev/null; then
-- if ln -s conf$$.file conf$$ 2>/dev/null; then
-- as_ln_s='ln -s'
-- # ... but there are two gotchas:
-- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-- # In both cases, we have to default to `cp -p'.
-- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-- as_ln_s='cp -p'
-- elif ln conf$$.file conf$$ 2>/dev/null; then
-- as_ln_s=ln
-- else
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+ as_ln_s='ln -s'
-+ # ... but there are two gotchas:
-+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+ # In both cases, we have to default to `cp -p'.
-+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
-- fi
-+elif ln conf$$.file conf$$ 2>/dev/null; then
-+ as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
-@@ -25481,10 +25260,10 @@ else
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-- test -d "$1/.";
-+ test -d "$1/.";
- else
- case $1 in
-- -*)set "./$1";;
-+ -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
-@@ -25507,7 +25286,7 @@ exec 6>&1
- # values after options handling.
- ac_log="
- This file was extended by pango $as_me 1.22.4, which was
--generated by GNU Autoconf 2.63. Invocation command line was
-+generated by GNU Autoconf 2.61. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -25520,16 +25299,7 @@ on `(hostname || uname -n) 2>/dev/null |
-
- _ACEOF
-
--case $ac_config_files in *"
--"*) set x $ac_config_files; shift; ac_config_files=$*;;
--esac
--
--case $ac_config_headers in *"
--"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
--esac
--
--
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<_ACEOF
- # Files that config.status was made for.
- config_files="$ac_config_files"
- config_headers="$ac_config_headers"
-@@ -25537,23 +25307,22 @@ config_commands="$ac_config_commands"
-
- _ACEOF
-
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<\_ACEOF
- ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
- current configuration.
-
--Usage: $0 [OPTION]... [FILE]...
-+Usage: $0 [OPTIONS] [FILE]...
-
- -h, --help print this help, then exit
- -V, --version print version number and configuration settings, then exit
-- -q, --quiet, --silent
-- do not print progress messages
-+ -q, --quiet do not print progress messages
- -d, --debug don't remove temporary files
- --recheck update $as_me by reconfiguring in the same conditions
-- --file=FILE[:TEMPLATE]
-- instantiate the configuration file FILE
-- --header=FILE[:TEMPLATE]
-- instantiate the configuration header FILE
-+ --file=FILE[:TEMPLATE]
-+ instantiate the configuration file FILE
-+ --header=FILE[:TEMPLATE]
-+ instantiate the configuration header FILE
-
- Configuration files:
- $config_files
-@@ -25567,13 +25336,13 @@ $config_commands
- Report bugs to <bug-autoconf at gnu.org>."
-
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- pango config.status 1.22.4
--configured by $0, generated by GNU Autoconf 2.63,
-- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.61,
-+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
--Copyright (C) 2008 Free Software Foundation, Inc.
-+Copyright (C) 2006 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
-
-@@ -25581,12 +25350,11 @@ ac_pwd='$ac_pwd'
- srcdir='$srcdir'
- INSTALL='$INSTALL'
- MKDIR_P='$MKDIR_P'
--AWK='$AWK'
--test -n "\$AWK" || AWK=awk
- _ACEOF
-
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
--# The default lists apply if the user does not specify any file.
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If no file are specified by the user, then we need to provide default
-+# value. By we need to know if files were specified by the user.
- ac_need_defaults=:
- while test $# != 0
- do
-@@ -25608,36 +25376,30 @@ do
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- ac_cs_recheck=: ;;
- --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-- $as_echo "$ac_cs_version"; exit ;;
-+ echo "$ac_cs_version"; exit ;;
- --debug | --debu | --deb | --de | --d | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
- $ac_shift
-- case $ac_optarg in
-- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-- esac
-- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
-+ CONFIG_FILES="$CONFIG_FILES $ac_optarg"
- ac_need_defaults=false;;
- --header | --heade | --head | --hea )
- $ac_shift
-- case $ac_optarg in
-- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-- esac
-- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
-+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
- ac_need_defaults=false;;
- --he | --h)
- # Conflict between --help and --header
-- { $as_echo "$as_me: error: ambiguous option: $1
-+ { echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; };;
- --help | --hel | -h )
-- $as_echo "$ac_cs_usage"; exit ;;
-+ echo "$ac_cs_usage"; exit ;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil | --si | --s)
- ac_cs_silent=: ;;
-
- # This is an error.
-- -*) { $as_echo "$as_me: error: unrecognized option: $1
-+ -*) { echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; } ;;
-
-@@ -25656,29 +25418,27 @@ if $ac_cs_silent; then
- fi
-
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<_ACEOF
- if \$ac_cs_recheck; then
-- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-- shift
-- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-- CONFIG_SHELL='$SHELL'
-+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+ CONFIG_SHELL=$SHELL
- export CONFIG_SHELL
-- exec "\$@"
-+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- fi
-
- _ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<\_ACEOF
- exec 5>>config.log
- {
- echo
- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
- ## Running $as_me. ##
- _ASBOX
-- $as_echo "$ac_log"
-+ echo "$ac_log"
- } >&5
-
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<_ACEOF
- #
- # INIT-COMMANDS
- #
-@@ -25694,7 +25454,7 @@ included_modules=$included_modules
-
- _ACEOF
-
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<\_ACEOF
-
- # Handling of arguments.
- for ac_config_target in $ac_config_targets
-@@ -25747,8 +25507,8 @@ do
- "pango-zip.sh") CONFIG_FILES="$CONFIG_FILES pango-zip.sh" ;;
- "tests/runtests.sh") CONFIG_FILES="$CONFIG_FILES tests/runtests.sh" ;;
-
-- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
--$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
- esac
- done
-@@ -25789,144 +25549,414 @@ $debug ||
- (umask 077 && mkdir "$tmp")
- } ||
- {
-- $as_echo "$as_me: cannot create a temporary directory in ." >&2
-+ echo "$me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
- }
-
--# Set up the scripts for CONFIG_FILES section.
--# No need to generate them if there are no CONFIG_FILES.
--# This happens for instance with `./config.status config.h'.
-+#
-+# Set up the sed scripts for CONFIG_FILES section.
-+#
-+
-+# No need to generate the scripts if there are no CONFIG_FILES.
-+# This happens for instance when ./config.status config.h
- if test -n "$CONFIG_FILES"; then
-
-+_ACEOF
-+
-
--ac_cr='
'
--ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
--if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-- ac_cs_awk_cr='\\r'
--else
-- ac_cs_awk_cr=$ac_cr
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+SHELL!$SHELL$ac_delim
-+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-+exec_prefix!$exec_prefix$ac_delim
-+prefix!$prefix$ac_delim
-+program_transform_name!$program_transform_name$ac_delim
-+bindir!$bindir$ac_delim
-+sbindir!$sbindir$ac_delim
-+libexecdir!$libexecdir$ac_delim
-+datarootdir!$datarootdir$ac_delim
-+datadir!$datadir$ac_delim
-+sysconfdir!$sysconfdir$ac_delim
-+sharedstatedir!$sharedstatedir$ac_delim
-+localstatedir!$localstatedir$ac_delim
-+includedir!$includedir$ac_delim
-+oldincludedir!$oldincludedir$ac_delim
-+docdir!$docdir$ac_delim
-+infodir!$infodir$ac_delim
-+htmldir!$htmldir$ac_delim
-+dvidir!$dvidir$ac_delim
-+pdfdir!$pdfdir$ac_delim
-+psdir!$psdir$ac_delim
-+libdir!$libdir$ac_delim
-+localedir!$localedir$ac_delim
-+mandir!$mandir$ac_delim
-+DEFS!$DEFS$ac_delim
-+ECHO_C!$ECHO_C$ac_delim
-+ECHO_N!$ECHO_N$ac_delim
-+ECHO_T!$ECHO_T$ac_delim
-+LIBS!$LIBS$ac_delim
-+build_alias!$build_alias$ac_delim
-+host_alias!$host_alias$ac_delim
-+target_alias!$target_alias$ac_delim
-+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-+INSTALL_DATA!$INSTALL_DATA$ac_delim
-+am__isrc!$am__isrc$ac_delim
-+CYGPATH_W!$CYGPATH_W$ac_delim
-+PACKAGE!$PACKAGE$ac_delim
-+VERSION!$VERSION$ac_delim
-+ACLOCAL!$ACLOCAL$ac_delim
-+AUTOCONF!$AUTOCONF$ac_delim
-+AUTOMAKE!$AUTOMAKE$ac_delim
-+AUTOHEADER!$AUTOHEADER$ac_delim
-+MAKEINFO!$MAKEINFO$ac_delim
-+install_sh!$install_sh$ac_delim
-+STRIP!$STRIP$ac_delim
-+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-+mkdir_p!$mkdir_p$ac_delim
-+AWK!$AWK$ac_delim
-+SET_MAKE!$SET_MAKE$ac_delim
-+am__leading_dot!$am__leading_dot$ac_delim
-+AMTAR!$AMTAR$ac_delim
-+am__tar!$am__tar$ac_delim
-+am__untar!$am__untar$ac_delim
-+PANGO_VERSION_MAJOR!$PANGO_VERSION_MAJOR$ac_delim
-+PANGO_VERSION_MINOR!$PANGO_VERSION_MINOR$ac_delim
-+PANGO_VERSION_MICRO!$PANGO_VERSION_MICRO$ac_delim
-+PANGO_VERSION!$PANGO_VERSION$ac_delim
-+PANGO_API_VERSION!$PANGO_API_VERSION$ac_delim
-+PANGO_INTERFACE_AGE!$PANGO_INTERFACE_AGE$ac_delim
-+PANGO_BINARY_AGE!$PANGO_BINARY_AGE$ac_delim
-+PANGO_MODULE_VERSION!$PANGO_MODULE_VERSION$ac_delim
-+PANGO_CURRENT_MINUS_AGE!$PANGO_CURRENT_MINUS_AGE$ac_delim
-+build!$build$ac_delim
-+build_cpu!$build_cpu$ac_delim
-+build_vendor!$build_vendor$ac_delim
-+build_os!$build_os$ac_delim
-+host!$host$ac_delim
-+host_cpu!$host_cpu$ac_delim
-+host_vendor!$host_vendor$ac_delim
-+host_os!$host_os$ac_delim
-+LIB_EXE_MACHINE_FLAG!$LIB_EXE_MACHINE_FLAG$ac_delim
-+OS_WIN32_TRUE!$OS_WIN32_TRUE$ac_delim
-+OS_WIN32_FALSE!$OS_WIN32_FALSE$ac_delim
-+CC!$CC$ac_delim
-+CFLAGS!$CFLAGS$ac_delim
-+LDFLAGS!$LDFLAGS$ac_delim
-+CPPFLAGS!$CPPFLAGS$ac_delim
-+ac_ct_CC!$ac_ct_CC$ac_delim
-+EXEEXT!$EXEEXT$ac_delim
-+OBJEXT!$OBJEXT$ac_delim
-+DEPDIR!$DEPDIR$ac_delim
-+am__include!$am__include$ac_delim
-+am__quote!$am__quote$ac_delim
-+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-+CCDEPMODE!$CCDEPMODE$ac_delim
-+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-+CXX!$CXX$ac_delim
-+CXXFLAGS!$CXXFLAGS$ac_delim
-+_ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { (exit 1); exit 1; }; }
-+ else
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+ fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
- fi
-
--echo 'BEGIN {' >"$tmp/subs1.awk" &&
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
- _ACEOF
-
-
--{
-- echo "cat >conf$$subs.awk <<_ACEOF" &&
-- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-- echo "_ACEOF"
--} >conf$$subs.sh ||
-- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-- { (exit 1); exit 1; }; }
--ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-- . ./conf$$subs.sh ||
-- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-- { (exit 1); exit 1; }; }
-+ cat >conf$$subs.sed <<_ACEOF
-+ac_ct_CXX!$ac_ct_CXX$ac_delim
-+CXXDEPMODE!$CXXDEPMODE$ac_delim
-+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
-+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-+HAVE_CXX_TRUE!$HAVE_CXX_TRUE$ac_delim
-+HAVE_CXX_FALSE!$HAVE_CXX_FALSE$ac_delim
-+SED!$SED$ac_delim
-+GREP!$GREP$ac_delim
-+EGREP!$EGREP$ac_delim
-+LN_S!$LN_S$ac_delim
-+ECHO!$ECHO$ac_delim
-+AR!$AR$ac_delim
-+RANLIB!$RANLIB$ac_delim
-+DSYMUTIL!$DSYMUTIL$ac_delim
-+NMEDIT!$NMEDIT$ac_delim
-+DLLTOOL!$DLLTOOL$ac_delim
-+AS!$AS$ac_delim
-+OBJDUMP!$OBJDUMP$ac_delim
-+CPP!$CPP$ac_delim
-+CXXCPP!$CXXCPP$ac_delim
-+F77!$F77$ac_delim
-+FFLAGS!$FFLAGS$ac_delim
-+ac_ct_F77!$ac_ct_F77$ac_delim
-+LIBTOOL!$LIBTOOL$ac_delim
-+PLATFORM_WIN32_TRUE!$PLATFORM_WIN32_TRUE$ac_delim
-+PLATFORM_WIN32_FALSE!$PLATFORM_WIN32_FALSE$ac_delim
-+WINDRES!$WINDRES$ac_delim
-+ms_librarian!$ms_librarian$ac_delim
-+MS_LIB_AVAILABLE_TRUE!$MS_LIB_AVAILABLE_TRUE$ac_delim
-+MS_LIB_AVAILABLE_FALSE!$MS_LIB_AVAILABLE_FALSE$ac_delim
-+PANGO_DEBUG_FLAGS!$PANGO_DEBUG_FLAGS$ac_delim
-+CROSS_COMPILING_TRUE!$CROSS_COMPILING_TRUE$ac_delim
-+CROSS_COMPILING_FALSE!$CROSS_COMPILING_FALSE$ac_delim
-+PERL!$PERL$ac_delim
-+REBUILD!$REBUILD$ac_delim
-+XMKMF!$XMKMF$ac_delim
-+X_CFLAGS!$X_CFLAGS$ac_delim
-+X_PRE_LIBS!$X_PRE_LIBS$ac_delim
-+X_LIBS!$X_LIBS$ac_delim
-+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
-+HAVE_X_TRUE!$HAVE_X_TRUE$ac_delim
-+HAVE_X_FALSE!$HAVE_X_FALSE$ac_delim
-+PKG_CONFIG!$PKG_CONFIG$ac_delim
-+FONTCONFIG_CFLAGS!$FONTCONFIG_CFLAGS$ac_delim
-+FONTCONFIG_LIBS!$FONTCONFIG_LIBS$ac_delim
-+FREETYPE_CFLAGS!$FREETYPE_CFLAGS$ac_delim
-+FREETYPE_LIBS!$FREETYPE_LIBS$ac_delim
-+HAVE_FREETYPE_TRUE!$HAVE_FREETYPE_TRUE$ac_delim
-+HAVE_FREETYPE_FALSE!$HAVE_FREETYPE_FALSE$ac_delim
-+XFT_CFLAGS!$XFT_CFLAGS$ac_delim
-+XFT_LIBS!$XFT_LIBS$ac_delim
-+HAVE_XFT_TRUE!$HAVE_XFT_TRUE$ac_delim
-+HAVE_XFT_FALSE!$HAVE_XFT_FALSE$ac_delim
-+WIN32_LIBS!$WIN32_LIBS$ac_delim
-+HAVE_WIN32_TRUE!$HAVE_WIN32_TRUE$ac_delim
-+HAVE_WIN32_FALSE!$HAVE_WIN32_FALSE$ac_delim
-+CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
-+CAIRO_LIBS!$CAIRO_LIBS$ac_delim
-+HAVE_CAIRO_TRUE!$HAVE_CAIRO_TRUE$ac_delim
-+HAVE_CAIRO_FALSE!$HAVE_CAIRO_FALSE$ac_delim
-+HAVE_CAIRO_PNG_TRUE!$HAVE_CAIRO_PNG_TRUE$ac_delim
-+HAVE_CAIRO_PNG_FALSE!$HAVE_CAIRO_PNG_FALSE$ac_delim
-+HAVE_CAIRO_PS_TRUE!$HAVE_CAIRO_PS_TRUE$ac_delim
-+HAVE_CAIRO_PS_FALSE!$HAVE_CAIRO_PS_FALSE$ac_delim
-+HAVE_CAIRO_PDF_TRUE!$HAVE_CAIRO_PDF_TRUE$ac_delim
-+HAVE_CAIRO_PDF_FALSE!$HAVE_CAIRO_PDF_FALSE$ac_delim
-+HAVE_CAIRO_XLIB_TRUE!$HAVE_CAIRO_XLIB_TRUE$ac_delim
-+HAVE_CAIRO_XLIB_FALSE!$HAVE_CAIRO_XLIB_FALSE$ac_delim
-+HAVE_CAIRO_WIN32_TRUE!$HAVE_CAIRO_WIN32_TRUE$ac_delim
-+HAVE_CAIRO_WIN32_FALSE!$HAVE_CAIRO_WIN32_FALSE$ac_delim
-+HAVE_CAIRO_FREETYPE_TRUE!$HAVE_CAIRO_FREETYPE_TRUE$ac_delim
-+HAVE_CAIRO_FREETYPE_FALSE!$HAVE_CAIRO_FREETYPE_FALSE$ac_delim
-+HAVE_CAIRO_ATSUI_TRUE!$HAVE_CAIRO_ATSUI_TRUE$ac_delim
-+HAVE_CAIRO_ATSUI_FALSE!$HAVE_CAIRO_ATSUI_FALSE$ac_delim
-+GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
-+GLIB_LIBS!$GLIB_LIBS$ac_delim
-+LIBTHAI_CFLAGS!$LIBTHAI_CFLAGS$ac_delim
-+LIBTHAI_LIBS!$LIBTHAI_LIBS$ac_delim
-+HAVE_INCLUDED_MODULES_TRUE!$HAVE_INCLUDED_MODULES_TRUE$ac_delim
-+HAVE_INCLUDED_MODULES_FALSE!$HAVE_INCLUDED_MODULES_FALSE$ac_delim
-+HAVE_DYNAMIC_MODULES_TRUE!$HAVE_DYNAMIC_MODULES_TRUE$ac_delim
-+HAVE_DYNAMIC_MODULES_FALSE!$HAVE_DYNAMIC_MODULES_FALSE$ac_delim
-+INCLUDED_X_MODULES!$INCLUDED_X_MODULES$ac_delim
-+INCLUDED_FC_MODULES!$INCLUDED_FC_MODULES$ac_delim
-+INCLUDED_WIN32_MODULES!$INCLUDED_WIN32_MODULES$ac_delim
-+INCLUDED_ATSUI_MODULES!$INCLUDED_ATSUI_MODULES$ac_delim
-+INCLUDED_LANG_MODULES!$INCLUDED_LANG_MODULES$ac_delim
-+INCLUDE_ARABIC_FC_TRUE!$INCLUDE_ARABIC_FC_TRUE$ac_delim
-+INCLUDE_ARABIC_FC_FALSE!$INCLUDE_ARABIC_FC_FALSE$ac_delim
-+INCLUDE_ARABIC_LANG_TRUE!$INCLUDE_ARABIC_LANG_TRUE$ac_delim
-+INCLUDE_ARABIC_LANG_FALSE!$INCLUDE_ARABIC_LANG_FALSE$ac_delim
-+INCLUDE_BASIC_FC_TRUE!$INCLUDE_BASIC_FC_TRUE$ac_delim
-+INCLUDE_BASIC_FC_FALSE!$INCLUDE_BASIC_FC_FALSE$ac_delim
-+INCLUDE_BASIC_WIN32_TRUE!$INCLUDE_BASIC_WIN32_TRUE$ac_delim
-+INCLUDE_BASIC_WIN32_FALSE!$INCLUDE_BASIC_WIN32_FALSE$ac_delim
-+INCLUDE_BASIC_X_TRUE!$INCLUDE_BASIC_X_TRUE$ac_delim
-+INCLUDE_BASIC_X_FALSE!$INCLUDE_BASIC_X_FALSE$ac_delim
-+_ACEOF
-
-- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-- if test $ac_delim_n = $ac_delim_num; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
- break
- elif $ac_last_try; then
-- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
- done
--rm -f conf$$subs.sh
-
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
--cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
--_ACEOF
--sed -n '
--h
--s/^/S["/; s/!.*/"]=/
--p
--g
--s/^[^!]*!//
--:repl
--t repl
--s/'"$ac_delim"'$//
--t delim
--:nl
--h
--s/\(.\{148\}\).*/\1/
--t more1
--s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
--p
--n
--b repl
--:more1
--s/["\\]/\\&/g; s/^/"/; s/$/"\\/
--p
--g
--s/.\{148\}//
--t nl
--:delim
--h
--s/\(.\{148\}\).*/\1/
--t more2
--s/["\\]/\\&/g; s/^/"/; s/$/"/
--p
--b
--:more2
--s/["\\]/\\&/g; s/^/"/; s/$/"\\/
--p
--g
--s/.\{148\}//
--t delim
--' <conf$$subs.awk | sed '
--/^[^""]/{
-- N
-- s/\n//
--}
--' >>$CONFIG_STATUS || ac_write_fail=1
--rm -f conf$$subs.awk
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
--_ACAWK
--cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-- for (key in S) S_is_set[key] = 1
-- FS = ""
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
-+fi
-
--}
--{
-- line = $ 0
-- nfields = split(line, field, "@")
-- substed = 0
-- len = length(field[1])
-- for (i = 2; i < nfields; i++) {
-- key = field[i]
-- keylen = length(key)
-- if (S_is_set[key]) {
-- value = S[key]
-- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-- len += length(value) + length(field[++i])
-- substed = 1
-- } else
-- len += 1 + keylen
-- }
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
-+_ACEOF
-
-- print line
--}
-
--_ACAWK
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+INCLUDE_BASIC_ATSUI_TRUE!$INCLUDE_BASIC_ATSUI_TRUE$ac_delim
-+INCLUDE_BASIC_ATSUI_FALSE!$INCLUDE_BASIC_ATSUI_FALSE$ac_delim
-+INCLUDE_HANGUL_FC_TRUE!$INCLUDE_HANGUL_FC_TRUE$ac_delim
-+INCLUDE_HANGUL_FC_FALSE!$INCLUDE_HANGUL_FC_FALSE$ac_delim
-+INCLUDE_HEBREW_FC_TRUE!$INCLUDE_HEBREW_FC_TRUE$ac_delim
-+INCLUDE_HEBREW_FC_FALSE!$INCLUDE_HEBREW_FC_FALSE$ac_delim
-+INCLUDE_INDIC_FC_TRUE!$INCLUDE_INDIC_FC_TRUE$ac_delim
-+INCLUDE_INDIC_FC_FALSE!$INCLUDE_INDIC_FC_FALSE$ac_delim
-+INCLUDE_INDIC_LANG_TRUE!$INCLUDE_INDIC_LANG_TRUE$ac_delim
-+INCLUDE_INDIC_LANG_FALSE!$INCLUDE_INDIC_LANG_FALSE$ac_delim
-+INCLUDE_KHMER_FC_TRUE!$INCLUDE_KHMER_FC_TRUE$ac_delim
-+INCLUDE_KHMER_FC_FALSE!$INCLUDE_KHMER_FC_FALSE$ac_delim
-+INCLUDE_SYRIAC_FC_TRUE!$INCLUDE_SYRIAC_FC_TRUE$ac_delim
-+INCLUDE_SYRIAC_FC_FALSE!$INCLUDE_SYRIAC_FC_FALSE$ac_delim
-+INCLUDE_THAI_FC_TRUE!$INCLUDE_THAI_FC_TRUE$ac_delim
-+INCLUDE_THAI_FC_FALSE!$INCLUDE_THAI_FC_FALSE$ac_delim
-+INCLUDE_THAI_LANG_TRUE!$INCLUDE_THAI_LANG_TRUE$ac_delim
-+INCLUDE_THAI_LANG_FALSE!$INCLUDE_THAI_LANG_FALSE$ac_delim
-+INCLUDE_TIBETAN_FC_TRUE!$INCLUDE_TIBETAN_FC_TRUE$ac_delim
-+INCLUDE_TIBETAN_FC_FALSE!$INCLUDE_TIBETAN_FC_FALSE$ac_delim
-+DYNAMIC_ARABIC_FC_TRUE!$DYNAMIC_ARABIC_FC_TRUE$ac_delim
-+DYNAMIC_ARABIC_FC_FALSE!$DYNAMIC_ARABIC_FC_FALSE$ac_delim
-+DYNAMIC_ARABIC_LANG_TRUE!$DYNAMIC_ARABIC_LANG_TRUE$ac_delim
-+DYNAMIC_ARABIC_LANG_FALSE!$DYNAMIC_ARABIC_LANG_FALSE$ac_delim
-+DYNAMIC_BASIC_FC_TRUE!$DYNAMIC_BASIC_FC_TRUE$ac_delim
-+DYNAMIC_BASIC_FC_FALSE!$DYNAMIC_BASIC_FC_FALSE$ac_delim
-+DYNAMIC_BASIC_WIN32_TRUE!$DYNAMIC_BASIC_WIN32_TRUE$ac_delim
-+DYNAMIC_BASIC_WIN32_FALSE!$DYNAMIC_BASIC_WIN32_FALSE$ac_delim
-+DYNAMIC_BASIC_X_TRUE!$DYNAMIC_BASIC_X_TRUE$ac_delim
-+DYNAMIC_BASIC_X_FALSE!$DYNAMIC_BASIC_X_FALSE$ac_delim
-+DYNAMIC_BASIC_ATSUI_TRUE!$DYNAMIC_BASIC_ATSUI_TRUE$ac_delim
-+DYNAMIC_BASIC_ATSUI_FALSE!$DYNAMIC_BASIC_ATSUI_FALSE$ac_delim
-+DYNAMIC_HANGUL_FC_TRUE!$DYNAMIC_HANGUL_FC_TRUE$ac_delim
-+DYNAMIC_HANGUL_FC_FALSE!$DYNAMIC_HANGUL_FC_FALSE$ac_delim
-+DYNAMIC_HEBREW_FC_TRUE!$DYNAMIC_HEBREW_FC_TRUE$ac_delim
-+DYNAMIC_HEBREW_FC_FALSE!$DYNAMIC_HEBREW_FC_FALSE$ac_delim
-+DYNAMIC_INDIC_FC_TRUE!$DYNAMIC_INDIC_FC_TRUE$ac_delim
-+DYNAMIC_INDIC_FC_FALSE!$DYNAMIC_INDIC_FC_FALSE$ac_delim
-+DYNAMIC_INDIC_LANG_TRUE!$DYNAMIC_INDIC_LANG_TRUE$ac_delim
-+DYNAMIC_INDIC_LANG_FALSE!$DYNAMIC_INDIC_LANG_FALSE$ac_delim
-+DYNAMIC_KHMER_FC_TRUE!$DYNAMIC_KHMER_FC_TRUE$ac_delim
-+DYNAMIC_KHMER_FC_FALSE!$DYNAMIC_KHMER_FC_FALSE$ac_delim
-+DYNAMIC_SYRIAC_FC_TRUE!$DYNAMIC_SYRIAC_FC_TRUE$ac_delim
-+DYNAMIC_SYRIAC_FC_FALSE!$DYNAMIC_SYRIAC_FC_FALSE$ac_delim
-+DYNAMIC_THAI_FC_TRUE!$DYNAMIC_THAI_FC_TRUE$ac_delim
-+DYNAMIC_THAI_FC_FALSE!$DYNAMIC_THAI_FC_FALSE$ac_delim
-+DYNAMIC_THAI_LANG_TRUE!$DYNAMIC_THAI_LANG_TRUE$ac_delim
-+DYNAMIC_THAI_LANG_FALSE!$DYNAMIC_THAI_LANG_FALSE$ac_delim
-+DYNAMIC_TIBETAN_FC_TRUE!$DYNAMIC_TIBETAN_FC_TRUE$ac_delim
-+DYNAMIC_TIBETAN_FC_FALSE!$DYNAMIC_TIBETAN_FC_FALSE$ac_delim
-+HTML_DIR!$HTML_DIR$ac_delim
-+GTKDOC_CHECK!$GTKDOC_CHECK$ac_delim
-+ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim
-+ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim
-+GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim
-+GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim
-+XSLTPROC!$XSLTPROC$ac_delim
-+XML_CATALOG_FILE!$XML_CATALOG_FILE$ac_delim
-+XMLCATALOG!$XMLCATALOG$ac_delim
-+ENABLE_MAN_TRUE!$ENABLE_MAN_TRUE$ac_delim
-+ENABLE_MAN_FALSE!$ENABLE_MAN_FALSE$ac_delim
-+GLIB_PREFIX!$GLIB_PREFIX$ac_delim
-+CAIRO_PREFIX!$CAIRO_PREFIX$ac_delim
-+ENABLE_DOC_CROSS_REFERENCES_TRUE!$ENABLE_DOC_CROSS_REFERENCES_TRUE$ac_delim
-+ENABLE_DOC_CROSS_REFERENCES_FALSE!$ENABLE_DOC_CROSS_REFERENCES_FALSE$ac_delim
-+LIBRARY_LIBTOOL_OPTIONS!$LIBRARY_LIBTOOL_OPTIONS$ac_delim
-+MODULE_LIBTOOL_OPTIONS!$MODULE_LIBTOOL_OPTIONS$ac_delim
-+PKGCONFIG_MATH_LIBS!$PKGCONFIG_MATH_LIBS$ac_delim
-+PKGCONFIG_CAIRO_REQUIRES!$PKGCONFIG_CAIRO_REQUIRES$ac_delim
-+DISABLE_EXPLICIT_DEPS_TRUE!$DISABLE_EXPLICIT_DEPS_TRUE$ac_delim
-+DISABLE_EXPLICIT_DEPS_FALSE!$DISABLE_EXPLICIT_DEPS_FALSE$ac_delim
-+LIBOBJS!$LIBOBJS$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
--if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
--else
-- cat
--fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
--$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
-+ else
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+ fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+:end
-+s/|#_!!_#|//g
-+CEOF$ac_eof
- _ACEOF
-
-+
- # VPATH may cause trouble with some makes, so we remove $(srcdir),
- # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
- # trailing colons and then remove the whole line if VPATH becomes empty
-@@ -25942,133 +25972,19 @@ s/^[^=]*=[ ]*$//
- }'
- fi
-
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<\_ACEOF
- fi # test -n "$CONFIG_FILES"
-
--# Set up the scripts for CONFIG_HEADERS section.
--# No need to generate them if there are no CONFIG_HEADERS.
--# This happens for instance with `./config.status Makefile'.
--if test -n "$CONFIG_HEADERS"; then
--cat >"$tmp/defines.awk" <<\_ACAWK ||
--BEGIN {
--_ACEOF
--
--# Transform confdefs.h into an awk script `defines.awk', embedded as
--# here-document in config.status, that substitutes the proper values into
--# config.h.in to produce config.h.
--
--# Create a delimiter string that does not exist in confdefs.h, to ease
--# handling of long lines.
--ac_delim='%!_!# '
--for ac_last_try in false false :; do
-- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-- if test -z "$ac_t"; then
-- break
-- elif $ac_last_try; then
-- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
--$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
-- { (exit 1); exit 1; }; }
-- else
-- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-- fi
--done
--
--# For the awk script, D is an array of macro values keyed by name,
--# likewise P contains macro parameters if any. Preserve backslash
--# newline sequences.
--
--ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
--sed -n '
--s/.\{148\}/&'"$ac_delim"'/g
--t rset
--:rset
--s/^[ ]*#[ ]*define[ ][ ]*/ /
--t def
--d
--:def
--s/\\$//
--t bsnl
--s/["\\]/\\&/g
--s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
--D["\1"]=" \3"/p
--s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
--d
--:bsnl
--s/["\\]/\\&/g
--s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
--D["\1"]=" \3\\\\\\n"\\/p
--t cont
--s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
--t cont
--d
--:cont
--n
--s/.\{148\}/&'"$ac_delim"'/g
--t clear
--:clear
--s/\\$//
--t bsnlc
--s/["\\]/\\&/g; s/^/"/; s/$/"/p
--d
--:bsnlc
--s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
--b cont
--' <confdefs.h | sed '
--s/'"$ac_delim"'/"\\\
--"/g' >>$CONFIG_STATUS || ac_write_fail=1
--
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-- for (key in D) D_is_set[key] = 1
-- FS = ""
--}
--/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-- line = \$ 0
-- split(line, arg, " ")
-- if (arg[1] == "#") {
-- defundef = arg[2]
-- mac1 = arg[3]
-- } else {
-- defundef = substr(arg[1], 2)
-- mac1 = arg[2]
-- }
-- split(mac1, mac2, "(") #)
-- macro = mac2[1]
-- prefix = substr(line, 1, index(line, defundef) - 1)
-- if (D_is_set[macro]) {
-- # Preserve the white space surrounding the "#".
-- print prefix "define", macro P[macro] D[macro]
-- next
-- } else {
-- # Replace #undef with comments. This is necessary, for example,
-- # in the case of _POSIX_SOURCE, which is predefined and required
-- # on some systems where configure will not decide to define it.
-- if (defundef == "undef") {
-- print "/*", prefix defundef, macro, "*/"
-- next
-- }
-- }
--}
--{ print }
--_ACAWK
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
--$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-- { (exit 1); exit 1; }; }
--fi # test -n "$CONFIG_HEADERS"
--
-
--eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
--shift
--for ac_tag
-+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
- do
- case $ac_tag in
- :[FHLC]) ac_mode=$ac_tag; continue;;
- esac
- case $ac_mode$ac_tag in
- :[FHL]*:*);;
-- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
--$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
- { (exit 1); exit 1; }; };;
- :[FH]-) ac_tag=-:-;;
- :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-@@ -26097,38 +26013,26 @@ $as_echo "$as_me: error: invalid tag $ac
- [\\/$]*) false;;
- *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
- esac ||
-- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
--$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
- { (exit 1); exit 1; }; };;
- esac
-- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-- ac_file_inputs="$ac_file_inputs '$ac_f'"
-+ ac_file_inputs="$ac_file_inputs $ac_f"
- done
-
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
-- configure_input='Generated from '`
-- $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-- `' by configure.'
-+ configure_input="Generated from "`IFS=:
-+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
- if test x"$ac_file" != x-; then
- configure_input="$ac_file. $configure_input"
-- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
--$as_echo "$as_me: creating $ac_file" >&6;}
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
- fi
-- # Neutralize special characters interpreted by sed in replacement strings.
-- case $configure_input in #(
-- *\&* | *\|* | *\\* )
-- ac_sed_conf_input=`$as_echo "$configure_input" |
-- sed 's/[\\\\&|]/\\\\&/g'`;; #(
-- *) ac_sed_conf_input=$configure_input;;
-- esac
-
- case $ac_tag in
-- *:-:* | *:-) cat >"$tmp/stdin" \
-- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
--$as_echo "$as_me: error: could not create $ac_file" >&2;}
-- { (exit 1); exit 1; }; } ;;
-+ *:-:* | *:-) cat >"$tmp/stdin";;
- esac
- ;;
- esac
-@@ -26138,7 +26042,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$ac_file" |
-+echo X"$ac_file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -26164,7 +26068,7 @@ $as_echo X"$ac_file" |
- as_dirs=
- while :; do
- case $as_dir in #(
-- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
-@@ -26173,7 +26077,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$as_dir" |
-+echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -26194,17 +26098,17 @@ $as_echo X"$as_dir" |
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
-- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
--$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
- ac_builddir=.
-
- case "$ac_dir" in
- .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *)
-- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A ".." for each directory in $ac_dir_suffix.
-- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-@@ -26249,13 +26153,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
- esac
- _ACEOF
-
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<\_ACEOF
- # If the template does not know about datarootdir, expand it.
- # FIXME: This hack should be removed a few years after 2.60.
- ac_datarootdir_hack=; ac_datarootdir_seen=
-
--ac_sed_dataroot='
--/datarootdir/ {
-+case `sed -n '/datarootdir/ {
- p
- q
- }
-@@ -26264,14 +26167,13 @@ ac_sed_dataroot='
- /@infodir@/p
- /@localedir@/p
- /@mandir@/p
--'
--case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-+' $ac_file_inputs` in
- *datarootdir*) ac_datarootdir_seen=yes;;
- *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
--$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<_ACEOF
- ac_datarootdir_hack='
- s&@datadir@&$datadir&g
- s&@docdir@&$docdir&g
-@@ -26285,16 +26187,15 @@ _ACEOF
- # Neutralize VPATH when `$srcdir' = `.'.
- # Shell code in configure.ac might set extrasub.
- # FIXME: do we really want to maintain this feature?
--cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
--ac_sed_extra="$ac_vpsub
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ sed "$ac_vpsub
- $extrasub
- _ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+cat >>$CONFIG_STATUS <<\_ACEOF
- :t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s|@configure_input@|$ac_sed_conf_input|;t t
-+s&@configure_input@&$configure_input&;t t
- s&@top_builddir@&$ac_top_builddir_sub&;t t
--s&@top_build_prefix@&$ac_top_build_prefix&;t t
- s&@srcdir@&$ac_srcdir&;t t
- s&@abs_srcdir@&$ac_abs_srcdir&;t t
- s&@top_srcdir@&$ac_top_srcdir&;t t
-@@ -26305,60 +26206,121 @@ s&@abs_top_builddir@&$ac_abs_top_builddi
- s&@INSTALL@&$ac_INSTALL&;t t
- s&@MKDIR_P@&$ac_MKDIR_P&;t t
- $ac_datarootdir_hack
--"
--eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
--$as_echo "$as_me: error: could not create $ac_file" >&2;}
-- { (exit 1); exit 1; }; }
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
-
- test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
- which seems to be undefined. Please make sure it is defined." >&5
--$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
- which seems to be undefined. Please make sure it is defined." >&2;}
-
- rm -f "$tmp/stdin"
- case $ac_file in
-- -) cat "$tmp/out" && rm -f "$tmp/out";;
-- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-- esac \
-- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
--$as_echo "$as_me: error: could not create $ac_file" >&2;}
-- { (exit 1); exit 1; }; }
-+ -) cat "$tmp/out"; rm -f "$tmp/out";;
-+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-+ esac
- ;;
- :H)
- #
- # CONFIG_HEADER
- #
-+_ACEOF
-+
-+# Transform confdefs.h into a sed script `conftest.defines', that
-+# substitutes the proper values into config.h.in to produce config.h.
-+rm -f conftest.defines conftest.tail
-+# First, append a space to every undef/define line, to ease matching.
-+echo 's/$/ /' >conftest.defines
-+# Then, protect against being on the right side of a sed subst, or in
-+# an unquoted here document, in config.status. If some macros were
-+# called several times there might be several #defines for the same
-+# symbol, which is useless. But do not sort them, since the last
-+# AC_DEFINE must be honored.
-+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-+# NAME is the cpp macro being defined, VALUE is the value it is being given.
-+# PARAMS is the parameter list in the macro definition--in most cases, it's
-+# just an empty string.
-+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
-+ac_dB='\\)[ (].*,\\1define\\2'
-+ac_dC=' '
-+ac_dD=' ,'
-+
-+uniq confdefs.h |
-+ sed -n '
-+ t rset
-+ :rset
-+ s/^[ ]*#[ ]*define[ ][ ]*//
-+ t ok
-+ d
-+ :ok
-+ s/[\\&,]/\\&/g
-+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-+ ' >>conftest.defines
-+
-+# Remove the space that was appended to ease matching.
-+# Then replace #undef with comments. This is necessary, for
-+# example, in the case of _POSIX_SOURCE, which is predefined and required
-+# on some systems where configure will not decide to define it.
-+# (The regexp can be short, since the line contains either #define or #undef.)
-+echo 's/ $//
-+s,^[ #]*u.*,/* & */,' >>conftest.defines
-+
-+# Break up conftest.defines:
-+ac_max_sed_lines=50
-+
-+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-+# et cetera.
-+ac_in='$ac_file_inputs'
-+ac_out='"$tmp/out1"'
-+ac_nxt='"$tmp/out2"'
-+
-+while :
-+do
-+ # Write a here document:
-+ cat >>$CONFIG_STATUS <<_ACEOF
-+ # First, check the format of the line:
-+ cat >"\$tmp/defines.sed" <<\\CEOF
-+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
-+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
-+b
-+:def
-+_ACEOF
-+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-+ echo 'CEOF
-+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-+ grep . conftest.tail >/dev/null || break
-+ rm -f conftest.defines
-+ mv conftest.tail conftest.defines
-+done
-+rm -f conftest.defines conftest.tail
-+
-+echo "ac_result=$ac_in" >>$CONFIG_STATUS
-+cat >>$CONFIG_STATUS <<\_ACEOF
- if test x"$ac_file" != x-; then
-- {
-- $as_echo "/* $configure_input */" \
-- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-- } >"$tmp/config.h" \
-- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
--$as_echo "$as_me: error: could not create $ac_file" >&2;}
-- { (exit 1); exit 1; }; }
-- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
--$as_echo "$as_me: $ac_file is unchanged" >&6;}
-+ echo "/* $configure_input */" >"$tmp/config.h"
-+ cat "$ac_result" >>"$tmp/config.h"
-+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-+ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-+echo "$as_me: $ac_file is unchanged" >&6;}
- else
-- rm -f "$ac_file"
-- mv "$tmp/config.h" "$ac_file" \
-- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
--$as_echo "$as_me: error: could not create $ac_file" >&2;}
-- { (exit 1); exit 1; }; }
-+ rm -f $ac_file
-+ mv "$tmp/config.h" $ac_file
- fi
- else
-- $as_echo "/* $configure_input */" \
-- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
--$as_echo "$as_me: error: could not create -" >&2;}
-- { (exit 1); exit 1; }; }
-+ echo "/* $configure_input */"
-+ cat "$ac_result"
- fi
--# Compute "$ac_file"'s index in $config_headers.
--_am_arg="$ac_file"
-+ rm -f "$tmp/out12"
-+# Compute $ac_file's index in $config_headers.
-+_am_arg=$ac_file
- _am_stamp_count=1
- for _am_header in $config_headers :; do
- case $_am_header in
-@@ -26373,7 +26335,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^
- X"$_am_arg" : 'X\(//\)[^/]' \| \
- X"$_am_arg" : 'X\(//\)$' \| \
- X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$_am_arg" |
-+echo X"$_am_arg" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -26393,8 +26355,8 @@ $as_echo X"$_am_arg" |
- s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
--$as_echo "$as_me: executing $ac_file commands" >&6;}
-+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-+echo "$as_me: executing $ac_file commands" >&6;}
- ;;
- esac
-
-@@ -26416,7 +26378,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$mf" |
-+echo X"$mf" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -26460,7 +26422,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$file" |
-+echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -26486,7 +26448,7 @@ $as_echo X"$file" |
- as_dirs=
- while :; do
- case $as_dir in #(
-- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
-@@ -26495,7 +26457,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$as_dir" |
-+echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -26516,8 +26478,8 @@ $as_echo X"$as_dir" |
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
-- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
--$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
-@@ -26683,8 +26645,8 @@ EOTEXT
- ;;
- "pango/pango-features.h":C) featuresfile=pango/pango-features.h
- outfile=$featuresfile.tmp
-- { $as_echo "$as_me:$LINENO: creating $featuresfile" >&5
--$as_echo "$as_me: creating $featuresfile" >&6;}
-+ { echo "$as_me:$LINENO: creating $featuresfile" >&5
-+echo "$as_me: creating $featuresfile" >&6;}
- cat >$outfile <<_EOF
- /* Generated by configure. Do not edit */
- #ifndef PANGO_FEATURES_H
-@@ -26703,8 +26665,8 @@ _EOF
- echo '#endif' >>$outfile
-
- if cmp -s $outfile $featuresfile; then
-- { $as_echo "$as_me:$LINENO: $featuresfile is unchanged" >&5
--$as_echo "$as_me: $featuresfile is unchanged" >&6;}
-+ { echo "$as_me:$LINENO: $featuresfile is unchanged" >&5
-+echo "$as_me: $featuresfile is unchanged" >&6;}
- rm -f $outfile
- else
- mv $outfile $featuresfile
-@@ -26721,11 +26683,6 @@ _ACEOF
- chmod +x $CONFIG_STATUS
- ac_clean_files=$ac_clean_files_save
-
--test $ac_write_fail = 0 ||
-- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
--$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-- { (exit 1); exit 1; }; }
--
-
- # configure is writing to config.log, and then calls config.status.
- # config.status does its own redirection, appending to config.log.
-@@ -26747,10 +26704,6 @@ if test "$no_create" != yes; then
- # would make configure fail if this is the last instruction.
- $ac_cs_success || { (exit 1); exit 1; }
- fi
--if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
--$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
--fi
-
-
- backends=""
-diff -pruN pango-1.22.4.orig/docs/Makefile.in pango-1.22.4/docs/Makefile.in
---- pango-1.22.4.orig/docs/Makefile.in 2008-12-16 07:14:32.000000000 +0100
-+++ pango-1.22.4/docs/Makefile.in 2009-01-06 16:41:27.324191482 +0100
-@@ -216,7 +216,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
-
-diff -pruN pango-1.22.4.orig/examples/Makefile.in pango-1.22.4/examples/Makefile.in
---- pango-1.22.4.orig/examples/Makefile.in 2008-12-16 07:14:33.000000000 +0100
-+++ pango-1.22.4/examples/Makefile.in 2009-01-06 16:41:27.488689903 +0100
-@@ -244,7 +244,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- EXTRA_DIST = \
-diff -pruN pango-1.22.4.orig/ltmain.sh pango-1.22.4/ltmain.sh
---- pango-1.22.4.orig/ltmain.sh 2008-08-30 00:27:25.000000000 +0200
-+++ pango-1.22.4/ltmain.sh 2008-04-29 22:21:21.000000000 +0200
-@@ -43,7 +43,7 @@ EXIT_FAILURE=1
+@@ -73,7 +73,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
--VERSION=1.5.26
-+VERSION="1.5.26 Debian 1.5.26-4"
- TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
-
- # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-@@ -2135,7 +2135,10 @@ EOF
+-VERSION=2.2.6
++VERSION="2.2.6 Debian-2.2.6a-1"
+ TIMESTAMP=""
+ package_revision=1.3012
+
+@@ -5033,7 +5033,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -13068,203 +1227,654 @@
+ ;;
esac
fi
- if test "$pass" = dlopen; then
-@@ -3269,6 +3272,11 @@ EOF
+ if test "$linkmode,$pass" = "lib,dlpreopen"; then
+@@ -6206,6 +6209,9 @@
revision="$number_minor"
lt_irix_increment=no
;;
+ *)
-+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
-+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
-+ exit $EXIT_FAILURE
++ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+ ;;
esac
;;
no)
-diff -pruN pango-1.22.4.orig/Makefile.in pango-1.22.4/Makefile.in
---- pango-1.22.4.orig/Makefile.in 2008-12-16 07:14:37.000000000 +0100
-+++ pango-1.22.4/Makefile.in 2009-01-06 16:41:30.564191050 +0100
-@@ -257,7 +257,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = pango modules pango-view examples docs tools tests
-diff -pruN pango-1.22.4.orig/modules/arabic/Makefile.in pango-1.22.4/modules/arabic/Makefile.in
---- pango-1.22.4.orig/modules/arabic/Makefile.in 2008-12-16 07:14:33.000000000 +0100
-+++ pango-1.22.4/modules/arabic/Makefile.in 2009-01-06 16:41:27.756691494 +0100
-@@ -282,7 +282,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- pangolibs = \
-diff -pruN pango-1.22.4.orig/modules/basic/Makefile.in pango-1.22.4/modules/basic/Makefile.in
---- pango-1.22.4.orig/modules/basic/Makefile.in 2008-12-16 07:14:33.000000000 +0100
-+++ pango-1.22.4/modules/basic/Makefile.in 2009-01-06 16:41:27.948692362 +0100
-@@ -330,7 +330,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- pangolibs = \
-diff -pruN pango-1.22.4.orig/modules/hangul/Makefile.in pango-1.22.4/modules/hangul/Makefile.in
---- pango-1.22.4.orig/modules/hangul/Makefile.in 2008-12-16 07:14:34.000000000 +0100
-+++ pango-1.22.4/modules/hangul/Makefile.in 2009-01-06 16:41:28.100691359 +0100
-@@ -257,7 +257,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- pangolibs = \
-diff -pruN pango-1.22.4.orig/modules/hebrew/Makefile.in pango-1.22.4/modules/hebrew/Makefile.in
---- pango-1.22.4.orig/modules/hebrew/Makefile.in 2008-12-16 07:14:34.000000000 +0100
-+++ pango-1.22.4/modules/hebrew/Makefile.in 2009-01-06 16:41:28.260691023 +0100
-@@ -259,7 +259,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- pangolibs = \
-diff -pruN pango-1.22.4.orig/modules/indic/Makefile.in pango-1.22.4/modules/indic/Makefile.in
---- pango-1.22.4.orig/modules/indic/Makefile.in 2008-12-16 07:14:34.000000000 +0100
-+++ pango-1.22.4/modules/indic/Makefile.in 2009-01-06 16:41:28.452691892 +0100
-@@ -284,7 +284,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- pangolibs = \
-diff -pruN pango-1.22.4.orig/modules/khmer/Makefile.in pango-1.22.4/modules/khmer/Makefile.in
---- pango-1.22.4.orig/modules/khmer/Makefile.in 2008-12-16 07:14:34.000000000 +0100
-+++ pango-1.22.4/modules/khmer/Makefile.in 2009-01-06 16:41:28.608690979 +0100
-@@ -256,7 +256,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- pangolibs = \
-diff -pruN pango-1.22.4.orig/modules/Makefile.in pango-1.22.4/modules/Makefile.in
---- pango-1.22.4.orig/modules/Makefile.in 2008-12-16 07:14:33.000000000 +0100
-+++ pango-1.22.4/modules/Makefile.in 2009-01-06 16:41:27.596691339 +0100
-@@ -215,7 +215,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = \
-diff -pruN pango-1.22.4.orig/modules/syriac/Makefile.in pango-1.22.4/modules/syriac/Makefile.in
---- pango-1.22.4.orig/modules/syriac/Makefile.in 2008-12-16 07:14:34.000000000 +0100
-+++ pango-1.22.4/modules/syriac/Makefile.in 2009-01-06 16:41:28.764691043 +0100
-@@ -258,7 +258,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- pangolibs = \
-diff -pruN pango-1.22.4.orig/modules/thai/Makefile.in pango-1.22.4/modules/thai/Makefile.in
---- pango-1.22.4.orig/modules/thai/Makefile.in 2008-12-16 07:14:35.000000000 +0100
-+++ pango-1.22.4/modules/thai/Makefile.in 2009-01-06 16:41:28.956690445 +0100
-@@ -284,7 +284,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- pangolibs = \
-diff -pruN pango-1.22.4.orig/modules/tibetan/Makefile.in pango-1.22.4/modules/tibetan/Makefile.in
---- pango-1.22.4.orig/modules/tibetan/Makefile.in 2008-12-16 07:14:35.000000000 +0100
-+++ pango-1.22.4/modules/tibetan/Makefile.in 2009-01-06 16:41:29.108690909 +0100
-@@ -257,7 +257,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- pangolibs = \
-diff -pruN pango-1.22.4.orig/pango/Makefile.in pango-1.22.4/pango/Makefile.in
---- pango-1.22.4.orig/pango/Makefile.in 2008-12-16 07:14:36.000000000 +0100
-+++ pango-1.22.4/pango/Makefile.in 2009-01-06 16:41:29.724693431 +0100
-@@ -411,7 +411,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
-
-diff -pruN pango-1.22.4.orig/pango/mini-fribidi/Makefile.in pango-1.22.4/pango/mini-fribidi/Makefile.in
---- pango-1.22.4.orig/pango/mini-fribidi/Makefile.in 2008-12-16 07:14:36.000000000 +0100
-+++ pango-1.22.4/pango/mini-fribidi/Makefile.in 2009-01-06 16:41:29.852691403 +0100
-@@ -223,7 +223,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = \
-diff -pruN pango-1.22.4.orig/pango/opentype/Makefile.in pango-1.22.4/pango/opentype/Makefile.in
---- pango-1.22.4.orig/pango/opentype/Makefile.in 2008-12-16 07:14:36.000000000 +0100
-+++ pango-1.22.4/pango/opentype/Makefile.in 2009-01-06 16:41:30.004692845 +0100
-@@ -235,7 +235,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = \
-diff -pruN pango-1.22.4.orig/pango-view/Makefile.in pango-1.22.4/pango-view/Makefile.in
---- pango-1.22.4.orig/pango-view/Makefile.in 2008-12-16 07:14:35.000000000 +0100
-+++ pango-1.22.4/pango-view/Makefile.in 2009-01-06 16:41:29.300690801 +0100
-@@ -363,7 +363,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- TEST_TEXTS = \
-diff -pruN pango-1.22.4.orig/tests/Makefile.in pango-1.22.4/tests/Makefile.in
---- pango-1.22.4.orig/tests/Makefile.in 2008-12-16 07:14:36.000000000 +0100
-+++ pango-1.22.4/tests/Makefile.in 2009-01-06 16:41:30.200690381 +0100
-@@ -280,7 +280,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- EXTRA_DIST = \
-diff -pruN pango-1.22.4.orig/tools/Makefile.in pango-1.22.4/tools/Makefile.in
---- pango-1.22.4.orig/tools/Makefile.in 2008-12-16 07:14:36.000000000 +0100
-+++ pango-1.22.4/tools/Makefile.in 2009-01-06 16:41:30.344690666 +0100
-@@ -231,7 +231,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = \
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/Makefile.in pango1.0-1.24.0/Makefile.in
+--- pango1.0-1.24.0.old/Makefile.in 2009-03-16 23:35:05.000000000 +0100
++++ pango1.0-1.24.0/Makefile.in 2009-03-22 14:58:14.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -416,7 +416,7 @@
+ -rm -rf .libs _libs
+
+ distclean-libtool:
+- -rm -f libtool config.lt
++ -rm -f libtool
+ install-pkgconfigDATA: $(pkgconfig_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
+@@ -510,7 +510,7 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/modules/arabic/Makefile.in pango1.0-1.24.0/modules/arabic/Makefile.in
+--- pango1.0-1.24.0.old/modules/arabic/Makefile.in 2009-03-16 23:35:02.000000000 +0100
++++ pango1.0-1.24.0/modules/arabic/Makefile.in 2009-03-22 14:58:12.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -351,8 +351,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -487,7 +487,7 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/modules/basic/Makefile.in pango1.0-1.24.0/modules/basic/Makefile.in
+--- pango1.0-1.24.0.old/modules/basic/Makefile.in 2009-03-16 23:35:02.000000000 +0100
++++ pango1.0-1.24.0/modules/basic/Makefile.in 2009-03-22 14:58:13.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -407,8 +407,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -560,7 +560,7 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/modules/hangul/Makefile.in pango1.0-1.24.0/modules/hangul/Makefile.in
+--- pango1.0-1.24.0.old/modules/hangul/Makefile.in 2009-03-16 23:35:02.000000000 +0100
++++ pango1.0-1.24.0/modules/hangul/Makefile.in 2009-03-22 14:58:13.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -317,8 +317,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -431,7 +431,7 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/modules/hebrew/Makefile.in pango1.0-1.24.0/modules/hebrew/Makefile.in
+--- pango1.0-1.24.0.old/modules/hebrew/Makefile.in 2009-03-16 23:35:02.000000000 +0100
++++ pango1.0-1.24.0/modules/hebrew/Makefile.in 2009-03-22 14:58:13.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -317,8 +317,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -440,7 +440,7 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/modules/indic/Makefile.in pango1.0-1.24.0/modules/indic/Makefile.in
+--- pango1.0-1.24.0.old/modules/indic/Makefile.in 2009-03-16 23:35:03.000000000 +0100
++++ pango1.0-1.24.0/modules/indic/Makefile.in 2009-03-22 14:58:13.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -356,8 +356,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -510,7 +510,7 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/modules/khmer/Makefile.in pango1.0-1.24.0/modules/khmer/Makefile.in
+--- pango1.0-1.24.0.old/modules/khmer/Makefile.in 2009-03-16 23:35:03.000000000 +0100
++++ pango1.0-1.24.0/modules/khmer/Makefile.in 2009-03-22 14:58:13.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -315,8 +315,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -429,7 +429,7 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/modules/Makefile.in pango1.0-1.24.0/modules/Makefile.in
+--- pango1.0-1.24.0.old/modules/Makefile.in 2009-03-16 23:35:02.000000000 +0100
++++ pango1.0-1.24.0/modules/Makefile.in 2009-03-22 14:58:12.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -258,8 +258,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -365,7 +365,7 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/modules/syriac/Makefile.in pango1.0-1.24.0/modules/syriac/Makefile.in
+--- pango1.0-1.24.0.old/modules/syriac/Makefile.in 2009-03-16 23:35:03.000000000 +0100
++++ pango1.0-1.24.0/modules/syriac/Makefile.in 2009-03-22 14:58:13.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -319,8 +319,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -442,7 +442,7 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/modules/thai/Makefile.in pango1.0-1.24.0/modules/thai/Makefile.in
+--- pango1.0-1.24.0.old/modules/thai/Makefile.in 2009-03-16 23:35:03.000000000 +0100
++++ pango1.0-1.24.0/modules/thai/Makefile.in 2009-03-22 14:58:13.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -351,8 +351,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -496,7 +496,7 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/modules/tibetan/Makefile.in pango1.0-1.24.0/modules/tibetan/Makefile.in
+--- pango1.0-1.24.0.old/modules/tibetan/Makefile.in 2009-03-16 23:35:04.000000000 +0100
++++ pango1.0-1.24.0/modules/tibetan/Makefile.in 2009-03-22 14:58:13.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -314,8 +314,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -428,7 +428,7 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/pango/Makefile.in pango1.0-1.24.0/pango/Makefile.in
+--- pango1.0-1.24.0.old/pango/Makefile.in 2009-03-16 23:35:04.000000000 +0100
++++ pango1.0-1.24.0/pango/Makefile.in 2009-03-22 14:58:13.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -701,8 +701,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -1117,7 +1117,7 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -1173,7 +1173,7 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -1184,7 +1184,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -1196,7 +1196,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -1210,36 +1210,23 @@
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/pango/mini-fribidi/Makefile.in pango1.0-1.24.0/pango/mini-fribidi/Makefile.in
+--- pango1.0-1.24.0.old/pango/mini-fribidi/Makefile.in 2009-03-16 23:35:04.000000000 +0100
++++ pango1.0-1.24.0/pango/mini-fribidi/Makefile.in 2009-03-22 14:58:14.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -274,8 +274,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -353,7 +353,7 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/pango/opentype/Makefile.in pango1.0-1.24.0/pango/opentype/Makefile.in
+--- pango1.0-1.24.0.old/pango/opentype/Makefile.in 2009-03-16 23:35:05.000000000 +0100
++++ pango1.0-1.24.0/pango/opentype/Makefile.in 2009-03-22 14:58:14.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -317,8 +317,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -406,7 +406,7 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/pango-view/Makefile.in pango1.0-1.24.0/pango-view/Makefile.in
+--- pango1.0-1.24.0.old/pango-view/Makefile.in 2009-03-16 23:35:04.000000000 +0100
++++ pango1.0-1.24.0/pango-view/Makefile.in 2009-03-22 14:58:13.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -361,8 +361,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -487,8 +487,8 @@
+ esac; \
+ done; \
+ for i in $$list; do \
+- if test -f $$i; then file=$$i; \
+- else file=$(srcdir)/$$i; fi; \
++ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
++ else file=$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 1*) ;; \
+@@ -527,7 +527,7 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/tests/Makefile.in pango1.0-1.24.0/tests/Makefile.in
+--- pango1.0-1.24.0.old/tests/Makefile.in 2009-03-16 23:35:05.000000000 +0100
++++ pango1.0-1.24.0/tests/Makefile.in 2009-03-22 14:58:14.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -326,8 +326,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -464,7 +464,7 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+@@ -507,7 +507,7 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ if test -n "$$list"; then \
+@@ -518,7 +518,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -530,7 +530,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$tst[\ \ ]*) \
++ *$$ws$$tst$$ws*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -544,36 +544,23 @@
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+- if test "$$all" -eq 1; then \
+- tests="test"; \
+- All=""; \
+- else \
+- tests="tests"; \
+- All="All "; \
+- fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="$$All$$all $$tests passed"; \
++ banner="All $$all tests passed"; \
+ else \
+- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
++ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all $$tests failed"; \
++ banner="$$failed of $$all tests failed"; \
+ else \
+- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
++ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- if test "$$skip" -eq 1; then \
+- skipped="($$skip test was not run)"; \
+- else \
+- skipped="($$skip tests were not run)"; \
+- fi; \
++ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/tools/Makefile.in pango1.0-1.24.0/tools/Makefile.in
+--- pango1.0-1.24.0.old/tools/Makefile.in 2009-03-16 23:35:05.000000000 +0100
++++ pango1.0-1.24.0/tools/Makefile.in 2009-03-22 14:58:14.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -259,8 +259,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -328,7 +328,7 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
Modified: desktop/experimental/pango1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/patches/series?rev=19184&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/patches/series (original)
+++ desktop/experimental/pango1.0/debian/patches/series Sun Mar 22 14:20:08 2009
@@ -1,4 +1,5 @@
10_scan-module-files-in-dirs.patch
11_module-files-append-module-files-d.patch
12_module-files-append-compat-module-files-d.patch
+13_pango-view-undefined-references.patch
90_relibtoolize.patch
Modified: desktop/experimental/pango1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/rules?rev=19184&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/rules (original)
+++ desktop/experimental/pango1.0/debian/rules Sun Mar 22 14:20:08 2009
@@ -34,7 +34,7 @@
APIVER := 1.0
SONAME := 0
MODVER := 1.6.0
-SHVERSION := 1.22.0
+SHVERSION := 1.24.0
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
More information about the pkg-gnome-commits
mailing list