Changeset 9572


Ignore:
Timestamp:
May 31, 2013, 9:51:57 AM (6 years ago)
Author:
davidfs
Message:

Package updated

Location:
packages/cm18/plymouth
Files:
4 added
3 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • packages/cm18/plymouth/cmiffy/cmiffy

    r7421 r9572  
    5757
    5858#Changelog stuff
    59 AUTHOR='Flávio Moringa <flavio.moringa@caixamagica.pt>'
     59AUTHOR='David Semedo <david.semedo@caixamagica.pt>'
    6060DISTRO=""
    6161URGE="low"
  • packages/cm18/plymouth/cmiffy/debdiff.patch

    r6913 r9572  
    1 diff -Naur plymouth-0.8.2.orig//debian/control plymouth-0.8.2//debian/control
    2 --- plymouth-0.8.2.orig//debian/control 2011-09-26 06:26:06.000000000 +0100
    3 +++ plymouth-0.8.2//debian/control      2012-04-11 11:10:20.431765781 +0100
     1diff -Naur plymouth-0.8.2.orig/debian/control plymouth-0.8.2/debian/control
     2--- plymouth-0.8.2.orig/debian/control  2013-01-18 18:13:32.000000000 +0000
     3+++ plymouth-0.8.2/debian/control       2013-05-31 09:32:06.920091421 +0100
    44@@ -9,9 +9,9 @@
    55 Package: plymouth
    66 Architecture: any
    7  Depends: ${shlibs:Depends}, ${misc:Depends}, libplymouth2 (= ${binary:Version}), libdrm-intel1 | libdrm-radeon1 | libdrm-nouveau1a, udev (>= 166-0ubuntu4), mountall (>= 2.0), initramfs-tools
     7 Depends: ${shlibs:Depends}, ${misc:Depends}, libplymouth2 (= ${binary:Version}), libdrm-intel1 [i386 amd64] | libdrm-radeon1 | libdrm-nouveau1a, udev (>= 166-0ubuntu4), mountall (>= 2.0), initramfs-tools
    88-Recommends: plymouth-theme-ubuntu-text | plymouth-theme
    99+Recommends: plymouth-theme-caixamagica-text | plymouth-theme
    1010 Conflicts: usplash
    1111-Breaks: gdm (<< 3.0.4-0ubuntu11), kdm (<< 4:4.7.1-0ubuntu3), ubuntustudio-plymouth-theme (<= 0.38), xubuntu-plymouth-theme (<< 10.04.4), lubuntu-plymouth-theme (<= 0.4), lightdm (<< 0.9.7-0ubuntu2), lxdm (<< 0.4.1-0ubuntu2)
    12 +Breaks: gdm (<< 3.0.4-0ubuntu11), kdm (<< 4:4.7.1-0ubuntu3), ubuntustudio-plymouth-theme (<= 0.38), caixamagicastudio-plymouth-theme (<= 0.38), xubuntu-plymouth-theme (<< 10.04.4), caixamagicaxfce-plymouth-theme (<< 10.04.4), lubuntu-plymouth-theme (<= 0.4), caixamagicalxde-plymouth-theme (<= 0.4), lightdm (<< 0.9.7-0ubuntu2), lxdm (<< 0.4.1-0ubuntu2)
     12+Breaks: gdm (<< 3.0.4-0ubuntu11), kdm (<< 4:4.7.1-0ubuntu3), ubuntustudio-plymouth-theme (<= 0.38),caixamagicastudio-plymouth-theme (<= 0.38), xubuntu-plymouth-theme (<< 10.04.4),caixamagicaxfce-plymouth-theme (<< 10.04.4) ,lubuntu-plymouth-theme (<= 0.4),caixamagicalxde-plymouth-theme (<= 0.4) ,lightdm (<< 0.9.7-0ubuntu2), lxdm (<< 0.4.1-0ubuntu2)
    1313 Description: graphical boot animation and logger - main package
    1414  Plymouth is an application that runs very early in the boot process
     
    7474+ This package contains the default caixamagicakde-text text theme used when no
    7575  support for a graphical theme is found on your system.
    76 diff -Naur plymouth-0.8.2.orig//debian/initramfs-tools/hooks/plymouth plymouth-0.8.2//debian/initramfs-tools/hooks/plymouth
    77 --- plymouth-0.8.2.orig//debian/initramfs-tools/hooks/plymouth  2012-04-11 00:00:38.000000000 +0100
    78 +++ plymouth-0.8.2//debian/initramfs-tools/hooks/plymouth       2012-04-11 11:13:06.815771956 +0100
     76diff -Naur plymouth-0.8.2.orig/debian/initramfs-tools/hooks/plymouth plymouth-0.8.2/debian/initramfs-tools/hooks/plymouth
     77--- plymouth-0.8.2.orig/debian/initramfs-tools/hooks/plymouth   2012-04-13 12:04:59.000000000 +0100
     78+++ plymouth-0.8.2/debian/initramfs-tools/hooks/plymouth        2013-05-31 09:32:06.920091421 +0100
    7979@@ -66,7 +66,7 @@
    8080        copy_exec /lib/plymouth/renderers/drm.so /lib/plymouth/renderers/
     
    8686        # and copy the font support files needed in order to actually display
    8787        # any text
    88 diff -Naur plymouth-0.8.2.orig//debian/patches/autoreconf.patch plymouth-0.8.2//debian/patches/autoreconf.patch
    89 --- plymouth-0.8.2.orig//debian/patches/autoreconf.patch        2012-04-10 23:47:05.000000000 +0100
    90 +++ plymouth-0.8.2//debian/patches/autoreconf.patch     2012-04-11 11:10:20.435765782 +0100
    91 @@ -10266,7 +10266,7 @@
    92  
    93  
    94  -ac_config_files="$ac_config_files Makefile src/libply/Makefile src/libply-splash-core/Makefile src/libply-splash-graphics/Makefile src/ply-splash-core.pc src/ply-splash-graphics.pc src/plugins/Makefile src/plugins/renderers/Makefile src/plugins/renderers/frame-buffer/Makefile src/plugins/renderers/drm/Makefile src/plugins/renderers/x11/Makefile src/plugins/splash/Makefile src/plugins/splash/throbgress/Makefile src/plugins/splash/fade-throbber/Makefile src/plugins/splash/text/Makefile src/plugins/splash/details/Makefile src/plugins/splash/space-flares/Makefile src/plugins/splash/two-step/Makefile src/plugins/splash/script/Makefile src/plugins/controls/Makefile src/plugins/controls/label/Makefile src/Makefile src/client/ply-boot-client.pc src/client/Makefile src/viewer/Makefile src/tests/Makefile src/libply/tests/Makefile src/client/tests/Makefile themes/Makefile themes/spinfinity/Makefile themes/fade-in/Makefile themes/text/Makefile themes/details/Makefile themes/solar/Makefile themes/glow/Makefile themes/script/Makefile images/Makefile scripts/plymouth-generate-initrd scripts/plymouth-populate-initrd scripts/plymouth-set-default-theme scripts/Makefile docs/Makefile"
     88diff -Naur plymouth-0.8.2.orig/debian/patches/autoreconf.patch plymouth-0.8.2/debian/patches/autoreconf.patch
     89--- plymouth-0.8.2.orig/debian/patches/autoreconf.patch 2013-01-18 18:13:32.000000000 +0000
     90+++ plymouth-0.8.2/debian/patches/autoreconf.patch      2013-05-31 09:31:43.248091656 +0100
     91@@ -1,477 +1,6 @@
     92-Description: autoreconf output
     93- The result of running autoreconf.  To update this:
     94-  - quilt pop -a
     95-  - quilt push autoreconf.patch
     96-  - quilt shell
     97-  - autoreconf -fiv
     98-  - rm -rf autom4te.cache config.h.in~
     99-  - exit
     100-  - quilt refresh
     101-Forwarded: not-needed
     102-Last-Update: 2011-01-21
     103-
     104---- a/INSTALL
     105-+++ b/INSTALL
     106-@@ -1,91 +1,370 @@
     107--Plymouth isn't really designed to be built from source and get installed by end users.  For it to work correctly, it needs integration with the distribution.  Because it starts so early, it needs to be packed into the distribution's initial ram disk, and the distribution needs to poke plymouth to tell it how boot is progressing.
     108-+Installation Instructions
     109-+*************************
     110-
     111--Unfortunately, there isn't great documentation for distributors.  In the mean time, this email exchange might be useful:
     112-+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
     113-+Inc.
     114-
     115--Hi,
     116-+   Copying and distribution of this file, with or without modification,
     117-+are permitted in any medium without royalty provided the copyright
     118-+notice and this notice are preserved.  This file is offered as-is,
     119-+without warranty of any kind.
     120-+
     121-+Basic Installation
     122-+==================
     123-+
     124-+   Briefly, the shell commands `./configure; make; make install' should
     125-+configure, build, and install this package.  The following
     126-+more-detailed instructions are generic; see the `README' file for
     127-+instructions specific to this package.  Some packages provide this
     128-+`INSTALL' file but do not implement all of the features documented
     129-+below.  The lack of an optional feature in a given package is not
     130-+necessarily a bug.  More recommendations for GNU packages can be found
     131-+in *note Makefile Conventions: (standards)Makefile Conventions.
     132-+
     133-+   The `configure' shell script attempts to guess correct values for
     134-+various system-dependent variables used during compilation.  It uses
     135-+those values to create a `Makefile' in each directory of the package.
     136-+It may also create one or more `.h' files containing system-dependent
     137-+definitions.  Finally, it creates a shell script `config.status' that
     138-+you can run in the future to recreate the current configuration, and a
     139-+file `config.log' containing compiler output (useful mainly for
     140-+debugging `configure').
     141-+
     142-+   It can also use an optional file (typically called `config.cache'
     143-+and enabled with `--cache-file=config.cache' or simply `-C') that saves
     144-+the results of its tests to speed up reconfiguring.  Caching is
     145-+disabled by default to prevent problems with accidental use of stale
     146-+cache files.
     147-+
     148-+   If you need to do unusual things to compile the package, please try
     149-+to figure out how `configure' could check whether to do them, and mail
     150-+diffs or instructions to the address given in the `README' so they can
     151-+be considered for the next release.  If you are using the cache, and at
     152-+some point `config.cache' contains results you don't want to keep, you
     153-+may remove or edit it.
     154-+
     155-+   The file `configure.ac' (or `configure.in') is used to create
     156-+`configure' by a program called `autoconf'.  You need `configure.ac' if
     157-+you want to change it or regenerate `configure' using a newer version
     158-+of `autoconf'.
     159-+
     160-+   The simplest way to compile this package is:
     161-+
     162-+  1. `cd' to the directory containing the package's source code and type
     163-+     `./configure' to configure the package for your system.
     164-+
     165-+     Running `configure' might take a while.  While running, it prints
     166-+     some messages telling which features it is checking for.
     167-+
     168-+  2. Type `make' to compile the package.
     169-+
     170-+  3. Optionally, type `make check' to run any self-tests that come with
     171-+     the package, generally using the just-built uninstalled binaries.
     172-+
     173-+  4. Type `make install' to install the programs and any data files and
     174-+     documentation.  When installing into a prefix owned by root, it is
     175-+     recommended that the package be configured and built as a regular
     176-+     user, and only the `make install' phase executed with root
     177-+     privileges.
     178-+
     179-+  5. Optionally, type `make installcheck' to repeat any self-tests, but
     180-+     this time using the binaries in their final installed location.
     181-+     This target does not install anything.  Running this target as a
     182-+     regular user, particularly if the prior `make install' required
     183-+     root privileges, verifies that the installation completed
     184-+     correctly.
     185-+
     186-+  6. You can remove the program binaries and object files from the
     187-+     source code directory by typing `make clean'.  To also remove the
     188-+     files that `configure' created (so you can compile the package for
     189-+     a different kind of computer), type `make distclean'.  There is
     190-+     also a `make maintainer-clean' target, but that is intended mainly
     191-+     for the package's developers.  If you use it, you may have to get
     192-+     all sorts of other programs in order to regenerate files that came
     193-+     with the distribution.
     194-+
     195-+  7. Often, you can also type `make uninstall' to remove the installed
     196-+     files again.  In practice, not all packages have tested that
     197-+     uninstallation works correctly, even though it is required by the
     198-+     GNU Coding Standards.
     199-+
     200-+  8. Some packages, particularly those that use Automake, provide `make
     201-+     distcheck', which can by used by developers to test that all other
     202-+     targets like `make install' and `make uninstall' work correctly.
     203-+     This target is generally not run by end users.
     204-+
     205-+Compilers and Options
     206-+=====================
     207-+
     208-+   Some systems require unusual options for compilation or linking that
     209-+the `configure' script does not know about.  Run `./configure --help'
     210-+for details on some of the pertinent environment variables.
     211-+
     212-+   You can give `configure' initial values for configuration parameters
     213-+by setting variables in the command line or in the environment.  Here
     214-+is an example:
     215-+
     216-+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
     217-+
     218-+   *Note Defining Variables::, for more details.
     219-+
     220-+Compiling For Multiple Architectures
     221-+====================================
     222-+
     223-+   You can compile the package for more than one kind of computer at the
     224-+same time, by placing the object files for each architecture in their
     225-+own directory.  To do this, you can use GNU `make'.  `cd' to the
     226-+directory where you want the object files and executables to go and run
     227-+the `configure' script.  `configure' automatically checks for the
     228-+source code in the directory that `configure' is in and in `..'.  This
     229-+is known as a "VPATH" build.
     230-+
     231-+   With a non-GNU `make', it is safer to compile the package for one
     232-+architecture at a time in the source code directory.  After you have
     233-+installed the package for one architecture, use `make distclean' before
     234-+reconfiguring for another architecture.
     235-+
     236-+   On MacOS X 10.5 and later systems, you can create libraries and
     237-+executables that work on multiple system types--known as "fat" or
     238-+"universal" binaries--by specifying multiple `-arch' options to the
     239-+compiler but only a single `-arch' option to the preprocessor.  Like
     240-+this:
     241-+
     242-+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
     243-+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
     244-+                 CPP="gcc -E" CXXCPP="g++ -E"
     245-+
     246-+   This is not guaranteed to produce working output in all cases, you
     247-+may have to build one architecture at a time and combine the results
     248-+using the `lipo' tool if you have problems.
     249-+
     250-+Installation Names
     251-+==================
     252-+
     253-+   By default, `make install' installs the package's commands under
     254-+`/usr/local/bin', include files under `/usr/local/include', etc.  You
     255-+can specify an installation prefix other than `/usr/local' by giving
     256-+`configure' the option `--prefix=PREFIX', where PREFIX must be an
     257-+absolute file name.
     258-+
     259-+   You can specify separate installation prefixes for
     260-+architecture-specific files and architecture-independent files.  If you
     261-+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
     262-+PREFIX as the prefix for installing programs and libraries.
     263-+Documentation and other data files still use the regular prefix.
     264-+
     265-+   In addition, if you use an unusual directory layout you can give
     266-+options like `--bindir=DIR' to specify different values for particular
     267-+kinds of files.  Run `configure --help' for a list of the directories
     268-+you can set and what kinds of files go in them.  In general, the
     269-+default for these options is expressed in terms of `${prefix}', so that
     270-+specifying just `--prefix' will affect all of the other directory
     271-+specifications that were not explicitly provided.
     272-+
     273-+   The most portable way to affect installation locations is to pass the
     274-+correct locations to `configure'; however, many packages provide one or
     275-+both of the following shortcuts of passing variable assignments to the
     276-+`make install' command line to change installation locations without
     277-+having to reconfigure or recompile.
     278-+
     279-+   The first method involves providing an override variable for each
     280-+affected directory.  For example, `make install
     281-+prefix=/alternate/directory' will choose an alternate location for all
     282-+directory configuration variables that were expressed in terms of
     283-+`${prefix}'.  Any directories that were specified during `configure',
     284-+but not in terms of `${prefix}', must each be overridden at install
     285-+time for the entire installation to be relocated.  The approach of
     286-+makefile variable overrides for each directory variable is required by
     287-+the GNU Coding Standards, and ideally causes no recompilation.
     288-+However, some platforms have known limitations with the semantics of
     289-+shared libraries that end up requiring recompilation when using this
     290-+method, particularly noticeable in packages that use GNU Libtool.
     291-+
     292-+   The second method involves providing the `DESTDIR' variable.  For
     293-+example, `make install DESTDIR=/alternate/directory' will prepend
     294-+`/alternate/directory' before all installation names.  The approach of
     295-+`DESTDIR' overrides is not required by the GNU Coding Standards, and
     296-+does not work on platforms that have drive letters.  On the other hand,
     297-+it does better at avoiding recompilation issues, and works well even
     298-+when some directory options were not specified in terms of `${prefix}'
     299-+at `configure' time.
     300-+
     301-+Optional Features
     302-+=================
     303-+
     304-+   If the package supports it, you can cause programs to be installed
     305-+with an extra prefix or suffix on their names by giving `configure' the
     306-+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
     307-+
     308-+   Some packages pay attention to `--enable-FEATURE' options to
     309-+`configure', where FEATURE indicates an optional part of the package.
     310-+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
     311-+is something like `gnu-as' or `x' (for the X Window System).  The
     312-+`README' should mention any `--enable-' and `--with-' options that the
     313-+package recognizes.
     314-+
     315-+   For packages that use the X Window System, `configure' can usually
     316-+find the X include and library files automatically, but if it doesn't,
     317-+you can use the `configure' options `--x-includes=DIR' and
     318-+`--x-libraries=DIR' to specify their locations.
     319-+
     320-+   Some packages offer the ability to configure how verbose the
     321-+execution of `make' will be.  For these packages, running `./configure
     322-+--enable-silent-rules' sets the default to minimal output, which can be
     323-+overridden with `make V=1'; while running `./configure
     324-+--disable-silent-rules' sets the default to verbose, which can be
     325-+overridden with `make V=0'.
     326-+
     327-+Particular systems
     328-+==================
     329-+
     330-+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
     331-+CC is not installed, it is recommended to use the following options in
     332-+order to use an ANSI C compiler:
     333-+
     334-+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
     335-+
     336-+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
     337-+
     338-+   HP-UX `make' updates targets which have the same time stamps as
     339-+their prerequisites, which makes it generally unusable when shipped
     340-+generated files such as `configure' are involved.  Use GNU `make'
     341-+instead.
     342-+
     343-+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
     344-+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
     345-+a workaround.  If GNU CC is not installed, it is therefore recommended
     346-+to try
     347-+
     348-+     ./configure CC="cc"
     349-+
     350-+and if that doesn't work, try
     351-+
     352-+     ./configure CC="cc -nodtk"
     353-+
     354-+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
     355-+directory contains several dysfunctional programs; working variants of
     356-+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
     357-+in your `PATH', put it _after_ `/usr/bin'.
     358-+
     359-+   On Haiku, software installed for all users goes in `/boot/common',
     360-+not `/usr/local'.  It is recommended to use the following options:
     361-+
     362-+     ./configure --prefix=/boot/common
     363-+
     364-+Specifying the System Type
     365-+==========================
     366-+
     367-+   There may be some features `configure' cannot figure out
     368-+automatically, but needs to determine by the type of machine the package
     369-+will run on.  Usually, assuming the package is built to be run on the
     370-+_same_ architectures, `configure' can figure that out, but if it prints
     371-+a message saying it cannot guess the machine type, give it the
     372-+`--build=TYPE' option.  TYPE can either be a short name for the system
     373-+type, such as `sun4', or a canonical name which has the form:
     374-+
     375-+     CPU-COMPANY-SYSTEM
     376-+
     377-+where SYSTEM can have one of these forms:
     378-+
     379-+     OS
     380-+     KERNEL-OS
     381-+
     382-+   See the file `config.sub' for the possible values of each field.  If
     383-+`config.sub' isn't included in this package, then this package doesn't
     384-+need to know the machine type.
     385-+
     386-+   If you are _building_ compiler tools for cross-compiling, you should
     387-+use the option `--target=TYPE' to select the type of system they will
     388-+produce code for.
     389-+
     390-+   If you want to _use_ a cross compiler, that generates code for a
     391-+platform different from the build platform, you should specify the
     392-+"host" platform (i.e., that on which the generated programs will
     393-+eventually be run) with `--host=TYPE'.
     394-+
     395-+Sharing Defaults
     396-+================
     397-+
     398-+   If you want to set default values for `configure' scripts to share,
     399-+you can create a site shell script called `config.site' that gives
     400-+default values for variables like `CC', `cache_file', and `prefix'.
     401-+`configure' looks for `PREFIX/share/config.site' if it exists, then
     402-+`PREFIX/etc/config.site' if it exists.  Or, you can set the
     403-+`CONFIG_SITE' environment variable to the location of the site script.
     404-+A warning: not all `configure' scripts look for a site script.
     405-+
     406-+Defining Variables
     407-+==================
     408-+
     409-+   Variables not defined in a site shell script can be set in the
     410-+environment passed to `configure'.  However, some packages may run
     411-+configure again during the build, and the customized values of these
     412-+variables may be lost.  In order to avoid this problem, you should set
     413-+them in the `configure' command line, using `VAR=value'.  For example:
     414-+
     415-+     ./configure CC=/usr/local2/bin/gcc
     416-+
     417-+causes the specified `gcc' to be used as the C compiler (unless it is
     418-+overridden in the site shell script).
     419-+
     420-+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
     421-+an Autoconf bug.  Until the bug is fixed you can use this workaround:
     422-+
     423-+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
     424-+
     425-+`configure' Invocation
     426-+======================
     427-+
     428-+   `configure' recognizes the following options to control how it
     429-+operates.
     430-+
     431-+`--help'
     432-+`-h'
     433-+     Print a summary of all of the options to `configure', and exit.
     434-+
     435-+`--help=short'
     436-+`--help=recursive'
     437-+     Print a summary of the options unique to this package's
     438-+     `configure', and exit.  The `short' variant lists options used
     439-+     only in the top level, while the `recursive' variant lists options
     440-+     also present in any nested packages.
     441-+
     442-+`--version'
     443-+`-V'
     444-+     Print the version of Autoconf used to generate the `configure'
     445-+     script, and exit.
     446-+
     447-+`--cache-file=FILE'
     448-+     Enable the cache: use and save the results of the tests in FILE,
     449-+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
     450-+     disable caching.
     451-+
     452-+`--config-cache'
     453-+`-C'
     454-+     Alias for `--cache-file=config.cache'.
     455-+
     456-+`--quiet'
     457-+`--silent'
     458-+`-q'
     459-+     Do not print messages saying which checks are being made.  To
     460-+     suppress all normal output, redirect it to `/dev/null' (any error
     461-+     messages will still be shown).
     462-+
     463-+`--srcdir=DIR'
     464-+     Look for the package's source code in directory DIR.  Usually
     465-+     `configure' can determine that directory automatically.
     466-+
     467-+`--prefix=DIR'
     468-+     Use DIR as the installation prefix.  *note Installation Names::
     469-+     for more details, including other options available for fine-tuning
     470-+     the installation locations.
     471-+
     472-+`--no-create'
     473-+`-n'
     474-+     Run the configure checks, but stop before creating any output
     475-+     files.
     476-
     477--> I recently found a video showing Fedora booting with plymouth and I
     478--> liked it. So I wanted to use plymouth with my favorite distri (gentoo).
     479--> I know I'm enduser and the info text on freedesktop.org says plymouth
     480--> is not meant to be installed by end users but I want to give it a try.
     481--> I have KMS running and am using my own initramfs anyway (encrypted root
     482--> disk) so how hard can it be? Can anybody please give me some straight
     483--> forward hints on how to use plymouth? (The INSTALL file is empty and
     484--> the README file is boring)
     485-+`configure' also accepts some other, not widely useful, options.  Run
     486-+`configure --help' for more details.
     487-
     488--So the basic idea is you need to:
     489--
     490--1) build plymouth into the system.  On fedora we use these conffigure flags:
     491--
     492--.%configure  --enable-tracing --disable-tests --without-boot-entry \
     493--         --without-default-plugin                              \
     494--         --with-logo=%{_datadir}/pixmaps/system-logo-white.png \
     495--         --with-background-start-color-stop=0x0073B3           \
     496--         --with-background-end-color-stop=0x00457E             \
     497--         --with-background-color=0x3391cd                      \
     498--         --enable-gdm-transition                               \
     499--         --with-system-root-install                            \
     500--         --with-rhgb-compat-link
     501--
     502--%configure is a macro that expands to:
     503--
     504--./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
     505--
     506--(and some other stuff)
     507--
     508--%{_datadir} is just /usr/share
     509--
     510--You probably won't need --with-rhgb-compat-link since that's only
     511--there for compatibility with Fedora's old infrastructure.
     512--
     513----with-system-root-install makes plymouthd and plymouth install
     514--themselves into / instead of /usr.  This is important so that the
     515--plymouth client can work in cases where the root fs is mounted, but
     516--/usr isn't yet.
     517--
     518--Somehow you need to hook into your distros mkinitrd mechanism.   I
     519--mean you need to copy the plymouth binaries, plugins, and data files
     520--into the initrd everytime you rebuild your initrd. See
     521--plymouth-populate-initrd for how we do it on fedora (mkinitrd calls
     522--plymouth-populate-initrd).  I would like to upstream hooks for other
     523--distros mkinitrd systems, so the out of the box experience is easier.
     524--
     525--Inside the initrd, you need to start plymouthd early.  The earlier the
     526--better, but not before /sys, /proc/,  and /dev/pts are mounted, and
     527--not before /dev/tty[01] and /dev/fb0 are created.
     528--
     529--At some point during the initrd you need to load the kms driver.
     530--After it's loaded the graphics mode should get set up and /dev/fb0
     531--will be functional.  That's when you call plymouth --show-splash to
     532--show the splash screen.
     533--
     534--To decrypt your root, run
     535--
     536--lymouth ask-for-password --command="/sbin/cryptsetup luksOpen -T ..."
     537--
     538--where the --command is whatever makes sense for you.
     539--
     540--Right after you mount the root file system (but before you switch to it), run
     541--
     542--plymouth --newroot=/wherevertherootismounted
     543--
     544--This tells plymouth it can load some files off the real filesystem
     545--(like fonts, and stuff we don't want to stick in the initrd).
     546--
     547--while boot you need to run plymouth --update=some-milestone-id
     548--
     549--periodically to update the progress bar.
     550--
     551--When / is mounted read-write you need to run
     552--
     553--plymouth --sysinit
     554--
     555--Finally, when plymouth is done, you need to run plymouth --quit
     556--
     557--I have to run to catch a bus but i think that's the basics.
     558--
     559--> I'm even willing to give something back and convert your hints
     560--> into an easy step by step howto.
     561--That'd be great!
     562--
     563----Ray
     564---- a/aclocal.m4
     565-+++ b/aclocal.m4
     566+diff -Naur plymouth-0.8.2.orig/aclocal.m4 plymouth-0.8.2/aclocal.m4
     567+--- plymouth-0.8.2.orig/aclocal.m4     2010-04-12 18:45:07.000000000 +0100
     568++++ plymouth-0.8.2/aclocal.m4  2013-05-31 09:29:15.488093115 +0100
     569 @@ -1,7 +1,8 @@
     570 -# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
     571 +# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
     572@@ -5091,12620 +4620,12018 @@
     573       [m4_case([$1], [ustar],, [pax],,
     574                [m4_fatal([Unknown tar format])])
     575  AC_MSG_CHECKING([how to create a $1 tar archive])
     576---- a/config.h.in
     577-+++ b/config.h.in
     578-@@ -3,6 +3,10 @@
     579- /* TTY to use in boot mode */
     580- #undef BOOT_TTY
     581+diff -Naur plymouth-0.8.2.orig/build-tools/compile plymouth-0.8.2/build-tools/compile
     582+--- plymouth-0.8.2.orig/build-tools/compile    2010-02-23 16:52:04.000000000 +0000
     583++++ plymouth-0.8.2/build-tools/compile 2013-05-31 09:29:15.532093114 +0100
     584+@@ -1,10 +1,10 @@
     585+ #! /bin/sh
     586+-# Wrapper for compilers which do not understand `-c -o'.
     587++# Wrapper for compilers which do not understand '-c -o'.
     588 
     589-+/* Define to 1 if you have the declaration of `MSG_NOSIGNAL', and to 0 if you
     590-+   don't. */
     591-+#undef HAVE_DECL_MSG_NOSIGNAL
     592-+
     593- /* Define to 1 if you have the <dlfcn.h> header file. */
     594- #undef HAVE_DLFCN_H
     595+-scriptversion=2009-10-06.20; # UTC
     596++scriptversion=2012-01-04.17; # UTC
     597 
     598-@@ -12,6 +16,12 @@
     599- /* Define to 1 if you have the <memory.h> header file. */
     600- #undef HAVE_MEMORY_H
     601+-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
     602+-# Foundation, Inc.
     603++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
     604++# Software Foundation, Inc.
     605+ # Written by Tom Tromey <tromey@cygnus.com>.
     606+ #
     607+ # This program is free software; you can redistribute it and/or modify
     608+@@ -29,21 +29,186 @@
     609+ # bugs to <bug-automake@gnu.org> or send patches to
     610+ # <automake-patches@gnu.org>.
     611 
     612-+/* Define to 1 if you have the <ncursesw/term.h> header file. */
     613-+#undef HAVE_NCURSESW_TERM_H
     614++nl='
     615++'
     616 +
     617-+/* Define to 1 if you have the <ncurses/term.h> header file. */
     618-+#undef HAVE_NCURSES_TERM_H
     619++# We need space, tab and new line, in precisely that order.  Quoting is
     620++# there to prevent tools from complaining about whitespace usage.
     621++IFS=" ""      $nl"
     622 +
     623- /* Define to 1 if you have the <stdint.h> header file. */
     624- #undef HAVE_STDINT_H
     625-
     626-@@ -24,12 +34,18 @@
     627- /* Define to 1 if you have the <string.h> header file. */
     628- #undef HAVE_STRING_H
     629-
     630-+/* Define to 1 if you have the <sys/io.h> header file. */
     631-+#undef HAVE_SYS_IO_H
     632++file_conv=
     633 +
     634- /* Define to 1 if you have the <sys/stat.h> header file. */
     635- #undef HAVE_SYS_STAT_H
     636-
     637- /* Define to 1 if you have the <sys/types.h> header file. */
     638- #undef HAVE_SYS_TYPES_H
     639-
     640-+/* Define to 1 if you have the <term.h> header file. */
     641-+#undef HAVE_TERM_H
     642-+
     643- /* Define to 1 if you have the <unistd.h> header file. */
     644- #undef HAVE_UNISTD_H
     645-
     646-@@ -55,12 +71,24 @@
     647- /* Define to the one symbol short name of this package. */
     648- #undef PACKAGE_TARNAME
     649-
     650-+/* Define to the home page for this package. */
     651-+#undef PACKAGE_URL
     652++# func_file_conv build_file lazy
     653++# Convert a $build file to $host form and store it in $file
     654++# Currently only supports Windows hosts. If the determined conversion
     655++# type is listed in (the comma separated) LAZY, no conversion will
     656++# take place.
     657++func_file_conv ()
     658++{
     659++  file=$1
     660++  case $file in
     661++    / | /[!/]*) # absolute file, and not a UNC file
     662++      if test -z "$file_conv"; then
     663++      # lazily determine how to convert abs files
     664++      case `uname -s` in
     665++        MINGW*)
     666++          file_conv=mingw
     667++          ;;
     668++        CYGWIN*)
     669++          file_conv=cygwin
     670++          ;;
     671++        *)
     672++          file_conv=wine
     673++          ;;
     674++      esac
     675++      fi
     676++      case $file_conv/,$2, in
     677++      *,$file_conv,*)
     678++        ;;
     679++      mingw/*)
     680++        file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
     681++        ;;
     682++      cygwin/*)
     683++        file=`cygpath -m "$file" || echo "$file"`
     684++        ;;
     685++      wine/*)
     686++        file=`winepath -w "$file" || echo "$file"`
     687++        ;;
     688++      esac
     689++      ;;
     690++  esac
     691++}
     692 +
     693- /* Define to the version of this package. */
     694- #undef PACKAGE_VERSION
     695-
     696- /* Enable smooth transition to GDM */
     697- #undef PLY_ENABLE_GDM_TRANSITION
     698-
     699-+/* Enable support for libdrm_intel driver */
     700-+#undef PLY_ENABLE_LIBDRM_INTEL
     701++# func_cl_wrapper cl arg...
     702++# Adjust compile command to suit cl
     703++func_cl_wrapper ()
     704++{
     705++  # Assume a capable shell
     706++  lib_path=
     707++  shared=:
     708++  linker_opts=
     709++  for arg
     710++  do
     711++    if test -n "$eat"; then
     712++      eat=
     713++    else
     714++      case $1 in
     715++      -o)
     716++        # configure might choose to run compile as 'compile cc -o foo foo.c'.
     717++        eat=1
     718++        case $2 in
     719++          *.o | *.[oO][bB][jJ])
     720++            func_file_conv "$2"
     721++            set x "$@" -Fo"$file"
     722++            shift
     723++            ;;
     724++          *)
     725++            func_file_conv "$2"
     726++            set x "$@" -Fe"$file"
     727++            shift
     728++            ;;
     729++        esac
     730++        ;;
     731++      -I*)
     732++        func_file_conv "${1#-I}" mingw
     733++        set x "$@" -I"$file"
     734++        shift
     735++        ;;
     736++      -l*)
     737++        lib=${1#-l}
     738++        found=no
     739++        save_IFS=$IFS
     740++        IFS=';'
     741++        for dir in $lib_path $LIB
     742++        do
     743++          IFS=$save_IFS
     744++          if $shared && test -f "$dir/$lib.dll.lib"; then
     745++            found=yes
     746++            set x "$@" "$dir/$lib.dll.lib"
     747++            break
     748++          fi
     749++          if test -f "$dir/$lib.lib"; then
     750++            found=yes
     751++            set x "$@" "$dir/$lib.lib"
     752++            break
     753++          fi
     754++        done
     755++        IFS=$save_IFS
     756 +
     757-+/* Enable support for libdrm_nouveau driver */
     758-+#undef PLY_ENABLE_LIBDRM_NOUVEAU
     759++        test "$found" != yes && set x "$@" "$lib.lib"
     760++        shift
     761++        ;;
     762++      -L*)
     763++        func_file_conv "${1#-L}"
     764++        if test -z "$lib_path"; then
     765++          lib_path=$file
     766++        else
     767++          lib_path="$lib_path;$file"
     768++        fi
     769++        linker_opts="$linker_opts -LIBPATH:$file"
     770++        ;;
     771++      -static)
     772++        shared=false
     773++        ;;
     774++      -Wl,*)
     775++        arg=${1#-Wl,}
     776++        save_ifs="$IFS"; IFS=','
     777++        for flag in $arg; do
     778++          IFS="$save_ifs"
     779++          linker_opts="$linker_opts $flag"
     780++        done
     781++        IFS="$save_ifs"
     782++        ;;
     783++      -Xlinker)
     784++        eat=1
     785++        linker_opts="$linker_opts $2"
     786++        ;;
     787++      -*)
     788++        set x "$@" "$1"
     789++        shift
     790++        ;;
     791++      *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
     792++        func_file_conv "$1"
     793++        set x "$@" -Tp"$file"
     794++        shift
     795++        ;;
     796++      *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
     797++        func_file_conv "$1" mingw
     798++        set x "$@" "$file"
     799++        shift
     800++        ;;
     801++      *)
     802++        set x "$@" "$1"
     803++        shift
     804++        ;;
     805++      esac
     806++    fi
     807++    shift
     808++  done
     809++  if test -n "$linker_opts"; then
     810++    linker_opts="-link$linker_opts"
     811++  fi
     812++  exec "$@" $linker_opts
     813++  exit 1
     814++}
     815 +
     816-+/* Enable support for libdrm_radeon driver */
     817-+#undef PLY_ENABLE_LIBDRM_RADEON
     818++eat=
     819 +
     820- /* Build in verbose debug tracing spew */
     821- #undef PLY_ENABLE_TRACING
     822+ case $1 in
     823+   '')
     824+-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
     825++     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
     826+      exit 1;
     827+      ;;
     828+   -h | --h*)
     829+     cat <<\EOF
     830+ Usage: compile [--help] [--version] PROGRAM [ARGS]
     831 
     832---- a/configure
     833-+++ b/configure
     834-@@ -1,20 +1,22 @@
     835- #! /bin/sh
     836- # Guess values for system-dependent variables and create Makefiles.
     837--# Generated by GNU Autoconf 2.63 for plymouth 0.8.2.
     838-+# Generated by GNU Autoconf 2.69 for plymouth 0.8.2.
     839- #
     840- # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=plymouth>.
     841- #
     842--# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
     843--# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
     844-+#
     845-+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
     846-+#
     847-+#
     848- # This configure script is free software; the Free Software Foundation
     849- # gives unlimited permission to copy, distribute and modify it.
     850--## --------------------- ##
     851--## M4sh Initialization.  ##
     852--## --------------------- ##
     853-+## -------------------- ##
     854-+## M4sh Initialization. ##
     855-+## -------------------- ##
     856+-Wrapper for compilers which do not understand `-c -o'.
     857+-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
     858++Wrapper for compilers which do not understand '-c -o'.
     859++Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
     860+ arguments, and rename the output as expected.
     861 
     862- # Be more Bourne compatible
     863- DUALCASE=1; export DUALCASE # for MKS sh
     864--if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
     865-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
     866-   emulate sh
     867-   NULLCMD=:
     868-   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
     869-@@ -22,23 +24,15 @@
     870-   alias -g '${1+"$@"}'='"$@"'
     871-   setopt NO_GLOB_SUBST
     872- else
     873--  case `(set -o) 2>/dev/null` in
     874--  *posix*) set -o posix ;;
     875-+  case `(set -o) 2>/dev/null` in #(
     876-+  *posix*) :
     877-+    set -o posix ;; #(
     878-+  *) :
     879-+     ;;
     880+ If you are trying to build a whole package this is not the
     881+-right script to run: please start by reading the file `INSTALL'.
     882++right script to run: please start by reading the file 'INSTALL'.
     883+
     884+ Report bugs to <bug-automake@gnu.org>.
     885+ EOF
     886+@@ -53,11 +218,13 @@
     887+     echo "compile $scriptversion"
     888+     exit $?
     889+     ;;
     890++  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
     891++    func_cl_wrapper "$@"      # Doesn't return...
     892++    ;;
     893  esac
     894--
     895- fi
     896 
     897+ ofile=
     898+ cfile=
     899+-eat=
     900 
     901--
     902--
     903--# PATH needs CR
     904--# Avoid depending upon Character Ranges.
     905--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
     906--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
     907--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
     908--as_cr_digits='0123456789'
     909--as_cr_alnum=$as_cr_Letters$as_cr_digits
     910--
     911- as_nl='
     912- '
     913- export as_nl
     914-@@ -46,7 +40,13 @@
     915- as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
     916- as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
     917- as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
     918--if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
     919-+# Prefer a ksh shell builtin over an external printf program on Solaris,
     920-+# but without wasting forks for bash or zsh.
     921-+if test -z "$BASH_VERSION$ZSH_VERSION" \
     922-+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
     923-+  as_echo='print -r --'
     924-+  as_echo_n='print -rn --'
     925-+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
     926-   as_echo='printf %s\n'
     927-   as_echo_n='printf %s'
     928- else
     929-@@ -57,7 +57,7 @@
     930-     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     931-     as_echo_n_body='eval
     932-       arg=$1;
     933--      case $arg in
     934-+      case $arg in #(
     935-       *"$as_nl"*)
     936-       expr "X$arg" : "X\\(.*\\)$as_nl";
     937-       arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
     938-@@ -80,13 +80,6 @@
     939-   }
     940- fi
     941+ for arg
     942+ do
     943+@@ -66,8 +233,8 @@
     944+   else
     945+     case $1 in
     946+       -o)
     947+-      # configure might choose to run compile as `compile cc -o foo foo.c'.
     948+-      # So we strip `-o arg' only if arg is an object.
     949++      # configure might choose to run compile as 'compile cc -o foo foo.c'.
     950++      # So we strip '-o arg' only if arg is an object.
     951+       eat=1
     952+       case $2 in
     953+         *.o | *.obj)
     954+@@ -94,10 +261,10 @@
     955+ done
     956 
     957--# Support unset when possible.
     958--if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
     959--  as_unset=unset
     960--else
     961--  as_unset=false
     962--fi
     963--
     964+ if test -z "$ofile" || test -z "$cfile"; then
     965+-  # If no `-o' option was seen then we might have been invoked from a
     966++  # If no '-o' option was seen then we might have been invoked from a
     967+   # pattern rule where we don't need one.  That is ok -- this is a
     968+   # normal compilation that the losing compiler can handle.  If no
     969+-  # `.c' file was seen then we are probably linking.  That is also
     970++  # '.c' file was seen then we are probably linking.  That is also
     971+   # ok.
     972+   exec "$@"
     973+ fi
     974+@@ -106,7 +273,7 @@
     975+ cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
     976 
     977- # IFS
     978- # We need space, tab and new line, in precisely that order.  Quoting is
     979-@@ -96,15 +89,16 @@
     980- IFS=" ""      $as_nl"
     981+ # Create the lock directory.
     982+-# Note: use `[/\\:.-]' here to ensure that we don't use the same name
     983++# Note: use '[/\\:.-]' here to ensure that we don't use the same name
     984+ # that we are using for the .o file.  Also, base the name on the expected
     985+ # object file name, since that is what matters with a parallel build.
     986+ lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
     987+diff -Naur plymouth-0.8.2.orig/build-tools/config.guess plymouth-0.8.2/build-tools/config.guess
     988+--- plymouth-0.8.2.orig/build-tools/config.guess       2010-02-23 16:52:04.000000000 +0000
     989++++ plymouth-0.8.2/build-tools/config.guess    2013-05-31 09:29:15.508093115 +0100
     990+@@ -1,10 +1,10 @@
     991+ #! /bin/sh
     992+ # Attempt to guess a canonical system name.
     993+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     994+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
     995+-#   Free Software Foundation, Inc.
     996++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
     997++#   2011, 2012 Free Software Foundation, Inc.
     998 
     999- # Find who we are.  Look in the path if we contain no directory separator.
     1000--case $0 in
     1001-+as_myself=
     1002-+case $0 in #((
     1003-   *[\\/]* ) as_myself=$0 ;;
     1004-   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     1005- for as_dir in $PATH
     1006- do
     1007-   IFS=$as_save_IFS
     1008-   test -z "$as_dir" && as_dir=.
     1009--  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
     1010--done
     1011-+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
     1012-+  done
     1013- IFS=$as_save_IFS
     1014+-timestamp='2009-11-20'
     1015++timestamp='2012-02-10'
     1016 
     1017-      ;;
     1018-@@ -116,12 +110,16 @@
     1019- fi
     1020- if test ! -f "$as_myself"; then
     1021-   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
     1022--  { (exit 1); exit 1; }
     1023-+  exit 1
     1024- fi
     1025+ # This file is free software; you can redistribute it and/or modify it
     1026+ # under the terms of the GNU General Public License as published by
     1027+@@ -17,9 +17,7 @@
     1028+ # General Public License for more details.
     1029+ #
     1030+ # You should have received a copy of the GNU General Public License
     1031+-# along with this program; if not, write to the Free Software
     1032+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
     1033+-# 02110-1301, USA.
     1034++# along with this program; if not, see <http://www.gnu.org/licenses/>.
     1035+ #
     1036+ # As a special exception to the GNU General Public License, if you
     1037+ # distribute this file as part of a program that contains a
     1038+@@ -56,8 +54,9 @@
     1039+ GNU config.guess ($timestamp)
     1040 
     1041--# Work around bugs in pre-3.0 UWIN ksh.
     1042--for as_var in ENV MAIL MAILPATH
     1043--do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
     1044-+# Unset variables that we do not need and which cause bugs (e.g. in
     1045-+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
     1046-+# suppresses any "Segmentation fault" message there.  '((' could
     1047-+# trigger a bug in pdksh 5.2.14.
     1048-+for as_var in BASH_ENV ENV MAIL MAILPATH
     1049-+do eval test x\${$as_var+set} = xset \
     1050-+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
     1051- done
     1052- PS1='$ '
     1053- PS2='> '
     1054-@@ -133,7 +131,303 @@
     1055- LANGUAGE=C
     1056- export LANGUAGE
     1057+ Originally written by Per Bothner.
     1058+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
     1059+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
     1060++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
     1061++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
     1062++Free Software Foundation, Inc.
     1063 
     1064--# Required to use basename.
     1065-+# CDPATH.
     1066-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
     1067-+
     1068-+# Use a proper internal environment variable to ensure we don't fall
     1069-+  # into an infinite loop, continuously re-executing ourselves.
     1070-+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
     1071-+    _as_can_reexec=no; export _as_can_reexec;
     1072-+    # We cannot yet assume a decent shell, so we have to provide a
     1073-+# neutralization value for shells without unset; and this also
     1074-+# works around shells that cannot unset nonexistent variables.
     1075-+# Preserve -v and -x to the replacement shell.
     1076-+BASH_ENV=/dev/null
     1077-+ENV=/dev/null
     1078-+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
     1079-+case $- in # ((((
     1080-+  *v*x* | *x*v* ) as_opts=-vx ;;
     1081-+  *v* ) as_opts=-v ;;
     1082-+  *x* ) as_opts=-x ;;
     1083-+  * ) as_opts= ;;
     1084-+esac
     1085-+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
     1086-+# Admittedly, this is quite paranoid, since all the known shells bail
     1087-+# out after a failed `exec'.
     1088-+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
     1089-+as_fn_exit 255
     1090-+  fi
     1091-+  # We don't want this to propagate to other subprocesses.
     1092-+          { _as_can_reexec=; unset _as_can_reexec;}
     1093-+if test "x$CONFIG_SHELL" = x; then
     1094-+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
     1095-+  emulate sh
     1096-+  NULLCMD=:
     1097-+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
     1098-+  # is contrary to our usage.  Disable this feature.
     1099-+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
     1100-+  setopt NO_GLOB_SUBST
     1101-+else
     1102-+  case \`(set -o) 2>/dev/null\` in #(
     1103-+  *posix*) :
     1104-+    set -o posix ;; #(
     1105-+  *) :
     1106-+     ;;
     1107-+esac
     1108-+fi
     1109-+"
     1110-+  as_required="as_fn_return () { (exit \$1); }
     1111-+as_fn_success () { as_fn_return 0; }
     1112-+as_fn_failure () { as_fn_return 1; }
     1113-+as_fn_ret_success () { return 0; }
     1114-+as_fn_ret_failure () { return 1; }
     1115-+
     1116-+exitcode=0
     1117-+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
     1118-+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
     1119-+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
     1120-+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
     1121-+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
     1122-+
     1123-+else
     1124-+  exitcode=1; echo positional parameters were not saved.
     1125-+fi
     1126-+test x\$exitcode = x0 || exit 1
     1127-+test -x / || exit 1"
     1128-+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
     1129-+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
     1130-+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
     1131-+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
     1132-+test \$(( 1 + 1 )) = 2 || exit 1
     1133-+
     1134-+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
     1135-+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
     1136-+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
     1137-+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
     1138-+    PATH=/empty FPATH=/empty; export PATH FPATH
     1139-+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
     1140-+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
     1141-+  if (eval "$as_required") 2>/dev/null; then :
     1142-+  as_have_required=yes
     1143-+else
     1144-+  as_have_required=no
     1145-+fi
     1146-+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
     1147-+
     1148-+else
     1149-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     1150-+as_found=false
     1151-+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
     1152-+do
     1153-+  IFS=$as_save_IFS
     1154-+  test -z "$as_dir" && as_dir=.
     1155-+  as_found=:
     1156-+  case $as_dir in #(
     1157-+       /*)
     1158-+         for as_base in sh bash ksh sh5; do
     1159-+           # Try only shells that exist, to save several forks.
     1160-+           as_shell=$as_dir/$as_base
     1161-+           if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
     1162-+                  { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
     1163-+  CONFIG_SHELL=$as_shell as_have_required=yes
     1164-+                 if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
     1165-+  break 2
     1166-+fi
     1167-+fi
     1168-+         done;;
     1169-+       esac
     1170-+  as_found=false
     1171-+done
     1172-+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
     1173-+            { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
     1174-+  CONFIG_SHELL=$SHELL as_have_required=yes
     1175-+fi; }
     1176-+IFS=$as_save_IFS
     1177-+
     1178-+
     1179-+      if test "x$CONFIG_SHELL" != x; then :
     1180-+  export CONFIG_SHELL
     1181-+             # We cannot yet assume a decent shell, so we have to provide a
     1182-+# neutralization value for shells without unset; and this also
     1183-+# works around shells that cannot unset nonexistent variables.
     1184-+# Preserve -v and -x to the replacement shell.
     1185-+BASH_ENV=/dev/null
     1186-+ENV=/dev/null
     1187-+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
     1188-+case $- in # ((((
     1189-+  *v*x* | *x*v* ) as_opts=-vx ;;
     1190-+  *v* ) as_opts=-v ;;
     1191-+  *x* ) as_opts=-x ;;
     1192-+  * ) as_opts= ;;
     1193-+esac
     1194-+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
     1195-+# Admittedly, this is quite paranoid, since all the known shells bail
     1196-+# out after a failed `exec'.
     1197-+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
     1198-+exit 255
     1199-+fi
     1200-+
     1201-+    if test x$as_have_required = xno; then :
     1202-+  $as_echo "$0: This script requires a shell more modern than all"
     1203-+  $as_echo "$0: the shells that I found on your system."
     1204-+  if test x${ZSH_VERSION+set} = xset ; then
     1205-+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
     1206-+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
     1207-+  else
     1208-+    $as_echo "$0: Please tell bug-autoconf@gnu.org and
     1209-+$0: https://bugs.freedesktop.org/enter_bug.cgi?product=plymouth
     1210-+$0: about your system, including any error possibly output
     1211-+$0: before this message. Then install a modern shell, or
     1212-+$0: manually run the script under such a shell if you do
     1213-+$0: have one."
     1214-+  fi
     1215-+  exit 1
     1216-+fi
     1217-+fi
     1218-+fi
     1219-+SHELL=${CONFIG_SHELL-/bin/sh}
     1220-+export SHELL
     1221-+# Unset more variables known to interfere with behavior of common tools.
     1222-+CLICOLOR_FORCE= GREP_OPTIONS=
     1223-+unset CLICOLOR_FORCE GREP_OPTIONS
     1224-+
     1225-+## --------------------- ##
     1226-+## M4sh Shell Functions. ##
     1227-+## --------------------- ##
     1228-+# as_fn_unset VAR
     1229-+# ---------------
     1230-+# Portably unset VAR.
     1231-+as_fn_unset ()
     1232-+{
     1233-+  { eval $1=; unset $1;}
     1234-+}
     1235-+as_unset=as_fn_unset
     1236-+
     1237-+# as_fn_set_status STATUS
     1238-+# -----------------------
     1239-+# Set $? to STATUS, without forking.
     1240-+as_fn_set_status ()
     1241-+{
     1242-+  return $1
     1243-+} # as_fn_set_status
     1244-+
     1245-+# as_fn_exit STATUS
     1246-+# -----------------
     1247-+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
     1248-+as_fn_exit ()
     1249-+{
     1250-+  set +e
     1251-+  as_fn_set_status $1
     1252-+  exit $1
     1253-+} # as_fn_exit
     1254-+
     1255-+# as_fn_mkdir_p
     1256-+# -------------
     1257-+# Create "$as_dir" as a directory, including parents if necessary.
     1258-+as_fn_mkdir_p ()
     1259-+{
     1260-+
     1261-+  case $as_dir in #(
     1262-+  -*) as_dir=./$as_dir;;
     1263-+  esac
     1264-+  test -d "$as_dir" || eval $as_mkdir_p || {
     1265-+    as_dirs=
     1266-+    while :; do
     1267-+      case $as_dir in #(
     1268-+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
     1269-+      *) as_qdir=$as_dir;;
     1270-+      esac
     1271-+      as_dirs="'$as_qdir' $as_dirs"
     1272-+      as_dir=`$as_dirname -- "$as_dir" ||
     1273-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
     1274-+       X"$as_dir" : 'X\(//\)[^/]' \| \
     1275-+       X"$as_dir" : 'X\(//\)$' \| \
     1276-+       X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
     1277-+$as_echo X"$as_dir" |
     1278-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
     1279-+          s//\1/
     1280-+          q
     1281-+        }
     1282-+        /^X\(\/\/\)[^/].*/{
     1283-+          s//\1/
     1284-+          q
     1285-+        }
     1286-+        /^X\(\/\/\)$/{
     1287-+          s//\1/
     1288-+          q
     1289-+        }
     1290-+        /^X\(\/\).*/{
     1291-+          s//\1/
     1292-+          q
     1293-+        }
     1294-+        s/.*/./; q'`
     1295-+      test -d "$as_dir" && break
     1296-+    done
     1297-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
     1298-+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
     1299-+
     1300-+
     1301-+} # as_fn_mkdir_p
     1302-+
     1303-+# as_fn_executable_p FILE
     1304-+# -----------------------
     1305-+# Test if FILE is an executable regular file.
     1306-+as_fn_executable_p ()
     1307-+{
     1308-+  test -f "$1" && test -x "$1"
     1309-+} # as_fn_executable_p
     1310-+# as_fn_append VAR VALUE
     1311-+# ----------------------
     1312-+# Append the text in VALUE to the end of the definition contained in VAR. Take
     1313-+# advantage of any shell optimizations that allow amortized linear growth over
     1314-+# repeated appends, instead of the typical quadratic growth present in naive
     1315-+# implementations.
     1316-+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
     1317-+  eval 'as_fn_append ()
     1318-+  {
     1319-+    eval $1+=\$2
     1320-+  }'
     1321-+else
     1322-+  as_fn_append ()
     1323-+  {
     1324-+    eval $1=\$$1\$2
     1325-+  }
     1326-+fi # as_fn_append
     1327-+
     1328-+# as_fn_arith ARG...
     1329-+# ------------------
     1330-+# Perform arithmetic evaluation on the ARGs, and store the result in the
     1331-+# global $as_val. Take advantage of shells that can avoid forks. The arguments
     1332-+# must be portable across $(()) and expr.
     1333-+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
     1334-+  eval 'as_fn_arith ()
     1335-+  {
     1336-+    as_val=$(( $* ))
     1337-+  }'
     1338-+else
     1339-+  as_fn_arith ()
     1340-+  {
     1341-+    as_val=`expr "$@" || test $? -eq 1`
     1342-+  }
     1343-+fi # as_fn_arith
     1344-+
     1345-+
     1346-+# as_fn_error STATUS ERROR [LINENO LOG_FD]
     1347-+# ----------------------------------------
     1348-+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
     1349-+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
     1350-+# script with STATUS, using 1 if that was 0.
     1351-+as_fn_error ()
     1352-+{
     1353-+  as_status=$1; test $as_status -eq 0 && as_status=1
     1354-+  if test "$4"; then
     1355-+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     1356-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
     1357-+  fi
     1358-+  $as_echo "$as_me: error: $2" >&2
     1359-+  as_fn_exit $as_status
     1360-+} # as_fn_error
     1361+ This is free software; see the source for copying conditions.  There is NO
     1362+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     1363+@@ -144,7 +143,7 @@
     1364+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     1365+     *:NetBSD:*:*)
     1366+       # NetBSD (nbsd) targets should (where applicable) match one or
     1367+-      # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
     1368++      # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
     1369+       # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
     1370+       # switched to ELF, *-*-netbsd* would select the old
     1371+       # object file format.  This provides both forward
     1372+@@ -180,7 +179,7 @@
     1373+               fi
     1374+               ;;
     1375+           *)
     1376+-              os=netbsd
     1377++              os=netbsd
     1378+               ;;
     1379+       esac
     1380+       # The OS release
     1381+@@ -223,7 +222,7 @@
     1382+               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
     1383+               ;;
     1384+       *5.*)
     1385+-              UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
     1386++              UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
     1387+               ;;
     1388+       esac
     1389+       # According to Compaq, /usr/sbin/psrinfo has been available on
     1390+@@ -269,7 +268,10 @@
     1391+       # A Xn.n version is an unreleased experimental baselevel.
     1392+       # 1.2 uses "1.2" for uname -r.
     1393+       echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
     1394+-      exit ;;
     1395++      # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
     1396++      exitcode=$?
     1397++      trap '' 0
     1398++      exit $exitcode ;;
     1399+     Alpha\ *:Windows_NT*:*)
     1400+       # How do we know it's Interix rather than the generic POSIX subsystem?
     1401+       # Should we change UNAME_MACHINE based on the output of uname instead
     1402+@@ -295,7 +297,7 @@
     1403+       echo s390-ibm-zvmoe
     1404+       exit ;;
     1405+     *:OS400:*:*)
     1406+-        echo powerpc-ibm-os400
     1407++      echo powerpc-ibm-os400
     1408+       exit ;;
     1409+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
     1410+       echo arm-acorn-riscix${UNAME_RELEASE}
     1411+@@ -394,23 +396,23 @@
     1412+     # MiNT.  But MiNT is downward compatible to TOS, so this should
     1413+     # be no problem.
     1414+     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
     1415+-        echo m68k-atari-mint${UNAME_RELEASE}
     1416++      echo m68k-atari-mint${UNAME_RELEASE}
     1417+       exit ;;
     1418+     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
     1419+       echo m68k-atari-mint${UNAME_RELEASE}
     1420+-        exit ;;
     1421++      exit ;;
     1422+     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
     1423+-        echo m68k-atari-mint${UNAME_RELEASE}
     1424++      echo m68k-atari-mint${UNAME_RELEASE}
     1425+       exit ;;
     1426+     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
     1427+-        echo m68k-milan-mint${UNAME_RELEASE}
     1428+-        exit ;;
     1429++      echo m68k-milan-mint${UNAME_RELEASE}
     1430++      exit ;;
     1431+     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
     1432+-        echo m68k-hades-mint${UNAME_RELEASE}
     1433+-        exit ;;
     1434++      echo m68k-hades-mint${UNAME_RELEASE}
     1435++      exit ;;
     1436+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
     1437+-        echo m68k-unknown-mint${UNAME_RELEASE}
     1438+-        exit ;;
     1439++      echo m68k-unknown-mint${UNAME_RELEASE}
     1440++      exit ;;
     1441+     m68k:machten:*:*)
     1442+       echo m68k-apple-machten${UNAME_RELEASE}
     1443+       exit ;;
     1444+@@ -480,8 +482,8 @@
     1445+       echo m88k-motorola-sysv3
     1446+       exit ;;
     1447+     AViiON:dgux:*:*)
     1448+-        # DG/UX returns AViiON for all architectures
     1449+-        UNAME_PROCESSOR=`/usr/bin/uname -p`
     1450++      # DG/UX returns AViiON for all architectures
     1451++      UNAME_PROCESSOR=`/usr/bin/uname -p`
     1452+       if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
     1453+       then
     1454+           if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
     1455+@@ -494,7 +496,7 @@
     1456+       else
     1457+           echo i586-dg-dgux${UNAME_RELEASE}
     1458+       fi
     1459+-      exit ;;
     1460++      exit ;;
     1461+     M88*:DolphinOS:*:*)       # DolphinOS (SVR3)
     1462+       echo m88k-dolphin-sysv3
     1463+       exit ;;
     1464+@@ -551,7 +553,7 @@
     1465+               echo rs6000-ibm-aix3.2
     1466+       fi
     1467+       exit ;;
     1468+-    *:AIX:*:[456])
     1469++    *:AIX:*:[4567])
     1470+       IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
     1471+       if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
     1472+               IBM_ARCH=rs6000
     1473+@@ -594,52 +596,52 @@
     1474+           9000/[678][0-9][0-9])
     1475+               if [ -x /usr/bin/getconf ]; then
     1476+                   sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
     1477+-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
     1478+-                    case "${sc_cpu_version}" in
     1479+-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
     1480+-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
     1481+-                      532)                      # CPU_PA_RISC2_0
     1482+-                        case "${sc_kernel_bits}" in
     1483+-                          32) HP_ARCH="hppa2.0n" ;;
     1484+-                          64) HP_ARCH="hppa2.0w" ;;
     1485++                  sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
     1486++                  case "${sc_cpu_version}" in
     1487++                    523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
     1488++                    528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
     1489++                    532)                      # CPU_PA_RISC2_0
     1490++                      case "${sc_kernel_bits}" in
     1491++                        32) HP_ARCH="hppa2.0n" ;;
     1492++                        64) HP_ARCH="hppa2.0w" ;;
     1493+                         '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
     1494+-                        esac ;;
     1495+-                    esac
     1496++                      esac ;;
     1497++                  esac
     1498+               fi
     1499+               if [ "${HP_ARCH}" = "" ]; then
     1500+                   eval $set_cc_for_build
     1501+-                  sed 's/^              //' << EOF >$dummy.c
     1502++                  sed 's/^            //' << EOF >$dummy.c
     1503 +
     1504- if expr a : '\(a\)' >/dev/null 2>&1 &&
     1505-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
     1506-   as_expr=expr
     1507-@@ -147,8 +441,12 @@
     1508-   as_basename=false
     1509- fi
     1510-
     1511-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
     1512-+  as_dirname=dirname
     1513-+else
     1514-+  as_dirname=false
     1515-+fi
     1516-
     1517--# Name of the executable.
     1518- as_me=`$as_basename -- "$0" ||
     1519- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
     1520-        X"$0" : 'X\(//\)$' \| \
     1521-@@ -168,566 +466,115 @@
     1522-         }
     1523-         s/.*/./; q'`
     1524-
     1525--# CDPATH.
     1526--$as_unset CDPATH
     1527-+# Avoid depending upon Character Ranges.
     1528-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
     1529-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
     1530-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
     1531-+as_cr_digits='0123456789'
     1532-+as_cr_alnum=$as_cr_Letters$as_cr_digits
     1533-
     1534-
     1535--if test "x$CONFIG_SHELL" = x; then
     1536--  if (eval ":") 2>/dev/null; then
     1537--  as_have_required=yes
     1538--else
     1539--  as_have_required=no
     1540--fi
     1541-+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
     1542-+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
     1543-+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
     1544-+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
     1545-+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
     1546-+  sed -n '
     1547-+    p
     1548-+    /[$]LINENO/=
     1549-+  ' <$as_myself |
     1550-+    sed '
     1551-+      s/[$]LINENO.*/&-/
     1552-+      t lineno
     1553-+      b
     1554-+      :lineno
     1555-+      N
     1556-+      :loop
     1557-+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
     1558-+      t loop
     1559-+      s/-\n.*//
     1560-+    ' >$as_me.lineno &&
     1561-+  chmod +x "$as_me.lineno" ||
     1562-+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
     1563-
     1564--  if test $as_have_required = yes &&   (eval ":
     1565--(as_func_return () {
     1566--  (exit \$1)
     1567--}
     1568--as_func_success () {
     1569--  as_func_return 0
     1570--}
     1571--as_func_failure () {
     1572--  as_func_return 1
     1573--}
     1574--as_func_ret_success () {
     1575--  return 0
     1576--}
     1577--as_func_ret_failure () {
     1578--  return 1
     1579-+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
     1580-+  # already done that, so ensure we don't try to do so again and fall
     1581-+  # in an infinite loop.  This has already happened in practice.
     1582-+  _as_can_reexec=no; export _as_can_reexec
     1583-+  # Don't try to exec as it changes $[0], causing all sort of problems
     1584-+  # (the dirname of $[0] is not the place where we might find the
     1585-+  # original and so on.  Autoconf is especially sensitive to this).
     1586-+  . "./$as_me.lineno"
     1587-+  # Exit status is that of the last command.
     1588-+  exit
     1589- }
     1590-
     1591--exitcode=0
     1592--if as_func_success; then
     1593--  :
     1594--else
     1595--  exitcode=1
     1596--  echo as_func_success failed.
     1597--fi
     1598--
     1599--if as_func_failure; then
     1600--  exitcode=1
     1601--  echo as_func_failure succeeded.
     1602--fi
     1603-+ECHO_C= ECHO_N= ECHO_T=
     1604-+case `echo -n x` in #(((((
     1605-+-n*)
     1606-+  case `echo 'xy\c'` in
     1607-+  *c*) ECHO_T='       ';;     # ECHO_T is single tab character.
     1608-+  xy)  ECHO_C='\c';;
     1609-+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
     1610-+       ECHO_T='       ';;
     1611-+  esac;;
     1612-+*)
     1613-+  ECHO_N='-n';;
     1614-+esac
     1615++              #define _HPUX_SOURCE
     1616++              #include <stdlib.h>
     1617++              #include <unistd.h>
     1618 
     1619--if as_func_ret_success; then
     1620--  :
     1621-+rm -f conf$$ conf$$.exe conf$$.file
     1622-+if test -d conf$$.dir; then
     1623-+  rm -f conf$$.dir/conf$$.file
     1624- else
     1625--  exitcode=1
     1626--  echo as_func_ret_success failed.
     1627--fi
     1628--
     1629--if as_func_ret_failure; then
     1630--  exitcode=1
     1631--  echo as_func_ret_failure succeeded.
     1632-+  rm -f conf$$.dir
     1633-+  mkdir conf$$.dir 2>/dev/null
     1634- fi
     1635+-              #define _HPUX_SOURCE
     1636+-              #include <stdlib.h>
     1637+-              #include <unistd.h>
     1638 -
     1639--if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
     1640--  :
     1641-+if (echo >conf$$.file) 2>/dev/null; then
     1642-+  if ln -s conf$$.file conf$$ 2>/dev/null; then
     1643-+    as_ln_s='ln -s'
     1644-+    # ... but there are two gotchas:
     1645-+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     1646-+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
     1647-+    # In both cases, we have to default to `cp -pR'.
     1648-+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
     1649-+      as_ln_s='cp -pR'
     1650-+  elif ln conf$$.file conf$$ 2>/dev/null; then
     1651-+    as_ln_s=ln
     1652-+  else
     1653-+    as_ln_s='cp -pR'
     1654-+  fi
     1655- else
     1656--  exitcode=1
     1657--  echo positional parameters were not saved.
     1658-+  as_ln_s='cp -pR'
     1659- fi
     1660-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
     1661-+rmdir conf$$.dir 2>/dev/null
     1662-
     1663--test \$exitcode = 0) || { (exit 1); exit 1; }
     1664+-              int main ()
     1665+-              {
     1666+-              #if defined(_SC_KERNEL_BITS)
     1667+-                  long bits = sysconf(_SC_KERNEL_BITS);
     1668+-              #endif
     1669+-                  long cpu  = sysconf (_SC_CPU_VERSION);
     1670 -
     1671--(
     1672--  as_lineno_1=\$LINENO
     1673--  as_lineno_2=\$LINENO
     1674--  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
     1675--  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
     1676--") 2> /dev/null; then
     1677--  :
     1678-+if mkdir -p . 2>/dev/null; then
     1679-+  as_mkdir_p='mkdir -p "$as_dir"'
     1680- else
     1681--  as_candidate_shells=
     1682--    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     1683--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
     1684--do
     1685--  IFS=$as_save_IFS
     1686--  test -z "$as_dir" && as_dir=.
     1687--  case $as_dir in
     1688--       /*)
     1689--         for as_base in sh bash ksh sh5; do
     1690--           as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
     1691--         done;;
     1692--       esac
     1693--done
     1694--IFS=$as_save_IFS
     1695-+  test -d ./-p && rmdir ./-p
     1696-+  as_mkdir_p=false
     1697-+fi
     1698-
     1699-+as_test_x='test -x'
     1700-+as_executable_p=as_fn_executable_p
     1701-
     1702--      for as_shell in $as_candidate_shells $SHELL; do
     1703--       # Try only shells that exist, to save several forks.
     1704--       if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
     1705--              { ("$as_shell") 2> /dev/null <<\_ASEOF
     1706--if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
     1707--  emulate sh
     1708--  NULLCMD=:
     1709--  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
     1710--  # is contrary to our usage.  Disable this feature.
     1711--  alias -g '${1+"$@"}'='"$@"'
     1712--  setopt NO_GLOB_SUBST
     1713--else
     1714--  case `(set -o) 2>/dev/null` in
     1715--  *posix*) set -o posix ;;
     1716--esac
     1717-+# Sed expression to map a string onto a valid CPP name.
     1718-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
     1719-
     1720--fi
     1721-+# Sed expression to map a string onto a valid variable name.
     1722-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
     1723-
     1724-+SHELL=${CONFIG_SHELL-/bin/sh}
     1725-
     1726--:
     1727--_ASEOF
     1728--}; then
     1729--  CONFIG_SHELL=$as_shell
     1730--             as_have_required=yes
     1731--             if { "$as_shell" 2> /dev/null <<\_ASEOF
     1732--if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
     1733--  emulate sh
     1734--  NULLCMD=:
     1735--  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
     1736--  # is contrary to our usage.  Disable this feature.
     1737--  alias -g '${1+"$@"}'='"$@"'
     1738--  setopt NO_GLOB_SUBST
     1739--else
     1740--  case `(set -o) 2>/dev/null` in
     1741--  *posix*) set -o posix ;;
     1742--esac
     1743-
     1744--fi
     1745-+test -n "$DJDIR" || exec 7<&0 </dev/null
     1746-+exec 6>&1
     1747-
     1748--
     1749--:
     1750--(as_func_return () {
     1751--  (exit $1)
     1752--}
     1753--as_func_success () {
     1754--  as_func_return 0
     1755--}
     1756--as_func_failure () {
     1757--  as_func_return 1
     1758--}
     1759--as_func_ret_success () {
     1760--  return 0
     1761--}
     1762--as_func_ret_failure () {
     1763--  return 1
     1764--}
     1765--
     1766--exitcode=0
     1767--if as_func_success; then
     1768--  :
     1769--else
     1770--  exitcode=1
     1771--  echo as_func_success failed.
     1772--fi
     1773--
     1774--if as_func_failure; then
     1775--  exitcode=1
     1776--  echo as_func_failure succeeded.
     1777--fi
     1778--
     1779--if as_func_ret_success; then
     1780--  :
     1781--else
     1782--  exitcode=1
     1783--  echo as_func_ret_success failed.
     1784--fi
     1785--
     1786--if as_func_ret_failure; then
     1787--  exitcode=1
     1788--  echo as_func_ret_failure succeeded.
     1789--fi
     1790--
     1791--if ( set x; as_func_ret_success y && test x = "$1" ); then
     1792--  :
     1793--else
     1794--  exitcode=1
     1795--  echo positional parameters were not saved.
     1796--fi
     1797--
     1798--test $exitcode = 0) || { (exit 1); exit 1; }
     1799--
     1800--(
     1801--  as_lineno_1=$LINENO
     1802--  as_lineno_2=$LINENO
     1803--  test "x$as_lineno_1" != "x$as_lineno_2" &&
     1804--  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
     1805--
     1806--_ASEOF
     1807--}; then
     1808--  break
     1809--fi
     1810--
     1811--fi
     1812--
     1813--      done
     1814--
     1815--      if test "x$CONFIG_SHELL" != x; then
     1816--  for as_var in BASH_ENV ENV
     1817--      do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
     1818--      done
     1819--      export CONFIG_SHELL
     1820--      exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
     1821--fi
     1822--
     1823--
     1824--    if test $as_have_required = no; then
     1825--  echo This script requires a shell more modern than all the
     1826--      echo shells that I found on your system.  Please install a
     1827--      echo modern shell, or manually run the script under such a
     1828--      echo shell if you do have one.
     1829--      { (exit 1); exit 1; }
     1830--fi
     1831--
     1832--
     1833--fi
     1834--
     1835--fi
     1836--
     1837--
     1838--
     1839--(eval "as_func_return () {
     1840--  (exit \$1)
     1841--}
     1842--as_func_success () {
     1843--  as_func_return 0
     1844--}
     1845--as_func_failure () {
     1846--  as_func_return 1
     1847--}
     1848--as_func_ret_success () {
     1849--  return 0
     1850--}
     1851--as_func_ret_failure () {
     1852--  return 1
     1853--}
     1854--
     1855--exitcode=0
     1856--if as_func_success; then
     1857--  :
     1858--else
     1859--  exitcode=1
     1860--  echo as_func_success failed.
     1861--fi
     1862--
     1863--if as_func_failure; then
     1864--  exitcode=1
     1865--  echo as_func_failure succeeded.
     1866--fi
     1867--
     1868--if as_func_ret_success; then
     1869--  :
     1870--else
     1871--  exitcode=1
     1872--  echo as_func_ret_success failed.
     1873--fi
     1874--
     1875--if as_func_ret_failure; then
     1876--  exitcode=1
     1877--  echo as_func_ret_failure succeeded.
     1878--fi
     1879--
     1880--if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
     1881--  :
     1882--else
     1883--  exitcode=1
     1884--  echo positional parameters were not saved.
     1885--fi
     1886--
     1887--test \$exitcode = 0") || {
     1888--  echo No shell found that supports shell functions.
     1889--  echo Please tell bug-autoconf@gnu.org about your system,
     1890--  echo including any error possibly output before this message.
     1891--  echo This can help us improve future autoconf versions.
     1892--  echo Configuration will now proceed without shell functions.
     1893--}
     1894--
     1895--
     1896--
     1897--  as_lineno_1=$LINENO
     1898--  as_lineno_2=$LINENO
     1899--  test "x$as_lineno_1" != "x$as_lineno_2" &&
     1900--  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
     1901--
     1902--  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
     1903--  # uniformly replaced by the line number.  The first 'sed' inserts a
     1904--  # line-number line after each line using $LINENO; the second 'sed'
     1905--  # does the real work.  The second script uses 'N' to pair each
     1906--  # line-number line with the line containing $LINENO, and appends
     1907--  # trailing '-' during substitution so that $LINENO is not a special
     1908--  # case at line end.
     1909--  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
     1910--  # scripts with optimization help from Paolo Bonzini.  Blame Lee
     1911--  # E. McMahon (1931-1989) for sed's syntax.  :-)
     1912--  sed -n '
     1913--    p
     1914--    /[$]LINENO/=
     1915--  ' <$as_myself |
     1916--    sed '
     1917--      s/[$]LINENO.*/&-/
     1918--      t lineno
     1919--      b
     1920--      :lineno
     1921--      N
     1922--      :loop
     1923--      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
     1924--      t loop
     1925--      s/-\n.*//
     1926--    ' >$as_me.lineno &&
     1927--  chmod +x "$as_me.lineno" ||
     1928--    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
     1929--   { (exit 1); exit 1; }; }
     1930--
     1931--  # Don't try to exec as it changes $[0], causing all sort of problems
     1932--  # (the dirname of $[0] is not the place where we might find the
     1933--  # original and so on.  Autoconf is especially sensitive to this).
     1934--  . "./$as_me.lineno"
     1935--  # Exit status is that of the last command.
     1936--  exit
     1937--}
     1938--
     1939--
     1940--if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
     1941--  as_dirname=dirname
     1942--else
     1943--  as_dirname=false
     1944--fi
     1945--
     1946--ECHO_C= ECHO_N= ECHO_T=
     1947--case `echo -n x` in
     1948---n*)
     1949--  case `echo 'x\c'` in
     1950--  *c*) ECHO_T='       ';;     # ECHO_T is single tab character.
     1951--  *)   ECHO_C='\c';;
     1952--  esac;;
     1953--*)
     1954--  ECHO_N='-n';;
     1955--esac
     1956--if expr a : '\(a\)' >/dev/null 2>&1 &&
     1957--   test "X`expr 00001 : '.*\(...\)'`" = X001; then
     1958--  as_expr=expr
     1959--else
     1960--  as_expr=false
     1961--fi
     1962--
     1963--rm -f conf$$ conf$$.exe conf$$.file
     1964--if test -d conf$$.dir; then
     1965--  rm -f conf$$.dir/conf$$.file
     1966--else
     1967--  rm -f conf$$.dir
     1968--  mkdir conf$$.dir 2>/dev/null
     1969--fi
     1970--if (echo >conf$$.file) 2>/dev/null; then
     1971--  if ln -s conf$$.file conf$$ 2>/dev/null; then
     1972--    as_ln_s='ln -s'
     1973--    # ... but there are two gotchas:
     1974--    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     1975--    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
     1976--    # In both cases, we have to default to `cp -p'.
     1977--    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
     1978--      as_ln_s='cp -p'
     1979--  elif ln conf$$.file conf$$ 2>/dev/null; then
     1980--    as_ln_s=ln
     1981--  else
     1982--    as_ln_s='cp -p'
     1983--  fi
     1984--else
     1985--  as_ln_s='cp -p'
     1986--fi
     1987--rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
     1988--rmdir conf$$.dir 2>/dev/null
     1989--
     1990--if mkdir -p . 2>/dev/null; then
     1991--  as_mkdir_p=:
     1992--else
     1993--  test -d ./-p && rmdir ./-p
     1994--  as_mkdir_p=false
     1995--fi
     1996--
     1997--if test -x / >/dev/null 2>&1; then
     1998--  as_test_x='test -x'
     1999--else
     2000--  if ls -dL / >/dev/null 2>&1; then
     2001--    as_ls_L_option=L
     2002--  else
     2003--    as_ls_L_option=
     2004--  fi
     2005--  as_test_x='
     2006--    eval sh -c '\''
     2007--      if test -d "$1"; then
     2008--      test -d "$1/.";
     2009--      else
     2010--      case $1 in
     2011--      -*)set "./$1";;
     2012--      esac;
     2013--      case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
     2014--      ???[sx]*):;;*)false;;esac;fi
     2015--    '\'' sh
     2016--  '
     2017--fi
     2018--as_executable_p=$as_test_x
     2019--
     2020--# Sed expression to map a string onto a valid CPP name.
     2021--as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
     2022--
     2023--# Sed expression to map a string onto a valid variable name.
     2024--as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
     2025--
     2026--
     2027--
     2028--
     2029--# Check that we are running under the correct shell.
     2030--SHELL=${CONFIG_SHELL-/bin/sh}
     2031--
     2032--case X$lt_ECHO in
     2033--X*--fallback-echo)
     2034--  # Remove one level of quotation (which was required for Make).
     2035--  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
     2036--  ;;
     2037--esac
     2038--
     2039--ECHO=${lt_ECHO-echo}
     2040--if test "X$1" = X--no-reexec; then
     2041--  # Discard the --no-reexec flag, and continue.
     2042--  shift
     2043--elif test "X$1" = X--fallback-echo; then
     2044--  # Avoid inline document here, it may be left over
     2045--  :
     2046--elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
     2047--  # Yippee, $ECHO works!
     2048--  :
     2049--else
     2050--  # Restart under the correct shell.
     2051--  exec $SHELL "$0" --no-reexec ${1+"$@"}
     2052--fi
     2053--
     2054--if test "X$1" = X--fallback-echo; then
     2055--  # used as fallback echo
     2056--  shift
     2057--  cat <<_LT_EOF
     2058--$*
     2059--_LT_EOF
     2060--  exit 0
     2061--fi
     2062--
     2063--# The HP-UX ksh and POSIX shell print the target directory to stdout
     2064--# if CDPATH is set.
     2065--(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
     2066--
     2067--if test -z "$lt_ECHO"; then
     2068--  if test "X${echo_test_string+set}" != Xset; then
     2069--    # find a string as large as possible, as long as the shell can cope with it
     2070--    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
     2071--      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
     2072--      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
     2073--       { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
     2074--      then
     2075--        break
     2076--      fi
     2077--    done
     2078--  fi
     2079--
     2080--  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
     2081--     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
     2082--     test "X$echo_testing_string" = "X$echo_test_string"; then
     2083--    :
     2084--  else
     2085--    # The Solaris, AIX, and Digital Unix default echo programs unquote
     2086--    # backslashes.  This makes it impossible to quote backslashes using
     2087--    #   echo "$something" | sed 's/\\/\\\\/g'
     2088--    #
     2089--    # So, first we look for a working echo in the user's PATH.
     2090--
     2091--    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
     2092--    for dir in $PATH /usr/ucb; do
     2093--      IFS="$lt_save_ifs"
     2094--      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
     2095--         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
     2096--         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
     2097--         test "X$echo_testing_string" = "X$echo_test_string"; then
     2098--        ECHO="$dir/echo"
     2099--        break
     2100--      fi
     2101--    done
     2102--    IFS="$lt_save_ifs"
     2103--
     2104--    if test "X$ECHO" = Xecho; then
     2105--      # We didn't find a better echo, so look for alternatives.
     2106--      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
     2107--         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
     2108--         test "X$echo_testing_string" = "X$echo_test_string"; then
     2109--        # This shell has a builtin print -r that does the trick.
     2110--        ECHO='print -r'
     2111--      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
     2112--         test "X$CONFIG_SHELL" != X/bin/ksh; then
     2113--        # If we have ksh, try running configure again with it.
     2114--        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
     2115--        export ORIGINAL_CONFIG_SHELL
     2116--        CONFIG_SHELL=/bin/ksh
     2117--        export CONFIG_SHELL
     2118--        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
     2119--      else
     2120--        # Try using printf.
     2121--        ECHO='printf %s\n'
     2122--        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
     2123--         echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
     2124--         test "X$echo_testing_string" = "X$echo_test_string"; then
     2125--        # Cool, printf works
     2126--        :
     2127--        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
     2128--           test "X$echo_testing_string" = 'X\t' &&
     2129--           echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
     2130--           test "X$echo_testing_string" = "X$echo_test_string"; then
     2131--        CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
     2132--        export CONFIG_SHELL
     2133--        SHELL="$CONFIG_SHELL"
     2134--        export SHELL
     2135--        ECHO="$CONFIG_SHELL $0 --fallback-echo"
     2136--        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
     2137--           test "X$echo_testing_string" = 'X\t' &&
     2138--           echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
     2139--           test "X$echo_testing_string" = "X$echo_test_string"; then
     2140--        ECHO="$CONFIG_SHELL $0 --fallback-echo"
     2141--        else
     2142--        # maybe with a smaller string...
     2143--        prev=:
     2144--
     2145--        for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
     2146--          if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
     2147--          then
     2148--            break
     2149--          fi
     2150--          prev="$cmd"
     2151--        done
     2152--
     2153--        if test "$prev" != 'sed 50q "$0"'; then
     2154--          echo_test_string=`eval $prev`
     2155--          export echo_test_string
     2156--          exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
     2157--        else
     2158--          # Oops.  We lost completely, so just stick with echo.
     2159--          ECHO=echo
     2160--        fi
     2161--        fi
     2162--      fi
     2163--    fi
     2164--  fi
     2165--fi
     2166--
     2167--# Copy echo and quote the copy suitably for passing to libtool from
     2168--# the Makefile, instead of quoting the original, which is used later.
     2169--lt_ECHO=$ECHO
     2170--if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
     2171--   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
     2172--fi
     2173--
     2174--
     2175--
     2176--
     2177--exec 7<&0 </dev/null 6>&1
     2178--
     2179--# Name of the host.
     2180--# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
     2181--# so uname gets run too.
     2182--ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
     2183-+# Name of the host.
     2184-+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
     2185-+# so uname gets run too.
     2186-+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
     2187-
     2188- #
     2189- # Initializations.
     2190-@@ -740,7 +587,6 @@
     2191- subdirs=
     2192- MFLAGS=
     2193- MAKEFLAGS=
     2194--SHELL=${CONFIG_SHELL-/bin/sh}
     2195-
     2196- # Identity of this package.
     2197- PACKAGE_NAME='plymouth'
     2198-@@ -748,6 +594,7 @@
     2199- PACKAGE_VERSION='0.8.2'
     2200- PACKAGE_STRING='plymouth 0.8.2'
     2201- PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=plymouth'
     2202-+PACKAGE_URL=''
     2203-
     2204- ac_unique_file="src/main.c"
     2205- # Factoring default headers for most tests.
     2206-@@ -797,6 +644,8 @@
     2207- PLYMOUTH_POLICY_DIR
     2208- PLYMOUTH_PLUGIN_PATH
     2209- PLYMOUTH_THEME_PATH
     2210-+BUILD_VGA16FB_FALSE
     2211-+BUILD_VGA16FB_TRUE
     2212- RELEASE_FILE
     2213- background_end_color
     2214- background_start_color
     2215-@@ -812,10 +661,29 @@
     2216- plymouthclientdir
     2217- WITH_SYSTEM_ROOT_INSTALL_FALSE
     2218- WITH_SYSTEM_ROOT_INSTALL_TRUE
     2219-+ENABLE_UPSTART_MONITORING_FALSE
     2220-+ENABLE_UPSTART_MONITORING_TRUE
     2221-+CURSES_LIBS
     2222-+DBUS_LIBS
     2223-+DBUS_CFLAGS
     2224- ENABLE_TESTS_FALSE
     2225- ENABLE_TESTS_TRUE
     2226-+ENABLE_DRM_RENDERER_FALSE
     2227-+ENABLE_DRM_RENDERER_TRUE
     2228- DRM_LIBS
     2229- DRM_CFLAGS
     2230-+DRM_NOUVEAU_LIBS
     2231-+DRM_NOUVEAU_CFLAGS
     2232-+ENABLE_LIBDRM_NOUVEAU_FALSE
     2233-+ENABLE_LIBDRM_NOUVEAU_TRUE
     2234-+DRM_RADEON_LIBS
     2235-+DRM_RADEON_CFLAGS
     2236-+ENABLE_LIBDRM_RADEON_FALSE
     2237-+ENABLE_LIBDRM_RADEON_TRUE
     2238-+DRM_INTEL_LIBS
     2239-+DRM_INTEL_CFLAGS
     2240-+ENABLE_LIBDRM_INTEL_FALSE
     2241-+ENABLE_LIBDRM_INTEL_TRUE
     2242- GTK_LIBS
     2243- GTK_CFLAGS
     2244- PANGO_LIBS
     2245-@@ -834,9 +702,11 @@
     2246- LIPO
     2247- NMEDIT
     2248- DSYMUTIL
     2249--lt_ECHO
     2250-+MANIFEST_TOOL
     2251- RANLIB
     2252-+ac_ct_AR
     2253- AR
     2254-+DLLTOOL
     2255- OBJDUMP
     2256- LN_S
     2257- NM
     2258-@@ -854,15 +724,20 @@
     2259- build_cpu
     2260- build
     2261- LIBTOOL
     2262-+PKG_CONFIG_LIBDIR
     2263-+PKG_CONFIG_PATH
     2264- PKG_CONFIG
     2265- MAINT
     2266- MAINTAINER_MODE_FALSE
     2267- MAINTAINER_MODE_TRUE
     2268- AM_BACKSLASH
     2269- AM_DEFAULT_VERBOSITY
     2270-+AM_DEFAULT_V
     2271-+AM_V
     2272- am__fastdepCC_FALSE
     2273- am__fastdepCC_TRUE
     2274- CCDEPMODE
     2275-+am__nodep
     2276- AMDEPBACKSLASH
     2277- AMDEP_FALSE
     2278- AMDEP_TRUE
     2279-@@ -932,6 +807,7 @@
     2280- program_transform_name
     2281- prefix
     2282- exec_prefix
     2283-+PACKAGE_URL
     2284- PACKAGE_BUGREPORT
     2285- PACKAGE_STRING
     2286- PACKAGE_VERSION
     2287-@@ -950,11 +826,16 @@
     2288- with_pic
     2289- enable_fast_install
     2290- with_gnu_ld
     2291-+with_sysroot
     2292- enable_libtool_lock
     2293- enable_pango
     2294-+enable_libdrm_intel
     2295-+enable_libdrm_radeon
     2296-+enable_libdrm_nouveau
     2297- enable_tracing
     2298- enable_tests
     2299- enable_gdm_transition
     2300-+enable_upstart_monitoring
     2301- with_system_root_install
     2302- with_rhgb_compat_link
     2303- with_gdm_autostart_file
     2304-@@ -977,14 +858,22 @@
     2305- CPPFLAGS
     2306- CPP
     2307- PKG_CONFIG
     2308-+PKG_CONFIG_PATH
     2309-+PKG_CONFIG_LIBDIR
     2310- IMAGE_CFLAGS
     2311- IMAGE_LIBS
     2312- PANGO_CFLAGS
     2313- PANGO_LIBS
     2314- GTK_CFLAGS
     2315- GTK_LIBS
     2316--DRM_CFLAGS
     2317--DRM_LIBS'
     2318-+DRM_INTEL_CFLAGS
     2319-+DRM_INTEL_LIBS
     2320-+DRM_RADEON_CFLAGS
     2321-+DRM_RADEON_LIBS
     2322-+DRM_NOUVEAU_CFLAGS
     2323-+DRM_NOUVEAU_LIBS
     2324-+DBUS_CFLAGS
     2325-+DBUS_LIBS'
     2326-
     2327-
     2328- # Initialize some variables set by options.
     2329-@@ -1047,8 +936,9 @@
     2330-   fi
     2331-
     2332-   case $ac_option in
     2333--  *=*)        ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
     2334--  *)  ac_optarg=yes ;;
     2335-+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
     2336-+  *=)   ac_optarg= ;;
     2337-+  *)    ac_optarg=yes ;;
     2338-   esac
     2339-
     2340-   # Accept the important Cygnus configure options, so we can diagnose typos.
     2341-@@ -1093,8 +983,7 @@
     2342-     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     2343-     # Reject names that are not valid shell variable names.
     2344-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
     2345--      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
     2346--   { (exit 1); exit 1; }; }
     2347-+      as_fn_error $? "invalid feature name: $ac_useropt"
     2348-     ac_useropt_orig=$ac_useropt
     2349-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     2350-     case $ac_user_opts in
     2351-@@ -1120,8 +1009,7 @@
     2352-     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     2353-     # Reject names that are not valid shell variable names.
     2354-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
     2355--      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
     2356--   { (exit 1); exit 1; }; }
     2357-+      as_fn_error $? "invalid feature name: $ac_useropt"
     2358-     ac_useropt_orig=$ac_useropt
     2359-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     2360-     case $ac_user_opts in
     2361-@@ -1325,8 +1213,7 @@
     2362-     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     2363-     # Reject names that are not valid shell variable names.
     2364-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
     2365--      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
     2366--   { (exit 1); exit 1; }; }
     2367-+      as_fn_error $? "invalid package name: $ac_useropt"
     2368-     ac_useropt_orig=$ac_useropt
     2369-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     2370-     case $ac_user_opts in
     2371-@@ -1342,8 +1229,7 @@
     2372-     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     2373-     # Reject names that are not valid shell variable names.
     2374-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
     2375--      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
     2376--   { (exit 1); exit 1; }; }
     2377-+      as_fn_error $? "invalid package name: $ac_useropt"
     2378-     ac_useropt_orig=$ac_useropt
     2379-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     2380-     case $ac_user_opts in
     2381-@@ -1373,17 +1259,17 @@
     2382-   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     2383-     x_libraries=$ac_optarg ;;
     2384-
     2385--  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
     2386--Try \`$0 --help' for more information." >&2
     2387--   { (exit 1); exit 1; }; }
     2388-+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
     2389-+Try \`$0 --help' for more information"
     2390-     ;;
     2391-
     2392-   *=*)
     2393-     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     2394-     # Reject names that are not valid shell variable names.
     2395--    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
     2396--      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
     2397--   { (exit 1); exit 1; }; }
     2398-+    case $ac_envvar in #(
     2399-+      '' | [0-9]* | *[!_$as_cr_alnum]* )
     2400-+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     2401-+    esac
     2402-     eval $ac_envvar=\$ac_optarg
     2403-     export $ac_envvar ;;
     2404-
     2405-@@ -1392,7 +1278,7 @@
     2406-     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     2407-     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
     2408-       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     2409--    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     2410-+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     2411-     ;;
     2412-
     2413-   esac
     2414-@@ -1400,15 +1286,13 @@
     2415-
     2416- if test -n "$ac_prev"; then
     2417-   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
     2418--  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
     2419--   { (exit 1); exit 1; }; }
     2420-+  as_fn_error $? "missing argument to $ac_option"
     2421- fi
     2422-
     2423- if test -n "$ac_unrecognized_opts"; then
     2424-   case $enable_option_checking in
     2425-     no) ;;
     2426--    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
     2427--   { (exit 1); exit 1; }; } ;;
     2428-+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     2429-     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
     2430-   esac
     2431- fi
     2432-@@ -1431,8 +1315,7 @@
     2433-     [\\/$]* | ?:[\\/]* )  continue;;
     2434-     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
     2435-   esac
     2436--  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
     2437--   { (exit 1); exit 1; }; }
     2438-+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
     2439- done
     2440-
     2441- # There might be people who depend on the old broken behavior: `$host'
     2442-@@ -1446,8 +1329,6 @@
     2443- if test "x$host_alias" != x; then
     2444-   if test "x$build_alias" = x; then
     2445-     cross_compiling=maybe
     2446--    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     2447--    If a cross compiler is detected then cross compile mode will be used." >&2
     2448-   elif test "x$build_alias" != "x$host_alias"; then
     2449-     cross_compiling=yes
     2450-   fi
     2451-@@ -1462,11 +1343,9 @@
     2452- ac_pwd=`pwd` && test -n "$ac_pwd" &&
     2453- ac_ls_di=`ls -di .` &&
     2454- ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
     2455--  { $as_echo "$as_me: error: working directory cannot be determined" >&2
     2456--   { (exit 1); exit 1; }; }
     2457-+  as_fn_error $? "working directory cannot be determined"
     2458- test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
     2459--  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
     2460--   { (exit 1); exit 1; }; }
     2461-+  as_fn_error $? "pwd does not report name of working directory"
     2462-
     2463-
     2464- # Find the source files, if location was not specified.
     2465-@@ -1505,13 +1384,11 @@
     2466- fi
     2467- if test ! -r "$srcdir/$ac_unique_file"; then
     2468-   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
     2469--  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
     2470--   { (exit 1); exit 1; }; }
     2471-+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
     2472- fi
     2473- ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
     2474- ac_abs_confdir=`(
     2475--      cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
     2476--   { (exit 1); exit 1; }; }
     2477-+      cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
     2478-       pwd)`
     2479- # When building in place, set srcdir=.
     2480- if test "$ac_abs_confdir" = "$ac_pwd"; then
     2481-@@ -1551,7 +1428,7 @@
     2482-       --help=short        display options specific to this package
     2483-       --help=recursive    display the short help of all the included packages
     2484-   -V, --version           display version information and exit
     2485--  -q, --quiet, --silent   do not print \`checking...' messages
     2486-+  -q, --quiet, --silent   do not print \`checking ...' messages
     2487-       --cache-file=FILE   cache test results in FILE [disabled]
     2488-   -C, --config-cache      alias for \`--cache-file=config.cache'
     2489-   -n, --no-create         do not create output files
     2490-@@ -1628,17 +1505,24 @@
     2491-   --disable-libtool-lock  avoid locking (might break parallel builds)
     2492-   --enable-pango          enable building with pango, disabled there is no
     2493-                           encryption prompts
     2494-+  --enable-libdrm_intel   enable building with libdrm_intel support
     2495-+  --enable-libdrm_radeon  enable building with libdrm_radeon support
     2496-+  --enable-libdrm_nouveau enable building with libdrm_nouveau support
     2497-   --enable-tracing        enable verbose tracing code
     2498-   --enable-tests          build tests
     2499-   --enable-gdm-transition enable smooth transition to gdm
     2500-+  --enable-upstart-monitoring
     2501-+                          listen for messages on the Upstart D-Bus interface
     2502-   --enable-more-warnings  Maximum compiler warnings
     2503-
     2504- Optional Packages:
     2505-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
     2506-   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
     2507--  --with-pic              try to use only PIC/non-PIC objects [default=use
     2508-+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
     2509-                           both]
     2510-   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
     2511-+  --with-sysroot=DIR Search for dependent libraries within DIR
     2512-+                        (or the compiler's sysroot if not specified).
     2513-   --with-system-root-install
     2514-                           Install client in /bin and daemon in /sbin
     2515-   --with-rhgb-compat-link Install /usr/bin/rhgb-client compatability symlink
     2516-@@ -1666,10 +1550,14 @@
     2517-   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
     2518-               nonstandard directory <lib dir>
     2519-   LIBS        libraries to pass to the linker, e.g. -l<library>
     2520--  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
     2521-+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
     2522-               you have headers in a nonstandard directory <include dir>
     2523-   CPP         C preprocessor
     2524-   PKG_CONFIG  path to pkg-config utility
     2525-+  PKG_CONFIG_PATH
     2526-+              directories to add to pkg-config's search path
     2527-+  PKG_CONFIG_LIBDIR
     2528-+              path overriding pkg-config's built-in search path
     2529-   IMAGE_CFLAGS
     2530-               C compiler flags for IMAGE, overriding pkg-config
     2531-   IMAGE_LIBS  linker flags for IMAGE, overriding pkg-config
     2532-@@ -1678,8 +1566,20 @@
     2533-   PANGO_LIBS  linker flags for PANGO, overriding pkg-config
     2534-   GTK_CFLAGS  C compiler flags for GTK, overriding pkg-config
     2535-   GTK_LIBS    linker flags for GTK, overriding pkg-config
     2536--  DRM_CFLAGS  C compiler flags for DRM, overriding pkg-config
     2537--  DRM_LIBS    linker flags for DRM, overriding pkg-config
     2538-+  DRM_INTEL_CFLAGS
     2539-+              C compiler flags for DRM_INTEL, overriding pkg-config
     2540-+  DRM_INTEL_LIBS
     2541-+              linker flags for DRM_INTEL, overriding pkg-config
     2542-+  DRM_RADEON_CFLAGS
     2543-+              C compiler flags for DRM_RADEON, overriding pkg-config
     2544-+  DRM_RADEON_LIBS
     2545-+              linker flags for DRM_RADEON, overriding pkg-config
     2546-+  DRM_NOUVEAU_CFLAGS
     2547-+              C compiler flags for DRM_NOUVEAU, overriding pkg-config
     2548-+  DRM_NOUVEAU_LIBS
     2549-+              linker flags for DRM_NOUVEAU, overriding pkg-config
     2550-+  DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
     2551-+  DBUS_LIBS   linker flags for DBUS, overriding pkg-config
     2552-
     2553- Use these variables to override the choices made by `configure' or to help
     2554- it to find libraries and programs with nonstandard names/locations.
     2555-@@ -1748,34 +1648,435 @@
     2556- if $ac_init_version; then
     2557-   cat <<\_ACEOF
     2558- plymouth configure 0.8.2
     2559--generated by GNU Autoconf 2.63
     2560-+generated by GNU Autoconf 2.69
     2561-
     2562--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
     2563--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
     2564-+Copyright (C) 2012 Free Software Foundation, Inc.
     2565- This configure script is free software; the Free Software Foundation
     2566- gives unlimited permission to copy, distribute and modify it.
     2567- _ACEOF
     2568-   exit
     2569- fi
     2570--cat >config.log <<_ACEOF
     2571--This file contains any messages produced by compilers while
     2572--running configure, to aid debugging if configure makes a mistake.
     2573-
     2574--It was created by plymouth $as_me 0.8.2, which was
     2575--generated by GNU Autoconf 2.63.  Invocation command line was
     2576-+## ------------------------ ##
     2577-+## Autoconf initialization. ##
     2578-+## ------------------------ ##
     2579-+
     2580-+# ac_fn_c_try_compile LINENO
     2581-+# --------------------------
     2582-+# Try to compile conftest.$ac_ext, and return whether this succeeded.
     2583-+ac_fn_c_try_compile ()
     2584-+{
     2585-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     2586-+  rm -f conftest.$ac_objext
     2587-+  if { { ac_try="$ac_compile"
     2588-+case "(($ac_try" in
     2589-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     2590-+  *) ac_try_echo=$ac_try;;
     2591-+esac
     2592-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     2593-+$as_echo "$ac_try_echo"; } >&5
     2594-+  (eval "$ac_compile") 2>conftest.err
     2595-+  ac_status=$?
     2596-+  if test -s conftest.err; then
     2597-+    grep -v '^ *+' conftest.err >conftest.er1
     2598-+    cat conftest.er1 >&5
     2599-+    mv -f conftest.er1 conftest.err
     2600-+  fi
     2601-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     2602-+  test $ac_status = 0; } && {
     2603-+       test -z "$ac_c_werror_flag" ||
     2604-+       test ! -s conftest.err
     2605-+       } && test -s conftest.$ac_objext; then :
     2606-+  ac_retval=0
     2607-+else
     2608-+  $as_echo "$as_me: failed program was:" >&5
     2609-+sed 's/^/| /' conftest.$ac_ext >&5
     2610-
     2611--  $ $0 $@
     2612-+      ac_retval=1
     2613-+fi
     2614-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
     2615-+  as_fn_set_status $ac_retval
     2616-
     2617--_ACEOF
     2618--exec 5>>config.log
     2619--{
     2620--cat <<_ASUNAME
     2621--## --------- ##
     2622--## Platform. ##
     2623--## --------- ##
     2624-+} # ac_fn_c_try_compile
     2625-
     2626--hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
     2627--uname -m = `(uname -m) 2>/dev/null || echo unknown`
     2628-+# ac_fn_c_try_cpp LINENO
     2629-+# ----------------------
     2630-+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
     2631-+ac_fn_c_try_cpp ()
     2632-+{
     2633-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     2634-+  if { { ac_try="$ac_cpp conftest.$ac_ext"
     2635-+case "(($ac_try" in
     2636-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     2637-+  *) ac_try_echo=$ac_try;;
     2638-+esac
     2639-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     2640-+$as_echo "$ac_try_echo"; } >&5
     2641-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
     2642-+  ac_status=$?
     2643-+  if test -s conftest.err; then
     2644-+    grep -v '^ *+' conftest.err >conftest.er1
     2645-+    cat conftest.er1 >&5
     2646-+    mv -f conftest.er1 conftest.err
     2647-+  fi
     2648-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     2649-+  test $ac_status = 0; } > conftest.i && {
     2650-+       test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
     2651-+       test ! -s conftest.err
     2652-+       }; then :
     2653-+  ac_retval=0
     2654-+else
     2655-+  $as_echo "$as_me: failed program was:" >&5
     2656-+sed 's/^/| /' conftest.$ac_ext >&5
     2657-+
     2658-+    ac_retval=1
     2659-+fi
     2660-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
     2661-+  as_fn_set_status $ac_retval
     2662-+
     2663-+} # ac_fn_c_try_cpp
     2664-+
     2665-+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
     2666-+# -------------------------------------------------------
     2667-+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
     2668-+# the include files in INCLUDES and setting the cache variable VAR
     2669-+# accordingly.
     2670-+ac_fn_c_check_header_mongrel ()
     2671-+{
     2672-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     2673-+  if eval \${$3+:} false; then :
     2674-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
     2675-+$as_echo_n "checking for $2... " >&6; }
     2676-+if eval \${$3+:} false; then :
     2677-+  $as_echo_n "(cached) " >&6
     2678-+fi
     2679-+eval ac_res=\$$3
     2680-+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
     2681-+$as_echo "$ac_res" >&6; }
     2682-+else
     2683-+  # Is the header compilable?
     2684-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
     2685-+$as_echo_n "checking $2 usability... " >&6; }
     2686-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     2687-+/* end confdefs.h.  */
     2688-+$4
     2689-+#include <$2>
     2690-+_ACEOF
     2691-+if ac_fn_c_try_compile "$LINENO"; then :
     2692-+  ac_header_compiler=yes
     2693-+else
     2694-+  ac_header_compiler=no
     2695-+fi
     2696-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     2697-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
     2698-+$as_echo "$ac_header_compiler" >&6; }
     2699-+
     2700-+# Is the header present?
     2701-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
     2702-+$as_echo_n "checking $2 presence... " >&6; }
     2703-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     2704-+/* end confdefs.h.  */
     2705-+#include <$2>
     2706-+_ACEOF
     2707-+if ac_fn_c_try_cpp "$LINENO"; then :
     2708-+  ac_header_preproc=yes
     2709-+else
     2710-+  ac_header_preproc=no
     2711-+fi
     2712-+rm -f conftest.err conftest.i conftest.$ac_ext
     2713-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
     2714-+$as_echo "$ac_header_preproc" >&6; }
     2715-+
     2716-+# So?  What about this header?
     2717-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
     2718-+  yes:no: )
     2719-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
     2720-+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
     2721-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
     2722-+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
     2723-+    ;;
     2724-+  no:yes:* )
     2725-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
     2726-+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
     2727-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
     2728-+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
     2729-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
     2730-+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
     2731-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
     2732-+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     2733-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
     2734-+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
     2735-+( $as_echo "## -------------------------------------------------------------------------- ##
     2736-+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=plymouth ##
     2737-+## -------------------------------------------------------------------------- ##"
     2738-+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     2739-+    ;;
     2740-+esac
     2741-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
     2742-+$as_echo_n "checking for $2... " >&6; }
     2743-+if eval \${$3+:} false; then :
     2744-+  $as_echo_n "(cached) " >&6
     2745-+else
     2746-+  eval "$3=\$ac_header_compiler"
     2747-+fi
     2748-+eval ac_res=\$$3
     2749-+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
     2750-+$as_echo "$ac_res" >&6; }
     2751-+fi
     2752-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
     2753-+
     2754-+} # ac_fn_c_check_header_mongrel
     2755-+
     2756-+# ac_fn_c_try_run LINENO
     2757-+# ----------------------
     2758-+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
     2759-+# that executables *can* be run.
     2760-+ac_fn_c_try_run ()
     2761-+{
     2762-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     2763-+  if { { ac_try="$ac_link"
     2764-+case "(($ac_try" in
     2765-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     2766-+  *) ac_try_echo=$ac_try;;
     2767-+esac
     2768-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     2769-+$as_echo "$ac_try_echo"; } >&5
     2770-+  (eval "$ac_link") 2>&5
     2771-+  ac_status=$?
     2772-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     2773-+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
     2774-+  { { case "(($ac_try" in
     2775-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     2776-+  *) ac_try_echo=$ac_try;;
     2777-+esac
     2778-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     2779-+$as_echo "$ac_try_echo"; } >&5
     2780-+  (eval "$ac_try") 2>&5
     2781-+  ac_status=$?
     2782-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     2783-+  test $ac_status = 0; }; }; then :
     2784-+  ac_retval=0
     2785-+else
     2786-+  $as_echo "$as_me: program exited with status $ac_status" >&5
     2787-+       $as_echo "$as_me: failed program was:" >&5
     2788-+sed 's/^/| /' conftest.$ac_ext >&5
     2789-+
     2790-+       ac_retval=$ac_status
     2791-+fi
     2792-+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
     2793-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
     2794-+  as_fn_set_status $ac_retval
     2795-+
     2796-+} # ac_fn_c_try_run
     2797-+
     2798-+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
     2799-+# -------------------------------------------------------
     2800-+# Tests whether HEADER exists and can be compiled using the include files in
     2801-+# INCLUDES, setting the cache variable VAR accordingly.
     2802-+ac_fn_c_check_header_compile ()
     2803-+{
     2804-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     2805-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
     2806-+$as_echo_n "checking for $2... " >&6; }
     2807-+if eval \${$3+:} false; then :
     2808-+  $as_echo_n "(cached) " >&6
     2809-+else
     2810-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     2811-+/* end confdefs.h.  */
     2812-+$4
     2813-+#include <$2>
     2814-+_ACEOF
     2815-+if ac_fn_c_try_compile "$LINENO"; then :
     2816-+  eval "$3=yes"
     2817-+else
     2818-+  eval "$3=no"
     2819-+fi
     2820-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     2821-+fi
     2822-+eval ac_res=\$$3
     2823-+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
     2824-+$as_echo "$ac_res" >&6; }
     2825-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
     2826-+
     2827-+} # ac_fn_c_check_header_compile
     2828-+
     2829-+# ac_fn_c_try_link LINENO
     2830-+# -----------------------
     2831-+# Try to link conftest.$ac_ext, and return whether this succeeded.
     2832-+ac_fn_c_try_link ()
     2833-+{
     2834-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     2835-+  rm -f conftest.$ac_objext conftest$ac_exeext
     2836-+  if { { ac_try="$ac_link"
     2837-+case "(($ac_try" in
     2838-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     2839-+  *) ac_try_echo=$ac_try;;
     2840-+esac
     2841-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     2842-+$as_echo "$ac_try_echo"; } >&5
     2843-+  (eval "$ac_link") 2>conftest.err
     2844-+  ac_status=$?
     2845-+  if test -s conftest.err; then
     2846-+    grep -v '^ *+' conftest.err >conftest.er1
     2847-+    cat conftest.er1 >&5
     2848-+    mv -f conftest.er1 conftest.err
     2849-+  fi
     2850-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     2851-+  test $ac_status = 0; } && {
     2852-+       test -z "$ac_c_werror_flag" ||
     2853-+       test ! -s conftest.err
     2854-+       } && test -s conftest$ac_exeext && {
     2855-+       test "$cross_compiling" = yes ||
     2856-+       test -x conftest$ac_exeext
     2857-+       }; then :
     2858-+  ac_retval=0
     2859-+else
     2860-+  $as_echo "$as_me: failed program was:" >&5
     2861-+sed 's/^/| /' conftest.$ac_ext >&5
     2862-+
     2863-+      ac_retval=1
     2864-+fi
     2865-+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
     2866-+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
     2867-+  # interfere with the next link command; also delete a directory that is
     2868-+  # left behind by Apple's compiler.  We do this before executing the actions.
     2869-+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
     2870-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
     2871-+  as_fn_set_status $ac_retval
     2872-+
     2873-+} # ac_fn_c_try_link
     2874-+
     2875-+# ac_fn_c_check_func LINENO FUNC VAR
     2876-+# ----------------------------------
     2877-+# Tests whether FUNC exists, setting the cache variable VAR accordingly
     2878-+ac_fn_c_check_func ()
     2879-+{
     2880-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     2881-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
     2882-+$as_echo_n "checking for $2... " >&6; }
     2883-+if eval \${$3+:} false; then :
     2884-+  $as_echo_n "(cached) " >&6
     2885-+else
     2886-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     2887-+/* end confdefs.h.  */
     2888-+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
     2889-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
     2890-+#define $2 innocuous_$2
     2891-+
     2892-+/* System header to define __stub macros and hopefully few prototypes,
     2893-+    which can conflict with char $2 (); below.
     2894-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     2895-+    <limits.h> exists even on freestanding compilers.  */
     2896-+
     2897-+#ifdef __STDC__
     2898-+# include <limits.h>
     2899-+#else
     2900-+# include <assert.h>
     2901-+#endif
     2902-+
     2903-+#undef $2
     2904-+
     2905-+/* Override any GCC internal prototype to avoid an error.
     2906-+   Use char because int might match the return type of a GCC
     2907-+   builtin and then its argument prototype would still apply.  */
     2908-+#ifdef __cplusplus
     2909-+extern "C"
     2910-+#endif
     2911-+char $2 ();
     2912-+/* The GNU C library defines this for functions which it implements
     2913-+    to always fail with ENOSYS.  Some functions are actually named
     2914-+    something starting with __ and the normal name is an alias.  */
     2915-+#if defined __stub_$2 || defined __stub___$2
     2916-+choke me
     2917-+#endif
     2918-+
     2919-+int
     2920-+main ()
     2921-+{
     2922-+return $2 ();
     2923-+  ;
     2924-+  return 0;
     2925-+}
     2926-+_ACEOF
     2927-+if ac_fn_c_try_link "$LINENO"; then :
     2928-+  eval "$3=yes"
     2929-+else
     2930-+  eval "$3=no"
     2931-+fi
     2932-+rm -f core conftest.err conftest.$ac_objext \
     2933-+    conftest$ac_exeext conftest.$ac_ext
     2934-+fi
     2935-+eval ac_res=\$$3
     2936-+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
     2937-+$as_echo "$ac_res" >&6; }
     2938-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
     2939-+
     2940-+} # ac_fn_c_check_func
     2941-+
     2942-+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
     2943-+# ---------------------------------------------
     2944-+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
     2945-+# accordingly.
     2946-+ac_fn_c_check_decl ()
     2947-+{
     2948-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     2949-+  as_decl_name=`echo $2|sed 's/ *(.*//'`
     2950-+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
     2951-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
     2952-+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
     2953-+if eval \${$3+:} false; then :
     2954-+  $as_echo_n "(cached) " >&6
     2955-+else
     2956-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     2957-+/* end confdefs.h.  */
     2958-+$4
     2959-+int
     2960-+main ()
     2961-+{
     2962-+#ifndef $as_decl_name
     2963-+#ifdef __cplusplus
     2964-+  (void) $as_decl_use;
     2965-+#else
     2966-+  (void) $as_decl_name;
     2967-+#endif
     2968-+#endif
     2969-+
     2970-+  ;
     2971-+  return 0;
     2972-+}
     2973-+_ACEOF
     2974-+if ac_fn_c_try_compile "$LINENO"; then :
     2975-+  eval "$3=yes"
     2976-+else
     2977-+  eval "$3=no"
     2978-+fi
     2979-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     2980-+fi
     2981-+eval ac_res=\$$3
     2982-+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
     2983-+$as_echo "$ac_res" >&6; }
     2984-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
     2985-+
     2986-+} # ac_fn_c_check_decl
     2987-+cat >config.log <<_ACEOF
     2988-+This file contains any messages produced by compilers while
     2989-+running configure, to aid debugging if configure makes a mistake.
     2990-+
     2991-+It was created by plymouth $as_me 0.8.2, which was
     2992-+generated by GNU Autoconf 2.69.  Invocation command line was
     2993-+
     2994-+  $ $0 $@
     2995-+
     2996-+_ACEOF
     2997-+exec 5>>config.log
     2998-+{
     2999-+cat <<_ASUNAME
     3000-+## --------- ##
     3001-+## Platform. ##
     3002-+## --------- ##
     3003-+
     3004-+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
     3005-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
     3006- uname -r = `(uname -r) 2>/dev/null || echo unknown`
     3007- uname -s = `(uname -s) 2>/dev/null || echo unknown`
     3008- uname -v = `(uname -v) 2>/dev/null || echo unknown`
     3009-@@ -1798,8 +2099,8 @@
     3010- do
     3011-   IFS=$as_save_IFS
     3012-   test -z "$as_dir" && as_dir=.
     3013--  $as_echo "PATH: $as_dir"
     3014--done
     3015-+    $as_echo "PATH: $as_dir"
     3016-+  done
     3017- IFS=$as_save_IFS
     3018-
     3019- } >&5
     3020-@@ -1836,9 +2137,9 @@
     3021-       ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     3022-     esac
     3023-     case $ac_pass in
     3024--    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
     3025-+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     3026-     2)
     3027--      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
     3028-+      as_fn_append ac_configure_args1 " '$ac_arg'"
     3029-       if test $ac_must_keep_next = true; then
     3030-       ac_must_keep_next=false # Got value, back to normal.
     3031-       else
     3032-@@ -1854,13 +2155,13 @@
     3033-         -* ) ac_must_keep_next=true ;;
     3034-       esac
     3035-       fi
     3036--      ac_configure_args="$ac_configure_args '$ac_arg'"
     3037-+      as_fn_append ac_configure_args " '$ac_arg'"
     3038-       ;;
     3039-     esac
     3040-   done
     3041- done
     3042--$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
     3043--$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
     3044-+{ ac_configure_args0=; unset ac_configure_args0;}
     3045-+{ ac_configure_args1=; unset ac_configure_args1;}
     3046-
     3047- # When interrupted or exit'd, cleanup temporary files, and complete
     3048- # config.log.  We remove comments because anyway the quotes in there
     3049-@@ -1872,11 +2173,9 @@
     3050-   {
     3051-     echo
     3052-
     3053--    cat <<\_ASBOX
     3054--## ---------------- ##
     3055-+    $as_echo "## ---------------- ##
     3056- ## Cache variables. ##
     3057--## ---------------- ##
     3058--_ASBOX
     3059-+## ---------------- ##"
     3060-     echo
     3061-     # The following way of writing the cache mishandles newlines in values,
     3062- (
     3063-@@ -1885,13 +2184,13 @@
     3064-     case $ac_val in #(
     3065-     *${as_nl}*)
     3066-       case $ac_var in #(
     3067--      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
     3068-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
     3069- $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
     3070-       esac
     3071-       case $ac_var in #(
     3072-       _ | IFS | as_nl) ;; #(
     3073-       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
     3074--      *) $as_unset $ac_var ;;
     3075-+      *) { eval $ac_var=; unset $ac_var;} ;;
     3076-       esac ;;
     3077-     esac
     3078-   done
     3079-@@ -1910,11 +2209,9 @@
     3080- )
     3081-     echo
     3082-
     3083--    cat <<\_ASBOX
     3084--## ----------------- ##
     3085-+    $as_echo "## ----------------- ##
     3086- ## Output variables. ##
     3087--## ----------------- ##
     3088--_ASBOX
     3089-+## ----------------- ##"
     3090-     echo
     3091-     for ac_var in $ac_subst_vars
     3092-     do
     3093-@@ -1927,11 +2224,9 @@
     3094-     echo
     3095-
     3096-     if test -n "$ac_subst_files"; then
     3097--      cat <<\_ASBOX
     3098--## ------------------- ##
     3099-+      $as_echo "## ------------------- ##
     3100- ## File substitutions. ##
     3101--## ------------------- ##
     3102--_ASBOX
     3103-+## ------------------- ##"
     3104-       echo
     3105-       for ac_var in $ac_subst_files
     3106-       do
     3107-@@ -1945,11 +2240,9 @@
     3108-     fi
     3109-
     3110-     if test -s confdefs.h; then
     3111--      cat <<\_ASBOX
     3112--## ----------- ##
     3113-+      $as_echo "## ----------- ##
     3114- ## confdefs.h. ##
     3115--## ----------- ##
     3116--_ASBOX
     3117-+## ----------- ##"
     3118-       echo
     3119-       cat confdefs.h
     3120-       echo
     3121-@@ -1963,46 +2256,53 @@
     3122-     exit $exit_status
     3123- ' 0
     3124- for ac_signal in 1 2 13 15; do
     3125--  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
     3126-+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
     3127- done
     3128- ac_signal=0
     3129-
     3130- # confdefs.h avoids OS command line length limits that DEFS can exceed.
     3131- rm -f -r conftest* confdefs.h
     3132-
     3133-+$as_echo "/* confdefs.h */" > confdefs.h
     3134-+
     3135- # Predefined preprocessor variables.
     3136-
     3137- cat >>confdefs.h <<_ACEOF
     3138- #define PACKAGE_NAME "$PACKAGE_NAME"
     3139- _ACEOF
     3140-
     3141--
     3142- cat >>confdefs.h <<_ACEOF
     3143- #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
     3144- _ACEOF
     3145-
     3146--
     3147- cat >>confdefs.h <<_ACEOF
     3148- #define PACKAGE_VERSION "$PACKAGE_VERSION"
     3149- _ACEOF
     3150-
     3151--
     3152- cat >>confdefs.h <<_ACEOF
     3153- #define PACKAGE_STRING "$PACKAGE_STRING"
     3154- _ACEOF
     3155-
     3156--
     3157- cat >>confdefs.h <<_ACEOF
     3158- #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
     3159- _ACEOF
     3160-
     3161-+cat >>confdefs.h <<_ACEOF
     3162-+#define PACKAGE_URL "$PACKAGE_URL"
     3163-+_ACEOF
     3164-+
     3165-
     3166- # Let the site file select an alternate cache file if it wants to.
     3167- # Prefer an explicitly selected file to automatically selected ones.
     3168- ac_site_file1=NONE
     3169- ac_site_file2=NONE
     3170- if test -n "$CONFIG_SITE"; then
     3171--  ac_site_file1=$CONFIG_SITE
     3172-+  # We do not want a PATH search for config.site.
     3173-+  case $CONFIG_SITE in #((
     3174-+    -*)  ac_site_file1=./$CONFIG_SITE;;
     3175-+    */*) ac_site_file1=$CONFIG_SITE;;
     3176-+    *)   ac_site_file1=./$CONFIG_SITE;;
     3177-+  esac
     3178- elif test "x$prefix" != xNONE; then
     3179-   ac_site_file1=$prefix/share/config.site
     3180-   ac_site_file2=$prefix/etc/config.site
     3181-@@ -2013,19 +2313,23 @@
     3182- for ac_site_file in "$ac_site_file1" "$ac_site_file2"
     3183- do
     3184-   test "x$ac_site_file" = xNONE && continue
     3185--  if test -r "$ac_site_file"; then
     3186--    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
     3187-+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
     3188-+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
     3189- $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     3190-     sed 's/^/| /' "$ac_site_file" >&5
     3191--    . "$ac_site_file"
     3192-+    . "$ac_site_file" \
     3193-+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     3194-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     3195-+as_fn_error $? "failed to load site script $ac_site_file
     3196-+See \`config.log' for more details" "$LINENO" 5; }
     3197-   fi
     3198- done
     3199-
     3200- if test -r "$cache_file"; then
     3201--  # Some versions of bash will fail to source /dev/null (special
     3202--  # files actually), so we avoid doing that.
     3203--  if test -f "$cache_file"; then
     3204--    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
     3205-+  # Some versions of bash will fail to source /dev/null (special files
     3206-+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
     3207-+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
     3208-+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
     3209- $as_echo "$as_me: loading cache $cache_file" >&6;}
     3210-     case $cache_file in
     3211-       [\\/]* | ?:[\\/]* ) . "$cache_file";;
     3212-@@ -2033,7 +2337,7 @@
     3213-     esac
     3214-   fi
     3215- else
     3216--  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
     3217-+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
     3218- $as_echo "$as_me: creating cache $cache_file" >&6;}
     3219-   >$cache_file
     3220- fi
     3221-@@ -2048,11 +2352,11 @@
     3222-   eval ac_new_val=\$ac_env_${ac_var}_value
     3223-   case $ac_old_set,$ac_new_set in
     3224-     set,)
     3225--      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
     3226-+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
     3227- $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
     3228-       ac_cache_corrupted=: ;;
     3229-     ,set)
     3230--      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
     3231-+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
     3232- $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
     3233-       ac_cache_corrupted=: ;;
     3234-     ,);;
     3235-@@ -2062,17 +2366,17 @@
     3236-       ac_old_val_w=`echo x $ac_old_val`
     3237-       ac_new_val_w=`echo x $ac_new_val`
     3238-       if test "$ac_old_val_w" != "$ac_new_val_w"; then
     3239--        { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
     3240-+        { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
     3241- $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
     3242-         ac_cache_corrupted=:
     3243-       else
     3244--        { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
     3245-+        { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
     3246- $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
     3247-         eval $ac_var=\$ac_old_val
     3248-       fi
     3249--      { $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
     3250-+      { $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
     3251- $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
     3252--      { $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
     3253-+      { $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
     3254- $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
     3255-       fi;;
     3256-   esac
     3257-@@ -2084,43 +2388,20 @@
     3258-     esac
     3259-     case " $ac_configure_args " in
     3260-       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
     3261--      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
     3262-+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     3263-     esac
     3264-   fi
     3265- done
     3266- if $ac_cache_corrupted; then
     3267--  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
     3268-+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     3269- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     3270--  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
     3271-+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
     3272- $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
     3273--  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
     3274--$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
     3275--   { (exit 1); exit 1; }; }
     3276-+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
     3277- fi
     3278--
     3279--
     3280--
     3281--
     3282--
     3283--
     3284--
     3285--
     3286--
     3287--
     3288--
     3289--
     3290--
     3291--
     3292--
     3293--
     3294--
     3295--
     3296--
     3297--
     3298--
     3299--
     3300--
     3301--
     3302-+## -------------------- ##
     3303-+## Main body of script. ##
     3304-+## -------------------- ##
     3305-
     3306- ac_ext=c
     3307- ac_cpp='$CPP $CPPFLAGS'
     3308-@@ -2149,9 +2430,7 @@
     3309-   fi
     3310- done
     3311- if test -z "$ac_aux_dir"; then
     3312--  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in build-tools \"$srcdir\"/build-tools" >&5
     3313--$as_echo "$as_me: error: cannot find install-sh or install.sh in build-tools \"$srcdir\"/build-tools" >&2;}
     3314--   { (exit 1); exit 1; }; }
     3315-+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-tools \"$srcdir\"/build-tools" "$LINENO" 5
     3316- fi
     3317-
     3318- # These three variables are undocumented and unsupported,
     3319-@@ -2172,9 +2451,9 @@
     3320- if test -n "$ac_tool_prefix"; then
     3321-   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
     3322- set dummy ${ac_tool_prefix}gcc; ac_word=$2
     3323--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
     3324-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     3325- $as_echo_n "checking for $ac_word... " >&6; }
     3326--if test "${ac_cv_prog_CC+set}" = set; then
     3327-+if ${ac_cv_prog_CC+:} false; then :
     3328-   $as_echo_n "(cached) " >&6
     3329- else
     3330-   if test -n "$CC"; then
     3331-@@ -2185,24 +2464,24 @@
     3332- do
     3333-   IFS=$as_save_IFS
     3334-   test -z "$as_dir" && as_dir=.
     3335--  for ac_exec_ext in '' $ac_executable_extensions; do
     3336--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     3337-+    for ac_exec_ext in '' $ac_executable_extensions; do
     3338-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     3339-     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     3340--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     3341-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     3342-     break 2
     3343-   fi
     3344- done
     3345--done
     3346-+  done
     3347- IFS=$as_save_IFS
     3348-
     3349- fi
     3350- fi
     3351- CC=$ac_cv_prog_CC
     3352- if test -n "$CC"; then
     3353--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
     3354-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
     3355- $as_echo "$CC" >&6; }
     3356- else
     3357--  { $as_echo "$as_me:$LINENO: result: no" >&5
     3358-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     3359- $as_echo "no" >&6; }
     3360- fi
     3361-
     3362-@@ -2212,9 +2491,9 @@
     3363-   ac_ct_CC=$CC
     3364-   # Extract the first word of "gcc", so it can be a program name with args.
     3365- set dummy gcc; ac_word=$2
     3366--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
     3367-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     3368- $as_echo_n "checking for $ac_word... " >&6; }
     3369--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
     3370-+if ${ac_cv_prog_ac_ct_CC+:} false; then :
     3371-   $as_echo_n "(cached) " >&6
     3372- else
     3373-   if test -n "$ac_ct_CC"; then
     3374-@@ -2225,24 +2504,24 @@
     3375- do
     3376-   IFS=$as_save_IFS
     3377-   test -z "$as_dir" && as_dir=.
     3378--  for ac_exec_ext in '' $ac_executable_extensions; do
     3379--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     3380-+    for ac_exec_ext in '' $ac_executable_extensions; do
     3381-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     3382-     ac_cv_prog_ac_ct_CC="gcc"
     3383--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     3384-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     3385-     break 2
     3386-   fi
     3387- done
     3388--done
     3389-+  done
     3390- IFS=$as_save_IFS
     3391-
     3392- fi
     3393- fi
     3394- ac_ct_CC=$ac_cv_prog_ac_ct_CC
     3395- if test -n "$ac_ct_CC"; then
     3396--  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
     3397-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
     3398- $as_echo "$ac_ct_CC" >&6; }
     3399- else
     3400--  { $as_echo "$as_me:$LINENO: result: no" >&5
     3401-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     3402- $as_echo "no" >&6; }
     3403- fi
     3404-
     3405-@@ -2251,7 +2530,7 @@
     3406-   else
     3407-     case $cross_compiling:$ac_tool_warned in
     3408- yes:)
     3409--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
     3410-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     3411- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     3412- ac_tool_warned=yes ;;
     3413- esac
     3414-@@ -2265,9 +2544,9 @@
     3415-           if test -n "$ac_tool_prefix"; then
     3416-     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
     3417- set dummy ${ac_tool_prefix}cc; ac_word=$2
     3418--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
     3419-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     3420- $as_echo_n "checking for $ac_word... " >&6; }
     3421--if test "${ac_cv_prog_CC+set}" = set; then
     3422-+if ${ac_cv_prog_CC+:} false; then :
     3423-   $as_echo_n "(cached) " >&6
     3424- else
     3425-   if test -n "$CC"; then
     3426-@@ -2278,24 +2557,24 @@
     3427- do
     3428-   IFS=$as_save_IFS
     3429-   test -z "$as_dir" && as_dir=.
     3430--  for ac_exec_ext in '' $ac_executable_extensions; do
     3431--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     3432-+    for ac_exec_ext in '' $ac_executable_extensions; do
     3433-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     3434-     ac_cv_prog_CC="${ac_tool_prefix}cc"
     3435--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     3436-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     3437-     break 2
     3438-   fi
     3439- done
     3440--done
     3441-+  done
     3442- IFS=$as_save_IFS
     3443-
     3444- fi
     3445- fi
     3446- CC=$ac_cv_prog_CC
     3447- if test -n "$CC"; then
     3448--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
     3449-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
     3450- $as_echo "$CC" >&6; }
     3451- else
     3452--  { $as_echo "$as_me:$LINENO: result: no" >&5
     3453-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     3454- $as_echo "no" >&6; }
     3455- fi
     3456-
     3457-@@ -2305,9 +2584,9 @@
     3458- if test -z "$CC"; then
     3459-   # Extract the first word of "cc", so it can be a program name with args.
     3460- set dummy cc; ac_word=$2
     3461--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
     3462-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     3463- $as_echo_n "checking for $ac_word... " >&6; }
     3464--if test "${ac_cv_prog_CC+set}" = set; then
     3465-+if ${ac_cv_prog_CC+:} false; then :
     3466-   $as_echo_n "(cached) " >&6
     3467- else
     3468-   if test -n "$CC"; then
     3469-@@ -2319,18 +2598,18 @@
     3470- do
     3471-   IFS=$as_save_IFS
     3472-   test -z "$as_dir" && as_dir=.
     3473--  for ac_exec_ext in '' $ac_executable_extensions; do
     3474--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     3475-+    for ac_exec_ext in '' $ac_executable_extensions; do
     3476-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     3477-     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
     3478-        ac_prog_rejected=yes
     3479-        continue
     3480-      fi
     3481-     ac_cv_prog_CC="cc"
     3482--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     3483-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     3484-     break 2
     3485-   fi
     3486- done
     3487--done
     3488-+  done
     3489- IFS=$as_save_IFS
     3490-
     3491- if test $ac_prog_rejected = yes; then
     3492-@@ -2349,10 +2628,10 @@
     3493- fi
     3494- CC=$ac_cv_prog_CC
     3495- if test -n "$CC"; then
     3496--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
     3497-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
     3498- $as_echo "$CC" >&6; }
     3499- else
     3500--  { $as_echo "$as_me:$LINENO: result: no" >&5
     3501-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     3502- $as_echo "no" >&6; }
     3503- fi
     3504-
     3505-@@ -2364,9 +2643,9 @@
     3506-   do
     3507-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
     3508- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
     3509--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
     3510-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     3511- $as_echo_n "checking for $ac_word... " >&6; }
     3512--if test "${ac_cv_prog_CC+set}" = set; then
     3513-+if ${ac_cv_prog_CC+:} false; then :
     3514-   $as_echo_n "(cached) " >&6
     3515- else
     3516-   if test -n "$CC"; then
     3517-@@ -2377,24 +2656,24 @@
     3518- do
     3519-   IFS=$as_save_IFS
     3520-   test -z "$as_dir" && as_dir=.
     3521--  for ac_exec_ext in '' $ac_executable_extensions; do
     3522--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     3523-+    for ac_exec_ext in '' $ac_executable_extensions; do
     3524-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     3525-     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     3526--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     3527-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     3528-     break 2
     3529-   fi
     3530- done
     3531--done
     3532-+  done
     3533- IFS=$as_save_IFS
     3534-
     3535- fi
     3536- fi
     3537- CC=$ac_cv_prog_CC
     3538- if test -n "$CC"; then
     3539--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
     3540-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
     3541- $as_echo "$CC" >&6; }
     3542- else
     3543--  { $as_echo "$as_me:$LINENO: result: no" >&5
     3544-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     3545- $as_echo "no" >&6; }
     3546- fi
     3547-
     3548-@@ -2408,9 +2687,9 @@
     3549- do
     3550-   # Extract the first word of "$ac_prog", so it can be a program name with args.
     3551- set dummy $ac_prog; ac_word=$2
     3552--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
     3553-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     3554- $as_echo_n "checking for $ac_word... " >&6; }
     3555--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
     3556-+if ${ac_cv_prog_ac_ct_CC+:} false; then :
     3557-   $as_echo_n "(cached) " >&6
     3558- else
     3559-   if test -n "$ac_ct_CC"; then
     3560-@@ -2421,24 +2700,24 @@
     3561- do
     3562-   IFS=$as_save_IFS
     3563-   test -z "$as_dir" && as_dir=.
     3564--  for ac_exec_ext in '' $ac_executable_extensions; do
     3565--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     3566-+    for ac_exec_ext in '' $ac_executable_extensions; do
     3567-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     3568-     ac_cv_prog_ac_ct_CC="$ac_prog"
     3569--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     3570-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     3571-     break 2
     3572-   fi
     3573- done
     3574--done
     3575-+  done
     3576- IFS=$as_save_IFS
     3577-
     3578- fi
     3579- fi
     3580- ac_ct_CC=$ac_cv_prog_ac_ct_CC
     3581- if test -n "$ac_ct_CC"; then
     3582--  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
     3583-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
     3584- $as_echo "$ac_ct_CC" >&6; }
     3585- else
     3586--  { $as_echo "$as_me:$LINENO: result: no" >&5
     3587-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     3588- $as_echo "no" >&6; }
     3589- fi
     3590-
     3591-@@ -2451,7 +2730,7 @@
     3592-   else
     3593-     case $cross_compiling:$ac_tool_warned in
     3594- yes:)
     3595--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
     3596-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     3597- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     3598- ac_tool_warned=yes ;;
     3599- esac
     3600-@@ -2462,57 +2741,37 @@
     3601- fi
     3602-
     3603-
     3604--test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
     3605-+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     3606- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     3607--{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
     3608--See \`config.log' for more details." >&5
     3609--$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
     3610--See \`config.log' for more details." >&2;}
     3611--   { (exit 1); exit 1; }; }; }
     3612-+as_fn_error $? "no acceptable C compiler found in \$PATH
     3613-+See \`config.log' for more details" "$LINENO" 5; }
     3614-
     3615- # Provide some information about the compiler.
     3616--$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
     3617-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
     3618- set X $ac_compile
     3619- ac_compiler=$2
     3620--{ (ac_try="$ac_compiler --version >&5"
     3621--case "(($ac_try" in
     3622--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     3623--  *) ac_try_echo=$ac_try;;
     3624--esac
     3625--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     3626--$as_echo "$ac_try_echo") >&5
     3627--  (eval "$ac_compiler --version >&5") 2>&5
     3628--  ac_status=$?
     3629--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     3630--  (exit $ac_status); }
     3631--{ (ac_try="$ac_compiler -v >&5"
     3632--case "(($ac_try" in
     3633--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     3634--  *) ac_try_echo=$ac_try;;
     3635--esac
     3636--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     3637--$as_echo "$ac_try_echo") >&5
     3638--  (eval "$ac_compiler -v >&5") 2>&5
     3639--  ac_status=$?
     3640--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     3641--  (exit $ac_status); }
     3642--{ (ac_try="$ac_compiler -V >&5"
     3643-+for ac_option in --version -v -V -qversion; do
     3644-+  { { ac_try="$ac_compiler $ac_option >&5"
     3645- case "(($ac_try" in
     3646-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     3647-   *) ac_try_echo=$ac_try;;
     3648- esac
     3649--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     3650--$as_echo "$ac_try_echo") >&5
     3651--  (eval "$ac_compiler -V >&5") 2>&5
     3652-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     3653-+$as_echo "$ac_try_echo"; } >&5
     3654-+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
     3655-   ac_status=$?
     3656--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     3657--  (exit $ac_status); }
     3658-+  if test -s conftest.err; then
     3659-+    sed '10a\
     3660-+... rest of stderr output deleted ...
     3661-+         10q' conftest.err >conftest.er1
     3662-+    cat conftest.er1 >&5
     3663-+  fi
     3664-+  rm -f conftest.er1 conftest.err
     3665-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     3666-+  test $ac_status = 0; }
     3667-+done
     3668-
     3669--cat >conftest.$ac_ext <<_ACEOF
     3670--/* confdefs.h.  */
     3671--_ACEOF
     3672--cat confdefs.h >>conftest.$ac_ext
     3673--cat >>conftest.$ac_ext <<_ACEOF
     3674-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3675- /* end confdefs.h.  */
     3676-
     3677- int
     3678-@@ -2528,8 +2787,8 @@
     3679- # Try to create an executable without -o first, disregard a.out.
     3680- # It will help us diagnose broken compilers, and finding out an intuition
     3681- # of exeext.
     3682--{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
     3683--$as_echo_n "checking for C compiler default output file name... " >&6; }
     3684-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
     3685-+$as_echo_n "checking whether the C compiler works... " >&6; }
     3686- ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
     3687-
     3688- # The possible output files:
     3689-@@ -2545,17 +2804,17 @@
     3690- done
     3691- rm -f $ac_rmfiles
     3692-
     3693--if { (ac_try="$ac_link_default"
     3694-+if { { ac_try="$ac_link_default"
     3695- case "(($ac_try" in
     3696-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     3697-   *) ac_try_echo=$ac_try;;
     3698- esac
     3699--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     3700--$as_echo "$ac_try_echo") >&5
     3701-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     3702-+$as_echo "$ac_try_echo"; } >&5
     3703-   (eval "$ac_link_default") 2>&5
     3704-   ac_status=$?
     3705--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     3706--  (exit $ac_status); }; then
     3707-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     3708-+  test $ac_status = 0; }; then :
     3709-   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
     3710- # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
     3711- # in a Makefile.  We should not override ac_cv_exeext if it was cached,
     3712-@@ -2572,7 +2831,7 @@
     3713-       # certainly right.
     3714-       break;;
     3715-     *.* )
     3716--        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
     3717-+      if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
     3718-       then :; else
     3719-          ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
     3720-       fi
     3721-@@ -2591,84 +2850,41 @@
     3722- else
     3723-   ac_file=''
     3724- fi
     3725-+if test -z "$ac_file"; then :
     3726-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     3727-+$as_echo "no" >&6; }
     3728-+$as_echo "$as_me: failed program was:" >&5
     3729-+sed 's/^/| /' conftest.$ac_ext >&5
     3730-
     3731--{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
     3732--$as_echo "$ac_file" >&6; }
     3733--if test -z "$ac_file"; then
     3734--  $as_echo "$as_me: failed program was:" >&5
     3735--sed 's/^/| /' conftest.$ac_ext >&5
     3736--
     3737--{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
     3738-+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     3739- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     3740--{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
     3741--See \`config.log' for more details." >&5
     3742--$as_echo "$as_me: error: C compiler cannot create executables
     3743--See \`config.log' for more details." >&2;}
     3744--   { (exit 77); exit 77; }; }; }
     3745-+as_fn_error 77 "C compiler cannot create executables
     3746-+See \`config.log' for more details" "$LINENO" 5; }
     3747-+else
     3748-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
     3749-+$as_echo "yes" >&6; }
     3750- fi
     3751--
     3752-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
     3753-+$as_echo_n "checking for C compiler default output file name... " >&6; }
     3754-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
     3755-+$as_echo "$ac_file" >&6; }
     3756- ac_exeext=$ac_cv_exeext
     3757-
     3758--# Check that the compiler produces executables we can run.  If not, either
     3759--# the compiler is broken, or we cross compile.
     3760--{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
     3761--$as_echo_n "checking whether the C compiler works... " >&6; }
     3762--# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
     3763--# If not cross compiling, check that we can run a simple program.
     3764--if test "$cross_compiling" != yes; then
     3765--  if { ac_try='./$ac_file'
     3766--  { (case "(($ac_try" in
     3767--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     3768--  *) ac_try_echo=$ac_try;;
     3769--esac
     3770--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     3771--$as_echo "$ac_try_echo") >&5
     3772--  (eval "$ac_try") 2>&5
     3773--  ac_status=$?
     3774--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     3775--  (exit $ac_status); }; }; then
     3776--    cross_compiling=no
     3777--  else
     3778--    if test "$cross_compiling" = maybe; then
     3779--      cross_compiling=yes
     3780--    else
     3781--      { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
     3782--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     3783--{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
     3784--If you meant to cross compile, use \`--host'.
     3785--See \`config.log' for more details." >&5
     3786--$as_echo "$as_me: error: cannot run C compiled programs.
     3787--If you meant to cross compile, use \`--host'.
     3788--See \`config.log' for more details." >&2;}
     3789--   { (exit 1); exit 1; }; }; }
     3790--    fi
     3791--  fi
     3792--fi
     3793--{ $as_echo "$as_me:$LINENO: result: yes" >&5
     3794--$as_echo "yes" >&6; }
     3795--
     3796- rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
     3797- ac_clean_files=$ac_clean_files_save
     3798--# Check that the compiler produces executables we can run.  If not, either
     3799--# the compiler is broken, or we cross compile.
     3800--{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
     3801--$as_echo_n "checking whether we are cross compiling... " >&6; }
     3802--{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
     3803--$as_echo "$cross_compiling" >&6; }
     3804--
     3805--{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
     3806-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
     3807- $as_echo_n "checking for suffix of executables... " >&6; }
     3808--if { (ac_try="$ac_link"
     3809-+if { { ac_try="$ac_link"
     3810- case "(($ac_try" in
     3811-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     3812-   *) ac_try_echo=$ac_try;;
     3813- esac
     3814--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     3815--$as_echo "$ac_try_echo") >&5
     3816-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     3817-+$as_echo "$ac_try_echo"; } >&5
     3818-   (eval "$ac_link") 2>&5
     3819-   ac_status=$?
     3820--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     3821--  (exit $ac_status); }; then
     3822-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     3823-+  test $ac_status = 0; }; then :
     3824-   # If both `conftest.exe' and `conftest' are `present' (well, observable)
     3825- # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
     3826- # work properly (i.e., refer to `conftest.exe'), while it won't with
     3827-@@ -2683,32 +2899,83 @@
     3828-   esac
     3829- done
     3830- else
     3831--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
     3832-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     3833- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     3834--{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
     3835--See \`config.log' for more details." >&5
     3836--$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
     3837--See \`config.log' for more details." >&2;}
     3838--   { (exit 1); exit 1; }; }; }
     3839-+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
     3840-+See \`config.log' for more details" "$LINENO" 5; }
     3841- fi
     3842--
     3843--rm -f conftest$ac_cv_exeext
     3844--{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
     3845-+rm -f conftest conftest$ac_cv_exeext
     3846-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
     3847- $as_echo "$ac_cv_exeext" >&6; }
     3848-
     3849- rm -f conftest.$ac_ext
     3850- EXEEXT=$ac_cv_exeext
     3851- ac_exeext=$EXEEXT
     3852--{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
     3853-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3854-+/* end confdefs.h.  */
     3855-+#include <stdio.h>
     3856-+int
     3857-+main ()
     3858-+{
     3859-+FILE *f = fopen ("conftest.out", "w");
     3860-+ return ferror (f) || fclose (f) != 0;
     3861-+
     3862-+  ;
     3863-+  return 0;
     3864-+}
     3865-+_ACEOF
     3866-+ac_clean_files="$ac_clean_files conftest.out"
     3867-+# Check that the compiler produces executables we can run.  If not, either
     3868-+# the compiler is broken, or we cross compile.
     3869-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
     3870-+$as_echo_n "checking whether we are cross compiling... " >&6; }
     3871-+if test "$cross_compiling" != yes; then
     3872-+  { { ac_try="$ac_link"
     3873-+case "(($ac_try" in
     3874-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     3875-+  *) ac_try_echo=$ac_try;;
     3876-+esac
     3877-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     3878-+$as_echo "$ac_try_echo"; } >&5
     3879-+  (eval "$ac_link") 2>&5
     3880-+  ac_status=$?
     3881-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     3882-+  test $ac_status = 0; }
     3883-+  if { ac_try='./conftest$ac_cv_exeext'
     3884-+  { { case "(($ac_try" in
     3885-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     3886-+  *) ac_try_echo=$ac_try;;
     3887-+esac
     3888-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     3889-+$as_echo "$ac_try_echo"; } >&5
     3890-+  (eval "$ac_try") 2>&5
     3891-+  ac_status=$?
     3892-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     3893-+  test $ac_status = 0; }; }; then
     3894-+    cross_compiling=no
     3895-+  else
     3896-+    if test "$cross_compiling" = maybe; then
     3897-+      cross_compiling=yes
     3898-+    else
     3899-+      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     3900-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     3901-+as_fn_error $? "cannot run C compiled programs.
     3902-+If you meant to cross compile, use \`--host'.
     3903-+See \`config.log' for more details" "$LINENO" 5; }
     3904-+    fi
     3905-+  fi
     3906-+fi
     3907-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
     3908-+$as_echo "$cross_compiling" >&6; }
     3909-+
     3910-+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
     3911-+ac_clean_files=$ac_clean_files_save
     3912-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
     3913- $as_echo_n "checking for suffix of object files... " >&6; }
     3914--if test "${ac_cv_objext+set}" = set; then
     3915-+if ${ac_cv_objext+:} false; then :
     3916-   $as_echo_n "(cached) " >&6
     3917- else
     3918--  cat >conftest.$ac_ext <<_ACEOF
     3919--/* confdefs.h.  */
     3920--_ACEOF
     3921--cat confdefs.h >>conftest.$ac_ext
     3922--cat >>conftest.$ac_ext <<_ACEOF
     3923-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3924- /* end confdefs.h.  */
     3925-
     3926- int
     3927-@@ -2720,17 +2987,17 @@
     3928- }
     3929- _ACEOF
     3930- rm -f conftest.o conftest.obj
     3931--if { (ac_try="$ac_compile"
     3932-+if { { ac_try="$ac_compile"
     3933- case "(($ac_try" in
     3934-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     3935-   *) ac_try_echo=$ac_try;;
     3936- esac
     3937--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     3938--$as_echo "$ac_try_echo") >&5
     3939-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     3940-+$as_echo "$ac_try_echo"; } >&5
     3941-   (eval "$ac_compile") 2>&5
     3942-   ac_status=$?
     3943--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     3944--  (exit $ac_status); }; then
     3945-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     3946-+  test $ac_status = 0; }; then :
     3947-   for ac_file in conftest.o conftest.obj conftest.*; do
     3948-   test -f "$ac_file" || continue;
     3949-   case $ac_file in
     3950-@@ -2743,31 +3010,23 @@
     3951-   $as_echo "$as_me: failed program was:" >&5
     3952- sed 's/^/| /' conftest.$ac_ext >&5
     3953-
     3954--{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
     3955-+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     3956- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     3957--{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
     3958--See \`config.log' for more details." >&5
     3959--$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
     3960--See \`config.log' for more details." >&2;}
     3961--   { (exit 1); exit 1; }; }; }
     3962-+as_fn_error $? "cannot compute suffix of object files: cannot compile
     3963-+See \`config.log' for more details" "$LINENO" 5; }
     3964- fi
     3965--
     3966- rm -f conftest.$ac_cv_objext conftest.$ac_ext
     3967- fi
     3968--{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
     3969-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
     3970- $as_echo "$ac_cv_objext" >&6; }
     3971- OBJEXT=$ac_cv_objext
     3972- ac_objext=$OBJEXT
     3973--{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
     3974-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
     3975- $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
     3976--if test "${ac_cv_c_compiler_gnu+set}" = set; then
     3977-+if ${ac_cv_c_compiler_gnu+:} false; then :
     3978-   $as_echo_n "(cached) " >&6
     3979- else
     3980--  cat >conftest.$ac_ext <<_ACEOF
     3981--/* confdefs.h.  */
     3982--_ACEOF
     3983--cat confdefs.h >>conftest.$ac_ext
     3984--cat >>conftest.$ac_ext <<_ACEOF
     3985-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3986- /* end confdefs.h.  */
     3987-
     3988- int
     3989-@@ -2781,37 +3040,16 @@
     3990-   return 0;
     3991- }
     3992- _ACEOF
     3993--rm -f conftest.$ac_objext
     3994--if { (ac_try="$ac_compile"
     3995--case "(($ac_try" in
     3996--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     3997--  *) ac_try_echo=$ac_try;;
     3998--esac
     3999--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     4000--$as_echo "$ac_try_echo") >&5
     4001--  (eval "$ac_compile") 2>conftest.er1
     4002--  ac_status=$?
     4003--  grep -v '^ *+' conftest.er1 >conftest.err
     4004--  rm -f conftest.er1
     4005--  cat conftest.err >&5
     4006--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4007--  (exit $ac_status); } && {
     4008--       test -z "$ac_c_werror_flag" ||
     4009--       test ! -s conftest.err
     4010--       } && test -s conftest.$ac_objext; then
     4011-+if ac_fn_c_try_compile "$LINENO"; then :
     4012-   ac_compiler_gnu=yes
     4013- else
     4014--  $as_echo "$as_me: failed program was:" >&5
     4015--sed 's/^/| /' conftest.$ac_ext >&5
     4016--
     4017--      ac_compiler_gnu=no
     4018-+  ac_compiler_gnu=no
     4019- fi
     4020--
     4021- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     4022- ac_cv_c_compiler_gnu=$ac_compiler_gnu
     4023-
     4024- fi
     4025--{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
     4026-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
     4027- $as_echo "$ac_cv_c_compiler_gnu" >&6; }
     4028- if test $ac_compiler_gnu = yes; then
     4029-   GCC=yes
     4030-@@ -2820,20 +3058,16 @@
     4031- fi
     4032- ac_test_CFLAGS=${CFLAGS+set}
     4033- ac_save_CFLAGS=$CFLAGS
     4034--{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
     4035-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
     4036- $as_echo_n "checking whether $CC accepts -g... " >&6; }
     4037--if test "${ac_cv_prog_cc_g+set}" = set; then
     4038-+if ${ac_cv_prog_cc_g+:} false; then :
     4039-   $as_echo_n "(cached) " >&6
     4040- else
     4041-   ac_save_c_werror_flag=$ac_c_werror_flag
     4042-    ac_c_werror_flag=yes
     4043-    ac_cv_prog_cc_g=no
     4044-    CFLAGS="-g"
     4045--   cat >conftest.$ac_ext <<_ACEOF
     4046--/* confdefs.h.  */
     4047--_ACEOF
     4048--cat confdefs.h >>conftest.$ac_ext
     4049--cat >>conftest.$ac_ext <<_ACEOF
     4050-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     4051- /* end confdefs.h.  */
     4052-
     4053- int
     4054-@@ -2844,35 +3078,11 @@
     4055-   return 0;
     4056- }
     4057- _ACEOF
     4058--rm -f conftest.$ac_objext
     4059--if { (ac_try="$ac_compile"
     4060--case "(($ac_try" in
     4061--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     4062--  *) ac_try_echo=$ac_try;;
     4063--esac
     4064--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     4065--$as_echo "$ac_try_echo") >&5
     4066--  (eval "$ac_compile") 2>conftest.er1
     4067--  ac_status=$?
     4068--  grep -v '^ *+' conftest.er1 >conftest.err
     4069--  rm -f conftest.er1
     4070--  cat conftest.err >&5
     4071--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4072--  (exit $ac_status); } && {
     4073--       test -z "$ac_c_werror_flag" ||
     4074--       test ! -s conftest.err
     4075--       } && test -s conftest.$ac_objext; then
     4076-+if ac_fn_c_try_compile "$LINENO"; then :
     4077-   ac_cv_prog_cc_g=yes
     4078- else
     4079--  $as_echo "$as_me: failed program was:" >&5
     4080--sed 's/^/| /' conftest.$ac_ext >&5
     4081--
     4082--      CFLAGS=""
     4083--      cat >conftest.$ac_ext <<_ACEOF
     4084--/* confdefs.h.  */
     4085--_ACEOF
     4086--cat confdefs.h >>conftest.$ac_ext
     4087--cat >>conftest.$ac_ext <<_ACEOF
     4088-+  CFLAGS=""
     4089-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     4090- /* end confdefs.h.  */
     4091-
     4092- int
     4093-@@ -2883,36 +3093,12 @@
     4094-   return 0;
     4095- }
     4096- _ACEOF
     4097--rm -f conftest.$ac_objext
     4098--if { (ac_try="$ac_compile"
     4099--case "(($ac_try" in
     4100--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     4101--  *) ac_try_echo=$ac_try;;
     4102--esac
     4103--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     4104--$as_echo "$ac_try_echo") >&5
     4105--  (eval "$ac_compile") 2>conftest.er1
     4106--  ac_status=$?
     4107--  grep -v '^ *+' conftest.er1 >conftest.err
     4108--  rm -f conftest.er1
     4109--  cat conftest.err >&5
     4110--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4111--  (exit $ac_status); } && {
     4112--       test -z "$ac_c_werror_flag" ||
     4113--       test ! -s conftest.err
     4114--       } && test -s conftest.$ac_objext; then
     4115--  :
     4116--else
     4117--  $as_echo "$as_me: failed program was:" >&5
     4118--sed 's/^/| /' conftest.$ac_ext >&5
     4119-+if ac_fn_c_try_compile "$LINENO"; then :
     4120-
     4121--      ac_c_werror_flag=$ac_save_c_werror_flag
     4122-+else
     4123-+  ac_c_werror_flag=$ac_save_c_werror_flag
     4124-        CFLAGS="-g"
     4125--       cat >conftest.$ac_ext <<_ACEOF
     4126--/* confdefs.h.  */
     4127--_ACEOF
     4128--cat confdefs.h >>conftest.$ac_ext
     4129--cat >>conftest.$ac_ext <<_ACEOF
     4130-+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     4131- /* end confdefs.h.  */
     4132-
     4133- int
     4134-@@ -2923,42 +3109,17 @@
     4135-   return 0;
     4136- }
     4137- _ACEOF
     4138--rm -f conftest.$ac_objext
     4139--if { (ac_try="$ac_compile"
     4140--case "(($ac_try" in
     4141--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     4142--  *) ac_try_echo=$ac_try;;
     4143--esac
     4144--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     4145--$as_echo "$ac_try_echo") >&5
     4146--  (eval "$ac_compile") 2>conftest.er1
     4147--  ac_status=$?
     4148--  grep -v '^ *+' conftest.er1 >conftest.err
     4149--  rm -f conftest.er1
     4150--  cat conftest.err >&5
     4151--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4152--  (exit $ac_status); } && {
     4153--       test -z "$ac_c_werror_flag" ||
     4154--       test ! -s conftest.err
     4155--       } && test -s conftest.$ac_objext; then
     4156-+if ac_fn_c_try_compile "$LINENO"; then :
     4157-   ac_cv_prog_cc_g=yes
     4158--else
     4159--  $as_echo "$as_me: failed program was:" >&5
     4160--sed 's/^/| /' conftest.$ac_ext >&5
     4161--
     4162--
     4163- fi
     4164--
     4165- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     4166- fi
     4167--
     4168- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     4169- fi
     4170--
     4171- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     4172-    ac_c_werror_flag=$ac_save_c_werror_flag
     4173- fi
     4174--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
     4175-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
     4176- $as_echo "$ac_cv_prog_cc_g" >&6; }
     4177- if test "$ac_test_CFLAGS" = set; then
     4178-   CFLAGS=$ac_save_CFLAGS
     4179-@@ -2975,23 +3136,18 @@
     4180-     CFLAGS=
     4181-   fi
     4182- fi
     4183--{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
     4184-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
     4185- $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
     4186--if test "${ac_cv_prog_cc_c89+set}" = set; then
     4187-+if ${ac_cv_prog_cc_c89+:} false; then :
     4188-   $as_echo_n "(cached) " >&6
     4189- else
     4190-   ac_cv_prog_cc_c89=no
     4191- ac_save_CC=$CC
     4192--cat >conftest.$ac_ext <<_ACEOF
     4193--/* confdefs.h.  */
     4194--_ACEOF
     4195--cat confdefs.h >>conftest.$ac_ext
     4196--cat >>conftest.$ac_ext <<_ACEOF
     4197-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     4198- /* end confdefs.h.  */
     4199- #include <stdarg.h>
     4200- #include <stdio.h>
     4201--#include <sys/types.h>
     4202--#include <sys/stat.h>
     4203-+struct stat;
     4204- /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
     4205- struct buf { int x; };
     4206- FILE * (*rcsopen) (struct buf *, struct stat *, int);
     4207-@@ -3043,32 +3199,9 @@
     4208-       -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
     4209- do
     4210-   CC="$ac_save_CC $ac_arg"
     4211--  rm -f conftest.$ac_objext
     4212--if { (ac_try="$ac_compile"
     4213--case "(($ac_try" in
     4214--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     4215--  *) ac_try_echo=$ac_try;;
     4216--esac
     4217--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     4218--$as_echo "$ac_try_echo") >&5
     4219--  (eval "$ac_compile") 2>conftest.er1
     4220--  ac_status=$?
     4221--  grep -v '^ *+' conftest.er1 >conftest.err
     4222--  rm -f conftest.er1
     4223--  cat conftest.err >&5
     4224--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4225--  (exit $ac_status); } && {
     4226--       test -z "$ac_c_werror_flag" ||
     4227--       test ! -s conftest.err
     4228--       } && test -s conftest.$ac_objext; then
     4229-+  if ac_fn_c_try_compile "$LINENO"; then :
     4230-   ac_cv_prog_cc_c89=$ac_arg
     4231--else
     4232--  $as_echo "$as_me: failed program was:" >&5
     4233--sed 's/^/| /' conftest.$ac_ext >&5
     4234--
     4235--
     4236- fi
     4237--
     4238- rm -f core conftest.err conftest.$ac_objext
     4239-   test "x$ac_cv_prog_cc_c89" != "xno" && break
     4240- done
     4241-@@ -3079,17 +3212,19 @@
     4242- # AC_CACHE_VAL
     4243- case "x$ac_cv_prog_cc_c89" in
     4244-   x)
     4245--    { $as_echo "$as_me:$LINENO: result: none needed" >&5
     4246-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
     4247- $as_echo "none needed" >&6; } ;;
     4248-   xno)
     4249--    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
     4250-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
     4251- $as_echo "unsupported" >&6; } ;;
     4252-   *)
     4253-     CC="$CC $ac_cv_prog_cc_c89"
     4254--    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
     4255-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
     4256- $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
     4257- esac
     4258-+if test "x$ac_cv_prog_cc_c89" != xno; then :
     4259-
     4260-+fi
     4261-
     4262- ac_ext=c
     4263- ac_cpp='$CPP $CPPFLAGS'
     4264-@@ -3103,14 +3238,14 @@
     4265- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     4266- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     4267- ac_compiler_gnu=$ac_cv_c_compiler_gnu
     4268--{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
     4269-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
     4270- $as_echo_n "checking how to run the C preprocessor... " >&6; }
     4271- # On Suns, sometimes $CPP names a directory.
     4272- if test -n "$CPP" && test -d "$CPP"; then
     4273-   CPP=
     4274- fi
     4275- if test -z "$CPP"; then
     4276--  if test "${ac_cv_prog_CPP+set}" = set; then
     4277-+  if ${ac_cv_prog_CPP+:} false; then :
     4278-   $as_echo_n "(cached) " >&6
     4279- else
     4280-       # Double quotes because CPP needs to be expanded
     4281-@@ -3125,11 +3260,7 @@
     4282-   # <limits.h> exists even on freestanding compilers.
     4283-   # On the NeXT, cc -E runs the code through the compiler's parser,
     4284-   # not just through cpp. "Syntax error" is here to catch this case.
     4285--  cat >conftest.$ac_ext <<_ACEOF
     4286--/* confdefs.h.  */
     4287--_ACEOF
     4288--cat confdefs.h >>conftest.$ac_ext
     4289--cat >>conftest.$ac_ext <<_ACEOF
     4290-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     4291- /* end confdefs.h.  */
     4292- #ifdef __STDC__
     4293- # include <limits.h>
     4294-@@ -3138,78 +3269,34 @@
     4295- #endif
     4296-                    Syntax error
     4297- _ACEOF
     4298--if { (ac_try="$ac_cpp conftest.$ac_ext"
     4299--case "(($ac_try" in
     4300--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     4301--  *) ac_try_echo=$ac_try;;
     4302--esac
     4303--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     4304--$as_echo "$ac_try_echo") >&5
     4305--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
     4306--  ac_status=$?
     4307--  grep -v '^ *+' conftest.er1 >conftest.err
     4308--  rm -f conftest.er1
     4309--  cat conftest.err >&5
     4310--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4311--  (exit $ac_status); } >/dev/null && {
     4312--       test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
     4313--       test ! -s conftest.err
     4314--       }; then
     4315--  :
     4316--else
     4317--  $as_echo "$as_me: failed program was:" >&5
     4318--sed 's/^/| /' conftest.$ac_ext >&5
     4319-+if ac_fn_c_try_cpp "$LINENO"; then :
     4320-
     4321-+else
     4322-   # Broken: fails on valid input.
     4323- continue
     4324- fi
     4325--
     4326--rm -f conftest.err conftest.$ac_ext
     4327-+rm -f conftest.err conftest.i conftest.$ac_ext
     4328-
     4329-   # OK, works on sane cases.  Now check whether nonexistent headers
     4330-   # can be detected and how.
     4331--  cat >conftest.$ac_ext <<_ACEOF
     4332--/* confdefs.h.  */
     4333--_ACEOF
     4334--cat confdefs.h >>conftest.$ac_ext
     4335--cat >>conftest.$ac_ext <<_ACEOF
     4336-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     4337- /* end confdefs.h.  */
     4338- #include <ac_nonexistent.h>
     4339- _ACEOF
     4340--if { (ac_try="$ac_cpp conftest.$ac_ext"
     4341--case "(($ac_try" in
     4342--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     4343--  *) ac_try_echo=$ac_try;;
     4344--esac
     4345--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     4346--$as_echo "$ac_try_echo") >&5
     4347--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
     4348--  ac_status=$?
     4349--  grep -v '^ *+' conftest.er1 >conftest.err
     4350--  rm -f conftest.er1
     4351--  cat conftest.err >&5
     4352--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4353--  (exit $ac_status); } >/dev/null && {
     4354--       test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
     4355--       test ! -s conftest.err
     4356--       }; then
     4357-+if ac_fn_c_try_cpp "$LINENO"; then :
     4358-   # Broken: success on invalid input.
     4359- continue
     4360- else
     4361--  $as_echo "$as_me: failed program was:" >&5
     4362--sed 's/^/| /' conftest.$ac_ext >&5
     4363--
     4364-   # Passes both tests.
     4365- ac_preproc_ok=:
     4366- break
     4367- fi
     4368--
     4369--rm -f conftest.err conftest.$ac_ext
     4370-+rm -f conftest.err conftest.i conftest.$ac_ext
     4371-
     4372- done
     4373- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
     4374--rm -f conftest.err conftest.$ac_ext
     4375--if $ac_preproc_ok; then
     4376-+rm -f conftest.i conftest.err conftest.$ac_ext
     4377-+if $ac_preproc_ok; then :
     4378-   break
     4379- fi
     4380-
     4381-@@ -3221,7 +3308,7 @@
     4382- else
     4383-   ac_cv_prog_CPP=$CPP
     4384- fi
     4385--{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
     4386-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
     4387- $as_echo "$CPP" >&6; }
     4388- ac_preproc_ok=false
     4389- for ac_c_preproc_warn_flag in '' yes
     4390-@@ -3232,11 +3319,7 @@
     4391-   # <limits.h> exists even on freestanding compilers.
     4392-   # On the NeXT, cc -E runs the code through the compiler's parser,
     4393-   # not just through cpp. "Syntax error" is here to catch this case.
     4394--  cat >conftest.$ac_ext <<_ACEOF
     4395--/* confdefs.h.  */
     4396--_ACEOF
     4397--cat confdefs.h >>conftest.$ac_ext
     4398--cat >>conftest.$ac_ext <<_ACEOF
     4399-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     4400- /* end confdefs.h.  */
     4401- #ifdef __STDC__
     4402- # include <limits.h>
     4403-@@ -3245,87 +3328,40 @@
     4404- #endif
     4405-                    Syntax error
     4406- _ACEOF
     4407--if { (ac_try="$ac_cpp conftest.$ac_ext"
     4408--case "(($ac_try" in
     4409--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     4410--  *) ac_try_echo=$ac_try;;
     4411--esac
     4412--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     4413--$as_echo "$ac_try_echo") >&5
     4414--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
     4415--  ac_status=$?
     4416--  grep -v '^ *+' conftest.er1 >conftest.err
     4417--  rm -f conftest.er1
     4418--  cat conftest.err >&5
     4419--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4420--  (exit $ac_status); } >/dev/null && {
     4421--       test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
     4422--       test ! -s conftest.err
     4423--       }; then
     4424--  :
     4425--else
     4426--  $as_echo "$as_me: failed program was:" >&5
     4427--sed 's/^/| /' conftest.$ac_ext >&5
     4428-+if ac_fn_c_try_cpp "$LINENO"; then :
     4429-
     4430-+else
     4431-   # Broken: fails on valid input.
     4432- continue
     4433- fi
     4434--
     4435--rm -f conftest.err conftest.$ac_ext
     4436-+rm -f conftest.err conftest.i conftest.$ac_ext
     4437-
     4438-   # OK, works on sane cases.  Now check whether nonexistent headers
     4439-   # can be detected and how.
     4440--  cat >conftest.$ac_ext <<_ACEOF
     4441--/* confdefs.h.  */
     4442--_ACEOF
     4443--cat confdefs.h >>conftest.$ac_ext
     4444--cat >>conftest.$ac_ext <<_ACEOF
     4445-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     4446- /* end confdefs.h.  */
     4447- #include <ac_nonexistent.h>
     4448- _ACEOF
     4449--if { (ac_try="$ac_cpp conftest.$ac_ext"
     4450--case "(($ac_try" in
     4451--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     4452--  *) ac_try_echo=$ac_try;;
     4453--esac
     4454--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     4455--$as_echo "$ac_try_echo") >&5
     4456--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
     4457--  ac_status=$?
     4458--  grep -v '^ *+' conftest.er1 >conftest.err
     4459--  rm -f conftest.er1
     4460--  cat conftest.err >&5
     4461--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4462--  (exit $ac_status); } >/dev/null && {
     4463--       test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
     4464--       test ! -s conftest.err
     4465--       }; then
     4466-+if ac_fn_c_try_cpp "$LINENO"; then :
     4467-   # Broken: success on invalid input.
     4468- continue
     4469- else
     4470--  $as_echo "$as_me: failed program was:" >&5
     4471--sed 's/^/| /' conftest.$ac_ext >&5
     4472--
     4473-   # Passes both tests.
     4474- ac_preproc_ok=:
     4475- break
     4476- fi
     4477--
     4478--rm -f conftest.err conftest.$ac_ext
     4479-+rm -f conftest.err conftest.i conftest.$ac_ext
     4480-
     4481- done
     4482- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
     4483--rm -f conftest.err conftest.$ac_ext
     4484--if $ac_preproc_ok; then
     4485--  :
     4486-+rm -f conftest.i conftest.err conftest.$ac_ext
     4487-+if $ac_preproc_ok; then :
     4488-+
     4489- else
     4490--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
     4491-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     4492- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     4493--{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
     4494--See \`config.log' for more details." >&5
     4495--$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
     4496--See \`config.log' for more details." >&2;}
     4497--   { (exit 1); exit 1; }; }; }
     4498-+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
     4499-+See \`config.log' for more details" "$LINENO" 5; }
     4500- fi
     4501-
     4502- ac_ext=c
     4503-@@ -3335,9 +3371,9 @@
     4504- ac_compiler_gnu=$ac_cv_c_compiler_gnu
     4505-
     4506-
     4507--{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
     4508-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
     4509- $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
     4510--if test "${ac_cv_path_GREP+set}" = set; then
     4511-+if ${ac_cv_path_GREP+:} false; then :
     4512-   $as_echo_n "(cached) " >&6
     4513- else
     4514-   if test -z "$GREP"; then
     4515-@@ -3348,10 +3384,10 @@
     4516- do
     4517-   IFS=$as_save_IFS
     4518-   test -z "$as_dir" && as_dir=.
     4519--  for ac_prog in grep ggrep; do
     4520-+    for ac_prog in grep ggrep; do
     4521-     for ac_exec_ext in '' $ac_executable_extensions; do
     4522-       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
     4523--      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
     4524-+      as_fn_executable_p "$ac_path_GREP" || continue
     4525- # Check for GNU ac_path_GREP and select it if it is found.
     4526-   # Check for GNU $ac_path_GREP
     4527- case `"$ac_path_GREP" --version 2>&1` in
     4528-@@ -3368,7 +3404,7 @@
     4529-     $as_echo 'GREP' >> "conftest.nl"
     4530-     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     4531-     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     4532--    ac_count=`expr $ac_count + 1`
     4533-+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     4534-     if test $ac_count -gt ${ac_path_GREP_max-0}; then
     4535-       # Best one so far, save it but keep looking for a better one
     4536-       ac_cv_path_GREP="$ac_path_GREP"
     4537-@@ -3383,26 +3419,24 @@
     4538-       $ac_path_GREP_found && break 3
     4539-     done
     4540-   done
     4541--done
     4542-+  done
     4543- IFS=$as_save_IFS
     4544-   if test -z "$ac_cv_path_GREP"; then
     4545--    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
     4546--$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
     4547--   { (exit 1); exit 1; }; }
     4548-+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
     4549-   fi
     4550- else
     4551-   ac_cv_path_GREP=$GREP
     4552- fi
     4553-
     4554- fi
     4555--{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
     4556-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
     4557- $as_echo "$ac_cv_path_GREP" >&6; }
     4558-  GREP="$ac_cv_path_GREP"
     4559-
     4560-
     4561--{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
     4562-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
     4563- $as_echo_n "checking for egrep... " >&6; }
     4564--if test "${ac_cv_path_EGREP+set}" = set; then
     4565-+if ${ac_cv_path_EGREP+:} false; then :
     4566-   $as_echo_n "(cached) " >&6
     4567- else
     4568-   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
     4569-@@ -3416,10 +3450,10 @@
     4570- do
     4571-   IFS=$as_save_IFS
     4572-   test -z "$as_dir" && as_dir=.
     4573--  for ac_prog in egrep; do
     4574-+    for ac_prog in egrep; do
     4575-     for ac_exec_ext in '' $ac_executable_extensions; do
     4576-       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
     4577--      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
     4578-+      as_fn_executable_p "$ac_path_EGREP" || continue
     4579- # Check for GNU ac_path_EGREP and select it if it is found.
     4580-   # Check for GNU $ac_path_EGREP
     4581- case `"$ac_path_EGREP" --version 2>&1` in
     4582-@@ -3436,7 +3470,7 @@
     4583-     $as_echo 'EGREP' >> "conftest.nl"
     4584-     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     4585-     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     4586--    ac_count=`expr $ac_count + 1`
     4587-+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     4588-     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
     4589-       # Best one so far, save it but keep looking for a better one
     4590-       ac_cv_path_EGREP="$ac_path_EGREP"
     4591-@@ -3451,12 +3485,10 @@
     4592-       $ac_path_EGREP_found && break 3
     4593-     done
     4594-   done
     4595--done
     4596-+  done
     4597- IFS=$as_save_IFS
     4598-   if test -z "$ac_cv_path_EGREP"; then
     4599--    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
     4600--$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
     4601--   { (exit 1); exit 1; }; }
     4602-+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
     4603-   fi
     4604- else
     4605-   ac_cv_path_EGREP=$EGREP
     4606-@@ -3464,21 +3496,17 @@
     4607-
     4608-    fi
     4609- fi
     4610--{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
     4611-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
     4612- $as_echo "$ac_cv_path_EGREP" >&6; }
     4613-  EGREP="$ac_cv_path_EGREP"
     4614-
     4615-
     4616--{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
     4617-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
     4618- $as_echo_n "checking for ANSI C header files... " >&6; }
     4619--if test "${ac_cv_header_stdc+set}" = set; then
     4620-+if ${ac_cv_header_stdc+:} false; then :
     4621-   $as_echo_n "(cached) " >&6
     4622- else
     4623--  cat >conftest.$ac_ext <<_ACEOF
     4624--/* confdefs.h.  */
     4625--_ACEOF
     4626--cat confdefs.h >>conftest.$ac_ext
     4627--cat >>conftest.$ac_ext <<_ACEOF
     4628-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     4629- /* end confdefs.h.  */
     4630- #include <stdlib.h>
     4631- #include <stdarg.h>
     4632-@@ -3493,48 +3521,23 @@
     4633-   return 0;
     4634- }
     4635- _ACEOF
     4636--rm -f conftest.$ac_objext
     4637--if { (ac_try="$ac_compile"
     4638--case "(($ac_try" in
     4639--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     4640--  *) ac_try_echo=$ac_try;;
     4641--esac
     4642--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     4643--$as_echo "$ac_try_echo") >&5
     4644--  (eval "$ac_compile") 2>conftest.er1
     4645--  ac_status=$?
     4646--  grep -v '^ *+' conftest.er1 >conftest.err
     4647--  rm -f conftest.er1
     4648--  cat conftest.err >&5
     4649--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4650--  (exit $ac_status); } && {
     4651--       test -z "$ac_c_werror_flag" ||
     4652--       test ! -s conftest.err
     4653--       } && test -s conftest.$ac_objext; then
     4654-+if ac_fn_c_try_compile "$LINENO"; then :
     4655-   ac_cv_header_stdc=yes
     4656- else
     4657--  $as_echo "$as_me: failed program was:" >&5
     4658--sed 's/^/| /' conftest.$ac_ext >&5
     4659--
     4660--      ac_cv_header_stdc=no
     4661-+  ac_cv_header_stdc=no
     4662- fi
     4663--
     4664- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     4665-
     4666- if test $ac_cv_header_stdc = yes; then
     4667-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
     4668--  cat >conftest.$ac_ext <<_ACEOF
     4669--/* confdefs.h.  */
     4670--_ACEOF
     4671--cat confdefs.h >>conftest.$ac_ext
     4672--cat >>conftest.$ac_ext <<_ACEOF
     4673-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     4674- /* end confdefs.h.  */
     4675- #include <string.h>
     4676-
     4677- _ACEOF
     4678- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
     4679--  $EGREP "memchr" >/dev/null 2>&1; then
     4680--  :
     4681-+  $EGREP "memchr" >/dev/null 2>&1; then :
     4682-+
     4683- else
     4684-   ac_cv_header_stdc=no
     4685- fi
     4686-@@ -3544,18 +3547,14 @@
     4687-
     4688- if test $ac_cv_header_stdc = yes; then
     4689-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
     4690--  cat >conftest.$ac_ext <<_ACEOF
     4691--/* confdefs.h.  */
     4692--_ACEOF
     4693--cat confdefs.h >>conftest.$ac_ext
     4694--cat >>conftest.$ac_ext <<_ACEOF
     4695-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     4696- /* end confdefs.h.  */
     4697- #include <stdlib.h>
     4698-
     4699- _ACEOF
     4700- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
     4701--  $EGREP "free" >/dev/null 2>&1; then
     4702--  :
     4703-+  $EGREP "free" >/dev/null 2>&1; then :
     4704-+
     4705- else
     4706-   ac_cv_header_stdc=no
     4707- fi
     4708-@@ -3565,14 +3564,10 @@
     4709-
     4710- if test $ac_cv_header_stdc = yes; then
     4711-   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
     4712--  if test "$cross_compiling" = yes; then
     4713-+  if test "$cross_compiling" = yes; then :
     4714-   :
     4715- else
     4716--  cat >conftest.$ac_ext <<_ACEOF
     4717--/* confdefs.h.  */
     4718--_ACEOF
     4719--cat confdefs.h >>conftest.$ac_ext
     4720--cat >>conftest.$ac_ext <<_ACEOF
     4721-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     4722- /* end confdefs.h.  */
     4723- #include <ctype.h>
     4724- #include <stdlib.h>
     4725-@@ -3599,118 +3594,33 @@
     4726-   return 0;
     4727- }
     4728- _ACEOF
     4729--rm -f conftest$ac_exeext
     4730--if { (ac_try="$ac_link"
     4731--case "(($ac_try" in
     4732--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     4733--  *) ac_try_echo=$ac_try;;
     4734--esac
     4735--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     4736--$as_echo "$ac_try_echo") >&5
     4737--  (eval "$ac_link") 2>&5
     4738--  ac_status=$?
     4739--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4740--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
     4741--  { (case "(($ac_try" in
     4742--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     4743--  *) ac_try_echo=$ac_try;;
     4744--esac
     4745--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     4746--$as_echo "$ac_try_echo") >&5
     4747--  (eval "$ac_try") 2>&5
     4748--  ac_status=$?
     4749--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4750--  (exit $ac_status); }; }; then
     4751--  :
     4752--else
     4753--  $as_echo "$as_me: program exited with status $ac_status" >&5
     4754--$as_echo "$as_me: failed program was:" >&5
     4755--sed 's/^/| /' conftest.$ac_ext >&5
     4756-+if ac_fn_c_try_run "$LINENO"; then :
     4757-
     4758--( exit $ac_status )
     4759--ac_cv_header_stdc=no
     4760-+else
     4761-+  ac_cv_header_stdc=no
     4762- fi
     4763--rm -rf conftest.dSYM
     4764--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
     4765-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
     4766-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
     4767- fi
     4768-
     4769--
     4770- fi
     4771- fi
     4772--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
     4773-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
     4774- $as_echo "$ac_cv_header_stdc" >&6; }
     4775- if test $ac_cv_header_stdc = yes; then
     4776-
     4777--cat >>confdefs.h <<\_ACEOF
     4778--#define STDC_HEADERS 1
     4779--_ACEOF
     4780-+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
     4781-
     4782- fi
     4783-
     4784- # On IRIX 5.3, sys/types and inttypes.h are conflicting.
     4785--
     4786--
     4787--
     4788--
     4789--
     4790--
     4791--
     4792--
     4793--
     4794- for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
     4795-                 inttypes.h stdint.h unistd.h
     4796--do
     4797--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
     4798--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
     4799--$as_echo_n "checking for $ac_header... " >&6; }
     4800--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
     4801--  $as_echo_n "(cached) " >&6
     4802--else
     4803--  cat >conftest.$ac_ext <<_ACEOF
     4804--/* confdefs.h.  */
     4805--_ACEOF
     4806--cat confdefs.h >>conftest.$ac_ext
     4807--cat >>conftest.$ac_ext <<_ACEOF
     4808--/* end confdefs.h.  */
     4809--$ac_includes_default
     4810--
     4811--#include <$ac_header>
     4812--_ACEOF
     4813--rm -f conftest.$ac_objext
     4814--if { (ac_try="$ac_compile"
     4815--case "(($ac_try" in
     4816--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     4817--  *) ac_try_echo=$ac_try;;
     4818--esac
     4819--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     4820--$as_echo "$ac_try_echo") >&5
     4821--  (eval "$ac_compile") 2>conftest.er1
     4822--  ac_status=$?
     4823--  grep -v '^ *+' conftest.er1 >conftest.err
     4824--  rm -f conftest.er1
     4825--  cat conftest.err >&5
     4826--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4827--  (exit $ac_status); } && {
     4828--       test -z "$ac_c_werror_flag" ||
     4829--       test ! -s conftest.err
     4830--       } && test -s conftest.$ac_objext; then
     4831--  eval "$as_ac_Header=yes"
     4832--else
     4833--  $as_echo "$as_me: failed program was:" >&5
     4834--sed 's/^/| /' conftest.$ac_ext >&5
     4835--
     4836--      eval "$as_ac_Header=no"
     4837--fi
     4838--
     4839--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     4840--fi
     4841--ac_res=`eval 'as_val=${'$as_ac_Header'}
     4842--               $as_echo "$as_val"'`
     4843--             { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
     4844--$as_echo "$ac_res" >&6; }
     4845--as_val=`eval 'as_val=${'$as_ac_Header'}
     4846--               $as_echo "$as_val"'`
     4847--   if test "x$as_val" = x""yes; then
     4848-+do :
     4849-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
     4850-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
     4851-+"
     4852-+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     4853-   cat >>confdefs.h <<_ACEOF
     4854- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
     4855- _ACEOF
     4856-@@ -3721,139 +3631,8 @@
     4857-
     4858-
     4859-
     4860--  if test "${ac_cv_header_minix_config_h+set}" = set; then
     4861--  { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
     4862--$as_echo_n "checking for minix/config.h... " >&6; }
     4863--if test "${ac_cv_header_minix_config_h+set}" = set; then
     4864--  $as_echo_n "(cached) " >&6
     4865--fi
     4866--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
     4867--$as_echo "$ac_cv_header_minix_config_h" >&6; }
     4868--else
     4869--  # Is the header compilable?
     4870--{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5
     4871--$as_echo_n "checking minix/config.h usability... " >&6; }
     4872--cat >conftest.$ac_ext <<_ACEOF
     4873--/* confdefs.h.  */
     4874--_ACEOF
     4875--cat confdefs.h >>conftest.$ac_ext
     4876--cat >>conftest.$ac_ext <<_ACEOF
     4877--/* end confdefs.h.  */
     4878--$ac_includes_default
     4879--#include <minix/config.h>
     4880--_ACEOF
     4881--rm -f conftest.$ac_objext
     4882--if { (ac_try="$ac_compile"
     4883--case "(($ac_try" in
     4884--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     4885--  *) ac_try_echo=$ac_try;;
     4886--esac
     4887--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     4888--$as_echo "$ac_try_echo") >&5
     4889--  (eval "$ac_compile") 2>conftest.er1
     4890--  ac_status=$?
     4891--  grep -v '^ *+' conftest.er1 >conftest.err
     4892--  rm -f conftest.er1
     4893--  cat conftest.err >&5
     4894--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4895--  (exit $ac_status); } && {
     4896--       test -z "$ac_c_werror_flag" ||
     4897--       test ! -s conftest.err
     4898--       } && test -s conftest.$ac_objext; then
     4899--  ac_header_compiler=yes
     4900--else
     4901--  $as_echo "$as_me: failed program was:" >&5
     4902--sed 's/^/| /' conftest.$ac_ext >&5
     4903--
     4904--      ac_header_compiler=no
     4905--fi
     4906--
     4907--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     4908--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
     4909--$as_echo "$ac_header_compiler" >&6; }
     4910--
     4911--# Is the header present?
     4912--{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5
     4913--$as_echo_n "checking minix/config.h presence... " >&6; }
     4914--cat >conftest.$ac_ext <<_ACEOF
     4915--/* confdefs.h.  */
     4916--_ACEOF
     4917--cat confdefs.h >>conftest.$ac_ext
     4918--cat >>conftest.$ac_ext <<_ACEOF
     4919--/* end confdefs.h.  */
     4920--#include <minix/config.h>
     4921--_ACEOF
     4922--if { (ac_try="$ac_cpp conftest.$ac_ext"
     4923--case "(($ac_try" in
     4924--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     4925--  *) ac_try_echo=$ac_try;;
     4926--esac
     4927--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     4928--$as_echo "$ac_try_echo") >&5
     4929--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
     4930--  ac_status=$?
     4931--  grep -v '^ *+' conftest.er1 >conftest.err
     4932--  rm -f conftest.er1
     4933--  cat conftest.err >&5
     4934--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4935--  (exit $ac_status); } >/dev/null && {
     4936--       test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
     4937--       test ! -s conftest.err
     4938--       }; then
     4939--  ac_header_preproc=yes
     4940--else
     4941--  $as_echo "$as_me: failed program was:" >&5
     4942--sed 's/^/| /' conftest.$ac_ext >&5
     4943--
     4944--  ac_header_preproc=no
     4945--fi
     4946--
     4947--rm -f conftest.err conftest.$ac_ext
     4948--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
     4949--$as_echo "$ac_header_preproc" >&6; }
     4950--
     4951--# So?  What about this header?
     4952--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
     4953--  yes:no: )
     4954--    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
     4955--$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
     4956--    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
     4957--$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
     4958--    ac_header_preproc=yes
     4959--    ;;
     4960--  no:yes:* )
     4961--    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
     4962--$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
     4963--    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     check for missing prerequisite headers?" >&5
     4964--$as_echo "$as_me: WARNING: minix/config.h:     check for missing prerequisite headers?" >&2;}
     4965--    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
     4966--$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
     4967--    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&5
     4968--$as_echo "$as_me: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&2;}
     4969--    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
     4970--$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
     4971--    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
     4972--$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
     4973--    ( cat <<\_ASBOX
     4974--## -------------------------------------------------------------------------- ##
     4975--## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=plymouth ##
     4976--## -------------------------------------------------------------------------- ##
     4977--_ASBOX
     4978--     ) | sed "s/^/$as_me: WARNING:     /" >&2
     4979--    ;;
     4980--esac
     4981--{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
     4982--$as_echo_n "checking for minix/config.h... " >&6; }
     4983--if test "${ac_cv_header_minix_config_h+set}" = set; then
     4984--  $as_echo_n "(cached) " >&6
     4985--else
     4986--  ac_cv_header_minix_config_h=$ac_header_preproc
     4987--fi
     4988--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
     4989--$as_echo "$ac_cv_header_minix_config_h" >&6; }
     4990--
     4991--fi
     4992--if test "x$ac_cv_header_minix_config_h" = x""yes; then
     4993-+  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
     4994-+if test "x$ac_cv_header_minix_config_h" = xyes; then :
     4995-   MINIX=yes
     4996- else
     4997-   MINIX=
     4998-@@ -3862,38 +3641,27 @@
     4999-
     5000-   if test "$MINIX" = yes; then
     5001-
     5002--cat >>confdefs.h <<\_ACEOF
     5003--#define _POSIX_SOURCE 1
     5004--_ACEOF
     5005-+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
     5006-
     5007-
     5008--cat >>confdefs.h <<\_ACEOF
     5009--#define _POSIX_1_SOURCE 2
     5010--_ACEOF
     5011-+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
     5012-
     5013-
     5014--cat >>confdefs.h <<\_ACEOF
     5015--#define _MINIX 1
     5016--_ACEOF
     5017-+$as_echo "#define _MINIX 1" >>confdefs.h
     5018-
     5019-   fi
     5020-
     5021-
     5022--
     5023--  { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
     5024-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
     5025- $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
     5026--if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
     5027-+if ${ac_cv_safe_to_define___extensions__+:} false; then :
     5028-   $as_echo_n "(cached) " >&6
     5029- else
     5030--  cat >conftest.$ac_ext <<_ACEOF
     5031--/* confdefs.h.  */
     5032--_ACEOF
     5033--cat confdefs.h >>conftest.$ac_ext
     5034--cat >>conftest.$ac_ext <<_ACEOF
     5035-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     5036- /* end confdefs.h.  */
     5037-
     5038--#       define __EXTENSIONS__ 1
     5039--        $ac_includes_default
     5040-+#         define __EXTENSIONS__ 1
     5041-+          $ac_includes_default
     5042- int
     5043- main ()
     5044- {
     5045-@@ -3902,65 +3670,34 @@
     5046-   return 0;
     5047- }
     5048- _ACEOF
     5049--rm -f conftest.$ac_objext
     5050--if { (ac_try="$ac_compile"
     5051--case "(($ac_try" in
     5052--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     5053--  *) ac_try_echo=$ac_try;;
     5054--esac
     5055--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     5056--$as_echo "$ac_try_echo") >&5
     5057--  (eval "$ac_compile") 2>conftest.er1
     5058--  ac_status=$?
     5059--  grep -v '^ *+' conftest.er1 >conftest.err
     5060--  rm -f conftest.er1
     5061--  cat conftest.err >&5
     5062--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     5063--  (exit $ac_status); } && {
     5064--       test -z "$ac_c_werror_flag" ||
     5065--       test ! -s conftest.err
     5066--       } && test -s conftest.$ac_objext; then
     5067-+if ac_fn_c_try_compile "$LINENO"; then :
     5068-   ac_cv_safe_to_define___extensions__=yes
     5069- else
     5070--  $as_echo "$as_me: failed program was:" >&5
     5071--sed 's/^/| /' conftest.$ac_ext >&5
     5072--
     5073--      ac_cv_safe_to_define___extensions__=no
     5074-+  ac_cv_safe_to_define___extensions__=no
     5075- fi
     5076--
     5077- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     5078- fi
     5079--{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
     5080-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
     5081- $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
     5082-   test $ac_cv_safe_to_define___extensions__ = yes &&
     5083--    cat >>confdefs.h <<\_ACEOF
     5084--#define __EXTENSIONS__ 1
     5085--_ACEOF
     5086-+    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
     5087-
     5088--  cat >>confdefs.h <<\_ACEOF
     5089--#define _ALL_SOURCE 1
     5090--_ACEOF
     5091-+  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
     5092-
     5093--  cat >>confdefs.h <<\_ACEOF
     5094--#define _GNU_SOURCE 1
     5095--_ACEOF
     5096-+  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
     5097-
     5098--  cat >>confdefs.h <<\_ACEOF
     5099--#define _POSIX_PTHREAD_SEMANTICS 1
     5100--_ACEOF
     5101-+  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
     5102-
     5103--  cat >>confdefs.h <<\_ACEOF
     5104--#define _TANDEM_SOURCE 1
     5105--_ACEOF
     5106-+  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
     5107-
     5108-
     5109- for ac_prog in gawk mawk nawk awk
     5110- do
     5111-   # Extract the first word of "$ac_prog", so it can be a program name with args.
     5112- set dummy $ac_prog; ac_word=$2
     5113--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
     5114-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     5115- $as_echo_n "checking for $ac_word... " >&6; }
     5116--if test "${ac_cv_prog_AWK+set}" = set; then
     5117-+if ${ac_cv_prog_AWK+:} false; then :
     5118-   $as_echo_n "(cached) " >&6
     5119- else
     5120-   if test -n "$AWK"; then
     5121-@@ -3971,24 +3708,24 @@
     5122- do
     5123-   IFS=$as_save_IFS
     5124-   test -z "$as_dir" && as_dir=.
     5125--  for ac_exec_ext in '' $ac_executable_extensions; do
     5126--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     5127-+    for ac_exec_ext in '' $ac_executable_extensions; do
     5128-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     5129-     ac_cv_prog_AWK="$ac_prog"
     5130--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     5131-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     5132-     break 2
     5133-   fi
     5134- done
     5135--done
     5136-+  done
     5137- IFS=$as_save_IFS
     5138-
     5139- fi
     5140- fi
     5141- AWK=$ac_cv_prog_AWK
     5142- if test -n "$AWK"; then
     5143--  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
     5144-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
     5145- $as_echo "$AWK" >&6; }
     5146- else
     5147--  { $as_echo "$as_me:$LINENO: result: no" >&5
     5148-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     5149- $as_echo "no" >&6; }
     5150- fi
     5151-
     5152-@@ -4004,9 +3741,9 @@
     5153- if test -n "$ac_tool_prefix"; then
     5154-   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
     5155- set dummy ${ac_tool_prefix}gcc; ac_word=$2
     5156--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
     5157-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     5158- $as_echo_n "checking for $ac_word... " >&6; }
     5159--if test "${ac_cv_prog_CC+set}" = set; then
     5160-+if ${ac_cv_prog_CC+:} false; then :
     5161-   $as_echo_n "(cached) " >&6
     5162- else
     5163-   if test -n "$CC"; then
     5164-@@ -4017,24 +3754,24 @@
     5165- do
     5166-   IFS=$as_save_IFS
     5167-   test -z "$as_dir" && as_dir=.
     5168--  for ac_exec_ext in '' $ac_executable_extensions; do
     5169--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     5170-+    for ac_exec_ext in '' $ac_executable_extensions; do
     5171-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     5172-     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     5173--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     5174-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     5175-     break 2
     5176-   fi
     5177- done
     5178--done
     5179-+  done
     5180- IFS=$as_save_IFS
     5181-
     5182- fi
     5183- fi
     5184- CC=$ac_cv_prog_CC
     5185- if test -n "$CC"; then
     5186--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
     5187-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
     5188- $as_echo "$CC" >&6; }
     5189- else
     5190--  { $as_echo "$as_me:$LINENO: result: no" >&5
     5191-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     5192- $as_echo "no" >&6; }
     5193- fi
     5194-
     5195-@@ -4044,9 +3781,9 @@
     5196-   ac_ct_CC=$CC
     5197-   # Extract the first word of "gcc", so it can be a program name with args.
     5198- set dummy gcc; ac_word=$2
     5199--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
     5200-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     5201- $as_echo_n "checking for $ac_word... " >&6; }
     5202--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
     5203-+if ${ac_cv_prog_ac_ct_CC+:} false; then :
     5204-   $as_echo_n "(cached) " >&6
     5205- else
     5206-   if test -n "$ac_ct_CC"; then
     5207-@@ -4057,24 +3794,24 @@
     5208- do
     5209-   IFS=$as_save_IFS
     5210-   test -z "$as_dir" && as_dir=.
     5211--  for ac_exec_ext in '' $ac_executable_extensions; do
     5212--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     5213-+    for ac_exec_ext in '' $ac_executable_extensions; do
     5214-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     5215-     ac_cv_prog_ac_ct_CC="gcc"
     5216--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     5217-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     5218-     break 2
     5219-   fi
     5220- done
     5221--done
     5222-+  done
     5223- IFS=$as_save_IFS
     5224-
     5225- fi
     5226- fi
     5227- ac_ct_CC=$ac_cv_prog_ac_ct_CC
     5228- if test -n "$ac_ct_CC"; then
     5229--  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
     5230-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
     5231- $as_echo "$ac_ct_CC" >&6; }
     5232- else
     5233--  { $as_echo "$as_me:$LINENO: result: no" >&5
     5234-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     5235- $as_echo "no" >&6; }
     5236- fi
     5237-
     5238-@@ -4083,7 +3820,7 @@
     5239-   else
     5240-     case $cross_compiling:$ac_tool_warned in
     5241- yes:)
     5242--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
     5243-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     5244- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     5245- ac_tool_warned=yes ;;
     5246- esac
     5247-@@ -4097,9 +3834,9 @@
     5248-           if test -n "$ac_tool_prefix"; then
     5249-     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
     5250- set dummy ${ac_tool_prefix}cc; ac_word=$2
     5251--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
     5252-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     5253- $as_echo_n "checking for $ac_word... " >&6; }
     5254--if test "${ac_cv_prog_CC+set}" = set; then
     5255-+if ${ac_cv_prog_CC+:} false; then :
     5256-   $as_echo_n "(cached) " >&6
     5257- else
     5258-   if test -n "$CC"; then
     5259-@@ -4110,24 +3847,24 @@
     5260- do
     5261-   IFS=$as_save_IFS
     5262-   test -z "$as_dir" && as_dir=.
     5263--  for ac_exec_ext in '' $ac_executable_extensions; do
     5264--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     5265-+    for ac_exec_ext in '' $ac_executable_extensions; do
     5266-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     5267-     ac_cv_prog_CC="${ac_tool_prefix}cc"
     5268--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     5269-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     5270-     break 2
     5271-   fi
     5272- done
     5273--done
     5274-+  done
     5275- IFS=$as_save_IFS
     5276-
     5277- fi
     5278- fi
     5279- CC=$ac_cv_prog_CC
     5280- if test -n "$CC"; then
     5281--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
     5282-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
     5283- $as_echo "$CC" >&6; }
     5284- else
     5285--  { $as_echo "$as_me:$LINENO: result: no" >&5
     5286-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     5287- $as_echo "no" >&6; }
     5288- fi
     5289-
     5290-@@ -4137,9 +3874,9 @@
     5291- if test -z "$CC"; then
     5292-   # Extract the first word of "cc", so it can be a program name with args.
     5293- set dummy cc; ac_word=$2
     5294--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
     5295-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     5296- $as_echo_n "checking for $ac_word... " >&6; }
     5297--if test "${ac_cv_prog_CC+set}" = set; then
     5298-+if ${ac_cv_prog_CC+:} false; then :
     5299-   $as_echo_n "(cached) " >&6
     5300- else
     5301-   if test -n "$CC"; then
     5302-@@ -4151,18 +3888,18 @@
     5303- do
     5304-   IFS=$as_save_IFS
     5305-   test -z "$as_dir" && as_dir=.
     5306--  for ac_exec_ext in '' $ac_executable_extensions; do
     5307--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     5308-+    for ac_exec_ext in '' $ac_executable_extensions; do
     5309-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     5310-     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
     5311-        ac_prog_rejected=yes
     5312-        continue
     5313-      fi
     5314-     ac_cv_prog_CC="cc"
     5315--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     5316-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     5317-     break 2
     5318-   fi
     5319- done
     5320--done
     5321-+  done
     5322- IFS=$as_save_IFS
     5323-
     5324- if test $ac_prog_rejected = yes; then
     5325-@@ -4181,10 +3918,10 @@
     5326- fi
     5327- CC=$ac_cv_prog_CC
     5328- if test -n "$CC"; then
     5329--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
     5330-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
     5331- $as_echo "$CC" >&6; }
     5332- else
     5333--  { $as_echo "$as_me:$LINENO: result: no" >&5
     5334-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     5335- $as_echo "no" >&6; }
     5336- fi
     5337-
     5338-@@ -4196,9 +3933,9 @@
     5339-   do
     5340-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
     5341- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
     5342--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
     5343-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     5344- $as_echo_n "checking for $ac_word... " >&6; }
     5345--if test "${ac_cv_prog_CC+set}" = set; then
     5346-+if ${ac_cv_prog_CC+:} false; then :
     5347-   $as_echo_n "(cached) " >&6
     5348- else
     5349-   if test -n "$CC"; then
     5350-@@ -4209,24 +3946,24 @@
     5351- do
     5352-   IFS=$as_save_IFS
     5353-   test -z "$as_dir" && as_dir=.
     5354--  for ac_exec_ext in '' $ac_executable_extensions; do
     5355--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     5356-+    for ac_exec_ext in '' $ac_executable_extensions; do
     5357-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     5358-     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     5359--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     5360-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     5361-     break 2
     5362-   fi
     5363- done
     5364--done
     5365-+  done
     5366- IFS=$as_save_IFS
     5367-
     5368- fi
     5369- fi
     5370- CC=$ac_cv_prog_CC
     5371- if test -n "$CC"; then
     5372--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
     5373-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
     5374- $as_echo "$CC" >&6; }
     5375- else
     5376--  { $as_echo "$as_me:$LINENO: result: no" >&5
     5377-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     5378- $as_echo "no" >&6; }
     5379- fi
     5380-
     5381-@@ -4240,9 +3977,9 @@
     5382- do
     5383-   # Extract the first word of "$ac_prog", so it can be a program name with args.
     5384- set dummy $ac_prog; ac_word=$2
     5385--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
     5386-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     5387- $as_echo_n "checking for $ac_word... " >&6; }
     5388--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
     5389-+if ${ac_cv_prog_ac_ct_CC+:} false; then :
     5390-   $as_echo_n "(cached) " >&6
     5391- else
     5392-   if test -n "$ac_ct_CC"; then
     5393-@@ -4253,24 +3990,24 @@
     5394- do
     5395-   IFS=$as_save_IFS
     5396-   test -z "$as_dir" && as_dir=.
     5397--  for ac_exec_ext in '' $ac_executable_extensions; do
     5398--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     5399-+    for ac_exec_ext in '' $ac_executable_extensions; do
     5400-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     5401-     ac_cv_prog_ac_ct_CC="$ac_prog"
     5402--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     5403-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     5404-     break 2
     5405-   fi
     5406- done
     5407--done
     5408-+  done
     5409- IFS=$as_save_IFS
     5410-
     5411- fi
     5412- fi
     5413- ac_ct_CC=$ac_cv_prog_ac_ct_CC
     5414- if test -n "$ac_ct_CC"; then
     5415--  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
     5416-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
     5417- $as_echo "$ac_ct_CC" >&6; }
     5418- else
     5419--  { $as_echo "$as_me:$LINENO: result: no" >&5
     5420-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     5421- $as_echo "no" >&6; }
     5422- fi
     5423-
     5424-@@ -4283,7 +4020,7 @@
     5425-   else
     5426-     case $cross_compiling:$ac_tool_warned in
     5427- yes:)
     5428--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
     5429-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     5430- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     5431- ac_tool_warned=yes ;;
     5432- esac
     5433-@@ -4294,62 +4031,42 @@
     5434- fi
     5435-
     5436-
     5437--test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
     5438-+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     5439- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     5440--{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
     5441--See \`config.log' for more details." >&5
     5442--$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
     5443--See \`config.log' for more details." >&2;}
     5444--   { (exit 1); exit 1; }; }; }
     5445-+as_fn_error $? "no acceptable C compiler found in \$PATH
     5446-+See \`config.log' for more details" "$LINENO" 5; }
     5447-
     5448- # Provide some information about the compiler.
     5449--$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
     5450-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
     5451- set X $ac_compile
     5452- ac_compiler=$2
     5453--{ (ac_try="$ac_compiler --version >&5"
     5454--case "(($ac_try" in
     5455--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     5456--  *) ac_try_echo=$ac_try;;
     5457--esac
     5458--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     5459--$as_echo "$ac_try_echo") >&5
     5460--  (eval "$ac_compiler --version >&5") 2>&5
     5461--  ac_status=$?
     5462--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     5463--  (exit $ac_status); }
     5464--{ (ac_try="$ac_compiler -v >&5"
     5465--case "(($ac_try" in
     5466--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     5467--  *) ac_try_echo=$ac_try;;
     5468--esac
     5469--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     5470--$as_echo "$ac_try_echo") >&5
     5471--  (eval "$ac_compiler -v >&5") 2>&5
     5472--  ac_status=$?
     5473--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     5474--  (exit $ac_status); }
     5475--{ (ac_try="$ac_compiler -V >&5"
     5476-+for ac_option in --version -v -V -qversion; do
     5477-+  { { ac_try="$ac_compiler $ac_option >&5"
     5478- case "(($ac_try" in
     5479-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     5480-   *) ac_try_echo=$ac_try;;
     5481- esac
     5482--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     5483--$as_echo "$ac_try_echo") >&5
     5484--  (eval "$ac_compiler -V >&5") 2>&5
     5485-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     5486-+$as_echo "$ac_try_echo"; } >&5
     5487-+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
     5488-   ac_status=$?
     5489--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     5490--  (exit $ac_status); }
     5491-+  if test -s conftest.err; then
     5492-+    sed '10a\
     5493-+... rest of stderr output deleted ...
     5494-+         10q' conftest.err >conftest.er1
     5495-+    cat conftest.er1 >&5
     5496-+  fi
     5497-+  rm -f conftest.er1 conftest.err
     5498-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     5499-+  test $ac_status = 0; }
     5500-+done
     5501-
     5502--{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
     5503-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
     5504- $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
     5505--if test "${ac_cv_c_compiler_gnu+set}" = set; then
     5506-+if ${ac_cv_c_compiler_gnu+:} false; then :
     5507-   $as_echo_n "(cached) " >&6
     5508- else
     5509--  cat >conftest.$ac_ext <<_ACEOF
     5510--/* confdefs.h.  */
     5511--_ACEOF
     5512--cat confdefs.h >>conftest.$ac_ext
     5513--cat >>conftest.$ac_ext <<_ACEOF
     5514-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     5515- /* end confdefs.h.  */
     5516-
     5517- int
     5518-@@ -4363,37 +4080,16 @@
     5519-   return 0;
     5520- }
     5521- _ACEOF
     5522--rm -f conftest.$ac_objext
     5523--if { (ac_try="$ac_compile"
     5524--case "(($ac_try" in
     5525--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     5526--  *) ac_try_echo=$ac_try;;
     5527--esac
     5528--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     5529--$as_echo "$ac_try_echo") >&5
     5530--  (eval "$ac_compile") 2>conftest.er1
     5531--  ac_status=$?
     5532--  grep -v '^ *+' conftest.er1 >conftest.err
     5533--  rm -f conftest.er1
     5534--  cat conftest.err >&5
     5535--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     5536--  (exit $ac_status); } && {
     5537--       test -z "$ac_c_werror_flag" ||
     5538--       test ! -s conftest.err
     5539--       } && test -s conftest.$ac_objext; then
     5540-+if ac_fn_c_try_compile "$LINENO"; then :
     5541-   ac_compiler_gnu=yes
     5542- else
     5543--  $as_echo "$as_me: failed program was:" >&5
     5544--sed 's/^/| /' conftest.$ac_ext >&5
     5545--
     5546--      ac_compiler_gnu=no
     5547-+  ac_compiler_gnu=no
     5548- fi
     5549--
     5550- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     5551- ac_cv_c_compiler_gnu=$ac_compiler_gnu
     5552-
     5553- fi
     5554--{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
     5555-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
     5556- $as_echo "$ac_cv_c_compiler_gnu" >&6; }
     5557- if test $ac_compiler_gnu = yes; then
     5558-   GCC=yes
     5559-@@ -4402,20 +4098,16 @@
     5560- fi
     5561- ac_test_CFLAGS=${CFLAGS+set}
     5562- ac_save_CFLAGS=$CFLAGS
     5563--{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
     5564-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
     5565- $as_echo_n "checking whether $CC accepts -g... " >&6; }
     5566--if test "${ac_cv_prog_cc_g+set}" = set; then
     5567-+if ${ac_cv_prog_cc_g+:} false; then :
     5568-   $as_echo_n "(cached) " >&6
     5569- else
     5570-   ac_save_c_werror_flag=$ac_c_werror_flag
     5571-    ac_c_werror_flag=yes
     5572-    ac_cv_prog_cc_g=no
     5573-    CFLAGS="-g"
     5574--   cat >conftest.$ac_ext <<_ACEOF
     5575--/* confdefs.h.  */
     5576--_ACEOF
     5577--cat confdefs.h >>conftest.$ac_ext
     5578--cat >>conftest.$ac_ext <<_ACEOF
     5579-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     5580- /* end confdefs.h.  */
     5581-
     5582- int
     5583-@@ -4426,35 +4118,11 @@
     5584-   return 0;
     5585- }
     5586- _ACEOF
     5587--rm -f conftest.$ac_objext
     5588--if { (ac_try="$ac_compile"
     5589--case "(($ac_try" in
     5590--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     5591--  *) ac_try_echo=$ac_try;;
     5592--esac
     5593--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     5594--$as_echo "$ac_try_echo") >&5
     5595--  (eval "$ac_compile") 2>conftest.er1
     5596--  ac_status=$?
     5597--  grep -v '^ *+' conftest.er1 >conftest.err
     5598--  rm -f conftest.er1
     5599--  cat conftest.err >&5
     5600--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     5601--  (exit $ac_status); } && {
     5602--       test -z "$ac_c_werror_flag" ||
     5603--       test ! -s conftest.err
     5604--       } && test -s conftest.$ac_objext; then
     5605-+if ac_fn_c_try_compile "$LINENO"; then :
     5606-   ac_cv_prog_cc_g=yes
     5607- else
     5608--  $as_echo "$as_me: failed program was:" >&5
     5609--sed 's/^/| /' conftest.$ac_ext >&5
     5610--
     5611--      CFLAGS=""
     5612--      cat >conftest.$ac_ext <<_ACEOF
     5613--/* confdefs.h.  */
     5614--_ACEOF
     5615--cat confdefs.h >>conftest.$ac_ext
     5616--cat >>conftest.$ac_ext <<_ACEOF
     5617-+  CFLAGS=""
     5618-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     5619- /* end confdefs.h.  */
     5620-
     5621- int
     5622-@@ -4465,36 +4133,12 @@
     5623-   return 0;
     5624- }
     5625- _ACEOF
     5626--rm -f conftest.$ac_objext
     5627--if { (ac_try="$ac_compile"
     5628--case "(($ac_try" in
     5629--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     5630--  *) ac_try_echo=$ac_try;;
     5631--esac
     5632--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     5633--$as_echo "$ac_try_echo") >&5
     5634--  (eval "$ac_compile") 2>conftest.er1
     5635--  ac_status=$?
     5636--  grep -v '^ *+' conftest.er1 >conftest.err
     5637--  rm -f conftest.er1
     5638--  cat conftest.err >&5
     5639--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     5640--  (exit $ac_status); } && {
     5641--       test -z "$ac_c_werror_flag" ||
     5642--       test ! -s conftest.err
     5643--       } && test -s conftest.$ac_objext; then
     5644--  :
     5645--else
     5646--  $as_echo "$as_me: failed program was:" >&5
     5647--sed 's/^/| /' conftest.$ac_ext >&5
     5648-+if ac_fn_c_try_compile "$LINENO"; then :
     5649-
     5650--      ac_c_werror_flag=$ac_save_c_werror_flag
     5651-+else
     5652-+  ac_c_werror_flag=$ac_save_c_werror_flag
     5653-        CFLAGS="-g"
     5654--       cat >conftest.$ac_ext <<_ACEOF
     5655--/* confdefs.h.  */
     5656--_ACEOF
     5657--cat confdefs.h >>conftest.$ac_ext
     5658--cat >>conftest.$ac_ext <<_ACEOF
     5659-+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     5660- /* end confdefs.h.  */
     5661-
     5662- int
     5663-@@ -4505,42 +4149,17 @@
     5664-   return 0;
     5665- }
     5666- _ACEOF
     5667--rm -f conftest.$ac_objext
     5668--if { (ac_try="$ac_compile"
     5669--case "(($ac_try" in
     5670--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     5671--  *) ac_try_echo=$ac_try;;
     5672--esac
     5673--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     5674--$as_echo "$ac_try_echo") >&5
     5675--  (eval "$ac_compile") 2>conftest.er1
     5676--  ac_status=$?
     5677--  grep -v '^ *+' conftest.er1 >conftest.err
     5678--  rm -f conftest.er1
     5679--  cat conftest.err >&5
     5680--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     5681--  (exit $ac_status); } && {
     5682--       test -z "$ac_c_werror_flag" ||
     5683--       test ! -s conftest.err
     5684--       } && test -s conftest.$ac_objext; then
     5685-+if ac_fn_c_try_compile "$LINENO"; then :
     5686-   ac_cv_prog_cc_g=yes
     5687--else
     5688--  $as_echo "$as_me: failed program was:" >&5
     5689--sed 's/^/| /' conftest.$ac_ext >&5
     5690--
     5691--
     5692- fi
     5693--
     5694- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     5695- fi
     5696--
     5697- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     5698- fi
     5699--
     5700- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     5701-    ac_c_werror_flag=$ac_save_c_werror_flag
     5702- fi
     5703--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
     5704-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
     5705- $as_echo "$ac_cv_prog_cc_g" >&6; }
     5706- if test "$ac_test_CFLAGS" = set; then
     5707-   CFLAGS=$ac_save_CFLAGS
     5708-@@ -4557,23 +4176,18 @@
     5709-     CFLAGS=
     5710-   fi
     5711- fi
     5712--{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
     5713-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
     5714- $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
     5715--if test "${ac_cv_prog_cc_c89+set}" = set; then
     5716-+if ${ac_cv_prog_cc_c89+:} false; then :
     5717-   $as_echo_n "(cached) " >&6
     5718- else
     5719-   ac_cv_prog_cc_c89=no
     5720- ac_save_CC=$CC
     5721--cat >conftest.$ac_ext <<_ACEOF
     5722--/* confdefs.h.  */
     5723--_ACEOF
     5724--cat confdefs.h >>conftest.$ac_ext
     5725--cat >>conftest.$ac_ext <<_ACEOF
     5726-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     5727- /* end confdefs.h.  */
     5728- #include <stdarg.h>
     5729- #include <stdio.h>
     5730--#include <sys/types.h>
     5731--#include <sys/stat.h>
     5732-+struct stat;
     5733- /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
     5734- struct buf { int x; };
     5735- FILE * (*rcsopen) (struct buf *, struct stat *, int);
     5736-@@ -4625,32 +4239,9 @@
     5737-       -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
     5738- do
     5739-   CC="$ac_save_CC $ac_arg"
     5740--  rm -f conftest.$ac_objext
     5741--if { (ac_try="$ac_compile"
     5742--case "(($ac_try" in
     5743--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     5744--  *) ac_try_echo=$ac_try;;
     5745--esac
     5746--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     5747--$as_echo "$ac_try_echo") >&5
     5748--  (eval "$ac_compile") 2>conftest.er1
     5749--  ac_status=$?
     5750--  grep -v '^ *+' conftest.er1 >conftest.err
     5751--  rm -f conftest.er1
     5752--  cat conftest.err >&5
     5753--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     5754--  (exit $ac_status); } && {
     5755--       test -z "$ac_c_werror_flag" ||
     5756--       test ! -s conftest.err
     5757--       } && test -s conftest.$ac_objext; then
     5758-+  if ac_fn_c_try_compile "$LINENO"; then :
     5759-   ac_cv_prog_cc_c89=$ac_arg
     5760--else
     5761--  $as_echo "$as_me: failed program was:" >&5
     5762--sed 's/^/| /' conftest.$ac_ext >&5
     5763--
     5764--
     5765- fi
     5766--
     5767- rm -f core conftest.err conftest.$ac_objext
     5768-   test "x$ac_cv_prog_cc_c89" != "xno" && break
     5769- done
     5770-@@ -4661,17 +4252,19 @@
     5771- # AC_CACHE_VAL
     5772- case "x$ac_cv_prog_cc_c89" in
     5773-   x)
     5774--    { $as_echo "$as_me:$LINENO: result: none needed" >&5
     5775-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
     5776- $as_echo "none needed" >&6; } ;;
     5777-   xno)
     5778--    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
     5779-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
     5780- $as_echo "unsupported" >&6; } ;;
     5781-   *)
     5782-     CC="$CC $ac_cv_prog_cc_c89"
     5783--    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
     5784-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
     5785- $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
     5786- esac
     5787-+if test "x$ac_cv_prog_cc_c89" != xno; then :
     5788-
     5789-+fi
     5790-
     5791- ac_ext=c
     5792- ac_cpp='$CPP $CPPFLAGS'
     5793-@@ -4680,22 +4273,18 @@
     5794- ac_compiler_gnu=$ac_cv_c_compiler_gnu
     5795-
     5796- if test "x$CC" != xcc; then
     5797--  { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
     5798-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
     5799- $as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
     5800- else
     5801--  { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
     5802-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
     5803- $as_echo_n "checking whether cc understands -c and -o together... " >&6; }
     5804- fi
     5805- set dummy $CC; ac_cc=`$as_echo "$2" |
     5806-                     sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
     5807--if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
     5808-+if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
     5809-   $as_echo_n "(cached) " >&6
     5810- else
     5811--  cat >conftest.$ac_ext <<_ACEOF
     5812--/* confdefs.h.  */
     5813--_ACEOF
     5814--cat confdefs.h >>conftest.$ac_ext
     5815--cat >>conftest.$ac_ext <<_ACEOF
     5816-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     5817- /* end confdefs.h.  */
     5818-
     5819- int
     5820-@@ -4711,63 +4300,63 @@
     5821- # existing .o file with -o, though they will create one.
     5822- ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
     5823- rm -f conftest2.*
     5824--if { (case "(($ac_try" in
     5825-+if { { case "(($ac_try" in
     5826-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     5827-   *) ac_try_echo=$ac_try;;
     5828- esac
     5829--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     5830--$as_echo "$ac_try_echo") >&5
     5831-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     5832-+$as_echo "$ac_try_echo"; } >&5
     5833-   (eval "$ac_try") 2>&5
     5834-   ac_status=$?
     5835--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     5836--  (exit $ac_status); } &&
     5837--   test -f conftest2.$ac_objext && { (case "(($ac_try" in
     5838-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     5839-+  test $ac_status = 0; } &&
     5840-+   test -f conftest2.$ac_objext && { { case "(($ac_try" in
     5841-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     5842-   *) ac_try_echo=$ac_try;;
     5843- esac
     5844--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     5845--$as_echo "$ac_try_echo") >&5
     5846-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     5847-+$as_echo "$ac_try_echo"; } >&5
     5848-   (eval "$ac_try") 2>&5
     5849-   ac_status=$?
     5850--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     5851--  (exit $ac_status); };
     5852-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     5853-+  test $ac_status = 0; };
     5854- then
     5855-   eval ac_cv_prog_cc_${ac_cc}_c_o=yes
     5856-   if test "x$CC" != xcc; then
     5857-     # Test first that cc exists at all.
     5858-     if { ac_try='cc -c conftest.$ac_ext >&5'
     5859--  { (case "(($ac_try" in
     5860-+  { { case "(($ac_try" in
     5861-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     5862-   *) ac_try_echo=$ac_try;;
     5863- esac
     5864--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     5865--$as_echo "$ac_try_echo") >&5
     5866-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     5867-+$as_echo "$ac_try_echo"; } >&5
     5868-   (eval "$ac_try") 2>&5
     5869-   ac_status=$?
     5870--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     5871--  (exit $ac_status); }; }; then
     5872-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     5873-+  test $ac_status = 0; }; }; then
     5874-       ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
     5875-       rm -f conftest2.*
     5876--      if { (case "(($ac_try" in
     5877-+      if { { case "(($ac_try" in
     5878-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     5879-   *) ac_try_echo=$ac_try;;
     5880- esac
     5881--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     5882--$as_echo "$ac_try_echo") >&5
     5883-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     5884-+$as_echo "$ac_try_echo"; } >&5
     5885-   (eval "$ac_try") 2>&5
     5886-   ac_status=$?
     5887--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     5888--  (exit $ac_status); } &&
     5889--       test -f conftest2.$ac_objext && { (case "(($ac_try" in
     5890-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     5891-+  test $ac_status = 0; } &&
     5892-+       test -f conftest2.$ac_objext && { { case "(($ac_try" in
     5893-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     5894-   *) ac_try_echo=$ac_try;;
     5895+-                  switch (cpu)
     5896+-                      {
     5897+-                      case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
     5898+-                      case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
     5899+-                      case CPU_PA_RISC2_0:
     5900+-              #if defined(_SC_KERNEL_BITS)
     5901+-                          switch (bits)
     5902+-                              {
     5903+-                              case 64: puts ("hppa2.0w"); break;
     5904+-                              case 32: puts ("hppa2.0n"); break;
     5905+-                              default: puts ("hppa2.0"); break;
     5906+-                              } break;
     5907+-              #else  /* !defined(_SC_KERNEL_BITS) */
     5908+-                          puts ("hppa2.0"); break;
     5909+-              #endif
     5910+-                      default: puts ("hppa1.0"); break;
     5911+-                      }
     5912+-                  exit (0);
     5913+-              }
     5914++              int main ()
     5915++              {
     5916++              #if defined(_SC_KERNEL_BITS)
     5917++                  long bits = sysconf(_SC_KERNEL_BITS);
     5918++              #endif
     5919++                  long cpu  = sysconf (_SC_CPU_VERSION);
     5920++
     5921++                  switch (cpu)
     5922++                      {
     5923++                      case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
     5924++                      case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
     5925++                      case CPU_PA_RISC2_0:
     5926++              #if defined(_SC_KERNEL_BITS)
     5927++                          switch (bits)
     5928++                              {
     5929++                              case 64: puts ("hppa2.0w"); break;
     5930++                              case 32: puts ("hppa2.0n"); break;
     5931++                              default: puts ("hppa2.0"); break;
     5932++                              } break;
     5933++              #else  /* !defined(_SC_KERNEL_BITS) */
     5934++                          puts ("hppa2.0"); break;
     5935++              #endif
     5936++                      default: puts ("hppa1.0"); break;
     5937++                      }
     5938++                  exit (0);
     5939++              }
     5940+ EOF
     5941+                   (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
     5942+                   test -z "$HP_ARCH" && HP_ARCH=hppa
     5943+@@ -730,22 +732,22 @@
     5944+       exit ;;
     5945+     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
     5946+       echo c1-convex-bsd
     5947+-        exit ;;
     5948++      exit ;;
     5949+     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
     5950+       if getsysinfo -f scalar_acc
     5951+       then echo c32-convex-bsd
     5952+       else echo c2-convex-bsd
     5953+       fi
     5954+-        exit ;;
     5955++      exit ;;
     5956+     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
     5957+       echo c34-convex-bsd
     5958+-        exit ;;
     5959++      exit ;;
     5960+     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
     5961+       echo c38-convex-bsd
     5962+-        exit ;;
     5963++      exit ;;
     5964+     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
     5965+       echo c4-convex-bsd
     5966+-        exit ;;
     5967++      exit ;;
     5968+     CRAY*Y-MP:*:*:*)
     5969+       echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
     5970+       exit ;;
     5971+@@ -769,14 +771,14 @@
     5972+       exit ;;
     5973+     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
     5974+       FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
     5975+-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
     5976+-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
     5977+-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
     5978+-        exit ;;
     5979++      FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
     5980++      FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
     5981++      echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
     5982++      exit ;;
     5983+     5000:UNIX_System_V:4.*:*)
     5984+-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
     5985+-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
     5986+-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
     5987++      FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
     5988++      FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
     5989++      echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
     5990+       exit ;;
     5991+     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
     5992+       echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
     5993+@@ -788,13 +790,12 @@
     5994+       echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
     5995+       exit ;;
     5996+     *:FreeBSD:*:*)
     5997+-      case ${UNAME_MACHINE} in
     5998+-          pc98)
     5999+-              echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
     6000++      UNAME_PROCESSOR=`/usr/bin/uname -p`
     6001++      case ${UNAME_PROCESSOR} in
     6002+           amd64)
     6003+               echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
     6004+           *)
     6005+-              echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
     6006++              echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
     6007+       esac
     6008+       exit ;;
     6009+     i*:CYGWIN*:*)
     6010+@@ -803,15 +804,18 @@
     6011+     *:MINGW*:*)
     6012+       echo ${UNAME_MACHINE}-pc-mingw32
     6013+       exit ;;
     6014++    i*:MSYS*:*)
     6015++      echo ${UNAME_MACHINE}-pc-msys
     6016++      exit ;;
     6017+     i*:windows32*:*)
     6018+-      # uname -m includes "-pc" on this system.
     6019+-      echo ${UNAME_MACHINE}-mingw32
     6020++      # uname -m includes "-pc" on this system.
     6021++      echo ${UNAME_MACHINE}-mingw32
     6022+       exit ;;
     6023+     i*:PW*:*)
     6024+       echo ${UNAME_MACHINE}-pc-pw32
     6025+       exit ;;
     6026+     *:Interix*:*)
     6027+-      case ${UNAME_MACHINE} in
     6028++      case ${UNAME_MACHINE} in
     6029+           x86)
     6030+               echo i586-pc-interix${UNAME_RELEASE}
     6031+               exit ;;
     6032+@@ -857,6 +861,13 @@
     6033+     i*86:Minix:*:*)
     6034+       echo ${UNAME_MACHINE}-pc-minix
     6035+       exit ;;
     6036++    aarch64:Linux:*:*)
     6037++      echo ${UNAME_MACHINE}-unknown-linux-gnu
     6038++      exit ;;
     6039++    aarch64_be:Linux:*:*)
     6040++      UNAME_MACHINE=aarch64_be
     6041++      echo ${UNAME_MACHINE}-unknown-linux-gnu
     6042++      exit ;;
     6043+     alpha:Linux:*:*)
     6044+       case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
     6045+         EV5)   UNAME_MACHINE=alphaev5 ;;
     6046+@@ -866,7 +877,7 @@
     6047+         EV6)   UNAME_MACHINE=alphaev6 ;;
     6048+         EV67)  UNAME_MACHINE=alphaev67 ;;
     6049+         EV68*) UNAME_MACHINE=alphaev68 ;;
     6050+-        esac
     6051++      esac
     6052+       objdump --private-headers /bin/sh | grep -q ld.so.1
     6053+       if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
     6054+       echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
     6055+@@ -878,20 +889,29 @@
     6056+       then
     6057+           echo ${UNAME_MACHINE}-unknown-linux-gnu
     6058+       else
     6059+-          echo ${UNAME_MACHINE}-unknown-linux-gnueabi
     6060++          if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
     6061++              | grep -q __ARM_PCS_VFP
     6062++          then
     6063++              echo ${UNAME_MACHINE}-unknown-linux-gnueabi
     6064++          else
     6065++              echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
     6066++          fi
     6067+       fi
     6068+       exit ;;
     6069+     avr32*:Linux:*:*)
     6070+       echo ${UNAME_MACHINE}-unknown-linux-gnu
     6071+       exit ;;
     6072+     cris:Linux:*:*)
     6073+-      echo cris-axis-linux-gnu
     6074++      echo ${UNAME_MACHINE}-axis-linux-gnu
     6075+       exit ;;
     6076+     crisv32:Linux:*:*)
     6077+-      echo crisv32-axis-linux-gnu
     6078++      echo ${UNAME_MACHINE}-axis-linux-gnu
     6079+       exit ;;
     6080+     frv:Linux:*:*)
     6081+-      echo frv-unknown-linux-gnu
     6082++      echo ${UNAME_MACHINE}-unknown-linux-gnu
     6083++      exit ;;
     6084++    hexagon:Linux:*:*)
     6085++      echo ${UNAME_MACHINE}-unknown-linux-gnu
     6086+       exit ;;
     6087+     i*86:Linux:*:*)
     6088+       LIBC=gnu
     6089+@@ -933,7 +953,7 @@
     6090+       test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
     6091+       ;;
     6092+     or32:Linux:*:*)
     6093+-      echo or32-unknown-linux-gnu
     6094++      echo ${UNAME_MACHINE}-unknown-linux-gnu
     6095+       exit ;;
     6096+     padre:Linux:*:*)
     6097+       echo sparc-unknown-linux-gnu
     6098+@@ -959,7 +979,7 @@
     6099+       echo ${UNAME_MACHINE}-ibm-linux
     6100+       exit ;;
     6101+     sh64*:Linux:*:*)
     6102+-      echo ${UNAME_MACHINE}-unknown-linux-gnu
     6103++      echo ${UNAME_MACHINE}-unknown-linux-gnu
     6104+       exit ;;
     6105+     sh*:Linux:*:*)
     6106+       echo ${UNAME_MACHINE}-unknown-linux-gnu
     6107+@@ -967,14 +987,17 @@
     6108+     sparc:Linux:*:* | sparc64:Linux:*:*)
     6109+       echo ${UNAME_MACHINE}-unknown-linux-gnu
     6110+       exit ;;
     6111++    tile*:Linux:*:*)
     6112++      echo ${UNAME_MACHINE}-unknown-linux-gnu
     6113++      exit ;;
     6114+     vax:Linux:*:*)
     6115+       echo ${UNAME_MACHINE}-dec-linux-gnu
     6116+       exit ;;
     6117+     x86_64:Linux:*:*)
     6118+-      echo x86_64-unknown-linux-gnu
     6119++      echo ${UNAME_MACHINE}-unknown-linux-gnu
     6120+       exit ;;
     6121+     xtensa*:Linux:*:*)
     6122+-      echo ${UNAME_MACHINE}-unknown-linux-gnu
     6123++      echo ${UNAME_MACHINE}-unknown-linux-gnu
     6124+       exit ;;
     6125+     i*86:DYNIX/ptx:4*:*)
     6126+       # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
     6127+@@ -983,11 +1006,11 @@
     6128+       echo i386-sequent-sysv4
     6129+       exit ;;
     6130+     i*86:UNIX_SV:4.2MP:2.*)
     6131+-        # Unixware is an offshoot of SVR4, but it has its own version
     6132+-        # number series starting with 2...
     6133+-        # I am not positive that other SVR4 systems won't match this,
     6134++      # Unixware is an offshoot of SVR4, but it has its own version
     6135++      # number series starting with 2...
     6136++      # I am not positive that other SVR4 systems won't match this,
     6137+       # I just have to hope.  -- rms.
     6138+-        # Use sysv4.2uw... so that sysv4* matches it.
     6139++      # Use sysv4.2uw... so that sysv4* matches it.
     6140+       echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
     6141+       exit ;;
     6142+     i*86:OS/2:*:*)
     6143+@@ -1019,7 +1042,7 @@
     6144+       fi
     6145+       exit ;;
     6146+     i*86:*:5:[678]*)
     6147+-      # UnixWare 7.x, OpenUNIX and OpenServer 6.
     6148++      # UnixWare 7.x, OpenUNIX and OpenServer 6.
     6149+       case `/bin/uname -X | grep "^Machine"` in
     6150+           *486*)           UNAME_MACHINE=i486 ;;
     6151+           *Pentium)        UNAME_MACHINE=i586 ;;
     6152+@@ -1047,13 +1070,13 @@
     6153+       exit ;;
     6154+     pc:*:*:*)
     6155+       # Left here for compatibility:
     6156+-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
     6157+-        # the processor, so we play safe by assuming i586.
     6158++      # uname -m prints for DJGPP always 'pc', but it prints nothing about
     6159++      # the processor, so we play safe by assuming i586.
     6160+       # Note: whatever this is, it MUST be the same as what config.sub
     6161+       # prints for the "djgpp" host, or else GDB configury will decide that
     6162+       # this is a cross-build.
     6163+       echo i586-pc-msdosdjgpp
     6164+-        exit ;;
     6165++      exit ;;
     6166+     Intel:Mach:3*:*)
     6167+       echo i386-pc-mach3
     6168+       exit ;;
     6169+@@ -1088,8 +1111,8 @@
     6170+       /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
     6171+         && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     6172+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
     6173+-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
     6174+-          && { echo i486-ncr-sysv4; exit; } ;;
     6175++      /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
     6176++        && { echo i486-ncr-sysv4; exit; } ;;
     6177+     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
     6178+       OS_REL='.3'
     6179+       test -r /etc/.relid \
     6180+@@ -1132,10 +1155,10 @@
     6181+               echo ns32k-sni-sysv
     6182+       fi
     6183+       exit ;;
     6184+-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
     6185+-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
     6186+-        echo i586-unisys-sysv4
     6187+-        exit ;;
     6188++    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
     6189++                      # says <Richard.M.Bartel@ccMail.Census.GOV>
     6190++      echo i586-unisys-sysv4
     6191++      exit ;;
     6192+     *:UNIX_System_V:4*:FTX*)
     6193+       # From Gerald Hewes <hewes@openmarket.com>.
     6194+       # How about differentiating between stratus architectures? -djm
     6195+@@ -1161,11 +1184,11 @@
     6196+       exit ;;
     6197+     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
     6198+       if [ -d /usr/nec ]; then
     6199+-              echo mips-nec-sysv${UNAME_RELEASE}
     6200++              echo mips-nec-sysv${UNAME_RELEASE}
     6201+       else
     6202+-              echo mips-unknown-sysv${UNAME_RELEASE}
     6203++              echo mips-unknown-sysv${UNAME_RELEASE}
     6204+       fi
     6205+-        exit ;;
     6206++      exit ;;
     6207+     BeBox:BeOS:*:*)   # BeOS running on hardware made by Be, PPC only.
     6208+       echo powerpc-be-beos
     6209+       exit ;;
     6210+@@ -1230,6 +1253,9 @@
     6211+     *:QNX:*:4*)
     6212+       echo i386-pc-qnx
     6213+       exit ;;
     6214++    NEO-?:NONSTOP_KERNEL:*:*)
     6215++      echo neo-tandem-nsk${UNAME_RELEASE}
     6216++      exit ;;
     6217+     NSE-?:NONSTOP_KERNEL:*:*)
     6218+       echo nse-tandem-nsk${UNAME_RELEASE}
     6219+       exit ;;
     6220+@@ -1275,13 +1301,13 @@
     6221+       echo pdp10-unknown-its
     6222+       exit ;;
     6223+     SEI:*:*:SEIUX)
     6224+-        echo mips-sei-seiux${UNAME_RELEASE}
     6225++      echo mips-sei-seiux${UNAME_RELEASE}
     6226+       exit ;;
     6227+     *:DragonFly:*:*)
     6228+       echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
     6229+       exit ;;
     6230+     *:*VMS:*:*)
     6231+-      UNAME_MACHINE=`(uname -p) 2>/dev/null`
     6232++      UNAME_MACHINE=`(uname -p) 2>/dev/null`
     6233+       case "${UNAME_MACHINE}" in
     6234+           A*) echo alpha-dec-vms ; exit ;;
     6235+           I*) echo ia64-dec-vms ; exit ;;
     6236+@@ -1299,6 +1325,9 @@
     6237+     i*86:AROS:*:*)
     6238+       echo ${UNAME_MACHINE}-pc-aros
     6239+       exit ;;
     6240++    x86_64:VMkernel:*:*)
     6241++      echo ${UNAME_MACHINE}-unknown-esx
     6242++      exit ;;
     6243  esac
     6244--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     6245--$as_echo "$ac_try_echo") >&5
     6246-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     6247-+$as_echo "$ac_try_echo"; } >&5
     6248-   (eval "$ac_try") 2>&5
     6249-   ac_status=$?
     6250--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     6251--  (exit $ac_status); };
     6252-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     6253-+  test $ac_status = 0; };
     6254-       then
     6255-       # cc works too.
     6256-       :
     6257-@@ -4784,15 +4373,13 @@
     6258-
     6259- fi
     6260- if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
     6261--  { $as_echo "$as_me:$LINENO: result: yes" >&5
     6262-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
     6263- $as_echo "yes" >&6; }
     6264- else
     6265--  { $as_echo "$as_me:$LINENO: result: no" >&5
     6266-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     6267- $as_echo "no" >&6; }
     6268 
     6269--cat >>confdefs.h <<\_ACEOF
     6270--#define NO_MINUS_C_MINUS_O 1
     6271--_ACEOF
     6272-+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
     6273+ #echo '(No uname command or uname output not recognized.)' 1>&2
     6274+@@ -1321,11 +1350,11 @@
     6275+ #include <sys/param.h>
     6276+   printf ("m68k-sony-newsos%s\n",
     6277+ #ifdef NEWSOS4
     6278+-          "4"
     6279++      "4"
     6280+ #else
     6281+-        ""
     6282++      ""
     6283+ #endif
     6284+-         ); exit (0);
     6285++      ); exit (0);
     6286+ #endif
     6287+ #endif
     6288 
     6289- fi
     6290+diff -Naur plymouth-0.8.2.orig/build-tools/config.sub plymouth-0.8.2/build-tools/config.sub
     6291+--- plymouth-0.8.2.orig/build-tools/config.sub 2010-02-23 16:52:04.000000000 +0000
     6292++++ plymouth-0.8.2/build-tools/config.sub      2013-05-31 09:29:15.508093115 +0100
     6293+@@ -1,10 +1,10 @@
     6294+ #! /bin/sh
     6295+ # Configuration validation subroutine script.
     6296+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     6297+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
     6298+-#   Free Software Foundation, Inc.
     6299++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
     6300++#   2011, 2012 Free Software Foundation, Inc.
     6301 
     6302-@@ -4814,16 +4401,12 @@
     6303- fi
     6304+-timestamp='2009-11-20'
     6305++timestamp='2012-02-10'
     6306 
     6307+ # This file is (in principle) common to ALL GNU software.
     6308+ # The presence of a machine in this file suggests that SOME GNU software
     6309+@@ -21,9 +21,7 @@
     6310+ # GNU General Public License for more details.
     6311+ #
     6312+ # You should have received a copy of the GNU General Public License
     6313+-# along with this program; if not, write to the Free Software
     6314+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
     6315+-# 02110-1301, USA.
     6316++# along with this program; if not, see <http://www.gnu.org/licenses/>.
     6317+ #
     6318+ # As a special exception to the GNU General Public License, if you
     6319+ # distribute this file as part of a program that contains a
     6320+@@ -75,8 +73,9 @@
     6321+ version="\
     6322+ GNU config.sub ($timestamp)
     6323 
     6324--{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
     6325-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
     6326- $as_echo_n "checking for ANSI C header files... " >&6; }
     6327--if test "${ac_cv_header_stdc+set}" = set; then
     6328-+if ${ac_cv_header_stdc+:} false; then :
     6329-   $as_echo_n "(cached) " >&6
     6330- else
     6331--  cat >conftest.$ac_ext <<_ACEOF
     6332--/* confdefs.h.  */
     6333--_ACEOF
     6334--cat confdefs.h >>conftest.$ac_ext
     6335--cat >>conftest.$ac_ext <<_ACEOF
     6336-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     6337- /* end confdefs.h.  */
     6338- #include <stdlib.h>
     6339- #include <stdarg.h>
     6340-@@ -4838,48 +4421,23 @@
     6341-   return 0;
     6342- }
     6343- _ACEOF
     6344--rm -f conftest.$ac_objext
     6345--if { (ac_try="$ac_compile"
     6346--case "(($ac_try" in
     6347--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     6348--  *) ac_try_echo=$ac_try;;
     6349--esac
     6350--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     6351--$as_echo "$ac_try_echo") >&5
     6352--  (eval "$ac_compile") 2>conftest.er1
     6353--  ac_status=$?
     6354--  grep -v '^ *+' conftest.er1 >conftest.err
     6355--  rm -f conftest.er1
     6356--  cat conftest.err >&5
     6357--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     6358--  (exit $ac_status); } && {
     6359--       test -z "$ac_c_werror_flag" ||
     6360--       test ! -s conftest.err
     6361--       } && test -s conftest.$ac_objext; then
     6362-+if ac_fn_c_try_compile "$LINENO"; then :
     6363-   ac_cv_header_stdc=yes
     6364- else
     6365--  $as_echo "$as_me: failed program was:" >&5
     6366--sed 's/^/| /' conftest.$ac_ext >&5
     6367--
     6368--      ac_cv_header_stdc=no
     6369-+  ac_cv_header_stdc=no
     6370- fi
     6371--
     6372- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     6373+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
     6374+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
     6375++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
     6376++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
     6377++Free Software Foundation, Inc.
     6378 
     6379- if test $ac_cv_header_stdc = yes; then
     6380-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
     6381--  cat >conftest.$ac_ext <<_ACEOF
     6382--/* confdefs.h.  */
     6383--_ACEOF
     6384--cat confdefs.h >>conftest.$ac_ext
     6385--cat >>conftest.$ac_ext <<_ACEOF
     6386-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     6387- /* end confdefs.h.  */
     6388- #include <string.h>
     6389+ This is free software; see the source for copying conditions.  There is NO
     6390+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     6391+@@ -123,13 +122,18 @@
     6392+ # Here we must recognize all the valid KERNEL-OS combinations.
     6393+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
     6394+ case $maybe_os in
     6395+-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
     6396+-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
     6397++  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
     6398++  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
     6399++  knetbsd*-gnu* | netbsd*-gnu* | \
     6400+   kopensolaris*-gnu* | \
     6401+   storm-chaos* | os2-emx* | rtmk-nova*)
     6402+     os=-$maybe_os
     6403+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     6404+     ;;
     6405++  android-linux)
     6406++    os=-linux-android
     6407++    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
     6408++    ;;
     6409+   *)
     6410+     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     6411+     if [ $basic_machine != $1 ]
     6412+@@ -156,8 +160,8 @@
     6413+               os=
     6414+               basic_machine=$1
     6415+               ;;
     6416+-        -bluegene*)
     6417+-              os=-cnk
     6418++      -bluegene*)
     6419++              os=-cnk
     6420+               ;;
     6421+       -sim | -cisco | -oki | -wec | -winbond)
     6422+               os=
     6423+@@ -173,10 +177,10 @@
     6424+               os=-chorusos
     6425+               basic_machine=$1
     6426+               ;;
     6427+-      -chorusrdb)
     6428+-              os=-chorusrdb
     6429++      -chorusrdb)
     6430++              os=-chorusrdb
     6431+               basic_machine=$1
     6432+-              ;;
     6433++              ;;
     6434+       -hiux*)
     6435+               os=-hiuxwe2
     6436+               ;;
     6437+@@ -245,17 +249,22 @@
     6438+       # Some are omitted here because they have special meanings below.
     6439+       1750a | 580 \
     6440+       | a29k \
     6441++      | aarch64 | aarch64_be \
     6442+       | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
     6443+       | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
     6444+       | am33_2.0 \
     6445+       | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
     6446++        | be32 | be64 \
     6447+       | bfin \
     6448+       | c4x | clipper \
     6449+       | d10v | d30v | dlx | dsp16xx \
     6450++      | epiphany \
     6451+       | fido | fr30 | frv \
     6452+       | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
     6453++      | hexagon \
     6454+       | i370 | i860 | i960 | ia64 \
     6455+       | ip2k | iq2000 \
     6456++      | le32 | le64 \
     6457+       | lm32 \
     6458+       | m32c | m32r | m32rle | m68000 | m68k | m88k \
     6459+       | maxq | mb | microblaze | mcore | mep | metag \
     6460+@@ -281,29 +290,39 @@
     6461+       | moxie \
     6462+       | mt \
     6463+       | msp430 \
     6464++      | nds32 | nds32le | nds32be \
     6465+       | nios | nios2 \
     6466+       | ns16k | ns32k \
     6467++      | open8 \
     6468+       | or32 \
     6469+       | pdp10 | pdp11 | pj | pjl \
     6470+-      | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
     6471++      | powerpc | powerpc64 | powerpc64le | powerpcle \
     6472+       | pyramid \
     6473+-      | rx \
     6474++      | rl78 | rx \
     6475+       | score \
     6476+       | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
     6477+       | sh64 | sh64le \
     6478+       | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
     6479+       | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
     6480+-      | spu | strongarm \
     6481+-      | tahoe | thumb | tic4x | tic80 | tron \
     6482++      | spu \
     6483++      | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
     6484+       | ubicom32 \
     6485+-      | v850 | v850e \
     6486++      | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
     6487+       | we32k \
     6488+-      | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
     6489++      | x86 | xc16x | xstormy16 | xtensa \
     6490+       | z8k | z80)
     6491+               basic_machine=$basic_machine-unknown
     6492+               ;;
     6493+-      m6811 | m68hc11 | m6812 | m68hc12 | picochip)
     6494+-              # Motorola 68HC11/12.
     6495++      c54x)
     6496++              basic_machine=tic54x-unknown
     6497++              ;;
     6498++      c55x)
     6499++              basic_machine=tic55x-unknown
     6500++              ;;
     6501++      c6x)
     6502++              basic_machine=tic6x-unknown
     6503++              ;;
     6504++      m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
     6505+               basic_machine=$basic_machine-unknown
     6506+               os=-none
     6507+               ;;
     6508+@@ -313,6 +332,21 @@
     6509+               basic_machine=mt-unknown
     6510+               ;;
     6511 
     6512- _ACEOF
     6513- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
     6514--  $EGREP "memchr" >/dev/null 2>&1; then
     6515--  :
     6516-+  $EGREP "memchr" >/dev/null 2>&1; then :
     6517++      strongarm | thumb | xscale)
     6518++              basic_machine=arm-unknown
     6519++              ;;
     6520++      xgate)
     6521++              basic_machine=$basic_machine-unknown
     6522++              os=-none
     6523++              ;;
     6524++      xscaleeb)
     6525++              basic_machine=armeb-unknown
     6526++              ;;
     6527 +
     6528- else
     6529-   ac_cv_header_stdc=no
     6530- fi
     6531-@@ -4889,18 +4447,14 @@
     6532-
     6533- if test $ac_cv_header_stdc = yes; then
     6534-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
     6535--  cat >conftest.$ac_ext <<_ACEOF
     6536--/* confdefs.h.  */
     6537--_ACEOF
     6538--cat confdefs.h >>conftest.$ac_ext
     6539--cat >>conftest.$ac_ext <<_ACEOF
     6540-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     6541- /* end confdefs.h.  */
     6542- #include <stdlib.h>
     6543-
     6544- _ACEOF
     6545- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
     6546--  $EGREP "free" >/dev/null 2>&1; then
     6547--  :
     6548-+  $EGREP "free" >/dev/null 2>&1; then :
     6549++      xscaleel)
     6550++              basic_machine=armel-unknown
     6551++              ;;
     6552 +
     6553- else
     6554-   ac_cv_header_stdc=no
     6555- fi
     6556-@@ -4910,14 +4464,10 @@
     6557-
     6558- if test $ac_cv_header_stdc = yes; then
     6559-   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
     6560--  if test "$cross_compiling" = yes; then
     6561-+  if test "$cross_compiling" = yes; then :
     6562-   :
     6563- else
     6564--  cat >conftest.$ac_ext <<_ACEOF
     6565--/* confdefs.h.  */
     6566--_ACEOF
     6567--cat confdefs.h >>conftest.$ac_ext
     6568--cat >>conftest.$ac_ext <<_ACEOF
     6569-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     6570- /* end confdefs.h.  */
     6571- #include <ctype.h>
     6572- #include <stdlib.h>
     6573-@@ -4944,74 +4494,41 @@
     6574-   return 0;
     6575- }
     6576- _ACEOF
     6577--rm -f conftest$ac_exeext
     6578--if { (ac_try="$ac_link"
     6579--case "(($ac_try" in
     6580--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     6581--  *) ac_try_echo=$ac_try;;
     6582--esac
     6583--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     6584--$as_echo "$ac_try_echo") >&5
     6585--  (eval "$ac_link") 2>&5
     6586--  ac_status=$?
     6587--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     6588--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
     6589--  { (case "(($ac_try" in
     6590--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     6591--  *) ac_try_echo=$ac_try;;
     6592--esac
     6593--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     6594--$as_echo "$ac_try_echo") >&5
     6595--  (eval "$ac_try") 2>&5
     6596--  ac_status=$?
     6597--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     6598--  (exit $ac_status); }; }; then
     6599--  :
     6600--else
     6601--  $as_echo "$as_me: program exited with status $ac_status" >&5
     6602--$as_echo "$as_me: failed program was:" >&5
     6603--sed 's/^/| /' conftest.$ac_ext >&5
     6604-+if ac_fn_c_try_run "$LINENO"; then :
     6605+       # We use `pc' rather than `unknown'
     6606+       # because (1) that's what they normally are, and
     6607+       # (2) the word "unknown" tends to confuse beginning users.
     6608+@@ -327,21 +361,25 @@
     6609+       # Recognize the basic CPU types with company name.
     6610+       580-* \
     6611+       | a29k-* \
     6612++      | aarch64-* | aarch64_be-* \
     6613+       | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
     6614+       | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
     6615+       | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
     6616+       | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
     6617+       | avr-* | avr32-* \
     6618++      | be32-* | be64-* \
     6619+       | bfin-* | bs2000-* \
     6620+-      | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
     6621++      | c[123]* | c30-* | [cjt]90-* | c4x-* \
     6622+       | clipper-* | craynv-* | cydra-* \
     6623+       | d10v-* | d30v-* | dlx-* \
     6624+       | elxsi-* \
     6625+       | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
     6626+       | h8300-* | h8500-* \
     6627+       | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
     6628++      | hexagon-* \
     6629+       | i*86-* | i860-* | i960-* | ia64-* \
     6630+       | ip2k-* | iq2000-* \
     6631++      | le32-* | le64-* \
     6632+       | lm32-* \
     6633+       | m32c-* | m32r-* | m32rle-* \
     6634+       | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
     6635+@@ -367,25 +405,29 @@
     6636+       | mmix-* \
     6637+       | mt-* \
     6638+       | msp430-* \
     6639++      | nds32-* | nds32le-* | nds32be-* \
     6640+       | nios-* | nios2-* \
     6641+       | none-* | np1-* | ns16k-* | ns32k-* \
     6642++      | open8-* \
     6643+       | orion-* \
     6644+       | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
     6645+-      | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
     6646++      | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
     6647+       | pyramid-* \
     6648+-      | romp-* | rs6000-* | rx-* \
     6649++      | rl78-* | romp-* | rs6000-* | rx-* \
     6650+       | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
     6651+       | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
     6652+       | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
     6653+       | sparclite-* \
     6654+-      | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
     6655+-      | tahoe-* | thumb-* \
     6656+-      | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
     6657++      | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
     6658++      | tahoe-* \
     6659++      | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
     6660++      | tile*-* \
     6661+       | tron-* \
     6662+       | ubicom32-* \
     6663+-      | v850-* | v850e-* | vax-* \
     6664++      | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
     6665++      | vax-* \
     6666+       | we32k-* \
     6667+-      | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
     6668++      | x86-* | x86_64-* | xc16x-* | xps100-* \
     6669+       | xstormy16-* | xtensa*-* \
     6670+       | ymp-* \
     6671+       | z8k-* | z80-*)
     6672+@@ -410,7 +452,7 @@
     6673+               basic_machine=a29k-amd
     6674+               os=-udi
     6675+               ;;
     6676+-      abacus)
     6677++      abacus)
     6678+               basic_machine=abacus-unknown
     6679+               ;;
     6680+       adobe68k)
     6681+@@ -480,11 +522,20 @@
     6682+               basic_machine=powerpc-ibm
     6683+               os=-cnk
     6684+               ;;
     6685++      c54x-*)
     6686++              basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
     6687++              ;;
     6688++      c55x-*)
     6689++              basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
     6690++              ;;
     6691++      c6x-*)
     6692++              basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
     6693++              ;;
     6694+       c90)
     6695+               basic_machine=c90-cray
     6696+               os=-unicos
     6697+               ;;
     6698+-        cegcc)
     6699++      cegcc)
     6700+               basic_machine=arm-unknown
     6701+               os=-cegcc
     6702+               ;;
     6703+@@ -516,7 +567,7 @@
     6704+               basic_machine=craynv-cray
     6705+               os=-unico