RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: PCRE: pcre/ 132html AUTHORS CMakeLists.txt COPYING ChangeLo...

From: Jeff Johnson <jbj@rpm5.org>
Date: Sat 21 Aug 2010 - 23:48:24 CEST
Message-Id: <20100821214824.CC65FD2B8F@rpm5.org>
  RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: pcre                             Date:   21-Aug-2010 23:48:24
  Branch: PCRE                             Handle: 2010082121480401

  Modified files:           (Branch: PCRE)
    pcre                    AUTHORS CMakeLists.txt ChangeLog INSTALL
                            Makefile.am Makefile.in NEWS NON-UNIX-USE README
                            RunTest aclocal.m4 config.guess config.h.generic
                            config.h.in config.sub configure configure.ac
                            depcomp install-sh ltmain.sh missing
                            pcre-config.in pcre.h.generic pcre.h.in
                            pcre_chartables.c.dist pcre_compile.c
                            pcre_dfa_exec.c pcre_exec.c pcre_globals.c
                            pcre_internal.h pcre_printint.src pcre_scanner.cc
                            pcre_scanner_unittest.cc pcre_study.c
                            pcre_tables.c pcre_ucd.c pcre_xclass.c pcrecpp.cc
                            pcrecpp.h pcrecpp_unittest.cc pcredemo.c
                            pcregexp.pas pcregrep.c pcreposix.c pcreposix.h
                            pcretest.c perltest.pl ucp.h
    pcre/doc                pcre.3 pcre.txt pcre_compile.3 pcre_compile2.3
                            pcreapi.3 pcrecompat.3 pcregrep.1 pcregrep.txt
                            pcrepattern.3 pcreperform.3 pcreposix.3
                            pcresample.3 pcrestack.3 pcresyntax.3 pcretest.1
                            pcretest.txt
    pcre/doc/html           pcre.html pcre_compile.html pcre_compile2.html
                            pcreapi.html pcrecompat.html pcredemo.html
                            pcregrep.html pcrepattern.html pcreperform.html
                            pcreposix.html pcresample.html pcrestack.html
                            pcresyntax.html pcretest.html
    pcre/testdata           testinput1 testinput10 testinput11 testinput12
                            testinput2 testinput5 testinput6 testinput7
                            testinput9 testoutput1 testoutput10 testoutput11
                            testoutput12 testoutput2 testoutput5 testoutput6
                            testoutput7 testoutput9
  Touched files:            (Branch: PCRE)
    pcre                    132html COPYING CleanTxt Detrail HACKING
                            PrepareRelease RunGrepTest RunTest.bat
                            config-cmake.h.in dftables.c libpcre.pc.in
                            libpcrecpp.pc.in libpcreposix.pc.in makevp.bat
                            makevp_c.txt makevp_l.txt pcre_config.c
                            pcre_fullinfo.c pcre_get.c pcre_info.c
                            pcre_maketables.c pcre_newline.c pcre_ord2utf8.c
                            pcre_refcount.c pcre_scanner.h pcre_stringpiece.cc
                            pcre_stringpiece.h.in pcre_stringpiece_unittest.cc
                            pcre_try_flipped.c pcre_valid_utf8.c
                            pcre_version.c pcrecpp_internal.h pcrecpparg.h.in
    pcre/cmake              COPYING-CMAKE-SCRIPTS
                            FindPackageHandleStandardArgs.cmake
                            FindReadline.cmake
    pcre/doc                index.html.src pcre-config.1 pcre-config.txt
                            pcre_config.3 pcre_copy_named_substring.3
                            pcre_copy_substring.3 pcre_dfa_exec.3 pcre_exec.3
                            pcre_free_substring.3 pcre_free_substring_list.3
                            pcre_fullinfo.3 pcre_get_named_substring.3
                            pcre_get_stringnumber.3
                            pcre_get_stringtable_entries.3
                            pcre_get_substring.3 pcre_get_substring_list.3
                            pcre_info.3 pcre_maketables.3 pcre_refcount.3
                            pcre_study.3 pcre_version.3 pcrebuild.3
                            pcrecallout.3 pcrecpp.3 pcrematching.3
                            pcrepartial.3 pcreprecompile.3 perltest.txt
    pcre/doc/html           index.html pcre-config.html pcre_config.html
                            pcre_copy_named_substring.html
                            pcre_copy_substring.html pcre_dfa_exec.html
                            pcre_exec.html pcre_free_substring.html
                            pcre_free_substring_list.html pcre_fullinfo.html
                            pcre_get_named_substring.html
                            pcre_get_stringnumber.html
                            pcre_get_stringtable_entries.html
                            pcre_get_substring.html
                            pcre_get_substring_list.html pcre_info.html
                            pcre_maketables.html pcre_refcount.html
                            pcre_study.html pcre_version.html pcrebuild.html
                            pcrecallout.html pcrecpp.html pcrematching.html
                            pcrepartial.html pcreprecompile.html
    pcre/testdata           grepinput grepinput8 grepinputv grepinputx
                            greplist grepoutput grepoutput8 grepoutputN
                            testinput3 testinput4 testinput8 testoutput3
                            testoutput4 testoutput8 wintestinput3
                            wintestoutput3

  Log:
    import PCRE 8.10 onto vendor branch
    
    [Release Tag: pcre-8_10]

  Summary:
    Revision    Changes     Path
    1.1.1.3     +2  -2      pcre/AUTHORS
    1.1.1.3     +4  -0      pcre/CMakeLists.txt
    1.1.1.4     +288 -0     pcre/ChangeLog
    1.1.1.3     +93 -19     pcre/INSTALL
    1.1.1.4     +2  -0      pcre/Makefile.am
    1.1.1.4     +33 -3      pcre/Makefile.in
    1.1.1.4     +24 -0      pcre/NEWS
    1.1.1.4     +13 -10     pcre/NON-UNIX-USE
    1.1.1.4     +5  -5      pcre/README
    1.1.1.3     +6  -6      pcre/RunTest
    1.1.1.4     +96 -70     pcre/aclocal.m4
    1.1.1.4     +85 -142    pcre/config.guess
    1.1.1.4     +16 -6      pcre/config.h.generic
    1.1.1.4     +13 -3      pcre/config.h.in
    1.1.1.4     +45 -16     pcre/config.sub
    1.1.1.4     +5159 -7658 pcre/configure
    1.1.1.4     +101 -28    pcre/configure.ac
    1.1.1.2     +63 -20     pcre/depcomp
    1.1.1.4     +0  -0      pcre/doc/html/pcre.html
    1.1.1.3     +0  -0      pcre/doc/html/pcre_compile.html
    1.1.1.3     +0  -0      pcre/doc/html/pcre_compile2.html
    1.1.1.4     +0  -0      pcre/doc/html/pcreapi.html
    1.1.1.3     +0  -0      pcre/doc/html/pcrecompat.html
    1.1.1.2     +0  -0      pcre/doc/html/pcredemo.html
    1.1.1.4     +0  -0      pcre/doc/html/pcregrep.html
    1.1.1.4     +0  -0      pcre/doc/html/pcrepattern.html
    1.1.1.2     +0  -0      pcre/doc/html/pcreperform.html
    1.1.1.4     +0  -0      pcre/doc/html/pcreposix.html
    1.1.1.3     +0  -0      pcre/doc/html/pcresample.html
    1.1.1.2     +0  -0      pcre/doc/html/pcrestack.html
    1.1.1.3     +0  -0      pcre/doc/html/pcresyntax.html
    1.1.1.4     +0  -0      pcre/doc/html/pcretest.html
    1.1.1.4     +0  -0      pcre/doc/pcre.3
    1.1.1.4     +0  -0      pcre/doc/pcre.txt
    1.1.1.3     +0  -0      pcre/doc/pcre_compile.3
    1.1.1.3     +0  -0      pcre/doc/pcre_compile2.3
    1.1.1.4     +0  -0      pcre/doc/pcreapi.3
    1.1.1.3     +0  -0      pcre/doc/pcrecompat.3
    1.1.1.4     +0  -0      pcre/doc/pcregrep.1
    1.1.1.4     +0  -0      pcre/doc/pcregrep.txt
    1.1.1.4     +0  -0      pcre/doc/pcrepattern.3
    1.1.1.2     +0  -0      pcre/doc/pcreperform.3
    1.1.1.4     +0  -0      pcre/doc/pcreposix.3
    1.1.1.3     +0  -0      pcre/doc/pcresample.3
    1.1.1.2     +0  -0      pcre/doc/pcrestack.3
    1.1.1.3     +0  -0      pcre/doc/pcresyntax.3
    1.1.1.4     +0  -0      pcre/doc/pcretest.1
    1.1.1.4     +0  -0      pcre/doc/pcretest.txt
    1.1.1.2     +3  -2      pcre/install-sh
    1.1.1.3     +8  -8      pcre/ltmain.sh
    1.1.1.2     +28 -17     pcre/missing
    1.1.1.3     +12 -2      pcre/pcre-config.in
    1.1.1.4     +6  -3      pcre/pcre.h.generic
    1.1.1.4     +4  -1      pcre/pcre.h.in
    1.1.1.2     +1  -1      pcre/pcre_chartables.c.dist
    1.1.1.4     +663 -259   pcre/pcre_compile.c
    1.1.1.4     +203 -52    pcre/pcre_dfa_exec.c
    1.1.1.4     +786 -333   pcre/pcre_exec.c
    1.1.1.2     +24 -3      pcre/pcre_globals.c
    1.1.1.4     +92 -43     pcre/pcre_internal.h
    1.1.1.4     +30 -2      pcre/pcre_printint.src
    1.1.1.2     +2  -2      pcre/pcre_scanner.cc
    1.1.1.2     +4  -4      pcre/pcre_scanner_unittest.cc
    1.1.1.3     +227 -69    pcre/pcre_study.c
    1.1.1.3     +170 -113   pcre/pcre_tables.c
    1.1.1.3     +2255 -2054 pcre/pcre_ucd.c
    1.1.1.3     +32 -4      pcre/pcre_xclass.c
    1.1.1.2     +70 -43     pcre/pcrecpp.cc
    1.1.1.3     +1  -0      pcre/pcrecpp.h
    1.1.1.2     +16 -3      pcre/pcrecpp_unittest.cc
    1.1.1.3     +15 -5      pcre/pcredemo.c
    1.1.1.2     +26 -1      pcre/pcregexp.pas
    1.1.1.4     +114 -32    pcre/pcregrep.c
    1.1.1.4     +42 -21     pcre/pcreposix.c
    1.1.1.4     +1  -0      pcre/pcreposix.h
    1.1.1.4     +403 -22    pcre/pcretest.c
    1.1.1.3     +25 -7      pcre/perltest.pl
    1.1.1.4     +0  -0      pcre/testdata/testinput1
    1.1.1.3     +0  -0      pcre/testdata/testinput10
    1.1.1.2     +0  -0      pcre/testdata/testinput11
    1.1.1.2     +0  -0      pcre/testdata/testinput12
    1.1.1.4     +0  -0      pcre/testdata/testinput2
    1.1.1.4     +0  -0      pcre/testdata/testinput5
    1.1.1.4     +0  -0      pcre/testdata/testinput6
    1.1.1.4     +0  -0      pcre/testdata/testinput7
    1.1.1.3     +0  -0      pcre/testdata/testinput9
    1.1.1.4     +0  -0      pcre/testdata/testoutput1
    1.1.1.3     +0  -0      pcre/testdata/testoutput10
    1.1.1.2     +0  -0      pcre/testdata/testoutput11
    1.1.1.2     +0  -0      pcre/testdata/testoutput12
    1.1.1.4     +0  -0      pcre/testdata/testoutput2
    1.1.1.4     +0  -0      pcre/testdata/testoutput5
    1.1.1.4     +0  -0      pcre/testdata/testoutput6
    1.1.1.4     +0  -0      pcre/testdata/testoutput7
    1.1.1.3     +0  -0      pcre/testdata/testoutput9
    1.1.1.3     +17 -1      pcre/ucp.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: pcre/AUTHORS
  ============================================================================
  $ cvs diff -u -r1.1.1.2 -r1.1.1.3 AUTHORS
  --- pcre/AUTHORS	18 Aug 2009 21:25:52 -0000	1.1.1.2
  +++ pcre/AUTHORS	21 Aug 2010 21:48:05 -0000	1.1.1.3
  @@ -8,7 +8,7 @@
   University of Cambridge Computing Service,
   Cambridge, England.
   
  -Copyright (c) 1997-2009 University of Cambridge
  +Copyright (c) 1997-2010 University of Cambridge
   All rights reserved
   
   
  @@ -17,7 +17,7 @@
   
   Written by:       Google Inc.
   
  -Copyright (c) 2007-2008 Google Inc
  +Copyright (c) 2007-2010 Google Inc
   All rights reserved
   
   ####
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/CMakeLists.txt
  ============================================================================
  $ cvs diff -u -r1.1.1.2 -r1.1.1.3 CMakeLists.txt
  --- pcre/CMakeLists.txt	18 Aug 2009 21:25:58 -0000	1.1.1.2
  +++ pcre/CMakeLists.txt	21 Aug 2010 21:48:05 -0000	1.1.1.3
  @@ -35,6 +35,8 @@
   #            to disable the final configuration report.
   # 2009-04-11 PH applied Christian Ehrlicher's patch to show compiler flags that
   #            are set by specifying a release type.
  +# 2010-01-02 PH added test for stdint.h
  +# 2010-03-02 PH addes test for inttypes.h
   
   PROJECT(PCRE C CXX)
   
  @@ -55,6 +57,8 @@
   INCLUDE(CheckTypeSize)
   
   CHECK_INCLUDE_FILE(dirent.h     HAVE_DIRENT_H)
  +CHECK_INCLUDE_FILE(stdint.h     HAVE_STDINT_H)
  +CHECK_INCLUDE_FILE(inttypes.h   HAVE_INTTYPES_H)
   CHECK_INCLUDE_FILE(sys/stat.h   HAVE_SYS_STAT_H)
   CHECK_INCLUDE_FILE(sys/types.h  HAVE_SYS_TYPES_H)
   CHECK_INCLUDE_FILE(unistd.h     HAVE_UNISTD_H)
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/ChangeLog
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 ChangeLog
  --- pcre/ChangeLog	5 Dec 2009 13:54:00 -0000	1.1.1.3
  +++ pcre/ChangeLog	21 Aug 2010 21:48:05 -0000	1.1.1.4
  @@ -1,6 +1,294 @@
   ChangeLog for PCRE
   ------------------
   
  +Version 8.10 25-Jun-2010
  +------------------------
  +
  +1.  Added support for (*MARK:ARG) and for ARG additions to PRUNE, SKIP, and
  +    THEN.
  +
  +2.  (*ACCEPT) was not working when inside an atomic group.
  +
  +3.  Inside a character class, \B is treated as a literal by default, but
  +    faulted if PCRE_EXTRA is set. This mimics Perl's behaviour (the -w option
  +    causes the error). The code is unchanged, but I tidied the documentation.
  +
  +4.  Inside a character class, PCRE always treated \R and \X as literals,
  +    whereas Perl faults them if its -w option is set. I have changed PCRE so
  +    that it faults them when PCRE_EXTRA is set.
  +
  +5.  Added support for \N, which always matches any character other than
  +    newline. (It is the same as "." when PCRE_DOTALL is not set.)
  +
  +6.  When compiling pcregrep with newer versions of gcc which may have
  +    FORTIFY_SOURCE set, several warnings "ignoring return value of 'fwrite',
  +    declared with attribute warn_unused_result" were given. Just casting the
  +    result to (void) does not stop the warnings; a more elaborate fudge is
  +    needed. I've used a macro to implement this.
  +
  +7.  Minor change to pcretest.c to avoid a compiler warning.
  +
  +8.  Added four artifical Unicode properties to help with an option to make
  +    \s etc use properties (see next item). The new properties are: Xan
  +    (alphanumeric), Xsp (Perl space), Xps (POSIX space), and Xwd (word).
  +
  +9.  Added PCRE_UCP to make \b, \d, \s, \w, and certain POSIX character classes
  +    use Unicode properties. (*UCP) at the start of a pattern can be used to set
  +    this option. Modified pcretest to add /W to test this facility. Added
  +    REG_UCP to make it available via the POSIX interface.
  +
  +10. Added --line-buffered to pcregrep.
  +
  +11. In UTF-8 mode, if a pattern that was compiled with PCRE_CASELESS was
  +    studied, and the match started with a letter with a code point greater than
  +    127 whose first byte was different to the first byte of the other case of
  +    the letter, the other case of this starting letter was not recognized
  +    (#976).
  +
  +12. If a pattern that was studied started with a repeated Unicode property
  +    test, for example, \p{Nd}+, there was the theoretical possibility of
  +    setting up an incorrect bitmap of starting bytes, but fortunately it could
  +    not have actually happened in practice until change 8 above was made (it
  +    added property types that matched character-matching opcodes).
  +
  +13. pcre_study() now recognizes \h, \v, and \R when constructing a bit map of
  +    possible starting bytes for non-anchored patterns.
  +
  +14. Extended the "auto-possessify" feature of pcre_compile(). It now recognizes
  +    \R, and also a number of cases that involve Unicode properties, both
  +    explicit and implicit when PCRE_UCP is set.
  +
  +15. If a repeated Unicode property match (e.g. \p{Lu}*) was used with non-UTF-8
  +    input, it could crash or give wrong results if characters with values
  +    greater than 0xc0 were present in the subject string. (Detail: it assumed
  +    UTF-8 input when processing these items.)
  +
  +16. Added a lot of (int) casts to avoid compiler warnings in systems where
  +    size_t is 64-bit (#991).
  +
  +17. Added a check for running out of memory when PCRE is compiled with
  +    --disable-stack-for-recursion (#990).
  +
  +18. If the last data line in a file for pcretest does not have a newline on
  +    the end, a newline was missing in the output.
  +
  +19. The default pcre_chartables.c file recognizes only ASCII characters (values
  +    less than 128) in its various bitmaps. However, there is a facility for
  +    generating tables according to the current locale when PCRE is compiled. It
  +    turns out that in some environments, 0x85 and 0xa0, which are Unicode space
  +    characters, are recognized by isspace() and therefore were getting set in
  +    these tables, and indeed these tables seem to approximate to ISO 8859. This
  +    caused a problem in UTF-8 mode when pcre_study() was used to create a list
  +    of bytes that can start a match. For \s, it was including 0x85 and 0xa0,
  +    which of course cannot start UTF-8 characters. I have changed the code so
  +    that only real ASCII characters (less than 128) and the correct starting
  +    bytes for UTF-8 encodings are set for characters greater than 127 when in
  +    UTF-8 mode. (When PCRE_UCP is set - see 9 above - the code is different
  +    altogether.)
  +
  +20. Added the /T option to pcretest so as to be able to run tests with non-
  +    standard character tables, thus making it possible to include the tests
  +    used for 19 above in the standard set of tests.
  +
  +21. A pattern such as (?&t)(?#()(?(DEFINE)(?<t>a)) which has a forward
  +    reference to a subpattern the other side of a comment that contains an
  +    opening parenthesis caused either an internal compiling error, or a
  +    reference to the wrong subpattern.
  +
  +
  +Version 8.02 19-Mar-2010
  +------------------------
  +
  +1.  The Unicode data tables have been updated to Unicode 5.2.0.
  +
  +2.  Added the option --libs-cpp to pcre-config, but only when C++ support is
  +    configured.
  +
  +3.  Updated the licensing terms in the pcregexp.pas file, as agreed with the
  +    original author of that file, following a query about its status.
  +
  +4.  On systems that do not have stdint.h (e.g. Solaris), check for and include
  +    inttypes.h instead. This fixes a bug that was introduced by change 8.01/8.
  +
  +5.  A pattern such as (?&t)*+(?(DEFINE)(?<t>.)) which has a possessive
  +    quantifier applied to a forward-referencing subroutine call, could compile
  +    incorrect code or give the error "internal error: previously-checked
  +    referenced subpattern not found".
  +
  +6.  Both MS Visual Studio and Symbian OS have problems with initializing
  +    variables to point to external functions. For these systems, therefore,
  +    pcre_malloc etc. are now initialized to local functions that call the
  +    relevant global functions.
  +
  +7.  There were two entries missing in the vectors called coptable and poptable
  +    in pcre_dfa_exec.c. This could lead to memory accesses outsize the vectors.
  +    I've fixed the data, and added a kludgy way of testing at compile time that
  +    the lengths are correct (equal to the number of opcodes).
  +
  +8.  Following on from 7, I added a similar kludge to check the length of the
  +    eint vector in pcreposix.c.
  +
  +9.  Error texts for pcre_compile() are held as one long string to avoid too
  +    much relocation at load time. To find a text, the string is searched,
  +    counting zeros. There was no check for running off the end of the string,
  +    which could happen if a new error number was added without updating the
  +    string.
  +
  +10. \K gave a compile-time error if it appeared in a lookbehind assersion.
  +
  +11. \K was not working if it appeared in an atomic group or in a group that
  +    was called as a "subroutine", or in an assertion. Perl 5.11 documents that
  +    \K is "not well defined" if used in an assertion. PCRE now accepts it if
  +    the assertion is positive, but not if it is negative.
  +
  +12. Change 11 fortuitously reduced the size of the stack frame used in the
  +    "match()" function of pcre_exec.c by one pointer. Forthcoming
  +    implementation of support for (*MARK) will need an extra pointer on the
  +    stack; I have reserved it now, so that the stack frame size does not
  +    decrease.
  +
  +13. A pattern such as (?P<L1>(?P<L2>0)|(?P>L2)(?P>L1)) in which the only other
  +    item in branch that calls a recursion is a subroutine call - as in the
  +    second branch in the above example - was incorrectly given the compile-
  +    time error "recursive call could loop indefinitely" because pcre_compile()
  +    was not correctly checking the subroutine for matching a non-empty string.
  +
  +14. The checks for overrunning compiling workspace could trigger after an
  +    overrun had occurred. This is a "should never occur" error, but it can be
  +    triggered by pathological patterns such as hundreds of nested parentheses.
  +    The checks now trigger 100 bytes before the end of the workspace.
  +
  +15. Fix typo in configure.ac: "srtoq" should be "strtoq".
  +
  +
  +Version 8.01 19-Jan-2010
  +------------------------
  +
  +1.  If a pattern contained a conditional subpattern with only one branch (in
  +    particular, this includes all (*DEFINE) patterns), a call to pcre_study()
  +    computed the wrong minimum data length (which is of course zero for such
  +    subpatterns). This could cause incorrect "no match" results.
  +
  +2.  For patterns such as (?i)a(?-i)b|c where an option setting at the start of
  +    the pattern is reset in the first branch, pcre_compile() failed with
  +    "internal error: code overflow at offset...". This happened only when
  +    the reset was to the original external option setting. (An optimization
  +    abstracts leading options settings into an external setting, which was the
  +    cause of this.)
  +
  +3.  A pattern such as ^(?!a(*SKIP)b) where a negative assertion contained one
  +    of the verbs SKIP, PRUNE, or COMMIT, did not work correctly. When the
  +    assertion pattern did not match (meaning that the assertion was true), it
  +    was incorrectly treated as false if the SKIP had been reached during the
  +    matching. This also applied to assertions used as conditions.
  +
  +4.  If an item that is not supported by pcre_dfa_exec() was encountered in an
  +    assertion subpattern, including such a pattern used as a condition,
  +    unpredictable results occurred, instead of the error return
  +    PCRE_ERROR_DFA_UITEM.
  +
  +5.  The C++ GlobalReplace function was not working like Perl for the special
  +    situation when an empty string is matched. It now does the fancy magic
  +    stuff that is necessary.
  +
  +6.  In pcre_internal.h, obsolete includes to setjmp.h and stdarg.h have been
  +    removed. (These were left over from very, very early versions of PCRE.)
  +
  +7.  Some cosmetic changes to the code to make life easier when compiling it
  +    as part of something else:
  +
  +    (a) Change DEBUG to PCRE_DEBUG.
  +
  +    (b) In pcre_compile(), rename the member of the "branch_chain" structure
  +        called "current" as "current_branch", to prevent a collision with the
  +        Linux macro when compiled as a kernel module.
  +
  +    (c) In pcre_study(), rename the function set_bit() as set_table_bit(), to
  +        prevent a collision with the Linux macro when compiled as a kernel
  +        module.
  +
  +8.  In pcre_compile() there are some checks for integer overflows that used to
  +    cast potentially large values to (double). This has been changed to that
  +    when building, a check for int64_t is made, and if it is found, it is used
  +    instead, thus avoiding the use of floating point arithmetic. (There is no
  +    other use of FP in PCRE.) If int64_t is not found, the fallback is to
  +    double.
  +
  +9.  Added two casts to avoid signed/unsigned warnings from VS Studio Express
  +    2005 (difference between two addresses compared to an unsigned value).
  +
  +10. Change the standard AC_CHECK_LIB test for libbz2 in configure.ac to a
  +    custom one, because of the following reported problem in Windows:
  +
  +      - libbz2 uses the Pascal calling convention (WINAPI) for the functions
  +          under Win32.
  +      - The standard autoconf AC_CHECK_LIB fails to include "bzlib.h",
  +          therefore missing the function definition.
  +      - The compiler thus generates a "C" signature for the test function.
  +      - The linker fails to find the "C" function.
  +      - PCRE fails to configure if asked to do so against libbz2.
  +
  +11. When running libtoolize from libtool-2.2.6b as part of autogen.sh, these
  +    messages were output:
  +
  +      Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
  +      rerunning libtoolize, to keep the correct libtool macros in-tree.
  +      Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
  +
  +    I have done both of these things.
  +
  +12. Although pcre_dfa_exec() does not use nearly as much stack as pcre_exec()
  +    most of the time, it *can* run out if it is given a pattern that contains a
  +    runaway infinite recursion. I updated the discussion in the pcrestack man
  +    page.
  +
  +13. Now that we have gone to the x.xx style of version numbers, the minor
  +    version may start with zero. Using 08 or 09 is a bad idea because users
  +    might check the value of PCRE_MINOR in their code, and 08 or 09 may be
  +    interpreted as invalid octal numbers. I've updated the previous comment in
  +    configure.ac, and also added a check that gives an error if 08 or 09 are
  +    used.
  +
  +14. Change 8.00/11 was not quite complete: code had been accidentally omitted,
  +    causing partial matching to fail when the end of the subject matched \W
  +    in a UTF-8 pattern where \W was quantified with a minimum of 3.
  +
  +15. There were some discrepancies between the declarations in pcre_internal.h
  +    of _pcre_is_newline(), _pcre_was_newline(), and _pcre_valid_utf8() and
  +    their definitions. The declarations used "const uschar *" and the
  +    definitions used USPTR. Even though USPTR is normally defined as "const
  +    unsigned char *" (and uschar is typedeffed as "unsigned char"), it was
  +    reported that: "This difference in casting confuses some C++ compilers, for
  +    example, SunCC recognizes above declarations as different functions and
  +    generates broken code for hbpcre." I have changed the declarations to use
  +    USPTR.
  +
  +16. GNU libtool is named differently on some systems. The autogen.sh script now
  +    tries several variants such as glibtoolize (MacOSX) and libtoolize1x
  +    (FreeBSD).
  +
  +17. Applied Craig's patch that fixes an HP aCC compile error in pcre 8.00
  +    (strtoXX undefined when compiling pcrecpp.cc). The patch contains this
  +    comment: "Figure out how to create a longlong from a string: strtoll and
  +    equivalent. It's not enough to call AC_CHECK_FUNCS: hpux has a strtoll, for
  +    instance, but it only takes 2 args instead of 3!"
  +
  +18. A subtle bug concerned with back references has been fixed by a change of
  +    specification, with a corresponding code fix. A pattern such as
  +    ^(xa|=?\1a)+$ which contains a back reference inside the group to which it
  +    refers, was giving matches when it shouldn't. For example, xa=xaaa would
  +    match that pattern. Interestingly, Perl (at least up to 5.11.3) has the
  +    same bug. Such groups have to be quantified to be useful, or contained
  +    inside another quantified group. (If there's no repetition, the reference
  +    can never match.) The problem arises because, having left the group and
  +    moved on to the rest of the pattern, a later failure that backtracks into
  +    the group uses the captured value from the final iteration of the group
  +    rather than the correct earlier one. I have fixed this in PCRE by forcing
  +    any group that contains a reference to itself to be an atomic group; that
  +    is, there cannot be any backtracking into it once it has completed. This is
  +    similar to recursive and subroutine calls.
  +
  +
   Version 8.00 19-Oct-09
   ----------------------
   
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/INSTALL
  ============================================================================
  $ cvs diff -u -r1.1.1.2 -r1.1.1.3 INSTALL
  --- pcre/INSTALL	18 Aug 2009 21:25:51 -0000	1.1.1.2
  +++ pcre/INSTALL	21 Aug 2010 21:48:04 -0000	1.1.1.3
  @@ -2,10 +2,12 @@
   *************************
   
   Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
  -2006, 2007, 2008 Free Software Foundation, Inc.
  +2006, 2007, 2008, 2009 Free Software Foundation, Inc.
   
  -   This file is free documentation; the Free Software Foundation gives
  -unlimited permission to copy, distribute and modify it.
  +   Copying and distribution of this file, with or without modification,
  +are permitted in any medium without royalty provided the copyright
  +notice and this notice are preserved.  This file is offered as-is,
  +without warranty of any kind.
   
   Basic Installation
   ==================
  @@ -13,7 +15,11 @@
      Briefly, the shell commands `./configure; make; make install' should
   configure, build, and install this package.  The following
   more-detailed instructions are generic; see the `README' file for
  -instructions specific to this package.
  +instructions specific to this package.  Some packages provide this
  +`INSTALL' file but do not implement all of the features documented
  +below.  The lack of an optional feature in a given package is not
  +necessarily a bug.  More recommendations for GNU packages can be found
  +in *note Makefile Conventions: (standards)Makefile Conventions.
   
      The `configure' shell script attempts to guess correct values for
   various system-dependent variables used during compilation.  It uses
  @@ -42,7 +48,7 @@
   you want to change it or regenerate `configure' using a newer version
   of `autoconf'.
   
  -The simplest way to compile this package is:
  +   The simplest way to compile this package is:
   
     1. `cd' to the directory containing the package's source code and type
        `./configure' to configure the package for your system.
  @@ -53,12 +59,22 @@
     2. Type `make' to compile the package.
   
     3. Optionally, type `make check' to run any self-tests that come with
  -     the package.
  +     the package, generally using the just-built uninstalled binaries.
   
     4. Type `make install' to install the programs and any data files and
  -     documentation.
  +     documentation.  When installing into a prefix owned by root, it is
  +     recommended that the package be configured and built as a regular
  +     user, and only the `make install' phase executed with root
  +     privileges.
  +
  +  5. Optionally, type `make installcheck' to repeat any self-tests, but
  +     this time using the binaries in their final installed location.
  +     This target does not install anything.  Running this target as a
  +     regular user, particularly if the prior `make install' required
  +     root privileges, verifies that the installation completed
  +     correctly.
   
  -  5. You can remove the program binaries and object files from the
  +  6. You can remove the program binaries and object files from the
        source code directory by typing `make clean'.  To also remove the
        files that `configure' created (so you can compile the package for
        a different kind of computer), type `make distclean'.  There is
  @@ -67,8 +83,15 @@
        all sorts of other programs in order to regenerate files that came
        with the distribution.
   
  -  6. Often, you can also type `make uninstall' to remove the installed
  -     files again.
  +  7. Often, you can also type `make uninstall' to remove the installed
  +     files again.  In practice, not all packages have tested that
  +     uninstallation works correctly, even though it is required by the
  +     GNU Coding Standards.
  +
  +  8. Some packages, particularly those that use Automake, provide `make
  +     distcheck', which can by used by developers to test that all other
  +     targets like `make install' and `make uninstall' work correctly.
  +     This target is generally not run by end users.
   
   Compilers and Options
   =====================
  @@ -93,7 +116,8 @@
   own directory.  To do this, you can use GNU `make'.  `cd' to the
   directory where you want the object files and executables to go and run
   the `configure' script.  `configure' automatically checks for the
  -source code in the directory that `configure' is in and in `..'.
  +source code in the directory that `configure' is in and in `..'.  This
  +is known as a "VPATH" build.
   
      With a non-GNU `make', it is safer to compile the package for one
   architecture at a time in the source code directory.  After you have
  @@ -120,7 +144,8 @@
      By default, `make install' installs the package's commands under
   `/usr/local/bin', include files under `/usr/local/include', etc.  You
   can specify an installation prefix other than `/usr/local' by giving
  -`configure' the option `--prefix=PREFIX'.
  +`configure' the option `--prefix=PREFIX', where PREFIX must be an
  +absolute file name.
   
      You can specify separate installation prefixes for
   architecture-specific files and architecture-independent files.  If you
  @@ -131,15 +156,46 @@
      In addition, if you use an unusual directory layout you can give
   options like `--bindir=DIR' to specify different values for particular
   kinds of files.  Run `configure --help' for a list of the directories
  -you can set and what kinds of files go in them.
  +you can set and what kinds of files go in them.  In general, the
  +default for these options is expressed in terms of `${prefix}', so that
  +specifying just `--prefix' will affect all of the other directory
  +specifications that were not explicitly provided.
  +
  +   The most portable way to affect installation locations is to pass the
  +correct locations to `configure'; however, many packages provide one or
  +both of the following shortcuts of passing variable assignments to the
  +`make install' command line to change installation locations without
  +having to reconfigure or recompile.
  +
  +   The first method involves providing an override variable for each
  +affected directory.  For example, `make install
  +prefix=/alternate/directory' will choose an alternate location for all
  +directory configuration variables that were expressed in terms of
  +`${prefix}'.  Any directories that were specified during `configure',
  +but not in terms of `${prefix}', must each be overridden at install
  +time for the entire installation to be relocated.  The approach of
  +makefile variable overrides for each directory variable is required by
  +the GNU Coding Standards, and ideally causes no recompilation.
  +However, some platforms have known limitations with the semantics of
  +shared libraries that end up requiring recompilation when using this
  +method, particularly noticeable in packages that use GNU Libtool.
  +
  +   The second method involves providing the `DESTDIR' variable.  For
  +example, `make install DESTDIR=/alternate/directory' will prepend
  +`/alternate/directory' before all installation names.  The approach of
  +`DESTDIR' overrides is not required by the GNU Coding Standards, and
  +does not work on platforms that have drive letters.  On the other hand,
  +it does better at avoiding recompilation issues, and works well even
  +when some directory options were not specified in terms of `${prefix}'
  +at `configure' time.
  +
  +Optional Features
  +=================
   
      If the package supports it, you can cause programs to be installed
   with an extra prefix or suffix on their names by giving `configure' the
   option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
   
  -Optional Features
  -=================
  -
      Some packages pay attention to `--enable-FEATURE' options to
   `configure', where FEATURE indicates an optional part of the package.
   They may also pay attention to `--with-PACKAGE' options, where PACKAGE
  @@ -152,6 +208,13 @@
   you can use the `configure' options `--x-includes=DIR' and
   `--x-libraries=DIR' to specify their locations.
   
  +   Some packages offer the ability to configure how verbose the
  +execution of `make' will be.  For these packages, running `./configure
  +--enable-silent-rules' sets the default to minimal output, which can be
  +overridden with `make V=1'; while running `./configure
  +--disable-silent-rules' sets the default to verbose, which can be
  +overridden with `make V=0'.
  +
   Particular systems
   ==================
   
  @@ -159,7 +222,7 @@
   CC is not installed, it is recommended to use the following options in
   order to use an ANSI C compiler:
   
  -     ./configure CC="cc -Ae"
  +     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
   
   and if that doesn't work, install pre-built binaries of GCC for HP-UX.
   
  @@ -174,6 +237,16 @@
   
        ./configure CC="cc -nodtk"
   
  +   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
  +directory contains several dysfunctional programs; working variants of
  +these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
  +in your `PATH', put it _after_ `/usr/bin'.
  +
  +   On Haiku, software installed for all users goes in `/boot/common',
  +not `/usr/local'.  It is recommended to use the following options:
  +
  +     ./configure --prefix=/boot/common
  +
   Specifying the System Type
   ==========================
   
  @@ -189,7 +262,8 @@
   
   where SYSTEM can have one of these forms:
   
  -     OS KERNEL-OS
  +     OS
  +     KERNEL-OS
   
      See the file `config.sub' for the possible values of each field.  If
   `config.sub' isn't included in this package, then this package doesn't
  @@ -277,7 +351,7 @@
        `configure' can determine that directory automatically.
   
   `--prefix=DIR'
  -     Use DIR as the installation prefix.  *Note Installation Names::
  +     Use DIR as the installation prefix.  *note Installation Names::
        for more details, including other options available for fine-tuning
        the installation locations.
   
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 Makefile.am
  --- pcre/Makefile.am	5 Dec 2009 13:53:53 -0000	1.1.1.3
  +++ pcre/Makefile.am	21 Aug 2010 21:48:05 -0000	1.1.1.4
  @@ -1,5 +1,7 @@
   ## Process this file with automake to produce Makefile.in.
   
  +ACLOCAL_AMFLAGS = -I m4
  +
   dist_doc_DATA = \
     doc/pcre.txt \
     doc/pcre-config.txt \
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/Makefile.in
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 Makefile.in
  --- pcre/Makefile.in	5 Dec 2009 13:54:02 -0000	1.1.1.3
  +++ pcre/Makefile.in	21 Aug 2010 21:48:05 -0000	1.1.1.4
  @@ -1,8 +1,9 @@
  -# Makefile.in generated by automake 1.10.2 from Makefile.am.
  +# Makefile.in generated by automake 1.10.3 from Makefile.am.
   # @configure_input@
   
   # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
  -# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
  +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
  +# Inc.
   # This Makefile.in is free software; the Free Software Foundation
   # gives unlimited permission to copy and/or distribute it,
   # with or without modifications, as long as this notice is preserved.
  @@ -287,6 +288,7 @@
   PACKAGE_NAME = @PACKAGE_NAME@
   PACKAGE_STRING = @PACKAGE_STRING@
   PACKAGE_TARNAME = @PACKAGE_TARNAME@
  +PACKAGE_URL = @PACKAGE_URL@
   PACKAGE_VERSION = @PACKAGE_VERSION@
   PATH_SEPARATOR = @PATH_SEPARATOR@
   PCRE_DATE = @PCRE_DATE@
  @@ -323,6 +325,7 @@
   datarootdir = @datarootdir@
   docdir = @docdir@
   dvidir = @dvidir@
  +enable_cpp = @enable_cpp@
   exec_prefix = @exec_prefix@
   host = @host@
   host_alias = @host_alias@
  @@ -357,6 +360,7 @@
   top_build_prefix = @top_build_prefix@
   top_builddir = @top_builddir@
   top_srcdir = @top_srcdir@
  +ACLOCAL_AMFLAGS = -I m4
   dist_doc_DATA = \
     doc/pcre.txt \
     doc/pcre-config.txt \
  @@ -1170,6 +1174,19 @@
   	else :; fi
   
   distdir: $(DISTFILES)
  +	@list='$(MANS)'; if test -n "$$list"; then \
  +	  list=`for p in $$list; do \
  +	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
  +	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
  +	  if test -n "$$list" && \
  +	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
  +	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
  +	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
  +	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
  +	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
  +	    exit 1; \
  +	  else :; fi; \
  +	else :; fi
   	$(am__remove_distdir)
   	test -d $(distdir) || mkdir $(distdir)
   	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
  @@ -1197,7 +1214,8 @@
   	    || exit 1; \
   	  fi; \
   	done
  -	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
  +	-find "$(distdir)" -type d ! -perm -755 \
  +		-exec chmod u+rwx,go+rx {} \; -o \
   	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
   	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
   	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
  @@ -1357,6 +1375,8 @@
   
   html: html-am
   
  +html-am:
  +
   info: info-am
   
   info-am:
  @@ -1367,19 +1387,29 @@
   
   install-dvi: install-dvi-am
   
  +install-dvi-am:
  +
   install-exec-am: install-binPROGRAMS install-binSCRIPTS \
   	install-libLTLIBRARIES
   
   install-html: install-html-am
   
  +install-html-am:
  +
   install-info: install-info-am
   
  +install-info-am:
  +
   install-man: install-man1 install-man3
   
   install-pdf: install-pdf-am
   
  +install-pdf-am:
  +
   install-ps: install-ps-am
   
  +install-ps-am:
  +
   installcheck-am:
   
   maintainer-clean: maintainer-clean-am
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/NEWS
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 NEWS
  --- pcre/NEWS	5 Dec 2009 13:54:02 -0000	1.1.1.3
  +++ pcre/NEWS	21 Aug 2010 21:48:05 -0000	1.1.1.4
  @@ -1,6 +1,30 @@
   News about PCRE releases
   ------------------------
   
  +Release 8.10 25-Jun-2010
  +------------------------
  +
  +There are two major additions: support for (*MARK) and friends, and the option
  +PCRE_UCP, which changes the behaviour of \b, \d, \s, and \w (and their
  +opposites) so that they make use of Unicode properties. There are also a number
  +of lesser new features, and several bugs have been fixed. A new option,
  +--line-buffered, has been added to pcregrep, for use when it is connected to
  +pipes.
  +
  +
  +Release 8.02 19-Mar-2010
  +------------------------
  +
  +Another bug-fix release.
  +
  +
  +Release 8.01 19-Jan-2010
  +------------------------
  +
  +This is a bug-fix release. Several bugs in the code itself and some bugs and
  +infelicities in the build system have been fixed.
  +
  +
   Release 8.00 19-Oct-09
   ----------------------
   
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/NON-UNIX-USE
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 NON-UNIX-USE
  --- pcre/NON-UNIX-USE	5 Dec 2009 13:54:03 -0000	1.1.1.3
  +++ pcre/NON-UNIX-USE	21 Aug 2010 21:48:05 -0000	1.1.1.4
  @@ -127,12 +127,16 @@
        your system has static and shared libraries, you may have to do this once
        for each type.
   
  - (8) Similarly, compile pcreposix.c (remembering -DHAVE_CONFIG_H if necessary)
  -     and link the result (on its own) as the pcreposix library.
  + (8) Similarly, if you want to build the POSIX wrapper functions, ensure that
  +     you have the pcreposix.h file and then compile pcreposix.c (remembering
  +     -DHAVE_CONFIG_H if necessary). Link the result (on its own) as the
  +     pcreposix library.
   
    (9) Compile the test program pcretest.c (again, don't forget -DHAVE_CONFIG_H).
  -     This needs the functions in the pcre and pcreposix libraries when linking.
  -     It also needs the pcre_printint.src source file, which it #includes.
  +     This needs the functions in the PCRE library when linking. It also needs
  +     the pcreposix wrapper functions unless you compile it with -DNOPOSIX. The
  +     pcretest.c program also needs the pcre_printint.src source file, which it
  +     #includes.
   
   (10) Run pcretest on the testinput files in the testdata directory, and check
        that the output matches the corresponding testoutput files. Note that the
  @@ -184,9 +188,9 @@
   LINKING PROGRAMS IN WINDOWS ENVIRONMENTS
   
   If you want to statically link a program against a PCRE library in the form of
  -a non-dll .a file, you must define PCRE_STATIC before including pcre.h,
  -otherwise the pcre_malloc() and pcre_free() exported functions will be declared
  -__declspec(dllimport), with unwanted results.
  +a non-dll .a file, you must define PCRE_STATIC before including pcre.h or
  +pcrecpp.h, otherwise the pcre_malloc() and pcre_free() exported functions will
  +be declared __declspec(dllimport), with unwanted results.
   
   
   CALLING CONVENTIONS IN WINDOWS ENVIRONMENTS
  @@ -273,8 +277,7 @@
   
   The test files that are supplied with PCRE are in Unix format, with LF
   characters as line terminators. It may be necessary to change the line
  -terminators in order to get some of the tests to work. We hope to improve
  -things in this area in future.
  +terminators in order to get some of the tests to work.
   
   
   BUILDING PCRE ON WINDOWS WITH CMAKE
  @@ -494,5 +497,5 @@
   
   
   =========================
  -Last Updated: 05 October 2009
  +Last Updated: 26 May 2010
   ****
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/README
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 README
  --- pcre/README	5 Dec 2009 13:53:58 -0000	1.1.1.3
  +++ pcre/README	21 Aug 2010 21:48:04 -0000	1.1.1.4
  @@ -311,10 +311,10 @@
   . RunTest is a script for running tests on the basic C library
   . RunGrepTest is a script for running tests on the pcregrep command
   
  -Versions of config.h and pcre.h are distributed in the PCRE tarballs under
  -the names config.h.generic and pcre.h.generic. These are provided for the
  -benefit of those who have to built PCRE without the benefit of "configure". If
  -you use "configure", the .generic versions are not used.
  +Versions of config.h and pcre.h are distributed in the PCRE tarballs under the
  +names config.h.generic and pcre.h.generic. These are provided for those who
  +have to built PCRE without using "configure" or CMake. If you use "configure"
  +or CMake, the .generic versions are not used.
   
   If a C++ compiler is found, the following files are also built:
   
  @@ -796,4 +796,4 @@
   Philip Hazel
   Email local part: ph10
   Email domain: cam.ac.uk
  -Last updated: 19 October 2009
  +Last updated: 19 January 2010
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/RunTest
  ============================================================================
  $ cvs diff -u -r1.1.1.2 -r1.1.1.3 RunTest
  --- pcre/RunTest	5 Dec 2009 13:54:01 -0000	1.1.1.2
  +++ pcre/RunTest	21 Aug 2010 21:48:05 -0000	1.1.1.3
  @@ -133,10 +133,10 @@
   echo PCRE C library tests
   ./pcretest /dev/null
   
  -# Primary test, Perl-compatible for both 5.8 and 5.10
  +# Primary test, compatible with Perl 5.8, 5.10, 5.11
   
   if [ $do1 = yes ] ; then
  -  echo "Test 1: main functionality (Perl 5.8 & 5.10 compatible)"
  +  echo "Test 1: main functionality (Perl 5.8, 5.10, 5.11 compatible)"
     $valgrind ./pcretest -q $testdata/testinput1 testtry
     if [ $? = 0 ] ; then
       $cf $testdata/testoutput1 testtry
  @@ -215,7 +215,7 @@
   # Additional tests for UTF8 support
   
   if [ $do4 = yes ] ; then
  -  echo "Test 4: UTF-8 support (Perl 5.8 & 5.10 compatible)"
  +  echo "Test 4: UTF-8 support (Perl 5.8, 5.10, 5.11 compatible)"
     $valgrind ./pcretest -q $testdata/testinput4 testtry
     if [ $? = 0 ] ; then
       $cf $testdata/testoutput4 testtry
  @@ -237,7 +237,7 @@
   fi
   
   if [ $do6 = yes ] ; then
  -  echo "Test 6: Unicode property support (Perl 5.10 compatible)"
  +  echo "Test 6: Unicode property support (Perl 5.10, 5.11 compatible)"
     $valgrind ./pcretest -q $testdata/testinput6 testtry
     if [ $? = 0 ] ; then
       $cf $testdata/testoutput6 testtry
  @@ -299,10 +299,10 @@
     echo "OK"
   fi
   
  -# Test of Perl 5.10 features
  +# Test of Perl 5.10, 5.11 features
   
   if [ $do11 = yes ] ; then
  -  echo "Test 11: Perl 5.10 features"
  +  echo "Test 11: Perl 5.10, 5.11 features"
     $valgrind ./pcretest -q $testdata/testinput11 testtry
     if [ $? = 0 ] ; then
       $cf $testdata/testoutput11 testtry
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/aclocal.m4
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 aclocal.m4
  --- pcre/aclocal.m4	5 Dec 2009 13:54:02 -0000	1.1.1.3
  +++ pcre/aclocal.m4	21 Aug 2010 21:48:05 -0000	1.1.1.4
  @@ -1,7 +1,7 @@
  -# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
  +# generated automatically by aclocal 1.10.3 -*- Autoconf -*-
   
   # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
  -# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
  +# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
   # This file is free software; the Free Software Foundation
   # gives unlimited permission to copy and/or distribute it,
   # with or without modifications, as long as this notice is preserved.
  @@ -13,8 +13,8 @@
   
   m4_ifndef([AC_AUTOCONF_VERSION],
     [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
  -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
  -[m4_warning([this file was generated for autoconf 2.63.
  +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
  +[m4_warning([this file was generated for autoconf 2.65.
   You have another version of autoconf.  It may work, but is not guaranteed to.
   If you have problems, you may need to regenerate the build system entirely.
   To do so, use the procedure documented by the package, typically `autoreconf'.])])
  @@ -7872,15 +7872,15 @@
   
   # Generated from ltversion.in.
   
  -# serial 3012 ltversion.m4
  +# serial 3017 ltversion.m4
   # This file is part of GNU Libtool
   
  -m4_define([LT_PACKAGE_VERSION], [2.2.6])
  -m4_define([LT_PACKAGE_REVISION], [1.3012])
  +m4_define([LT_PACKAGE_VERSION], [2.2.6b])
  +m4_define([LT_PACKAGE_REVISION], [1.3017])
   
   AC_DEFUN([LTVERSION_VERSION],
  -[macro_version='2.2.6'
  -macro_revision='1.3012'
  +[macro_version='2.2.6b'
  +macro_revision='1.3017'
   _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
   _LT_DECL(, macro_revision, 0)
   ])
  @@ -7993,7 +7993,7 @@
   [am__api_version='1.10'
   dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
   dnl require some minimum version.  Point them to the right macro.
  -m4_if([$1], [1.10.2], [],
  +m4_if([$1], [1.10.3], [],
         [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
   ])
   
  @@ -8009,7 +8009,7 @@
   # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
   # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
   AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
  -[AM_AUTOMAKE_VERSION([1.10.2])dnl
  +[AM_AUTOMAKE_VERSION([1.10.3])dnl
   m4_ifndef([AC_AUTOCONF_VERSION],
     [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
   _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
  @@ -8102,14 +8102,14 @@
   Usually this means the macro was only invoked conditionally.]])
   fi])])
   
  -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
  +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
   # Free Software Foundation, Inc.
   #
   # This file is free software; the Free Software Foundation
   # gives unlimited permission to copy and/or distribute it,
   # with or without modifications, as long as this notice is preserved.
   
  -# serial 9
  +# serial 10
   
   # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
   # written in clear, in which case automake, when reading aclocal.m4,
  @@ -8166,6 +8166,16 @@
     if test "$am_compiler_list" = ""; then
        am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
     fi
  +  am__universal=false
  +  m4_case([$1], [CC],
  +    [case " $depcc " in #(
  +     *\ -arch\ *\ -arch\ *) am__universal=true ;;
  +     esac],
  +    [CXX],
  +    [case " $depcc " in #(
  +     *\ -arch\ *\ -arch\ *) am__universal=true ;;
  +     esac])
  +
     for depmode in $am_compiler_list; do
       # Setup a source with many dependencies, because some compilers
       # like to wrap large dependency lists on column 80 (with \), and
  @@ -8183,7 +8193,17 @@
       done
       echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
   
  +    # We check with `-c' and `-o' for the sake of the "dashmstdout"
  +    # mode.  It turns out that the SunPro C++ compiler does not properly
  +    # handle `-M -o', and we need to detect this.  Also, some Intel
  +    # versions had trouble with output in subdirs
  +    am__obj=sub/conftest.${OBJEXT-o}
  +    am__minus_obj="-o $am__obj"
       case $depmode in
  +    gcc)
  +      # This depmode causes a compiler race in universal mode.
  +      test "$am__universal" = false || continue
  +      ;;
       nosideeffect)
         # after this tag, mechanisms are not by side-effect, so they'll
         # only be used when explicitly requested
  @@ -8193,19 +8213,23 @@
   	break
         fi
         ;;
  +    msvisualcpp | msvcmsys)
  +      # This compiler won't grok `-c -o', but also, the minuso test has
  +      # not run yet.  These depmodes are late enough in the game, and
  +      # so weak that their functioning should not be impacted.
  +      am__obj=conftest.${OBJEXT-o}
  +      am__minus_obj=
  +      ;;
       none) break ;;
       esac
  -    # We check with `-c' and `-o' for the sake of the "dashmstdout"
  -    # mode.  It turns out that the SunPro C++ compiler does not properly
  -    # handle `-M -o', and we need to detect this.
       if depmode=$depmode \
  -       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
  +       source=sub/conftest.c object=$am__obj \
          depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
  -       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
  +       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
            >/dev/null 2>conftest.err &&
          grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
          grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
  -       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
  +       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
          ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
         # icc doesn't choke on unknown options, it will just issue warnings
         # or remarks (even with -Werror).  So we grep stderr for any message
  @@ -8269,59 +8293,61 @@
   # gives unlimited permission to copy and/or distribute it,
   # with or without modifications, as long as this notice is preserved.
   
  -#serial 4
  +#serial 5
   
   # _AM_OUTPUT_DEPENDENCY_COMMANDS
   # ------------------------------
   AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
  -[# Autoconf 2.62 quotes --file arguments for eval, but not when files
  -# are listed without --file.  Let's play safe and only enable the eval
  -# if we detect the quoting.
  -case $CONFIG_FILES in
  -*\'*) eval set x "$CONFIG_FILES" ;;
  -*)   set x $CONFIG_FILES ;;
  -esac
  -shift
  -for mf
  -do
  -  # Strip MF so we end up with the name of the file.
  -  mf=`echo "$mf" | sed -e 's/:.*$//'`
  -  # Check whether this is an Automake generated Makefile or not.
  -  # We used to match only the files named `Makefile.in', but
  -  # some people rename them; so instead we look at the file content.
  -  # Grep'ing the first line is not enough: some people post-process
  -  # each Makefile.in and add a new line on top of each file to say so.
  -  # Grep'ing the whole file is not good either: AIX grep has a line
  -  # limit of 2048, but all sed's we know have understand at least 4000.
  -  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
  -    dirpart=`AS_DIRNAME("$mf")`
  -  else
  -    continue
  -  fi
  -  # Extract the definition of DEPDIR, am__include, and am__quote
  -  # from the Makefile without running `make'.
  -  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
  -  test -z "$DEPDIR" && continue
  -  am__include=`sed -n 's/^am__include = //p' < "$mf"`
  -  test -z "am__include" && continue
  -  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
  -  # When using ansi2knr, U may be empty or an underscore; expand it
  -  U=`sed -n 's/^U = //p' < "$mf"`
  -  # Find all dependency output files, they are included files with
  -  # $(DEPDIR) in their names.  We invoke sed twice because it is the
  -  # simplest approach to changing $(DEPDIR) to its actual value in the
  -  # expansion.
  -  for file in `sed -n "
  -    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
  -       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
  -    # Make sure the directory exists.
  -    test -f "$dirpart/$file" && continue
  -    fdir=`AS_DIRNAME(["$file"])`
  -    AS_MKDIR_P([$dirpart/$fdir])
  -    # echo "creating $dirpart/$file"
  -    echo '# dummy' > "$dirpart/$file"
  +[{
  +  # Autoconf 2.62 quotes --file arguments for eval, but not when files
  +  # are listed without --file.  Let's play safe and only enable the eval
  +  # if we detect the quoting.
  +  case $CONFIG_FILES in
  +  *\'*) eval set x "$CONFIG_FILES" ;;
  +  *)   set x $CONFIG_FILES ;;
  +  esac
  +  shift
  +  for mf
  +  do
  +    # Strip MF so we end up with the name of the file.
  +    mf=`echo "$mf" | sed -e 's/:.*$//'`
  +    # Check whether this is an Automake generated Makefile or not.
  +    # We used to match only the files named `Makefile.in', but
  +    # some people rename them; so instead we look at the file content.
  +    # Grep'ing the first line is not enough: some people post-process
  +    # each Makefile.in and add a new line on top of each file to say so.
  +    # Grep'ing the whole file is not good either: AIX grep has a line
  +    # limit of 2048, but all sed's we know have understand at least 4000.
  +    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
  +      dirpart=`AS_DIRNAME("$mf")`
  +    else
  +      continue
  +    fi
  +    # Extract the definition of DEPDIR, am__include, and am__quote
  +    # from the Makefile without running `make'.
  +    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
  +    test -z "$DEPDIR" && continue
  +    am__include=`sed -n 's/^am__include = //p' < "$mf"`
  +    test -z "am__include" && continue
  +    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
  +    # When using ansi2knr, U may be empty or an underscore; expand it
  +    U=`sed -n 's/^U = //p' < "$mf"`
  +    # Find all dependency output files, they are included files with
  +    # $(DEPDIR) in their names.  We invoke sed twice because it is the
  +    # simplest approach to changing $(DEPDIR) to its actual value in the
  +    # expansion.
  +    for file in `sed -n "
  +      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
  +	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
  +      # Make sure the directory exists.
  +      test -f "$dirpart/$file" && continue
  +      fdir=`AS_DIRNAME(["$file"])`
  +      AS_MKDIR_P([$dirpart/$fdir])
  +      # echo "creating $dirpart/$file"
  +      echo '# dummy' > "$dirpart/$file"
  +    done
     done
  -done
  +}
   ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
   
   
  @@ -8341,7 +8367,7 @@
   # Do all the work for Automake.                             -*- Autoconf -*-
   
   # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
  -# 2005, 2006, 2008 Free Software Foundation, Inc.
  +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
   #
   # This file is free software; the Free Software Foundation
   # gives unlimited permission to copy and/or distribute it,
  @@ -8415,8 +8441,8 @@
   AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
   AM_MISSING_PROG(AUTOHEADER, autoheader)
   AM_MISSING_PROG(MAKEINFO, makeinfo)
  -AM_PROG_INSTALL_SH
  -AM_PROG_INSTALL_STRIP
  +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
  +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
   AC_REQUIRE([AM_PROG_MKDIR_P])dnl
   # We need awk for the "check" target.  The system "awk" is bad on
   # some platforms.
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/config.guess
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 config.guess
  --- pcre/config.guess	5 Dec 2009 13:54:03 -0000	1.1.1.3
  +++ pcre/config.guess	21 Aug 2010 21:48:05 -0000	1.1.1.4
  @@ -1,10 +1,10 @@
   #! /bin/sh
   # Attempt to guess a canonical system name.
   #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  -#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
  +#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
   #   Free Software Foundation, Inc.
   
  -timestamp='2009-02-03'
  +timestamp='2009-12-30'
   
   # This file is free software; you can redistribute it and/or modify it
   # under the terms of the GNU General Public License as published by
  @@ -27,16 +27,16 @@
   # the same distribution terms that you use for the rest of that program.
   
   
  -# Originally written by Per Bothner <per@bothner.com>.
  -# Please send patches to <config-patches@gnu.org>.  Submit a context
  -# diff and a properly formatted ChangeLog entry.
  +# Originally written by Per Bothner.  Please send patches (context
  +# diff format) to <config-patches@gnu.org> and include a ChangeLog
  +# entry.
   #
   # This script attempts to guess a canonical system name similar to
   # config.sub.  If it succeeds, it prints the system name on stdout, and
   # exits with 0.  Otherwise, it exits with 1.
   #
  -# The plan is that this can be called by configure scripts if you
  -# don't specify an explicit build system type.
  +# You can get the latest version of this script from:
  +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
   
   me=`echo "$0" | sed -e 's,.*/,,'`
   
  @@ -56,8 +56,9 @@
   GNU config.guess ($timestamp)
   
   Originally written by Per Bothner.
  -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
  -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
  +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
  +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
  +Software Foundation, Inc.
   
   This is free software; see the source for copying conditions.  There is NO
   warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
  @@ -139,9 +140,10 @@
   UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
   UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
   
  -if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
  +case "${UNAME_SYSTEM}" in
  +Linux|GNU/*)
   	eval $set_cc_for_build
  -	cat << EOF > $dummy.c
  +	cat <<-EOF > $dummy.c
   	#include <features.h>
   	#ifdef __UCLIBC__
   	# ifdef __UCLIBC_CONFIG_VERSION__
  @@ -150,11 +152,16 @@
   	LIBC=uclibc
   	# endif
   	#else
  +	# ifdef __dietlibc__
  +	LIBC=dietlibc
  +	# else
   	LIBC=gnu
  +	# endif
   	#endif
  -EOF
  -	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
  -fi
  +	EOF
  +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
  +	;;
  +esac
   
   # Note: order is significant - the case branches are not exclusive.
   
  @@ -187,7 +194,7 @@
   	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
   		eval $set_cc_for_build
   		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
  -			| grep __ELF__ >/dev/null
  +			| grep -q __ELF__
   		then
   		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
   		    # Return netbsd for either.  FIX?
  @@ -341,12 +348,18 @@
   	case `/usr/bin/uname -p` in
   	    sparc) echo sparc-icl-nx7; exit ;;
   	esac ;;
  +    s390x:SunOS:*:*)
  +	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  +	exit ;;
       sun4H:SunOS:5.*:*)
   	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   	exit ;;
       sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
   	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   	exit ;;
  +    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
  +	echo i386-pc-auroraux${UNAME_RELEASE}
  +	exit ;;
       i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
   	eval $set_cc_for_build
   	SUN_ARCH="i386"
  @@ -670,7 +683,7 @@
   	    # => hppa64-hp-hpux11.23
   
   	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
  -		grep __LP64__ >/dev/null
  +		grep -q __LP64__
   	    then
   		HP_ARCH="hppa2.0w"
   	    else
  @@ -821,12 +834,12 @@
       i*:PW*:*)
   	echo ${UNAME_MACHINE}-pc-pw32
   	exit ;;
  -    *:Interix*:[3456]*)
  +    *:Interix*:*)
       	case ${UNAME_MACHINE} in
   	    x86)
   		echo i586-pc-interix${UNAME_RELEASE}
   		exit ;;
  -	    EM64T | authenticamd | genuineintel)
  +	    authenticamd | genuineintel | EM64T)
   		echo x86_64-unknown-interix${UNAME_RELEASE}
   		exit ;;
   	    IA64)
  @@ -836,6 +849,9 @@
       [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
   	echo i${UNAME_MACHINE}-pc-mks
   	exit ;;
  +    8664:Windows_NT:*)
  +	echo x86_64-pc-mks
  +	exit ;;
       i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
   	# How do we know it's Interix rather than the generic POSIX subsystem?
   	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
  @@ -856,15 +872,29 @@
   	exit ;;
       *:GNU:*:*)
   	# the GNU system
  -	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
  +	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
   	exit ;;
       *:GNU/*:*:*)
   	# other systems with GNU libc and userland
  -	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
  +	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
   	exit ;;
       i*86:Minix:*:*)
   	echo ${UNAME_MACHINE}-pc-minix
   	exit ;;
  +    alpha:Linux:*:*)
  +	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
  +	  EV5)   UNAME_MACHINE=alphaev5 ;;
  +	  EV56)  UNAME_MACHINE=alphaev56 ;;
  +	  PCA56) UNAME_MACHINE=alphapca56 ;;
  +	  PCA57) UNAME_MACHINE=alphapca56 ;;
  +	  EV6)   UNAME_MACHINE=alphaev6 ;;
  +	  EV67)  UNAME_MACHINE=alphaev67 ;;
  +	  EV68*) UNAME_MACHINE=alphaev68 ;;
  +        esac
  +	objdump --private-headers /bin/sh | grep -q ld.so.1
  +	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
  +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  +	exit ;;
       arm*:Linux:*:*)
   	eval $set_cc_for_build
   	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
  @@ -887,6 +917,9 @@
       frv:Linux:*:*)
       	echo frv-unknown-linux-${LIBC}
   	exit ;;
  +    i*86:Linux:*:*)
  +	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
  +	exit ;;
       ia64:Linux:*:*)
   	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   	exit ;;
  @@ -896,77 +929,33 @@
       m68*:Linux:*:*)
   	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   	exit ;;
  -    mips:Linux:*:*)
  -	eval $set_cc_for_build
  -	sed 's/^	//' << EOF >$dummy.c
  -	#undef CPU
  -	#undef mips
  -	#undef mipsel
  -	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
  -	CPU=mipsel
  -	#else
  -	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
  -	CPU=mips
  -	#else
  -	CPU=
  -	#endif
  -	#endif
  -EOF
  -	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
  -	    /^CPU/{
  -		s: ::g
  -		p
  -	    }'`"
  -	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
  -	;;
  -    mips64:Linux:*:*)
  +    mips:Linux:*:* | mips64:Linux:*:*)
   	eval $set_cc_for_build
   	sed 's/^	//' << EOF >$dummy.c
   	#undef CPU
  -	#undef mips64
  -	#undef mips64el
  +	#undef ${UNAME_MACHINE}
  +	#undef ${UNAME_MACHINE}el
   	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
  -	CPU=mips64el
  +	CPU=${UNAME_MACHINE}el
   	#else
   	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
  -	CPU=mips64
  +	CPU=${UNAME_MACHINE}
   	#else
   	CPU=
   	#endif
   	#endif
   EOF
  -	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
  -	    /^CPU/{
  -		s: ::g
  -		p
  -	    }'`"
  +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
   	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
   	;;
       or32:Linux:*:*)
   	echo or32-unknown-linux-${LIBC}
   	exit ;;
  -    ppc:Linux:*:*)
  -	echo powerpc-unknown-linux-${LIBC}
  -	exit ;;
  -    ppc64:Linux:*:*)
  -	echo powerpc64-unknown-linux-${LIBC}
  -	exit ;;
  -    alpha:Linux:*:*)
  -	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
  -	  EV5)   UNAME_MACHINE=alphaev5 ;;
  -	  EV56)  UNAME_MACHINE=alphaev56 ;;
  -	  PCA56) UNAME_MACHINE=alphapca56 ;;
  -	  PCA57) UNAME_MACHINE=alphapca56 ;;
  -	  EV6)   UNAME_MACHINE=alphaev6 ;;
  -	  EV67)  UNAME_MACHINE=alphaev67 ;;
  -	  EV68*) UNAME_MACHINE=alphaev68 ;;
  -        esac
  -	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
  -	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
  -	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  -	exit ;;
       padre:Linux:*:*)
  -	echo sparc-unknown-linux-gnu
  +	echo sparc-unknown-linux-${LIBC}
  +	exit ;;
  +    parisc64:Linux:*:* | hppa64:Linux:*:*)
  +	echo hppa64-unknown-linux-${LIBC}
   	exit ;;
       parisc:Linux:*:* | hppa:Linux:*:*)
   	# Look for CPU level
  @@ -976,8 +965,11 @@
   	  *)    echo hppa-unknown-linux-${LIBC} ;;
   	esac
   	exit ;;
  -    parisc64:Linux:*:* | hppa64:Linux:*:*)
  -	echo hppa64-unknown-linux-${LIBC}
  +    ppc64:Linux:*:*)
  +	echo powerpc64-unknown-linux-${LIBC}
  +	exit ;;
  +    ppc:Linux:*:*)
  +	echo powerpc-unknown-linux-${LIBC}
   	exit ;;
       s390:Linux:*:* | s390x:Linux:*:*)
   	echo ${UNAME_MACHINE}-ibm-linux
  @@ -1000,68 +992,6 @@
       xtensa*:Linux:*:*)
       	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   	exit ;;
  -    i*86:Linux:*:*)
  -	# The BFD linker knows what the default object file format is, so
  -	# first see if it will tell us. cd to the root directory to prevent
  -	# problems with other programs or directories called `ld' in the path.
  -	# Set LC_ALL=C to ensure ld outputs messages in English.
  -	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
  -			 | sed -ne '/supported targets:/!d
  -				    s/[ 	][ 	]*/ /g
  -				    s/.*supported targets: *//
  -				    s/ .*//
  -				    p'`
  -        case "$ld_supported_targets" in
  -	  elf32-i386)
  -		TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
  -		;;
  -	  a.out-i386-linux)
  -		echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
  -		exit ;;
  -	  "")
  -		# Either a pre-BFD a.out linker (linux-gnuoldld) or
  -		# one that does not give us useful --help.
  -		echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
  -		exit ;;
  -	esac
  -	# This should get integrated into the C code below, but now we hack
  -	if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
  -	# Determine whether the default compiler is a.out or elf
  -	eval $set_cc_for_build
  -	sed 's/^	//' << EOF >$dummy.c
  -	#include <features.h>
  -	#ifdef __ELF__
  -	# ifdef __GLIBC__
  -	#  if __GLIBC__ >= 2
  -	LIBC=gnu
  -	#  else
  -	LIBC=gnulibc1
  -	#  endif
  -	# else
  -	LIBC=gnulibc1
  -	# endif
  -	#else
  -	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
  -	LIBC=gnu
  -	#else
  -	LIBC=gnuaout
  -	#endif
  -	#endif
  -	#ifdef __dietlibc__
  -	LIBC=dietlibc
  -	#endif
  -EOF
  -	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
  -	    /^LIBC/{
  -		s: ::g
  -		p
  -	    }'`"
  -	test x"${LIBC}" != x && {
  -		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
  -		exit
  -	}
  -	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
  -	;;
       i*86:DYNIX/ptx:4*:*)
   	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
   	# earlier versions are messed up and put the nodename in both
  @@ -1090,7 +1020,7 @@
       i*86:syllable:*:*)
   	echo ${UNAME_MACHINE}-pc-syllable
   	exit ;;
  -    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
  +    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
   	echo i386-unknown-lynxos${UNAME_RELEASE}
   	exit ;;
       i*86:*DOS:*:*)
  @@ -1134,8 +1064,11 @@
       pc:*:*:*)
   	# Left here for compatibility:
           # uname -m prints for DJGPP always 'pc', but it prints nothing about
  -        # the processor, so we play safe by assuming i386.
  -	echo i386-pc-msdosdjgpp
  +        # the processor, so we play safe by assuming i586.
  +	# Note: whatever this is, it MUST be the same as what config.sub
  +	# prints for the "djgpp" host, or else GDB configury will decide that
  +	# this is a cross-build.
  +	echo i586-pc-msdosdjgpp
           exit ;;
       Intel:Mach:3*:*)
   	echo i386-pc-mach3
  @@ -1195,7 +1128,7 @@
       rs6000:LynxOS:2.*:*)
   	echo rs6000-unknown-lynxos${UNAME_RELEASE}
   	exit ;;
  -    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
  +    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
   	echo powerpc-unknown-lynxos${UNAME_RELEASE}
   	exit ;;
       SM[BE]S:UNIX_SV:*:*)
  @@ -1288,6 +1221,16 @@
       *:Darwin:*:*)
   	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
   	case $UNAME_PROCESSOR in
  +	    i386)
  +		eval $set_cc_for_build
  +		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
  +		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
  +		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
  +		      grep IS_64BIT_ARCH >/dev/null
  +		  then
  +		      UNAME_PROCESSOR="x86_64"
  +		  fi
  +		fi ;;
   	    unknown) UNAME_PROCESSOR=powerpc ;;
   	esac
   	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/config.h.generic
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 config.h.generic
  --- pcre/config.h.generic	5 Dec 2009 13:53:53 -0000	1.1.1.3
  +++ pcre/config.h.generic	21 Aug 2010 21:48:05 -0000	1.1.1.4
  @@ -123,10 +123,13 @@
   #define HAVE_STRING_H 1
   #endif
   
  -/* Define to 1 if you have the `strtoll' function. */
  +/* Define to 1 if you have `strtoimax'. */
  +/* #undef HAVE_STRTOIMAX */
  +
  +/* Define to 1 if you have `strtoll'. */
   /* #undef HAVE_STRTOLL */
   
  -/* Define to 1 if you have the `strtoq' function. */
  +/* Define to 1 if you have `strtoq'. */
   #ifndef HAVE_STRTOQ
   #define HAVE_STRTOQ 1
   #endif
  @@ -162,7 +165,7 @@
   #define HAVE_ZLIB_H 1
   #endif
   
  -/* Define to 1 if you have the `_strtoi64' function. */
  +/* Define to 1 if you have `_strtoi64'. */
   /* #undef HAVE__STRTOI64 */
   
   /* The value of LINK_SIZE determines the number of bytes used to store links
  @@ -247,13 +250,16 @@
   #define PACKAGE_NAME "PCRE"
   
   /* Define to the full name and version of this package. */
  -#define PACKAGE_STRING "PCRE 8.00"
  +#define PACKAGE_STRING "PCRE 8.10"
   
   /* Define to the one symbol short name of this package. */
   #define PACKAGE_TARNAME "pcre"
   
  +/* Define to the home page for this package. */
  +#define PACKAGE_URL ""
  +
   /* Define to the version of this package. */
  -#define PACKAGE_VERSION "8.00"
  +#define PACKAGE_VERSION "8.10"
   
   
   /* If you are compiling for a system other than a Unix-like system or
  @@ -309,11 +315,15 @@
   
   /* Version number of package */
   #ifndef VERSION
  -#define VERSION "8.00"
  +#define VERSION "8.10"
   #endif
   
   /* Define to empty if `const' does not conform to ANSI C. */
   /* #undef const */
   
  +/* Define to the type of a signed integer type of width exactly 64 bits if
  +   such a type exists and the standard includes do not define it. */
  +/* #undef int64_t */
  +
   /* Define to `unsigned int' if <sys/types.h> does not define. */
   /* #undef size_t */
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/config.h.in
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 config.h.in
  --- pcre/config.h.in	5 Dec 2009 13:54:00 -0000	1.1.1.3
  +++ pcre/config.h.in	21 Aug 2010 21:48:05 -0000	1.1.1.4
  @@ -88,10 +88,13 @@
   /* Define to 1 if you have the <string.h> header file. */
   #undef HAVE_STRING_H
   
  -/* Define to 1 if you have the `strtoll' function. */
  +/* Define to 1 if you have `strtoimax'. */
  +#undef HAVE_STRTOIMAX
  +
  +/* Define to 1 if you have `strtoll'. */
   #undef HAVE_STRTOLL
   
  -/* Define to 1 if you have the `strtoq' function. */
  +/* Define to 1 if you have `strtoq'. */
   #undef HAVE_STRTOQ
   
   /* Define to 1 if you have the <sys/stat.h> header file. */
  @@ -115,7 +118,7 @@
   /* Define to 1 if you have the <zlib.h> header file. */
   #undef HAVE_ZLIB_H
   
  -/* Define to 1 if you have the `_strtoi64' function. */
  +/* Define to 1 if you have `_strtoi64'. */
   #undef HAVE__STRTOI64
   
   /* The value of LINK_SIZE determines the number of bytes used to store links
  @@ -191,6 +194,9 @@
   /* Define to the one symbol short name of this package. */
   #undef PACKAGE_TARNAME
   
  +/* Define to the home page for this package. */
  +#undef PACKAGE_URL
  +
   /* Define to the version of this package. */
   #undef PACKAGE_VERSION
   
  @@ -248,5 +254,9 @@
   /* Define to empty if `const' does not conform to ANSI C. */
   #undef const
   
  +/* Define to the type of a signed integer type of width exactly 64 bits if
  +   such a type exists and the standard includes do not define it. */
  +#undef int64_t
  +
   /* Define to `unsigned int' if <sys/types.h> does not define. */
   #undef size_t
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/config.sub
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 config.sub
  --- pcre/config.sub	5 Dec 2009 13:54:00 -0000	1.1.1.3
  +++ pcre/config.sub	21 Aug 2010 21:48:05 -0000	1.1.1.4
  @@ -1,10 +1,10 @@
   #! /bin/sh
   # Configuration validation subroutine script.
   #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  -#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
  +#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
   #   Free Software Foundation, Inc.
   
  -timestamp='2009-02-03'
  +timestamp='2010-01-22'
   
   # This file is (in principle) common to ALL GNU software.
   # The presence of a machine in this file suggests that SOME GNU software
  @@ -32,13 +32,16 @@
   
   
   # Please send patches to <config-patches@gnu.org>.  Submit a context
  -# diff and a properly formatted ChangeLog entry.
  +# diff and a properly formatted GNU ChangeLog entry.
   #
   # Configuration subroutine to validate and canonicalize a configuration type.
   # Supply the specified configuration type as an argument.
   # If it is invalid, we print an error message on stderr and exit with code 1.
   # Otherwise, we print the canonical config type on stdout and succeed.
   
  +# You can get the latest version of this script from:
  +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
  +
   # This file is supposed to be the same for all GNU packages
   # and recognize all the CPU types, system types and aliases
   # that are meaningful with *any* GNU software.
  @@ -72,8 +75,9 @@
   version="\
   GNU config.sub ($timestamp)
   
  -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
  -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
  +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
  +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
  +Software Foundation, Inc.
   
   This is free software; see the source for copying conditions.  There is NO
   warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
  @@ -149,10 +153,13 @@
   	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
   	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
   	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
  -	-apple | -axis | -knuth | -cray)
  +	-apple | -axis | -knuth | -cray | -microblaze)
   		os=
   		basic_machine=$1
   		;;
  +        -bluegene*)
  +	        os=-cnk
  +		;;
   	-sim | -cisco | -oki | -wec | -winbond)
   		os=
   		basic_machine=$1
  @@ -272,6 +279,7 @@
   	| mipsisa64sr71k | mipsisa64sr71kel \
   	| mipstx39 | mipstx39el \
   	| mn10200 | mn10300 \
  +	| moxie \
   	| mt \
   	| msp430 \
   	| nios | nios2 \
  @@ -280,6 +288,7 @@
   	| pdp10 | pdp11 | pj | pjl \
   	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
   	| pyramid \
  +	| rx \
   	| score \
   	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
   	| sh64 | sh64le \
  @@ -287,13 +296,14 @@
   	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
   	| spu | strongarm \
   	| tahoe | thumb | tic4x | tic80 | tron \
  +	| ubicom32 \
   	| v850 | v850e \
   	| we32k \
   	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
   	| z8k | z80)
   		basic_machine=$basic_machine-unknown
   		;;
  -	m6811 | m68hc11 | m6812 | m68hc12)
  +	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
   		# Motorola 68HC11/12.
   		basic_machine=$basic_machine-unknown
   		os=-none
  @@ -336,7 +346,7 @@
   	| lm32-* \
   	| m32c-* | m32r-* | m32rle-* \
   	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
  -	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
  +	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
   	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
   	| mips16-* \
   	| mips64-* | mips64el-* \
  @@ -364,15 +374,17 @@
   	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
   	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
   	| pyramid-* \
  -	| romp-* | rs6000-* \
  +	| romp-* | rs6000-* | rx-* \
   	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
   	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
   	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
   	| sparclite-* \
   	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
   	| tahoe-* | thumb-* \
  -	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
  +	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
  +	| tile-* | tilegx-* \
   	| tron-* \
  +	| ubicom32-* \
   	| v850-* | v850e-* | vax-* \
   	| we32k-* \
   	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
  @@ -466,6 +478,10 @@
   		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
   		os=-linux
   		;;
  +	bluegene*)
  +		basic_machine=powerpc-ibm
  +		os=-cnk
  +		;;
   	c90)
   		basic_machine=c90-cray
   		os=-unicos
  @@ -718,6 +734,9 @@
   		basic_machine=ns32k-utek
   		os=-sysv
   		;;
  +        microblaze)
  +		basic_machine=microblaze-xilinx
  +		;;
   	mingw32)
   		basic_machine=i386-pc
   		os=-mingw32
  @@ -1086,6 +1105,11 @@
   		basic_machine=tic6x-unknown
   		os=-coff
   		;;
  +        # This must be matched before tile*.
  +        tilegx*)
  +		basic_machine=tilegx-unknown
  +		os=-linux-gnu
  +		;;
   	tile*)
   		basic_machine=tile-unknown
   		os=-linux-gnu
  @@ -1257,6 +1281,9 @@
           # First match some system type aliases
           # that might get confused with valid system types.
   	# -solaris* is a basic system type, with this one exception.
  +        -auroraux)
  +	        os=-auroraux
  +		;;
   	-solaris1 | -solaris1.*)
   		os=`echo $os | sed -e 's|solaris1|sunos4|'`
   		;;
  @@ -1277,9 +1304,9 @@
   	# Each alternative MUST END IN A *, to match a version number.
   	# -sysv* is not here because it comes later, after sysvr4.
   	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
  -	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
  -	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
  -	      | -kopensolaris* \
  +	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
  +	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
  +	      | -sym* | -kopensolaris* \
   	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
   	      | -aos* | -aros* \
   	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  @@ -1296,11 +1323,11 @@
   	      | -uxpv* | -beos* | -mpeix* | -udk* \
   	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
   	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
  -	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
  +	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
   	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
   	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
   	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
  -	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*)
  +	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
   	# Remember, each alternative MUST END IN *, to match a version number.
   		;;
   	-qnx*)
  @@ -1433,6 +1460,8 @@
   	-dicos*)
   		os=-dicos
   		;;
  +        -nacl*)
  +	        ;;
   	-none)
   		;;
   	*)
  @@ -1630,7 +1659,7 @@
   			-sunos*)
   				vendor=sun
   				;;
  -			-aix*)
  +			-cnk*|-aix*)
   				vendor=ibm
   				;;
   			-beos*)
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/configure
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 configure
  --- pcre/configure	5 Dec 2009 13:53:57 -0000	1.1.1.3
  +++ pcre/configure	21 Aug 2010 21:48:05 -0000	1.1.1.4
  @@ -1,18 +1,22 @@
   #! /bin/sh
   # Guess values for system-dependent variables and create Makefiles.
  -# Generated by GNU Autoconf 2.63 for PCRE 8.00.
  +# Generated by GNU Autoconf 2.65 for PCRE 8.10.
  +#
   #
   # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
  -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
  +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
  +# Inc.
  +#
  +#
   # This configure script is free software; the Free Software Foundation
   # gives unlimited permission to copy, distribute and modify it.
  -## --------------------- ##
  -## M4sh Initialization.  ##
  -## --------------------- ##
  +## -------------------- ##
  +## M4sh Initialization. ##
  +## -------------------- ##
   
   # Be more Bourne compatible
   DUALCASE=1; export DUALCASE # for MKS sh
  -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
  +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
     emulate sh
     NULLCMD=:
     # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
  @@ -20,23 +24,15 @@
     alias -g '${1+"$@"}'='"$@"'
     setopt NO_GLOB_SUBST
   else
  -  case `(set -o) 2>/dev/null` in
  -  *posix*) set -o posix ;;
  +  case `(set -o) 2>/dev/null` in #(
  +  *posix*) :
  +    set -o posix ;; #(
  +  *) :
  +     ;;
   esac
  -
   fi
   
   
  -
  -
  -# PATH needs CR
  -# Avoid depending upon Character Ranges.
  -as_cr_letters='abcdefghijklmnopqrstuvwxyz'
  -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
  -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
  -as_cr_digits='0123456789'
  -as_cr_alnum=$as_cr_Letters$as_cr_digits
  -
   as_nl='
   '
   export as_nl
  @@ -44,7 +40,13 @@
   as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
   as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
   as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
  -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
  +# Prefer a ksh shell builtin over an external printf program on Solaris,
  +# but without wasting forks for bash or zsh.
  +if test -z "$BASH_VERSION$ZSH_VERSION" \
  +    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
  +  as_echo='print -r --'
  +  as_echo_n='print -rn --'
  +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
     as_echo='printf %s\n'
     as_echo_n='printf %s'
   else
  @@ -55,7 +57,7 @@
       as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
       as_echo_n_body='eval
         arg=$1;
  -      case $arg in
  +      case $arg in #(
         *"$as_nl"*)
   	expr "X$arg" : "X\\(.*\\)$as_nl";
   	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
  @@ -78,13 +80,6 @@
     }
   fi
   
  -# Support unset when possible.
  -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
  -  as_unset=unset
  -else
  -  as_unset=false
  -fi
  -
   
   # IFS
   # We need space, tab and new line, in precisely that order.  Quoting is
  @@ -94,15 +89,15 @@
   IFS=" ""	$as_nl"
   
   # Find who we are.  Look in the path if we contain no directory separator.
  -case $0 in
  +case $0 in #((
     *[\\/]* ) as_myself=$0 ;;
     *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   for as_dir in $PATH
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
  -done
  +    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
  +  done
   IFS=$as_save_IFS
   
        ;;
  @@ -114,12 +109,16 @@
   fi
   if test ! -f "$as_myself"; then
     $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
  -  { (exit 1); exit 1; }
  +  exit 1
   fi
   
  -# Work around bugs in pre-3.0 UWIN ksh.
  -for as_var in ENV MAIL MAILPATH
  -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
  +# Unset variables that we do not need and which cause bugs (e.g. in
  +# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
  +# suppresses any "Segmentation fault" message there.  '((' could
  +# trigger a bug in pdksh 5.2.14.
  +for as_var in BASH_ENV ENV MAIL MAILPATH
  +do eval test x\${$as_var+set} = xset \
  +  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
   done
   PS1='$ '
   PS2='> '
  @@ -131,330 +130,299 @@
   LANGUAGE=C
   export LANGUAGE
   
  -# Required to use basename.
  -if expr a : '\(a\)' >/dev/null 2>&1 &&
  -   test "X`expr 00001 : '.*\(...\)'`" = X001; then
  -  as_expr=expr
  -else
  -  as_expr=false
  -fi
  -
  -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
  -  as_basename=basename
  -else
  -  as_basename=false
  -fi
  -
  -
  -# Name of the executable.
  -as_me=`$as_basename -- "$0" ||
  -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  -	 X"$0" : 'X\(//\)$' \| \
  -	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
  -$as_echo X/"$0" |
  -    sed '/^.*\/\([^/][^/]*\)\/*$/{
  -	    s//\1/
  -	    q
  -	  }
  -	  /^X\/\(\/\/\)$/{
  -	    s//\1/
  -	    q
  -	  }
  -	  /^X\/\(\/\).*/{
  -	    s//\1/
  -	    q
  -	  }
  -	  s/.*/./; q'`
  -
   # CDPATH.
  -$as_unset CDPATH
  -
  +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
   
   if test "x$CONFIG_SHELL" = x; then
  -  if (eval ":") 2>/dev/null; then
  -  as_have_required=yes
  +  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
  +  emulate sh
  +  NULLCMD=:
  +  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
  +  # is contrary to our usage.  Disable this feature.
  +  alias -g '\${1+\"\$@\"}'='\"\$@\"'
  +  setopt NO_GLOB_SUBST
   else
  -  as_have_required=no
  +  case \`(set -o) 2>/dev/null\` in #(
  +  *posix*) :
  +    set -o posix ;; #(
  +  *) :
  +     ;;
  +esac
   fi
  -
  -  if test $as_have_required = yes &&	 (eval ":
  -(as_func_return () {
  -  (exit \$1)
  -}
  -as_func_success () {
  -  as_func_return 0
  -}
  -as_func_failure () {
  -  as_func_return 1
  -}
  -as_func_ret_success () {
  -  return 0
  -}
  -as_func_ret_failure () {
  -  return 1
  -}
  +"
  +  as_required="as_fn_return () { (exit \$1); }
  +as_fn_success () { as_fn_return 0; }
  +as_fn_failure () { as_fn_return 1; }
  +as_fn_ret_success () { return 0; }
  +as_fn_ret_failure () { return 1; }
   
   exitcode=0
  -if as_func_success; then
  -  :
  -else
  -  exitcode=1
  -  echo as_func_success failed.
  -fi
  -
  -if as_func_failure; then
  -  exitcode=1
  -  echo as_func_failure succeeded.
  -fi
  -
  -if as_func_ret_success; then
  -  :
  -else
  -  exitcode=1
  -  echo as_func_ret_success failed.
  -fi
  -
  -if as_func_ret_failure; then
  -  exitcode=1
  -  echo as_func_ret_failure succeeded.
  -fi
  -
  -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
  -  :
  +as_fn_success || { exitcode=1; echo as_fn_success failed.; }
  +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
  +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
  +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
  +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
  +
  +else
  +  exitcode=1; echo positional parameters were not saved.
  +fi
  +test x\$exitcode = x0 || exit 1"
  +  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
  +  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
  +  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
  +  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
  +test \$(( 1 + 1 )) = 2 || exit 1"
  +  if (eval "$as_required") 2>/dev/null; then :
  +  as_have_required=yes
   else
  -  exitcode=1
  -  echo positional parameters were not saved.
  +  as_have_required=no
   fi
  +  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
   
  -test \$exitcode = 0) || { (exit 1); exit 1; }
  -
  -(
  -  as_lineno_1=\$LINENO
  -  as_lineno_2=\$LINENO
  -  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
  -  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
  -") 2> /dev/null; then
  -  :
   else
  -  as_candidate_shells=
  -    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  +as_found=false
   for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  case $as_dir in
  +  as_found=:
  +  case $as_dir in #(
   	 /*)
   	   for as_base in sh bash ksh sh5; do
  -	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
  +	     # Try only shells that exist, to save several forks.
  +	     as_shell=$as_dir/$as_base
  +	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
  +		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
  +  CONFIG_SHELL=$as_shell as_have_required=yes
  +		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
  +  break 2
  +fi
  +fi
   	   done;;
          esac
  +  as_found=false
   done
  +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
  +	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
  +  CONFIG_SHELL=$SHELL as_have_required=yes
  +fi; }
   IFS=$as_save_IFS
   
   
  -      for as_shell in $as_candidate_shells $SHELL; do
  -	 # Try only shells that exist, to save several forks.
  -	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
  -		{ ("$as_shell") 2> /dev/null <<\_ASEOF
  -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
  -  emulate sh
  -  NULLCMD=:
  -  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
  -  # is contrary to our usage.  Disable this feature.
  -  alias -g '${1+"$@"}'='"$@"'
  -  setopt NO_GLOB_SUBST
  -else
  -  case `(set -o) 2>/dev/null` in
  -  *posix*) set -o posix ;;
  -esac
  -
  -fi
  -
  -
  -:
  -_ASEOF
  -}; then
  -  CONFIG_SHELL=$as_shell
  -	       as_have_required=yes
  -	       if { "$as_shell" 2> /dev/null <<\_ASEOF
  -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
  -  emulate sh
  -  NULLCMD=:
  -  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
  -  # is contrary to our usage.  Disable this feature.
  -  alias -g '${1+"$@"}'='"$@"'
  -  setopt NO_GLOB_SUBST
  -else
  -  case `(set -o) 2>/dev/null` in
  -  *posix*) set -o posix ;;
  -esac
  -
  -fi
  -
  -
  -:
  -(as_func_return () {
  -  (exit $1)
  -}
  -as_func_success () {
  -  as_func_return 0
  -}
  -as_func_failure () {
  -  as_func_return 1
  -}
  -as_func_ret_success () {
  -  return 0
  -}
  -as_func_ret_failure () {
  -  return 1
  -}
  -
  -exitcode=0
  -if as_func_success; then
  -  :
  -else
  -  exitcode=1
  -  echo as_func_success failed.
  -fi
  -
  -if as_func_failure; then
  -  exitcode=1
  -  echo as_func_failure succeeded.
  -fi
  -
  -if as_func_ret_success; then
  -  :
  -else
  -  exitcode=1
  -  echo as_func_ret_success failed.
  -fi
  -
  -if as_func_ret_failure; then
  -  exitcode=1
  -  echo as_func_ret_failure succeeded.
  -fi
  -
  -if ( set x; as_func_ret_success y && test x = "$1" ); then
  -  :
  -else
  -  exitcode=1
  -  echo positional parameters were not saved.
  -fi
  -
  -test $exitcode = 0) || { (exit 1); exit 1; }
  -
  -(
  -  as_lineno_1=$LINENO
  -  as_lineno_2=$LINENO
  -  test "x$as_lineno_1" != "x$as_lineno_2" &&
  -  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
  -
  -_ASEOF
  -}; then
  -  break
  -fi
  -
  -fi
  -
  -      done
  -
  -      if test "x$CONFIG_SHELL" != x; then
  -  for as_var in BASH_ENV ENV
  -	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
  -	done
  +      if test "x$CONFIG_SHELL" != x; then :
  +  # We cannot yet assume a decent shell, so we have to provide a
  +	# neutralization value for shells without unset; and this also
  +	# works around shells that cannot unset nonexistent variables.
  +	BASH_ENV=/dev/null
  +	ENV=/dev/null
  +	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
   	export CONFIG_SHELL
   	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
   fi
   
  -
  -    if test $as_have_required = no; then
  -  echo This script requires a shell more modern than all the
  -      echo shells that I found on your system.  Please install a
  -      echo modern shell, or manually run the script under such a
  -      echo shell if you do have one.
  -      { (exit 1); exit 1; }
  +    if test x$as_have_required = xno; then :
  +  $as_echo "$0: This script requires a shell more modern than all"
  +  $as_echo "$0: the shells that I found on your system."
  +  if test x${ZSH_VERSION+set} = xset ; then
  +    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
  +    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
  +  else
  +    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
  +$0: including any error possibly output before this
  +$0: message. Then install a modern shell, or manually run
  +$0: the script under such a shell if you do have one."
  +  fi
  +  exit 1
   fi
  -
  -
   fi
  -
   fi
  +SHELL=${CONFIG_SHELL-/bin/sh}
  +export SHELL
  +# Unset more variables known to interfere with behavior of common tools.
  +CLICOLOR_FORCE= GREP_OPTIONS=
  +unset CLICOLOR_FORCE GREP_OPTIONS
   
  +## --------------------- ##
  +## M4sh Shell Functions. ##
  +## --------------------- ##
  +# as_fn_unset VAR
  +# ---------------
  +# Portably unset VAR.
  +as_fn_unset ()
  +{
  +  { eval $1=; unset $1;}
  +}
  +as_unset=as_fn_unset
  +
  +# as_fn_set_status STATUS
  +# -----------------------
  +# Set $? to STATUS, without forking.
  +as_fn_set_status ()
  +{
  +  return $1
  +} # as_fn_set_status
  +
  +# as_fn_exit STATUS
  +# -----------------
  +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
  +as_fn_exit ()
  +{
  +  set +e
  +  as_fn_set_status $1
  +  exit $1
  +} # as_fn_exit
  +
  +# as_fn_mkdir_p
  +# -------------
  +# Create "$as_dir" as a directory, including parents if necessary.
  +as_fn_mkdir_p ()
  +{
  +
  +  case $as_dir in #(
  +  -*) as_dir=./$as_dir;;
  +  esac
  +  test -d "$as_dir" || eval $as_mkdir_p || {
  +    as_dirs=
  +    while :; do
  +      case $as_dir in #(
  +      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
  +      *) as_qdir=$as_dir;;
  +      esac
  +      as_dirs="'$as_qdir' $as_dirs"
  +      as_dir=`$as_dirname -- "$as_dir" ||
  +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  +	 X"$as_dir" : 'X\(//\)[^/]' \| \
  +	 X"$as_dir" : 'X\(//\)$' \| \
  +	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
  +$as_echo X"$as_dir" |
  +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  +	    s//\1/
  +	    q
  +	  }
  +	  /^X\(\/\/\)[^/].*/{
  +	    s//\1/
  +	    q
  +	  }
  +	  /^X\(\/\/\)$/{
  +	    s//\1/
  +	    q
  +	  }
  +	  /^X\(\/\).*/{
  +	    s//\1/
  +	    q
  +	  }
  +	  s/.*/./; q'`
  +      test -d "$as_dir" && break
  +    done
  +    test -z "$as_dirs" || eval "mkdir $as_dirs"
  +  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
   
   
  -(eval "as_func_return () {
  -  (exit \$1)
  -}
  -as_func_success () {
  -  as_func_return 0
  -}
  -as_func_failure () {
  -  as_func_return 1
  -}
  -as_func_ret_success () {
  -  return 0
  -}
  -as_func_ret_failure () {
  -  return 1
  -}
  +} # as_fn_mkdir_p
  +# as_fn_append VAR VALUE
  +# ----------------------
  +# Append the text in VALUE to the end of the definition contained in VAR. Take
  +# advantage of any shell optimizations that allow amortized linear growth over
  +# repeated appends, instead of the typical quadratic growth present in naive
  +# implementations.
  +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
  +  eval 'as_fn_append ()
  +  {
  +    eval $1+=\$2
  +  }'
  +else
  +  as_fn_append ()
  +  {
  +    eval $1=\$$1\$2
  +  }
  +fi # as_fn_append
   
  -exitcode=0
  -if as_func_success; then
  -  :
  +# as_fn_arith ARG...
  +# ------------------
  +# Perform arithmetic evaluation on the ARGs, and store the result in the
  +# global $as_val. Take advantage of shells that can avoid forks. The arguments
  +# must be portable across $(()) and expr.
  +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
  +  eval 'as_fn_arith ()
  +  {
  +    as_val=$(( $* ))
  +  }'
   else
  -  exitcode=1
  -  echo as_func_success failed.
  -fi
  +  as_fn_arith ()
  +  {
  +    as_val=`expr "$@" || test $? -eq 1`
  +  }
  +fi # as_fn_arith
   
  -if as_func_failure; then
  -  exitcode=1
  -  echo as_func_failure succeeded.
  -fi
   
  -if as_func_ret_success; then
  -  :
  +# as_fn_error ERROR [LINENO LOG_FD]
  +# ---------------------------------
  +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
  +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
  +# script with status $?, using 1 if that was 0.
  +as_fn_error ()
  +{
  +  as_status=$?; test $as_status -eq 0 && as_status=1
  +  if test "$3"; then
  +    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  +    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
  +  fi
  +  $as_echo "$as_me: error: $1" >&2
  +  as_fn_exit $as_status
  +} # as_fn_error
  +
  +if expr a : '\(a\)' >/dev/null 2>&1 &&
  +   test "X`expr 00001 : '.*\(...\)'`" = X001; then
  +  as_expr=expr
   else
  -  exitcode=1
  -  echo as_func_ret_success failed.
  +  as_expr=false
   fi
   
  -if as_func_ret_failure; then
  -  exitcode=1
  -  echo as_func_ret_failure succeeded.
  +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
  +  as_basename=basename
  +else
  +  as_basename=false
   fi
   
  -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
  -  :
  +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
  +  as_dirname=dirname
   else
  -  exitcode=1
  -  echo positional parameters were not saved.
  +  as_dirname=false
   fi
   
  -test \$exitcode = 0") || {
  -  echo No shell found that supports shell functions.
  -  echo Please tell bug-autoconf@gnu.org about your system,
  -  echo including any error possibly output before this message.
  -  echo This can help us improve future autoconf versions.
  -  echo Configuration will now proceed without shell functions.
  -}
  +as_me=`$as_basename -- "$0" ||
  +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  +	 X"$0" : 'X\(//\)$' \| \
  +	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
  +$as_echo X/"$0" |
  +    sed '/^.*\/\([^/][^/]*\)\/*$/{
  +	    s//\1/
  +	    q
  +	  }
  +	  /^X\/\(\/\/\)$/{
  +	    s//\1/
  +	    q
  +	  }
  +	  /^X\/\(\/\).*/{
  +	    s//\1/
  +	    q
  +	  }
  +	  s/.*/./; q'`
   
  +# Avoid depending upon Character Ranges.
  +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
  +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
  +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
  +as_cr_digits='0123456789'
  +as_cr_alnum=$as_cr_Letters$as_cr_digits
   
   
  -  as_lineno_1=$LINENO
  -  as_lineno_2=$LINENO
  -  test "x$as_lineno_1" != "x$as_lineno_2" &&
  -  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
  -
  -  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
  -  # uniformly replaced by the line number.  The first 'sed' inserts a
  -  # line-number line after each line using $LINENO; the second 'sed'
  -  # does the real work.  The second script uses 'N' to pair each
  -  # line-number line with the line containing $LINENO, and appends
  -  # trailing '-' during substitution so that $LINENO is not a special
  -  # case at line end.
  -  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
  -  # scripts with optimization help from Paolo Bonzini.  Blame Lee
  -  # E. McMahon (1931-1989) for sed's syntax.  :-)
  +  as_lineno_1=$LINENO as_lineno_1a=$LINENO
  +  as_lineno_2=$LINENO as_lineno_2a=$LINENO
  +  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
  +  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
  +  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
     sed -n '
       p
       /[$]LINENO/=
  @@ -471,8 +439,7 @@
         s/-\n.*//
       ' >$as_me.lineno &&
     chmod +x "$as_me.lineno" ||
  -    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
  -   { (exit 1); exit 1; }; }
  +    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
   
     # Don't try to exec as it changes $[0], causing all sort of problems
     # (the dirname of $[0] is not the place where we might find the
  @@ -482,29 +449,18 @@
     exit
   }
   
  -
  -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
  -  as_dirname=dirname
  -else
  -  as_dirname=false
  -fi
  -
   ECHO_C= ECHO_N= ECHO_T=
  -case `echo -n x` in
  +case `echo -n x` in #(((((
   -n*)
  -  case `echo 'x\c'` in
  +  case `echo 'xy\c'` in
     *c*) ECHO_T='	';;	# ECHO_T is single tab character.
  -  *)   ECHO_C='\c';;
  +  xy)  ECHO_C='\c';;
  +  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
  +       ECHO_T='	';;
     esac;;
   *)
     ECHO_N='-n';;
   esac
  -if expr a : '\(a\)' >/dev/null 2>&1 &&
  -   test "X`expr 00001 : '.*\(...\)'`" = X001; then
  -  as_expr=expr
  -else
  -  as_expr=false
  -fi
   
   rm -f conf$$ conf$$.exe conf$$.file
   if test -d conf$$.dir; then
  @@ -534,7 +490,7 @@
   rmdir conf$$.dir 2>/dev/null
   
   if mkdir -p . 2>/dev/null; then
  -  as_mkdir_p=:
  +  as_mkdir_p='mkdir -p "$as_dir"'
   else
     test -d ./-p && rmdir ./-p
     as_mkdir_p=false
  @@ -553,10 +509,10 @@
         if test -d "$1"; then
   	test -d "$1/.";
         else
  -	case $1 in
  +	case $1 in #(
   	-*)set "./$1";;
   	esac;
  -	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
  +	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
   	???[sx]*):;;*)false;;esac;fi
       '\'' sh
     '
  @@ -571,7 +527,6 @@
   
   
   
  -
   # Check that we are running under the correct shell.
   SHELL=${CONFIG_SHELL-/bin/sh}
   
  @@ -720,7 +675,8 @@
   
   
   
  -exec 7<&0 </dev/null 6>&1
  +test -n "$DJDIR" || exec 7<&0 </dev/null
  +exec 6>&1
   
   # Name of the host.
   # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
  @@ -738,14 +694,14 @@
   subdirs=
   MFLAGS=
   MAKEFLAGS=
  -SHELL=${CONFIG_SHELL-/bin/sh}
   
   # Identity of this package.
   PACKAGE_NAME='PCRE'
   PACKAGE_TARNAME='pcre'
  -PACKAGE_VERSION='8.00'
  -PACKAGE_STRING='PCRE 8.00'
  +PACKAGE_VERSION='8.10'
  +PACKAGE_STRING='PCRE 8.10'
   PACKAGE_BUGREPORT=''
  +PACKAGE_URL=''
   
   ac_unique_file="pcre.h.in"
   # Factoring default headers for most tests.
  @@ -794,20 +750,20 @@
   EXTRA_LIBPCREPOSIX_LDFLAGS
   EXTRA_LIBPCRE_LDFLAGS
   PCRE_STATIC_CFLAG
  -pcre_have_ulong_long
  -pcre_have_long_long
   WITH_REBUILD_CHARTABLES_FALSE
   WITH_REBUILD_CHARTABLES_TRUE
   WITH_PCRE_CPP_FALSE
   WITH_PCRE_CPP_TRUE
   pcre_have_bits_type_traits
   pcre_have_type_traits
  +pcre_have_ulong_long
  +pcre_have_long_long
  +enable_cpp
   PCRE_DATE
   PCRE_PRERELEASE
   PCRE_MINOR
   PCRE_MAJOR
   CXXCPP
  -CPP
   OTOOL64
   OTOOL
   LIPO
  @@ -822,8 +778,6 @@
   DUMPBIN
   LD
   FGREP
  -EGREP
  -GREP
   SED
   LIBTOOL
   OBJDUMP
  @@ -837,6 +791,9 @@
   build_vendor
   build_cpu
   build
  +EGREP
  +GREP
  +CPP
   am__fastdepCXX_FALSE
   am__fastdepCXX_TRUE
   CXXDEPMODE
  @@ -912,6 +869,7 @@
   program_transform_name
   prefix
   exec_prefix
  +PACKAGE_URL
   PACKAGE_BUGREPORT
   PACKAGE_STRING
   PACKAGE_VERSION
  @@ -1070,8 +1028,7 @@
       ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
       # Reject names that are not valid shell variable names.
       expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
  -      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
  -   { (exit 1); exit 1; }; }
  +      as_fn_error "invalid feature name: $ac_useropt"
       ac_useropt_orig=$ac_useropt
       ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
       case $ac_user_opts in
  @@ -1097,8 +1054,7 @@
       ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
       # Reject names that are not valid shell variable names.
       expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
  -      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
  -   { (exit 1); exit 1; }; }
  +      as_fn_error "invalid feature name: $ac_useropt"
       ac_useropt_orig=$ac_useropt
       ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
       case $ac_user_opts in
  @@ -1302,8 +1258,7 @@
       ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
       # Reject names that are not valid shell variable names.
       expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
  -      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
  -   { (exit 1); exit 1; }; }
  +      as_fn_error "invalid package name: $ac_useropt"
       ac_useropt_orig=$ac_useropt
       ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
       case $ac_user_opts in
  @@ -1319,8 +1274,7 @@
       ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
       # Reject names that are not valid shell variable names.
       expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
  -      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
  -   { (exit 1); exit 1; }; }
  +      as_fn_error "invalid package name: $ac_useropt"
       ac_useropt_orig=$ac_useropt
       ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
       case $ac_user_opts in
  @@ -1350,17 +1304,17 @@
     | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
       x_libraries=$ac_optarg ;;
   
  -  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
  -Try \`$0 --help' for more information." >&2
  -   { (exit 1); exit 1; }; }
  +  -*) as_fn_error "unrecognized option: \`$ac_option'
  +Try \`$0 --help' for more information."
       ;;
   
     *=*)
       ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
       # Reject names that are not valid shell variable names.
  -    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
  -      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
  -   { (exit 1); exit 1; }; }
  +    case $ac_envvar in #(
  +      '' | [0-9]* | *[!_$as_cr_alnum]* )
  +      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
  +    esac
       eval $ac_envvar=\$ac_optarg
       export $ac_envvar ;;
   
  @@ -1377,15 +1331,13 @@
   
   if test -n "$ac_prev"; then
     ac_option=--`echo $ac_prev | sed 's/_/-/g'`
  -  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
  -   { (exit 1); exit 1; }; }
  +  as_fn_error "missing argument to $ac_option"
   fi
   
   if test -n "$ac_unrecognized_opts"; then
     case $enable_option_checking in
       no) ;;
  -    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
  -   { (exit 1); exit 1; }; } ;;
  +    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
       *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
     esac
   fi
  @@ -1408,8 +1360,7 @@
       [\\/$]* | ?:[\\/]* )  continue;;
       NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
     esac
  -  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
  -   { (exit 1); exit 1; }; }
  +  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
   done
   
   # There might be people who depend on the old broken behavior: `$host'
  @@ -1439,11 +1390,9 @@
   ac_pwd=`pwd` && test -n "$ac_pwd" &&
   ac_ls_di=`ls -di .` &&
   ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
  -  { $as_echo "$as_me: error: working directory cannot be determined" >&2
  -   { (exit 1); exit 1; }; }
  +  as_fn_error "working directory cannot be determined"
   test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
  -  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
  -   { (exit 1); exit 1; }; }
  +  as_fn_error "pwd does not report name of working directory"
   
   
   # Find the source files, if location was not specified.
  @@ -1482,13 +1431,11 @@
   fi
   if test ! -r "$srcdir/$ac_unique_file"; then
     test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
  -  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
  -   { (exit 1); exit 1; }; }
  +  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
   fi
   ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
   ac_abs_confdir=`(
  -	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
  -   { (exit 1); exit 1; }; }
  +	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
   	pwd)`
   # When building in place, set srcdir=.
   if test "$ac_abs_confdir" = "$ac_pwd"; then
  @@ -1514,7 +1461,7 @@
     # Omit some internal or obsolete options to make the list less imposing.
     # This message is too long to be a string in the A/UX 3.1 sh.
     cat <<_ACEOF
  -\`configure' configures PCRE 8.00 to adapt to many kinds of systems.
  +\`configure' configures PCRE 8.10 to adapt to many kinds of systems.
   
   Usage: $0 [OPTION]... [VAR=VALUE]...
   
  @@ -1584,7 +1531,7 @@
   
   if test -n "$ac_init_help"; then
     case $ac_init_help in
  -     short | recursive ) echo "Configuration of PCRE 8.00:";;
  +     short | recursive ) echo "Configuration of PCRE 8.10:";;
      esac
     cat <<\_ACEOF
   
  @@ -1646,7 +1593,7 @@
     LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                 nonstandard directory <lib dir>
     LIBS        libraries to pass to the linker, e.g. -l<library>
  -  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
  +  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
                 you have headers in a nonstandard directory <include dir>
     CXX         C++ compiler command
     CXXFLAGS    C++ compiler flags
  @@ -1656,6 +1603,7 @@
   Use these variables to override the choices made by `configure' or to help
   it to find libraries and programs with nonstandard names/locations.
   
  +Report bugs to the package provider.
   _ACEOF
   ac_status=$?
   fi
  @@ -1718,1499 +1666,2725 @@
   test -n "$ac_init_help" && exit $ac_status
   if $ac_init_version; then
     cat <<\_ACEOF
  -PCRE configure 8.00
  -generated by GNU Autoconf 2.63
  +PCRE configure 8.10
  +generated by GNU Autoconf 2.65
   
  -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
  -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
  +Copyright (C) 2009 Free Software Foundation, Inc.
   This configure script is free software; the Free Software Foundation
   gives unlimited permission to copy, distribute and modify it.
   _ACEOF
     exit
   fi
  -cat >config.log <<_ACEOF
  -This file contains any messages produced by compilers while
  -running configure, to aid debugging if configure makes a mistake.
   
  -It was created by PCRE $as_me 8.00, which was
  -generated by GNU Autoconf 2.63.  Invocation command line was
  +## ------------------------ ##
  +## Autoconf initialization. ##
  +## ------------------------ ##
  +
  +# ac_fn_c_try_compile LINENO
  +# --------------------------
  +# Try to compile conftest.$ac_ext, and return whether this succeeded.
  +ac_fn_c_try_compile ()
  +{
  +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  +  rm -f conftest.$ac_objext
  +  if { { ac_try="$ac_compile"
  +case "(($ac_try" in
  +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  +  *) ac_try_echo=$ac_try;;
  +esac
  +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  +$as_echo "$ac_try_echo"; } >&5
  +  (eval "$ac_compile") 2>conftest.err
  +  ac_status=$?
  +  if test -s conftest.err; then
  +    grep -v '^ *+' conftest.err >conftest.er1
  +    cat conftest.er1 >&5
  +    mv -f conftest.er1 conftest.err
  +  fi
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; } && {
  +	 test -z "$ac_c_werror_flag" ||
  +	 test ! -s conftest.err
  +       } && test -s conftest.$ac_objext; then :
  +  ac_retval=0
  +else
  +  $as_echo "$as_me: failed program was:" >&5
  +sed 's/^/| /' conftest.$ac_ext >&5
  +
  +	ac_retval=1
  +fi
  +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  +  as_fn_set_status $ac_retval
   
  -  $ $0 $@
  +} # ac_fn_c_try_compile
   
  -_ACEOF
  -exec 5>>config.log
  +# ac_fn_cxx_try_compile LINENO
  +# ----------------------------
  +# Try to compile conftest.$ac_ext, and return whether this succeeded.
  +ac_fn_cxx_try_compile ()
   {
  -cat <<_ASUNAME
  -## --------- ##
  -## Platform. ##
  -## --------- ##
  -
  -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
  -uname -m = `(uname -m) 2>/dev/null || echo unknown`
  -uname -r = `(uname -r) 2>/dev/null || echo unknown`
  -uname -s = `(uname -s) 2>/dev/null || echo unknown`
  -uname -v = `(uname -v) 2>/dev/null || echo unknown`
  +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  +  rm -f conftest.$ac_objext
  +  if { { ac_try="$ac_compile"
  +case "(($ac_try" in
  +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  +  *) ac_try_echo=$ac_try;;
  +esac
  +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  +$as_echo "$ac_try_echo"; } >&5
  +  (eval "$ac_compile") 2>conftest.err
  +  ac_status=$?
  +  if test -s conftest.err; then
  +    grep -v '^ *+' conftest.err >conftest.er1
  +    cat conftest.er1 >&5
  +    mv -f conftest.er1 conftest.err
  +  fi
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; } && {
  +	 test -z "$ac_cxx_werror_flag" ||
  +	 test ! -s conftest.err
  +       } && test -s conftest.$ac_objext; then :
  +  ac_retval=0
  +else
  +  $as_echo "$as_me: failed program was:" >&5
  +sed 's/^/| /' conftest.$ac_ext >&5
   
  -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
  -/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
  +	ac_retval=1
  +fi
  +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  +  as_fn_set_status $ac_retval
   
  -/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
  -/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
  -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
  -/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
  -/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
  -/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
  -/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
  +} # ac_fn_cxx_try_compile
   
  -_ASUNAME
  +# ac_fn_c_try_cpp LINENO
  +# ----------------------
  +# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
  +ac_fn_c_try_cpp ()
  +{
  +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  +  if { { ac_try="$ac_cpp conftest.$ac_ext"
  +case "(($ac_try" in
  +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  +  *) ac_try_echo=$ac_try;;
  +esac
  +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  +$as_echo "$ac_try_echo"; } >&5
  +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
  +  ac_status=$?
  +  if test -s conftest.err; then
  +    grep -v '^ *+' conftest.err >conftest.er1
  +    cat conftest.er1 >&5
  +    mv -f conftest.er1 conftest.err
  +  fi
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; } >/dev/null && {
  +	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  +	 test ! -s conftest.err
  +       }; then :
  +  ac_retval=0
  +else
  +  $as_echo "$as_me: failed program was:" >&5
  +sed 's/^/| /' conftest.$ac_ext >&5
   
  -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  -for as_dir in $PATH
  -do
  -  IFS=$as_save_IFS
  -  test -z "$as_dir" && as_dir=.
  -  $as_echo "PATH: $as_dir"
  -done
  -IFS=$as_save_IFS
  +    ac_retval=1
  +fi
  +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  +  as_fn_set_status $ac_retval
   
  -} >&5
  +} # ac_fn_c_try_cpp
   
  -cat >&5 <<_ACEOF
  +# ac_fn_c_try_run LINENO
  +# ----------------------
  +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
  +# that executables *can* be run.
  +ac_fn_c_try_run ()
  +{
  +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  +  if { { ac_try="$ac_link"
  +case "(($ac_try" in
  +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  +  *) ac_try_echo=$ac_try;;
  +esac
  +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  +$as_echo "$ac_try_echo"; } >&5
  +  (eval "$ac_link") 2>&5
  +  ac_status=$?
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
  +  { { case "(($ac_try" in
  +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  +  *) ac_try_echo=$ac_try;;
  +esac
  +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  +$as_echo "$ac_try_echo"; } >&5
  +  (eval "$ac_try") 2>&5
  +  ac_status=$?
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; }; }; then :
  +  ac_retval=0
  +else
  +  $as_echo "$as_me: program exited with status $ac_status" >&5
  +       $as_echo "$as_me: failed program was:" >&5
  +sed 's/^/| /' conftest.$ac_ext >&5
   
  +       ac_retval=$ac_status
  +fi
  +  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
  +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  +  as_fn_set_status $ac_retval
   
  -## ----------- ##
  -## Core tests. ##
  -## ----------- ##
  +} # ac_fn_c_try_run
   
  +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
  +# -------------------------------------------------------
  +# Tests whether HEADER exists and can be compiled using the include files in
  +# INCLUDES, setting the cache variable VAR accordingly.
  +ac_fn_c_check_header_compile ()
  +{
  +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  +$as_echo_n "checking for $2... " >&6; }
  +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  +  $as_echo_n "(cached) " >&6
  +else
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +$4
  +#include <$2>
   _ACEOF
  +if ac_fn_c_try_compile "$LINENO"; then :
  +  eval "$3=yes"
  +else
  +  eval "$3=no"
  +fi
  +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  +fi
  +eval ac_res=\$$3
  +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  +$as_echo "$ac_res" >&6; }
  +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   
  +} # ac_fn_c_check_header_compile
   
  -# Keep a trace of the command line.
  -# Strip out --no-create and --no-recursion so they do not pile up.
  -# Strip out --silent because we don't want to record it for future runs.
  -# Also quote any args containing shell meta-characters.
  -# Make two passes to allow for proper duplicate-argument suppression.
  -ac_configure_args=
  -ac_configure_args0=
  -ac_configure_args1=
  -ac_must_keep_next=false
  -for ac_pass in 1 2
  -do
  -  for ac_arg
  -  do
  -    case $ac_arg in
  -    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
  -    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
  -    | -silent | --silent | --silen | --sile | --sil)
  -      continue ;;
  -    *\'*)
  -      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
  -    esac
  -    case $ac_pass in
  -    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
  -    2)
  -      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
  -      if test $ac_must_keep_next = true; then
  -	ac_must_keep_next=false # Got value, back to normal.
  -      else
  -	case $ac_arg in
  -	  *=* | --config-cache | -C | -disable-* | --disable-* \
  -	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
  -	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
  -	  | -with-* | --with-* | -without-* | --without-* | --x)
  -	    case "$ac_configure_args0 " in
  -	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
  -	    esac
  -	    ;;
  -	  -* ) ac_must_keep_next=true ;;
  -	esac
  -      fi
  -      ac_configure_args="$ac_configure_args '$ac_arg'"
  -      ;;
  -    esac
  -  done
  -done
  -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
  -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
  +# ac_fn_c_find_intX_t LINENO BITS VAR
  +# -----------------------------------
  +# Finds a signed integer type with width BITS, setting cache variable VAR
  +# accordingly.
  +ac_fn_c_find_intX_t ()
  +{
  +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
  +$as_echo_n "checking for int$2_t... " >&6; }
  +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  +  $as_echo_n "(cached) " >&6
  +else
  +  eval "$3=no"
  +     # Order is important - never check a type that is potentially smaller
  +     # than half of the expected target width.
  +     for ac_type in int$2_t 'int' 'long int' \
  +	 'long long int' 'short int' 'signed char'; do
  +       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +$ac_includes_default
  +int
  +main ()
  +{
  +static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 };
  +	     0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
  +test_array [0] = 0
   
  -# When interrupted or exit'd, cleanup temporary files, and complete
  -# config.log.  We remove comments because anyway the quotes in there
  -# would cause problems or look ugly.
  -# WARNING: Use '\'' to represent an apostrophe within the trap.
  -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
  -trap 'exit_status=$?
  -  # Save into config.log some information that might help in debugging.
  -  {
  -    echo
  +  ;
  +  return 0;
  +}
  +_ACEOF
  +if ac_fn_c_try_compile "$LINENO"; then :
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +$ac_includes_default
  +int
  +main ()
  +{
  +static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 };
  +		($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
  +		 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
  +test_array [0] = 0
   
  -    cat <<\_ASBOX
  -## ---------------- ##
  -## Cache variables. ##
  -## ---------------- ##
  -_ASBOX
  -    echo
  -    # The following way of writing the cache mishandles newlines in values,
  -(
  -  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
  -    eval ac_val=\$$ac_var
  -    case $ac_val in #(
  -    *${as_nl}*)
  -      case $ac_var in #(
  -      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
  -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
  -      esac
  -      case $ac_var in #(
  -      _ | IFS | as_nl) ;; #(
  -      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
  -      *) $as_unset $ac_var ;;
  -      esac ;;
  -    esac
  -  done
  -  (set) 2>&1 |
  -    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
  -    *${as_nl}ac_space=\ *)
  -      sed -n \
  -	"s/'\''/'\''\\\\'\'''\''/g;
  -	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
  -      ;; #(
  -    *)
  -      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
  -      ;;
  -    esac |
  -    sort
  -)
  -    echo
  +  ;
  +  return 0;
  +}
  +_ACEOF
  +if ac_fn_c_try_compile "$LINENO"; then :
   
  -    cat <<\_ASBOX
  -## ----------------- ##
  -## Output variables. ##
  -## ----------------- ##
  -_ASBOX
  -    echo
  -    for ac_var in $ac_subst_vars
  -    do
  -      eval ac_val=\$$ac_var
  -      case $ac_val in
  -      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
  -      esac
  -      $as_echo "$ac_var='\''$ac_val'\''"
  -    done | sort
  -    echo
  +else
  +  case $ac_type in #(
  +  int$2_t) :
  +    eval "$3=yes" ;; #(
  +  *) :
  +    eval "$3=\$ac_type" ;;
  +esac
  +fi
  +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  +fi
  +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  +       eval as_val=\$$3
  +   if test "x$as_val" = x""no; then :
   
  -    if test -n "$ac_subst_files"; then
  -      cat <<\_ASBOX
  -## ------------------- ##
  -## File substitutions. ##
  -## ------------------- ##
  -_ASBOX
  -      echo
  -      for ac_var in $ac_subst_files
  -      do
  -	eval ac_val=\$$ac_var
  -	case $ac_val in
  -	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
  -	esac
  -	$as_echo "$ac_var='\''$ac_val'\''"
  -      done | sort
  -      echo
  -    fi
  +else
  +  break
  +fi
  +     done
  +fi
  +eval ac_res=\$$3
  +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  +$as_echo "$ac_res" >&6; }
  +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   
  -    if test -s confdefs.h; then
  -      cat <<\_ASBOX
  -## ----------- ##
  -## confdefs.h. ##
  -## ----------- ##
  -_ASBOX
  -      echo
  -      cat confdefs.h
  -      echo
  -    fi
  -    test "$ac_signal" != 0 &&
  -      $as_echo "$as_me: caught signal $ac_signal"
  -    $as_echo "$as_me: exit $exit_status"
  -  } >&5
  -  rm -f core *.core core.conftest.* &&
  -    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
  -    exit $exit_status
  -' 0
  -for ac_signal in 1 2 13 15; do
  -  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
  -done
  -ac_signal=0
  +} # ac_fn_c_find_intX_t
   
  -# confdefs.h avoids OS command line length limits that DEFS can exceed.
  -rm -f -r conftest* confdefs.h
  +# ac_fn_c_try_link LINENO
  +# -----------------------
  +# Try to link conftest.$ac_ext, and return whether this succeeded.
  +ac_fn_c_try_link ()
  +{
  +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  +  rm -f conftest.$ac_objext conftest$ac_exeext
  +  if { { ac_try="$ac_link"
  +case "(($ac_try" in
  +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  +  *) ac_try_echo=$ac_try;;
  +esac
  +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  +$as_echo "$ac_try_echo"; } >&5
  +  (eval "$ac_link") 2>conftest.err
  +  ac_status=$?
  +  if test -s conftest.err; then
  +    grep -v '^ *+' conftest.err >conftest.er1
  +    cat conftest.er1 >&5
  +    mv -f conftest.er1 conftest.err
  +  fi
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; } && {
  +	 test -z "$ac_c_werror_flag" ||
  +	 test ! -s conftest.err
  +       } && test -s conftest$ac_exeext && {
  +	 test "$cross_compiling" = yes ||
  +	 $as_test_x conftest$ac_exeext
  +       }; then :
  +  ac_retval=0
  +else
  +  $as_echo "$as_me: failed program was:" >&5
  +sed 's/^/| /' conftest.$ac_ext >&5
   
  -# Predefined preprocessor variables.
  +	ac_retval=1
  +fi
  +  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
  +  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
  +  # interfere with the next link command; also delete a directory that is
  +  # left behind by Apple's compiler.  We do this before executing the actions.
  +  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
  +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  +  as_fn_set_status $ac_retval
  +
  +} # ac_fn_c_try_link
  +
  +# ac_fn_c_check_func LINENO FUNC VAR
  +# ----------------------------------
  +# Tests whether FUNC exists, setting the cache variable VAR accordingly
  +ac_fn_c_check_func ()
  +{
  +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  +$as_echo_n "checking for $2... " >&6; }
  +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  +  $as_echo_n "(cached) " >&6
  +else
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
  +   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
  +#define $2 innocuous_$2
   
  -cat >>confdefs.h <<_ACEOF
  -#define PACKAGE_NAME "$PACKAGE_NAME"
  -_ACEOF
  +/* System header to define __stub macros and hopefully few prototypes,
  +    which can conflict with char $2 (); below.
  +    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
  +    <limits.h> exists even on freestanding compilers.  */
   
  +#ifdef __STDC__
  +# include <limits.h>
  +#else
  +# include <assert.h>
  +#endif
   
  -cat >>confdefs.h <<_ACEOF
  -#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
  -_ACEOF
  +#undef $2
   
  +/* Override any GCC internal prototype to avoid an error.
  +   Use char because int might match the return type of a GCC
  +   builtin and then its argument prototype would still apply.  */
  +#ifdef __cplusplus
  +extern "C"
  +#endif
  +char $2 ();
  +/* The GNU C library defines this for functions which it implements
  +    to always fail with ENOSYS.  Some functions are actually named
  +    something starting with __ and the normal name is an alias.  */
  +#if defined __stub_$2 || defined __stub___$2
  +choke me
  +#endif
   
  -cat >>confdefs.h <<_ACEOF
  -#define PACKAGE_VERSION "$PACKAGE_VERSION"
  +int
  +main ()
  +{
  +return $2 ();
  +  ;
  +  return 0;
  +}
   _ACEOF
  +if ac_fn_c_try_link "$LINENO"; then :
  +  eval "$3=yes"
  +else
  +  eval "$3=no"
  +fi
  +rm -f core conftest.err conftest.$ac_objext \
  +    conftest$ac_exeext conftest.$ac_ext
  +fi
  +eval ac_res=\$$3
  +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  +$as_echo "$ac_res" >&6; }
  +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   
  +} # ac_fn_c_check_func
   
  -cat >>confdefs.h <<_ACEOF
  -#define PACKAGE_STRING "$PACKAGE_STRING"
  -_ACEOF
  +# ac_fn_cxx_try_cpp LINENO
  +# ------------------------
  +# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
  +ac_fn_cxx_try_cpp ()
  +{
  +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  +  if { { ac_try="$ac_cpp conftest.$ac_ext"
  +case "(($ac_try" in
  +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  +  *) ac_try_echo=$ac_try;;
  +esac
  +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  +$as_echo "$ac_try_echo"; } >&5
  +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
  +  ac_status=$?
  +  if test -s conftest.err; then
  +    grep -v '^ *+' conftest.err >conftest.er1
  +    cat conftest.er1 >&5
  +    mv -f conftest.er1 conftest.err
  +  fi
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; } >/dev/null && {
  +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
  +	 test ! -s conftest.err
  +       }; then :
  +  ac_retval=0
  +else
  +  $as_echo "$as_me: failed program was:" >&5
  +sed 's/^/| /' conftest.$ac_ext >&5
   
  +    ac_retval=1
  +fi
  +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  +  as_fn_set_status $ac_retval
   
  -cat >>confdefs.h <<_ACEOF
  -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
  -_ACEOF
  +} # ac_fn_cxx_try_cpp
   
  +# ac_fn_cxx_try_link LINENO
  +# -------------------------
  +# Try to link conftest.$ac_ext, and return whether this succeeded.
  +ac_fn_cxx_try_link ()
  +{
  +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  +  rm -f conftest.$ac_objext conftest$ac_exeext
  +  if { { ac_try="$ac_link"
  +case "(($ac_try" in
  +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  +  *) ac_try_echo=$ac_try;;
  +esac
  +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  +$as_echo "$ac_try_echo"; } >&5
  +  (eval "$ac_link") 2>conftest.err
  +  ac_status=$?
  +  if test -s conftest.err; then
  +    grep -v '^ *+' conftest.err >conftest.er1
  +    cat conftest.er1 >&5
  +    mv -f conftest.er1 conftest.err
  +  fi
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; } && {
  +	 test -z "$ac_cxx_werror_flag" ||
  +	 test ! -s conftest.err
  +       } && test -s conftest$ac_exeext && {
  +	 test "$cross_compiling" = yes ||
  +	 $as_test_x conftest$ac_exeext
  +       }; then :
  +  ac_retval=0
  +else
  +  $as_echo "$as_me: failed program was:" >&5
  +sed 's/^/| /' conftest.$ac_ext >&5
   
  -# Let the site file select an alternate cache file if it wants to.
  -# Prefer an explicitly selected file to automatically selected ones.
  -ac_site_file1=NONE
  -ac_site_file2=NONE
  -if test -n "$CONFIG_SITE"; then
  -  ac_site_file1=$CONFIG_SITE
  -elif test "x$prefix" != xNONE; then
  -  ac_site_file1=$prefix/share/config.site
  -  ac_site_file2=$prefix/etc/config.site
  +	ac_retval=1
  +fi
  +  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
  +  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
  +  # interfere with the next link command; also delete a directory that is
  +  # left behind by Apple's compiler.  We do this before executing the actions.
  +  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
  +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  +  as_fn_set_status $ac_retval
  +
  +} # ac_fn_cxx_try_link
  +
  +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
  +# -------------------------------------------------------
  +# Tests whether HEADER exists, giving a warning if it cannot be compiled using
  +# the include files in INCLUDES and setting the cache variable VAR
  +# accordingly.
  +ac_fn_c_check_header_mongrel ()
  +{
  +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  +  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  +$as_echo_n "checking for $2... " >&6; }
  +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  +  $as_echo_n "(cached) " >&6
  +fi
  +eval ac_res=\$$3
  +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  +$as_echo "$ac_res" >&6; }
   else
  -  ac_site_file1=$ac_default_prefix/share/config.site
  -  ac_site_file2=$ac_default_prefix/etc/config.site
  +  # Is the header compilable?
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
  +$as_echo_n "checking $2 usability... " >&6; }
  +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +$4
  +#include <$2>
  +_ACEOF
  +if ac_fn_c_try_compile "$LINENO"; then :
  +  ac_header_compiler=yes
  +else
  +  ac_header_compiler=no
   fi
  -for ac_site_file in "$ac_site_file1" "$ac_site_file2"
  -do
  -  test "x$ac_site_file" = xNONE && continue
  -  if test -r "$ac_site_file"; then
  -    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
  -$as_echo "$as_me: loading site script $ac_site_file" >&6;}
  -    sed 's/^/| /' "$ac_site_file" >&5
  -    . "$ac_site_file"
  -  fi
  -done
  +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
  +$as_echo "$ac_header_compiler" >&6; }
   
  -if test -r "$cache_file"; then
  -  # Some versions of bash will fail to source /dev/null (special
  -  # files actually), so we avoid doing that.
  -  if test -f "$cache_file"; then
  -    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
  -$as_echo "$as_me: loading cache $cache_file" >&6;}
  -    case $cache_file in
  -      [\\/]* | ?:[\\/]* ) . "$cache_file";;
  -      *)                      . "./$cache_file";;
  -    esac
  -  fi
  +# Is the header present?
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
  +$as_echo_n "checking $2 presence... " >&6; }
  +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +#include <$2>
  +_ACEOF
  +if ac_fn_c_try_cpp "$LINENO"; then :
  +  ac_header_preproc=yes
   else
  -  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
  -$as_echo "$as_me: creating cache $cache_file" >&6;}
  -  >$cache_file
  +  ac_header_preproc=no
   fi
  +rm -f conftest.err conftest.$ac_ext
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
  +$as_echo "$ac_header_preproc" >&6; }
   
  -# Check that the precious variables saved in the cache have kept the same
  -# value.
  -ac_cache_corrupted=false
  -for ac_var in $ac_precious_vars; do
  -  eval ac_old_set=\$ac_cv_env_${ac_var}_set
  -  eval ac_new_set=\$ac_env_${ac_var}_set
  -  eval ac_old_val=\$ac_cv_env_${ac_var}_value
  -  eval ac_new_val=\$ac_env_${ac_var}_value
  -  case $ac_old_set,$ac_new_set in
  -    set,)
  -      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
  -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
  -      ac_cache_corrupted=: ;;
  -    ,set)
  -      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
  -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
  -      ac_cache_corrupted=: ;;
  -    ,);;
  -    *)
  -      if test "x$ac_old_val" != "x$ac_new_val"; then
  -	# differences in whitespace do not lead to failure.
  -	ac_old_val_w=`echo x $ac_old_val`
  -	ac_new_val_w=`echo x $ac_new_val`
  -	if test "$ac_old_val_w" != "$ac_new_val_w"; then
  -	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
  -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
  -	  ac_cache_corrupted=:
  -	else
  -	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
  -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
  -	  eval $ac_var=\$ac_old_val
  -	fi
  -	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
  -$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
  -	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
  -$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
  -      fi;;
  -  esac
  -  # Pass precious variables to config.status.
  -  if test "$ac_new_set" = set; then
  -    case $ac_new_val in
  -    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
  -    *) ac_arg=$ac_var=$ac_new_val ;;
  -    esac
  -    case " $ac_configure_args " in
  -      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
  -      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
  -    esac
  -  fi
  -done
  -if $ac_cache_corrupted; then
  -  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  -  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
  -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
  -  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
  -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
  -   { (exit 1); exit 1; }; }
  +# So?  What about this header?
  +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
  +  yes:no: )
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
  +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
  +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
  +    ;;
  +  no:yes:* )
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
  +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
  +$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
  +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
  +$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
  +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
  +    ;;
  +esac
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  +$as_echo_n "checking for $2... " >&6; }
  +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  +  $as_echo_n "(cached) " >&6
  +else
  +  eval "$3=\$ac_header_compiler"
   fi
  +eval ac_res=\$$3
  +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  +$as_echo "$ac_res" >&6; }
  +fi
  +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   
  +} # ac_fn_c_check_header_mongrel
   
  +# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
  +# ---------------------------------------------------------
  +# Tests whether HEADER exists, giving a warning if it cannot be compiled using
  +# the include files in INCLUDES and setting the cache variable VAR
  +# accordingly.
  +ac_fn_cxx_check_header_mongrel ()
  +{
  +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  +  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  +$as_echo_n "checking for $2... " >&6; }
  +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  +  $as_echo_n "(cached) " >&6
  +fi
  +eval ac_res=\$$3
  +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  +$as_echo "$ac_res" >&6; }
  +else
  +  # Is the header compilable?
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
  +$as_echo_n "checking $2 usability... " >&6; }
  +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +$4
  +#include <$2>
  +_ACEOF
  +if ac_fn_cxx_try_compile "$LINENO"; then :
  +  ac_header_compiler=yes
  +else
  +  ac_header_compiler=no
  +fi
  +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
  +$as_echo "$ac_header_compiler" >&6; }
   
  +# Is the header present?
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
  +$as_echo_n "checking $2 presence... " >&6; }
  +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +#include <$2>
  +_ACEOF
  +if ac_fn_cxx_try_cpp "$LINENO"; then :
  +  ac_header_preproc=yes
  +else
  +  ac_header_preproc=no
  +fi
  +rm -f conftest.err conftest.$ac_ext
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
  +$as_echo "$ac_header_preproc" >&6; }
   
  +# So?  What about this header?
  +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
  +  yes:no: )
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
  +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
  +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
  +    ;;
  +  no:yes:* )
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
  +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
  +$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
  +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
  +$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
  +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
  +    ;;
  +esac
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  +$as_echo_n "checking for $2... " >&6; }
  +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  +  $as_echo_n "(cached) " >&6
  +else
  +  eval "$3=\$ac_header_compiler"
  +fi
  +eval ac_res=\$$3
  +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  +$as_echo "$ac_res" >&6; }
  +fi
  +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   
  +} # ac_fn_cxx_check_header_mongrel
   
  +# ac_fn_cxx_check_type LINENO TYPE VAR INCLUDES
  +# ---------------------------------------------
  +# Tests whether TYPE exists after having included INCLUDES, setting cache
  +# variable VAR accordingly.
  +ac_fn_cxx_check_type ()
  +{
  +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  +$as_echo_n "checking for $2... " >&6; }
  +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  +  $as_echo_n "(cached) " >&6
  +else
  +  eval "$3=no"
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +$4
  +int
  +main ()
  +{
  +if (sizeof ($2))
  +	 return 0;
  +  ;
  +  return 0;
  +}
  +_ACEOF
  +if ac_fn_cxx_try_compile "$LINENO"; then :
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +$4
  +int
  +main ()
  +{
  +if (sizeof (($2)))
  +	    return 0;
  +  ;
  +  return 0;
  +}
  +_ACEOF
  +if ac_fn_cxx_try_compile "$LINENO"; then :
   
  +else
  +  eval "$3=yes"
  +fi
  +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  +fi
  +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  +fi
  +eval ac_res=\$$3
  +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  +$as_echo "$ac_res" >&6; }
  +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   
  +} # ac_fn_cxx_check_type
   
  +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
  +# -------------------------------------------
  +# Tests whether TYPE exists after having included INCLUDES, setting cache
  +# variable VAR accordingly.
  +ac_fn_c_check_type ()
  +{
  +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  +$as_echo_n "checking for $2... " >&6; }
  +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  +  $as_echo_n "(cached) " >&6
  +else
  +  eval "$3=no"
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +$4
  +int
  +main ()
  +{
  +if (sizeof ($2))
  +	 return 0;
  +  ;
  +  return 0;
  +}
  +_ACEOF
  +if ac_fn_c_try_compile "$LINENO"; then :
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +$4
  +int
  +main ()
  +{
  +if (sizeof (($2)))
  +	    return 0;
  +  ;
  +  return 0;
  +}
  +_ACEOF
  +if ac_fn_c_try_compile "$LINENO"; then :
   
  +else
  +  eval "$3=yes"
  +fi
  +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  +fi
  +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  +fi
  +eval ac_res=\$$3
  +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  +$as_echo "$ac_res" >&6; }
  +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   
  +} # ac_fn_c_check_type
  +cat >config.log <<_ACEOF
  +This file contains any messages produced by compilers while
  +running configure, to aid debugging if configure makes a mistake.
   
  +It was created by PCRE $as_me 8.10, which was
  +generated by GNU Autoconf 2.65.  Invocation command line was
   
  +  $ $0 $@
   
  +_ACEOF
  +exec 5>>config.log
  +{
  +cat <<_ASUNAME
  +## --------- ##
  +## Platform. ##
  +## --------- ##
   
  +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
  +uname -m = `(uname -m) 2>/dev/null || echo unknown`
  +uname -r = `(uname -r) 2>/dev/null || echo unknown`
  +uname -s = `(uname -s) 2>/dev/null || echo unknown`
  +uname -v = `(uname -v) 2>/dev/null || echo unknown`
   
  +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
  +/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
   
  +/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
  +/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
  +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
  +/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
  +/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
  +/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
  +/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
   
  +_ASUNAME
   
  -
  -
  -
  -
  -
  -
  -ac_ext=c
  -ac_cpp='$CPP $CPPFLAGS'
  -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  -ac_compiler_gnu=$ac_cv_c_compiler_gnu
  -
  -
  -
  -am__api_version='1.10'
  -
  -ac_aux_dir=
  -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
  -  if test -f "$ac_dir/install-sh"; then
  -    ac_aux_dir=$ac_dir
  -    ac_install_sh="$ac_aux_dir/install-sh -c"
  -    break
  -  elif test -f "$ac_dir/install.sh"; then
  -    ac_aux_dir=$ac_dir
  -    ac_install_sh="$ac_aux_dir/install.sh -c"
  -    break
  -  elif test -f "$ac_dir/shtool"; then
  -    ac_aux_dir=$ac_dir
  -    ac_install_sh="$ac_aux_dir/shtool install -c"
  -    break
  -  fi
  -done
  -if test -z "$ac_aux_dir"; then
  -  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
  -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
  -   { (exit 1); exit 1; }; }
  -fi
  -
  -# These three variables are undocumented and unsupported,
  -# and are intended to be withdrawn in a future Autoconf release.
  -# They can cause serious problems if a builder's source tree is in a directory
  -# whose full name contains unusual characters.
  -ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
  -ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
  -ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
  -
  -
  -# Find a good install program.  We prefer a C program (faster),
  -# so one script is as good as another.  But avoid the broken or
  -# incompatible versions:
  -# SysV /etc/install, /usr/sbin/install
  -# SunOS /usr/etc/install
  -# IRIX /sbin/install
  -# AIX /bin/install
  -# AmigaOS /C/install, which installs bootblocks on floppy discs
  -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
  -# AFS /usr/afsws/bin/install, which mishandles nonexistent args
  -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  -# OS/2's system install, which has a completely different semantic
  -# ./install, which can be erroneously created by make from ./install.sh.
  -# Reject install programs that cannot install multiple files.
  -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
  -$as_echo_n "checking for a BSD-compatible install... " >&6; }
  -if test -z "$INSTALL"; then
  -if test "${ac_cv_path_install+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   for as_dir in $PATH
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  # Account for people who put trailing slashes in PATH elements.
  -case $as_dir/ in
  -  ./ | .// | /cC/* | \
  -  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
  -  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
  -  /usr/ucb/* ) ;;
  -  *)
  -    # OSF1 and SCO ODT 3.0 have their own names for install.
  -    # Don't use installbsd from OSF since it installs stuff as root
  -    # by default.
  -    for ac_prog in ginstall scoinst install; do
  -      for ac_exec_ext in '' $ac_executable_extensions; do
  -	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
  -	  if test $ac_prog = install &&
  -	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  -	    # AIX install.  It has an incompatible calling convention.
  -	    :
  -	  elif test $ac_prog = install &&
  -	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  -	    # program-specific install script used by HP pwplus--don't use.
  -	    :
  -	  else
  -	    rm -rf conftest.one conftest.two conftest.dir
  -	    echo one > conftest.one
  -	    echo two > conftest.two
  -	    mkdir conftest.dir
  -	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
  -	      test -s conftest.one && test -s conftest.two &&
  -	      test -s conftest.dir/conftest.one &&
  -	      test -s conftest.dir/conftest.two
  -	    then
  -	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
  -	      break 3
  -	    fi
  -	  fi
  -	fi
  -      done
  -    done
  -    ;;
  -esac
  -
  -done
  +    $as_echo "PATH: $as_dir"
  +  done
   IFS=$as_save_IFS
   
  -rm -rf conftest.one conftest.two conftest.dir
  -
  -fi
  -  if test "${ac_cv_path_install+set}" = set; then
  -    INSTALL=$ac_cv_path_install
  -  else
  -    # As a last resort, use the slow shell script.  Don't cache a
  -    # value for INSTALL within a source directory, because that will
  -    # break other packages using the cache if that directory is
  -    # removed, or if the value is a relative name.
  -    INSTALL=$ac_install_sh
  -  fi
  -fi
  -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
  -$as_echo "$INSTALL" >&6; }
  -
  -# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  -# It thinks the first close brace ends the variable substitution.
  -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
  -
  -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
  +} >&5
   
  -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  +cat >&5 <<_ACEOF
   
  -{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
  -$as_echo_n "checking whether build environment is sane... " >&6; }
  -# Just in case
  -sleep 1
  -echo timestamp > conftest.file
  -# Do `set' in a subshell so we don't clobber the current shell's
  -# arguments.  Must try -L first in case configure is actually a
  -# symlink; some systems play weird games with the mod time of symlinks
  -# (eg FreeBSD returns the mod time of the symlink's containing
  -# directory).
  -if (
  -   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
  -   if test "$*" = "X"; then
  -      # -L didn't work.
  -      set X `ls -t $srcdir/configure conftest.file`
  -   fi
  -   rm -f conftest.file
  -   if test "$*" != "X $srcdir/configure conftest.file" \
  -      && test "$*" != "X conftest.file $srcdir/configure"; then
   
  -      # If neither matched, then we have a broken ls.  This can happen
  -      # if, for instance, CONFIG_SHELL is bash and it inherits a
  -      # broken ls alias from the environment.  This has actually
  -      # happened.  Such a system could not be considered "sane".
  -      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
  -alias in your environment" >&5
  -$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
  -alias in your environment" >&2;}
  -   { (exit 1); exit 1; }; }
  -   fi
  +## ----------- ##
  +## Core tests. ##
  +## ----------- ##
   
  -   test "$2" = conftest.file
  -   )
  -then
  -   # Ok.
  -   :
  -else
  -   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
  -Check your system clock" >&5
  -$as_echo "$as_me: error: newly created file is older than distributed files!
  -Check your system clock" >&2;}
  -   { (exit 1); exit 1; }; }
  -fi
  -{ $as_echo "$as_me:$LINENO: result: yes" >&5
  -$as_echo "yes" >&6; }
  -test "$program_prefix" != NONE &&
  -  program_transform_name="s&^&$program_prefix&;$program_transform_name"
  -# Use a double $ so make ignores it.
  -test "$program_suffix" != NONE &&
  -  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
  -# Double any \ or $.
  -# By default was `s,x,x', remove it if useless.
  -ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
  -program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
  +_ACEOF
   
  -# expand $ac_aux_dir to an absolute path
  -am_aux_dir=`cd $ac_aux_dir && pwd`
   
  -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
  -# Use eval to expand $SHELL
  -if eval "$MISSING --run true"; then
  +# Keep a trace of the command line.
  +# Strip out --no-create and --no-recursion so they do not pile up.
  +# Strip out --silent because we don't want to record it for future runs.
  +# Also quote any args containing shell meta-characters.
  +# Make two passes to allow for proper duplicate-argument suppression.
  +ac_configure_args=
  +ac_configure_args0=
  +ac_configure_args1=
  +ac_must_keep_next=false
  +for ac_pass in 1 2
  +do
  +  for ac_arg
  +  do
  +    case $ac_arg in
  +    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
  +    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
  +    | -silent | --silent | --silen | --sile | --sil)
  +      continue ;;
  +    *\'*)
  +      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
  +    esac
  +    case $ac_pass in
  +    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
  +    2)
  +      as_fn_append ac_configure_args1 " '$ac_arg'"
  +      if test $ac_must_keep_next = true; then
  +	ac_must_keep_next=false # Got value, back to normal.
  +      else
  +	case $ac_arg in
  +	  *=* | --config-cache | -C | -disable-* | --disable-* \
  +	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
  +	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
  +	  | -with-* | --with-* | -without-* | --without-* | --x)
  +	    case "$ac_configure_args0 " in
  +	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
  +	    esac
  +	    ;;
  +	  -* ) ac_must_keep_next=true ;;
  +	esac
  +      fi
  +      as_fn_append ac_configure_args " '$ac_arg'"
  +      ;;
  +    esac
  +  done
  +done
  +{ ac_configure_args0=; unset ac_configure_args0;}
  +{ ac_configure_args1=; unset ac_configure_args1;}
  +
  +# When interrupted or exit'd, cleanup temporary files, and complete
  +# config.log.  We remove comments because anyway the quotes in there
  +# would cause problems or look ugly.
  +# WARNING: Use '\'' to represent an apostrophe within the trap.
  +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
  +trap 'exit_status=$?
  +  # Save into config.log some information that might help in debugging.
  +  {
  +    echo
  +
  +    cat <<\_ASBOX
  +## ---------------- ##
  +## Cache variables. ##
  +## ---------------- ##
  +_ASBOX
  +    echo
  +    # The following way of writing the cache mishandles newlines in values,
  +(
  +  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
  +    eval ac_val=\$$ac_var
  +    case $ac_val in #(
  +    *${as_nl}*)
  +      case $ac_var in #(
  +      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
  +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
  +      esac
  +      case $ac_var in #(
  +      _ | IFS | as_nl) ;; #(
  +      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
  +      *) { eval $ac_var=; unset $ac_var;} ;;
  +      esac ;;
  +    esac
  +  done
  +  (set) 2>&1 |
  +    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
  +    *${as_nl}ac_space=\ *)
  +      sed -n \
  +	"s/'\''/'\''\\\\'\'''\''/g;
  +	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
  +      ;; #(
  +    *)
  +      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
  +      ;;
  +    esac |
  +    sort
  +)
  +    echo
  +
  +    cat <<\_ASBOX
  +## ----------------- ##
  +## Output variables. ##
  +## ----------------- ##
  +_ASBOX
  +    echo
  +    for ac_var in $ac_subst_vars
  +    do
  +      eval ac_val=\$$ac_var
  +      case $ac_val in
  +      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
  +      esac
  +      $as_echo "$ac_var='\''$ac_val'\''"
  +    done | sort
  +    echo
  +
  +    if test -n "$ac_subst_files"; then
  +      cat <<\_ASBOX
  +## ------------------- ##
  +## File substitutions. ##
  +## ------------------- ##
  +_ASBOX
  +      echo
  +      for ac_var in $ac_subst_files
  +      do
  +	eval ac_val=\$$ac_var
  +	case $ac_val in
  +	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
  +	esac
  +	$as_echo "$ac_var='\''$ac_val'\''"
  +      done | sort
  +      echo
  +    fi
  +
  +    if test -s confdefs.h; then
  +      cat <<\_ASBOX
  +## ----------- ##
  +## confdefs.h. ##
  +## ----------- ##
  +_ASBOX
  +      echo
  +      cat confdefs.h
  +      echo
  +    fi
  +    test "$ac_signal" != 0 &&
  +      $as_echo "$as_me: caught signal $ac_signal"
  +    $as_echo "$as_me: exit $exit_status"
  +  } >&5
  +  rm -f core *.core core.conftest.* &&
  +    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
  +    exit $exit_status
  +' 0
  +for ac_signal in 1 2 13 15; do
  +  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
  +done
  +ac_signal=0
  +
  +# confdefs.h avoids OS command line length limits that DEFS can exceed.
  +rm -f -r conftest* confdefs.h
  +
  +$as_echo "/* confdefs.h */" > confdefs.h
  +
  +# Predefined preprocessor variables.
  +
  +cat >>confdefs.h <<_ACEOF
  +#define PACKAGE_NAME "$PACKAGE_NAME"
  +_ACEOF
  +
  +cat >>confdefs.h <<_ACEOF
  +#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
  +_ACEOF
  +
  +cat >>confdefs.h <<_ACEOF
  +#define PACKAGE_VERSION "$PACKAGE_VERSION"
  +_ACEOF
  +
  +cat >>confdefs.h <<_ACEOF
  +#define PACKAGE_STRING "$PACKAGE_STRING"
  +_ACEOF
  +
  +cat >>confdefs.h <<_ACEOF
  +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
  +_ACEOF
  +
  +cat >>confdefs.h <<_ACEOF
  +#define PACKAGE_URL "$PACKAGE_URL"
  +_ACEOF
  +
  +
  +# Let the site file select an alternate cache file if it wants to.
  +# Prefer an explicitly selected file to automatically selected ones.
  +ac_site_file1=NONE
  +ac_site_file2=NONE
  +if test -n "$CONFIG_SITE"; then
  +  ac_site_file1=$CONFIG_SITE
  +elif test "x$prefix" != xNONE; then
  +  ac_site_file1=$prefix/share/config.site
  +  ac_site_file2=$prefix/etc/config.site
  +else
  +  ac_site_file1=$ac_default_prefix/share/config.site
  +  ac_site_file2=$ac_default_prefix/etc/config.site
  +fi
  +for ac_site_file in "$ac_site_file1" "$ac_site_file2"
  +do
  +  test "x$ac_site_file" = xNONE && continue
  +  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
  +$as_echo "$as_me: loading site script $ac_site_file" >&6;}
  +    sed 's/^/| /' "$ac_site_file" >&5
  +    . "$ac_site_file"
  +  fi
  +done
  +
  +if test -r "$cache_file"; then
  +  # Some versions of bash will fail to source /dev/null (special files
  +  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
  +  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
  +$as_echo "$as_me: loading cache $cache_file" >&6;}
  +    case $cache_file in
  +      [\\/]* | ?:[\\/]* ) . "$cache_file";;
  +      *)                      . "./$cache_file";;
  +    esac
  +  fi
  +else
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
  +$as_echo "$as_me: creating cache $cache_file" >&6;}
  +  >$cache_file
  +fi
  +
  +# Check that the precious variables saved in the cache have kept the same
  +# value.
  +ac_cache_corrupted=false
  +for ac_var in $ac_precious_vars; do
  +  eval ac_old_set=\$ac_cv_env_${ac_var}_set
  +  eval ac_new_set=\$ac_env_${ac_var}_set
  +  eval ac_old_val=\$ac_cv_env_${ac_var}_value
  +  eval ac_new_val=\$ac_env_${ac_var}_value
  +  case $ac_old_set,$ac_new_set in
  +    set,)
  +      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
  +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
  +      ac_cache_corrupted=: ;;
  +    ,set)
  +      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
  +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
  +      ac_cache_corrupted=: ;;
  +    ,);;
  +    *)
  +      if test "x$ac_old_val" != "x$ac_new_val"; then
  +	# differences in whitespace do not lead to failure.
  +	ac_old_val_w=`echo x $ac_old_val`
  +	ac_new_val_w=`echo x $ac_new_val`
  +	if test "$ac_old_val_w" != "$ac_new_val_w"; then
  +	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
  +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
  +	  ac_cache_corrupted=:
  +	else
  +	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
  +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
  +	  eval $ac_var=\$ac_old_val
  +	fi
  +	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
  +$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
  +	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
  +$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
  +      fi;;
  +  esac
  +  # Pass precious variables to config.status.
  +  if test "$ac_new_set" = set; then
  +    case $ac_new_val in
  +    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
  +    *) ac_arg=$ac_var=$ac_new_val ;;
  +    esac
  +    case " $ac_configure_args " in
  +      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
  +      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
  +    esac
  +  fi
  +done
  +if $ac_cache_corrupted; then
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
  +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
  +  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
  +fi
  +## -------------------- ##
  +## Main body of script. ##
  +## -------------------- ##
  +
  +ac_ext=c
  +ac_cpp='$CPP $CPPFLAGS'
  +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  +ac_compiler_gnu=$ac_cv_c_compiler_gnu
  +
  +
  +
  +am__api_version='1.10'
  +
  +ac_aux_dir=
  +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
  +  for ac_t in install-sh install.sh shtool; do
  +    if test -f "$ac_dir/$ac_t"; then
  +      ac_aux_dir=$ac_dir
  +      ac_install_sh="$ac_aux_dir/$ac_t -c"
  +      break 2
  +    fi
  +  done
  +done
  +if test -z "$ac_aux_dir"; then
  +  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
  +fi
  +
  +# These three variables are undocumented and unsupported,
  +# and are intended to be withdrawn in a future Autoconf release.
  +# They can cause serious problems if a builder's source tree is in a directory
  +# whose full name contains unusual characters.
  +ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
  +ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
  +ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
  +
  +
  +# Find a good install program.  We prefer a C program (faster),
  +# so one script is as good as another.  But avoid the broken or
  +# incompatible versions:
  +# SysV /etc/install, /usr/sbin/install
  +# SunOS /usr/etc/install
  +# IRIX /sbin/install
  +# AIX /bin/install
  +# AmigaOS /C/install, which installs bootblocks on floppy discs
  +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
  +# AFS /usr/afsws/bin/install, which mishandles nonexistent args
  +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  +# OS/2's system install, which has a completely different semantic
  +# ./install, which can be erroneously created by make from ./install.sh.
  +# Reject install programs that cannot install multiple files.
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
  +$as_echo_n "checking for a BSD-compatible install... " >&6; }
  +if test -z "$INSTALL"; then
  +if test "${ac_cv_path_install+set}" = set; then :
  +  $as_echo_n "(cached) " >&6
  +else
  +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  +for as_dir in $PATH
  +do
  +  IFS=$as_save_IFS
  +  test -z "$as_dir" && as_dir=.
  +    # Account for people who put trailing slashes in PATH elements.
  +case $as_dir/ in #((
  +  ./ | .// | /[cC]/* | \
  +  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
  +  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
  +  /usr/ucb/* ) ;;
  +  *)
  +    # OSF1 and SCO ODT 3.0 have their own names for install.
  +    # Don't use installbsd from OSF since it installs stuff as root
  +    # by default.
  +    for ac_prog in ginstall scoinst install; do
  +      for ac_exec_ext in '' $ac_executable_extensions; do
  +	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
  +	  if test $ac_prog = install &&
  +	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  +	    # AIX install.  It has an incompatible calling convention.
  +	    :
  +	  elif test $ac_prog = install &&
  +	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  +	    # program-specific install script used by HP pwplus--don't use.
  +	    :
  +	  else
  +	    rm -rf conftest.one conftest.two conftest.dir
  +	    echo one > conftest.one
  +	    echo two > conftest.two
  +	    mkdir conftest.dir
  +	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
  +	      test -s conftest.one && test -s conftest.two &&
  +	      test -s conftest.dir/conftest.one &&
  +	      test -s conftest.dir/conftest.two
  +	    then
  +	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
  +	      break 3
  +	    fi
  +	  fi
  +	fi
  +      done
  +    done
  +    ;;
  +esac
  +
  +  done
  +IFS=$as_save_IFS
  +
  +rm -rf conftest.one conftest.two conftest.dir
  +
  +fi
  +  if test "${ac_cv_path_install+set}" = set; then
  +    INSTALL=$ac_cv_path_install
  +  else
  +    # As a last resort, use the slow shell script.  Don't cache a
  +    # value for INSTALL within a source directory, because that will
  +    # break other packages using the cache if that directory is
  +    # removed, or if the value is a relative name.
  +    INSTALL=$ac_install_sh
  +  fi
  +fi
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
  +$as_echo "$INSTALL" >&6; }
  +
  +# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  +# It thinks the first close brace ends the variable substitution.
  +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
  +
  +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
  +
  +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  +
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
  +$as_echo_n "checking whether build environment is sane... " >&6; }
  +# Just in case
  +sleep 1
  +echo timestamp > conftest.file
  +# Do `set' in a subshell so we don't clobber the current shell's
  +# arguments.  Must try -L first in case configure is actually a
  +# symlink; some systems play weird games with the mod time of symlinks
  +# (eg FreeBSD returns the mod time of the symlink's containing
  +# directory).
  +if (
  +   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
  +   if test "$*" = "X"; then
  +      # -L didn't work.
  +      set X `ls -t $srcdir/configure conftest.file`
  +   fi
  +   rm -f conftest.file
  +   if test "$*" != "X $srcdir/configure conftest.file" \
  +      && test "$*" != "X conftest.file $srcdir/configure"; then
  +
  +      # If neither matched, then we have a broken ls.  This can happen
  +      # if, for instance, CONFIG_SHELL is bash and it inherits a
  +      # broken ls alias from the environment.  This has actually
  +      # happened.  Such a system could not be considered "sane".
  +      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
  +alias in your environment" "$LINENO" 5
  +   fi
  +
  +   test "$2" = conftest.file
  +   )
  +then
  +   # Ok.
  +   :
  +else
  +   as_fn_error "newly created file is older than distributed files!
  +Check your system clock" "$LINENO" 5
  +fi
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  +$as_echo "yes" >&6; }
  +test "$program_prefix" != NONE &&
  +  program_transform_name="s&^&$program_prefix&;$program_transform_name"
  +# Use a double $ so make ignores it.
  +test "$program_suffix" != NONE &&
  +  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
  +# Double any \ or $.
  +# By default was `s,x,x', remove it if useless.
  +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
  +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
  +
  +# expand $ac_aux_dir to an absolute path
  +am_aux_dir=`cd $ac_aux_dir && pwd`
  +
  +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
  +# Use eval to expand $SHELL
  +if eval "$MISSING --run true"; then
     am_missing_run="$MISSING --run "
   else
  -  am_missing_run=
  -  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
  -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
  +  am_missing_run=
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
  +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
  +fi
  +
  +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
  +
  +# Installed binaries are usually stripped using `strip' when the user
  +# run `make install-strip'.  However `strip' might not be the right
  +# tool to use in cross-compilation environments, therefore Automake
  +# will honor the `STRIP' environment variable to overrule this program.
  +if test "$cross_compiling" != no; then
  +  if test -n "$ac_tool_prefix"; then
  +  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  +set dummy ${ac_tool_prefix}strip; ac_word=$2
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  +$as_echo_n "checking for $ac_word... " >&6; }
  +if test "${ac_cv_prog_STRIP+set}" = set; then :
  +  $as_echo_n "(cached) " >&6
  +else
  +  if test -n "$STRIP"; then
  +  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
  +else
  +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  +for as_dir in $PATH
  +do
  +  IFS=$as_save_IFS
  +  test -z "$as_dir" && as_dir=.
  +    for ac_exec_ext in '' $ac_executable_extensions; do
  +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  +    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    break 2
  +  fi
  +done
  +  done
  +IFS=$as_save_IFS
  +
  +fi
  +fi
  +STRIP=$ac_cv_prog_STRIP
  +if test -n "$STRIP"; then
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
  +$as_echo "$STRIP" >&6; }
  +else
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  +$as_echo "no" >&6; }
  +fi
  +
  +
  +fi
  +if test -z "$ac_cv_prog_STRIP"; then
  +  ac_ct_STRIP=$STRIP
  +  # Extract the first word of "strip", so it can be a program name with args.
  +set dummy strip; ac_word=$2
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  +$as_echo_n "checking for $ac_word... " >&6; }
  +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
  +  $as_echo_n "(cached) " >&6
  +else
  +  if test -n "$ac_ct_STRIP"; then
  +  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
  +else
  +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  +for as_dir in $PATH
  +do
  +  IFS=$as_save_IFS
  +  test -z "$as_dir" && as_dir=.
  +    for ac_exec_ext in '' $ac_executable_extensions; do
  +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  +    ac_cv_prog_ac_ct_STRIP="strip"
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    break 2
  +  fi
  +done
  +  done
  +IFS=$as_save_IFS
  +
  +fi
  +fi
  +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
  +if test -n "$ac_ct_STRIP"; then
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
  +$as_echo "$ac_ct_STRIP" >&6; }
  +else
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  +$as_echo "no" >&6; }
  +fi
  +
  +  if test "x$ac_ct_STRIP" = x; then
  +    STRIP=":"
  +  else
  +    case $cross_compiling:$ac_tool_warned in
  +yes:)
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  +ac_tool_warned=yes ;;
  +esac
  +    STRIP=$ac_ct_STRIP
  +  fi
  +else
  +  STRIP="$ac_cv_prog_STRIP"
  +fi
  +
  +fi
  +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
  +
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
  +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
  +if test -z "$MKDIR_P"; then
  +  if test "${ac_cv_path_mkdir+set}" = set; then :
  +  $as_echo_n "(cached) " >&6
  +else
  +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
  +do
  +  IFS=$as_save_IFS
  +  test -z "$as_dir" && as_dir=.
  +    for ac_prog in mkdir gmkdir; do
  +	 for ac_exec_ext in '' $ac_executable_extensions; do
  +	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
  +	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
  +	     'mkdir (GNU coreutils) '* | \
  +	     'mkdir (coreutils) '* | \
  +	     'mkdir (fileutils) '4.1*)
  +	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
  +	       break 3;;
  +	   esac
  +	 done
  +       done
  +  done
  +IFS=$as_save_IFS
  +
  +fi
  +
  +  test -d ./--version && rmdir ./--version
  +  if test "${ac_cv_path_mkdir+set}" = set; then
  +    MKDIR_P="$ac_cv_path_mkdir -p"
  +  else
  +    # As a last resort, use the slow shell script.  Don't cache a
  +    # value for MKDIR_P within a source directory, because that will
  +    # break other packages using the cache if that directory is
  +    # removed, or if the value is a relative name.
  +    MKDIR_P="$ac_install_sh -d"
  +  fi
  +fi
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
  +$as_echo "$MKDIR_P" >&6; }
  +
  +mkdir_p="$MKDIR_P"
  +case $mkdir_p in
  +  [\\/$]* | ?:[\\/]*) ;;
  +  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
  +esac
  +
  +for ac_prog in gawk mawk nawk awk
  +do
  +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  +set dummy $ac_prog; ac_word=$2
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  +$as_echo_n "checking for $ac_word... " >&6; }
  +if test "${ac_cv_prog_AWK+set}" = set; then :
  +  $as_echo_n "(cached) " >&6
  +else
  +  if test -n "$AWK"; then
  +  ac_cv_prog_AWK="$AWK" # Let the user override the test.
  +else
  +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  +for as_dir in $PATH
  +do
  +  IFS=$as_save_IFS
  +  test -z "$as_dir" && as_dir=.
  +    for ac_exec_ext in '' $ac_executable_extensions; do
  +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  +    ac_cv_prog_AWK="$ac_prog"
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    break 2
  +  fi
  +done
  +  done
  +IFS=$as_save_IFS
  +
  +fi
  +fi
  +AWK=$ac_cv_prog_AWK
  +if test -n "$AWK"; then
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
  +$as_echo "$AWK" >&6; }
  +else
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  +$as_echo "no" >&6; }
  +fi
  +
  +
  +  test -n "$AWK" && break
  +done
  +
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
  +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
  +set x ${MAKE-make}
  +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
  +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
  +  $as_echo_n "(cached) " >&6
  +else
  +  cat >conftest.make <<\_ACEOF
  +SHELL = /bin/sh
  +all:
  +	@echo '@@@%%%=$(MAKE)=@@@%%%'
  +_ACEOF
  +# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  +case `${MAKE-make} -f conftest.make 2>/dev/null` in
  +  *@@@%%%=?*=@@@%%%*)
  +    eval ac_cv_prog_make_${ac_make}_set=yes;;
  +  *)
  +    eval ac_cv_prog_make_${ac_make}_set=no;;
  +esac
  +rm -f conftest.make
  +fi
  +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  +$as_echo "yes" >&6; }
  +  SET_MAKE=
  +else
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  +$as_echo "no" >&6; }
  +  SET_MAKE="MAKE=${MAKE-make}"
  +fi
  +
  +rm -rf .tst 2>/dev/null
  +mkdir .tst 2>/dev/null
  +if test -d .tst; then
  +  am__leading_dot=.
  +else
  +  am__leading_dot=_
  +fi
  +rmdir .tst 2>/dev/null
  +
  +if test "`cd $srcdir && pwd`" != "`pwd`"; then
  +  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
  +  # is not polluted with repeated "-I."
  +  am__isrc=' -I$(srcdir)'
  +  # test to see if srcdir already configured
  +  if test -f $srcdir/config.status; then
  +    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
  +  fi
  +fi
  +
  +# test whether we have cygpath
  +if test -z "$CYGPATH_W"; then
  +  if (cygpath --version) >/dev/null 2>/dev/null; then
  +    CYGPATH_W='cygpath -w'
  +  else
  +    CYGPATH_W=echo
  +  fi
  +fi
  +
  +
  +# Define the identity of the package.
  + PACKAGE='pcre'
  + VERSION='8.10'
  +
  +
  +cat >>confdefs.h <<_ACEOF
  +#define PACKAGE "$PACKAGE"
  +_ACEOF
  +
  +
  +cat >>confdefs.h <<_ACEOF
  +#define VERSION "$VERSION"
  +_ACEOF
  +
  +# Some tools Automake needs.
  +
  +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
  +
  +
  +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
  +
  +
  +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
  +
  +
  +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
  +
  +
  +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
  +
  +# We need awk for the "check" target.  The system "awk" is bad on
  +# some platforms.
  +# Always define AMTAR for backward compatibility.
  +
  +AMTAR=${AMTAR-"${am_missing_run}tar"}
  +
  +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
  +
  +
  +
  +
  +
  +ac_config_headers="$ac_config_headers config.h"
  +
  +
  +# This was added at the suggestion of libtoolize (03-Jan-10)
  +
  +
  +# The default CFLAGS and CXXFLAGS in Autoconf are "-g -O2" for gcc and just
  +# "-g" for any other compiler. There doesn't seem to be a standard way of
  +# getting rid of the -g (which I don't think is needed for a production
  +# library). This fudge seems to achieve the necessary. First, we remember the
  +# externally set values of CFLAGS and CXXFLAGS. Then call the AC_PROG_CC and
  +# AC_PROG_CXX macros to find the compilers - if CFLAGS and CXXFLAGS are not
  +# set, they will be set to Autoconf's defaults. Afterwards, if the original
  +# values were not set, remove the -g from the Autoconf defaults.
  +# (PH 02-May-07)
  +
  +remember_set_CFLAGS="$CFLAGS"
  +remember_set_CXXFLAGS="$CXXFLAGS"
  +
  +ac_ext=c
  +ac_cpp='$CPP $CPPFLAGS'
  +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  +ac_compiler_gnu=$ac_cv_c_compiler_gnu
  +if test -n "$ac_tool_prefix"; then
  +  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  +set dummy ${ac_tool_prefix}gcc; ac_word=$2
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  +$as_echo_n "checking for $ac_word... " >&6; }
  +if test "${ac_cv_prog_CC+set}" = set; then :
  +  $as_echo_n "(cached) " >&6
  +else
  +  if test -n "$CC"; then
  +  ac_cv_prog_CC="$CC" # Let the user override the test.
  +else
  +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  +for as_dir in $PATH
  +do
  +  IFS=$as_save_IFS
  +  test -z "$as_dir" && as_dir=.
  +    for ac_exec_ext in '' $ac_executable_extensions; do
  +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  +    ac_cv_prog_CC="${ac_tool_prefix}gcc"
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    break 2
  +  fi
  +done
  +  done
  +IFS=$as_save_IFS
  +
  +fi
  +fi
  +CC=$ac_cv_prog_CC
  +if test -n "$CC"; then
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
  +$as_echo "$CC" >&6; }
  +else
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  +$as_echo "no" >&6; }
   fi
   
  -{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
  -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
  -if test -z "$MKDIR_P"; then
  -  if test "${ac_cv_path_mkdir+set}" = set; then
  +
  +fi
  +if test -z "$ac_cv_prog_CC"; then
  +  ac_ct_CC=$CC
  +  # Extract the first word of "gcc", so it can be a program name with args.
  +set dummy gcc; ac_word=$2
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  +$as_echo_n "checking for $ac_word... " >&6; }
  +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
  -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
  +  if test -n "$ac_ct_CC"; then
  +  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
  +else
  +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  +for as_dir in $PATH
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_prog in mkdir gmkdir; do
  -	 for ac_exec_ext in '' $ac_executable_extensions; do
  -	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
  -	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
  -	     'mkdir (GNU coreutils) '* | \
  -	     'mkdir (coreutils) '* | \
  -	     'mkdir (fileutils) '4.1*)
  -	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
  -	       break 3;;
  -	   esac
  -	 done
  -       done
  +    for ac_exec_ext in '' $ac_executable_extensions; do
  +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  +    ac_cv_prog_ac_ct_CC="gcc"
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    break 2
  +  fi
   done
  +  done
   IFS=$as_save_IFS
   
   fi
  +fi
  +ac_ct_CC=$ac_cv_prog_ac_ct_CC
  +if test -n "$ac_ct_CC"; then
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
  +$as_echo "$ac_ct_CC" >&6; }
  +else
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  +$as_echo "no" >&6; }
  +fi
   
  -  if test "${ac_cv_path_mkdir+set}" = set; then
  -    MKDIR_P="$ac_cv_path_mkdir -p"
  +  if test "x$ac_ct_CC" = x; then
  +    CC=""
     else
  -    # As a last resort, use the slow shell script.  Don't cache a
  -    # value for MKDIR_P within a source directory, because that will
  -    # break other packages using the cache if that directory is
  -    # removed, or if the value is a relative name.
  -    test -d ./--version && rmdir ./--version
  -    MKDIR_P="$ac_install_sh -d"
  +    case $cross_compiling:$ac_tool_warned in
  +yes:)
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  +ac_tool_warned=yes ;;
  +esac
  +    CC=$ac_ct_CC
     fi
  +else
  +  CC="$ac_cv_prog_CC"
   fi
  -{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
  -$as_echo "$MKDIR_P" >&6; }
  -
  -mkdir_p="$MKDIR_P"
  -case $mkdir_p in
  -  [\\/$]* | ?:[\\/]*) ;;
  -  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
  -esac
   
  -for ac_prog in gawk mawk nawk awk
  -do
  -  # Extract the first word of "$ac_prog", so it can be a program name with args.
  -set dummy $ac_prog; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +if test -z "$CC"; then
  +          if test -n "$ac_tool_prefix"; then
  +    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  +set dummy ${ac_tool_prefix}cc; ac_word=$2
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_AWK+set}" = set; then
  +if test "${ac_cv_prog_CC+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
  -  if test -n "$AWK"; then
  -  ac_cv_prog_AWK="$AWK" # Let the user override the test.
  +  if test -n "$CC"; then
  +  ac_cv_prog_CC="$CC" # Let the user override the test.
   else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   for as_dir in $PATH
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  -    ac_cv_prog_AWK="$ac_prog"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    ac_cv_prog_CC="${ac_tool_prefix}cc"
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  +  done
  +IFS=$as_save_IFS
  +
  +fi
  +fi
  +CC=$ac_cv_prog_CC
  +if test -n "$CC"; then
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
  +$as_echo "$CC" >&6; }
  +else
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  +$as_echo "no" >&6; }
  +fi
  +
  +
  +  fi
  +fi
  +if test -z "$CC"; then
  +  # Extract the first word of "cc", so it can be a program name with args.
  +set dummy cc; ac_word=$2
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  +$as_echo_n "checking for $ac_word... " >&6; }
  +if test "${ac_cv_prog_CC+set}" = set; then :
  +  $as_echo_n "(cached) " >&6
  +else
  +  if test -n "$CC"; then
  +  ac_cv_prog_CC="$CC" # Let the user override the test.
  +else
  +  ac_prog_rejected=no
  +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  +for as_dir in $PATH
  +do
  +  IFS=$as_save_IFS
  +  test -z "$as_dir" && as_dir=.
  +    for ac_exec_ext in '' $ac_executable_extensions; do
  +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  +    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
  +       ac_prog_rejected=yes
  +       continue
  +     fi
  +    ac_cv_prog_CC="cc"
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    break 2
  +  fi
   done
  +  done
   IFS=$as_save_IFS
   
  +if test $ac_prog_rejected = yes; then
  +  # We found a bogon in the path, so make sure we never use it.
  +  set dummy $ac_cv_prog_CC
  +  shift
  +  if test $# != 0; then
  +    # We chose a different compiler from the bogus one.
  +    # However, it has the same basename, so the bogon will be chosen
  +    # first if we set CC to just the basename; use the full file name.
  +    shift
  +    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
  +  fi
   fi
   fi
  -AWK=$ac_cv_prog_AWK
  -if test -n "$AWK"; then
  -  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
  -$as_echo "$AWK" >&6; }
  +fi
  +CC=$ac_cv_prog_CC
  +if test -n "$CC"; then
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
  +$as_echo "$CC" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
   
  -  test -n "$AWK" && break
  +fi
  +if test -z "$CC"; then
  +  if test -n "$ac_tool_prefix"; then
  +  for ac_prog in cl.exe
  +  do
  +    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  +$as_echo_n "checking for $ac_word... " >&6; }
  +if test "${ac_cv_prog_CC+set}" = set; then :
  +  $as_echo_n "(cached) " >&6
  +else
  +  if test -n "$CC"; then
  +  ac_cv_prog_CC="$CC" # Let the user override the test.
  +else
  +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  +for as_dir in $PATH
  +do
  +  IFS=$as_save_IFS
  +  test -z "$as_dir" && as_dir=.
  +    for ac_exec_ext in '' $ac_executable_extensions; do
  +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  +    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    break 2
  +  fi
   done
  +  done
  +IFS=$as_save_IFS
   
  -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
  -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
  -set x ${MAKE-make}
  -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
  -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
  +fi
  +fi
  +CC=$ac_cv_prog_CC
  +if test -n "$CC"; then
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
  +$as_echo "$CC" >&6; }
  +else
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  +$as_echo "no" >&6; }
  +fi
  +
  +
  +    test -n "$CC" && break
  +  done
  +fi
  +if test -z "$CC"; then
  +  ac_ct_CC=$CC
  +  for ac_prog in cl.exe
  +do
  +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  +set dummy $ac_prog; ac_word=$2
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  +$as_echo_n "checking for $ac_word... " >&6; }
  +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
  -  cat >conftest.make <<\_ACEOF
  -SHELL = /bin/sh
  -all:
  -	@echo '@@@%%%=$(MAKE)=@@@%%%'
  -_ACEOF
  -# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  -case `${MAKE-make} -f conftest.make 2>/dev/null` in
  -  *@@@%%%=?*=@@@%%%*)
  -    eval ac_cv_prog_make_${ac_make}_set=yes;;
  -  *)
  -    eval ac_cv_prog_make_${ac_make}_set=no;;
  -esac
  -rm -f conftest.make
  +  if test -n "$ac_ct_CC"; then
  +  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
  +else
  +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  +for as_dir in $PATH
  +do
  +  IFS=$as_save_IFS
  +  test -z "$as_dir" && as_dir=.
  +    for ac_exec_ext in '' $ac_executable_extensions; do
  +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  +    ac_cv_prog_ac_ct_CC="$ac_prog"
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    break 2
  +  fi
  +done
  +  done
  +IFS=$as_save_IFS
  +
   fi
  -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
  -  { $as_echo "$as_me:$LINENO: result: yes" >&5
  -$as_echo "yes" >&6; }
  -  SET_MAKE=
  +fi
  +ac_ct_CC=$ac_cv_prog_ac_ct_CC
  +if test -n "$ac_ct_CC"; then
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
  +$as_echo "$ac_ct_CC" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
  -  SET_MAKE="MAKE=${MAKE-make}"
   fi
   
  -rm -rf .tst 2>/dev/null
  -mkdir .tst 2>/dev/null
  -if test -d .tst; then
  -  am__leading_dot=.
  -else
  -  am__leading_dot=_
  -fi
  -rmdir .tst 2>/dev/null
   
  -if test "`cd $srcdir && pwd`" != "`pwd`"; then
  -  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
  -  # is not polluted with repeated "-I."
  -  am__isrc=' -I$(srcdir)'
  -  # test to see if srcdir already configured
  -  if test -f $srcdir/config.status; then
  -    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
  -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
  -   { (exit 1); exit 1; }; }
  -  fi
  -fi
  +  test -n "$ac_ct_CC" && break
  +done
   
  -# test whether we have cygpath
  -if test -z "$CYGPATH_W"; then
  -  if (cygpath --version) >/dev/null 2>/dev/null; then
  -    CYGPATH_W='cygpath -w'
  +  if test "x$ac_ct_CC" = x; then
  +    CC=""
     else
  -    CYGPATH_W=echo
  +    case $cross_compiling:$ac_tool_warned in
  +yes:)
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  +ac_tool_warned=yes ;;
  +esac
  +    CC=$ac_ct_CC
     fi
   fi
   
  +fi
   
  -# Define the identity of the package.
  - PACKAGE='pcre'
  - VERSION='8.00'
  -
  -
  -cat >>confdefs.h <<_ACEOF
  -#define PACKAGE "$PACKAGE"
  -_ACEOF
   
  +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  +as_fn_error "no acceptable C compiler found in \$PATH
  +See \`config.log' for more details." "$LINENO" 5; }
   
  -cat >>confdefs.h <<_ACEOF
  -#define VERSION "$VERSION"
  -_ACEOF
  +# Provide some information about the compiler.
  +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
  +set X $ac_compile
  +ac_compiler=$2
  +for ac_option in --version -v -V -qversion; do
  +  { { ac_try="$ac_compiler $ac_option >&5"
  +case "(($ac_try" in
  +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  +  *) ac_try_echo=$ac_try;;
  +esac
  +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  +$as_echo "$ac_try_echo"; } >&5
  +  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
  +  ac_status=$?
  +  if test -s conftest.err; then
  +    sed '10a\
  +... rest of stderr output deleted ...
  +         10q' conftest.err >conftest.er1
  +    cat conftest.er1 >&5
  +  fi
  +  rm -f conftest.er1 conftest.err
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; }
  +done
   
  -# Some tools Automake needs.
  +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
   
  -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
  +int
  +main ()
  +{
   
  +  ;
  +  return 0;
  +}
  +_ACEOF
  +ac_clean_files_save=$ac_clean_files
  +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
  +# Try to create an executable without -o first, disregard a.out.
  +# It will help us diagnose broken compilers, and finding out an intuition
  +# of exeext.
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
  +$as_echo_n "checking whether the C compiler works... " >&6; }
  +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
   
  -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
  +# The possible output files:
  +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
   
  +ac_rmfiles=
  +for ac_file in $ac_files
  +do
  +  case $ac_file in
  +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
  +    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
  +  esac
  +done
  +rm -f $ac_rmfiles
   
  -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
  +if { { ac_try="$ac_link_default"
  +case "(($ac_try" in
  +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  +  *) ac_try_echo=$ac_try;;
  +esac
  +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  +$as_echo "$ac_try_echo"; } >&5
  +  (eval "$ac_link_default") 2>&5
  +  ac_status=$?
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; }; then :
  +  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
  +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
  +# in a Makefile.  We should not override ac_cv_exeext if it was cached,
  +# so that the user can short-circuit this test for compilers unknown to
  +# Autoconf.
  +for ac_file in $ac_files ''
  +do
  +  test -f "$ac_file" || continue
  +  case $ac_file in
  +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
  +	;;
  +    [ab].out )
  +	# We found the default executable, but exeext='' is most
  +	# certainly right.
  +	break;;
  +    *.* )
  +	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
  +	then :; else
  +	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  +	fi
  +	# We set ac_cv_exeext here because the later test for it is not
  +	# safe: cross compilers may not add the suffix if given an `-o'
  +	# argument, so we may need to know it at that point already.
  +	# Even if this section looks crufty: it has the advantage of
  +	# actually working.
  +	break;;
  +    * )
  +	break;;
  +  esac
  +done
  +test "$ac_cv_exeext" = no && ac_cv_exeext=
   
  +else
  +  ac_file=''
  +fi
  +if test -z "$ac_file"; then :
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  +$as_echo "no" >&6; }
  +$as_echo "$as_me: failed program was:" >&5
  +sed 's/^/| /' conftest.$ac_ext >&5
   
  -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
  +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  +{ as_fn_set_status 77
  +as_fn_error "C compiler cannot create executables
  +See \`config.log' for more details." "$LINENO" 5; }; }
  +else
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  +$as_echo "yes" >&6; }
  +fi
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
  +$as_echo_n "checking for C compiler default output file name... " >&6; }
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
  +$as_echo "$ac_file" >&6; }
  +ac_exeext=$ac_cv_exeext
   
  +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
  +ac_clean_files=$ac_clean_files_save
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
  +$as_echo_n "checking for suffix of executables... " >&6; }
  +if { { ac_try="$ac_link"
  +case "(($ac_try" in
  +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  +  *) ac_try_echo=$ac_try;;
  +esac
  +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  +$as_echo "$ac_try_echo"; } >&5
  +  (eval "$ac_link") 2>&5
  +  ac_status=$?
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; }; then :
  +  # If both `conftest.exe' and `conftest' are `present' (well, observable)
  +# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
  +# work properly (i.e., refer to `conftest.exe'), while it won't with
  +# `rm'.
  +for ac_file in conftest.exe conftest conftest.*; do
  +  test -f "$ac_file" || continue
  +  case $ac_file in
  +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
  +    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  +	  break;;
  +    * ) break;;
  +  esac
  +done
  +else
  +  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  +as_fn_error "cannot compute suffix of executables: cannot compile and link
  +See \`config.log' for more details." "$LINENO" 5; }
  +fi
  +rm -f conftest conftest$ac_cv_exeext
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
  +$as_echo "$ac_cv_exeext" >&6; }
   
  -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
  +rm -f conftest.$ac_ext
  +EXEEXT=$ac_cv_exeext
  +ac_exeext=$EXEEXT
  +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +#include <stdio.h>
  +int
  +main ()
  +{
  +FILE *f = fopen ("conftest.out", "w");
  + return ferror (f) || fclose (f) != 0;
   
  -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
  +  ;
  +  return 0;
  +}
  +_ACEOF
  +ac_clean_files="$ac_clean_files conftest.out"
  +# Check that the compiler produces executables we can run.  If not, either
  +# the compiler is broken, or we cross compile.
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
  +$as_echo_n "checking whether we are cross compiling... " >&6; }
  +if test "$cross_compiling" != yes; then
  +  { { ac_try="$ac_link"
  +case "(($ac_try" in
  +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  +  *) ac_try_echo=$ac_try;;
  +esac
  +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  +$as_echo "$ac_try_echo"; } >&5
  +  (eval "$ac_link") 2>&5
  +  ac_status=$?
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; }
  +  if { ac_try='./conftest$ac_cv_exeext'
  +  { { case "(($ac_try" in
  +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  +  *) ac_try_echo=$ac_try;;
  +esac
  +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  +$as_echo "$ac_try_echo"; } >&5
  +  (eval "$ac_try") 2>&5
  +  ac_status=$?
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; }; }; then
  +    cross_compiling=no
  +  else
  +    if test "$cross_compiling" = maybe; then
  +	cross_compiling=yes
  +    else
  +	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  +as_fn_error "cannot run C compiled programs.
  +If you meant to cross compile, use \`--host'.
  +See \`config.log' for more details." "$LINENO" 5; }
  +    fi
  +  fi
  +fi
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
  +$as_echo "$cross_compiling" >&6; }
   
  -# Installed binaries are usually stripped using `strip' when the user
  -# run `make install-strip'.  However `strip' might not be the right
  -# tool to use in cross-compilation environments, therefore Automake
  -# will honor the `STRIP' environment variable to overrule this program.
  -if test "$cross_compiling" != no; then
  -  if test -n "$ac_tool_prefix"; then
  -  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  -set dummy ${ac_tool_prefix}strip; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  -$as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_STRIP+set}" = set; then
  +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
  +ac_clean_files=$ac_clean_files_save
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
  +$as_echo_n "checking for suffix of object files... " >&6; }
  +if test "${ac_cv_objext+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
  -  if test -n "$STRIP"; then
  -  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
  -else
  -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  -for as_dir in $PATH
  -do
  -  IFS=$as_save_IFS
  -  test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  -    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  -    break 2
  -  fi
  -done
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +
  +int
  +main ()
  +{
  +
  +  ;
  +  return 0;
  +}
  +_ACEOF
  +rm -f conftest.o conftest.obj
  +if { { ac_try="$ac_compile"
  +case "(($ac_try" in
  +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  +  *) ac_try_echo=$ac_try;;
  +esac
  +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  +$as_echo "$ac_try_echo"; } >&5
  +  (eval "$ac_compile") 2>&5
  +  ac_status=$?
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; }; then :
  +  for ac_file in conftest.o conftest.obj conftest.*; do
  +  test -f "$ac_file" || continue;
  +  case $ac_file in
  +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
  +    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
  +       break;;
  +  esac
   done
  -IFS=$as_save_IFS
  +else
  +  $as_echo "$as_me: failed program was:" >&5
  +sed 's/^/| /' conftest.$ac_ext >&5
   
  +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  +as_fn_error "cannot compute suffix of object files: cannot compile
  +See \`config.log' for more details." "$LINENO" 5; }
   fi
  +rm -f conftest.$ac_cv_objext conftest.$ac_ext
   fi
  -STRIP=$ac_cv_prog_STRIP
  -if test -n "$STRIP"; then
  -  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
  -$as_echo "$STRIP" >&6; }
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
  +$as_echo "$ac_cv_objext" >&6; }
  +OBJEXT=$ac_cv_objext
  +ac_objext=$OBJEXT
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
  +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
  +if test "${ac_cv_c_compiler_gnu+set}" = set; then :
  +  $as_echo_n "(cached) " >&6
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  -$as_echo "no" >&6; }
  -fi
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
   
  +int
  +main ()
  +{
  +#ifndef __GNUC__
  +       choke me
  +#endif
   
  -fi
  -if test -z "$ac_cv_prog_STRIP"; then
  -  ac_ct_STRIP=$STRIP
  -  # Extract the first word of "strip", so it can be a program name with args.
  -set dummy strip; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  -$as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  if test -n "$ac_ct_STRIP"; then
  -  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
  +  ;
  +  return 0;
  +}
  +_ACEOF
  +if ac_fn_c_try_compile "$LINENO"; then :
  +  ac_compiler_gnu=yes
   else
  -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  -for as_dir in $PATH
  -do
  -  IFS=$as_save_IFS
  -  test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  -    ac_cv_prog_ac_ct_STRIP="strip"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  -    break 2
  -  fi
  -done
  -done
  -IFS=$as_save_IFS
  -
  +  ac_compiler_gnu=no
   fi
  +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  +ac_cv_c_compiler_gnu=$ac_compiler_gnu
  +
   fi
  -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
  -if test -n "$ac_ct_STRIP"; then
  -  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
  -$as_echo "$ac_ct_STRIP" >&6; }
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
  +$as_echo "$ac_cv_c_compiler_gnu" >&6; }
  +if test $ac_compiler_gnu = yes; then
  +  GCC=yes
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  -$as_echo "no" >&6; }
  +  GCC=
   fi
  -
  -  if test "x$ac_ct_STRIP" = x; then
  -    STRIP=":"
  -  else
  -    case $cross_compiling:$ac_tool_warned in
  -yes:)
  -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  -ac_tool_warned=yes ;;
  -esac
  -    STRIP=$ac_ct_STRIP
  -  fi
  +ac_test_CFLAGS=${CFLAGS+set}
  +ac_save_CFLAGS=$CFLAGS
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
  +$as_echo_n "checking whether $CC accepts -g... " >&6; }
  +if test "${ac_cv_prog_cc_g+set}" = set; then :
  +  $as_echo_n "(cached) " >&6
   else
  -  STRIP="$ac_cv_prog_STRIP"
  -fi
  -
  -fi
  -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
  -
  -# We need awk for the "check" target.  The system "awk" is bad on
  -# some platforms.
  -# Always define AMTAR for backward compatibility.
  -
  -AMTAR=${AMTAR-"${am_missing_run}tar"}
  +  ac_save_c_werror_flag=$ac_c_werror_flag
  +   ac_c_werror_flag=yes
  +   ac_cv_prog_cc_g=no
  +   CFLAGS="-g"
  +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
   
  -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
  +int
  +main ()
  +{
   
  +  ;
  +  return 0;
  +}
  +_ACEOF
  +if ac_fn_c_try_compile "$LINENO"; then :
  +  ac_cv_prog_cc_g=yes
  +else
  +  CFLAGS=""
  +      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
   
  +int
  +main ()
  +{
   
  +  ;
  +  return 0;
  +}
  +_ACEOF
  +if ac_fn_c_try_compile "$LINENO"; then :
   
  +else
  +  ac_c_werror_flag=$ac_save_c_werror_flag
  +	 CFLAGS="-g"
  +	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
   
  -ac_config_headers="$ac_config_headers config.h"
  +int
  +main ()
  +{
   
  +  ;
  +  return 0;
  +}
  +_ACEOF
  +if ac_fn_c_try_compile "$LINENO"; then :
  +  ac_cv_prog_cc_g=yes
  +fi
  +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  +fi
  +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  +fi
  +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  +   ac_c_werror_flag=$ac_save_c_werror_flag
  +fi
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
  +$as_echo "$ac_cv_prog_cc_g" >&6; }
  +if test "$ac_test_CFLAGS" = set; then
  +  CFLAGS=$ac_save_CFLAGS
  +elif test $ac_cv_prog_cc_g = yes; then
  +  if test "$GCC" = yes; then
  +    CFLAGS="-g -O2"
  +  else
  +    CFLAGS="-g"
  +  fi
  +else
  +  if test "$GCC" = yes; then
  +    CFLAGS="-O2"
  +  else
  +    CFLAGS=
  +  fi
  +fi
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
  +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
  +if test "${ac_cv_prog_cc_c89+set}" = set; then :
  +  $as_echo_n "(cached) " >&6
  +else
  +  ac_cv_prog_cc_c89=no
  +ac_save_CC=$CC
  +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +#include <stdarg.h>
  +#include <stdio.h>
  +#include <sys/types.h>
  +#include <sys/stat.h>
  +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
  +struct buf { int x; };
  +FILE * (*rcsopen) (struct buf *, struct stat *, int);
  +static char *e (p, i)
  +     char **p;
  +     int i;
  +{
  +  return p[i];
  +}
  +static char *f (char * (*g) (char **, int), char **p, ...)
  +{
  +  char *s;
  +  va_list v;
  +  va_start (v,p);
  +  s = g (p, va_arg (v,int));
  +  va_end (v);
  +  return s;
  +}
   
  -# The default CFLAGS and CXXFLAGS in Autoconf are "-g -O2" for gcc and just
  -# "-g" for any other compiler. There doesn't seem to be a standard way of
  -# getting rid of the -g (which I don't think is needed for a production
  -# library). This fudge seems to achieve the necessary. First, we remember the
  -# externally set values of CFLAGS and CXXFLAGS. Then call the AC_PROG_CC and
  -# AC_PROG_CXX macros to find the compilers - if CFLAGS and CXXFLAGS are not
  -# set, they will be set to Autoconf's defaults. Afterwards, if the original
  -# values were not set, remove the -g from the Autoconf defaults.
  -# (PH 02-May-07)
  +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
  +   function prototypes and stuff, but not '\xHH' hex character constants.
  +   These don't provoke an error unfortunately, instead are silently treated
  +   as 'x'.  The following induces an error, until -std is added to get
  +   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
  +   array size at least.  It's necessary to write '\x00'==0 to get something
  +   that's true only with -std.  */
  +int osf4_cc_array ['\x00' == 0 ? 1 : -1];
   
  -remember_set_CFLAGS="$CFLAGS"
  -remember_set_CXXFLAGS="$CXXFLAGS"
  +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
  +   inside strings and character constants.  */
  +#define FOO(x) 'x'
  +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
   
  -ac_ext=c
  -ac_cpp='$CPP $CPPFLAGS'
  -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  -ac_compiler_gnu=$ac_cv_c_compiler_gnu
  -if test -n "$ac_tool_prefix"; then
  -  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  -set dummy ${ac_tool_prefix}gcc; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  -$as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_CC+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  if test -n "$CC"; then
  -  ac_cv_prog_CC="$CC" # Let the user override the test.
  -else
  -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  -for as_dir in $PATH
  +int test (int i, double x);
  +struct s1 {int (*f) (int a);};
  +struct s2 {int (*f) (double a);};
  +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
  +int argc;
  +char **argv;
  +int
  +main ()
  +{
  +return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
  +  ;
  +  return 0;
  +}
  +_ACEOF
  +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
  +	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
   do
  -  IFS=$as_save_IFS
  -  test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  -    ac_cv_prog_CC="${ac_tool_prefix}gcc"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  -    break 2
  -  fi
  -done
  +  CC="$ac_save_CC $ac_arg"
  +  if ac_fn_c_try_compile "$LINENO"; then :
  +  ac_cv_prog_cc_c89=$ac_arg
  +fi
  +rm -f core conftest.err conftest.$ac_objext
  +  test "x$ac_cv_prog_cc_c89" != "xno" && break
   done
  -IFS=$as_save_IFS
  +rm -f conftest.$ac_ext
  +CC=$ac_save_CC
  +
  +fi
  +# AC_CACHE_VAL
  +case "x$ac_cv_prog_cc_c89" in
  +  x)
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
  +$as_echo "none needed" >&6; } ;;
  +  xno)
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
  +$as_echo "unsupported" >&6; } ;;
  +  *)
  +    CC="$CC $ac_cv_prog_cc_c89"
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
  +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
  +esac
  +if test "x$ac_cv_prog_cc_c89" != xno; then :
   
   fi
  -fi
  -CC=$ac_cv_prog_CC
  -if test -n "$CC"; then
  -  { $as_echo "$as_me:$LINENO: result: $CC" >&5
  -$as_echo "$CC" >&6; }
  -else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  -$as_echo "no" >&6; }
  -fi
   
  +ac_ext=c
  +ac_cpp='$CPP $CPPFLAGS'
  +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  +ac_compiler_gnu=$ac_cv_c_compiler_gnu
  +DEPDIR="${am__leading_dot}deps"
   
  -fi
  -if test -z "$ac_cv_prog_CC"; then
  -  ac_ct_CC=$CC
  -  # Extract the first word of "gcc", so it can be a program name with args.
  -set dummy gcc; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  -$as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  if test -n "$ac_ct_CC"; then
  -  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
  -else
  -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  -for as_dir in $PATH
  -do
  -  IFS=$as_save_IFS
  -  test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  -    ac_cv_prog_ac_ct_CC="gcc"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  -    break 2
  -  fi
  -done
  -done
  -IFS=$as_save_IFS
  +ac_config_commands="$ac_config_commands depfiles"
   
  +
  +am_make=${MAKE-make}
  +cat > confinc << 'END'
  +am__doit:
  +	@echo done
  +.PHONY: am__doit
  +END
  +# If we don't find an include directive, just comment out the code.
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
  +$as_echo_n "checking for style of include used by $am_make... " >&6; }
  +am__include="#"
  +am__quote=
  +_am_result=none
  +# First try GNU make style include.
  +echo "include confinc" > confmf
  +# We grep out `Entering directory' and `Leaving directory'
  +# messages which can occur if `w' ends up in MAKEFLAGS.
  +# In particular we don't look at `^make:' because GNU make might
  +# be invoked under some other name (usually "gmake"), in which
  +# case it prints its new name instead of `make'.
  +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
  +   am__include=include
  +   am__quote=
  +   _am_result=GNU
   fi
  -fi
  -ac_ct_CC=$ac_cv_prog_ac_ct_CC
  -if test -n "$ac_ct_CC"; then
  -  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
  -$as_echo "$ac_ct_CC" >&6; }
  -else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  -$as_echo "no" >&6; }
  +# Now try BSD make style include.
  +if test "$am__include" = "#"; then
  +   echo '.include "confinc"' > confmf
  +   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
  +      am__include=.include
  +      am__quote="\""
  +      _am_result=BSD
  +   fi
   fi
   
  -  if test "x$ac_ct_CC" = x; then
  -    CC=""
  -  else
  -    case $cross_compiling:$ac_tool_warned in
  -yes:)
  -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  -ac_tool_warned=yes ;;
  -esac
  -    CC=$ac_ct_CC
  -  fi
  -else
  -  CC="$ac_cv_prog_CC"
  -fi
   
  -if test -z "$CC"; then
  -          if test -n "$ac_tool_prefix"; then
  -    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  -set dummy ${ac_tool_prefix}cc; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  -$as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_CC+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  if test -n "$CC"; then
  -  ac_cv_prog_CC="$CC" # Let the user override the test.
  -else
  -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  -for as_dir in $PATH
  -do
  -  IFS=$as_save_IFS
  -  test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  -    ac_cv_prog_CC="${ac_tool_prefix}cc"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  -    break 2
  -  fi
  -done
  -done
  -IFS=$as_save_IFS
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
  +$as_echo "$_am_result" >&6; }
  +rm -f confinc confmf
   
  +# Check whether --enable-dependency-tracking was given.
  +if test "${enable_dependency_tracking+set}" = set; then :
  +  enableval=$enable_dependency_tracking;
   fi
  +
  +if test "x$enable_dependency_tracking" != xno; then
  +  am_depcomp="$ac_aux_dir/depcomp"
  +  AMDEPBACKSLASH='\'
   fi
  -CC=$ac_cv_prog_CC
  -if test -n "$CC"; then
  -  { $as_echo "$as_me:$LINENO: result: $CC" >&5
  -$as_echo "$CC" >&6; }
  + if test "x$enable_dependency_tracking" != xno; then
  +  AMDEP_TRUE=
  +  AMDEP_FALSE='#'
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  -$as_echo "no" >&6; }
  +  AMDEP_TRUE='#'
  +  AMDEP_FALSE=
   fi
   
   
  -  fi
  -fi
  -if test -z "$CC"; then
  -  # Extract the first word of "cc", so it can be a program name with args.
  -set dummy cc; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  -$as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_CC+set}" = set; then
  +
  +depcc="$CC"   am_compiler_list=
  +
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
  +$as_echo_n "checking dependency style of $depcc... " >&6; }
  +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
  -  if test -n "$CC"; then
  -  ac_cv_prog_CC="$CC" # Let the user override the test.
  -else
  -  ac_prog_rejected=no
  -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  -for as_dir in $PATH
  -do
  -  IFS=$as_save_IFS
  -  test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  -    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
  -       ac_prog_rejected=yes
  -       continue
  -     fi
  -    ac_cv_prog_CC="cc"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  -    break 2
  -  fi
  -done
  -done
  -IFS=$as_save_IFS
  +  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
  +  # We make a subdir and do the tests there.  Otherwise we can end up
  +  # making bogus files that we don't know about and never remove.  For
  +  # instance it was reported that on HP-UX the gcc test will end up
  +  # making a dummy file named `D' -- because `-MD' means `put the output
  +  # in D'.
  +  mkdir conftest.dir
  +  # Copy depcomp to subdir because otherwise we won't find it if we're
  +  # using a relative directory.
  +  cp "$am_depcomp" conftest.dir
  +  cd conftest.dir
  +  # We will build objects and dependencies in a subdirectory because
  +  # it helps to detect inapplicable dependency modes.  For instance
  +  # both Tru64's cc and ICC support -MD to output dependencies as a
  +  # side effect of compilation, but ICC will put the dependencies in
  +  # the current directory while Tru64 will put them in the object
  +  # directory.
  +  mkdir sub
   
  -if test $ac_prog_rejected = yes; then
  -  # We found a bogon in the path, so make sure we never use it.
  -  set dummy $ac_cv_prog_CC
  -  shift
  -  if test $# != 0; then
  -    # We chose a different compiler from the bogus one.
  -    # However, it has the same basename, so the bogon will be chosen
  -    # first if we set CC to just the basename; use the full file name.
  -    shift
  -    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
  +  am_cv_CC_dependencies_compiler_type=none
  +  if test "$am_compiler_list" = ""; then
  +     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
     fi
  -fi
  -fi
  -fi
  -CC=$ac_cv_prog_CC
  -if test -n "$CC"; then
  -  { $as_echo "$as_me:$LINENO: result: $CC" >&5
  -$as_echo "$CC" >&6; }
  +  am__universal=false
  +  case " $depcc " in #(
  +     *\ -arch\ *\ -arch\ *) am__universal=true ;;
  +     esac
  +
  +  for depmode in $am_compiler_list; do
  +    # Setup a source with many dependencies, because some compilers
  +    # like to wrap large dependency lists on column 80 (with \), and
  +    # we should not choose a depcomp mode which is confused by this.
  +    #
  +    # We need to recreate these files for each test, as the compiler may
  +    # overwrite some of them when testing with obscure command lines.
  +    # This happens at least with the AIX C compiler.
  +    : > sub/conftest.c
  +    for i in 1 2 3 4 5 6; do
  +      echo '#include "conftst'$i'.h"' >> sub/conftest.c
  +      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
  +      # Solaris 8's {/usr,}/bin/sh.
  +      touch sub/conftst$i.h
  +    done
  +    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  +
  +    # We check with `-c' and `-o' for the sake of the "dashmstdout"
  +    # mode.  It turns out that the SunPro C++ compiler does not properly
  +    # handle `-M -o', and we need to detect this.  Also, some Intel
  +    # versions had trouble with output in subdirs
  +    am__obj=sub/conftest.${OBJEXT-o}
  +    am__minus_obj="-o $am__obj"
  +    case $depmode in
  +    gcc)
  +      # This depmode causes a compiler race in universal mode.
  +      test "$am__universal" = false || continue
  +      ;;
  +    nosideeffect)
  +      # after this tag, mechanisms are not by side-effect, so they'll
  +      # only be used when explicitly requested
  +      if test "x$enable_dependency_tracking" = xyes; then
  +	continue
  +      else
  +	break
  +      fi
  +      ;;
  +    msvisualcpp | msvcmsys)
  +      # This compiler won't grok `-c -o', but also, the minuso test has
  +      # not run yet.  These depmodes are late enough in the game, and
  +      # so weak that their functioning should not be impacted.
  +      am__obj=conftest.${OBJEXT-o}
  +      am__minus_obj=
  +      ;;
  +    none) break ;;
  +    esac
  +    if depmode=$depmode \
  +       source=sub/conftest.c object=$am__obj \
  +       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
  +       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
  +         >/dev/null 2>conftest.err &&
  +       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
  +       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
  +       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
  +       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
  +      # icc doesn't choke on unknown options, it will just issue warnings
  +      # or remarks (even with -Werror).  So we grep stderr for any message
  +      # that says an option was ignored or not supported.
  +      # When given -MP, icc 7.0 and 7.1 complain thusly:
  +      #   icc: Command line warning: ignoring option '-M'; no argument required
  +      # The diagnosis changed in icc 8.0:
  +      #   icc: Command line remark: option '-MP' not supported
  +      if (grep 'ignoring option' conftest.err ||
  +          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
  +        am_cv_CC_dependencies_compiler_type=$depmode
  +        break
  +      fi
  +    fi
  +  done
  +
  +  cd ..
  +  rm -rf conftest.dir
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  -$as_echo "no" >&6; }
  +  am_cv_CC_dependencies_compiler_type=none
   fi
   
  +fi
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
  +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
  +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
   
  + if
  +  test "x$enable_dependency_tracking" != xno \
  +  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
  +  am__fastdepCC_TRUE=
  +  am__fastdepCC_FALSE='#'
  +else
  +  am__fastdepCC_TRUE='#'
  +  am__fastdepCC_FALSE=
   fi
  -if test -z "$CC"; then
  -  if test -n "$ac_tool_prefix"; then
  -  for ac_prog in cl.exe
  +
  +
  +ac_ext=cpp
  +ac_cpp='$CXXCPP $CPPFLAGS'
  +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  +if test -z "$CXX"; then
  +  if test -n "$CCC"; then
  +    CXX=$CCC
  +  else
  +    if test -n "$ac_tool_prefix"; then
  +  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
     do
       # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
   set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_CC+set}" = set; then
  +if test "${ac_cv_prog_CXX+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
  -  if test -n "$CC"; then
  -  ac_cv_prog_CC="$CC" # Let the user override the test.
  +  if test -n "$CXX"; then
  +  ac_cv_prog_CXX="$CXX" # Let the user override the test.
   else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   for as_dir in $PATH
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  -    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
  -CC=$ac_cv_prog_CC
  -if test -n "$CC"; then
  -  { $as_echo "$as_me:$LINENO: result: $CC" >&5
  -$as_echo "$CC" >&6; }
  +CXX=$ac_cv_prog_CXX
  +if test -n "$CXX"; then
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
  +$as_echo "$CXX" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
   
  -    test -n "$CC" && break
  +    test -n "$CXX" && break
     done
   fi
  -if test -z "$CC"; then
  -  ac_ct_CC=$CC
  -  for ac_prog in cl.exe
  +if test -z "$CXX"; then
  +  ac_ct_CXX=$CXX
  +  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
   do
     # Extract the first word of "$ac_prog", so it can be a program name with args.
   set dummy $ac_prog; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
  +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
  -  if test -n "$ac_ct_CC"; then
  -  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
  +  if test -n "$ac_ct_CXX"; then
  +  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
   else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   for as_dir in $PATH
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  -    ac_cv_prog_ac_ct_CC="$ac_prog"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    ac_cv_prog_ac_ct_CXX="$ac_prog"
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
  -ac_ct_CC=$ac_cv_prog_ac_ct_CC
  -if test -n "$ac_ct_CC"; then
  -  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
  -$as_echo "$ac_ct_CC" >&6; }
  +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
  +if test -n "$ac_ct_CXX"; then
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
  +$as_echo "$ac_ct_CXX" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
   
  -  test -n "$ac_ct_CC" && break
  +  test -n "$ac_ct_CXX" && break
   done
   
  -  if test "x$ac_ct_CC" = x; then
  -    CC=""
  +  if test "x$ac_ct_CXX" = x; then
  +    CXX="g++"
     else
       case $cross_compiling:$ac_tool_warned in
   yes:)
  -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
   $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
   ac_tool_warned=yes ;;
   esac
  -    CC=$ac_ct_CC
  -  fi
  -fi
  -
  -fi
  -
  -
  -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
  -See \`config.log' for more details." >&5
  -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
  -See \`config.log' for more details." >&2;}
  -   { (exit 1); exit 1; }; }; }
  -
  -# Provide some information about the compiler.
  -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
  -set X $ac_compile
  -ac_compiler=$2
  -{ (ac_try="$ac_compiler --version >&5"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compiler --version >&5") 2>&5
  -  ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }
  -{ (ac_try="$ac_compiler -v >&5"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compiler -v >&5") 2>&5
  -  ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }
  -{ (ac_try="$ac_compiler -V >&5"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compiler -V >&5") 2>&5
  -  ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }
  -
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -
  -int
  -main ()
  -{
  -
  -  ;
  -  return 0;
  -}
  -_ACEOF
  -ac_clean_files_save=$ac_clean_files
  -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
  -# Try to create an executable without -o first, disregard a.out.
  -# It will help us diagnose broken compilers, and finding out an intuition
  -# of exeext.
  -{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
  -$as_echo_n "checking for C compiler default output file name... " >&6; }
  -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
  -
  -# The possible output files:
  -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
  -
  -ac_rmfiles=
  -for ac_file in $ac_files
  -do
  -  case $ac_file in
  -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
  -    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
  -  esac
  -done
  -rm -f $ac_rmfiles
  -
  -if { (ac_try="$ac_link_default"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link_default") 2>&5
  -  ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }; then
  -  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
  -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
  -# in a Makefile.  We should not override ac_cv_exeext if it was cached,
  -# so that the user can short-circuit this test for compilers unknown to
  -# Autoconf.
  -for ac_file in $ac_files ''
  -do
  -  test -f "$ac_file" || continue
  -  case $ac_file in
  -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
  -	;;
  -    [ab].out )
  -	# We found the default executable, but exeext='' is most
  -	# certainly right.
  -	break;;
  -    *.* )
  -        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
  -	then :; else
  -	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  -	fi
  -	# We set ac_cv_exeext here because the later test for it is not
  -	# safe: cross compilers may not add the suffix if given an `-o'
  -	# argument, so we may need to know it at that point already.
  -	# Even if this section looks crufty: it has the advantage of
  -	# actually working.
  -	break;;
  -    * )
  -	break;;
  -  esac
  -done
  -test "$ac_cv_exeext" = no && ac_cv_exeext=
  -
  -else
  -  ac_file=''
  -fi
  -
  -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
  -$as_echo "$ac_file" >&6; }
  -if test -z "$ac_file"; then
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  -{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
  -See \`config.log' for more details." >&5
  -$as_echo "$as_me: error: C compiler cannot create executables
  -See \`config.log' for more details." >&2;}
  -   { (exit 77); exit 77; }; }; }
  -fi
  -
  -ac_exeext=$ac_cv_exeext
  -
  -# Check that the compiler produces executables we can run.  If not, either
  -# the compiler is broken, or we cross compile.
  -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
  -$as_echo_n "checking whether the C compiler works... " >&6; }
  -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
  -# If not cross compiling, check that we can run a simple program.
  -if test "$cross_compiling" != yes; then
  -  if { ac_try='./$ac_file'
  -  { (case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_try") 2>&5
  -  ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }; }; then
  -    cross_compiling=no
  -  else
  -    if test "$cross_compiling" = maybe; then
  -	cross_compiling=yes
  -    else
  -	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
  -If you meant to cross compile, use \`--host'.
  -See \`config.log' for more details." >&5
  -$as_echo "$as_me: error: cannot run C compiled programs.
  -If you meant to cross compile, use \`--host'.
  -See \`config.log' for more details." >&2;}
  -   { (exit 1); exit 1; }; }; }
  -    fi
  -  fi
  -fi
  -{ $as_echo "$as_me:$LINENO: result: yes" >&5
  -$as_echo "yes" >&6; }
  -
  -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
  -ac_clean_files=$ac_clean_files_save
  -# Check that the compiler produces executables we can run.  If not, either
  -# the compiler is broken, or we cross compile.
  -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
  -$as_echo_n "checking whether we are cross compiling... " >&6; }
  -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
  -$as_echo "$cross_compiling" >&6; }
  -
  -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
  -$as_echo_n "checking for suffix of executables... " >&6; }
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>&5
  -  ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }; then
  -  # If both `conftest.exe' and `conftest' are `present' (well, observable)
  -# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
  -# work properly (i.e., refer to `conftest.exe'), while it won't with
  -# `rm'.
  -for ac_file in conftest.exe conftest conftest.*; do
  -  test -f "$ac_file" || continue
  -  case $ac_file in
  -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
  -    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  -	  break;;
  -    * ) break;;
  -  esac
  -done
  -else
  -  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
  -See \`config.log' for more details." >&5
  -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
  -See \`config.log' for more details." >&2;}
  -   { (exit 1); exit 1; }; }; }
  -fi
  -
  -rm -f conftest$ac_cv_exeext
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
  -$as_echo "$ac_cv_exeext" >&6; }
  -
  -rm -f conftest.$ac_ext
  -EXEEXT=$ac_cv_exeext
  -ac_exeext=$EXEEXT
  -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
  -$as_echo_n "checking for suffix of object files... " >&6; }
  -if test "${ac_cv_objext+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -
  -int
  -main ()
  -{
  -
  -  ;
  -  return 0;
  -}
  -_ACEOF
  -rm -f conftest.o conftest.obj
  -if { (ac_try="$ac_compile"
  +    CXX=$ac_ct_CXX
  +  fi
  +fi
  +
  +  fi
  +fi
  +# Provide some information about the compiler.
  +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
  +set X $ac_compile
  +ac_compiler=$2
  +for ac_option in --version -v -V -qversion; do
  +  { { ac_try="$ac_compiler $ac_option >&5"
   case "(($ac_try" in
     *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     *) ac_try_echo=$ac_try;;
   esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>&5
  +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  +$as_echo "$ac_try_echo"; } >&5
  +  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
     ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }; then
  -  for ac_file in conftest.o conftest.obj conftest.*; do
  -  test -f "$ac_file" || continue;
  -  case $ac_file in
  -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
  -    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
  -       break;;
  -  esac
  +  if test -s conftest.err; then
  +    sed '10a\
  +... rest of stderr output deleted ...
  +         10q' conftest.err >conftest.er1
  +    cat conftest.er1 >&5
  +  fi
  +  rm -f conftest.er1 conftest.err
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; }
   done
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
  -See \`config.log' for more details." >&5
  -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
  -See \`config.log' for more details." >&2;}
  -   { (exit 1); exit 1; }; }; }
  -fi
   
  -rm -f conftest.$ac_cv_objext conftest.$ac_ext
  -fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
  -$as_echo "$ac_cv_objext" >&6; }
  -OBJEXT=$ac_cv_objext
  -ac_objext=$OBJEXT
  -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
  -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
  -if test "${ac_cv_c_compiler_gnu+set}" = set; then
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
  +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
  +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   
   int
  @@ -3224,138 +4398,34 @@
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  +if ac_fn_cxx_try_compile "$LINENO"; then :
     ac_compiler_gnu=yes
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	ac_compiler_gnu=no
  +  ac_compiler_gnu=no
   fi
  -
   rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -ac_cv_c_compiler_gnu=$ac_compiler_gnu
  +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
   
   fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
  -$as_echo "$ac_cv_c_compiler_gnu" >&6; }
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
  +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
   if test $ac_compiler_gnu = yes; then
  -  GCC=yes
  +  GXX=yes
   else
  -  GCC=
  +  GXX=
   fi
  -ac_test_CFLAGS=${CFLAGS+set}
  -ac_save_CFLAGS=$CFLAGS
  -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
  -$as_echo_n "checking whether $CC accepts -g... " >&6; }
  -if test "${ac_cv_prog_cc_g+set}" = set; then
  +ac_test_CXXFLAGS=${CXXFLAGS+set}
  +ac_save_CXXFLAGS=$CXXFLAGS
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
  +$as_echo_n "checking whether $CXX accepts -g... " >&6; }
  +if test "${ac_cv_prog_cxx_g+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
  -  ac_save_c_werror_flag=$ac_c_werror_flag
  -   ac_c_werror_flag=yes
  -   ac_cv_prog_cc_g=no
  -   CFLAGS="-g"
  -   cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -
  -int
  -main ()
  -{
  -
  -  ;
  -  return 0;
  -}
  -_ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  ac_cv_prog_cc_g=yes
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	CFLAGS=""
  -      cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -
  -int
  -main ()
  -{
  -
  -  ;
  -  return 0;
  -}
  -_ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  :
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	ac_c_werror_flag=$ac_save_c_werror_flag
  -	 CFLAGS="-g"
  -	 cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
  +   ac_cxx_werror_flag=yes
  +   ac_cv_prog_cxx_g=no
  +   CXXFLAGS="-g"
  +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   
   int
  @@ -3366,247 +4436,75 @@
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  ac_cv_prog_cc_g=yes
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -
  -fi
  -
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -fi
  -
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -fi
  -
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -   ac_c_werror_flag=$ac_save_c_werror_flag
  -fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
  -$as_echo "$ac_cv_prog_cc_g" >&6; }
  -if test "$ac_test_CFLAGS" = set; then
  -  CFLAGS=$ac_save_CFLAGS
  -elif test $ac_cv_prog_cc_g = yes; then
  -  if test "$GCC" = yes; then
  -    CFLAGS="-g -O2"
  -  else
  -    CFLAGS="-g"
  -  fi
  -else
  -  if test "$GCC" = yes; then
  -    CFLAGS="-O2"
  -  else
  -    CFLAGS=
  -  fi
  -fi
  -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
  -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
  -if test "${ac_cv_prog_cc_c89+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  +if ac_fn_cxx_try_compile "$LINENO"; then :
  +  ac_cv_prog_cxx_g=yes
   else
  -  ac_cv_prog_cc_c89=no
  -ac_save_CC=$CC
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +  CXXFLAGS=""
  +      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
  -#include <stdarg.h>
  -#include <stdio.h>
  -#include <sys/types.h>
  -#include <sys/stat.h>
  -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
  -struct buf { int x; };
  -FILE * (*rcsopen) (struct buf *, struct stat *, int);
  -static char *e (p, i)
  -     char **p;
  -     int i;
  -{
  -  return p[i];
  -}
  -static char *f (char * (*g) (char **, int), char **p, ...)
  -{
  -  char *s;
  -  va_list v;
  -  va_start (v,p);
  -  s = g (p, va_arg (v,int));
  -  va_end (v);
  -  return s;
  -}
  -
  -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
  -   function prototypes and stuff, but not '\xHH' hex character constants.
  -   These don't provoke an error unfortunately, instead are silently treated
  -   as 'x'.  The following induces an error, until -std is added to get
  -   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
  -   array size at least.  It's necessary to write '\x00'==0 to get something
  -   that's true only with -std.  */
  -int osf4_cc_array ['\x00' == 0 ? 1 : -1];
  -
  -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
  -   inside strings and character constants.  */
  -#define FOO(x) 'x'
  -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
   
  -int test (int i, double x);
  -struct s1 {int (*f) (int a);};
  -struct s2 {int (*f) (double a);};
  -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
  -int argc;
  -char **argv;
   int
   main ()
   {
  -return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
  -  ;
  -  return 0;
  -}
  -_ACEOF
  -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
  -	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  -do
  -  CC="$ac_save_CC $ac_arg"
  -  rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  ac_cv_prog_cc_c89=$ac_arg
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -
  -fi
  -
  -rm -f core conftest.err conftest.$ac_objext
  -  test "x$ac_cv_prog_cc_c89" != "xno" && break
  -done
  -rm -f conftest.$ac_ext
  -CC=$ac_save_CC
  -
  -fi
  -# AC_CACHE_VAL
  -case "x$ac_cv_prog_cc_c89" in
  -  x)
  -    { $as_echo "$as_me:$LINENO: result: none needed" >&5
  -$as_echo "none needed" >&6; } ;;
  -  xno)
  -    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
  -$as_echo "unsupported" >&6; } ;;
  -  *)
  -    CC="$CC $ac_cv_prog_cc_c89"
  -    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
  -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
  -esac
  -
  -
  -ac_ext=c
  -ac_cpp='$CPP $CPPFLAGS'
  -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  -ac_compiler_gnu=$ac_cv_c_compiler_gnu
  -DEPDIR="${am__leading_dot}deps"
   
  -ac_config_commands="$ac_config_commands depfiles"
  +  ;
  +  return 0;
  +}
  +_ACEOF
  +if ac_fn_cxx_try_compile "$LINENO"; then :
   
  +else
  +  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
  +	 CXXFLAGS="-g"
  +	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
   
  -am_make=${MAKE-make}
  -cat > confinc << 'END'
  -am__doit:
  -	@echo done
  -.PHONY: am__doit
  -END
  -# If we don't find an include directive, just comment out the code.
  -{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
  -$as_echo_n "checking for style of include used by $am_make... " >&6; }
  -am__include="#"
  -am__quote=
  -_am_result=none
  -# First try GNU make style include.
  -echo "include confinc" > confmf
  -# We grep out `Entering directory' and `Leaving directory'
  -# messages which can occur if `w' ends up in MAKEFLAGS.
  -# In particular we don't look at `^make:' because GNU make might
  -# be invoked under some other name (usually "gmake"), in which
  -# case it prints its new name instead of `make'.
  -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
  -   am__include=include
  -   am__quote=
  -   _am_result=GNU
  +int
  +main ()
  +{
  +
  +  ;
  +  return 0;
  +}
  +_ACEOF
  +if ac_fn_cxx_try_compile "$LINENO"; then :
  +  ac_cv_prog_cxx_g=yes
   fi
  -# Now try BSD make style include.
  -if test "$am__include" = "#"; then
  -   echo '.include "confinc"' > confmf
  -   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
  -      am__include=.include
  -      am__quote="\""
  -      _am_result=BSD
  -   fi
  +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   fi
  -
  -
  -{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
  -$as_echo "$_am_result" >&6; }
  -rm -f confinc confmf
  -
  -# Check whether --enable-dependency-tracking was given.
  -if test "${enable_dependency_tracking+set}" = set; then
  -  enableval=$enable_dependency_tracking;
  +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   fi
  -
  -if test "x$enable_dependency_tracking" != xno; then
  -  am_depcomp="$ac_aux_dir/depcomp"
  -  AMDEPBACKSLASH='\'
  +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  +   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
   fi
  - if test "x$enable_dependency_tracking" != xno; then
  -  AMDEP_TRUE=
  -  AMDEP_FALSE='#'
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
  +$as_echo "$ac_cv_prog_cxx_g" >&6; }
  +if test "$ac_test_CXXFLAGS" = set; then
  +  CXXFLAGS=$ac_save_CXXFLAGS
  +elif test $ac_cv_prog_cxx_g = yes; then
  +  if test "$GXX" = yes; then
  +    CXXFLAGS="-g -O2"
  +  else
  +    CXXFLAGS="-g"
  +  fi
   else
  -  AMDEP_TRUE='#'
  -  AMDEP_FALSE=
  +  if test "$GXX" = yes; then
  +    CXXFLAGS="-O2"
  +  else
  +    CXXFLAGS=
  +  fi
   fi
  +ac_ext=c
  +ac_cpp='$CPP $CPPFLAGS'
  +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  +ac_compiler_gnu=$ac_cv_c_compiler_gnu
   
  +depcc="$CXX"  am_compiler_list=
   
  -
  -depcc="$CC"   am_compiler_list=
  -
  -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
   $as_echo_n "checking dependency style of $depcc... " >&6; }
  -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
  +if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
  @@ -3628,10 +4526,15 @@
     # directory.
     mkdir sub
   
  -  am_cv_CC_dependencies_compiler_type=none
  +  am_cv_CXX_dependencies_compiler_type=none
     if test "$am_compiler_list" = ""; then
        am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
     fi
  +  am__universal=false
  +  case " $depcc " in #(
  +     *\ -arch\ *\ -arch\ *) am__universal=true ;;
  +     esac
  +
     for depmode in $am_compiler_list; do
       # Setup a source with many dependencies, because some compilers
       # like to wrap large dependency lists on column 80 (with \), and
  @@ -3649,7 +4552,17 @@
       done
       echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
   
  +    # We check with `-c' and `-o' for the sake of the "dashmstdout"
  +    # mode.  It turns out that the SunPro C++ compiler does not properly
  +    # handle `-M -o', and we need to detect this.  Also, some Intel
  +    # versions had trouble with output in subdirs
  +    am__obj=sub/conftest.${OBJEXT-o}
  +    am__minus_obj="-o $am__obj"
       case $depmode in
  +    gcc)
  +      # This depmode causes a compiler race in universal mode.
  +      test "$am__universal" = false || continue
  +      ;;
       nosideeffect)
         # after this tag, mechanisms are not by side-effect, so they'll
         # only be used when explicitly requested
  @@ -3659,19 +4572,23 @@
   	break
         fi
         ;;
  +    msvisualcpp | msvcmsys)
  +      # This compiler won't grok `-c -o', but also, the minuso test has
  +      # not run yet.  These depmodes are late enough in the game, and
  +      # so weak that their functioning should not be impacted.
  +      am__obj=conftest.${OBJEXT-o}
  +      am__minus_obj=
  +      ;;
       none) break ;;
       esac
  -    # We check with `-c' and `-o' for the sake of the "dashmstdout"
  -    # mode.  It turns out that the SunPro C++ compiler does not properly
  -    # handle `-M -o', and we need to detect this.
       if depmode=$depmode \
  -       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
  +       source=sub/conftest.c object=$am__obj \
          depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
  -       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
  +       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
            >/dev/null 2>conftest.err &&
          grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
          grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
  -       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
  +       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
          ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
         # icc doesn't choke on unknown options, it will just issue warnings
         # or remarks (even with -Werror).  So we grep stderr for any message
  @@ -3682,7 +4599,7 @@
         #   icc: Command line remark: option '-MP' not supported
         if (grep 'ignoring option' conftest.err ||
             grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
  -        am_cv_CC_dependencies_compiler_type=$depmode
  +        am_cv_CXX_dependencies_compiler_type=$depmode
           break
         fi
       fi
  @@ -3691,330 +4608,362 @@
     cd ..
     rm -rf conftest.dir
   else
  -  am_cv_CC_dependencies_compiler_type=none
  +  am_cv_CXX_dependencies_compiler_type=none
   fi
   
   fi
  -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
  -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
  -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
  +$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
  +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
   
    if
     test "x$enable_dependency_tracking" != xno \
  -  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
  -  am__fastdepCC_TRUE=
  -  am__fastdepCC_FALSE='#'
  +  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
  +  am__fastdepCXX_TRUE=
  +  am__fastdepCXX_FALSE='#'
   else
  -  am__fastdepCC_TRUE='#'
  -  am__fastdepCC_FALSE=
  +  am__fastdepCXX_TRUE='#'
  +  am__fastdepCXX_FALSE=
  +fi
  +
  +
  +
  +if test "x$remember_set_CFLAGS" = "x"
  +then
  +  if test "$CFLAGS" = "-g -O2"
  +  then
  +    CFLAGS="-O2"
  +  elif test "$CFLAGS" = "-g"
  +  then
  +    CFLAGS=""
  +  fi
   fi
   
  +if test "x$remember_set_CXXFLAGS" = "x"
  +then
  +  if test "$CXXFLAGS" = "-g -O2"
  +  then
  +    CXXFLAGS="-O2"
  +  elif test "$CXXFLAGS" = "-g"
  +  then
  +    CXXFLAGS=""
  +  fi
  +fi
   
  +# AC_PROG_CXX will return "g++" even if no c++ compiler is installed.
  +# Check for that case, and just disable c++ code if g++ doesn't run.
   ac_ext=cpp
   ac_cpp='$CXXCPP $CPPFLAGS'
   ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
   ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
   ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  -if test -z "$CXX"; then
  -  if test -n "$CCC"; then
  -    CXX=$CCC
  -  else
  -    if test -n "$ac_tool_prefix"; then
  -  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
  -  do
  -    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  -set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  -$as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_CXX+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  if test -n "$CXX"; then
  -  ac_cv_prog_CXX="$CXX" # Let the user override the test.
  -else
  -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  -for as_dir in $PATH
  -do
  -  IFS=$as_save_IFS
  -  test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  -    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  -    break 2
  -  fi
  -done
  -done
  -IFS=$as_save_IFS
   
  -fi
  -fi
  -CXX=$ac_cv_prog_CXX
  -if test -n "$CXX"; then
  -  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
  -$as_echo "$CXX" >&6; }
  +
  +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +
  +int
  +main ()
  +{
  +
  +  ;
  +  return 0;
  +}
  +_ACEOF
  +if ac_fn_cxx_try_compile "$LINENO"; then :
  +
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  -$as_echo "no" >&6; }
  +  CXX=""; CXXCP=""; CXXFLAGS=""
   fi
  +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  +ac_ext=c
  +ac_cpp='$CPP $CPPFLAGS'
  +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  +ac_compiler_gnu=$ac_cv_c_compiler_gnu
   
   
  -    test -n "$CXX" && break
  -  done
  +# Check for a 64-bit integer type
  +
  +ac_ext=c
  +ac_cpp='$CPP $CPPFLAGS'
  +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  +ac_compiler_gnu=$ac_cv_c_compiler_gnu
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
  +$as_echo_n "checking how to run the C preprocessor... " >&6; }
  +# On Suns, sometimes $CPP names a directory.
  +if test -n "$CPP" && test -d "$CPP"; then
  +  CPP=
   fi
  -if test -z "$CXX"; then
  -  ac_ct_CXX=$CXX
  -  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
  -do
  -  # Extract the first word of "$ac_prog", so it can be a program name with args.
  -set dummy $ac_prog; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  -$as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
  +if test -z "$CPP"; then
  +  if test "${ac_cv_prog_CPP+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
  -  if test -n "$ac_ct_CXX"; then
  -  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
  -else
  -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  -for as_dir in $PATH
  +      # Double quotes because CPP needs to be expanded
  +    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
  +    do
  +      ac_preproc_ok=false
  +for ac_c_preproc_warn_flag in '' yes
   do
  -  IFS=$as_save_IFS
  -  test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  -    ac_cv_prog_ac_ct_CXX="$ac_prog"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  -    break 2
  -  fi
  -done
  +  # Use a header file that comes with gcc, so configuring glibc
  +  # with a fresh cross-compiler works.
  +  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
  +  # <limits.h> exists even on freestanding compilers.
  +  # On the NeXT, cc -E runs the code through the compiler's parser,
  +  # not just through cpp. "Syntax error" is here to catch this case.
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +#ifdef __STDC__
  +# include <limits.h>
  +#else
  +# include <assert.h>
  +#endif
  +		     Syntax error
  +_ACEOF
  +if ac_fn_c_try_cpp "$LINENO"; then :
  +
  +else
  +  # Broken: fails on valid input.
  +continue
  +fi
  +rm -f conftest.err conftest.$ac_ext
  +
  +  # OK, works on sane cases.  Now check whether nonexistent headers
  +  # can be detected and how.
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +#include <ac_nonexistent.h>
  +_ACEOF
  +if ac_fn_c_try_cpp "$LINENO"; then :
  +  # Broken: success on invalid input.
  +continue
  +else
  +  # Passes both tests.
  +ac_preproc_ok=:
  +break
  +fi
  +rm -f conftest.err conftest.$ac_ext
  +
   done
  -IFS=$as_save_IFS
  +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  +rm -f conftest.err conftest.$ac_ext
  +if $ac_preproc_ok; then :
  +  break
  +fi
  +
  +    done
  +    ac_cv_prog_CPP=$CPP
   
   fi
  +  CPP=$ac_cv_prog_CPP
  +else
  +  ac_cv_prog_CPP=$CPP
   fi
  -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
  -if test -n "$ac_ct_CXX"; then
  -  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
  -$as_echo "$ac_ct_CXX" >&6; }
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
  +$as_echo "$CPP" >&6; }
  +ac_preproc_ok=false
  +for ac_c_preproc_warn_flag in '' yes
  +do
  +  # Use a header file that comes with gcc, so configuring glibc
  +  # with a fresh cross-compiler works.
  +  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
  +  # <limits.h> exists even on freestanding compilers.
  +  # On the NeXT, cc -E runs the code through the compiler's parser,
  +  # not just through cpp. "Syntax error" is here to catch this case.
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +#ifdef __STDC__
  +# include <limits.h>
  +#else
  +# include <assert.h>
  +#endif
  +		     Syntax error
  +_ACEOF
  +if ac_fn_c_try_cpp "$LINENO"; then :
  +
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  -$as_echo "no" >&6; }
  +  # Broken: fails on valid input.
  +continue
   fi
  +rm -f conftest.err conftest.$ac_ext
   
  +  # OK, works on sane cases.  Now check whether nonexistent headers
  +  # can be detected and how.
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +#include <ac_nonexistent.h>
  +_ACEOF
  +if ac_fn_c_try_cpp "$LINENO"; then :
  +  # Broken: success on invalid input.
  +continue
  +else
  +  # Passes both tests.
  +ac_preproc_ok=:
  +break
  +fi
  +rm -f conftest.err conftest.$ac_ext
   
  -  test -n "$ac_ct_CXX" && break
   done
  +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  +rm -f conftest.err conftest.$ac_ext
  +if $ac_preproc_ok; then :
   
  -  if test "x$ac_ct_CXX" = x; then
  -    CXX="g++"
  -  else
  -    case $cross_compiling:$ac_tool_warned in
  -yes:)
  -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  -ac_tool_warned=yes ;;
  -esac
  -    CXX=$ac_ct_CXX
  -  fi
  +else
  +  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  +as_fn_error "C preprocessor \"$CPP\" fails sanity check
  +See \`config.log' for more details." "$LINENO" 5; }
   fi
   
  -  fi
  -fi
  -# Provide some information about the compiler.
  -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
  -set X $ac_compile
  -ac_compiler=$2
  -{ (ac_try="$ac_compiler --version >&5"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compiler --version >&5") 2>&5
  -  ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }
  -{ (ac_try="$ac_compiler -v >&5"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compiler -v >&5") 2>&5
  -  ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }
  -{ (ac_try="$ac_compiler -V >&5"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compiler -V >&5") 2>&5
  -  ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }
  +ac_ext=c
  +ac_cpp='$CPP $CPPFLAGS'
  +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  +ac_compiler_gnu=$ac_cv_c_compiler_gnu
   
  -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
  -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
  -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
  +
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
  +$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
  +if test "${ac_cv_path_GREP+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -
  -int
  -main ()
  -{
  -#ifndef __GNUC__
  -       choke me
  -#endif
  -
  -  ;
  -  return 0;
  -}
  -_ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  +  if test -z "$GREP"; then
  +  ac_path_GREP_found=false
  +  # Loop through the user's path and test for each of PROGNAME-LIST
  +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
  +do
  +  IFS=$as_save_IFS
  +  test -z "$as_dir" && as_dir=.
  +    for ac_prog in grep ggrep; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
  +      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
  +      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
  +# Check for GNU ac_path_GREP and select it if it is found.
  +  # Check for GNU $ac_path_GREP
  +case `"$ac_path_GREP" --version 2>&1` in
  +*GNU*)
  +  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
  +*)
  +  ac_count=0
  +  $as_echo_n 0123456789 >"conftest.in"
  +  while :
  +  do
  +    cat "conftest.in" "conftest.in" >"conftest.tmp"
  +    mv "conftest.tmp" "conftest.in"
  +    cp "conftest.in" "conftest.nl"
  +    $as_echo 'GREP' >> "conftest.nl"
  +    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
  +    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
  +    as_fn_arith $ac_count + 1 && ac_count=$as_val
  +    if test $ac_count -gt ${ac_path_GREP_max-0}; then
  +      # Best one so far, save it but keep looking for a better one
  +      ac_cv_path_GREP="$ac_path_GREP"
  +      ac_path_GREP_max=$ac_count
  +    fi
  +    # 10*(2^10) chars as input seems more than enough
  +    test $ac_count -gt 10 && break
  +  done
  +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
   esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  ac_compiler_gnu=yes
  +
  +      $ac_path_GREP_found && break 3
  +    done
  +  done
  +  done
  +IFS=$as_save_IFS
  +  if test -z "$ac_cv_path_GREP"; then
  +    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  +  fi
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  +  ac_cv_path_GREP=$GREP
  +fi
   
  -	ac_compiler_gnu=no
   fi
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
  +$as_echo "$ac_cv_path_GREP" >&6; }
  + GREP="$ac_cv_path_GREP"
   
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
   
  -fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
  -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
  -if test $ac_compiler_gnu = yes; then
  -  GXX=yes
  -else
  -  GXX=
  -fi
  -ac_test_CXXFLAGS=${CXXFLAGS+set}
  -ac_save_CXXFLAGS=$CXXFLAGS
  -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
  -$as_echo_n "checking whether $CXX accepts -g... " >&6; }
  -if test "${ac_cv_prog_cxx_g+set}" = set; then
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
  +$as_echo_n "checking for egrep... " >&6; }
  +if test "${ac_cv_path_EGREP+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
  -  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
  -   ac_cxx_werror_flag=yes
  -   ac_cv_prog_cxx_g=no
  -   CXXFLAGS="-g"
  -   cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -
  -int
  -main ()
  -{
  -
  -  ;
  -  return 0;
  -}
  -_ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  +  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
  +   then ac_cv_path_EGREP="$GREP -E"
  +   else
  +     if test -z "$EGREP"; then
  +  ac_path_EGREP_found=false
  +  # Loop through the user's path and test for each of PROGNAME-LIST
  +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
  +do
  +  IFS=$as_save_IFS
  +  test -z "$as_dir" && as_dir=.
  +    for ac_prog in egrep; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
  +      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
  +      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
  +# Check for GNU ac_path_EGREP and select it if it is found.
  +  # Check for GNU $ac_path_EGREP
  +case `"$ac_path_EGREP" --version 2>&1` in
  +*GNU*)
  +  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
  +*)
  +  ac_count=0
  +  $as_echo_n 0123456789 >"conftest.in"
  +  while :
  +  do
  +    cat "conftest.in" "conftest.in" >"conftest.tmp"
  +    mv "conftest.tmp" "conftest.in"
  +    cp "conftest.in" "conftest.nl"
  +    $as_echo 'EGREP' >> "conftest.nl"
  +    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
  +    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
  +    as_fn_arith $ac_count + 1 && ac_count=$as_val
  +    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
  +      # Best one so far, save it but keep looking for a better one
  +      ac_cv_path_EGREP="$ac_path_EGREP"
  +      ac_path_EGREP_max=$ac_count
  +    fi
  +    # 10*(2^10) chars as input seems more than enough
  +    test $ac_count -gt 10 && break
  +  done
  +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
   esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  ac_cv_prog_cxx_g=yes
  +
  +      $ac_path_EGREP_found && break 3
  +    done
  +  done
  +  done
  +IFS=$as_save_IFS
  +  if test -z "$ac_cv_path_EGREP"; then
  +    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  +  fi
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  +  ac_cv_path_EGREP=$EGREP
  +fi
   
  -	CXXFLAGS=""
  -      cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +   fi
  +fi
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
  +$as_echo "$ac_cv_path_EGREP" >&6; }
  + EGREP="$ac_cv_path_EGREP"
   
  -int
  -main ()
  -{
   
  -  ;
  -  return 0;
  -}
  -_ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  :
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
  +$as_echo_n "checking for ANSI C header files... " >&6; }
  +if test "${ac_cv_header_stdc+set}" = set; then :
  +  $as_echo_n "(cached) " >&6
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
  -	 CXXFLAGS="-g"
  -	 cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
  +#include <stdlib.h>
  +#include <stdarg.h>
  +#include <string.h>
  +#include <float.h>
   
   int
   main ()
  @@ -4024,377 +4973,152 @@
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  ac_cv_prog_cxx_g=yes
  +if ac_fn_c_try_compile "$LINENO"; then :
  +  ac_cv_header_stdc=yes
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -
  -fi
  -
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -fi
  -
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  +  ac_cv_header_stdc=no
   fi
  -
   rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
  -fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
  -$as_echo "$ac_cv_prog_cxx_g" >&6; }
  -if test "$ac_test_CXXFLAGS" = set; then
  -  CXXFLAGS=$ac_save_CXXFLAGS
  -elif test $ac_cv_prog_cxx_g = yes; then
  -  if test "$GXX" = yes; then
  -    CXXFLAGS="-g -O2"
  -  else
  -    CXXFLAGS="-g"
  -  fi
  -else
  -  if test "$GXX" = yes; then
  -    CXXFLAGS="-O2"
  -  else
  -    CXXFLAGS=
  -  fi
  -fi
  -ac_ext=c
  -ac_cpp='$CPP $CPPFLAGS'
  -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  -ac_compiler_gnu=$ac_cv_c_compiler_gnu
  -
  -depcc="$CXX"  am_compiler_list=
  -
  -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
  -$as_echo_n "checking dependency style of $depcc... " >&6; }
  -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
  -  # We make a subdir and do the tests there.  Otherwise we can end up
  -  # making bogus files that we don't know about and never remove.  For
  -  # instance it was reported that on HP-UX the gcc test will end up
  -  # making a dummy file named `D' -- because `-MD' means `put the output
  -  # in D'.
  -  mkdir conftest.dir
  -  # Copy depcomp to subdir because otherwise we won't find it if we're
  -  # using a relative directory.
  -  cp "$am_depcomp" conftest.dir
  -  cd conftest.dir
  -  # We will build objects and dependencies in a subdirectory because
  -  # it helps to detect inapplicable dependency modes.  For instance
  -  # both Tru64's cc and ICC support -MD to output dependencies as a
  -  # side effect of compilation, but ICC will put the dependencies in
  -  # the current directory while Tru64 will put them in the object
  -  # directory.
  -  mkdir sub
   
  -  am_cv_CXX_dependencies_compiler_type=none
  -  if test "$am_compiler_list" = ""; then
  -     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
  -  fi
  -  for depmode in $am_compiler_list; do
  -    # Setup a source with many dependencies, because some compilers
  -    # like to wrap large dependency lists on column 80 (with \), and
  -    # we should not choose a depcomp mode which is confused by this.
  -    #
  -    # We need to recreate these files for each test, as the compiler may
  -    # overwrite some of them when testing with obscure command lines.
  -    # This happens at least with the AIX C compiler.
  -    : > sub/conftest.c
  -    for i in 1 2 3 4 5 6; do
  -      echo '#include "conftst'$i'.h"' >> sub/conftest.c
  -      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
  -      # Solaris 8's {/usr,}/bin/sh.
  -      touch sub/conftst$i.h
  -    done
  -    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  +if test $ac_cv_header_stdc = yes; then
  +  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +#include <string.h>
   
  -    case $depmode in
  -    nosideeffect)
  -      # after this tag, mechanisms are not by side-effect, so they'll
  -      # only be used when explicitly requested
  -      if test "x$enable_dependency_tracking" = xyes; then
  -	continue
  -      else
  -	break
  -      fi
  -      ;;
  -    none) break ;;
  -    esac
  -    # We check with `-c' and `-o' for the sake of the "dashmstdout"
  -    # mode.  It turns out that the SunPro C++ compiler does not properly
  -    # handle `-M -o', and we need to detect this.
  -    if depmode=$depmode \
  -       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
  -       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
  -       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
  -         >/dev/null 2>conftest.err &&
  -       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
  -       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
  -       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
  -       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
  -      # icc doesn't choke on unknown options, it will just issue warnings
  -      # or remarks (even with -Werror).  So we grep stderr for any message
  -      # that says an option was ignored or not supported.
  -      # When given -MP, icc 7.0 and 7.1 complain thusly:
  -      #   icc: Command line warning: ignoring option '-M'; no argument required
  -      # The diagnosis changed in icc 8.0:
  -      #   icc: Command line remark: option '-MP' not supported
  -      if (grep 'ignoring option' conftest.err ||
  -          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
  -        am_cv_CXX_dependencies_compiler_type=$depmode
  -        break
  -      fi
  -    fi
  -  done
  +_ACEOF
  +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  +  $EGREP "memchr" >/dev/null 2>&1; then :
   
  -  cd ..
  -  rm -rf conftest.dir
   else
  -  am_cv_CXX_dependencies_compiler_type=none
  -fi
  -
  +  ac_cv_header_stdc=no
   fi
  -{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
  -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
  -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  +rm -f conftest*
   
  - if
  -  test "x$enable_dependency_tracking" != xno \
  -  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
  -  am__fastdepCXX_TRUE=
  -  am__fastdepCXX_FALSE='#'
  -else
  -  am__fastdepCXX_TRUE='#'
  -  am__fastdepCXX_FALSE=
   fi
   
  +if test $ac_cv_header_stdc = yes; then
  +  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +#include <stdlib.h>
   
  +_ACEOF
  +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  +  $EGREP "free" >/dev/null 2>&1; then :
   
  -if test "x$remember_set_CFLAGS" = "x"
  -then
  -  if test "$CFLAGS" = "-g -O2"
  -  then
  -    CFLAGS="-O2"
  -  elif test "$CFLAGS" = "-g"
  -  then
  -    CFLAGS=""
  -  fi
  +else
  +  ac_cv_header_stdc=no
   fi
  +rm -f conftest*
   
  -if test "x$remember_set_CXXFLAGS" = "x"
  -then
  -  if test "$CXXFLAGS" = "-g -O2"
  -  then
  -    CXXFLAGS="-O2"
  -  elif test "$CXXFLAGS" = "-g"
  -  then
  -    CXXFLAGS=""
  -  fi
   fi
   
  -# AC_PROG_CXX will return "g++" even if no c++ compiler is installed.
  -# Check for that case, and just disable c++ code if g++ doesn't run.
  -ac_ext=cpp
  -ac_cpp='$CXXCPP $CPPFLAGS'
  -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  -
  -
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +if test $ac_cv_header_stdc = yes; then
  +  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
  +  if test "$cross_compiling" = yes; then :
  +  :
  +else
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
  +#include <ctype.h>
  +#include <stdlib.h>
  +#if ((' ' & 0x0FF) == 0x020)
  +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
  +#else
  +# define ISLOWER(c) \
  +		   (('a' <= (c) && (c) <= 'i') \
  +		     || ('j' <= (c) && (c) <= 'r') \
  +		     || ('s' <= (c) && (c) <= 'z'))
  +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
  +#endif
   
  +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
   int
   main ()
   {
  -
  -  ;
  +  int i;
  +  for (i = 0; i < 256; i++)
  +    if (XOR (islower (i), ISLOWER (i))
  +	|| toupper (i) != TOUPPER (i))
  +      return 2;
     return 0;
   }
  -_ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  :
  +_ACEOF
  +if ac_fn_c_try_run "$LINENO"; then :
  +
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  +  ac_cv_header_stdc=no
  +fi
  +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
  +  conftest.$ac_objext conftest.beam conftest.$ac_ext
  +fi
   
  -	CXX=""; CXXCP=""; CXXFLAGS=""
   fi
  +fi
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
  +$as_echo "$ac_cv_header_stdc" >&6; }
  +if test $ac_cv_header_stdc = yes; then
   
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -ac_ext=c
  -ac_cpp='$CPP $CPPFLAGS'
  -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  -ac_compiler_gnu=$ac_cv_c_compiler_gnu
  +$as_echo "#define STDC_HEADERS 1" >>confdefs.h
   
  +fi
   
  -# Find a good install program.  We prefer a C program (faster),
  -# so one script is as good as another.  But avoid the broken or
  -# incompatible versions:
  -# SysV /etc/install, /usr/sbin/install
  -# SunOS /usr/etc/install
  -# IRIX /sbin/install
  -# AIX /bin/install
  -# AmigaOS /C/install, which installs bootblocks on floppy discs
  -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
  -# AFS /usr/afsws/bin/install, which mishandles nonexistent args
  -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  -# OS/2's system install, which has a completely different semantic
  -# ./install, which can be erroneously created by make from ./install.sh.
  -# Reject install programs that cannot install multiple files.
  -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
  -$as_echo_n "checking for a BSD-compatible install... " >&6; }
  -if test -z "$INSTALL"; then
  -if test "${ac_cv_path_install+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  -for as_dir in $PATH
  -do
  -  IFS=$as_save_IFS
  -  test -z "$as_dir" && as_dir=.
  -  # Account for people who put trailing slashes in PATH elements.
  -case $as_dir/ in
  -  ./ | .// | /cC/* | \
  -  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
  -  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
  -  /usr/ucb/* ) ;;
  -  *)
  -    # OSF1 and SCO ODT 3.0 have their own names for install.
  -    # Don't use installbsd from OSF since it installs stuff as root
  -    # by default.
  -    for ac_prog in ginstall scoinst install; do
  -      for ac_exec_ext in '' $ac_executable_extensions; do
  -	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
  -	  if test $ac_prog = install &&
  -	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  -	    # AIX install.  It has an incompatible calling convention.
  -	    :
  -	  elif test $ac_prog = install &&
  -	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  -	    # program-specific install script used by HP pwplus--don't use.
  -	    :
  -	  else
  -	    rm -rf conftest.one conftest.two conftest.dir
  -	    echo one > conftest.one
  -	    echo two > conftest.two
  -	    mkdir conftest.dir
  -	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
  -	      test -s conftest.one && test -s conftest.two &&
  -	      test -s conftest.dir/conftest.one &&
  -	      test -s conftest.dir/conftest.two
  -	    then
  -	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
  -	      break 3
  -	    fi
  -	  fi
  -	fi
  -      done
  -    done
  -    ;;
  -esac
  +# On IRIX 5.3, sys/types and inttypes.h are conflicting.
  +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
  +		  inttypes.h stdint.h unistd.h
  +do :
  +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
  +"
  +eval as_val=\$$as_ac_Header
  +   if test "x$as_val" = x""yes; then :
  +  cat >>confdefs.h <<_ACEOF
  +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  +_ACEOF
  +
  +fi
   
   done
  -IFS=$as_save_IFS
   
  -rm -rf conftest.one conftest.two conftest.dir
   
  -fi
  -  if test "${ac_cv_path_install+set}" = set; then
  -    INSTALL=$ac_cv_path_install
  -  else
  -    # As a last resort, use the slow shell script.  Don't cache a
  -    # value for INSTALL within a source directory, because that will
  -    # break other packages using the cache if that directory is
  -    # removed, or if the value is a relative name.
  -    INSTALL=$ac_install_sh
  -  fi
  -fi
  -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
  -$as_echo "$INSTALL" >&6; }
  +ac_fn_c_find_intX_t "$LINENO" "64" "ac_cv_c_int64_t"
  +case $ac_cv_c_int64_t in #(
  +  no|yes) ;; #(
  +  *)
   
  -# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  -# It thinks the first close brace ends the variable substitution.
  -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
  +cat >>confdefs.h <<_ACEOF
  +#define int64_t $ac_cv_c_int64_t
  +_ACEOF
  +;;
  +esac
   
  -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
   
  -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
   
   # Make sure we can run config.sub.
   $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
  -  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
  -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
  -   { (exit 1); exit 1; }; }
  +  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
   
  -{ $as_echo "$as_me:$LINENO: checking build system type" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
   $as_echo_n "checking build system type... " >&6; }
  -if test "${ac_cv_build+set}" = set; then
  +if test "${ac_cv_build+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     ac_build_alias=$build_alias
   test "x$ac_build_alias" = x &&
     ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
   test "x$ac_build_alias" = x &&
  -  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
  -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
  -   { (exit 1); exit 1; }; }
  +  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
   ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
  -  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
  -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
  -   { (exit 1); exit 1; }; }
  +  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
   
   fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
   $as_echo "$ac_cv_build" >&6; }
   case $ac_cv_build in
   *-*-*) ;;
  -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
  -$as_echo "$as_me: error: invalid value of canonical build" >&2;}
  -   { (exit 1); exit 1; }; };;
  +*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
   esac
   build=$ac_cv_build
   ac_save_IFS=$IFS; IFS='-'
  @@ -4410,28 +5134,24 @@
   case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
   
   
  -{ $as_echo "$as_me:$LINENO: checking host system type" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
   $as_echo_n "checking host system type... " >&6; }
  -if test "${ac_cv_host+set}" = set; then
  +if test "${ac_cv_host+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test "x$host_alias" = x; then
     ac_cv_host=$ac_cv_build
   else
     ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
  -    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
  -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
  -   { (exit 1); exit 1; }; }
  +    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
   fi
   
   fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
   $as_echo "$ac_cv_host" >&6; }
   case $ac_cv_host in
   *-*-*) ;;
  -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
  -$as_echo "$as_me: error: invalid value of canonical host" >&2;}
  -   { (exit 1); exit 1; }; };;
  +*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
   esac
   host=$ac_cv_host
   ac_save_IFS=$IFS; IFS='-'
  @@ -4454,9 +5174,9 @@
     if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
   set dummy ${ac_tool_prefix}as; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_AS+set}" = set; then
  +if test "${ac_cv_prog_AS+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$AS"; then
  @@ -4467,24 +5187,24 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
       ac_cv_prog_AS="${ac_tool_prefix}as"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
   AS=$ac_cv_prog_AS
   if test -n "$AS"; then
  -  { $as_echo "$as_me:$LINENO: result: $AS" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
   $as_echo "$AS" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -4494,9 +5214,9 @@
     ac_ct_AS=$AS
     # Extract the first word of "as", so it can be a program name with args.
   set dummy as; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
  +if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$ac_ct_AS"; then
  @@ -4507,24 +5227,24 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
       ac_cv_prog_ac_ct_AS="as"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
   ac_ct_AS=$ac_cv_prog_ac_ct_AS
   if test -n "$ac_ct_AS"; then
  -  { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
   $as_echo "$ac_ct_AS" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -4533,7 +5253,7 @@
     else
       case $cross_compiling:$ac_tool_warned in
   yes:)
  -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
   $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
   ac_tool_warned=yes ;;
   esac
  @@ -4546,9 +5266,9 @@
     if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
   set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_DLLTOOL+set}" = set; then
  +if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$DLLTOOL"; then
  @@ -4559,24 +5279,24 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
       ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
   DLLTOOL=$ac_cv_prog_DLLTOOL
   if test -n "$DLLTOOL"; then
  -  { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
   $as_echo "$DLLTOOL" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -4586,9 +5306,9 @@
     ac_ct_DLLTOOL=$DLLTOOL
     # Extract the first word of "dlltool", so it can be a program name with args.
   set dummy dlltool; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
  +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$ac_ct_DLLTOOL"; then
  @@ -4599,24 +5319,24 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
       ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
   ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
   if test -n "$ac_ct_DLLTOOL"; then
  -  { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
   $as_echo "$ac_ct_DLLTOOL" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -4625,7 +5345,7 @@
     else
       case $cross_compiling:$ac_tool_warned in
   yes:)
  -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
   $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
   ac_tool_warned=yes ;;
   esac
  @@ -4638,9 +5358,9 @@
     if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
   set dummy ${ac_tool_prefix}objdump; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_OBJDUMP+set}" = set; then
  +if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$OBJDUMP"; then
  @@ -4651,24 +5371,24 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
       ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
   OBJDUMP=$ac_cv_prog_OBJDUMP
   if test -n "$OBJDUMP"; then
  -  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
   $as_echo "$OBJDUMP" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -4678,9 +5398,9 @@
     ac_ct_OBJDUMP=$OBJDUMP
     # Extract the first word of "objdump", so it can be a program name with args.
   set dummy objdump; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
  +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$ac_ct_OBJDUMP"; then
  @@ -4691,24 +5411,24 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
       ac_cv_prog_ac_ct_OBJDUMP="objdump"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
   ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
   if test -n "$ac_ct_OBJDUMP"; then
  -  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
   $as_echo "$ac_ct_OBJDUMP" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -4717,7 +5437,7 @@
     else
       case $cross_compiling:$ac_tool_warned in
   yes:)
  -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
   $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
   ac_tool_warned=yes ;;
   esac
  @@ -4752,14 +5472,14 @@
   
   case `pwd` in
     *\ * | *\	*)
  -    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
   $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
   esac
   
   
   
  -macro_version='2.2.6'
  -macro_revision='1.3012'
  +macro_version='2.2.6b'
  +macro_revision='1.3017'
   
   
   
  @@ -4775,9 +5495,9 @@
   
   ltmain="$ac_aux_dir/ltmain.sh"
   
  -{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
   $as_echo_n "checking for a sed that does not truncate output... " >&6; }
  -if test "${ac_cv_path_SED+set}" = set; then
  +if test "${ac_cv_path_SED+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
               ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
  @@ -4785,7 +5505,7 @@
          ac_script="$ac_script$as_nl$ac_script"
        done
        echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
  -     $as_unset ac_script || ac_script=
  +     { ac_script=; unset ac_script;}
        if test -z "$SED"; then
     ac_path_SED_found=false
     # Loop through the user's path and test for each of PROGNAME-LIST
  @@ -4794,7 +5514,7 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_prog in sed gsed; do
  +    for ac_prog in sed gsed; do
       for ac_exec_ext in '' $ac_executable_extensions; do
         ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
         { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
  @@ -4802,153 +5522,7 @@
     # Check for GNU $ac_path_SED
   case `"$ac_path_SED" --version 2>&1` in
   *GNU*)
  -  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
  -*)
  -  ac_count=0
  -  $as_echo_n 0123456789 >"conftest.in"
  -  while :
  -  do
  -    cat "conftest.in" "conftest.in" >"conftest.tmp"
  -    mv "conftest.tmp" "conftest.in"
  -    cp "conftest.in" "conftest.nl"
  -    $as_echo '' >> "conftest.nl"
  -    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
  -    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
  -    ac_count=`expr $ac_count + 1`
  -    if test $ac_count -gt ${ac_path_SED_max-0}; then
  -      # Best one so far, save it but keep looking for a better one
  -      ac_cv_path_SED="$ac_path_SED"
  -      ac_path_SED_max=$ac_count
  -    fi
  -    # 10*(2^10) chars as input seems more than enough
  -    test $ac_count -gt 10 && break
  -  done
  -  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  -esac
  -
  -      $ac_path_SED_found && break 3
  -    done
  -  done
  -done
  -IFS=$as_save_IFS
  -  if test -z "$ac_cv_path_SED"; then
  -    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
  -$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
  -   { (exit 1); exit 1; }; }
  -  fi
  -else
  -  ac_cv_path_SED=$SED
  -fi
  -
  -fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
  -$as_echo "$ac_cv_path_SED" >&6; }
  - SED="$ac_cv_path_SED"
  -  rm -f conftest.sed
  -
  -test -z "$SED" && SED=sed
  -Xsed="$SED -e 1s/^X//"
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
  -$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
  -if test "${ac_cv_path_GREP+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  if test -z "$GREP"; then
  -  ac_path_GREP_found=false
  -  # Loop through the user's path and test for each of PROGNAME-LIST
  -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
  -do
  -  IFS=$as_save_IFS
  -  test -z "$as_dir" && as_dir=.
  -  for ac_prog in grep ggrep; do
  -    for ac_exec_ext in '' $ac_executable_extensions; do
  -      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
  -      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
  -# Check for GNU ac_path_GREP and select it if it is found.
  -  # Check for GNU $ac_path_GREP
  -case `"$ac_path_GREP" --version 2>&1` in
  -*GNU*)
  -  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
  -*)
  -  ac_count=0
  -  $as_echo_n 0123456789 >"conftest.in"
  -  while :
  -  do
  -    cat "conftest.in" "conftest.in" >"conftest.tmp"
  -    mv "conftest.tmp" "conftest.in"
  -    cp "conftest.in" "conftest.nl"
  -    $as_echo 'GREP' >> "conftest.nl"
  -    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
  -    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
  -    ac_count=`expr $ac_count + 1`
  -    if test $ac_count -gt ${ac_path_GREP_max-0}; then
  -      # Best one so far, save it but keep looking for a better one
  -      ac_cv_path_GREP="$ac_path_GREP"
  -      ac_path_GREP_max=$ac_count
  -    fi
  -    # 10*(2^10) chars as input seems more than enough
  -    test $ac_count -gt 10 && break
  -  done
  -  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  -esac
  -
  -      $ac_path_GREP_found && break 3
  -    done
  -  done
  -done
  -IFS=$as_save_IFS
  -  if test -z "$ac_cv_path_GREP"; then
  -    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
  -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
  -   { (exit 1); exit 1; }; }
  -  fi
  -else
  -  ac_cv_path_GREP=$GREP
  -fi
  -
  -fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
  -$as_echo "$ac_cv_path_GREP" >&6; }
  - GREP="$ac_cv_path_GREP"
  -
  -
  -{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
  -$as_echo_n "checking for egrep... " >&6; }
  -if test "${ac_cv_path_EGREP+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
  -   then ac_cv_path_EGREP="$GREP -E"
  -   else
  -     if test -z "$EGREP"; then
  -  ac_path_EGREP_found=false
  -  # Loop through the user's path and test for each of PROGNAME-LIST
  -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
  -do
  -  IFS=$as_save_IFS
  -  test -z "$as_dir" && as_dir=.
  -  for ac_prog in egrep; do
  -    for ac_exec_ext in '' $ac_executable_extensions; do
  -      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
  -      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
  -# Check for GNU ac_path_EGREP and select it if it is found.
  -  # Check for GNU $ac_path_EGREP
  -case `"$ac_path_EGREP" --version 2>&1` in
  -*GNU*)
  -  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
  +  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
   *)
     ac_count=0
     $as_echo_n 0123456789 >"conftest.in"
  @@ -4957,14 +5531,14 @@
       cat "conftest.in" "conftest.in" >"conftest.tmp"
       mv "conftest.tmp" "conftest.in"
       cp "conftest.in" "conftest.nl"
  -    $as_echo 'EGREP' >> "conftest.nl"
  -    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
  +    $as_echo '' >> "conftest.nl"
  +    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
       diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
  -    ac_count=`expr $ac_count + 1`
  -    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
  +    as_fn_arith $ac_count + 1 && ac_count=$as_val
  +    if test $ac_count -gt ${ac_path_SED_max-0}; then
         # Best one so far, save it but keep looking for a better one
  -      ac_cv_path_EGREP="$ac_path_EGREP"
  -      ac_path_EGREP_max=$ac_count
  +      ac_cv_path_SED="$ac_path_SED"
  +      ac_path_SED_max=$ac_count
       fi
       # 10*(2^10) chars as input seems more than enough
       test $ac_count -gt 10 && break
  @@ -4972,30 +5546,40 @@
     rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
   esac
   
  -      $ac_path_EGREP_found && break 3
  +      $ac_path_SED_found && break 3
       done
     done
  -done
  +  done
   IFS=$as_save_IFS
  -  if test -z "$ac_cv_path_EGREP"; then
  -    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
  -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
  -   { (exit 1); exit 1; }; }
  +  if test -z "$ac_cv_path_SED"; then
  +    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
     fi
   else
  -  ac_cv_path_EGREP=$EGREP
  +  ac_cv_path_SED=$SED
   fi
   
  -   fi
   fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
  -$as_echo "$ac_cv_path_EGREP" >&6; }
  - EGREP="$ac_cv_path_EGREP"
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
  +$as_echo "$ac_cv_path_SED" >&6; }
  + SED="$ac_cv_path_SED"
  +  rm -f conftest.sed
  +
  +test -z "$SED" && SED=sed
  +Xsed="$SED -e 1s/^X//"
  +
  +
  +
   
   
  -{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
  +
  +
  +
  +
  +
  +
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
   $as_echo_n "checking for fgrep... " >&6; }
  -if test "${ac_cv_path_FGREP+set}" = set; then
  +if test "${ac_cv_path_FGREP+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
  @@ -5009,7 +5593,7 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_prog in fgrep; do
  +    for ac_prog in fgrep; do
       for ac_exec_ext in '' $ac_executable_extensions; do
         ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
         { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
  @@ -5029,7 +5613,7 @@
       $as_echo 'FGREP' >> "conftest.nl"
       "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
       diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
  -    ac_count=`expr $ac_count + 1`
  +    as_fn_arith $ac_count + 1 && ac_count=$as_val
       if test $ac_count -gt ${ac_path_FGREP_max-0}; then
         # Best one so far, save it but keep looking for a better one
         ac_cv_path_FGREP="$ac_path_FGREP"
  @@ -5044,12 +5628,10 @@
         $ac_path_FGREP_found && break 3
       done
     done
  -done
  +  done
   IFS=$as_save_IFS
     if test -z "$ac_cv_path_FGREP"; then
  -    { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
  -$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
  -   { (exit 1); exit 1; }; }
  +    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
     fi
   else
     ac_cv_path_FGREP=$FGREP
  @@ -5057,7 +5639,7 @@
   
      fi
   fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
   $as_echo "$ac_cv_path_FGREP" >&6; }
    FGREP="$ac_cv_path_FGREP"
   
  @@ -5083,7 +5665,7 @@
   
   
   # Check whether --with-gnu-ld was given.
  -if test "${with_gnu_ld+set}" = set; then
  +if test "${with_gnu_ld+set}" = set; then :
     withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
   else
     with_gnu_ld=no
  @@ -5092,7 +5674,7 @@
   ac_prog=ld
   if test "$GCC" = yes; then
     # Check if gcc -print-prog-name=ld gives a path.
  -  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
   $as_echo_n "checking for ld used by $CC... " >&6; }
     case $host in
     *-*-mingw*)
  @@ -5122,13 +5704,13 @@
       ;;
     esac
   elif test "$with_gnu_ld" = yes; then
  -  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
   $as_echo_n "checking for GNU ld... " >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
   $as_echo_n "checking for non-GNU ld... " >&6; }
   fi
  -if test "${lt_cv_path_LD+set}" = set; then
  +if test "${lt_cv_path_LD+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -z "$LD"; then
  @@ -5159,18 +5741,16 @@
   
   LD="$lt_cv_path_LD"
   if test -n "$LD"; then
  -  { $as_echo "$as_me:$LINENO: result: $LD" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
   $as_echo "$LD" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
  -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
  -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
  -   { (exit 1); exit 1; }; }
  -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
  +test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
   $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
  -if test "${lt_cv_prog_gnu_ld+set}" = set; then
  +if test "${lt_cv_prog_gnu_ld+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     # I'd rather use --version here, but apparently some GNU lds only accept -v.
  @@ -5183,7 +5763,7 @@
     ;;
   esac
   fi
  -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
   $as_echo "$lt_cv_prog_gnu_ld" >&6; }
   with_gnu_ld=$lt_cv_prog_gnu_ld
   
  @@ -5195,9 +5775,9 @@
   
   
   
  -{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
   $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
  -if test "${lt_cv_path_NM+set}" = set; then
  +if test "${lt_cv_path_NM+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$NM"; then
  @@ -5244,7 +5824,7 @@
     : ${lt_cv_path_NM=no}
   fi
   fi
  -{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
   $as_echo "$lt_cv_path_NM" >&6; }
   if test "$lt_cv_path_NM" != "no"; then
     NM="$lt_cv_path_NM"
  @@ -5255,9 +5835,9 @@
     do
       # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
   set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_DUMPBIN+set}" = set; then
  +if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$DUMPBIN"; then
  @@ -5268,24 +5848,24 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
       ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
   DUMPBIN=$ac_cv_prog_DUMPBIN
   if test -n "$DUMPBIN"; then
  -  { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
   $as_echo "$DUMPBIN" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -5299,9 +5879,9 @@
   do
     # Extract the first word of "$ac_prog", so it can be a program name with args.
   set dummy $ac_prog; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
  +if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$ac_ct_DUMPBIN"; then
  @@ -5312,24 +5892,24 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
       ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
   ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
   if test -n "$ac_ct_DUMPBIN"; then
  -  { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
   $as_echo "$ac_ct_DUMPBIN" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -5342,7 +5922,7 @@
     else
       case $cross_compiling:$ac_tool_warned in
   yes:)
  -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
   $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
   ac_tool_warned=yes ;;
   esac
  @@ -5362,44 +5942,44 @@
   
   
   
  -{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
   $as_echo_n "checking the name lister ($NM) interface... " >&6; }
  -if test "${lt_cv_nm_interface+set}" = set; then
  +if test "${lt_cv_nm_interface+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     lt_cv_nm_interface="BSD nm"
     echo "int some_variable = 0;" > conftest.$ac_ext
  -  (eval echo "\"\$as_me:5372: $ac_compile\"" >&5)
  +  (eval echo "\"\$as_me:5952: $ac_compile\"" >&5)
     (eval "$ac_compile" 2>conftest.err)
     cat conftest.err >&5
  -  (eval echo "\"\$as_me:5375: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
  +  (eval echo "\"\$as_me:5955: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
     (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
     cat conftest.err >&5
  -  (eval echo "\"\$as_me:5378: output\"" >&5)
  +  (eval echo "\"\$as_me:5958: output\"" >&5)
     cat conftest.out >&5
     if $GREP 'External.*some_variable' conftest.out > /dev/null; then
       lt_cv_nm_interface="MS dumpbin"
     fi
     rm -f conftest*
   fi
  -{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
   $as_echo "$lt_cv_nm_interface" >&6; }
   
  -{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
   $as_echo_n "checking whether ln -s works... " >&6; }
   LN_S=$as_ln_s
   if test "$LN_S" = "ln -s"; then
  -  { $as_echo "$as_me:$LINENO: result: yes" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
   $as_echo "yes" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
   $as_echo "no, using $LN_S" >&6; }
   fi
   
   # find the maximum length of command line arguments
  -{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
   $as_echo_n "checking the maximum length of command line arguments... " >&6; }
  -if test "${lt_cv_sys_max_cmd_len+set}" = set; then
  +if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
       i=0
  @@ -5517,10 +6097,10 @@
   fi
   
   if test -n $lt_cv_sys_max_cmd_len ; then
  -  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
   $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: none" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
   $as_echo "none" >&6; }
   fi
   max_cmd_len=$lt_cv_sys_max_cmd_len
  @@ -5534,7 +6114,7 @@
   : ${MV="mv -f"}
   : ${RM="rm -f"}
   
  -{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
   $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
   # Try some XSI features
   xsi_shell=no
  @@ -5544,17 +6124,17 @@
       && eval 'test $(( 1 + 1 )) -eq 2 \
       && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
     && xsi_shell=yes
  -{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
   $as_echo "$xsi_shell" >&6; }
   
   
  -{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
   $as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
   lt_shell_append=no
   ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
       >/dev/null 2>&1 \
     && lt_shell_append=yes
  -{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
   $as_echo "$lt_shell_append" >&6; }
   
   
  @@ -5589,14 +6169,14 @@
   
   
   
  -{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
   $as_echo_n "checking for $LD option to reload object files... " >&6; }
  -if test "${lt_cv_ld_reload_flag+set}" = set; then
  +if test "${lt_cv_ld_reload_flag+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     lt_cv_ld_reload_flag='-r'
   fi
  -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
   $as_echo "$lt_cv_ld_reload_flag" >&6; }
   reload_flag=$lt_cv_ld_reload_flag
   case $reload_flag in
  @@ -5625,9 +6205,9 @@
   if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
   set dummy ${ac_tool_prefix}objdump; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_OBJDUMP+set}" = set; then
  +if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$OBJDUMP"; then
  @@ -5638,24 +6218,24 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
       ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
   OBJDUMP=$ac_cv_prog_OBJDUMP
   if test -n "$OBJDUMP"; then
  -  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
   $as_echo "$OBJDUMP" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -5665,9 +6245,9 @@
     ac_ct_OBJDUMP=$OBJDUMP
     # Extract the first word of "objdump", so it can be a program name with args.
   set dummy objdump; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
  +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$ac_ct_OBJDUMP"; then
  @@ -5678,24 +6258,24 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
       ac_cv_prog_ac_ct_OBJDUMP="objdump"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
   ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
   if test -n "$ac_ct_OBJDUMP"; then
  -  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
   $as_echo "$ac_ct_OBJDUMP" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -5704,7 +6284,7 @@
     else
       case $cross_compiling:$ac_tool_warned in
   yes:)
  -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
   $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
   ac_tool_warned=yes ;;
   esac
  @@ -5721,9 +6301,9 @@
   
   
   
  -{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
   $as_echo_n "checking how to recognize dependent libraries... " >&6; }
  -if test "${lt_cv_deplibs_check_method+set}" = set; then
  +if test "${lt_cv_deplibs_check_method+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     lt_cv_file_magic_cmd='$MAGIC_CMD'
  @@ -5917,7 +6497,7 @@
   esac
   
   fi
  -{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
   $as_echo "$lt_cv_deplibs_check_method" >&6; }
   file_magic_cmd=$lt_cv_file_magic_cmd
   deplibs_check_method=$lt_cv_deplibs_check_method
  @@ -5937,9 +6517,9 @@
   if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
   set dummy ${ac_tool_prefix}ar; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_AR+set}" = set; then
  +if test "${ac_cv_prog_AR+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$AR"; then
  @@ -5950,24 +6530,24 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
       ac_cv_prog_AR="${ac_tool_prefix}ar"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
   AR=$ac_cv_prog_AR
   if test -n "$AR"; then
  -  { $as_echo "$as_me:$LINENO: result: $AR" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
   $as_echo "$AR" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -5977,9 +6557,9 @@
     ac_ct_AR=$AR
     # Extract the first word of "ar", so it can be a program name with args.
   set dummy ar; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
  +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$ac_ct_AR"; then
  @@ -5990,24 +6570,24 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
       ac_cv_prog_ac_ct_AR="ar"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
   ac_ct_AR=$ac_cv_prog_ac_ct_AR
   if test -n "$ac_ct_AR"; then
  -  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
   $as_echo "$ac_ct_AR" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -6016,7 +6596,7 @@
     else
       case $cross_compiling:$ac_tool_warned in
   yes:)
  -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
   $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
   ac_tool_warned=yes ;;
   esac
  @@ -6042,9 +6622,9 @@
   if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
   set dummy ${ac_tool_prefix}strip; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_STRIP+set}" = set; then
  +if test "${ac_cv_prog_STRIP+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$STRIP"; then
  @@ -6055,24 +6635,24 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
       ac_cv_prog_STRIP="${ac_tool_prefix}strip"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
   STRIP=$ac_cv_prog_STRIP
   if test -n "$STRIP"; then
  -  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
   $as_echo "$STRIP" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -6082,9 +6662,9 @@
     ac_ct_STRIP=$STRIP
     # Extract the first word of "strip", so it can be a program name with args.
   set dummy strip; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
  +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$ac_ct_STRIP"; then
  @@ -6095,24 +6675,24 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
       ac_cv_prog_ac_ct_STRIP="strip"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
   ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
   if test -n "$ac_ct_STRIP"; then
  -  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
   $as_echo "$ac_ct_STRIP" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -6121,7 +6701,7 @@
     else
       case $cross_compiling:$ac_tool_warned in
   yes:)
  -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
   $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
   ac_tool_warned=yes ;;
   esac
  @@ -6141,9 +6721,9 @@
   if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
   set dummy ${ac_tool_prefix}ranlib; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_RANLIB+set}" = set; then
  +if test "${ac_cv_prog_RANLIB+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$RANLIB"; then
  @@ -6154,24 +6734,24 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
       ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
   RANLIB=$ac_cv_prog_RANLIB
   if test -n "$RANLIB"; then
  -  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
   $as_echo "$RANLIB" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -6181,9 +6761,9 @@
     ac_ct_RANLIB=$RANLIB
     # Extract the first word of "ranlib", so it can be a program name with args.
   set dummy ranlib; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
  +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$ac_ct_RANLIB"; then
  @@ -6194,24 +6774,24 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
       ac_cv_prog_ac_ct_RANLIB="ranlib"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
   ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
   if test -n "$ac_ct_RANLIB"; then
  -  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
   $as_echo "$ac_ct_RANLIB" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -6220,7 +6800,7 @@
     else
       case $cross_compiling:$ac_tool_warned in
   yes:)
  -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
   $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
   ac_tool_warned=yes ;;
   esac
  @@ -6298,9 +6878,9 @@
   
   
   # Check for command to grab the raw symbol name followed by C symbol from nm.
  -{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
   $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
  -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
  +if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
   
  @@ -6416,18 +6996,18 @@
   int main(){nm_test_var='a';nm_test_func();return(0);}
   _LT_EOF
   
  -  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
     (eval $ac_compile) 2>&5
     ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }; then
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; }; then
       # Now try to grab the symbols.
       nlist=conftest.nm
  -    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
  +    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
     (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
     ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && test -s "$nlist"; then
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; } && test -s "$nlist"; then
         # Try sorting and uniquifying the output.
         if sort "$nlist" | uniq > "$nlist"T; then
   	mv -f "$nlist"T "$nlist"
  @@ -6480,11 +7060,11 @@
   	  lt_save_CFLAGS="$CFLAGS"
   	  LIBS="conftstm.$ac_objext"
   	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  -	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  +	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
     (eval $ac_link) 2>&5
     ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && test -s conftest${ac_exeext}; then
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
   	    pipe_works=yes
   	  fi
   	  LIBS="$lt_save_LIBS"
  @@ -6518,10 +7098,10 @@
     lt_cv_sys_global_symbol_to_cdecl=
   fi
   if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
  -  { $as_echo "$as_me:$LINENO: result: failed" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
   $as_echo "failed" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: ok" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
   $as_echo "ok" >&6; }
   fi
   
  @@ -6546,9 +7126,8 @@
   
   
   
  -
   # Check whether --enable-libtool-lock was given.
  -if test "${enable_libtool_lock+set}" = set; then
  +if test "${enable_libtool_lock+set}" = set; then :
     enableval=$enable_libtool_lock;
   fi
   
  @@ -6560,11 +7139,11 @@
   ia64-*-hpux*)
     # Find out which ABI we are using.
     echo 'int i;' > conftest.$ac_ext
  -  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
     (eval $ac_compile) 2>&5
     ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }; then
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; }; then
       case `/usr/bin/file conftest.$ac_objext` in
         *ELF-32*)
   	HPUX_IA64_MODE="32"
  @@ -6578,12 +7157,12 @@
     ;;
   *-*-irix6*)
     # Find out which ABI we are using.
  -  echo '#line 6581 "configure"' > conftest.$ac_ext
  -  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  +  echo '#line 7160 "configure"' > conftest.$ac_ext
  +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
     (eval $ac_compile) 2>&5
     ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }; then
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; }; then
       if test "$lt_cv_prog_gnu_ld" = yes; then
         case `/usr/bin/file conftest.$ac_objext` in
   	*32-bit*)
  @@ -6617,11 +7196,11 @@
   s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
     # Find out which ABI we are using.
     echo 'int i;' > conftest.$ac_ext
  -  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
     (eval $ac_compile) 2>&5
     ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }; then
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; }; then
       case `/usr/bin/file conftest.o` in
         *32-bit*)
   	case $host in
  @@ -6670,9 +7249,9 @@
     # On SCO OpenServer 5, we need -belf to get full-featured binaries.
     SAVE_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -belf"
  -  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
   $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
  -if test "${lt_cv_cc_needs_belf+set}" = set; then
  +if test "${lt_cv_cc_needs_belf+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     ac_ext=c
  @@ -6681,11 +7260,7 @@
   ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
   ac_compiler_gnu=$ac_cv_c_compiler_gnu
   
  -     cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   
   int
  @@ -6696,38 +7271,13 @@
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  +if ac_fn_c_try_link "$LINENO"; then :
     lt_cv_cc_needs_belf=yes
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	lt_cv_cc_needs_belf=no
  +  lt_cv_cc_needs_belf=no
   fi
  -
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
  +rm -f core conftest.err conftest.$ac_objext \
  +    conftest$ac_exeext conftest.$ac_ext
        ac_ext=c
   ac_cpp='$CPP $CPPFLAGS'
   ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  @@ -6735,7 +7285,7 @@
   ac_compiler_gnu=$ac_cv_c_compiler_gnu
   
   fi
  -{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
   $as_echo "$lt_cv_cc_needs_belf" >&6; }
     if test x"$lt_cv_cc_needs_belf" != x"yes"; then
       # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
  @@ -6745,11 +7295,11 @@
   sparc*-*solaris*)
     # Find out which ABI we are using.
     echo 'int i;' > conftest.$ac_ext
  -  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
     (eval $ac_compile) 2>&5
     ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }; then
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; }; then
       case `/usr/bin/file conftest.o` in
       *64-bit*)
         case $lt_cv_prog_gnu_ld in
  @@ -6775,9 +7325,9 @@
       if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
   set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
  +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$DSYMUTIL"; then
  @@ -6788,24 +7338,24 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
       ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
   DSYMUTIL=$ac_cv_prog_DSYMUTIL
   if test -n "$DSYMUTIL"; then
  -  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
   $as_echo "$DSYMUTIL" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -6815,9 +7365,9 @@
     ac_ct_DSYMUTIL=$DSYMUTIL
     # Extract the first word of "dsymutil", so it can be a program name with args.
   set dummy dsymutil; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
  +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$ac_ct_DSYMUTIL"; then
  @@ -6828,24 +7378,24 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
       ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
   ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
   if test -n "$ac_ct_DSYMUTIL"; then
  -  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
   $as_echo "$ac_ct_DSYMUTIL" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -6854,7 +7404,7 @@
     else
       case $cross_compiling:$ac_tool_warned in
   yes:)
  -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
   $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
   ac_tool_warned=yes ;;
   esac
  @@ -6867,9 +7417,9 @@
       if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
   set dummy ${ac_tool_prefix}nmedit; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_NMEDIT+set}" = set; then
  +if test "${ac_cv_prog_NMEDIT+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$NMEDIT"; then
  @@ -6880,24 +7430,24 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
       ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
   NMEDIT=$ac_cv_prog_NMEDIT
   if test -n "$NMEDIT"; then
  -  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
   $as_echo "$NMEDIT" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -6907,898 +7457,339 @@
     ac_ct_NMEDIT=$NMEDIT
     # Extract the first word of "nmedit", so it can be a program name with args.
   set dummy nmedit; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  -$as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  if test -n "$ac_ct_NMEDIT"; then
  -  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
  -else
  -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  -for as_dir in $PATH
  -do
  -  IFS=$as_save_IFS
  -  test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  -    ac_cv_prog_ac_ct_NMEDIT="nmedit"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  -    break 2
  -  fi
  -done
  -done
  -IFS=$as_save_IFS
  -
  -fi
  -fi
  -ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
  -if test -n "$ac_ct_NMEDIT"; then
  -  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
  -$as_echo "$ac_ct_NMEDIT" >&6; }
  -else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  -$as_echo "no" >&6; }
  -fi
  -
  -  if test "x$ac_ct_NMEDIT" = x; then
  -    NMEDIT=":"
  -  else
  -    case $cross_compiling:$ac_tool_warned in
  -yes:)
  -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  -ac_tool_warned=yes ;;
  -esac
  -    NMEDIT=$ac_ct_NMEDIT
  -  fi
  -else
  -  NMEDIT="$ac_cv_prog_NMEDIT"
  -fi
  -
  -    if test -n "$ac_tool_prefix"; then
  -  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
  -set dummy ${ac_tool_prefix}lipo; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  -$as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_LIPO+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  if test -n "$LIPO"; then
  -  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
  -else
  -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  -for as_dir in $PATH
  -do
  -  IFS=$as_save_IFS
  -  test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  -    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  -    break 2
  -  fi
  -done
  -done
  -IFS=$as_save_IFS
  -
  -fi
  -fi
  -LIPO=$ac_cv_prog_LIPO
  -if test -n "$LIPO"; then
  -  { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
  -$as_echo "$LIPO" >&6; }
  -else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  -$as_echo "no" >&6; }
  -fi
  -
  -
  -fi
  -if test -z "$ac_cv_prog_LIPO"; then
  -  ac_ct_LIPO=$LIPO
  -  # Extract the first word of "lipo", so it can be a program name with args.
  -set dummy lipo; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  -$as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  if test -n "$ac_ct_LIPO"; then
  -  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
  -else
  -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  -for as_dir in $PATH
  -do
  -  IFS=$as_save_IFS
  -  test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  -    ac_cv_prog_ac_ct_LIPO="lipo"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  -    break 2
  -  fi
  -done
  -done
  -IFS=$as_save_IFS
  -
  -fi
  -fi
  -ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
  -if test -n "$ac_ct_LIPO"; then
  -  { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
  -$as_echo "$ac_ct_LIPO" >&6; }
  -else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  -$as_echo "no" >&6; }
  -fi
  -
  -  if test "x$ac_ct_LIPO" = x; then
  -    LIPO=":"
  -  else
  -    case $cross_compiling:$ac_tool_warned in
  -yes:)
  -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  -ac_tool_warned=yes ;;
  -esac
  -    LIPO=$ac_ct_LIPO
  -  fi
  -else
  -  LIPO="$ac_cv_prog_LIPO"
  -fi
  -
  -    if test -n "$ac_tool_prefix"; then
  -  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
  -set dummy ${ac_tool_prefix}otool; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  -$as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_OTOOL+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  if test -n "$OTOOL"; then
  -  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
  -else
  -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  -for as_dir in $PATH
  -do
  -  IFS=$as_save_IFS
  -  test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  -    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  -    break 2
  -  fi
  -done
  -done
  -IFS=$as_save_IFS
  -
  -fi
  -fi
  -OTOOL=$ac_cv_prog_OTOOL
  -if test -n "$OTOOL"; then
  -  { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
  -$as_echo "$OTOOL" >&6; }
  -else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  -$as_echo "no" >&6; }
  -fi
  -
  -
  -fi
  -if test -z "$ac_cv_prog_OTOOL"; then
  -  ac_ct_OTOOL=$OTOOL
  -  # Extract the first word of "otool", so it can be a program name with args.
  -set dummy otool; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
  +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
  -  if test -n "$ac_ct_OTOOL"; then
  -  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
  +  if test -n "$ac_ct_NMEDIT"; then
  +  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
   else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   for as_dir in $PATH
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  -    ac_cv_prog_ac_ct_OTOOL="otool"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    ac_cv_prog_ac_ct_NMEDIT="nmedit"
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
  -ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
  -if test -n "$ac_ct_OTOOL"; then
  -  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
  -$as_echo "$ac_ct_OTOOL" >&6; }
  +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
  +if test -n "$ac_ct_NMEDIT"; then
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
  +$as_echo "$ac_ct_NMEDIT" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  -  if test "x$ac_ct_OTOOL" = x; then
  -    OTOOL=":"
  +  if test "x$ac_ct_NMEDIT" = x; then
  +    NMEDIT=":"
     else
       case $cross_compiling:$ac_tool_warned in
   yes:)
  -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
   $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
   ac_tool_warned=yes ;;
   esac
  -    OTOOL=$ac_ct_OTOOL
  +    NMEDIT=$ac_ct_NMEDIT
     fi
   else
  -  OTOOL="$ac_cv_prog_OTOOL"
  +  NMEDIT="$ac_cv_prog_NMEDIT"
   fi
   
       if test -n "$ac_tool_prefix"; then
  -  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
  -set dummy ${ac_tool_prefix}otool64; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
  +set dummy ${ac_tool_prefix}lipo; ac_word=$2
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_OTOOL64+set}" = set; then
  +if test "${ac_cv_prog_LIPO+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
  -  if test -n "$OTOOL64"; then
  -  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
  +  if test -n "$LIPO"; then
  +  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
   else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   for as_dir in $PATH
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  -    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
  -OTOOL64=$ac_cv_prog_OTOOL64
  -if test -n "$OTOOL64"; then
  -  { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
  -$as_echo "$OTOOL64" >&6; }
  +LIPO=$ac_cv_prog_LIPO
  +if test -n "$LIPO"; then
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
  +$as_echo "$LIPO" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
   
   fi
  -if test -z "$ac_cv_prog_OTOOL64"; then
  -  ac_ct_OTOOL64=$OTOOL64
  -  # Extract the first word of "otool64", so it can be a program name with args.
  -set dummy otool64; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +if test -z "$ac_cv_prog_LIPO"; then
  +  ac_ct_LIPO=$LIPO
  +  # Extract the first word of "lipo", so it can be a program name with args.
  +set dummy lipo; ac_word=$2
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
  +if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
  -  if test -n "$ac_ct_OTOOL64"; then
  -  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
  +  if test -n "$ac_ct_LIPO"; then
  +  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
   else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   for as_dir in $PATH
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  -    ac_cv_prog_ac_ct_OTOOL64="otool64"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    ac_cv_prog_ac_ct_LIPO="lipo"
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
  -ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
  -if test -n "$ac_ct_OTOOL64"; then
  -  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
  -$as_echo "$ac_ct_OTOOL64" >&6; }
  -else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  -$as_echo "no" >&6; }
  -fi
  -
  -  if test "x$ac_ct_OTOOL64" = x; then
  -    OTOOL64=":"
  -  else
  -    case $cross_compiling:$ac_tool_warned in
  -yes:)
  -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  -ac_tool_warned=yes ;;
  -esac
  -    OTOOL64=$ac_ct_OTOOL64
  -  fi
  -else
  -  OTOOL64="$ac_cv_prog_OTOOL64"
  -fi
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
  -$as_echo_n "checking for -single_module linker flag... " >&6; }
  -if test "${lt_cv_apple_cc_single_mod+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  lt_cv_apple_cc_single_mod=no
  -      if test -z "${LT_MULTI_MODULE}"; then
  -	# By default we will add the -single_module flag. You can override
  -	# by either setting the environment variable LT_MULTI_MODULE
  -	# non-empty at configure time, or by adding -multi_module to the
  -	# link flags.
  -	rm -rf libconftest.dylib*
  -	echo "int foo(void){return 1;}" > conftest.c
  -	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
  --dynamiclib -Wl,-single_module conftest.c" >&5
  -	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
  -	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
  -        _lt_result=$?
  -	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
  -	  lt_cv_apple_cc_single_mod=yes
  -	else
  -	  cat conftest.err >&5
  -	fi
  -	rm -rf libconftest.dylib*
  -	rm -f conftest.*
  -      fi
  -fi
  -{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
  -$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
  -    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
  -$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
  -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  lt_cv_ld_exported_symbols_list=no
  -      save_LDFLAGS=$LDFLAGS
  -      echo "_main" > conftest.sym
  -      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
  -      cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -
  -int
  -main ()
  -{
  -
  -  ;
  -  return 0;
  -}
  -_ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  -  lt_cv_ld_exported_symbols_list=yes
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	lt_cv_ld_exported_symbols_list=no
  -fi
  -
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
  -	LDFLAGS="$save_LDFLAGS"
  -
  -fi
  -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
  -$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
  -    case $host_os in
  -    rhapsody* | darwin1.[012])
  -      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
  -    darwin1.*)
  -      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
  -    darwin*) # darwin 5.x on
  -      # if running on 10.5 or later, the deployment target defaults
  -      # to the OS version, if on x86, and 10.4, the deployment
  -      # target defaults to 10.4. Don't you love it?
  -      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
  -	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
  -	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
  -	10.[012]*)
  -	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
  -	10.*)
  -	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
  -      esac
  -    ;;
  -  esac
  -    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
  -      _lt_dar_single_mod='$single_module'
  -    fi
  -    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
  -      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
  -    else
  -      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
  -    fi
  -    if test "$DSYMUTIL" != ":"; then
  -      _lt_dsymutil='~$DSYMUTIL $lib || :'
  -    else
  -      _lt_dsymutil=
  -    fi
  -    ;;
  -  esac
  -
  -ac_ext=c
  -ac_cpp='$CPP $CPPFLAGS'
  -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  -ac_compiler_gnu=$ac_cv_c_compiler_gnu
  -{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
  -$as_echo_n "checking how to run the C preprocessor... " >&6; }
  -# On Suns, sometimes $CPP names a directory.
  -if test -n "$CPP" && test -d "$CPP"; then
  -  CPP=
  -fi
  -if test -z "$CPP"; then
  -  if test "${ac_cv_prog_CPP+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -      # Double quotes because CPP needs to be expanded
  -    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
  -    do
  -      ac_preproc_ok=false
  -for ac_c_preproc_warn_flag in '' yes
  -do
  -  # Use a header file that comes with gcc, so configuring glibc
  -  # with a fresh cross-compiler works.
  -  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
  -  # <limits.h> exists even on freestanding compilers.
  -  # On the NeXT, cc -E runs the code through the compiler's parser,
  -  # not just through cpp. "Syntax error" is here to catch this case.
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#ifdef __STDC__
  -# include <limits.h>
  -#else
  -# include <assert.h>
  -#endif
  -		     Syntax error
  -_ACEOF
  -if { (ac_try="$ac_cpp conftest.$ac_ext"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } >/dev/null && {
  -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       }; then
  -  :
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -  # Broken: fails on valid input.
  -continue
  +ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
  +if test -n "$ac_ct_LIPO"; then
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
  +$as_echo "$ac_ct_LIPO" >&6; }
  +else
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  +$as_echo "no" >&6; }
   fi
   
  -rm -f conftest.err conftest.$ac_ext
  -
  -  # OK, works on sane cases.  Now check whether nonexistent headers
  -  # can be detected and how.
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#include <ac_nonexistent.h>
  -_ACEOF
  -if { (ac_try="$ac_cpp conftest.$ac_ext"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  +  if test "x$ac_ct_LIPO" = x; then
  +    LIPO=":"
  +  else
  +    case $cross_compiling:$ac_tool_warned in
  +yes:)
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  +ac_tool_warned=yes ;;
   esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } >/dev/null && {
  -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       }; then
  -  # Broken: success on invalid input.
  -continue
  +    LIPO=$ac_ct_LIPO
  +  fi
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -  # Passes both tests.
  -ac_preproc_ok=:
  -break
  +  LIPO="$ac_cv_prog_LIPO"
   fi
   
  -rm -f conftest.err conftest.$ac_ext
  -
  +    if test -n "$ac_tool_prefix"; then
  +  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
  +set dummy ${ac_tool_prefix}otool; ac_word=$2
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  +$as_echo_n "checking for $ac_word... " >&6; }
  +if test "${ac_cv_prog_OTOOL+set}" = set; then :
  +  $as_echo_n "(cached) " >&6
  +else
  +  if test -n "$OTOOL"; then
  +  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
  +else
  +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  +for as_dir in $PATH
  +do
  +  IFS=$as_save_IFS
  +  test -z "$as_dir" && as_dir=.
  +    for ac_exec_ext in '' $ac_executable_extensions; do
  +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  +    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    break 2
  +  fi
   done
  -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  -rm -f conftest.err conftest.$ac_ext
  -if $ac_preproc_ok; then
  -  break
  +  done
  +IFS=$as_save_IFS
  +
  +fi
  +fi
  +OTOOL=$ac_cv_prog_OTOOL
  +if test -n "$OTOOL"; then
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
  +$as_echo "$OTOOL" >&6; }
  +else
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  +$as_echo "no" >&6; }
   fi
   
  -    done
  -    ac_cv_prog_CPP=$CPP
   
   fi
  -  CPP=$ac_cv_prog_CPP
  +if test -z "$ac_cv_prog_OTOOL"; then
  +  ac_ct_OTOOL=$OTOOL
  +  # Extract the first word of "otool", so it can be a program name with args.
  +set dummy otool; ac_word=$2
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  +$as_echo_n "checking for $ac_word... " >&6; }
  +if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
  +  $as_echo_n "(cached) " >&6
   else
  -  ac_cv_prog_CPP=$CPP
  -fi
  -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
  -$as_echo "$CPP" >&6; }
  -ac_preproc_ok=false
  -for ac_c_preproc_warn_flag in '' yes
  -do
  -  # Use a header file that comes with gcc, so configuring glibc
  -  # with a fresh cross-compiler works.
  -  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
  -  # <limits.h> exists even on freestanding compilers.
  -  # On the NeXT, cc -E runs the code through the compiler's parser,
  -  # not just through cpp. "Syntax error" is here to catch this case.
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#ifdef __STDC__
  -# include <limits.h>
  -#else
  -# include <assert.h>
  -#endif
  -		     Syntax error
  -_ACEOF
  -if { (ac_try="$ac_cpp conftest.$ac_ext"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } >/dev/null && {
  -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       }; then
  -  :
  +  if test -n "$ac_ct_OTOOL"; then
  +  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  +for as_dir in $PATH
  +do
  +  IFS=$as_save_IFS
  +  test -z "$as_dir" && as_dir=.
  +    for ac_exec_ext in '' $ac_executable_extensions; do
  +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  +    ac_cv_prog_ac_ct_OTOOL="otool"
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    break 2
  +  fi
  +done
  +  done
  +IFS=$as_save_IFS
   
  -  # Broken: fails on valid input.
  -continue
  +fi
  +fi
  +ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
  +if test -n "$ac_ct_OTOOL"; then
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
  +$as_echo "$ac_ct_OTOOL" >&6; }
  +else
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  +$as_echo "no" >&6; }
   fi
   
  -rm -f conftest.err conftest.$ac_ext
  -
  -  # OK, works on sane cases.  Now check whether nonexistent headers
  -  # can be detected and how.
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#include <ac_nonexistent.h>
  -_ACEOF
  -if { (ac_try="$ac_cpp conftest.$ac_ext"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  +  if test "x$ac_ct_OTOOL" = x; then
  +    OTOOL=":"
  +  else
  +    case $cross_compiling:$ac_tool_warned in
  +yes:)
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  +ac_tool_warned=yes ;;
   esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } >/dev/null && {
  -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       }; then
  -  # Broken: success on invalid input.
  -continue
  +    OTOOL=$ac_ct_OTOOL
  +  fi
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -  # Passes both tests.
  -ac_preproc_ok=:
  -break
  +  OTOOL="$ac_cv_prog_OTOOL"
   fi
   
  -rm -f conftest.err conftest.$ac_ext
  -
  +    if test -n "$ac_tool_prefix"; then
  +  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
  +set dummy ${ac_tool_prefix}otool64; ac_word=$2
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  +$as_echo_n "checking for $ac_word... " >&6; }
  +if test "${ac_cv_prog_OTOOL64+set}" = set; then :
  +  $as_echo_n "(cached) " >&6
  +else
  +  if test -n "$OTOOL64"; then
  +  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
  +else
  +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  +for as_dir in $PATH
  +do
  +  IFS=$as_save_IFS
  +  test -z "$as_dir" && as_dir=.
  +    for ac_exec_ext in '' $ac_executable_extensions; do
  +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  +    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    break 2
  +  fi
   done
  -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  -rm -f conftest.err conftest.$ac_ext
  -if $ac_preproc_ok; then
  -  :
  +  done
  +IFS=$as_save_IFS
  +
  +fi
  +fi
  +OTOOL64=$ac_cv_prog_OTOOL64
  +if test -n "$OTOOL64"; then
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
  +$as_echo "$OTOOL64" >&6; }
   else
  -  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
  -See \`config.log' for more details." >&5
  -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
  -See \`config.log' for more details." >&2;}
  -   { (exit 1); exit 1; }; }; }
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  +$as_echo "no" >&6; }
   fi
   
  -ac_ext=c
  -ac_cpp='$CPP $CPPFLAGS'
  -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  -ac_compiler_gnu=$ac_cv_c_compiler_gnu
  -
   
  -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
  -$as_echo_n "checking for ANSI C header files... " >&6; }
  -if test "${ac_cv_header_stdc+set}" = set; then
  +fi
  +if test -z "$ac_cv_prog_OTOOL64"; then
  +  ac_ct_OTOOL64=$OTOOL64
  +  # Extract the first word of "otool64", so it can be a program name with args.
  +set dummy otool64; ac_word=$2
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  +$as_echo_n "checking for $ac_word... " >&6; }
  +if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#include <stdlib.h>
  -#include <stdarg.h>
  -#include <string.h>
  -#include <float.h>
  -
  -int
  -main ()
  -{
  -
  -  ;
  -  return 0;
  -}
  -_ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  ac_cv_header_stdc=yes
  +  if test -n "$ac_ct_OTOOL64"; then
  +  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  +for as_dir in $PATH
  +do
  +  IFS=$as_save_IFS
  +  test -z "$as_dir" && as_dir=.
  +    for ac_exec_ext in '' $ac_executable_extensions; do
  +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  +    ac_cv_prog_ac_ct_OTOOL64="otool64"
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    break 2
  +  fi
  +done
  +  done
  +IFS=$as_save_IFS
   
  -	ac_cv_header_stdc=no
   fi
  -
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -
  -if test $ac_cv_header_stdc = yes; then
  -  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#include <string.h>
  -
  -_ACEOF
  -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  -  $EGREP "memchr" >/dev/null 2>&1; then
  -  :
  -else
  -  ac_cv_header_stdc=no
   fi
  -rm -f conftest*
  -
  +ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
  +if test -n "$ac_ct_OTOOL64"; then
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
  +$as_echo "$ac_ct_OTOOL64" >&6; }
  +else
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  +$as_echo "no" >&6; }
   fi
   
  -if test $ac_cv_header_stdc = yes; then
  -  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#include <stdlib.h>
  -
  -_ACEOF
  -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  -  $EGREP "free" >/dev/null 2>&1; then
  -  :
  +  if test "x$ac_ct_OTOOL64" = x; then
  +    OTOOL64=":"
  +  else
  +    case $cross_compiling:$ac_tool_warned in
  +yes:)
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  +ac_tool_warned=yes ;;
  +esac
  +    OTOOL64=$ac_ct_OTOOL64
  +  fi
   else
  -  ac_cv_header_stdc=no
  +  OTOOL64="$ac_cv_prog_OTOOL64"
   fi
  -rm -f conftest*
   
  -fi
   
  -if test $ac_cv_header_stdc = yes; then
  -  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
  -  if test "$cross_compiling" = yes; then
  -  :
  -else
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#include <ctype.h>
  -#include <stdlib.h>
  -#if ((' ' & 0x0FF) == 0x020)
  -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
  -#else
  -# define ISLOWER(c) \
  -		   (('a' <= (c) && (c) <= 'i') \
  -		     || ('j' <= (c) && (c) <= 'r') \
  -		     || ('s' <= (c) && (c) <= 'z'))
  -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
  -#endif
   
  -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
  -int
  -main ()
  -{
  -  int i;
  -  for (i = 0; i < 256; i++)
  -    if (XOR (islower (i), ISLOWER (i))
  -	|| toupper (i) != TOUPPER (i))
  -      return 2;
  -  return 0;
  -}
  -_ACEOF
  -rm -f conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>&5
  -  ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
  -  { (case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_try") 2>&5
  -  ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }; }; then
  -  :
  -else
  -  $as_echo "$as_me: program exited with status $ac_status" >&5
  -$as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
   
  -( exit $ac_status )
  -ac_cv_header_stdc=no
  -fi
  -rm -rf conftest.dSYM
  -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  -fi
   
   
  -fi
  -fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
  -$as_echo "$ac_cv_header_stdc" >&6; }
  -if test $ac_cv_header_stdc = yes; then
   
  -cat >>confdefs.h <<\_ACEOF
  -#define STDC_HEADERS 1
  -_ACEOF
   
  -fi
   
  -# On IRIX 5.3, sys/types and inttypes.h are conflicting.
   
   
   
  @@ -7808,125 +7799,118 @@
   
   
   
  -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
  -		  inttypes.h stdint.h unistd.h
  -do
  -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  -$as_echo_n "checking for $ac_header... " >&6; }
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -$ac_includes_default
   
  -#include <$ac_header>
  -_ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  eval "$as_ac_Header=yes"
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
   
  -	eval "$as_ac_Header=no"
  -fi
   
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -fi
  -ac_res=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  -$as_echo "$ac_res" >&6; }
  -as_val=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -   if test "x$as_val" = x""yes; then
  -  cat >>confdefs.h <<_ACEOF
  -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  -_ACEOF
   
  -fi
   
  -done
   
   
   
  -for ac_header in dlfcn.h
  -do
  -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  -$as_echo_n "checking for $ac_header... " >&6; }
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  +
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
  +$as_echo_n "checking for -single_module linker flag... " >&6; }
  +if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +  lt_cv_apple_cc_single_mod=no
  +      if test -z "${LT_MULTI_MODULE}"; then
  +	# By default we will add the -single_module flag. You can override
  +	# by either setting the environment variable LT_MULTI_MODULE
  +	# non-empty at configure time, or by adding -multi_module to the
  +	# link flags.
  +	rm -rf libconftest.dylib*
  +	echo "int foo(void){return 1;}" > conftest.c
  +	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
  +-dynamiclib -Wl,-single_module conftest.c" >&5
  +	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
  +	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
  +        _lt_result=$?
  +	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
  +	  lt_cv_apple_cc_single_mod=yes
  +	else
  +	  cat conftest.err >&5
  +	fi
  +	rm -rf libconftest.dylib*
  +	rm -f conftest.*
  +      fi
  +fi
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
  +$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
  +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
  +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
  +  $as_echo_n "(cached) " >&6
  +else
  +  lt_cv_ld_exported_symbols_list=no
  +      save_LDFLAGS=$LDFLAGS
  +      echo "_main" > conftest.sym
  +      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
  +      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
  -$ac_includes_default
   
  -#include <$ac_header>
  +int
  +main ()
  +{
  +
  +  ;
  +  return 0;
  +}
   _ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  eval "$as_ac_Header=yes"
  +if ac_fn_c_try_link "$LINENO"; then :
  +  lt_cv_ld_exported_symbols_list=yes
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	eval "$as_ac_Header=no"
  +  lt_cv_ld_exported_symbols_list=no
   fi
  +rm -f core conftest.err conftest.$ac_objext \
  +    conftest$ac_exeext conftest.$ac_ext
  +	LDFLAGS="$save_LDFLAGS"
   
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   fi
  -ac_res=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  -$as_echo "$ac_res" >&6; }
  -as_val=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -   if test "x$as_val" = x""yes; then
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
  +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
  +    case $host_os in
  +    rhapsody* | darwin1.[012])
  +      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
  +    darwin1.*)
  +      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
  +    darwin*) # darwin 5.x on
  +      # if running on 10.5 or later, the deployment target defaults
  +      # to the OS version, if on x86, and 10.4, the deployment
  +      # target defaults to 10.4. Don't you love it?
  +      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
  +	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
  +	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
  +	10.[012]*)
  +	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
  +	10.*)
  +	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
  +      esac
  +    ;;
  +  esac
  +    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
  +      _lt_dar_single_mod='$single_module'
  +    fi
  +    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
  +      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
  +    else
  +      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
  +    fi
  +    if test "$DSYMUTIL" != ":"; then
  +      _lt_dsymutil='~$DSYMUTIL $lib || :'
  +    else
  +      _lt_dsymutil=
  +    fi
  +    ;;
  +  esac
  +
  +for ac_header in dlfcn.h
  +do :
  +  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
  +"
  +if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
     cat >>confdefs.h <<_ACEOF
  -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  +#define HAVE_DLFCN_H 1
   _ACEOF
   
   fi
  @@ -7949,9 +7933,9 @@
     do
       # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
   set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_CXX+set}" = set; then
  +if test "${ac_cv_prog_CXX+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$CXX"; then
  @@ -7962,24 +7946,24 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
       ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
   CXX=$ac_cv_prog_CXX
   if test -n "$CXX"; then
  -  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
   $as_echo "$CXX" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -7993,9 +7977,9 @@
   do
     # Extract the first word of "$ac_prog", so it can be a program name with args.
   set dummy $ac_prog; ac_word=$2
  -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   $as_echo_n "checking for $ac_word... " >&6; }
  -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
  +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -n "$ac_ct_CXX"; then
  @@ -8006,24 +7990,24 @@
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  for ac_exec_ext in '' $ac_executable_extensions; do
  +    for ac_exec_ext in '' $ac_executable_extensions; do
     if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
       ac_cv_prog_ac_ct_CXX="$ac_prog"
  -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
       break 2
     fi
   done
  -done
  +  done
   IFS=$as_save_IFS
   
   fi
   fi
   ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
   if test -n "$ac_ct_CXX"; then
  -  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
   $as_echo "$ac_ct_CXX" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -8036,7 +8020,7 @@
     else
       case $cross_compiling:$ac_tool_warned in
   yes:)
  -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
   $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
   ac_tool_warned=yes ;;
   esac
  @@ -8047,53 +8031,36 @@
     fi
   fi
   # Provide some information about the compiler.
  -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
  +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
   set X $ac_compile
   ac_compiler=$2
  -{ (ac_try="$ac_compiler --version >&5"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compiler --version >&5") 2>&5
  -  ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }
  -{ (ac_try="$ac_compiler -v >&5"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compiler -v >&5") 2>&5
  -  ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }
  -{ (ac_try="$ac_compiler -V >&5"
  +for ac_option in --version -v -V -qversion; do
  +  { { ac_try="$ac_compiler $ac_option >&5"
   case "(($ac_try" in
     *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     *) ac_try_echo=$ac_try;;
   esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compiler -V >&5") 2>&5
  +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  +$as_echo "$ac_try_echo"; } >&5
  +  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
     ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }
  +  if test -s conftest.err; then
  +    sed '10a\
  +... rest of stderr output deleted ...
  +         10q' conftest.err >conftest.er1
  +    cat conftest.er1 >&5
  +  fi
  +  rm -f conftest.er1 conftest.err
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; }
  +done
   
  -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
   $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
  -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
  +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   
   int
  @@ -8104,40 +8071,19 @@
   #endif
   
     ;
  -  return 0;
  -}
  -_ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  +  return 0;
  +}
  +_ACEOF
  +if ac_fn_cxx_try_compile "$LINENO"; then :
     ac_compiler_gnu=yes
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	ac_compiler_gnu=no
  +  ac_compiler_gnu=no
   fi
  -
   rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
   
   fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
   $as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
   if test $ac_compiler_gnu = yes; then
     GXX=yes
  @@ -8146,20 +8092,16 @@
   fi
   ac_test_CXXFLAGS=${CXXFLAGS+set}
   ac_save_CXXFLAGS=$CXXFLAGS
  -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
   $as_echo_n "checking whether $CXX accepts -g... " >&6; }
  -if test "${ac_cv_prog_cxx_g+set}" = set; then
  +if test "${ac_cv_prog_cxx_g+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     ac_save_cxx_werror_flag=$ac_cxx_werror_flag
      ac_cxx_werror_flag=yes
      ac_cv_prog_cxx_g=no
      CXXFLAGS="-g"
  -   cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   
   int
  @@ -8170,35 +8112,11 @@
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  +if ac_fn_cxx_try_compile "$LINENO"; then :
     ac_cv_prog_cxx_g=yes
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	CXXFLAGS=""
  -      cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +  CXXFLAGS=""
  +      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   
   int
  @@ -8209,36 +8127,12 @@
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  :
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  +if ac_fn_cxx_try_compile "$LINENO"; then :
   
  -	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
  +else
  +  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
   	 CXXFLAGS="-g"
  -	 cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   
   int
  @@ -8249,42 +8143,17 @@
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  +if ac_fn_cxx_try_compile "$LINENO"; then :
     ac_cv_prog_cxx_g=yes
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -
   fi
  -
   rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   fi
  -
   rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   fi
  -
   rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
      ac_cxx_werror_flag=$ac_save_cxx_werror_flag
   fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
   $as_echo "$ac_cv_prog_cxx_g" >&6; }
   if test "$ac_test_CXXFLAGS" = set; then
     CXXFLAGS=$ac_save_CXXFLAGS
  @@ -8309,9 +8178,9 @@
   
   depcc="$CXX"  am_compiler_list=
   
  -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
   $as_echo_n "checking dependency style of $depcc... " >&6; }
  -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
  +if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
  @@ -8337,6 +8206,11 @@
     if test "$am_compiler_list" = ""; then
        am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
     fi
  +  am__universal=false
  +  case " $depcc " in #(
  +     *\ -arch\ *\ -arch\ *) am__universal=true ;;
  +     esac
  +
     for depmode in $am_compiler_list; do
       # Setup a source with many dependencies, because some compilers
       # like to wrap large dependency lists on column 80 (with \), and
  @@ -8354,7 +8228,17 @@
       done
       echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
   
  +    # We check with `-c' and `-o' for the sake of the "dashmstdout"
  +    # mode.  It turns out that the SunPro C++ compiler does not properly
  +    # handle `-M -o', and we need to detect this.  Also, some Intel
  +    # versions had trouble with output in subdirs
  +    am__obj=sub/conftest.${OBJEXT-o}
  +    am__minus_obj="-o $am__obj"
       case $depmode in
  +    gcc)
  +      # This depmode causes a compiler race in universal mode.
  +      test "$am__universal" = false || continue
  +      ;;
       nosideeffect)
         # after this tag, mechanisms are not by side-effect, so they'll
         # only be used when explicitly requested
  @@ -8364,19 +8248,23 @@
   	break
         fi
         ;;
  +    msvisualcpp | msvcmsys)
  +      # This compiler won't grok `-c -o', but also, the minuso test has
  +      # not run yet.  These depmodes are late enough in the game, and
  +      # so weak that their functioning should not be impacted.
  +      am__obj=conftest.${OBJEXT-o}
  +      am__minus_obj=
  +      ;;
       none) break ;;
       esac
  -    # We check with `-c' and `-o' for the sake of the "dashmstdout"
  -    # mode.  It turns out that the SunPro C++ compiler does not properly
  -    # handle `-M -o', and we need to detect this.
       if depmode=$depmode \
  -       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
  +       source=sub/conftest.c object=$am__obj \
          depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
  -       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
  +       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
            >/dev/null 2>conftest.err &&
          grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
          grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
  -       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
  +       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
          ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
         # icc doesn't choke on unknown options, it will just issue warnings
         # or remarks (even with -Werror).  So we grep stderr for any message
  @@ -8400,7 +8288,7 @@
   fi
   
   fi
  -{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
   $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
   CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
   
  @@ -8423,10 +8311,10 @@
   ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
   ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
   ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  -{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
   $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
   if test -z "$CXXCPP"; then
  -  if test "${ac_cv_prog_CXXCPP+set}" = set; then
  +  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
         # Double quotes because CXXCPP needs to be expanded
  @@ -8441,11 +8329,7 @@
     # <limits.h> exists even on freestanding compilers.
     # On the NeXT, cc -E runs the code through the compiler's parser,
     # not just through cpp. "Syntax error" is here to catch this case.
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   #ifdef __STDC__
   # include <limits.h>
  @@ -8454,78 +8338,34 @@
   #endif
   		     Syntax error
   _ACEOF
  -if { (ac_try="$ac_cpp conftest.$ac_ext"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } >/dev/null && {
  -	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       }; then
  -  :
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  +if ac_fn_cxx_try_cpp "$LINENO"; then :
   
  +else
     # Broken: fails on valid input.
   continue
   fi
  -
   rm -f conftest.err conftest.$ac_ext
   
     # OK, works on sane cases.  Now check whether nonexistent headers
     # can be detected and how.
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   #include <ac_nonexistent.h>
   _ACEOF
  -if { (ac_try="$ac_cpp conftest.$ac_ext"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } >/dev/null && {
  -	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       }; then
  +if ac_fn_cxx_try_cpp "$LINENO"; then :
     # Broken: success on invalid input.
   continue
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
     # Passes both tests.
   ac_preproc_ok=:
   break
   fi
  -
   rm -f conftest.err conftest.$ac_ext
   
   done
   # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
   rm -f conftest.err conftest.$ac_ext
  -if $ac_preproc_ok; then
  +if $ac_preproc_ok; then :
     break
   fi
   
  @@ -8537,7 +8377,7 @@
   else
     ac_cv_prog_CXXCPP=$CXXCPP
   fi
  -{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
   $as_echo "$CXXCPP" >&6; }
   ac_preproc_ok=false
   for ac_cxx_preproc_warn_flag in '' yes
  @@ -8548,11 +8388,7 @@
     # <limits.h> exists even on freestanding compilers.
     # On the NeXT, cc -E runs the code through the compiler's parser,
     # not just through cpp. "Syntax error" is here to catch this case.
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   #ifdef __STDC__
   # include <limits.h>
  @@ -8561,81 +8397,37 @@
   #endif
   		     Syntax error
   _ACEOF
  -if { (ac_try="$ac_cpp conftest.$ac_ext"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } >/dev/null && {
  -	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       }; then
  -  :
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  +if ac_fn_cxx_try_cpp "$LINENO"; then :
   
  +else
     # Broken: fails on valid input.
   continue
   fi
  -
   rm -f conftest.err conftest.$ac_ext
   
     # OK, works on sane cases.  Now check whether nonexistent headers
     # can be detected and how.
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   #include <ac_nonexistent.h>
   _ACEOF
  -if { (ac_try="$ac_cpp conftest.$ac_ext"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } >/dev/null && {
  -	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       }; then
  +if ac_fn_cxx_try_cpp "$LINENO"; then :
     # Broken: success on invalid input.
   continue
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
     # Passes both tests.
   ac_preproc_ok=:
   break
   fi
  -
   rm -f conftest.err conftest.$ac_ext
   
   done
   # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
   rm -f conftest.err conftest.$ac_ext
  -if $ac_preproc_ok; then
  -  :
  +if $ac_preproc_ok; then :
  +
   else
  -  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  +  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
   $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   _lt_caught_CXX_error=yes; }
   fi
  @@ -8662,7 +8454,7 @@
   
   
               # Check whether --enable-shared was given.
  -if test "${enable_shared+set}" = set; then
  +if test "${enable_shared+set}" = set; then :
     enableval=$enable_shared; p=${PACKAGE-default}
       case $enableval in
       yes) enable_shared=yes ;;
  @@ -8693,7 +8485,7 @@
   
   
     # Check whether --enable-static was given.
  -if test "${enable_static+set}" = set; then
  +if test "${enable_static+set}" = set; then :
     enableval=$enable_static; p=${PACKAGE-default}
       case $enableval in
       yes) enable_static=yes ;;
  @@ -8725,7 +8517,7 @@
   
   
   # Check whether --with-pic was given.
  -if test "${with_pic+set}" = set; then
  +if test "${with_pic+set}" = set; then :
     withval=$with_pic; pic_mode="$withval"
   else
     pic_mode=default
  @@ -8741,7 +8533,7 @@
   
   
     # Check whether --enable-fast-install was given.
  -if test "${enable_fast_install+set}" = set; then
  +if test "${enable_fast_install+set}" = set; then :
     enableval=$enable_fast_install; p=${PACKAGE-default}
       case $enableval in
       yes) enable_fast_install=yes ;;
  @@ -8822,9 +8614,9 @@
      setopt NO_GLOB_SUBST
   fi
   
  -{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
   $as_echo_n "checking for objdir... " >&6; }
  -if test "${lt_cv_objdir+set}" = set; then
  +if test "${lt_cv_objdir+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     rm -f .libs 2>/dev/null
  @@ -8837,7 +8629,7 @@
   fi
   rmdir .libs 2>/dev/null
   fi
  -{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
   $as_echo "$lt_cv_objdir" >&6; }
   objdir=$lt_cv_objdir
   
  @@ -8930,9 +8722,9 @@
   case $deplibs_check_method in
   file_magic*)
     if test "$file_magic_cmd" = '$MAGIC_CMD'; then
  -    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
   $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
  -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
  +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     case $MAGIC_CMD in
  @@ -8983,10 +8775,10 @@
   
   MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
   if test -n "$MAGIC_CMD"; then
  -  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
   $as_echo "$MAGIC_CMD" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -8996,9 +8788,9 @@
   
   if test -z "$lt_cv_path_MAGIC_CMD"; then
     if test -n "$ac_tool_prefix"; then
  -    { $as_echo "$as_me:$LINENO: checking for file" >&5
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
   $as_echo_n "checking for file... " >&6; }
  -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
  +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     case $MAGIC_CMD in
  @@ -9049,10 +8841,10 @@
   
   MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
   if test -n "$MAGIC_CMD"; then
  -  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
   $as_echo "$MAGIC_CMD" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
   
  @@ -9129,9 +8921,9 @@
   if test "$GCC" = yes; then
     lt_prog_compiler_no_builtin_flag=' -fno-builtin'
   
  -  { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
   $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
  -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
  +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     lt_cv_prog_compiler_rtti_exceptions=no
  @@ -9147,11 +8939,11 @@
      -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
      -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
      -e 's:$: $lt_compiler_flag:'`
  -   (eval echo "\"\$as_me:9150: $lt_compile\"" >&5)
  +   (eval echo "\"\$as_me:8942: $lt_compile\"" >&5)
      (eval "$lt_compile" 2>conftest.err)
      ac_status=$?
      cat conftest.err >&5
  -   echo "$as_me:9154: \$? = $ac_status" >&5
  +   echo "$as_me:8946: \$? = $ac_status" >&5
      if (exit $ac_status) && test -s "$ac_outfile"; then
        # The compiler can only warn and ignore the option if not recognized
        # So say no if there are warnings other than the usual output.
  @@ -9164,7 +8956,7 @@
      $RM conftest*
   
   fi
  -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
   $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
   
   if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
  @@ -9184,7 +8976,7 @@
   lt_prog_compiler_pic=
   lt_prog_compiler_static=
   
  -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
   $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
   
     if test "$GCC" = yes; then
  @@ -9456,7 +9248,7 @@
       lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
       ;;
   esac
  -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
   $as_echo "$lt_prog_compiler_pic" >&6; }
   
   
  @@ -9468,9 +9260,9 @@
   # Check to make sure the PIC flag actually works.
   #
   if test -n "$lt_prog_compiler_pic"; then
  -  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
   $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
  -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
  +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     lt_cv_prog_compiler_pic_works=no
  @@ -9486,11 +9278,11 @@
      -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
      -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
      -e 's:$: $lt_compiler_flag:'`
  -   (eval echo "\"\$as_me:9489: $lt_compile\"" >&5)
  +   (eval echo "\"\$as_me:9281: $lt_compile\"" >&5)
      (eval "$lt_compile" 2>conftest.err)
      ac_status=$?
      cat conftest.err >&5
  -   echo "$as_me:9493: \$? = $ac_status" >&5
  +   echo "$as_me:9285: \$? = $ac_status" >&5
      if (exit $ac_status) && test -s "$ac_outfile"; then
        # The compiler can only warn and ignore the option if not recognized
        # So say no if there are warnings other than the usual output.
  @@ -9503,7 +9295,7 @@
      $RM conftest*
   
   fi
  -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
   $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
   
   if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
  @@ -9527,9 +9319,9 @@
   # Check to make sure the static flag actually works.
   #
   wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
  -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
   $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
  -if test "${lt_cv_prog_compiler_static_works+set}" = set; then
  +if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     lt_cv_prog_compiler_static_works=no
  @@ -9555,7 +9347,7 @@
      LDFLAGS="$save_LDFLAGS"
   
   fi
  -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
   $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
   
   if test x"$lt_cv_prog_compiler_static_works" = xyes; then
  @@ -9570,9 +9362,9 @@
   
   
   
  -  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
   $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
  -if test "${lt_cv_prog_compiler_c_o+set}" = set; then
  +if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     lt_cv_prog_compiler_c_o=no
  @@ -9591,11 +9383,11 @@
      -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
      -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
      -e 's:$: $lt_compiler_flag:'`
  -   (eval echo "\"\$as_me:9594: $lt_compile\"" >&5)
  +   (eval echo "\"\$as_me:9386: $lt_compile\"" >&5)
      (eval "$lt_compile" 2>out/conftest.err)
      ac_status=$?
      cat out/conftest.err >&5
  -   echo "$as_me:9598: \$? = $ac_status" >&5
  +   echo "$as_me:9390: \$? = $ac_status" >&5
      if (exit $ac_status) && test -s out/conftest2.$ac_objext
      then
        # The compiler can only warn and ignore the option if not recognized
  @@ -9617,7 +9409,7 @@
      $RM conftest*
   
   fi
  -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
   $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
   
   
  @@ -9625,9 +9417,9 @@
   
   
   
  -  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
   $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
  -if test "${lt_cv_prog_compiler_c_o+set}" = set; then
  +if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     lt_cv_prog_compiler_c_o=no
  @@ -9646,11 +9438,11 @@
      -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
      -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
      -e 's:$: $lt_compiler_flag:'`
  -   (eval echo "\"\$as_me:9649: $lt_compile\"" >&5)
  +   (eval echo "\"\$as_me:9441: $lt_compile\"" >&5)
      (eval "$lt_compile" 2>out/conftest.err)
      ac_status=$?
      cat out/conftest.err >&5
  -   echo "$as_me:9653: \$? = $ac_status" >&5
  +   echo "$as_me:9445: \$? = $ac_status" >&5
      if (exit $ac_status) && test -s out/conftest2.$ac_objext
      then
        # The compiler can only warn and ignore the option if not recognized
  @@ -9672,7 +9464,7 @@
      $RM conftest*
   
   fi
  -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
   $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
   
   
  @@ -9681,7 +9473,7 @@
   hard_links="nottested"
   if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
     # do not overwrite the value of need_locks provided by the user
  -  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
   $as_echo_n "checking if we can lock with hard links... " >&6; }
     hard_links=yes
     $RM conftest*
  @@ -9689,10 +9481,10 @@
     touch conftest.a
     ln conftest.a conftest.b 2>&5 || hard_links=no
     ln conftest.a conftest.b 2>/dev/null && hard_links=no
  -  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
   $as_echo "$hard_links" >&6; }
     if test "$hard_links" = no; then
  -    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
   $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
       need_locks=warn
     fi
  @@ -9705,7 +9497,7 @@
   
   
   
  -  { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
   $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
   
     runpath_var=
  @@ -10147,11 +9939,7 @@
   	allow_undefined_flag='-berok'
           # Determine the default libpath from the value encoded in an
           # empty executable.
  -        cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   
   int
  @@ -10162,27 +9950,7 @@
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  +if ac_fn_c_try_link "$LINENO"; then :
   
   lt_aix_libpath_sed='
       /Import File Strings/,/^$/ {
  @@ -10196,16 +9964,9 @@
   if test -z "$aix_libpath"; then
     aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
   fi
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -
   fi
  -
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
  +rm -f core conftest.err conftest.$ac_objext \
  +    conftest$ac_exeext conftest.$ac_ext
   if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
   
           hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  @@ -10218,11 +9979,7 @@
   	else
   	 # Determine the default libpath from the value encoded in an
   	 # empty executable.
  -	 cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   
   int
  @@ -10233,27 +9990,7 @@
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  +if ac_fn_c_try_link "$LINENO"; then :
   
   lt_aix_libpath_sed='
       /Import File Strings/,/^$/ {
  @@ -10267,16 +10004,9 @@
   if test -z "$aix_libpath"; then
     aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
   fi
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -
   fi
  -
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
  +rm -f core conftest.err conftest.$ac_objext \
  +    conftest$ac_exeext conftest.$ac_ext
   if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
   
   	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  @@ -10488,42 +10218,16 @@
   	# implicitly export all symbols.
           save_LDFLAGS="$LDFLAGS"
           LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  -        cat >conftest.$ac_ext <<_ACEOF
  +        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
   int foo(void) {}
   _ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  +if ac_fn_c_try_link "$LINENO"; then :
     archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
   
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -
   fi
  -
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
  +rm -f core conftest.err conftest.$ac_objext \
  +    conftest$ac_exeext conftest.$ac_ext
           LDFLAGS="$save_LDFLAGS"
         else
   	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
  @@ -10779,7 +10483,7 @@
       fi
     fi
   
  -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
   $as_echo "$ld_shlibs" >&6; }
   test "$ld_shlibs" = no && can_build_shared=no
   
  @@ -10816,16 +10520,16 @@
         # Test whether the compiler implicitly links with -lc since on some
         # systems, -lgcc has to come before -lc. If gcc already passes -lc
         # to ld, don't add -lc before -lgcc.
  -      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
  +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
   $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
         $RM conftest*
         echo "$lt_simple_compile_test_code" > conftest.$ac_ext
   
  -      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  +      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
     (eval $ac_compile) 2>&5
     ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } 2>conftest.err; then
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; } 2>conftest.err; then
           soname=conftest
           lib=conftest
           libobjs=conftest.$ac_objext
  @@ -10839,11 +10543,11 @@
           libname=conftest
           lt_save_allow_undefined_flag=$allow_undefined_flag
           allow_undefined_flag=
  -        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
  +        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
     (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
     ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; }
           then
   	  archive_cmds_need_lc=no
           else
  @@ -10854,7 +10558,7 @@
           cat conftest.err 1>&5
         fi
         $RM conftest*
  -      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
  +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
   $as_echo "$archive_cmds_need_lc" >&6; }
         ;;
       esac
  @@ -11018,7 +10722,7 @@
   
   
   
  -  { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
   $as_echo_n "checking dynamic linker characteristics... " >&6; }
   
   if test "$GCC" = yes; then
  @@ -11453,11 +11157,7 @@
     save_libdir=$libdir
     eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
          LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   
   int
  @@ -11468,41 +11168,13 @@
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  -  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
  +if ac_fn_c_try_link "$LINENO"; then :
  +  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
     shlibpath_overrides_runpath=yes
   fi
  -
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -
   fi
  -
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
  +rm -f core conftest.err conftest.$ac_objext \
  +    conftest$ac_exeext conftest.$ac_ext
     LDFLAGS=$save_LDFLAGS
     libdir=$save_libdir
   
  @@ -11714,7 +11386,7 @@
     dynamic_linker=no
     ;;
   esac
  -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
   $as_echo "$dynamic_linker" >&6; }
   test "$dynamic_linker" = no && can_build_shared=no
   
  @@ -11816,7 +11488,7 @@
   
   
   
  -  { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
   $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
   hardcode_action=
   if test -n "$hardcode_libdir_flag_spec" ||
  @@ -11841,7 +11513,7 @@
     # directories.
     hardcode_action=unsupported
   fi
  -{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
   $as_echo "$hardcode_action" >&6; }
   
   if test "$hardcode_action" = relink ||
  @@ -11867,130 +11539,34 @@
     lt_cv_dlopen=no
     lt_cv_dlopen_libs=
   
  -  case $host_os in
  -  beos*)
  -    lt_cv_dlopen="load_add_on"
  -    lt_cv_dlopen_libs=
  -    lt_cv_dlopen_self=yes
  -    ;;
  -
  -  mingw* | pw32* | cegcc*)
  -    lt_cv_dlopen="LoadLibrary"
  -    lt_cv_dlopen_libs=
  -    ;;
  -
  -  cygwin*)
  -    lt_cv_dlopen="dlopen"
  -    lt_cv_dlopen_libs=
  -    ;;
  -
  -  darwin*)
  -  # if libdl is installed we need to link against it
  -    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
  -$as_echo_n "checking for dlopen in -ldl... " >&6; }
  -if test "${ac_cv_lib_dl_dlopen+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  ac_check_lib_save_LIBS=$LIBS
  -LIBS="-ldl  $LIBS"
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -
  -/* Override any GCC internal prototype to avoid an error.
  -   Use char because int might match the return type of a GCC
  -   builtin and then its argument prototype would still apply.  */
  -#ifdef __cplusplus
  -extern "C"
  -#endif
  -char dlopen ();
  -int
  -main ()
  -{
  -return dlopen ();
  -  ;
  -  return 0;
  -}
  -_ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  -  ac_cv_lib_dl_dlopen=yes
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	ac_cv_lib_dl_dlopen=no
  -fi
  -
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
  -LIBS=$ac_check_lib_save_LIBS
  -fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
  -$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
  -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
  -  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  -else
  -
  -    lt_cv_dlopen="dyld"
  +  case $host_os in
  +  beos*)
  +    lt_cv_dlopen="load_add_on"
       lt_cv_dlopen_libs=
       lt_cv_dlopen_self=yes
  +    ;;
   
  -fi
  +  mingw* | pw32* | cegcc*)
  +    lt_cv_dlopen="LoadLibrary"
  +    lt_cv_dlopen_libs=
  +    ;;
   
  +  cygwin*)
  +    lt_cv_dlopen="dlopen"
  +    lt_cv_dlopen_libs=
       ;;
   
  -  *)
  -    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
  -$as_echo_n "checking for shl_load... " >&6; }
  -if test "${ac_cv_func_shl_load+set}" = set; then
  +  darwin*)
  +  # if libdl is installed we need to link against it
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
  +$as_echo_n "checking for dlopen in -ldl... " >&6; }
  +if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +  ac_check_lib_save_LIBS=$LIBS
  +LIBS="-ldl  $LIBS"
  +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
  -/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
  -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
  -#define shl_load innocuous_shl_load
  -
  -/* System header to define __stub macros and hopefully few prototypes,
  -    which can conflict with char shl_load (); below.
  -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
  -    <limits.h> exists even on freestanding compilers.  */
  -
  -#ifdef __STDC__
  -# include <limits.h>
  -#else
  -# include <assert.h>
  -#endif
  -
  -#undef shl_load
   
   /* Override any GCC internal prototype to avoid an error.
      Use char because int might match the return type of a GCC
  @@ -11998,72 +11574,51 @@
   #ifdef __cplusplus
   extern "C"
   #endif
  -char shl_load ();
  -/* The GNU C library defines this for functions which it implements
  -    to always fail with ENOSYS.  Some functions are actually named
  -    something starting with __ and the normal name is an alias.  */
  -#if defined __stub_shl_load || defined __stub___shl_load
  -choke me
  -#endif
  -
  +char dlopen ();
   int
   main ()
   {
  -return shl_load ();
  +return dlopen ();
     ;
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  -  ac_cv_func_shl_load=yes
  +if ac_fn_c_try_link "$LINENO"; then :
  +  ac_cv_lib_dl_dlopen=yes
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	ac_cv_func_shl_load=no
  +  ac_cv_lib_dl_dlopen=no
   fi
  +rm -f core conftest.err conftest.$ac_objext \
  +    conftest$ac_exeext conftest.$ac_ext
  +LIBS=$ac_check_lib_save_LIBS
  +fi
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
  +$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
  +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
  +  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  +else
  +
  +    lt_cv_dlopen="dyld"
  +    lt_cv_dlopen_libs=
  +    lt_cv_dlopen_self=yes
   
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
   fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
  -$as_echo "$ac_cv_func_shl_load" >&6; }
  -if test "x$ac_cv_func_shl_load" = x""yes; then
  +
  +    ;;
  +
  +  *)
  +    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
  +if test "x$ac_cv_func_shl_load" = x""yes; then :
     lt_cv_dlopen="shl_load"
   else
  -  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
   $as_echo_n "checking for shl_load in -ldld... " >&6; }
  -if test "${ac_cv_lib_dld_shl_load+set}" = set; then
  +if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     ac_check_lib_save_LIBS=$LIBS
   LIBS="-ldld  $LIBS"
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   
   /* Override any GCC internal prototype to avoid an error.
  @@ -12081,145 +11636,32 @@
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  +if ac_fn_c_try_link "$LINENO"; then :
     ac_cv_lib_dld_shl_load=yes
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	ac_cv_lib_dld_shl_load=no
  +  ac_cv_lib_dld_shl_load=no
   fi
  -
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
  +rm -f core conftest.err conftest.$ac_objext \
  +    conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_check_lib_save_LIBS
   fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
   $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
  -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
  +if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
     lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
   else
  -  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
  -$as_echo_n "checking for dlopen... " >&6; }
  -if test "${ac_cv_func_dlopen+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
  -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
  -#define dlopen innocuous_dlopen
  -
  -/* System header to define __stub macros and hopefully few prototypes,
  -    which can conflict with char dlopen (); below.
  -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
  -    <limits.h> exists even on freestanding compilers.  */
  -
  -#ifdef __STDC__
  -# include <limits.h>
  -#else
  -# include <assert.h>
  -#endif
  -
  -#undef dlopen
  -
  -/* Override any GCC internal prototype to avoid an error.
  -   Use char because int might match the return type of a GCC
  -   builtin and then its argument prototype would still apply.  */
  -#ifdef __cplusplus
  -extern "C"
  -#endif
  -char dlopen ();
  -/* The GNU C library defines this for functions which it implements
  -    to always fail with ENOSYS.  Some functions are actually named
  -    something starting with __ and the normal name is an alias.  */
  -#if defined __stub_dlopen || defined __stub___dlopen
  -choke me
  -#endif
  -
  -int
  -main ()
  -{
  -return dlopen ();
  -  ;
  -  return 0;
  -}
  -_ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  -  ac_cv_func_dlopen=yes
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	ac_cv_func_dlopen=no
  -fi
  -
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
  -fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
  -$as_echo "$ac_cv_func_dlopen" >&6; }
  -if test "x$ac_cv_func_dlopen" = x""yes; then
  +  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
  +if test "x$ac_cv_func_dlopen" = x""yes; then :
     lt_cv_dlopen="dlopen"
   else
  -  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
   $as_echo_n "checking for dlopen in -ldl... " >&6; }
  -if test "${ac_cv_lib_dl_dlopen+set}" = set; then
  +if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     ac_check_lib_save_LIBS=$LIBS
   LIBS="-ldl  $LIBS"
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   
   /* Override any GCC internal prototype to avoid an error.
  @@ -12237,57 +11679,28 @@
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  +if ac_fn_c_try_link "$LINENO"; then :
     ac_cv_lib_dl_dlopen=yes
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	ac_cv_lib_dl_dlopen=no
  +  ac_cv_lib_dl_dlopen=no
   fi
  -
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
  +rm -f core conftest.err conftest.$ac_objext \
  +    conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_check_lib_save_LIBS
   fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
   $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
  -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
  +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
     lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
   else
  -  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
   $as_echo_n "checking for dlopen in -lsvld... " >&6; }
  -if test "${ac_cv_lib_svld_dlopen+set}" = set; then
  +if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     ac_check_lib_save_LIBS=$LIBS
   LIBS="-lsvld  $LIBS"
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   
   /* Override any GCC internal prototype to avoid an error.
  @@ -12305,57 +11718,28 @@
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  +if ac_fn_c_try_link "$LINENO"; then :
     ac_cv_lib_svld_dlopen=yes
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	ac_cv_lib_svld_dlopen=no
  +  ac_cv_lib_svld_dlopen=no
   fi
  -
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
  +rm -f core conftest.err conftest.$ac_objext \
  +    conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_check_lib_save_LIBS
   fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
   $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
  -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
  +if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
     lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
   else
  -  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
   $as_echo_n "checking for dld_link in -ldld... " >&6; }
  -if test "${ac_cv_lib_dld_dld_link+set}" = set; then
  +if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     ac_check_lib_save_LIBS=$LIBS
   LIBS="-ldld  $LIBS"
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   
   /* Override any GCC internal prototype to avoid an error.
  @@ -12373,43 +11757,18 @@
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  +if ac_fn_c_try_link "$LINENO"; then :
     ac_cv_lib_dld_dld_link=yes
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	ac_cv_lib_dld_dld_link=no
  +  ac_cv_lib_dld_dld_link=no
   fi
  -
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
  +rm -f core conftest.err conftest.$ac_objext \
  +    conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_check_lib_save_LIBS
   fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
   $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
  -if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
  +if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
     lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
   fi
   
  @@ -12448,9 +11807,9 @@
       save_LIBS="$LIBS"
       LIBS="$lt_cv_dlopen_libs $LIBS"
   
  -    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
   $as_echo_n "checking whether a program can dlopen itself... " >&6; }
  -if test "${lt_cv_dlopen_self+set}" = set; then
  +if test "${lt_cv_dlopen_self+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     	  if test "$cross_compiling" = yes; then :
  @@ -12459,7 +11818,7 @@
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
     lt_status=$lt_dlunknown
     cat > conftest.$ac_ext <<_LT_EOF
  -#line 12462 "configure"
  +#line 11821 "configure"
   #include "confdefs.h"
   
   #if HAVE_DLFCN_H
  @@ -12518,11 +11877,11 @@
     return status;
   }
   _LT_EOF
  -  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
     (eval $ac_link) 2>&5
     ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
       (./conftest; exit; ) >&5 2>/dev/null
       lt_status=$?
       case x$lt_status in
  @@ -12539,14 +11898,14 @@
   
   
   fi
  -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
   $as_echo "$lt_cv_dlopen_self" >&6; }
   
       if test "x$lt_cv_dlopen_self" = xyes; then
         wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
  -      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
  +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
   $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
  -if test "${lt_cv_dlopen_self_static+set}" = set; then
  +if test "${lt_cv_dlopen_self_static+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     	  if test "$cross_compiling" = yes; then :
  @@ -12555,7 +11914,7 @@
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
     lt_status=$lt_dlunknown
     cat > conftest.$ac_ext <<_LT_EOF
  -#line 12558 "configure"
  +#line 11917 "configure"
   #include "confdefs.h"
   
   #if HAVE_DLFCN_H
  @@ -12614,11 +11973,11 @@
     return status;
   }
   _LT_EOF
  -  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
     (eval $ac_link) 2>&5
     ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
       (./conftest; exit; ) >&5 2>/dev/null
       lt_status=$?
       case x$lt_status in
  @@ -12635,7 +11994,7 @@
   
   
   fi
  -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
   $as_echo "$lt_cv_dlopen_self_static" >&6; }
       fi
   
  @@ -12674,12 +12033,12 @@
   
   striplib=
   old_striplib=
  -{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
   $as_echo_n "checking whether stripping libraries is possible... " >&6; }
   if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
     test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
     test -z "$striplib" && striplib="$STRIP --strip-unneeded"
  -  { $as_echo "$as_me:$LINENO: result: yes" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
   $as_echo "yes" >&6; }
   else
   # FIXME - insert some real tests, host_os isn't really good enough
  @@ -12688,15 +12047,15 @@
       if test -n "$STRIP" ; then
         striplib="$STRIP -x"
         old_striplib="$STRIP -S"
  -      { $as_echo "$as_me:$LINENO: result: yes" >&5
  +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
   $as_echo "yes" >&6; }
       else
  -      { $as_echo "$as_me:$LINENO: result: no" >&5
  +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
       fi
       ;;
     *)
  -    { $as_echo "$as_me:$LINENO: result: no" >&5
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
       ;;
     esac
  @@ -12714,12 +12073,12 @@
   
   
     # Report which library types will actually be built
  -  { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
   $as_echo_n "checking if libtool supports shared libraries... " >&6; }
  -  { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
   $as_echo "$can_build_shared" >&6; }
   
  -  { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
   $as_echo_n "checking whether to build shared libraries... " >&6; }
     test "$can_build_shared" = "no" && enable_shared=no
   
  @@ -12740,14 +12099,14 @@
       fi
       ;;
     esac
  -  { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
   $as_echo "$enable_shared" >&6; }
   
  -  { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
   $as_echo_n "checking whether to build static libraries... " >&6; }
     # Make sure either enable_shared or enable_static is yes.
     test "$enable_shared" = yes || enable_static=yes
  -  { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
   $as_echo "$enable_static" >&6; }
   
   
  @@ -12888,7 +12247,7 @@
   
   
   # Check whether --with-gnu-ld was given.
  -if test "${with_gnu_ld+set}" = set; then
  +if test "${with_gnu_ld+set}" = set; then :
     withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
   else
     with_gnu_ld=no
  @@ -12897,7 +12256,7 @@
   ac_prog=ld
   if test "$GCC" = yes; then
     # Check if gcc -print-prog-name=ld gives a path.
  -  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
   $as_echo_n "checking for ld used by $CC... " >&6; }
     case $host in
     *-*-mingw*)
  @@ -12927,13 +12286,13 @@
       ;;
     esac
   elif test "$with_gnu_ld" = yes; then
  -  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
   $as_echo_n "checking for GNU ld... " >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
   $as_echo_n "checking for non-GNU ld... " >&6; }
   fi
  -if test "${lt_cv_path_LD+set}" = set; then
  +if test "${lt_cv_path_LD+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     if test -z "$LD"; then
  @@ -12964,18 +12323,16 @@
   
   LD="$lt_cv_path_LD"
   if test -n "$LD"; then
  -  { $as_echo "$as_me:$LINENO: result: $LD" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
   $as_echo "$LD" >&6; }
   else
  -  { $as_echo "$as_me:$LINENO: result: no" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
   fi
  -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
  -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
  -   { (exit 1); exit 1; }; }
  -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
  +test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
   $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
  -if test "${lt_cv_prog_gnu_ld+set}" = set; then
  +if test "${lt_cv_prog_gnu_ld+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     # I'd rather use --version here, but apparently some GNU lds only accept -v.
  @@ -12988,7 +12345,7 @@
     ;;
   esac
   fi
  -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
   $as_echo "$lt_cv_prog_gnu_ld" >&6; }
   with_gnu_ld=$lt_cv_prog_gnu_ld
   
  @@ -13043,7 +12400,7 @@
       fi
   
       # PORTME: fill in a description of your system's C++ link characteristics
  -    { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
   $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
       ld_shlibs_CXX=yes
       case $host_os in
  @@ -13144,11 +12501,7 @@
             allow_undefined_flag_CXX='-berok'
             # Determine the default libpath from the value encoded in an empty
             # executable.
  -          cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   
   int
  @@ -13159,27 +12512,7 @@
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  +if ac_fn_cxx_try_link "$LINENO"; then :
   
   lt_aix_libpath_sed='
       /Import File Strings/,/^$/ {
  @@ -13193,16 +12526,9 @@
   if test -z "$aix_libpath"; then
     aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
   fi
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -
   fi
  -
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
  +rm -f core conftest.err conftest.$ac_objext \
  +    conftest$ac_exeext conftest.$ac_ext
   if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
   
             hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  @@ -13216,11 +12542,7 @@
             else
   	    # Determine the default libpath from the value encoded in an
   	    # empty executable.
  -	    cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   
   int
  @@ -13231,27 +12553,7 @@
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  +if ac_fn_cxx_try_link "$LINENO"; then :
   
   lt_aix_libpath_sed='
       /Import File Strings/,/^$/ {
  @@ -13265,16 +12567,9 @@
   if test -z "$aix_libpath"; then
     aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
   fi
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -
   fi
  -
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
  +rm -f core conftest.err conftest.$ac_objext \
  +    conftest$ac_exeext conftest.$ac_ext
   if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
   
   	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  @@ -14018,7 +13313,7 @@
           ;;
       esac
   
  -    { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
   $as_echo "$ld_shlibs_CXX" >&6; }
       test "$ld_shlibs_CXX" = no && can_build_shared=no
   
  @@ -14046,11 +13341,11 @@
   };
   _LT_EOF
   
  -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  +if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
     (eval $ac_compile) 2>&5
     ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }; then
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; }; then
     # Parse the compiler output and extract the necessary
     # objects, libraries and library flags.
   
  @@ -14231,7 +13526,7 @@
   lt_prog_compiler_pic_CXX=
   lt_prog_compiler_static_CXX=
   
  -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
   $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
   
     # C++ specific cases for pic, static, wl, etc.
  @@ -14548,7 +13843,7 @@
       lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
       ;;
   esac
  -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
   $as_echo "$lt_prog_compiler_pic_CXX" >&6; }
   
   
  @@ -14557,9 +13852,9 @@
   # Check to make sure the PIC flag actually works.
   #
   if test -n "$lt_prog_compiler_pic_CXX"; then
  -  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
   $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
  -if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
  +if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     lt_cv_prog_compiler_pic_works_CXX=no
  @@ -14575,11 +13870,11 @@
      -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
      -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
      -e 's:$: $lt_compiler_flag:'`
  -   (eval echo "\"\$as_me:14578: $lt_compile\"" >&5)
  +   (eval echo "\"\$as_me:13873: $lt_compile\"" >&5)
      (eval "$lt_compile" 2>conftest.err)
      ac_status=$?
      cat conftest.err >&5
  -   echo "$as_me:14582: \$? = $ac_status" >&5
  +   echo "$as_me:13877: \$? = $ac_status" >&5
      if (exit $ac_status) && test -s "$ac_outfile"; then
        # The compiler can only warn and ignore the option if not recognized
        # So say no if there are warnings other than the usual output.
  @@ -14592,7 +13887,7 @@
      $RM conftest*
   
   fi
  -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
   $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
   
   if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
  @@ -14613,9 +13908,9 @@
   # Check to make sure the static flag actually works.
   #
   wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
  -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
   $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
  -if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
  +if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     lt_cv_prog_compiler_static_works_CXX=no
  @@ -14641,7 +13936,7 @@
      LDFLAGS="$save_LDFLAGS"
   
   fi
  -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
   $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
   
   if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
  @@ -14653,9 +13948,9 @@
   
   
   
  -    { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
   $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
  -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
  +if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     lt_cv_prog_compiler_c_o_CXX=no
  @@ -14674,11 +13969,11 @@
      -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
      -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
      -e 's:$: $lt_compiler_flag:'`
  -   (eval echo "\"\$as_me:14677: $lt_compile\"" >&5)
  +   (eval echo "\"\$as_me:13972: $lt_compile\"" >&5)
      (eval "$lt_compile" 2>out/conftest.err)
      ac_status=$?
      cat out/conftest.err >&5
  -   echo "$as_me:14681: \$? = $ac_status" >&5
  +   echo "$as_me:13976: \$? = $ac_status" >&5
      if (exit $ac_status) && test -s out/conftest2.$ac_objext
      then
        # The compiler can only warn and ignore the option if not recognized
  @@ -14700,14 +13995,14 @@
      $RM conftest*
   
   fi
  -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
   $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
   
   
   
  -    { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
   $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
  -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
  +if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     lt_cv_prog_compiler_c_o_CXX=no
  @@ -14726,11 +14021,11 @@
      -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
      -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
      -e 's:$: $lt_compiler_flag:'`
  -   (eval echo "\"\$as_me:14729: $lt_compile\"" >&5)
  +   (eval echo "\"\$as_me:14024: $lt_compile\"" >&5)
      (eval "$lt_compile" 2>out/conftest.err)
      ac_status=$?
      cat out/conftest.err >&5
  -   echo "$as_me:14733: \$? = $ac_status" >&5
  +   echo "$as_me:14028: \$? = $ac_status" >&5
      if (exit $ac_status) && test -s out/conftest2.$ac_objext
      then
        # The compiler can only warn and ignore the option if not recognized
  @@ -14752,7 +14047,7 @@
      $RM conftest*
   
   fi
  -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
   $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
   
   
  @@ -14761,7 +14056,7 @@
   hard_links="nottested"
   if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
     # do not overwrite the value of need_locks provided by the user
  -  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
   $as_echo_n "checking if we can lock with hard links... " >&6; }
     hard_links=yes
     $RM conftest*
  @@ -14769,10 +14064,10 @@
     touch conftest.a
     ln conftest.a conftest.b 2>&5 || hard_links=no
     ln conftest.a conftest.b 2>/dev/null && hard_links=no
  -  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
   $as_echo "$hard_links" >&6; }
     if test "$hard_links" = no; then
  -    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
   $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
       need_locks=warn
     fi
  @@ -14782,7 +14077,7 @@
   
   
   
  -    { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
   $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
   
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
  @@ -14808,7 +14103,7 @@
     esac
     exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   
  -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
   $as_echo "$ld_shlibs_CXX" >&6; }
   test "$ld_shlibs_CXX" = no && can_build_shared=no
   
  @@ -14836,16 +14131,16 @@
         # Test whether the compiler implicitly links with -lc since on some
         # systems, -lgcc has to come before -lc. If gcc already passes -lc
         # to ld, don't add -lc before -lgcc.
  -      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
  +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
   $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
         $RM conftest*
         echo "$lt_simple_compile_test_code" > conftest.$ac_ext
   
  -      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  +      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
     (eval $ac_compile) 2>&5
     ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } 2>conftest.err; then
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; } 2>conftest.err; then
           soname=conftest
           lib=conftest
           libobjs=conftest.$ac_objext
  @@ -14859,11 +14154,11 @@
           libname=conftest
           lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
           allow_undefined_flag_CXX=
  -        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
  +        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
     (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
     ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }
  +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  +  test $ac_status = 0; }
           then
   	  archive_cmds_need_lc_CXX=no
           else
  @@ -14874,7 +14169,7 @@
           cat conftest.err 1>&5
         fi
         $RM conftest*
  -      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
  +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
   $as_echo "$archive_cmds_need_lc_CXX" >&6; }
         ;;
       esac
  @@ -14945,7 +14240,7 @@
   
   
   
  -    { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
   $as_echo_n "checking dynamic linker characteristics... " >&6; }
   
   library_names_spec=
  @@ -15325,59 +14620,27 @@
     shlibpath_overrides_runpath=no
     # Some binutils ld are patched to set DT_RUNPATH
     save_LDFLAGS=$LDFLAGS
  -  save_libdir=$libdir
  -  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
  -       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -
  -int
  -main ()
  -{
  -
  -  ;
  -  return 0;
  -}
  -_ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  -  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
  -  shlibpath_overrides_runpath=yes
  -fi
  -
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  +  save_libdir=$libdir
  +  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
  +       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
   
  +int
  +main ()
  +{
   
  +  ;
  +  return 0;
  +}
  +_ACEOF
  +if ac_fn_cxx_try_link "$LINENO"; then :
  +  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
  +  shlibpath_overrides_runpath=yes
   fi
  -
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
  +fi
  +rm -f core conftest.err conftest.$ac_objext \
  +    conftest$ac_exeext conftest.$ac_ext
     LDFLAGS=$save_LDFLAGS
     libdir=$save_libdir
   
  @@ -15589,7 +14852,7 @@
     dynamic_linker=no
     ;;
   esac
  -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
   $as_echo "$dynamic_linker" >&6; }
   test "$dynamic_linker" = no && can_build_shared=no
   
  @@ -15598,1803 +14861,682 @@
     variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
   fi
   
  -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
  -  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
  -fi
  -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
  -  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
  -fi
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -    { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
  -$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
  -hardcode_action_CXX=
  -if test -n "$hardcode_libdir_flag_spec_CXX" ||
  -   test -n "$runpath_var_CXX" ||
  -   test "X$hardcode_automatic_CXX" = "Xyes" ; then
  -
  -  # We can hardcode non-existent directories.
  -  if test "$hardcode_direct_CXX" != no &&
  -     # If the only mechanism to avoid hardcoding is shlibpath_var, we
  -     # have to relink, otherwise we might link with an installed library
  -     # when we should be linking with a yet-to-be-installed one
  -     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
  -     test "$hardcode_minus_L_CXX" != no; then
  -    # Linking always hardcodes the temporary library directory.
  -    hardcode_action_CXX=relink
  -  else
  -    # We can link without hardcoding, and we can hardcode nonexisting dirs.
  -    hardcode_action_CXX=immediate
  -  fi
  -else
  -  # We cannot hardcode anything, or else we can only hardcode existing
  -  # directories.
  -  hardcode_action_CXX=unsupported
  -fi
  -{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
  -$as_echo "$hardcode_action_CXX" >&6; }
  -
  -if test "$hardcode_action_CXX" = relink ||
  -   test "$inherit_rpath_CXX" = yes; then
  -  # Fast installation is not supported
  -  enable_fast_install=no
  -elif test "$shlibpath_overrides_runpath" = yes ||
  -     test "$enable_shared" = no; then
  -  # Fast installation is not necessary
  -  enable_fast_install=needless
  -fi
  -
  -
  -
  -
  -
  -
  -
  -  fi # test -n "$compiler"
  -
  -  CC=$lt_save_CC
  -  LDCXX=$LD
  -  LD=$lt_save_LD
  -  GCC=$lt_save_GCC
  -  with_gnu_ld=$lt_save_with_gnu_ld
  -  lt_cv_path_LDCXX=$lt_cv_path_LD
  -  lt_cv_path_LD=$lt_save_path_LD
  -  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
  -  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
  -fi # test "$_lt_caught_CXX_error" != yes
  -
  -ac_ext=c
  -ac_cpp='$CPP $CPPFLAGS'
  -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  -ac_compiler_gnu=$ac_cv_c_compiler_gnu
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -        ac_config_commands="$ac_config_commands libtool"
  -
  -
  -
  -
  -# Only expand once:
  -
  -
  -{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
  -$as_echo_n "checking whether ln -s works... " >&6; }
  -LN_S=$as_ln_s
  -if test "$LN_S" = "ln -s"; then
  -  { $as_echo "$as_me:$LINENO: result: yes" >&5
  -$as_echo "yes" >&6; }
  -else
  -  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
  -$as_echo "no, using $LN_S" >&6; }
  -fi
  -
  -
  -PCRE_MAJOR="8"
  -PCRE_MINOR="00"
  -PCRE_PRERELEASE=""
  -PCRE_DATE="2009-10-19"
  -
  -
  -
  -
  -
  -
  -# Set a more sensible default value for $(htmldir).
  -if test "x$htmldir" = 'x${docdir}'
  -then
  -  htmldir='${docdir}/html'
  -fi
  -
  -# Handle --disable-cpp
  -# Check whether --enable-cpp was given.
  -if test "${enable_cpp+set}" = set; then
  -  enableval=$enable_cpp;
  -else
  -  enable_cpp=yes
  -fi
  -
  -
  -# Handle --enable-rebuild-chartables
  -# Check whether --enable-rebuild-chartables was given.
  -if test "${enable_rebuild_chartables+set}" = set; then
  -  enableval=$enable_rebuild_chartables;
  -else
  -  enable_rebuild_chartables=no
  -fi
  -
  -
  -# Handle --enable-utf8 (disabled by default)
  -# Check whether --enable-utf8 was given.
  -if test "${enable_utf8+set}" = set; then
  -  enableval=$enable_utf8;
  -else
  -  enable_utf8=unset
  -fi
  -
  -
  -# Handle --enable-unicode-properties
  -# Check whether --enable-unicode-properties was given.
  -if test "${enable_unicode_properties+set}" = set; then
  -  enableval=$enable_unicode_properties;
  -else
  -  enable_unicode_properties=no
  -fi
  -
  -
  -# Handle --enable-newline=NL
  -
  -# Separate newline options
  -ac_pcre_newline=lf
  -# Check whether --enable-newline-is-cr was given.
  -if test "${enable_newline_is_cr+set}" = set; then
  -  enableval=$enable_newline_is_cr; ac_pcre_newline=cr
  -fi
  -
  -# Check whether --enable-newline-is-lf was given.
  -if test "${enable_newline_is_lf+set}" = set; then
  -  enableval=$enable_newline_is_lf; ac_pcre_newline=lf
  -fi
  -
  -# Check whether --enable-newline-is-crlf was given.
  -if test "${enable_newline_is_crlf+set}" = set; then
  -  enableval=$enable_newline_is_crlf; ac_pcre_newline=crlf
  -fi
  -
  -# Check whether --enable-newline-is-anycrlf was given.
  -if test "${enable_newline_is_anycrlf+set}" = set; then
  -  enableval=$enable_newline_is_anycrlf; ac_pcre_newline=anycrlf
  -fi
  -
  -# Check whether --enable-newline-is-any was given.
  -if test "${enable_newline_is_any+set}" = set; then
  -  enableval=$enable_newline_is_any; ac_pcre_newline=any
  -fi
  -
  -enable_newline="$ac_pcre_newline"
  -
  -# Handle --enable-bsr-anycrlf
  -# Check whether --enable-bsr-anycrlf was given.
  -if test "${enable_bsr_anycrlf+set}" = set; then
  -  enableval=$enable_bsr_anycrlf;
  -else
  -  enable_bsr_anycrlf=no
  -fi
  -
  -
  -# Handle --enable-ebcdic
  -# Check whether --enable-ebcdic was given.
  -if test "${enable_ebcdic+set}" = set; then
  -  enableval=$enable_ebcdic;
  -else
  -  enable_ebcdic=no
  -fi
  -
  -
  -# Handle --disable-stack-for-recursion
  -# Check whether --enable-stack-for-recursion was given.
  -if test "${enable_stack_for_recursion+set}" = set; then
  -  enableval=$enable_stack_for_recursion;
  -else
  -  enable_stack_for_recursion=yes
  -fi
  -
  -
  -# Handle --enable-pcregrep-libz
  -# Check whether --enable-pcregrep-libz was given.
  -if test "${enable_pcregrep_libz+set}" = set; then
  -  enableval=$enable_pcregrep_libz;
  -else
  -  enable_pcregrep_libz=no
  -fi
  -
  -
  -# Handle --enable-pcregrep-libbz2
  -# Check whether --enable-pcregrep-libbz2 was given.
  -if test "${enable_pcregrep_libbz2+set}" = set; then
  -  enableval=$enable_pcregrep_libbz2;
  -else
  -  enable_pcregrep_libbz2=no
  -fi
  -
  -
  -# Handle --enable-pcretest-libreadline
  -# Check whether --enable-pcretest-libreadline was given.
  -if test "${enable_pcretest_libreadline+set}" = set; then
  -  enableval=$enable_pcretest_libreadline;
  -else
  -  enable_pcretest_libreadline=no
  +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
  +  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
  +fi
  +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
  +  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
   fi
   
   
  -# Handle --with-posix-malloc-threshold=NBYTES
   
  -# Check whether --with-posix-malloc-threshold was given.
  -if test "${with_posix_malloc_threshold+set}" = set; then
  -  withval=$with_posix_malloc_threshold;
  -else
  -  with_posix_malloc_threshold=10
  -fi
   
   
  -# Handle --with-link-size=N
   
  -# Check whether --with-link-size was given.
  -if test "${with_link_size+set}" = set; then
  -  withval=$with_link_size;
  -else
  -  with_link_size=2
  -fi
   
   
  -# Handle --with-match-limit=N
   
  -# Check whether --with-match-limit was given.
  -if test "${with_match_limit+set}" = set; then
  -  withval=$with_match_limit;
  -else
  -  with_match_limit=10000000
  -fi
   
   
  -# Handle --with-match-limit_recursion=N
  -#
  -# Note: In config.h, the default is to define MATCH_LIMIT_RECURSION
  -# symbolically as MATCH_LIMIT, which in turn is defined to be some numeric
  -# value (e.g. 10000000). MATCH_LIMIT_RECURSION can otherwise be set to some
  -# different numeric value (or even the same numeric value as MATCH_LIMIT,
  -# though no longer defined in terms of the latter).
  -#
   
  -# Check whether --with-match-limit-recursion was given.
  -if test "${with_match_limit_recursion+set}" = set; then
  -  withval=$with_match_limit_recursion;
  -else
  -  with_match_limit_recursion=MATCH_LIMIT
  -fi
   
   
  -# Make sure that if enable_unicode_properties was set, that UTF-8 support
  -# is enabled.
  -#
  -if test "x$enable_unicode_properties" = "xyes"
  -then
  -  if test "x$enable_utf8" = "xno"
  -  then
  -    { { $as_echo "$as_me:$LINENO: error: support for Unicode properties requires UTF-8 support" >&5
  -$as_echo "$as_me: error: support for Unicode properties requires UTF-8 support" >&2;}
  -   { (exit 1); exit 1; }; }
  -  fi
  -  enable_utf8=yes
  -fi
   
  -if test "x$enable_utf8" = "xunset"
  -then
  -  enable_utf8=no
  -fi
   
  -# Make sure that if enable_ebcdic is set, rebuild_chartables is also enabled.
  -# Also check that UTF-8 support is not requested, because PCRE cannot handle
  -# EBCDIC and UTF-8 in the same build. To do so it would need to use different
  -# character constants depending on the mode.
  -#
  -if test "x$enable_ebcdic" = "xyes"
  -then
  -  enable_rebuild_chartables=yes
  -  if test "x$enable_utf8" = "xyes"
  -  then
  -    { { $as_echo "$as_me:$LINENO: error: support for EBCDIC and UTF-8 cannot be enabled at the same time" >&5
  -$as_echo "$as_me: error: support for EBCDIC and UTF-8 cannot be enabled at the same time" >&2;}
  -   { (exit 1); exit 1; }; }
  -  fi
  -fi
   
  -# Convert the newline identifier into the appropriate integer value.
  -case "$enable_newline" in
  -  lf)      ac_pcre_newline_value=10   ;;
  -  cr)      ac_pcre_newline_value=13   ;;
  -  crlf)    ac_pcre_newline_value=3338 ;;
  -  anycrlf) ac_pcre_newline_value=-2   ;;
  -  any)     ac_pcre_newline_value=-1   ;;
  -  *)
  -  { { $as_echo "$as_me:$LINENO: error: invalid argument \"$enable_newline\" to --enable-newline option" >&5
  -$as_echo "$as_me: error: invalid argument \"$enable_newline\" to --enable-newline option" >&2;}
  -   { (exit 1); exit 1; }; }
  -  ;;
  -esac
   
  -# Check argument to --with-link-size
  -case "$with_link_size" in
  -  2|3|4) ;;
  -  *)
  -  { { $as_echo "$as_me:$LINENO: error: invalid argument \"$with_link_size\" to --with-link-size option" >&5
  -$as_echo "$as_me: error: invalid argument \"$with_link_size\" to --with-link-size option" >&2;}
  -   { (exit 1); exit 1; }; }
  -  ;;
  -esac
   
   
   
   
  -# Checks for header files.
  -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
  -$as_echo_n "checking for ANSI C header files... " >&6; }
  -if test "${ac_cv_header_stdc+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#include <stdlib.h>
  -#include <stdarg.h>
  -#include <string.h>
  -#include <float.h>
   
  -int
  -main ()
  -{
   
  -  ;
  -  return 0;
  -}
  -_ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  ac_cv_header_stdc=yes
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
   
  -	ac_cv_header_stdc=no
  -fi
   
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   
  -if test $ac_cv_header_stdc = yes; then
  -  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#include <string.h>
   
  -_ACEOF
  -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  -  $EGREP "memchr" >/dev/null 2>&1; then
  -  :
  -else
  -  ac_cv_header_stdc=no
  -fi
  -rm -f conftest*
   
  -fi
   
  -if test $ac_cv_header_stdc = yes; then
  -  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#include <stdlib.h>
   
  -_ACEOF
  -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  -  $EGREP "free" >/dev/null 2>&1; then
  -  :
  -else
  -  ac_cv_header_stdc=no
  -fi
  -rm -f conftest*
   
  -fi
   
  -if test $ac_cv_header_stdc = yes; then
  -  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
  -  if test "$cross_compiling" = yes; then
  -  :
  -else
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#include <ctype.h>
  -#include <stdlib.h>
  -#if ((' ' & 0x0FF) == 0x020)
  -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
  -#else
  -# define ISLOWER(c) \
  -		   (('a' <= (c) && (c) <= 'i') \
  -		     || ('j' <= (c) && (c) <= 'r') \
  -		     || ('s' <= (c) && (c) <= 'z'))
  -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
  -#endif
   
  -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
  -int
  -main ()
  -{
  -  int i;
  -  for (i = 0; i < 256; i++)
  -    if (XOR (islower (i), ISLOWER (i))
  -	|| toupper (i) != TOUPPER (i))
  -      return 2;
  -  return 0;
  -}
  -_ACEOF
  -rm -f conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>&5
  -  ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
  -  { (case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_try") 2>&5
  -  ac_status=$?
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }; }; then
  -  :
  -else
  -  $as_echo "$as_me: program exited with status $ac_status" >&5
  -$as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
   
  -( exit $ac_status )
  -ac_cv_header_stdc=no
  -fi
  -rm -rf conftest.dSYM
  -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  -fi
   
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
  +$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
  +hardcode_action_CXX=
  +if test -n "$hardcode_libdir_flag_spec_CXX" ||
  +   test -n "$runpath_var_CXX" ||
  +   test "X$hardcode_automatic_CXX" = "Xyes" ; then
   
  +  # We can hardcode non-existent directories.
  +  if test "$hardcode_direct_CXX" != no &&
  +     # If the only mechanism to avoid hardcoding is shlibpath_var, we
  +     # have to relink, otherwise we might link with an installed library
  +     # when we should be linking with a yet-to-be-installed one
  +     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
  +     test "$hardcode_minus_L_CXX" != no; then
  +    # Linking always hardcodes the temporary library directory.
  +    hardcode_action_CXX=relink
  +  else
  +    # We can link without hardcoding, and we can hardcode nonexisting dirs.
  +    hardcode_action_CXX=immediate
  +  fi
  +else
  +  # We cannot hardcode anything, or else we can only hardcode existing
  +  # directories.
  +  hardcode_action_CXX=unsupported
   fi
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
  +$as_echo "$hardcode_action_CXX" >&6; }
  +
  +if test "$hardcode_action_CXX" = relink ||
  +   test "$inherit_rpath_CXX" = yes; then
  +  # Fast installation is not supported
  +  enable_fast_install=no
  +elif test "$shlibpath_overrides_runpath" = yes ||
  +     test "$enable_shared" = no; then
  +  # Fast installation is not necessary
  +  enable_fast_install=needless
   fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
  -$as_echo "$ac_cv_header_stdc" >&6; }
  -if test $ac_cv_header_stdc = yes; then
   
  -cat >>confdefs.h <<\_ACEOF
  -#define STDC_HEADERS 1
  -_ACEOF
   
  -fi
   
   
   
   
   
  +  fi # test -n "$compiler"
   
  -for ac_header in limits.h sys/types.h sys/stat.h dirent.h windows.h
  -do
  -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  -$as_echo_n "checking for $ac_header... " >&6; }
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  $as_echo_n "(cached) " >&6
  -fi
  -ac_res=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  -$as_echo "$ac_res" >&6; }
  -else
  -  # Is the header compilable?
  -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
  -$as_echo_n "checking $ac_header usability... " >&6; }
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -$ac_includes_default
  -#include <$ac_header>
  -_ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  ac_header_compiler=yes
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  +  CC=$lt_save_CC
  +  LDCXX=$LD
  +  LD=$lt_save_LD
  +  GCC=$lt_save_GCC
  +  with_gnu_ld=$lt_save_with_gnu_ld
  +  lt_cv_path_LDCXX=$lt_cv_path_LD
  +  lt_cv_path_LD=$lt_save_path_LD
  +  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
  +  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
  +fi # test "$_lt_caught_CXX_error" != yes
   
  -	ac_header_compiler=no
  -fi
  +ac_ext=c
  +ac_cpp='$CPP $CPPFLAGS'
  +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  +ac_compiler_gnu=$ac_cv_c_compiler_gnu
   
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  -$as_echo "$ac_header_compiler" >&6; }
   
  -# Is the header present?
  -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
  -$as_echo_n "checking $ac_header presence... " >&6; }
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#include <$ac_header>
  -_ACEOF
  -if { (ac_try="$ac_cpp conftest.$ac_ext"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } >/dev/null && {
  -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       }; then
  -  ac_header_preproc=yes
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
   
  -  ac_header_preproc=no
  -fi
   
  -rm -f conftest.err conftest.$ac_ext
  -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
  -$as_echo "$ac_header_preproc" >&6; }
   
  -# So?  What about this header?
  -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
  -  yes:no: )
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
  -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
  -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
  -    ac_header_preproc=yes
  -    ;;
  -  no:yes:* )
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
  -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
  -$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
  -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
  -$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
  -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
   
  -    ;;
  -esac
  -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  -$as_echo_n "checking for $ac_header... " >&6; }
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  eval "$as_ac_Header=\$ac_header_preproc"
  -fi
  -ac_res=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  -$as_echo "$ac_res" >&6; }
   
  -fi
  -as_val=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -   if test "x$as_val" = x""yes; then
  -  cat >>confdefs.h <<_ACEOF
  -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  -_ACEOF
   
  -fi
   
  -done
   
   
  -# The files below are C++ header files.
  -pcre_have_type_traits="0"
  -pcre_have_bits_type_traits="0"
  -if test "x$enable_cpp" = "xyes" -a -n "$CXX"
  -then
  -ac_ext=cpp
  -ac_cpp='$CXXCPP $CPPFLAGS'
  -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
   
   
  -# Older versions of pcre defined pcrecpp::no_arg, but in new versions
  -# it's called pcrecpp::RE::no_arg.  For backwards ABI compatibility,
  -# we want to make one an alias for the other.  Different systems do
  -# this in different ways.  Some systems, for instance, can do it via
  -# a linker flag: -alias (for os x 10.5) or -i (for os x <=10.4).
  -OLD_LDFLAGS="$LDFLAGS"
  -for flag in "-alias,__ZN7pcrecpp2RE6no_argE,__ZN7pcrecpp6no_argE" \
  -            "-i__ZN7pcrecpp6no_argE:__ZN7pcrecpp2RE6no_argE"; do
  -  { $as_echo "$as_me:$LINENO: checking for alias support in the linker" >&5
  -$as_echo_n "checking for alias support in the linker... " >&6; }
  -  LDFLAGS="$OLD_LDFLAGS -Wl,$flag"
  -  # We try to run the linker with this new ld flag.  If the link fails,
  -  # we give up and remove the new flag from LDFLAGS.
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -namespace pcrecpp {
  -                                    class RE { static int no_arg; };
  -                                    int RE::no_arg;
  -                                  }
  -int
  -main ()
  -{
  +        ac_config_commands="$ac_config_commands libtool"
   
  -  ;
  -  return 0;
  -}
  -_ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  -  { $as_echo "$as_me:$LINENO: result: yes" >&5
  -$as_echo "yes" >&6; };
  -                  EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRECPP_LDFLAGS -Wl,$flag";
  -                  break;
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
   
  -	{ $as_echo "$as_me:$LINENO: result: no" >&5
  -$as_echo "no" >&6; }
  -fi
   
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
  -done
  -LDFLAGS="$OLD_LDFLAGS"
   
  -# We could be more clever here, given we're doing AC_SUBST with this
  -# (eg set a var to be the name of the include file we want). But we're not
  -# so it's easy to change back to 'regular' autoconf vars if we needed to.
  +# Only expand once:
   
   
  -for ac_header in string
  -do
  -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  -$as_echo_n "checking for $ac_header... " >&6; }
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  $as_echo_n "(cached) " >&6
  -fi
  -ac_res=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  -$as_echo "$ac_res" >&6; }
  -else
  -  # Is the header compilable?
  -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
  -$as_echo_n "checking $ac_header usability... " >&6; }
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -$ac_includes_default
  -#include <$ac_header>
  -_ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  ac_header_compiler=yes
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
  +$as_echo_n "checking whether ln -s works... " >&6; }
  +LN_S=$as_ln_s
  +if test "$LN_S" = "ln -s"; then
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  +$as_echo "yes" >&6; }
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	ac_header_compiler=no
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
  +$as_echo "no, using $LN_S" >&6; }
   fi
   
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  -$as_echo "$ac_header_compiler" >&6; }
   
  -# Is the header present?
  -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
  -$as_echo_n "checking $ac_header presence... " >&6; }
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#include <$ac_header>
  -_ACEOF
  -if { (ac_try="$ac_cpp conftest.$ac_ext"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } >/dev/null && {
  -	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       }; then
  -  ac_header_preproc=yes
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  +PCRE_MAJOR="8"
  +PCRE_MINOR="10"
  +PCRE_PRERELEASE=""
  +PCRE_DATE="2010-06-25"
   
  -  ac_header_preproc=no
  +if test "$PCRE_MINOR" = "08" -o "$PCRE_MINOR" = "09"
  +then
  +  echo "***"
  +  echo "*** Minor version number $PCRE_MINOR must not be used. ***"
  +  echo "*** Use only 01 to 07 or 10 onwards, to avoid octal issues. ***"
  +  echo "***"
  +  exit 1
   fi
   
  -rm -f conftest.err conftest.$ac_ext
  -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
  -$as_echo "$ac_header_preproc" >&6; }
   
  -# So?  What about this header?
  -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
  -  yes:no: )
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
  -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
  -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
  -    ac_header_preproc=yes
  -    ;;
  -  no:yes:* )
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
  -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
  -$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
  -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
  -$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
  -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
   
  -    ;;
  -esac
  -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  -$as_echo_n "checking for $ac_header... " >&6; }
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  eval "$as_ac_Header=\$ac_header_preproc"
  -fi
  -ac_res=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  -$as_echo "$ac_res" >&6; }
   
  +
  +
  +# Set a more sensible default value for $(htmldir).
  +if test "x$htmldir" = 'x${docdir}'
  +then
  +  htmldir='${docdir}/html'
   fi
  -as_val=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -   if test "x$as_val" = x""yes; then
  -  cat >>confdefs.h <<_ACEOF
  -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  -_ACEOF
  - pcre_have_cpp_headers="1"
  +
  +# Handle --disable-cpp. The substitution of enable_cpp is needed for use in
  +# pcre-config.
  +# Check whether --enable-cpp was given.
  +if test "${enable_cpp+set}" = set; then :
  +  enableval=$enable_cpp;
   else
  -  pcre_have_cpp_headers="0"
  +  enable_cpp=yes
   fi
   
  -done
   
   
  -for ac_header in bits/type_traits.h
  -do
  -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  -$as_echo_n "checking for $ac_header... " >&6; }
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  $as_echo_n "(cached) " >&6
  +# Handle --enable-rebuild-chartables
  +# Check whether --enable-rebuild-chartables was given.
  +if test "${enable_rebuild_chartables+set}" = set; then :
  +  enableval=$enable_rebuild_chartables;
  +else
  +  enable_rebuild_chartables=no
   fi
  -ac_res=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  -$as_echo "$ac_res" >&6; }
  +
  +
  +# Handle --enable-utf8 (disabled by default)
  +# Check whether --enable-utf8 was given.
  +if test "${enable_utf8+set}" = set; then :
  +  enableval=$enable_utf8;
   else
  -  # Is the header compilable?
  -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
  -$as_echo_n "checking $ac_header usability... " >&6; }
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -$ac_includes_default
  -#include <$ac_header>
  -_ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  ac_header_compiler=yes
  +  enable_utf8=unset
  +fi
  +
  +
  +# Handle --enable-unicode-properties
  +# Check whether --enable-unicode-properties was given.
  +if test "${enable_unicode_properties+set}" = set; then :
  +  enableval=$enable_unicode_properties;
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  +  enable_unicode_properties=no
  +fi
  +
  +
  +# Handle --enable-newline=NL
  +
  +# Separate newline options
  +ac_pcre_newline=lf
  +# Check whether --enable-newline-is-cr was given.
  +if test "${enable_newline_is_cr+set}" = set; then :
  +  enableval=$enable_newline_is_cr; ac_pcre_newline=cr
  +fi
   
  -	ac_header_compiler=no
  +# Check whether --enable-newline-is-lf was given.
  +if test "${enable_newline_is_lf+set}" = set; then :
  +  enableval=$enable_newline_is_lf; ac_pcre_newline=lf
   fi
   
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  -$as_echo "$ac_header_compiler" >&6; }
  +# Check whether --enable-newline-is-crlf was given.
  +if test "${enable_newline_is_crlf+set}" = set; then :
  +  enableval=$enable_newline_is_crlf; ac_pcre_newline=crlf
  +fi
   
  -# Is the header present?
  -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
  -$as_echo_n "checking $ac_header presence... " >&6; }
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#include <$ac_header>
  -_ACEOF
  -if { (ac_try="$ac_cpp conftest.$ac_ext"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } >/dev/null && {
  -	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       }; then
  -  ac_header_preproc=yes
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  +# Check whether --enable-newline-is-anycrlf was given.
  +if test "${enable_newline_is_anycrlf+set}" = set; then :
  +  enableval=$enable_newline_is_anycrlf; ac_pcre_newline=anycrlf
  +fi
   
  -  ac_header_preproc=no
  +# Check whether --enable-newline-is-any was given.
  +if test "${enable_newline_is_any+set}" = set; then :
  +  enableval=$enable_newline_is_any; ac_pcre_newline=any
   fi
   
  -rm -f conftest.err conftest.$ac_ext
  -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
  -$as_echo "$ac_header_preproc" >&6; }
  +enable_newline="$ac_pcre_newline"
   
  -# So?  What about this header?
  -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
  -  yes:no: )
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
  -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
  -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
  -    ac_header_preproc=yes
  -    ;;
  -  no:yes:* )
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
  -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
  -$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
  -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
  -$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
  -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
  +# Handle --enable-bsr-anycrlf
  +# Check whether --enable-bsr-anycrlf was given.
  +if test "${enable_bsr_anycrlf+set}" = set; then :
  +  enableval=$enable_bsr_anycrlf;
  +else
  +  enable_bsr_anycrlf=no
  +fi
   
  -    ;;
  -esac
  -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  -$as_echo_n "checking for $ac_header... " >&6; }
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  eval "$as_ac_Header=\$ac_header_preproc"
  -fi
  -ac_res=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  -$as_echo "$ac_res" >&6; }
   
  -fi
  -as_val=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -   if test "x$as_val" = x""yes; then
  -  cat >>confdefs.h <<_ACEOF
  -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  -_ACEOF
  - pcre_have_bits_type_traits="1"
  +# Handle --enable-ebcdic
  +# Check whether --enable-ebcdic was given.
  +if test "${enable_ebcdic+set}" = set; then :
  +  enableval=$enable_ebcdic;
   else
  -  pcre_have_bits_type_traits="0"
  +  enable_ebcdic=no
   fi
   
  -done
  -
   
  -for ac_header in type_traits.h
  -do
  -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  -$as_echo_n "checking for $ac_header... " >&6; }
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  $as_echo_n "(cached) " >&6
  -fi
  -ac_res=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  -$as_echo "$ac_res" >&6; }
  -else
  -  # Is the header compilable?
  -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
  -$as_echo_n "checking $ac_header usability... " >&6; }
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -$ac_includes_default
  -#include <$ac_header>
  -_ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  ac_header_compiler=yes
  +# Handle --disable-stack-for-recursion
  +# Check whether --enable-stack-for-recursion was given.
  +if test "${enable_stack_for_recursion+set}" = set; then :
  +  enableval=$enable_stack_for_recursion;
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	ac_header_compiler=no
  +  enable_stack_for_recursion=yes
   fi
   
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  -$as_echo "$ac_header_compiler" >&6; }
   
  -# Is the header present?
  -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
  -$as_echo_n "checking $ac_header presence... " >&6; }
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#include <$ac_header>
  -_ACEOF
  -if { (ac_try="$ac_cpp conftest.$ac_ext"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } >/dev/null && {
  -	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
  -	 test ! -s conftest.err
  -       }; then
  -  ac_header_preproc=yes
  +# Handle --enable-pcregrep-libz
  +# Check whether --enable-pcregrep-libz was given.
  +if test "${enable_pcregrep_libz+set}" = set; then :
  +  enableval=$enable_pcregrep_libz;
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -  ac_header_preproc=no
  +  enable_pcregrep_libz=no
   fi
   
  -rm -f conftest.err conftest.$ac_ext
  -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
  -$as_echo "$ac_header_preproc" >&6; }
   
  -# So?  What about this header?
  -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
  -  yes:no: )
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
  -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
  -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
  -    ac_header_preproc=yes
  -    ;;
  -  no:yes:* )
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
  -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
  -$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
  -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
  -$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
  -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
  +# Handle --enable-pcregrep-libbz2
  +# Check whether --enable-pcregrep-libbz2 was given.
  +if test "${enable_pcregrep_libbz2+set}" = set; then :
  +  enableval=$enable_pcregrep_libbz2;
  +else
  +  enable_pcregrep_libbz2=no
  +fi
   
  -    ;;
  -esac
  -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  -$as_echo_n "checking for $ac_header... " >&6; }
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  eval "$as_ac_Header=\$ac_header_preproc"
  -fi
  -ac_res=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  -$as_echo "$ac_res" >&6; }
   
  -fi
  -as_val=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -   if test "x$as_val" = x""yes; then
  -  cat >>confdefs.h <<_ACEOF
  -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  -_ACEOF
  - pcre_have_type_traits="1"
  +# Handle --enable-pcretest-libreadline
  +# Check whether --enable-pcretest-libreadline was given.
  +if test "${enable_pcretest_libreadline+set}" = set; then :
  +  enableval=$enable_pcretest_libreadline;
   else
  -  pcre_have_type_traits="0"
  +  enable_pcretest_libreadline=no
   fi
   
  -done
  -
   
  -ac_ext=c
  -ac_cpp='$CPP $CPPFLAGS'
  -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  -ac_compiler_gnu=$ac_cv_c_compiler_gnu
  +# Handle --with-posix-malloc-threshold=NBYTES
   
  +# Check whether --with-posix-malloc-threshold was given.
  +if test "${with_posix_malloc_threshold+set}" = set; then :
  +  withval=$with_posix_malloc_threshold;
  +else
  +  with_posix_malloc_threshold=10
   fi
  -# Using AC_SUBST eliminates the need to include config.h in a public .h file
   
   
  +# Handle --with-link-size=N
   
  -# Conditional compilation
  - if test "x$enable_cpp" = "xyes"; then
  -  WITH_PCRE_CPP_TRUE=
  -  WITH_PCRE_CPP_FALSE='#'
  +# Check whether --with-link-size was given.
  +if test "${with_link_size+set}" = set; then :
  +  withval=$with_link_size;
   else
  -  WITH_PCRE_CPP_TRUE='#'
  -  WITH_PCRE_CPP_FALSE=
  +  with_link_size=2
   fi
   
  - if test "x$enable_rebuild_chartables" = "xyes"; then
  -  WITH_REBUILD_CHARTABLES_TRUE=
  -  WITH_REBUILD_CHARTABLES_FALSE='#'
  +
  +# Handle --with-match-limit=N
  +
  +# Check whether --with-match-limit was given.
  +if test "${with_match_limit+set}" = set; then :
  +  withval=$with_match_limit;
   else
  -  WITH_REBUILD_CHARTABLES_TRUE='#'
  -  WITH_REBUILD_CHARTABLES_FALSE=
  +  with_match_limit=10000000
   fi
   
   
  -# Checks for typedefs, structures, and compiler characteristics.
  +# Handle --with-match-limit_recursion=N
  +#
  +# Note: In config.h, the default is to define MATCH_LIMIT_RECURSION
  +# symbolically as MATCH_LIMIT, which in turn is defined to be some numeric
  +# value (e.g. 10000000). MATCH_LIMIT_RECURSION can otherwise be set to some
  +# different numeric value (or even the same numeric value as MATCH_LIMIT,
  +# though no longer defined in terms of the latter).
  +#
   
  -{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
  -$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
  -if test "${ac_cv_c_const+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  +# Check whether --with-match-limit-recursion was given.
  +if test "${with_match_limit_recursion+set}" = set; then :
  +  withval=$with_match_limit_recursion;
   else
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +  with_match_limit_recursion=MATCH_LIMIT
  +fi
   
  -int
  -main ()
  -{
  -/* FIXME: Include the comments suggested by Paul. */
  -#ifndef __cplusplus
  -  /* Ultrix mips cc rejects this.  */
  -  typedef int charset[2];
  -  const charset cs;
  -  /* SunOS 4.1.1 cc rejects this.  */
  -  char const *const *pcpcc;
  -  char **ppc;
  -  /* NEC SVR4.0.2 mips cc rejects this.  */
  -  struct point {int x, y;};
  -  static struct point const zero = {0,0};
  -  /* AIX XL C 1.02.0.0 rejects this.
  -     It does not let you subtract one const X* pointer from another in
  -     an arm of an if-expression whose if-part is not a constant
  -     expression */
  -  const char *g = "string";
  -  pcpcc = &g + (g ? g-g : 0);
  -  /* HPUX 7.0 cc rejects these. */
  -  ++pcpcc;
  -  ppc = (char**) pcpcc;
  -  pcpcc = (char const *const *) ppc;
  -  { /* SCO 3.2v4 cc rejects this.  */
  -    char *t;
  -    char const *s = 0 ? (char *) 0 : (char const *) 0;
   
  -    *t++ = 0;
  -    if (s) return 0;
  -  }
  -  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
  -    int x[] = {25, 17};
  -    const int *foo = &x[0];
  -    ++foo;
  -  }
  -  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
  -    typedef const int *iptr;
  -    iptr p = 0;
  -    ++p;
  -  }
  -  { /* AIX XL C 1.02.0.0 rejects this saying
  -       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
  -    struct s { int j; const int *ap[3]; };
  -    struct s *b; b->j = 5;
  -  }
  -  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
  -    const int foo = 10;
  -    if (!foo) return 0;
  -  }
  -  return !cs[0] && !zero.x;
  -#endif
  +# Make sure that if enable_unicode_properties was set, that UTF-8 support
  +# is enabled.
  +#
  +if test "x$enable_unicode_properties" = "xyes"
  +then
  +  if test "x$enable_utf8" = "xno"
  +  then
  +    as_fn_error "support for Unicode properties requires UTF-8 support" "$LINENO" 5
  +  fi
  +  enable_utf8=yes
  +fi
   
  -  ;
  -  return 0;
  -}
  -_ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  ac_cv_c_const=yes
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  +if test "x$enable_utf8" = "xunset"
  +then
  +  enable_utf8=no
  +fi
   
  -	ac_cv_c_const=no
  +# Make sure that if enable_ebcdic is set, rebuild_chartables is also enabled.
  +# Also check that UTF-8 support is not requested, because PCRE cannot handle
  +# EBCDIC and UTF-8 in the same build. To do so it would need to use different
  +# character constants depending on the mode.
  +#
  +if test "x$enable_ebcdic" = "xyes"
  +then
  +  enable_rebuild_chartables=yes
  +  if test "x$enable_utf8" = "xyes"
  +  then
  +    as_fn_error "support for EBCDIC and UTF-8 cannot be enabled at the same time" "$LINENO" 5
  +  fi
   fi
   
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
  -$as_echo "$ac_cv_c_const" >&6; }
  -if test $ac_cv_c_const = no; then
  +# Convert the newline identifier into the appropriate integer value.
  +case "$enable_newline" in
  +  lf)      ac_pcre_newline_value=10   ;;
  +  cr)      ac_pcre_newline_value=13   ;;
  +  crlf)    ac_pcre_newline_value=3338 ;;
  +  anycrlf) ac_pcre_newline_value=-2   ;;
  +  any)     ac_pcre_newline_value=-1   ;;
  +  *)
  +  as_fn_error "invalid argument \"$enable_newline\" to --enable-newline option" "$LINENO" 5
  +  ;;
  +esac
  +
  +# Check argument to --with-link-size
  +case "$with_link_size" in
  +  2|3|4) ;;
  +  *)
  +  as_fn_error "invalid argument \"$with_link_size\" to --with-link-size option" "$LINENO" 5
  +  ;;
  +esac
   
  -cat >>confdefs.h <<\_ACEOF
  -#define const /**/
  -_ACEOF
   
  -fi
   
  -{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
  -$as_echo_n "checking for size_t... " >&6; }
  -if test "${ac_cv_type_size_t+set}" = set; then
  +# Checks for header files.
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
  +$as_echo_n "checking for ANSI C header files... " >&6; }
  +if test "${ac_cv_header_stdc+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
  -  ac_cv_type_size_t=no
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -$ac_includes_default
  -int
  -main ()
  -{
  -if (sizeof (size_t))
  -       return 0;
  -  ;
  -  return 0;
  -}
  -_ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
  -$ac_includes_default
  +#include <stdlib.h>
  +#include <stdarg.h>
  +#include <string.h>
  +#include <float.h>
  +
   int
   main ()
   {
  -if (sizeof ((size_t)))
  -	  return 0;
  +
     ;
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  :
  +if ac_fn_c_try_compile "$LINENO"; then :
  +  ac_cv_header_stdc=yes
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	ac_cv_type_size_t=yes
  +  ac_cv_header_stdc=no
   fi
  -
   rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
   
  +if test $ac_cv_header_stdc = yes; then
  +  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +#include <string.h>
  +
  +_ACEOF
  +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  +  $EGREP "memchr" >/dev/null 2>&1; then :
   
  +else
  +  ac_cv_header_stdc=no
   fi
  +rm -f conftest*
   
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
  -$as_echo "$ac_cv_type_size_t" >&6; }
  -if test "x$ac_cv_type_size_t" = x""yes; then
  -  :
  -else
   
  -cat >>confdefs.h <<_ACEOF
  -#define size_t unsigned int
  +if test $ac_cv_header_stdc = yes; then
  +  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
  +#include <stdlib.h>
  +
   _ACEOF
  +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  +  $EGREP "free" >/dev/null 2>&1; then :
   
  +else
  +  ac_cv_header_stdc=no
   fi
  +rm -f conftest*
   
  +fi
   
  -pcre_have_strotolonglong=0
  -
  -
  -
  -for ac_func in strtoq strtoll _strtoi64
  -do
  -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
  -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
  -$as_echo_n "checking for $ac_func... " >&6; }
  -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
  -  $as_echo_n "(cached) " >&6
  +if test $ac_cv_header_stdc = yes; then
  +  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
  +  if test "$cross_compiling" = yes; then :
  +  :
   else
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
  -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
  -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
  -#define $ac_func innocuous_$ac_func
  -
  -/* System header to define __stub macros and hopefully few prototypes,
  -    which can conflict with char $ac_func (); below.
  -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
  -    <limits.h> exists even on freestanding compilers.  */
  -
  -#ifdef __STDC__
  -# include <limits.h>
  +#include <ctype.h>
  +#include <stdlib.h>
  +#if ((' ' & 0x0FF) == 0x020)
  +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
   #else
  -# include <assert.h>
  -#endif
  -
  -#undef $ac_func
  -
  -/* Override any GCC internal prototype to avoid an error.
  -   Use char because int might match the return type of a GCC
  -   builtin and then its argument prototype would still apply.  */
  -#ifdef __cplusplus
  -extern "C"
  -#endif
  -char $ac_func ();
  -/* The GNU C library defines this for functions which it implements
  -    to always fail with ENOSYS.  Some functions are actually named
  -    something starting with __ and the normal name is an alias.  */
  -#if defined __stub_$ac_func || defined __stub___$ac_func
  -choke me
  +# define ISLOWER(c) \
  +		   (('a' <= (c) && (c) <= 'i') \
  +		     || ('j' <= (c) && (c) <= 'r') \
  +		     || ('s' <= (c) && (c) <= 'z'))
  +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
   #endif
   
  +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
   int
   main ()
   {
  -return $ac_func ();
  -  ;
  +  int i;
  +  for (i = 0; i < 256; i++)
  +    if (XOR (islower (i), ISLOWER (i))
  +	|| toupper (i) != TOUPPER (i))
  +      return 2;
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  -  eval "$as_ac_var=yes"
  +if ac_fn_c_try_run "$LINENO"; then :
  +
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  +  ac_cv_header_stdc=no
  +fi
  +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
  +  conftest.$ac_objext conftest.beam conftest.$ac_ext
  +fi
   
  -	eval "$as_ac_var=no"
   fi
  +fi
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
  +$as_echo "$ac_cv_header_stdc" >&6; }
  +if test $ac_cv_header_stdc = yes; then
  +
  +$as_echo "#define STDC_HEADERS 1" >>confdefs.h
   
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
   fi
  -ac_res=`eval 'as_val=${'$as_ac_var'}
  -		 $as_echo "$as_val"'`
  -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  -$as_echo "$ac_res" >&6; }
  -as_val=`eval 'as_val=${'$as_ac_var'}
  -		 $as_echo "$as_val"'`
  -   if test "x$as_val" = x""yes; then
  +
  +for ac_header in limits.h sys/types.h sys/stat.h dirent.h windows.h
  +do :
  +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
  +eval as_val=\$$as_ac_Header
  +   if test "x$as_val" = x""yes; then :
     cat >>confdefs.h <<_ACEOF
  -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
   _ACEOF
  - pcre_have_strotolonglong="1"; break
  +
   fi
  +
   done
   
  -# If we can't convert a string to a long long, pretend we don't even
  -# have a long long.
  -if test $pcre_have_strotolonglong = "0"; then
  -   pcre_have_long_long="0"
  -   pcre_have_ulong_long="0"
  -else
  -  { $as_echo "$as_me:$LINENO: checking for long long" >&5
  -$as_echo_n "checking for long long... " >&6; }
  -if test "${ac_cv_type_long_long+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  ac_cv_type_long_long=no
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +
  +# The files below are C++ header files.
  +pcre_have_type_traits="0"
  +pcre_have_bits_type_traits="0"
  +if test "x$enable_cpp" = "xyes" -a -n "$CXX"
  +then
  +ac_ext=cpp
  +ac_cpp='$CXXCPP $CPPFLAGS'
  +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  +
  +
  +# Older versions of pcre defined pcrecpp::no_arg, but in new versions
  +# it's called pcrecpp::RE::no_arg.  For backwards ABI compatibility,
  +# we want to make one an alias for the other.  Different systems do
  +# this in different ways.  Some systems, for instance, can do it via
  +# a linker flag: -alias (for os x 10.5) or -i (for os x <=10.4).
  +OLD_LDFLAGS="$LDFLAGS"
  +for flag in "-alias,__ZN7pcrecpp2RE6no_argE,__ZN7pcrecpp6no_argE" \
  +            "-i__ZN7pcrecpp6no_argE:__ZN7pcrecpp2RE6no_argE"; do
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alias support in the linker" >&5
  +$as_echo_n "checking for alias support in the linker... " >&6; }
  +  LDFLAGS="$OLD_LDFLAGS -Wl,$flag"
  +  # We try to run the linker with this new ld flag.  If the link fails,
  +  # we give up and remove the new flag from LDFLAGS.
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
  -$ac_includes_default
  +namespace pcrecpp {
  +                                    class RE { static int no_arg; };
  +                                    int RE::no_arg;
  +                                  }
   int
   main ()
   {
  -if (sizeof (long long))
  -       return 0;
  +
     ;
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  +if ac_fn_cxx_try_link "$LINENO"; then :
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  +$as_echo "yes" >&6; };
  +                  EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRECPP_LDFLAGS -Wl,$flag";
  +                  break;
  +else
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  +$as_echo "no" >&6; }
  +fi
  +rm -f core conftest.err conftest.$ac_objext \
  +    conftest$ac_exeext conftest.$ac_ext
  +done
  +LDFLAGS="$OLD_LDFLAGS"
  +
  +# We could be more clever here, given we're doing AC_SUBST with this
  +# (eg set a var to be the name of the include file we want). But we're not
  +# so it's easy to change back to 'regular' autoconf vars if we needed to.
  +
  +for ac_header in string
  +do :
  +  ac_fn_cxx_check_header_mongrel "$LINENO" "string" "ac_cv_header_string" "$ac_includes_default"
  +if test "x$ac_cv_header_string" = x""yes; then :
  +  cat >>confdefs.h <<_ACEOF
  +#define HAVE_STRING 1
   _ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -$ac_includes_default
  -int
  -main ()
  -{
  -if (sizeof ((long long)))
  -	  return 0;
  -  ;
  -  return 0;
  -}
  + pcre_have_cpp_headers="1"
  +else
  +  pcre_have_cpp_headers="0"
  +fi
  +
  +done
  +
  +for ac_header in bits/type_traits.h
  +do :
  +  ac_fn_cxx_check_header_mongrel "$LINENO" "bits/type_traits.h" "ac_cv_header_bits_type_traits_h" "$ac_includes_default"
  +if test "x$ac_cv_header_bits_type_traits_h" = x""yes; then :
  +  cat >>confdefs.h <<_ACEOF
  +#define HAVE_BITS_TYPE_TRAITS_H 1
   _ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  :
  + pcre_have_bits_type_traits="1"
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  +  pcre_have_bits_type_traits="0"
  +fi
  +
  +done
   
  -	ac_cv_type_long_long=yes
  +for ac_header in type_traits.h
  +do :
  +  ac_fn_cxx_check_header_mongrel "$LINENO" "type_traits.h" "ac_cv_header_type_traits_h" "$ac_includes_default"
  +if test "x$ac_cv_header_type_traits_h" = x""yes; then :
  +  cat >>confdefs.h <<_ACEOF
  +#define HAVE_TYPE_TRAITS_H 1
  +_ACEOF
  + pcre_have_type_traits="1"
  +else
  +  pcre_have_type_traits="0"
   fi
   
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  +done
   
   
  -fi
  +# (This isn't c++-specific, but is only used in pcrecpp.cc, so try this
  +# in a c++ context.  This matters becuase strtoimax is C99 and may not
  +# be supported by the C++ compiler.)
  +# Figure out how to create a longlong from a string: strtoll and
  +# equiv.  It's not enough to call AC_CHECK_FUNCS: hpux has a
  +# strtoll, for instance, but it only takes 2 args instead of 3!
  +# We have to call AH_TEMPLATE since AC_DEFINE_UNQUOTED below is complex.
   
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
  -$as_echo "$ac_cv_type_long_long" >&6; }
  -if test "x$ac_cv_type_long_long" = x""yes; then
   
  -cat >>confdefs.h <<_ACEOF
  -#define HAVE_LONG_LONG 1
  -_ACEOF
   
  -pcre_have_long_long="1"
  -else
  -  pcre_have_long_long="0"
  -fi
   
  -  { $as_echo "$as_me:$LINENO: checking for unsigned long long" >&5
  -$as_echo_n "checking for unsigned long long... " >&6; }
  -if test "${ac_cv_type_unsigned_long_long+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  ac_cv_type_unsigned_long_long=no
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +have_strto_fn=0
  +for fn in strtoq strtoll _strtoi64 strtoimax; do
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $fn" >&5
  +$as_echo_n "checking for $fn... " >&6; }
  +  if test "$fn" = strtoimax; then
  +    include=stdint.h
  +  else
  +    include=stdlib.h
  +  fi
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
  -$ac_includes_default
  +#include <$include>
   int
   main ()
   {
  -if (sizeof (unsigned long long))
  -       return 0;
  +char* e; return $fn("100", &e, 10)
     ;
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -$ac_includes_default
  -int
  -main ()
  -{
  -if (sizeof ((unsigned long long)))
  -	  return 0;
  -  ;
  -  return 0;
  -}
  +if ac_fn_cxx_try_compile "$LINENO"; then :
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  +$as_echo "yes" >&6; }
  +
  +cat >>confdefs.h <<_ACEOF
  +#define HAVE_`echo $fn | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ` 1
   _ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  :
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
   
  -	ac_cv_type_unsigned_long_long=yes
  +                     have_strto_fn=1
  +                     break
  +else
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  +$as_echo "no" >&6; }
   fi
  -
   rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  +done
   
  +if test "$have_strto_fn" = 1; then
  +  ac_fn_cxx_check_type "$LINENO" "long long" "ac_cv_type_long_long" "$ac_includes_default"
  +if test "x$ac_cv_type_long_long" = x""yes; then :
   
  -fi
  +cat >>confdefs.h <<_ACEOF
  +#define HAVE_LONG_LONG 1
  +_ACEOF
   
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  +pcre_have_long_long="1"
  +else
  +  pcre_have_long_long="0"
   fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5
  -$as_echo "$ac_cv_type_unsigned_long_long" >&6; }
  -if test "x$ac_cv_type_unsigned_long_long" = x""yes; then
  +
  +  ac_fn_cxx_check_type "$LINENO" "unsigned long long" "ac_cv_type_unsigned_long_long" "$ac_includes_default"
  +if test "x$ac_cv_type_unsigned_long_long" = x""yes; then :
   
   cat >>confdefs.h <<_ACEOF
   #define HAVE_UNSIGNED_LONG_LONG 1
  @@ -17405,276 +15547,174 @@
     pcre_have_ulong_long="0"
   fi
   
  +else
  +  pcre_have_long_long="0"
  +  pcre_have_ulong_long="0"
   fi
   
   
   
  -# Checks for library functions.
  +ac_ext=c
  +ac_cpp='$CPP $CPPFLAGS'
  +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  +ac_compiler_gnu=$ac_cv_c_compiler_gnu
   
  +fi
  +# Using AC_SUBST eliminates the need to include config.h in a public .h file
   
   
   
  -for ac_func in bcopy memmove strerror
  -do
  -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
  -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
  -$as_echo_n "checking for $ac_func... " >&6; }
  -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
  -  $as_echo_n "(cached) " >&6
  +# Conditional compilation
  + if test "x$enable_cpp" = "xyes"; then
  +  WITH_PCRE_CPP_TRUE=
  +  WITH_PCRE_CPP_FALSE='#'
   else
  -  cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
  -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
  -#define $ac_func innocuous_$ac_func
  +  WITH_PCRE_CPP_TRUE='#'
  +  WITH_PCRE_CPP_FALSE=
  +fi
   
  -/* System header to define __stub macros and hopefully few prototypes,
  -    which can conflict with char $ac_func (); below.
  -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
  -    <limits.h> exists even on freestanding compilers.  */
  + if test "x$enable_rebuild_chartables" = "xyes"; then
  +  WITH_REBUILD_CHARTABLES_TRUE=
  +  WITH_REBUILD_CHARTABLES_FALSE='#'
  +else
  +  WITH_REBUILD_CHARTABLES_TRUE='#'
  +  WITH_REBUILD_CHARTABLES_FALSE=
  +fi
   
  -#ifdef __STDC__
  -# include <limits.h>
  -#else
  -# include <assert.h>
  -#endif
   
  -#undef $ac_func
  +# Checks for typedefs, structures, and compiler characteristics.
   
  -/* Override any GCC internal prototype to avoid an error.
  -   Use char because int might match the return type of a GCC
  -   builtin and then its argument prototype would still apply.  */
  -#ifdef __cplusplus
  -extern "C"
  -#endif
  -char $ac_func ();
  -/* The GNU C library defines this for functions which it implements
  -    to always fail with ENOSYS.  Some functions are actually named
  -    something starting with __ and the normal name is an alias.  */
  -#if defined __stub_$ac_func || defined __stub___$ac_func
  -choke me
  -#endif
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
  +$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
  +if test "${ac_cv_c_const+set}" = set; then :
  +  $as_echo_n "(cached) " >&6
  +else
  +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  +/* end confdefs.h.  */
   
   int
   main ()
   {
  -return $ac_func ();
  +/* FIXME: Include the comments suggested by Paul. */
  +#ifndef __cplusplus
  +  /* Ultrix mips cc rejects this.  */
  +  typedef int charset[2];
  +  const charset cs;
  +  /* SunOS 4.1.1 cc rejects this.  */
  +  char const *const *pcpcc;
  +  char **ppc;
  +  /* NEC SVR4.0.2 mips cc rejects this.  */
  +  struct point {int x, y;};
  +  static struct point const zero = {0,0};
  +  /* AIX XL C 1.02.0.0 rejects this.
  +     It does not let you subtract one const X* pointer from another in
  +     an arm of an if-expression whose if-part is not a constant
  +     expression */
  +  const char *g = "string";
  +  pcpcc = &g + (g ? g-g : 0);
  +  /* HPUX 7.0 cc rejects these. */
  +  ++pcpcc;
  +  ppc = (char**) pcpcc;
  +  pcpcc = (char const *const *) ppc;
  +  { /* SCO 3.2v4 cc rejects this.  */
  +    char *t;
  +    char const *s = 0 ? (char *) 0 : (char const *) 0;
  +
  +    *t++ = 0;
  +    if (s) return 0;
  +  }
  +  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
  +    int x[] = {25, 17};
  +    const int *foo = &x[0];
  +    ++foo;
  +  }
  +  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
  +    typedef const int *iptr;
  +    iptr p = 0;
  +    ++p;
  +  }
  +  { /* AIX XL C 1.02.0.0 rejects this saying
  +       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
  +    struct s { int j; const int *ap[3]; };
  +    struct s *b; b->j = 5;
  +  }
  +  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
  +    const int foo = 10;
  +    if (!foo) return 0;
  +  }
  +  return !cs[0] && !zero.x;
  +#endif
  +
     ;
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  -  eval "$as_ac_var=yes"
  +if ac_fn_c_try_compile "$LINENO"; then :
  +  ac_cv_c_const=yes
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	eval "$as_ac_var=no"
  -fi
  -
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
  +  ac_cv_c_const=no
   fi
  -ac_res=`eval 'as_val=${'$as_ac_var'}
  -		 $as_echo "$as_val"'`
  -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  -$as_echo "$ac_res" >&6; }
  -as_val=`eval 'as_val=${'$as_ac_var'}
  -		 $as_echo "$as_val"'`
  -   if test "x$as_val" = x""yes; then
  -  cat >>confdefs.h <<_ACEOF
  -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  -_ACEOF
  -
  +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   fi
  -done
  -
  -
  -# Check for the availability of libz (aka zlib)
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
  +$as_echo "$ac_cv_c_const" >&6; }
  +if test $ac_cv_c_const = no; then
   
  +$as_echo "#define const /**/" >>confdefs.h
   
  -for ac_header in zlib.h
  -do
  -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  -$as_echo_n "checking for $ac_header... " >&6; }
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  $as_echo_n "(cached) " >&6
   fi
  -ac_res=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  -$as_echo "$ac_res" >&6; }
  -else
  -  # Is the header compilable?
  -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
  -$as_echo_n "checking $ac_header usability... " >&6; }
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -$ac_includes_default
  -#include <$ac_header>
  -_ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  ac_header_compiler=yes
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
   
  -	ac_header_compiler=no
  -fi
  +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
  +if test "x$ac_cv_type_size_t" = x""yes; then :
   
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  -$as_echo "$ac_header_compiler" >&6; }
  +else
   
  -# Is the header present?
  -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
  -$as_echo_n "checking $ac_header presence... " >&6; }
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#include <$ac_header>
  +cat >>confdefs.h <<_ACEOF
  +#define size_t unsigned int
   _ACEOF
  -if { (ac_try="$ac_cpp conftest.$ac_ext"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } >/dev/null && {
  -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       }; then
  -  ac_header_preproc=yes
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
   
  -  ac_header_preproc=no
   fi
   
  -rm -f conftest.err conftest.$ac_ext
  -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
  -$as_echo "$ac_header_preproc" >&6; }
   
  -# So?  What about this header?
  -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
  -  yes:no: )
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
  -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
  -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
  -    ac_header_preproc=yes
  -    ;;
  -  no:yes:* )
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
  -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
  -$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
  -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
  -$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
  -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
  +# Checks for library functions.
   
  -    ;;
  -esac
  -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  -$as_echo_n "checking for $ac_header... " >&6; }
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  eval "$as_ac_Header=\$ac_header_preproc"
  -fi
  -ac_res=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  -$as_echo "$ac_res" >&6; }
  +for ac_func in bcopy memmove strerror
  +do :
  +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
  +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
  +eval as_val=\$$as_ac_var
  +   if test "x$as_val" = x""yes; then :
  +  cat >>confdefs.h <<_ACEOF
  +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  +_ACEOF
   
   fi
  -as_val=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -   if test "x$as_val" = x""yes; then
  +done
  +
  +
  +# Check for the availability of libz (aka zlib)
  +
  +for ac_header in zlib.h
  +do :
  +  ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
  +if test "x$ac_cv_header_zlib_h" = x""yes; then :
     cat >>confdefs.h <<_ACEOF
  -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  +#define HAVE_ZLIB_H 1
   _ACEOF
    HAVE_ZLIB_H=1
   fi
   
   done
   
  -{ $as_echo "$as_me:$LINENO: checking for gzopen in -lz" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5
   $as_echo_n "checking for gzopen in -lz... " >&6; }
  -if test "${ac_cv_lib_z_gzopen+set}" = set; then
  +if test "${ac_cv_lib_z_gzopen+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     ac_check_lib_save_LIBS=$LIBS
   LIBS="-lz  $LIBS"
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   
   /* Override any GCC internal prototype to avoid an error.
  @@ -17692,571 +15732,118 @@
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  +if ac_fn_c_try_link "$LINENO"; then :
     ac_cv_lib_z_gzopen=yes
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	ac_cv_lib_z_gzopen=no
  +  ac_cv_lib_z_gzopen=no
   fi
  -
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
  +rm -f core conftest.err conftest.$ac_objext \
  +    conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_check_lib_save_LIBS
   fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzopen" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzopen" >&5
   $as_echo "$ac_cv_lib_z_gzopen" >&6; }
  -if test "x$ac_cv_lib_z_gzopen" = x""yes; then
  +if test "x$ac_cv_lib_z_gzopen" = x""yes; then :
     HAVE_LIBZ=1
   fi
   
   
  -# Check for the availability of libbz2
  -
  +# Check for the availability of libbz2. Originally we just used AC_CHECK_LIB,
  +# as for libz. However, this had the following problem, diagnosed and fixed by
  +# a user:
  +#
  +#   - libbz2 uses the Pascal calling convention (WINAPI) for the functions
  +#     under Win32.
  +#   - The standard autoconf AC_CHECK_LIB fails to include "bzlib.h",
  +#     therefore missing the function definition.
  +#   - The compiler thus generates a "C" signature for the test function.
  +#   - The linker fails to find the "C" function.
  +#   - PCRE fails to configure if asked to do so against libbz2.
  +#
  +# Solution:
  +#
  +#   - Replace the AC_CHECK_LIB test with a custom test.
   
   for ac_header in bzlib.h
  -do
  -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  -$as_echo_n "checking for $ac_header... " >&6; }
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  $as_echo_n "(cached) " >&6
  -fi
  -ac_res=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  -$as_echo "$ac_res" >&6; }
  -else
  -  # Is the header compilable?
  -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
  -$as_echo_n "checking $ac_header usability... " >&6; }
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -$ac_includes_default
  -#include <$ac_header>
  -_ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  ac_header_compiler=yes
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	ac_header_compiler=no
  -fi
  -
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  -$as_echo "$ac_header_compiler" >&6; }
  -
  -# Is the header present?
  -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
  -$as_echo_n "checking $ac_header presence... " >&6; }
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#include <$ac_header>
  -_ACEOF
  -if { (ac_try="$ac_cpp conftest.$ac_ext"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } >/dev/null && {
  -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       }; then
  -  ac_header_preproc=yes
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -  ac_header_preproc=no
  -fi
  -
  -rm -f conftest.err conftest.$ac_ext
  -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
  -$as_echo "$ac_header_preproc" >&6; }
  -
  -# So?  What about this header?
  -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
  -  yes:no: )
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
  -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
  -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
  -    ac_header_preproc=yes
  -    ;;
  -  no:yes:* )
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
  -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
  -$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
  -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
  -$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
  -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
  -
  -    ;;
  -esac
  -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  -$as_echo_n "checking for $ac_header... " >&6; }
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  eval "$as_ac_Header=\$ac_header_preproc"
  -fi
  -ac_res=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  -$as_echo "$ac_res" >&6; }
  -
  -fi
  -as_val=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -   if test "x$as_val" = x""yes; then
  +do :
  +  ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default"
  +if test "x$ac_cv_header_bzlib_h" = x""yes; then :
     cat >>confdefs.h <<_ACEOF
  -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  +#define HAVE_BZLIB_H 1
   _ACEOF
    HAVE_BZLIB_H=1
   fi
   
   done
   
  -{ $as_echo "$as_me:$LINENO: checking for BZ2_bzopen in -lbz2" >&5
  -$as_echo_n "checking for BZ2_bzopen in -lbz2... " >&6; }
  -if test "${ac_cv_lib_bz2_BZ2_bzopen+set}" = set; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  ac_check_lib_save_LIBS=$LIBS
  -LIBS="-lbz2  $LIBS"
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +# Original test
  +# AC_CHECK_LIB([bz2], [BZ2_bzopen], [HAVE_LIBBZ2=1])
  +#
  +# Custom test follows
  +
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libbz2" >&5
  +$as_echo_n "checking for libbz2... " >&6; }
  +OLD_LIBS="$LIBS"
  +LIBS="$LIBS -lbz2"
  +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   
  -/* Override any GCC internal prototype to avoid an error.
  -   Use char because int might match the return type of a GCC
  -   builtin and then its argument prototype would still apply.  */
  -#ifdef __cplusplus
  -extern "C"
  +#ifdef HAVE_BZLIB_H
  +#include <bzlib.h>
   #endif
  -char BZ2_bzopen ();
   int
   main ()
   {
  -return BZ2_bzopen ();
  +return (int)BZ2_bzopen("conftest", "rb");
     ;
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  -  ac_cv_lib_bz2_BZ2_bzopen=yes
  +if ac_fn_c_try_link "$LINENO"; then :
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  +$as_echo "yes" >&6; };HAVE_LIBBZ2=1; break;
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	ac_cv_lib_bz2_BZ2_bzopen=no
  -fi
  -
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
  -LIBS=$ac_check_lib_save_LIBS
  -fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bz2_BZ2_bzopen" >&5
  -$as_echo "$ac_cv_lib_bz2_BZ2_bzopen" >&6; }
  -if test "x$ac_cv_lib_bz2_BZ2_bzopen" = x""yes; then
  -  HAVE_LIBBZ2=1
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  +$as_echo "no" >&6; }
   fi
  -
  +rm -f core conftest.err conftest.$ac_objext \
  +    conftest$ac_exeext conftest.$ac_ext
  +LIBS="$OLD_LIBS"
   
   # Check for the availabiity of libreadline
   
  -
   for ac_header in readline/readline.h
  -do
  -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  -$as_echo_n "checking for $ac_header... " >&6; }
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  $as_echo_n "(cached) " >&6
  -fi
  -ac_res=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  -$as_echo "$ac_res" >&6; }
  -else
  -  # Is the header compilable?
  -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
  -$as_echo_n "checking $ac_header usability... " >&6; }
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -$ac_includes_default
  -#include <$ac_header>
  -_ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  ac_header_compiler=yes
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	ac_header_compiler=no
  -fi
  -
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  -$as_echo "$ac_header_compiler" >&6; }
  -
  -# Is the header present?
  -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
  -$as_echo_n "checking $ac_header presence... " >&6; }
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#include <$ac_header>
  -_ACEOF
  -if { (ac_try="$ac_cpp conftest.$ac_ext"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } >/dev/null && {
  -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       }; then
  -  ac_header_preproc=yes
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -  ac_header_preproc=no
  -fi
  -
  -rm -f conftest.err conftest.$ac_ext
  -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
  -$as_echo "$ac_header_preproc" >&6; }
  -
  -# So?  What about this header?
  -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
  -  yes:no: )
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
  -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
  -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
  -    ac_header_preproc=yes
  -    ;;
  -  no:yes:* )
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
  -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
  -$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
  -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
  -$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
  -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
  -
  -    ;;
  -esac
  -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  -$as_echo_n "checking for $ac_header... " >&6; }
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  eval "$as_ac_Header=\$ac_header_preproc"
  -fi
  -ac_res=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  -$as_echo "$ac_res" >&6; }
  -
  -fi
  -as_val=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -   if test "x$as_val" = x""yes; then
  +do :
  +  ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
  +if test "x$ac_cv_header_readline_readline_h" = x""yes; then :
     cat >>confdefs.h <<_ACEOF
  -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  +#define HAVE_READLINE_READLINE_H 1
   _ACEOF
    HAVE_READLINE_H=1
   fi
  -
  -done
  -
  -
  -for ac_header in readline/history.h
  -do
  -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  -$as_echo_n "checking for $ac_header... " >&6; }
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  $as_echo_n "(cached) " >&6
  -fi
  -ac_res=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  -$as_echo "$ac_res" >&6; }
  -else
  -  # Is the header compilable?
  -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
  -$as_echo_n "checking $ac_header usability... " >&6; }
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -$ac_includes_default
  -#include <$ac_header>
  -_ACEOF
  -rm -f conftest.$ac_objext
  -if { (ac_try="$ac_compile"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_compile") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest.$ac_objext; then
  -  ac_header_compiler=yes
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	ac_header_compiler=no
  -fi
  -
  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  -$as_echo "$ac_header_compiler" >&6; }
  -
  -# Is the header present?
  -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
  -$as_echo_n "checking $ac_header presence... " >&6; }
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#include <$ac_header>
  -_ACEOF
  -if { (ac_try="$ac_cpp conftest.$ac_ext"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } >/dev/null && {
  -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       }; then
  -  ac_header_preproc=yes
  -else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -  ac_header_preproc=no
  -fi
  -
  -rm -f conftest.err conftest.$ac_ext
  -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
  -$as_echo "$ac_header_preproc" >&6; }
  -
  -# So?  What about this header?
  -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
  -  yes:no: )
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
  -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
  -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
  -    ac_header_preproc=yes
  -    ;;
  -  no:yes:* )
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
  -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
  -$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
  -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
  -$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
  -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
  -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
  -
  -    ;;
  -esac
  -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  -$as_echo_n "checking for $ac_header... " >&6; }
  -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  -  $as_echo_n "(cached) " >&6
  -else
  -  eval "$as_ac_Header=\$ac_header_preproc"
  -fi
  -ac_res=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  -$as_echo "$ac_res" >&6; }
  -
  -fi
  -as_val=`eval 'as_val=${'$as_ac_Header'}
  -		 $as_echo "$as_val"'`
  -   if test "x$as_val" = x""yes; then
  +
  +done
  +
  +for ac_header in readline/history.h
  +do :
  +  ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default"
  +if test "x$ac_cv_header_readline_history_h" = x""yes; then :
     cat >>confdefs.h <<_ACEOF
  -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  +#define HAVE_READLINE_HISTORY_H 1
   _ACEOF
    HAVE_HISTORY_H=1
   fi
   
   done
   
  -{ $as_echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
   $as_echo_n "checking for readline in -lreadline... " >&6; }
  -if test "${ac_cv_lib_readline_readline+set}" = set; then
  +if test "${ac_cv_lib_readline_readline+set}" = set; then :
     $as_echo_n "(cached) " >&6
   else
     ac_check_lib_save_LIBS=$LIBS
   LIBS="-lreadline  $LIBS"
  -cat >conftest.$ac_ext <<_ACEOF
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   
   /* Override any GCC internal prototype to avoid an error.
  @@ -18274,43 +15861,18 @@
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (ac_try="$ac_link"
  -case "(($ac_try" in
  -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  -  *) ac_try_echo=$ac_try;;
  -esac
  -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  -$as_echo "$ac_try_echo") >&5
  -  (eval "$ac_link") 2>conftest.er1
  -  ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } && {
  -	 test -z "$ac_c_werror_flag" ||
  -	 test ! -s conftest.err
  -       } && test -s conftest$ac_exeext && {
  -	 test "$cross_compiling" = yes ||
  -	 $as_test_x conftest$ac_exeext
  -       }; then
  +if ac_fn_c_try_link "$LINENO"; then :
     ac_cv_lib_readline_readline=yes
   else
  -  $as_echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -	ac_cv_lib_readline_readline=no
  +  ac_cv_lib_readline_readline=no
   fi
  -
  -rm -rf conftest.dSYM
  -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  -      conftest$ac_exeext conftest.$ac_ext
  +rm -f core conftest.err conftest.$ac_objext \
  +    conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_check_lib_save_LIBS
   fi
  -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
   $as_echo "$ac_cv_lib_readline_readline" >&6; }
  -if test "x$ac_cv_lib_readline_readline" = x""yes; then
  +if test "x$ac_cv_lib_readline_readline" = x""yes; then :
     HAVE_LIB_READLINE=1
   fi
   
  @@ -18320,9 +15882,7 @@
   PCRE_STATIC_CFLAG=""
   if test "x$enable_shared" = "xno" ; then
   
  -cat >>confdefs.h <<\_ACEOF
  -#define PCRE_STATIC 1
  -_ACEOF
  +$as_echo "#define PCRE_STATIC 1" >>confdefs.h
   
     PCRE_STATIC_CFLAG="-DPCRE_STATIC"
   fi
  @@ -18332,49 +15892,37 @@
   
   if test "$enable_utf8" = "yes"; then
   
  -cat >>confdefs.h <<\_ACEOF
  -#define SUPPORT_UTF8 /**/
  -_ACEOF
  +$as_echo "#define SUPPORT_UTF8 /**/" >>confdefs.h
   
   fi
   
   if test "$enable_unicode_properties" = "yes"; then
   
  -cat >>confdefs.h <<\_ACEOF
  -#define SUPPORT_UCP /**/
  -_ACEOF
  +$as_echo "#define SUPPORT_UCP /**/" >>confdefs.h
   
   fi
   
   if test "$enable_stack_for_recursion" = "no"; then
   
  -cat >>confdefs.h <<\_ACEOF
  -#define NO_RECURSE /**/
  -_ACEOF
  +$as_echo "#define NO_RECURSE /**/" >>confdefs.h
   
   fi
   
   if test "$enable_pcregrep_libz" = "yes"; then
   
  -cat >>confdefs.h <<\_ACEOF
  -#define SUPPORT_LIBZ /**/
  -_ACEOF
  +$as_echo "#define SUPPORT_LIBZ /**/" >>confdefs.h
   
   fi
   
   if test "$enable_pcregrep_libbz2" = "yes"; then
   
  -cat >>confdefs.h <<\_ACEOF
  -#define SUPPORT_LIBBZ2 /**/
  -_ACEOF
  +$as_echo "#define SUPPORT_LIBBZ2 /**/" >>confdefs.h
   
   fi
   
   if test "$enable_pcretest_libreadline" = "yes"; then
   
  -cat >>confdefs.h <<\_ACEOF
  -#define SUPPORT_LIBREADLINE /**/
  -_ACEOF
  +$as_echo "#define SUPPORT_LIBREADLINE /**/" >>confdefs.h
   
   fi
   
  @@ -18386,9 +15934,7 @@
   
   if test "$enable_bsr_anycrlf" = "yes"; then
   
  -cat >>confdefs.h <<\_ACEOF
  -#define BSR_ANYCRLF /**/
  -_ACEOF
  +$as_echo "#define BSR_ANYCRLF /**/" >>confdefs.h
   
   fi
   
  @@ -18417,16 +15963,11 @@
   
   
   
  -cat >>confdefs.h <<\_ACEOF
  -#define MAX_NAME_SIZE 32
  -_ACEOF
  -
  +$as_echo "#define MAX_NAME_SIZE 32" >>confdefs.h
   
   
  -cat >>confdefs.h <<\_ACEOF
  -#define MAX_NAME_COUNT 10000
  -_ACEOF
   
  +$as_echo "#define MAX_NAME_COUNT 10000" >>confdefs.h
   
   
   
  @@ -18556,13 +16097,13 @@
       case $ac_val in #(
       *${as_nl}*)
         case $ac_var in #(
  -      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
  +      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
   $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
         esac
         case $ac_var in #(
         _ | IFS | as_nl) ;; #(
         BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
  -      *) $as_unset $ac_var ;;
  +      *) { eval $ac_var=; unset $ac_var;} ;;
         esac ;;
       esac
     done
  @@ -18570,8 +16111,8 @@
     (set) 2>&1 |
       case $as_nl`(ac_space=' '; set) 2>&1` in #(
       *${as_nl}ac_space=\ *)
  -      # `set' does not quote correctly, so add quotes (double-quote
  -      # substitution turns \\\\ into \\, and sed turns \\ into \).
  +      # `set' does not quote correctly, so add quotes: double-quote
  +      # substitution turns \\\\ into \\, and sed turns \\ into \.
         sed -n \
   	"s/'/'\\\\''/g;
   	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
  @@ -18594,11 +16135,11 @@
   if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
     if test -w "$cache_file"; then
       test "x$cache_file" != "x/dev/null" &&
  -      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
  +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
   $as_echo "$as_me: updating cache $cache_file" >&6;}
       cat confcache >$cache_file
     else
  -    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
  +    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
   $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
     fi
   fi
  @@ -18618,8 +16159,8 @@
     ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
     # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
     #    will be set to the directory where LIBOBJS objects are built.
  -  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
  -  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
  +  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
  +  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
   done
   LIBOBJS=$ac_libobjs
   
  @@ -18627,55 +16168,38 @@
   
   
   if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
  -  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
  -Usually this means the macro was only invoked conditionally." >&5
  -$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
  -Usually this means the macro was only invoked conditionally." >&2;}
  -   { (exit 1); exit 1; }; }
  +  as_fn_error "conditional \"AMDEP\" was never defined.
  +Usually this means the macro was only invoked conditionally." "$LINENO" 5
   fi
   if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
  -  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
  -Usually this means the macro was only invoked conditionally." >&5
  -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
  -Usually this means the macro was only invoked conditionally." >&2;}
  -   { (exit 1); exit 1; }; }
  +  as_fn_error "conditional \"am__fastdepCC\" was never defined.
  +Usually this means the macro was only invoked conditionally." "$LINENO" 5
   fi
   if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
  -  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
  -Usually this means the macro was only invoked conditionally." >&5
  -$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
  -Usually this means the macro was only invoked conditionally." >&2;}
  -   { (exit 1); exit 1; }; }
  +  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
  +Usually this means the macro was only invoked conditionally." "$LINENO" 5
   fi
   if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
  -  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
  -Usually this means the macro was only invoked conditionally." >&5
  -$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
  -Usually this means the macro was only invoked conditionally." >&2;}
  -   { (exit 1); exit 1; }; }
  +  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
  +Usually this means the macro was only invoked conditionally." "$LINENO" 5
   fi
   if test -z "${WITH_PCRE_CPP_TRUE}" && test -z "${WITH_PCRE_CPP_FALSE}"; then
  -  { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_PCRE_CPP\" was never defined.
  -Usually this means the macro was only invoked conditionally." >&5
  -$as_echo "$as_me: error: conditional \"WITH_PCRE_CPP\" was never defined.
  -Usually this means the macro was only invoked conditionally." >&2;}
  -   { (exit 1); exit 1; }; }
  +  as_fn_error "conditional \"WITH_PCRE_CPP\" was never defined.
  +Usually this means the macro was only invoked conditionally." "$LINENO" 5
   fi
   if test -z "${WITH_REBUILD_CHARTABLES_TRUE}" && test -z "${WITH_REBUILD_CHARTABLES_FALSE}"; then
  -  { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_REBUILD_CHARTABLES\" was never defined.
  -Usually this means the macro was only invoked conditionally." >&5
  -$as_echo "$as_me: error: conditional \"WITH_REBUILD_CHARTABLES\" was never defined.
  -Usually this means the macro was only invoked conditionally." >&2;}
  -   { (exit 1); exit 1; }; }
  +  as_fn_error "conditional \"WITH_REBUILD_CHARTABLES\" was never defined.
  +Usually this means the macro was only invoked conditionally." "$LINENO" 5
   fi
   
   : ${CONFIG_STATUS=./config.status}
   ac_write_fail=0
   ac_clean_files_save=$ac_clean_files
   ac_clean_files="$ac_clean_files $CONFIG_STATUS"
  -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
  +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
   $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
  -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  +as_write_fail=0
  +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
   #! $SHELL
   # Generated by $as_me.
   # Run this file to recreate the current configuration.
  @@ -18685,17 +16209,18 @@
   debug=false
   ac_cs_recheck=false
   ac_cs_silent=false
  -SHELL=\${CONFIG_SHELL-$SHELL}
  -_ACEOF
   
  -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  -## --------------------- ##
  -## M4sh Initialization.  ##
  -## --------------------- ##
  +SHELL=\${CONFIG_SHELL-$SHELL}
  +export SHELL
  +_ASEOF
  +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
  +## -------------------- ##
  +## M4sh Initialization. ##
  +## -------------------- ##
   
   # Be more Bourne compatible
   DUALCASE=1; export DUALCASE # for MKS sh
  -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
  +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
     emulate sh
     NULLCMD=:
     # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
  @@ -18703,23 +16228,15 @@
     alias -g '${1+"$@"}'='"$@"'
     setopt NO_GLOB_SUBST
   else
  -  case `(set -o) 2>/dev/null` in
  -  *posix*) set -o posix ;;
  +  case `(set -o) 2>/dev/null` in #(
  +  *posix*) :
  +    set -o posix ;; #(
  +  *) :
  +     ;;
   esac
  -
   fi
   
   
  -
  -
  -# PATH needs CR
  -# Avoid depending upon Character Ranges.
  -as_cr_letters='abcdefghijklmnopqrstuvwxyz'
  -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
  -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
  -as_cr_digits='0123456789'
  -as_cr_alnum=$as_cr_Letters$as_cr_digits
  -
   as_nl='
   '
   export as_nl
  @@ -18727,7 +16244,13 @@
   as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
   as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
   as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
  -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
  +# Prefer a ksh shell builtin over an external printf program on Solaris,
  +# but without wasting forks for bash or zsh.
  +if test -z "$BASH_VERSION$ZSH_VERSION" \
  +    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
  +  as_echo='print -r --'
  +  as_echo_n='print -rn --'
  +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
     as_echo='printf %s\n'
     as_echo_n='printf %s'
   else
  @@ -18738,7 +16261,7 @@
       as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
       as_echo_n_body='eval
         arg=$1;
  -      case $arg in
  +      case $arg in #(
         *"$as_nl"*)
   	expr "X$arg" : "X\\(.*\\)$as_nl";
   	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
  @@ -18761,13 +16284,6 @@
     }
   fi
   
  -# Support unset when possible.
  -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
  -  as_unset=unset
  -else
  -  as_unset=false
  -fi
  -
   
   # IFS
   # We need space, tab and new line, in precisely that order.  Quoting is
  @@ -18777,15 +16293,15 @@
   IFS=" ""	$as_nl"
   
   # Find who we are.  Look in the path if we contain no directory separator.
  -case $0 in
  +case $0 in #((
     *[\\/]* ) as_myself=$0 ;;
     *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   for as_dir in $PATH
   do
     IFS=$as_save_IFS
     test -z "$as_dir" && as_dir=.
  -  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
  -done
  +    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
  +  done
   IFS=$as_save_IFS
   
        ;;
  @@ -18797,12 +16313,16 @@
   fi
   if test ! -f "$as_myself"; then
     $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
  -  { (exit 1); exit 1; }
  +  exit 1
   fi
   
  -# Work around bugs in pre-3.0 UWIN ksh.
  -for as_var in ENV MAIL MAILPATH
  -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
  +# Unset variables that we do not need and which cause bugs (e.g. in
  +# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
  +# suppresses any "Segmentation fault" message there.  '((' could
  +# trigger a bug in pdksh 5.2.14.
  +for as_var in BASH_ENV ENV MAIL MAILPATH
  +do eval test x\${$as_var+set} = xset \
  +  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
   done
   PS1='$ '
   PS2='> '
  @@ -18814,7 +16334,89 @@
   LANGUAGE=C
   export LANGUAGE
   
  -# Required to use basename.
  +# CDPATH.
  +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  +
  +
  +# as_fn_error ERROR [LINENO LOG_FD]
  +# ---------------------------------
  +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
  +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
  +# script with status $?, using 1 if that was 0.
  +as_fn_error ()
  +{
  +  as_status=$?; test $as_status -eq 0 && as_status=1
  +  if test "$3"; then
  +    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  +    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
  +  fi
  +  $as_echo "$as_me: error: $1" >&2
  +  as_fn_exit $as_status
  +} # as_fn_error
  +
  +
  +# as_fn_set_status STATUS
  +# -----------------------
  +# Set $? to STATUS, without forking.
  +as_fn_set_status ()
  +{
  +  return $1
  +} # as_fn_set_status
  +
  +# as_fn_exit STATUS
  +# -----------------
  +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
  +as_fn_exit ()
  +{
  +  set +e
  +  as_fn_set_status $1
  +  exit $1
  +} # as_fn_exit
  +
  +# as_fn_unset VAR
  +# ---------------
  +# Portably unset VAR.
  +as_fn_unset ()
  +{
  +  { eval $1=; unset $1;}
  +}
  +as_unset=as_fn_unset
  +# as_fn_append VAR VALUE
  +# ----------------------
  +# Append the text in VALUE to the end of the definition contained in VAR. Take
  +# advantage of any shell optimizations that allow amortized linear growth over
  +# repeated appends, instead of the typical quadratic growth present in naive
  +# implementations.
  +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
  +  eval 'as_fn_append ()
  +  {
  +    eval $1+=\$2
  +  }'
  +else
  +  as_fn_append ()
  +  {
  +    eval $1=\$$1\$2
  +  }
  +fi # as_fn_append
  +
  +# as_fn_arith ARG...
  +# ------------------
  +# Perform arithmetic evaluation on the ARGs, and store the result in the
  +# global $as_val. Take advantage of shells that can avoid forks. The arguments
  +# must be portable across $(()) and expr.
  +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
  +  eval 'as_fn_arith ()
  +  {
  +    as_val=$(( $* ))
  +  }'
  +else
  +  as_fn_arith ()
  +  {
  +    as_val=`expr "$@" || test $? -eq 1`
  +  }
  +fi # as_fn_arith
  +
  +
   if expr a : '\(a\)' >/dev/null 2>&1 &&
      test "X`expr 00001 : '.*\(...\)'`" = X001; then
     as_expr=expr
  @@ -18828,8 +16430,12 @@
     as_basename=false
   fi
   
  +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
  +  as_dirname=dirname
  +else
  +  as_dirname=false
  +fi
   
  -# Name of the executable.
   as_me=`$as_basename -- "$0" ||
   $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
   	 X"$0" : 'X\(//\)$' \| \
  @@ -18849,76 +16455,25 @@
   	  }
   	  s/.*/./; q'`
   
  -# CDPATH.
  -$as_unset CDPATH
  -
  -
  -
  -  as_lineno_1=$LINENO
  -  as_lineno_2=$LINENO
  -  test "x$as_lineno_1" != "x$as_lineno_2" &&
  -  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
  -
  -  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
  -  # uniformly replaced by the line number.  The first 'sed' inserts a
  -  # line-number line after each line using $LINENO; the second 'sed'
  -  # does the real work.  The second script uses 'N' to pair each
  -  # line-number line with the line containing $LINENO, and appends
  -  # trailing '-' during substitution so that $LINENO is not a special
  -  # case at line end.
  -  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
  -  # scripts with optimization help from Paolo Bonzini.  Blame Lee
  -  # E. McMahon (1931-1989) for sed's syntax.  :-)
  -  sed -n '
  -    p
  -    /[$]LINENO/=
  -  ' <$as_myself |
  -    sed '
  -      s/[$]LINENO.*/&-/
  -      t lineno
  -      b
  -      :lineno
  -      N
  -      :loop
  -      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
  -      t loop
  -      s/-\n.*//
  -    ' >$as_me.lineno &&
  -  chmod +x "$as_me.lineno" ||
  -    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
  -   { (exit 1); exit 1; }; }
  -
  -  # Don't try to exec as it changes $[0], causing all sort of problems
  -  # (the dirname of $[0] is not the place where we might find the
  -  # original and so on.  Autoconf is especially sensitive to this).
  -  . "./$as_me.lineno"
  -  # Exit status is that of the last command.
  -  exit
  -}
  -
  -
  -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
  -  as_dirname=dirname
  -else
  -  as_dirname=false
  -fi
  +# Avoid depending upon Character Ranges.
  +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
  +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
  +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
  +as_cr_digits='0123456789'
  +as_cr_alnum=$as_cr_Letters$as_cr_digits
   
   ECHO_C= ECHO_N= ECHO_T=
  -case `echo -n x` in
  +case `echo -n x` in #(((((
   -n*)
  -  case `echo 'x\c'` in
  +  case `echo 'xy\c'` in
     *c*) ECHO_T='	';;	# ECHO_T is single tab character.
  -  *)   ECHO_C='\c';;
  +  xy)  ECHO_C='\c';;
  +  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
  +       ECHO_T='	';;
     esac;;
   *)
     ECHO_N='-n';;
   esac
  -if expr a : '\(a\)' >/dev/null 2>&1 &&
  -   test "X`expr 00001 : '.*\(...\)'`" = X001; then
  -  as_expr=expr
  -else
  -  as_expr=false
  -fi
   
   rm -f conf$$ conf$$.exe conf$$.file
   if test -d conf$$.dir; then
  @@ -18947,8 +16502,56 @@
   rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
   rmdir conf$$.dir 2>/dev/null
   
  +
  +# as_fn_mkdir_p
  +# -------------
  +# Create "$as_dir" as a directory, including parents if necessary.
  +as_fn_mkdir_p ()
  +{
  +
  +  case $as_dir in #(
  +  -*) as_dir=./$as_dir;;
  +  esac
  +  test -d "$as_dir" || eval $as_mkdir_p || {
  +    as_dirs=
  +    while :; do
  +      case $as_dir in #(
  +      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
  +      *) as_qdir=$as_dir;;
  +      esac
  +      as_dirs="'$as_qdir' $as_dirs"
  +      as_dir=`$as_dirname -- "$as_dir" ||
  +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  +	 X"$as_dir" : 'X\(//\)[^/]' \| \
  +	 X"$as_dir" : 'X\(//\)$' \| \
  +	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
  +$as_echo X"$as_dir" |
  +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  +	    s//\1/
  +	    q
  +	  }
  +	  /^X\(\/\/\)[^/].*/{
  +	    s//\1/
  +	    q
  +	  }
  +	  /^X\(\/\/\)$/{
  +	    s//\1/
  +	    q
  +	  }
  +	  /^X\(\/\).*/{
  +	    s//\1/
  +	    q
  +	  }
  +	  s/.*/./; q'`
  +      test -d "$as_dir" && break
  +    done
  +    test -z "$as_dirs" || eval "mkdir $as_dirs"
  +  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
  +
  +
  +} # as_fn_mkdir_p
   if mkdir -p . 2>/dev/null; then
  -  as_mkdir_p=:
  +  as_mkdir_p='mkdir -p "$as_dir"'
   else
     test -d ./-p && rmdir ./-p
     as_mkdir_p=false
  @@ -18967,10 +16570,10 @@
         if test -d "$1"; then
   	test -d "$1/.";
         else
  -	case $1 in
  +	case $1 in #(
   	-*)set "./$1";;
   	esac;
  -	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
  +	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
   	???[sx]*):;;*)false;;esac;fi
       '\'' sh
     '
  @@ -18985,13 +16588,19 @@
   
   
   exec 6>&1
  +## ----------------------------------- ##
  +## Main body of $CONFIG_STATUS script. ##
  +## ----------------------------------- ##
  +_ASEOF
  +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
   
  -# Save the log message, to keep $[0] and so on meaningful, and to
  +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  +# Save the log message, to keep $0 and so on meaningful, and to
   # report actual input values of CONFIG_FILES etc. instead of their
   # values after options handling.
   ac_log="
  -This file was extended by PCRE $as_me 8.00, which was
  -generated by GNU Autoconf 2.63.  Invocation command line was
  +This file was extended by PCRE $as_me 8.10, which was
  +generated by GNU Autoconf 2.65.  Invocation command line was
   
     CONFIG_FILES    = $CONFIG_FILES
     CONFIG_HEADERS  = $CONFIG_HEADERS
  @@ -19023,13 +16632,15 @@
   
   cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
   ac_cs_usage="\
  -\`$as_me' instantiates files from templates according to the
  -current configuration.
  +\`$as_me' instantiates files and other configuration actions
  +from templates according to the current configuration.  Unless the files
  +and actions are specified as TAGs, all are instantiated by default.
   
  -Usage: $0 [OPTION]... [FILE]...
  +Usage: $0 [OPTION]... [TAG]...
   
     -h, --help       print this help, then exit
     -V, --version    print version number and configuration settings, then exit
  +      --config     print configuration, then exit
     -q, --quiet, --silent
                      do not print progress messages
     -d, --debug      don't remove temporary files
  @@ -19048,16 +16659,17 @@
   Configuration commands:
   $config_commands
   
  -Report bugs to <bug-autoconf@gnu.org>."
  +Report bugs to the package provider."
   
   _ACEOF
   cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
   ac_cs_version="\\
  -PCRE config.status 8.00
  -configured by $0, generated by GNU Autoconf 2.63,
  -  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  +PCRE config.status 8.10
  +configured by $0, generated by GNU Autoconf 2.65,
  +  with options \\"\$ac_cs_config\\"
   
  -Copyright (C) 2008 Free Software Foundation, Inc.
  +Copyright (C) 2009 Free Software Foundation, Inc.
   This config.status script is free software; the Free Software Foundation
   gives unlimited permission to copy, distribute and modify it."
   
  @@ -19093,6 +16705,8 @@
       ac_cs_recheck=: ;;
     --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
       $as_echo "$ac_cs_version"; exit ;;
  +  --config | --confi | --conf | --con | --co | --c )
  +    $as_echo "$ac_cs_config"; exit ;;
     --debug | --debu | --deb | --de | --d | -d )
       debug=: ;;
     --file | --fil | --fi | --f )
  @@ -19100,20 +16714,19 @@
       case $ac_optarg in
       *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
       esac
  -    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
  +    as_fn_append CONFIG_FILES " '$ac_optarg'"
       ac_need_defaults=false;;
     --header | --heade | --head | --hea )
       $ac_shift
       case $ac_optarg in
       *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
       esac
  -    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
  +    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
       ac_need_defaults=false;;
     --he | --h)
       # Conflict between --help and --header
  -    { $as_echo "$as_me: error: ambiguous option: $1
  -Try \`$0 --help' for more information." >&2
  -   { (exit 1); exit 1; }; };;
  +    as_fn_error "ambiguous option: \`$1'
  +Try \`$0 --help' for more information.";;
     --help | --hel | -h )
       $as_echo "$ac_cs_usage"; exit ;;
     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
  @@ -19121,11 +16734,10 @@
       ac_cs_silent=: ;;
   
     # This is an error.
  -  -*) { $as_echo "$as_me: error: unrecognized option: $1
  -Try \`$0 --help' for more information." >&2
  -   { (exit 1); exit 1; }; } ;;
  +  -*) as_fn_error "unrecognized option: \`$1'
  +Try \`$0 --help' for more information." ;;
   
  -  *) ac_config_targets="$ac_config_targets $1"
  +  *) as_fn_append ac_config_targets " $1"
        ac_need_defaults=false ;;
   
     esac
  @@ -19542,9 +17154,7 @@
       "script-chmod") CONFIG_COMMANDS="$CONFIG_COMMANDS script-chmod" ;;
       "delete-old-chartables") CONFIG_COMMANDS="$CONFIG_COMMANDS delete-old-chartables" ;;
   
  -  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
  -   { (exit 1); exit 1; }; };;
  +  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
     esac
   done
   
  @@ -19571,7 +17181,7 @@
     trap 'exit_status=$?
     { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
   ' 0
  -  trap '{ (exit 1); exit 1; }' 1 2 13 15
  +  trap 'as_fn_exit 1' 1 2 13 15
   }
   # Create a (secure) tmp directory for tmp files.
   
  @@ -19582,11 +17192,7 @@
   {
     tmp=./conf$$-$RANDOM
     (umask 077 && mkdir "$tmp")
  -} ||
  -{
  -   $as_echo "$as_me: cannot create a temporary directory in ." >&2
  -   { (exit 1); exit 1; }
  -}
  +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
   
   # Set up the scripts for CONFIG_FILES section.
   # No need to generate them if there are no CONFIG_FILES.
  @@ -19594,10 +17200,16 @@
   if test -n "$CONFIG_FILES"; then
   
   
  -ac_cr='
'
  +ac_cr=`echo X | tr X '\015'`
  +# On cygwin, bash can eat \r inside `` if the user requested igncr.
  +# But we know of no other shell where ac_cr would be empty at this
  +# point, so we can use a bashism as a fallback.
  +if test "x$ac_cr" = x; then
  +  eval ac_cr=\$\'\\r\'
  +fi
   ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
   if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
  -  ac_cs_awk_cr='\\r'
  +  ac_cs_awk_cr='\r'
   else
     ac_cs_awk_cr=$ac_cr
   fi
  @@ -19611,24 +17223,18 @@
     echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
     echo "_ACEOF"
   } >conf$$subs.sh ||
  -  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
  -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
  -   { (exit 1); exit 1; }; }
  +  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
   ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
   ac_delim='%!_!# '
   for ac_last_try in false false false false false :; do
     . ./conf$$subs.sh ||
  -    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
  -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
  -   { (exit 1); exit 1; }; }
  +    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
   
     ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
     if test $ac_delim_n = $ac_delim_num; then
       break
     elif $ac_last_try; then
  -    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
  -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
  -   { (exit 1); exit 1; }; }
  +    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
     else
       ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
     fi
  @@ -19650,7 +17256,7 @@
   t delim
   :nl
   h
  -s/\(.\{148\}\).*/\1/
  +s/\(.\{148\}\)..*/\1/
   t more1
   s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
   p
  @@ -19664,7 +17270,7 @@
   t nl
   :delim
   h
  -s/\(.\{148\}\).*/\1/
  +s/\(.\{148\}\)..*/\1/
   t more2
   s/["\\]/\\&/g; s/^/"/; s/$/"/
   p
  @@ -19717,9 +17323,7 @@
   else
     cat
   fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
  -  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
  -$as_echo "$as_me: error: could not setup config files machinery" >&2;}
  -   { (exit 1); exit 1; }; }
  +  || as_fn_error "could not setup config files machinery" "$LINENO" 5
   _ACEOF
   
   # VPATH may cause trouble with some makes, so we remove $(srcdir),
  @@ -19760,9 +17364,7 @@
     if test -z "$ac_t"; then
       break
     elif $ac_last_try; then
  -    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
  -$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
  -   { (exit 1); exit 1; }; }
  +    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
     else
       ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
     fi
  @@ -19847,9 +17449,7 @@
   _ACAWK
   _ACEOF
   cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  -  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
  -$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
  -   { (exit 1); exit 1; }; }
  +  as_fn_error "could not setup config headers machinery" "$LINENO" 5
   fi # test -n "$CONFIG_HEADERS"
   
   
  @@ -19862,9 +17462,7 @@
     esac
     case $ac_mode$ac_tag in
     :[FHL]*:*);;
  -  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
  -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
  -   { (exit 1); exit 1; }; };;
  +  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
     :[FH]-) ac_tag=-:-;;
     :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
     esac
  @@ -19892,12 +17490,10 @@
   	   [\\/$]*) false;;
   	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
   	   esac ||
  -	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
  -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
  -   { (exit 1); exit 1; }; };;
  +	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
         esac
         case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
  -      ac_file_inputs="$ac_file_inputs '$ac_f'"
  +      as_fn_append ac_file_inputs " '$ac_f'"
       done
   
       # Let's still pretend it is `configure' which instantiates (i.e., don't
  @@ -19908,7 +17504,7 @@
   	`' by configure.'
       if test x"$ac_file" != x-; then
         configure_input="$ac_file.  $configure_input"
  -      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
  +      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
   $as_echo "$as_me: creating $ac_file" >&6;}
       fi
       # Neutralize special characters interpreted by sed in replacement strings.
  @@ -19921,9 +17517,7 @@
   
       case $ac_tag in
       *:-:* | *:-) cat >"$tmp/stdin" \
  -      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
  -$as_echo "$as_me: error: could not create $ac_file" >&2;}
  -   { (exit 1); exit 1; }; } ;;
  +      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
       esac
       ;;
     esac
  @@ -19951,47 +17545,7 @@
   	    q
   	  }
   	  s/.*/./; q'`
  -  { as_dir="$ac_dir"
  -  case $as_dir in #(
  -  -*) as_dir=./$as_dir;;
  -  esac
  -  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
  -    as_dirs=
  -    while :; do
  -      case $as_dir in #(
  -      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
  -      *) as_qdir=$as_dir;;
  -      esac
  -      as_dirs="'$as_qdir' $as_dirs"
  -      as_dir=`$as_dirname -- "$as_dir" ||
  -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  -	 X"$as_dir" : 'X\(//\)[^/]' \| \
  -	 X"$as_dir" : 'X\(//\)$' \| \
  -	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
  -$as_echo X"$as_dir" |
  -    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  -	    s//\1/
  -	    q
  -	  }
  -	  /^X\(\/\/\)[^/].*/{
  -	    s//\1/
  -	    q
  -	  }
  -	  /^X\(\/\/\)$/{
  -	    s//\1/
  -	    q
  -	  }
  -	  /^X\(\/\).*/{
  -	    s//\1/
  -	    q
  -	  }
  -	  s/.*/./; q'`
  -      test -d "$as_dir" && break
  -    done
  -    test -z "$as_dirs" || eval "mkdir $as_dirs"
  -  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
  -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
  -   { (exit 1); exit 1; }; }; }
  +  as_dir="$ac_dir"; as_fn_mkdir_p
     ac_builddir=.
   
   case "$ac_dir" in
  @@ -20048,7 +17602,6 @@
   # If the template does not know about datarootdir, expand it.
   # FIXME: This hack should be removed a few years after 2.60.
   ac_datarootdir_hack=; ac_datarootdir_seen=
  -
   ac_sed_dataroot='
   /datarootdir/ {
     p
  @@ -20058,12 +17611,11 @@
   /@docdir@/p
   /@infodir@/p
   /@localedir@/p
  -/@mandir@/p
  -'
  +/@mandir@/p'
   case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
   *datarootdir*) ac_datarootdir_seen=yes;;
   *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
  -  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
   $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
   _ACEOF
   cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  @@ -20073,7 +17625,7 @@
     s&@infodir@&$infodir&g
     s&@localedir@&$localedir&g
     s&@mandir@&$mandir&g
  -    s&\\\${datarootdir}&$datarootdir&g' ;;
  +  s&\\\${datarootdir}&$datarootdir&g' ;;
   esac
   _ACEOF
   
  @@ -20102,14 +17654,12 @@
   $ac_datarootdir_hack
   "
   eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
  -  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
  -$as_echo "$as_me: error: could not create $ac_file" >&2;}
  -   { (exit 1); exit 1; }; }
  +  || as_fn_error "could not create $ac_file" "$LINENO" 5
   
   test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
     { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
     { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
  -  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
   which seems to be undefined.  Please make sure it is defined." >&5
   $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
   which seems to be undefined.  Please make sure it is defined." >&2;}
  @@ -20119,9 +17669,7 @@
     -) cat "$tmp/out" && rm -f "$tmp/out";;
     *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
     esac \
  -  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
  -$as_echo "$as_me: error: could not create $ac_file" >&2;}
  -   { (exit 1); exit 1; }; }
  +  || as_fn_error "could not create $ac_file" "$LINENO" 5
    ;;
     :H)
     #
  @@ -20132,25 +17680,19 @@
         $as_echo "/* $configure_input  */" \
         && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
       } >"$tmp/config.h" \
  -      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
  -$as_echo "$as_me: error: could not create $ac_file" >&2;}
  -   { (exit 1); exit 1; }; }
  +      || as_fn_error "could not create $ac_file" "$LINENO" 5
       if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
  -      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
  +      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
   $as_echo "$as_me: $ac_file is unchanged" >&6;}
       else
         rm -f "$ac_file"
         mv "$tmp/config.h" "$ac_file" \
  -	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
  -$as_echo "$as_me: error: could not create $ac_file" >&2;}
  -   { (exit 1); exit 1; }; }
  +	|| as_fn_error "could not create $ac_file" "$LINENO" 5
       fi
     else
       $as_echo "/* $configure_input  */" \
         && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
  -      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
  -$as_echo "$as_me: error: could not create -" >&2;}
  -   { (exit 1); exit 1; }; }
  +      || as_fn_error "could not create -" "$LINENO" 5
     fi
   # Compute "$ac_file"'s index in $config_headers.
   _am_arg="$ac_file"
  @@ -20188,34 +17730,35 @@
   	  s/.*/./; q'`/stamp-h$_am_stamp_count
    ;;
   
  -  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
  +  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
   $as_echo "$as_me: executing $ac_file commands" >&6;}
    ;;
     esac
   
   
     case $ac_file$ac_mode in
  -    "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
  -# are listed without --file.  Let's play safe and only enable the eval
  -# if we detect the quoting.
  -case $CONFIG_FILES in
  -*\'*) eval set x "$CONFIG_FILES" ;;
  -*)   set x $CONFIG_FILES ;;
  -esac
  -shift
  -for mf
  -do
  -  # Strip MF so we end up with the name of the file.
  -  mf=`echo "$mf" | sed -e 's/:.*$//'`
  -  # Check whether this is an Automake generated Makefile or not.
  -  # We used to match only the files named `Makefile.in', but
  -  # some people rename them; so instead we look at the file content.
  -  # Grep'ing the first line is not enough: some people post-process
  -  # each Makefile.in and add a new line on top of each file to say so.
  -  # Grep'ing the whole file is not good either: AIX grep has a line
  -  # limit of 2048, but all sed's we know have understand at least 4000.
  -  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
  -    dirpart=`$as_dirname -- "$mf" ||
  +    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
  +  # Autoconf 2.62 quotes --file arguments for eval, but not when files
  +  # are listed without --file.  Let's play safe and only enable the eval
  +  # if we detect the quoting.
  +  case $CONFIG_FILES in
  +  *\'*) eval set x "$CONFIG_FILES" ;;
  +  *)   set x $CONFIG_FILES ;;
  +  esac
  +  shift
  +  for mf
  +  do
  +    # Strip MF so we end up with the name of the file.
  +    mf=`echo "$mf" | sed -e 's/:.*$//'`
  +    # Check whether this is an Automake generated Makefile or not.
  +    # We used to match only the files named `Makefile.in', but
  +    # some people rename them; so instead we look at the file content.
  +    # Grep'ing the first line is not enough: some people post-process
  +    # each Makefile.in and add a new line on top of each file to say so.
  +    # Grep'ing the whole file is not good either: AIX grep has a line
  +    # limit of 2048, but all sed's we know have understand at least 4000.
  +    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
  +      dirpart=`$as_dirname -- "$mf" ||
   $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
   	 X"$mf" : 'X\(//\)[^/]' \| \
   	 X"$mf" : 'X\(//\)$' \| \
  @@ -20238,28 +17781,28 @@
   	    q
   	  }
   	  s/.*/./; q'`
  -  else
  -    continue
  -  fi
  -  # Extract the definition of DEPDIR, am__include, and am__quote
  -  # from the Makefile without running `make'.
  -  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
  -  test -z "$DEPDIR" && continue
  -  am__include=`sed -n 's/^am__include = //p' < "$mf"`
  -  test -z "am__include" && continue
  -  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
  -  # When using ansi2knr, U may be empty or an underscore; expand it
  -  U=`sed -n 's/^U = //p' < "$mf"`
  -  # Find all dependency output files, they are included files with
  -  # $(DEPDIR) in their names.  We invoke sed twice because it is the
  -  # simplest approach to changing $(DEPDIR) to its actual value in the
  -  # expansion.
  -  for file in `sed -n "
  -    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
  -       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
  -    # Make sure the directory exists.
  -    test -f "$dirpart/$file" && continue
  -    fdir=`$as_dirname -- "$file" ||
  +    else
  +      continue
  +    fi
  +    # Extract the definition of DEPDIR, am__include, and am__quote
  +    # from the Makefile without running `make'.
  +    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
  +    test -z "$DEPDIR" && continue
  +    am__include=`sed -n 's/^am__include = //p' < "$mf"`
  +    test -z "am__include" && continue
  +    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
  +    # When using ansi2knr, U may be empty or an underscore; expand it
  +    U=`sed -n 's/^U = //p' < "$mf"`
  +    # Find all dependency output files, they are included files with
  +    # $(DEPDIR) in their names.  We invoke sed twice because it is the
  +    # simplest approach to changing $(DEPDIR) to its actual value in the
  +    # expansion.
  +    for file in `sed -n "
  +      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
  +	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
  +      # Make sure the directory exists.
  +      test -f "$dirpart/$file" && continue
  +      fdir=`$as_dirname -- "$file" ||
   $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
   	 X"$file" : 'X\(//\)[^/]' \| \
   	 X"$file" : 'X\(//\)$' \| \
  @@ -20282,51 +17825,12 @@
   	    q
   	  }
   	  s/.*/./; q'`
  -    { as_dir=$dirpart/$fdir
  -  case $as_dir in #(
  -  -*) as_dir=./$as_dir;;
  -  esac
  -  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
  -    as_dirs=
  -    while :; do
  -      case $as_dir in #(
  -      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
  -      *) as_qdir=$as_dir;;
  -      esac
  -      as_dirs="'$as_qdir' $as_dirs"
  -      as_dir=`$as_dirname -- "$as_dir" ||
  -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  -	 X"$as_dir" : 'X\(//\)[^/]' \| \
  -	 X"$as_dir" : 'X\(//\)$' \| \
  -	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
  -$as_echo X"$as_dir" |
  -    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  -	    s//\1/
  -	    q
  -	  }
  -	  /^X\(\/\/\)[^/].*/{
  -	    s//\1/
  -	    q
  -	  }
  -	  /^X\(\/\/\)$/{
  -	    s//\1/
  -	    q
  -	  }
  -	  /^X\(\/\).*/{
  -	    s//\1/
  -	    q
  -	  }
  -	  s/.*/./; q'`
  -      test -d "$as_dir" && break
  +      as_dir=$dirpart/$fdir; as_fn_mkdir_p
  +      # echo "creating $dirpart/$file"
  +      echo '# dummy' > "$dirpart/$file"
       done
  -    test -z "$as_dirs" || eval "mkdir $as_dirs"
  -  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
  -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
  -   { (exit 1); exit 1; }; }; }
  -    # echo "creating $dirpart/$file"
  -    echo '# dummy' > "$dirpart/$file"
     done
  -done
  +}
    ;;
       "libtool":C)
   
  @@ -21143,15 +18647,12 @@
   done # for ac_tag
   
   
  -{ (exit 0); exit 0; }
  +as_fn_exit 0
   _ACEOF
  -chmod +x $CONFIG_STATUS
   ac_clean_files=$ac_clean_files_save
   
   test $ac_write_fail = 0 ||
  -  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
  -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
  -   { (exit 1); exit 1; }; }
  +  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
   
   
   # configure is writing to config.log, and then calls config.status.
  @@ -21172,10 +18673,10 @@
     exec 5>>config.log
     # Use ||, not &&, to avoid exiting from the if with $? = 1, which
     # would make configure fail if this is the last instruction.
  -  $ac_cs_success || { (exit 1); exit 1; }
  +  $ac_cs_success || as_fn_exit $?
   fi
   if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
  -  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
  +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
   $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
   fi
   
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/configure.ac
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 configure.ac
  --- pcre/configure.ac	5 Dec 2009 13:53:53 -0000	1.1.1.3
  +++ pcre/configure.ac	21 Aug 2010 21:48:05 -0000	1.1.1.4
  @@ -1,15 +1,17 @@
   dnl Process this file with autoconf to produce a configure script.
   
  -dnl NOTE FOR MAINTAINERS: Do not use major or minor version numbers with
  -dnl leading zeros, because they may be treated as octal constants. The
  -dnl PCRE_PRERELEASE feature is for identifying release candidates. It might
  -dnl be defined as -RC2, for example. For real releases, it should be defined
  -dnl empty.
  +dnl NOTE FOR MAINTAINERS: Do not use minor version numbers 08 or 09 because
  +dnl the leading zeros may cause them to be treated as invalid octal constants
  +dnl if a PCRE user writes code that uses PCRE_MINOR as a number. There is now
  +dnl a check further down that throws an error if 08 or 09 are used.
  +
  +dnl The PCRE_PRERELEASE feature is for identifying release candidates. It might
  +dnl be defined as -RC2, for example. For real releases, it should be empty.
   
   m4_define(pcre_major, [8])
  -m4_define(pcre_minor, [00])
  +m4_define(pcre_minor, [10])
   m4_define(pcre_prerelease, [])
  -m4_define(pcre_date, [2009-10-19])
  +m4_define(pcre_date, [2010-06-25])
   
   # Libtool shared library interface versions (current:revision:age)
   m4_define(libpcre_version, [0:1:0])
  @@ -22,6 +24,9 @@
   AM_INIT_AUTOMAKE([dist-bzip2 dist-zip])
   AC_CONFIG_HEADERS(config.h)
   
  +# This was added at the suggestion of libtoolize (03-Jan-10)
  +AC_CONFIG_MACRO_DIR([m4])
  +
   # The default CFLAGS and CXXFLAGS in Autoconf are "-g -O2" for gcc and just
   # "-g" for any other compiler. There doesn't seem to be a standard way of
   # getting rid of the -g (which I don't think is needed for a production
  @@ -66,6 +71,9 @@
   AC_COMPILE_IFELSE(AC_LANG_PROGRAM([],[]),, CXX=""; CXXCP=""; CXXFLAGS="")
   AC_LANG_POP
   
  +# Check for a 64-bit integer type
  +AC_TYPE_INT64_T
  +
   AC_PROG_INSTALL
   AC_LIBTOOL_WIN32_DLL
   AC_PROG_LIBTOOL
  @@ -76,6 +84,15 @@
   PCRE_PRERELEASE="pcre_prerelease"
   PCRE_DATE="pcre_date"
   
  +if test "$PCRE_MINOR" = "08" -o "$PCRE_MINOR" = "09"
  +then
  +  echo "***"
  +  echo "*** Minor version number $PCRE_MINOR must not be used. ***"
  +  echo "*** Use only 01 to 07 or 10 onwards, to avoid octal issues. ***"
  +  echo "***"
  +  exit 1
  +fi
  +
   AC_SUBST(PCRE_MAJOR)
   AC_SUBST(PCRE_MINOR)
   AC_SUBST(PCRE_PRERELEASE)
  @@ -87,11 +104,13 @@
     htmldir='${docdir}/html'
   fi
   
  -# Handle --disable-cpp
  +# Handle --disable-cpp. The substitution of enable_cpp is needed for use in
  +# pcre-config.
   AC_ARG_ENABLE(cpp,
                 AS_HELP_STRING([--disable-cpp],
                                [disable C++ support]),
                 , enable_cpp=yes)
  +AC_SUBST(enable_cpp)
   
   # Handle --enable-rebuild-chartables
   AC_ARG_ENABLE(rebuild-chartables,
  @@ -323,6 +342,49 @@
   AC_CHECK_HEADERS(type_traits.h, [pcre_have_type_traits="1"],
                                   [pcre_have_type_traits="0"])
   
  +# (This isn't c++-specific, but is only used in pcrecpp.cc, so try this
  +# in a c++ context.  This matters becuase strtoimax is C99 and may not
  +# be supported by the C++ compiler.)
  +# Figure out how to create a longlong from a string: strtoll and
  +# equiv.  It's not enough to call AC_CHECK_FUNCS: hpux has a
  +# strtoll, for instance, but it only takes 2 args instead of 3!
  +# We have to call AH_TEMPLATE since AC_DEFINE_UNQUOTED below is complex.
  +AH_TEMPLATE(HAVE_STRTOQ, [Define to 1 if you have `strtoq'.])
  +AH_TEMPLATE(HAVE_STRTOLL, [Define to 1 if you have `strtoll'.])
  +AH_TEMPLATE(HAVE__STRTOI64, [Define to 1 if you have `_strtoi64'.])
  +AH_TEMPLATE(HAVE_STRTOIMAX, [Define to 1 if you have `strtoimax'.])
  +have_strto_fn=0
  +for fn in strtoq strtoll _strtoi64 strtoimax; do
  +  AC_MSG_CHECKING([for $fn])
  +  if test "$fn" = strtoimax; then
  +    include=stdint.h
  +  else
  +    include=stdlib.h
  +  fi
  +  AC_COMPILE_IFELSE(AC_LANG_PROGRAM([#include <$include>],
  +                                    [char* e; return $fn("100", &e, 10)]),
  +                    [AC_MSG_RESULT(yes)
  +                     AC_DEFINE_UNQUOTED(HAVE_`echo $fn | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`, 1,
  +                                        [Define to 1 if you have `$fn'.])
  +                     have_strto_fn=1
  +                     break],
  +                    [AC_MSG_RESULT(no)])
  +done
  +
  +if test "$have_strto_fn" = 1; then
  +  AC_CHECK_TYPES([long long],
  +                 [pcre_have_long_long="1"],
  +                 [pcre_have_long_long="0"])
  +  AC_CHECK_TYPES([unsigned long long],
  +                 [pcre_have_ulong_long="1"],
  +                 [pcre_have_ulong_long="0"])
  +else
  +  pcre_have_long_long="0"
  +  pcre_have_ulong_long="0"
  +fi
  +AC_SUBST(pcre_have_long_long)
  +AC_SUBST(pcre_have_ulong_long)
  +
   AC_LANG_POP
   fi
   # Using AC_SUBST eliminates the need to include config.h in a public .h file
  @@ -338,24 +400,6 @@
   AC_C_CONST
   AC_TYPE_SIZE_T
   
  -pcre_have_strotolonglong=0
  -AC_CHECK_FUNCS(strtoq strtoll _strtoi64, [pcre_have_strotolonglong="1"; break])
  -# If we can't convert a string to a long long, pretend we don't even
  -# have a long long.
  -if test $pcre_have_strotolonglong = "0"; then
  -   pcre_have_long_long="0"
  -   pcre_have_ulong_long="0"
  -else
  -  AC_CHECK_TYPES([long long],
  -                 [pcre_have_long_long="1"],
  -                 [pcre_have_long_long="0"])
  -  AC_CHECK_TYPES([unsigned long long],
  -                 [pcre_have_ulong_long="1"],
  -                 [pcre_have_ulong_long="0"])
  -fi
  -AC_SUBST(pcre_have_long_long)
  -AC_SUBST(pcre_have_ulong_long)
  -
   # Checks for library functions.
   
   AC_CHECK_FUNCS(bcopy memmove strerror)
  @@ -365,10 +409,39 @@
   AC_CHECK_HEADERS([zlib.h], [HAVE_ZLIB_H=1])
   AC_CHECK_LIB([z], [gzopen], [HAVE_LIBZ=1])
   
  -# Check for the availability of libbz2
  +# Check for the availability of libbz2. Originally we just used AC_CHECK_LIB,
  +# as for libz. However, this had the following problem, diagnosed and fixed by
  +# a user:
  +#
  +#   - libbz2 uses the Pascal calling convention (WINAPI) for the functions
  +#     under Win32.
  +#   - The standard autoconf AC_CHECK_LIB fails to include "bzlib.h",
  +#     therefore missing the function definition.
  +#   - The compiler thus generates a "C" signature for the test function.
  +#   - The linker fails to find the "C" function.
  +#   - PCRE fails to configure if asked to do so against libbz2.
  +#
  +# Solution:
  +#
  +#   - Replace the AC_CHECK_LIB test with a custom test.
   
   AC_CHECK_HEADERS([bzlib.h], [HAVE_BZLIB_H=1])
  -AC_CHECK_LIB([bz2], [BZ2_bzopen], [HAVE_LIBBZ2=1])
  +# Original test
  +# AC_CHECK_LIB([bz2], [BZ2_bzopen], [HAVE_LIBBZ2=1])
  +#
  +# Custom test follows
  +
  +AC_MSG_CHECKING([for libbz2])
  +OLD_LIBS="$LIBS"
  +LIBS="$LIBS -lbz2"
  +AC_LINK_IFELSE( AC_LANG_PROGRAM([[
  +#ifdef HAVE_BZLIB_H
  +#include <bzlib.h>
  +#endif]],
  +[[return (int)BZ2_bzopen("conftest", "rb");]]),
  +[AC_MSG_RESULT([yes]);HAVE_LIBBZ2=1; break;],
  +AC_MSG_RESULT([no]))
  +LIBS="$OLD_LIBS"
   
   # Check for the availabiity of libreadline
   
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/depcomp
  ============================================================================
  $ cvs diff -u -r1.1.1.1 -r1.1.1.2 depcomp
  --- pcre/depcomp	14 Jan 2009 20:18:54 -0000	1.1.1.1
  +++ pcre/depcomp	21 Aug 2010 21:48:04 -0000	1.1.1.2
  @@ -1,10 +1,10 @@
   #! /bin/sh
   # depcomp - compile a program generating dependencies as side-effects
   
  -scriptversion=2007-03-29.01
  +scriptversion=2009-04-28.21; # UTC
   
  -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
  -# Foundation, Inc.
  +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
  +# Software Foundation, Inc.
   
   # This program is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
  @@ -87,6 +87,15 @@
      depmode=dashmstdout
   fi
   
  +cygpath_u="cygpath -u -f -"
  +if test "$depmode" = msvcmsys; then
  +   # This is just like msvisualcpp but w/o cygpath translation.
  +   # Just convert the backslash-escaped backslashes to single forward
  +   # slashes to satisfy depend.m4
  +   cygpath_u="sed s,\\\\\\\\,/,g"
  +   depmode=msvisualcpp
  +fi
  +
   case "$depmode" in
   gcc3)
   ## gcc 3 implements dependency tracking that does exactly what
  @@ -192,14 +201,14 @@
   ' < "$tmpdepfile" \
       | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
       tr '
  -' ' ' >> $depfile
  -    echo >> $depfile
  +' ' ' >> "$depfile"
  +    echo >> "$depfile"
   
       # The second pass generates a dummy entry for each header file.
       tr ' ' '
   ' < "$tmpdepfile" \
      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
  -   >> $depfile
  +   >> "$depfile"
     else
       # The sourcefile does not contain any dependencies, so just
       # store a dummy comment line, to avoid errors with the Makefile
  @@ -328,7 +337,12 @@
     if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
       # Add `dependent.h:' lines.
  -    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
  +    sed -ne '2,${
  +	       s/^ *//
  +	       s/ \\*$//
  +	       s/$/:/
  +	       p
  +	     }' "$tmpdepfile" >> "$depfile"
     else
       echo "#dummy" > "$depfile"
     fi
  @@ -404,7 +418,7 @@
   
     # Remove the call to Libtool.
     if test "$libtool" = yes; then
  -    while test $1 != '--mode=compile'; do
  +    while test "X$1" != 'X--mode=compile'; do
         shift
       done
       shift
  @@ -455,32 +469,39 @@
     "$@" || exit $?
     # Remove any Libtool call
     if test "$libtool" = yes; then
  -    while test $1 != '--mode=compile'; do
  +    while test "X$1" != 'X--mode=compile'; do
         shift
       done
       shift
     fi
     # X makedepend
     shift
  -  cleared=no
  -  for arg in "$@"; do
  +  cleared=no eat=no
  +  for arg
  +  do
       case $cleared in
       no)
         set ""; shift
         cleared=yes ;;
       esac
  +    if test $eat = yes; then
  +      eat=no
  +      continue
  +    fi
       case "$arg" in
       -D*|-I*)
         set fnord "$@" "$arg"; shift ;;
       # Strip any option that makedepend may not understand.  Remove
       # the object too, otherwise makedepend will parse it as a source file.
  +    -arch)
  +      eat=yes ;;
       -*|$object)
         ;;
       *)
         set fnord "$@" "$arg"; shift ;;
       esac
     done
  -  obj_suffix="`echo $object | sed 's/^.*\././'`"
  +  obj_suffix=`echo "$object" | sed 's/^.*\././'`
     touch "$tmpdepfile"
     ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
     rm -f "$depfile"
  @@ -500,7 +521,7 @@
   
     # Remove the call to Libtool.
     if test "$libtool" = yes; then
  -    while test $1 != '--mode=compile'; do
  +    while test "X$1" != 'X--mode=compile'; do
         shift
       done
       shift
  @@ -538,13 +559,27 @@
   
   msvisualcpp)
     # Important note: in order to support this mode, a compiler *must*
  -  # always write the preprocessed file to stdout, regardless of -o,
  -  # because we must use -o when running libtool.
  +  # always write the preprocessed file to stdout.
     "$@" || exit $?
  +
  +  # Remove the call to Libtool.
  +  if test "$libtool" = yes; then
  +    while test "X$1" != 'X--mode=compile'; do
  +      shift
  +    done
  +    shift
  +  fi
  +
     IFS=" "
     for arg
     do
       case "$arg" in
  +    -o)
  +      shift
  +      ;;
  +    $object)
  +      shift
  +      ;;
       "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
   	set fnord "$@"
   	shift
  @@ -557,16 +592,23 @@
   	;;
       esac
     done
  -  "$@" -E |
  -  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
  +  "$@" -E 2>/dev/null |
  +  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
     rm -f "$depfile"
     echo "$object : \\" > "$depfile"
  -  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
  +  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
     echo "	" >> "$depfile"
  -  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
  +  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
     rm -f "$tmpdepfile"
     ;;
   
  +msvcmsys)
  +  # This case exists only to let depend.m4 do its work.  It works by
  +  # looking at the text of this script.  This case will never be run,
  +  # since it is checked for above.
  +  exit 1
  +  ;;
  +
   none)
     exec "$@"
     ;;
  @@ -585,5 +627,6 @@
   # eval: (add-hook 'write-file-hooks 'time-stamp)
   # time-stamp-start: "scriptversion="
   # time-stamp-format: "%:y-%02m-%02d.%02H"
  -# time-stamp-end: "$"
  +# time-stamp-time-zone: "UTC"
  +# time-stamp-end: "; # UTC"
   # End:
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/html/pcre.html
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 doc/html/pcre.html
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/html/pcre_compile.html
  ============================================================================
  $ cvs diff -u -r1.1.1.2 -r1.1.1.3 doc/html/pcre_compile.html
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/html/pcre_compile2.html
  ============================================================================
  $ cvs diff -u -r1.1.1.2 -r1.1.1.3 doc/html/pcre_compile2.html
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/html/pcreapi.html
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 doc/html/pcreapi.html
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/html/pcrecompat.html
  ============================================================================
  $ cvs diff -u -r1.1.1.2 -r1.1.1.3 doc/html/pcrecompat.html
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/html/pcredemo.html
  ============================================================================
  $ cvs diff -u -r1.1.1.1 -r1.1.1.2 doc/html/pcredemo.html
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/html/pcregrep.html
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 doc/html/pcregrep.html
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/html/pcrepattern.html
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 doc/html/pcrepattern.html
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/html/pcreperform.html
  ============================================================================
  $ cvs diff -u -r1.1.1.1 -r1.1.1.2 doc/html/pcreperform.html
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/html/pcreposix.html
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 doc/html/pcreposix.html
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/html/pcresample.html
  ============================================================================
  $ cvs diff -u -r1.1.1.2 -r1.1.1.3 doc/html/pcresample.html
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/html/pcrestack.html
  ============================================================================
  $ cvs diff -u -r1.1.1.1 -r1.1.1.2 doc/html/pcrestack.html
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/html/pcresyntax.html
  ============================================================================
  $ cvs diff -u -r1.1.1.2 -r1.1.1.3 doc/html/pcresyntax.html
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/html/pcretest.html
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 doc/html/pcretest.html
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/pcre.3
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 doc/pcre.3
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/pcre.txt
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 doc/pcre.txt
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/pcre_compile.3
  ============================================================================
  $ cvs diff -u -r1.1.1.2 -r1.1.1.3 doc/pcre_compile.3
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/pcre_compile2.3
  ============================================================================
  $ cvs diff -u -r1.1.1.2 -r1.1.1.3 doc/pcre_compile2.3
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/pcreapi.3
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 doc/pcreapi.3
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/pcrecompat.3
  ============================================================================
  $ cvs diff -u -r1.1.1.2 -r1.1.1.3 doc/pcrecompat.3
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/pcregrep.1
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 doc/pcregrep.1
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/pcregrep.txt
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 doc/pcregrep.txt
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/pcrepattern.3
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 doc/pcrepattern.3
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/pcreperform.3
  ============================================================================
  $ cvs diff -u -r1.1.1.1 -r1.1.1.2 doc/pcreperform.3
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/pcreposix.3
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 doc/pcreposix.3
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/pcresample.3
  ============================================================================
  $ cvs diff -u -r1.1.1.2 -r1.1.1.3 doc/pcresample.3
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/pcrestack.3
  ============================================================================
  $ cvs diff -u -r1.1.1.1 -r1.1.1.2 doc/pcrestack.3
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/pcresyntax.3
  ============================================================================
  $ cvs diff -u -r1.1.1.2 -r1.1.1.3 doc/pcresyntax.3
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/pcretest.1
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 doc/pcretest.1
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/doc/pcretest.txt
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 doc/pcretest.txt
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/install-sh
  ============================================================================
  $ cvs diff -u -r1.1.1.1 -r1.1.1.2 install-sh
  --- pcre/install-sh	14 Jan 2009 20:19:32 -0000	1.1.1.1
  +++ pcre/install-sh	21 Aug 2010 21:48:05 -0000	1.1.1.2
  @@ -1,7 +1,7 @@
   #!/bin/sh
   # install - install a program, script, or datafile
   
  -scriptversion=2006-12-25.00
  +scriptversion=2009-04-28.21; # UTC
   
   # This originates from X11R5 (mit/util/scripts/install.sh), which was
   # later released in X11R6 (xc/config/util/install.sh) with the
  @@ -515,5 +515,6 @@
   # eval: (add-hook 'write-file-hooks 'time-stamp)
   # time-stamp-start: "scriptversion="
   # time-stamp-format: "%:y-%02m-%02d.%02H"
  -# time-stamp-end: "$"
  +# time-stamp-time-zone: "UTC"
  +# time-stamp-end: "; # UTC"
   # End:
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/ltmain.sh
  ============================================================================
  $ cvs diff -u -r1.1.1.2 -r1.1.1.3 ltmain.sh
  --- pcre/ltmain.sh	5 Dec 2009 13:54:05 -0000	1.1.1.2
  +++ pcre/ltmain.sh	21 Aug 2010 21:48:04 -0000	1.1.1.3
  @@ -1,6 +1,6 @@
   # Generated from ltmain.m4sh.
   
  -# ltmain.sh (GNU libtool) 2.2.6
  +# ltmain.sh (GNU libtool) 2.2.6b
   # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
   
   # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
  @@ -65,7 +65,7 @@
   #       compiler:		$LTCC
   #       compiler flags:		$LTCFLAGS
   #       linker:		$LD (gnu? $with_gnu_ld)
  -#       $progname:		(GNU libtool) 2.2.6
  +#       $progname:		(GNU libtool) 2.2.6b
   #       automake:		$automake_version
   #       autoconf:		$autoconf_version
   #
  @@ -73,9 +73,9 @@
   
   PROGRAM=ltmain.sh
   PACKAGE=libtool
  -VERSION=2.2.6
  +VERSION=2.2.6b
   TIMESTAMP=""
  -package_revision=1.3012
  +package_revision=1.3017
   
   # Be Bourne compatible
   if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
  @@ -116,15 +116,15 @@
   
   : ${CP="cp -f"}
   : ${ECHO="echo"}
  -: ${EGREP="/usr/bin/grep -E"}
  -: ${FGREP="/usr/bin/grep -F"}
  -: ${GREP="/usr/bin/grep"}
  +: ${EGREP="/bin/grep -E"}
  +: ${FGREP="/bin/grep -F"}
  +: ${GREP="/bin/grep"}
   : ${LN_S="ln -s"}
   : ${MAKE="make"}
   : ${MKDIR="mkdir"}
   : ${MV="mv -f"}
   : ${RM="rm -f"}
  -: ${SED="/opt/local/bin/gsed"}
  +: ${SED="/bin/sed"}
   : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
   : ${Xsed="$SED -e 1s/^X//"}
   
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/missing
  ============================================================================
  $ cvs diff -u -r1.1.1.1 -r1.1.1.2 missing
  --- pcre/missing	14 Jan 2009 20:19:38 -0000	1.1.1.1
  +++ pcre/missing	21 Aug 2010 21:48:05 -0000	1.1.1.2
  @@ -1,10 +1,10 @@
   #! /bin/sh
   # Common stub for a few missing GNU programs while installing.
   
  -scriptversion=2006-05-10.23
  +scriptversion=2009-04-28.21; # UTC
   
  -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
  -#   Free Software Foundation, Inc.
  +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
  +# 2008, 2009 Free Software Foundation, Inc.
   # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
   
   # This program is free software; you can redistribute it and/or modify
  @@ -89,6 +89,9 @@
     tar          try tar, gnutar, gtar, then tar without non-portable flags
     yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
   
  +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
  +\`g' are ignored when checking the name.
  +
   Send bug reports to <bug-automake@gnu.org>."
       exit $?
       ;;
  @@ -106,15 +109,22 @@
   
   esac
   
  +# normalize program name to check for.
  +program=`echo "$1" | sed '
  +  s/^gnu-//; t
  +  s/^gnu//; t
  +  s/^g//; t'`
  +
   # Now exit if we have it, but it failed.  Also exit now if we
   # don't have it and --version was passed (most likely to detect
  -# the program).
  +# the program).  This is about non-GNU programs, so use $1 not
  +# $program.
   case $1 in
  -  lex|yacc)
  +  lex*|yacc*)
       # Not GNU programs, they don't have --version.
       ;;
   
  -  tar)
  +  tar*)
       if test -n "$run"; then
          echo 1>&2 "ERROR: \`tar' requires --run"
          exit 1
  @@ -138,7 +148,7 @@
   
   # If it does not exist, or fails to run (possibly an outdated version),
   # try to emulate it.
  -case $1 in
  +case $program in
     aclocal*)
       echo 1>&2 "\
   WARNING: \`$1' is $msg.  You should only need it if
  @@ -148,7 +158,7 @@
       touch aclocal.m4
       ;;
   
  -  autoconf)
  +  autoconf*)
       echo 1>&2 "\
   WARNING: \`$1' is $msg.  You should only need it if
            you modified \`${configure_ac}'.  You might want to install the
  @@ -157,7 +167,7 @@
       touch configure
       ;;
   
  -  autoheader)
  +  autoheader*)
       echo 1>&2 "\
   WARNING: \`$1' is $msg.  You should only need it if
            you modified \`acconfig.h' or \`${configure_ac}'.  You might want
  @@ -187,7 +197,7 @@
   	   while read f; do touch "$f"; done
       ;;
   
  -  autom4te)
  +  autom4te*)
       echo 1>&2 "\
   WARNING: \`$1' is needed, but is $msg.
            You might have modified some files without having the
  @@ -210,7 +220,7 @@
       fi
       ;;
   
  -  bison|yacc)
  +  bison*|yacc*)
       echo 1>&2 "\
   WARNING: \`$1' $msg.  You should only need it if
            you modified a \`.y' file.  You may need the \`Bison' package
  @@ -240,7 +250,7 @@
       fi
       ;;
   
  -  lex|flex)
  +  lex*|flex*)
       echo 1>&2 "\
   WARNING: \`$1' is $msg.  You should only need it if
            you modified a \`.l' file.  You may need the \`Flex' package
  @@ -263,7 +273,7 @@
       fi
       ;;
   
  -  help2man)
  +  help2man*)
       echo 1>&2 "\
   WARNING: \`$1' is $msg.  You should only need it if
   	 you modified a dependency of a manual page.  You may need the
  @@ -277,11 +287,11 @@
       else
   	test -z "$file" || exec >$file
   	echo ".ab help2man is required to generate this page"
  -	exit 1
  +	exit $?
       fi
       ;;
   
  -  makeinfo)
  +  makeinfo*)
       echo 1>&2 "\
   WARNING: \`$1' is $msg.  You should only need it if
            you modified a \`.texi' or \`.texinfo' file, or any other file
  @@ -310,7 +320,7 @@
       touch $file
       ;;
   
  -  tar)
  +  tar*)
       shift
   
       # We have already tried tar in the generic part.
  @@ -363,5 +373,6 @@
   # eval: (add-hook 'write-file-hooks 'time-stamp)
   # time-stamp-start: "scriptversion="
   # time-stamp-format: "%:y-%02m-%02d.%02H"
  -# time-stamp-end: "$"
  +# time-stamp-time-zone: "UTC"
  +# time-stamp-end: "; # UTC"
   # End:
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/pcre-config.in
  ============================================================================
  $ cvs diff -u -r1.1.1.2 -r1.1.1.3 pcre-config.in
  --- pcre/pcre-config.in	5 Dec 2009 13:54:04 -0000	1.1.1.2
  +++ pcre/pcre-config.in	21 Aug 2010 21:48:04 -0000	1.1.1.3
  @@ -4,8 +4,11 @@
   exec_prefix=@exec_prefix@
   exec_prefix_set=no
   
  -usage="\
  -Usage: pcre-config [--prefix] [--exec-prefix] [--version] [--libs] [--libs-posix] [--cflags] [--cflags-posix]"
  +if test @enable_cpp@ = yes ; then
  +  usage="Usage: pcre-config [--prefix] [--exec-prefix] [--version] [--libs] [--libs-posix] [--libs-cpp] [--cflags] [--cflags-posix]"
  +else
  +  usage="Usage: pcre-config [--prefix] [--exec-prefix] [--version] [--libs] [--libs-posix] [--cflags] [--cflags-posix]"
  +fi
   
   if test $# -eq 0; then
         echo "${usage}" 1>&2
  @@ -60,6 +63,13 @@
       --libs)
         echo -L@libdir@$libR -lpcre
         ;;
  +    --libs-cpp)
  +      if test @enable_cpp@ = yes ; then
  +        echo -L@libdir@$libR -lpcrecpp -lpcre
  +      else
  +        echo "${usage}" 1>&2
  +      fi
  +      ;;
       *)
         echo "${usage}" 1>&2
         exit 1
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/pcre.h.generic
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 pcre.h.generic
  --- pcre/pcre.h.generic	5 Dec 2009 13:53:58 -0000	1.1.1.3
  +++ pcre/pcre.h.generic	21 Aug 2010 21:48:05 -0000	1.1.1.4
  @@ -5,7 +5,7 @@
   /* This is the public header file for the PCRE library, to be #included by
   applications that call the PCRE functions.
   
  -           Copyright (c) 1997-2009 University of Cambridge
  +           Copyright (c) 1997-2010 University of Cambridge
   
   -----------------------------------------------------------------------------
   Redistribution and use in source and binary forms, with or without
  @@ -42,9 +42,9 @@
   /* The current PCRE version information. */
   
   #define PCRE_MAJOR          8
  -#define PCRE_MINOR          00
  +#define PCRE_MINOR          10
   #define PCRE_PRERELEASE     
  -#define PCRE_DATE           2009-10-19
  +#define PCRE_DATE           2010-06-25
   
   /* When an application links to a PCRE DLL in Windows, the symbols that are
   imported have to be identified as such. When building PCRE, the appropriate
  @@ -131,6 +131,7 @@
   #define PCRE_NO_START_OPTIMISE  0x04000000
   #define PCRE_PARTIAL_HARD       0x08000000
   #define PCRE_NOTEMPTY_ATSTART   0x10000000
  +#define PCRE_UCP                0x20000000
   
   /* Exec-time and get/set-time error codes */
   
  @@ -200,6 +201,7 @@
   #define PCRE_EXTRA_CALLOUT_DATA           0x0004
   #define PCRE_EXTRA_TABLES                 0x0008
   #define PCRE_EXTRA_MATCH_LIMIT_RECURSION  0x0010
  +#define PCRE_EXTRA_MARK                   0x0020
   
   /* Types */
   
  @@ -225,6 +227,7 @@
     void *callout_data;             /* Data passed back in callouts */
     const unsigned char *tables;    /* Pointer to character tables */
     unsigned long int match_limit_recursion; /* Max recursive calls to match() */
  +  unsigned char **mark;           /* For passing back a mark pointer */
   } pcre_extra;
   
   /* The structure for passing out data via the pcre_callout_function. We use a
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/pcre.h.in
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 pcre.h.in
  --- pcre/pcre.h.in	5 Dec 2009 13:54:03 -0000	1.1.1.3
  +++ pcre/pcre.h.in	21 Aug 2010 21:48:05 -0000	1.1.1.4
  @@ -5,7 +5,7 @@
   /* This is the public header file for the PCRE library, to be #included by
   applications that call the PCRE functions.
   
  -           Copyright (c) 1997-2009 University of Cambridge
  +           Copyright (c) 1997-2010 University of Cambridge
   
   -----------------------------------------------------------------------------
   Redistribution and use in source and binary forms, with or without
  @@ -131,6 +131,7 @@
   #define PCRE_NO_START_OPTIMISE  0x04000000
   #define PCRE_PARTIAL_HARD       0x08000000
   #define PCRE_NOTEMPTY_ATSTART   0x10000000
  +#define PCRE_UCP                0x20000000
   
   /* Exec-time and get/set-time error codes */
   
  @@ -200,6 +201,7 @@
   #define PCRE_EXTRA_CALLOUT_DATA           0x0004
   #define PCRE_EXTRA_TABLES                 0x0008
   #define PCRE_EXTRA_MATCH_LIMIT_RECURSION  0x0010
  +#define PCRE_EXTRA_MARK                   0x0020
   
   /* Types */
   
  @@ -225,6 +227,7 @@
     void *callout_data;             /* Data passed back in callouts */
     const unsigned char *tables;    /* Pointer to character tables */
     unsigned long int match_limit_recursion; /* Max recursive calls to match() */
  +  unsigned char **mark;           /* For passing back a mark pointer */
   } pcre_extra;
   
   /* The structure for passing out data via the pcre_callout_function. We use a
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/pcre_chartables.c.dist
  ============================================================================
  $ cvs diff -u -r1.1.1.1 -r1.1.1.2 pcre_chartables.c.dist
  --- pcre/pcre_chartables.c.dist	14 Jan 2009 20:19:52 -0000	1.1.1.1
  +++ pcre/pcre_chartables.c.dist	21 Aug 2010 21:48:05 -0000	1.1.1.2
  @@ -14,7 +14,7 @@
   current locale. If PCRE is configured with --enable-rebuild-chartables, this
   happens automatically.
   
  -The following #includes are present because without the gcc 4.x may remove the
  +The following #includes are present because without them gcc 4.x may remove the
   array definition from the final binary if PCRE is built into a static library
   and dead code stripping is activated. This leads to link errors. Pulling in the
   header ensures that the array gets flagged as "someone outside this compilation
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/pcre_compile.c
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 pcre_compile.c
  --- pcre/pcre_compile.c	5 Dec 2009 13:54:04 -0000	1.1.1.3
  +++ pcre/pcre_compile.c	21 Aug 2010 21:48:05 -0000	1.1.1.4
  @@ -6,7 +6,7 @@
   and semantics are as close as possible to those of the Perl 5 language.
   
                          Written by Philip Hazel
  -           Copyright (c) 1997-2009 University of Cambridge
  +           Copyright (c) 1997-2010 University of Cambridge
   
   -----------------------------------------------------------------------------
   Redistribution and use in source and binary forms, with or without
  @@ -53,10 +53,11 @@
   #include "pcre_internal.h"
   
   
  -/* When DEBUG is defined, we need the pcre_printint() function, which is also
  -used by pcretest. DEBUG is not defined when building a production library. */
  +/* When PCRE_DEBUG is defined, we need the pcre_printint() function, which is
  +also used by pcretest. PCRE_DEBUG is not defined when building a production
  +library. */
   
  -#ifdef DEBUG
  +#ifdef PCRE_DEBUG
   #include "pcre_printint.src"
   #endif
   
  @@ -91,6 +92,11 @@
   
   #define COMPILE_WORK_SIZE (4096)
   
  +/* The overrun tests check for a slightly smaller size so that they detect the
  +overrun before it actually does run off the end of the data block. */
  +
  +#define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100)
  +
   
   /* Table for handling escaped characters in the range '0'-'z'. Positive returns
   are simple data values; negative values are for special things like \d and so
  @@ -118,7 +124,7 @@
        -ESC_H,                  0,
        0,                       -ESC_K,
        0,                       0,
  -     0,                       0,
  +     -ESC_N,                  0,
        -ESC_P,                  -ESC_Q,
        -ESC_R,                  -ESC_S,
        0,                       0,
  @@ -165,7 +171,7 @@
   /*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',
   /*  C0 */   '{',-ESC_A, -ESC_B,  -ESC_C, -ESC_D,-ESC_E,      0, -ESC_G,
   /*  C8 */-ESC_H,     0,      0,       0,      0,     0,      0,      0,
  -/*  D0 */   '}',     0, -ESC_K,       0,      0,     0,      0, -ESC_P,
  +/*  D0 */   '}',     0, -ESC_K,       0,      0,-ESC_N,      0, -ESC_P,
   /*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,
   /*  E0 */  '\\',     0, -ESC_S,       0,      0,-ESC_V, -ESC_W, -ESC_X,
   /*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,
  @@ -182,11 +188,14 @@
   platforms. */
   
   typedef struct verbitem {
  -  int   len;
  -  int   op;
  +  int   len;                 /* Length of verb name */
  +  int   op;                  /* Op when no arg, or -1 if arg mandatory */
  +  int   op_arg;              /* Op when arg present, or -1 if not allowed */
   } verbitem;
   
   static const char verbnames[] =
  +  "\0"                       /* Empty name is a shorthand for MARK */
  +  STRING_MARK0
     STRING_ACCEPT0
     STRING_COMMIT0
     STRING_F0
  @@ -196,13 +205,15 @@
     STRING_THEN;
   
   static const verbitem verbs[] = {
  -  { 6, OP_ACCEPT },
  -  { 6, OP_COMMIT },
  -  { 1, OP_FAIL },
  -  { 4, OP_FAIL },
  -  { 5, OP_PRUNE },
  -  { 4, OP_SKIP  },
  -  { 4, OP_THEN  }
  +  { 0, -1,        OP_MARK },
  +  { 4, -1,        OP_MARK },
  +  { 6, OP_ACCEPT, -1 },
  +  { 6, OP_COMMIT, -1 },
  +  { 1, OP_FAIL,   -1 },
  +  { 4, OP_FAIL,   -1 },
  +  { 5, OP_PRUNE,  OP_PRUNE_ARG },
  +  { 4, OP_SKIP,   OP_SKIP_ARG  },
  +  { 4, OP_THEN,   OP_THEN_ARG  }
   };
   
   static const int verbcount = sizeof(verbs)/sizeof(verbitem);
  @@ -250,6 +261,53 @@
     cbit_xdigit,-1,          0              /* xdigit */
   };
   
  +/* Table of substitutes for \d etc when PCRE_UCP is set. The POSIX class
  +substitutes must be in the order of the names, defined above, and there are
  +both positive and negative cases. NULL means no substitute. */
  +
  +#ifdef SUPPORT_UCP
  +static const uschar *substitutes[] = {
  +  (uschar *)"\\P{Nd}",    /* \D */
  +  (uschar *)"\\p{Nd}",    /* \d */
  +  (uschar *)"\\P{Xsp}",   /* \S */       /* NOTE: Xsp is Perl space */
  +  (uschar *)"\\p{Xsp}",   /* \s */
  +  (uschar *)"\\P{Xwd}",   /* \W */
  +  (uschar *)"\\p{Xwd}"    /* \w */
  +};
  +
  +static const uschar *posix_substitutes[] = {
  +  (uschar *)"\\p{L}",     /* alpha */
  +  (uschar *)"\\p{Ll}",    /* lower */
  +  (uschar *)"\\p{Lu}",    /* upper */
  +  (uschar *)"\\p{Xan}",   /* alnum */
  +  NULL,                   /* ascii */
  +  (uschar *)"\\h",        /* blank */
  +  NULL,                   /* cntrl */
  +  (uschar *)"\\p{Nd}",    /* digit */
  +  NULL,                   /* graph */
  +  NULL,                   /* print */
  +  NULL,                   /* punct */
  +  (uschar *)"\\p{Xps}",   /* space */    /* NOTE: Xps is POSIX space */
  +  (uschar *)"\\p{Xwd}",   /* word */
  +  NULL,                   /* xdigit */
  +  /* Negated cases */
  +  (uschar *)"\\P{L}",     /* ^alpha */
  +  (uschar *)"\\P{Ll}",    /* ^lower */
  +  (uschar *)"\\P{Lu}",    /* ^upper */
  +  (uschar *)"\\P{Xan}",   /* ^alnum */
  +  NULL,                   /* ^ascii */
  +  (uschar *)"\\H",        /* ^blank */
  +  NULL,                   /* ^cntrl */
  +  (uschar *)"\\P{Nd}",    /* ^digit */
  +  NULL,                   /* ^graph */
  +  NULL,                   /* ^print */
  +  NULL,                   /* ^punct */
  +  (uschar *)"\\P{Xps}",   /* ^space */   /* NOTE: Xps is POSIX space */
  +  (uschar *)"\\P{Xwd}",   /* ^word */
  +  NULL                    /* ^xdigit */
  +};
  +#define POSIX_SUBSIZE (sizeof(posix_substitutes)/sizeof(uschar *))
  +#endif
   
   #define STRING(a)  # a
   #define XSTRING(s) STRING(s)
  @@ -262,7 +320,11 @@
   it is now one long string. We cannot use a table of offsets, because the
   lengths of inserts such as XSTRING(MAX_NAME_SIZE) are not known. Instead, we
   simply count through to the one we want - this isn't a performance issue
  -because these strings are used only when there is a compilation error. */
  +because these strings are used only when there is a compilation error.
  +
  +Each substring ends with \0 to insert a null character. This includes the final
  +substring, so that the whole string ends with \0\0, which can be detected when
  +counting through. */
   
   static const char error_texts[] =
     "no error\0"
  @@ -309,7 +371,7 @@
     /* 35 */
     "invalid condition (?(0)\0"
     "\\C not allowed in lookbehind assertion\0"
  -  "PCRE does not support \\L, \\l, \\N, \\U, or \\u\0"
  +  "PCRE does not support \\L, \\l, \\N{name}, \\U, or \\u\0"
     "number after (?C is > 255\0"
     "closing ) for (?C expected\0"
     /* 40 */
  @@ -335,7 +397,7 @@
     "inconsistent NEWLINE options\0"
     "\\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number\0"
     "a numbered reference must not be zero\0"
  -  "(*VERB) with an argument is not supported\0"
  +  "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)\0"
     /* 60 */
     "(*VERB) not recognized\0"
     "number is too big\0"
  @@ -343,8 +405,10 @@
     "digit expected after (?+\0"
     "] is an invalid data character in JavaScript compatibility mode\0"
     /* 65 */
  -  "different names for subpatterns of the same number are not allowed";
  -
  +  "different names for subpatterns of the same number are not allowed\0"
  +  "(*MARK) must have an argument\0"
  +  "this version of PCRE is not compiled with PCRE_UCP support\0"
  +  ;
   
   /* Table to identify digits and hex digits. This is used when compiling
   patterns. Note that the tables in chartables are dependent on the locale, and
  @@ -502,7 +566,11 @@
   find_error_text(int n)
   {
   const char *s = error_texts;
  -for (; n > 0; n--) while (*s++ != 0) {};
  +for (; n > 0; n--)
  +  {
  +  while (*s++ != 0) {};
  +  if (*s == 0) return "Error text not found (please report)";
  +  }
   return s;
   }
   
  @@ -573,7 +641,6 @@
   
       case CHAR_l:
       case CHAR_L:
  -    case CHAR_N:
       case CHAR_u:
       case CHAR_U:
       *errorcodeptr = ERR37;
  @@ -811,6 +878,19 @@
       }
     }
   
  +/* Perl supports \N{name} for character names, as well as plain \N for "not
  +newline". PCRE does not support \N{name}. */
  +
  +if (c == -ESC_N && ptr[1] == CHAR_LEFT_CURLY_BRACKET)
  +  *errorcodeptr = ERR37;
  +
  +/* If PCRE_UCP is set, we change the values for \d etc. */
  +
  +if ((options & PCRE_UCP) != 0 && c <= -ESC_D && c >= -ESC_w)
  +  c -= (ESC_DU - ESC_D);
  +
  +/* Set the pointer to the final character before returning. */
  +
   *ptrptr = ptr;
   return c;
   }
  @@ -1049,25 +1129,39 @@
   
   if (ptr[0] == CHAR_LEFT_PARENTHESIS)
     {
  -  if (ptr[1] == CHAR_QUESTION_MARK &&
  -      ptr[2] == CHAR_VERTICAL_LINE)
  +  /* Handle specials such as (*SKIP) or (*UTF8) etc. */
  +
  +  if (ptr[1] == CHAR_ASTERISK) ptr += 2;
  +
  +  /* Handle a normal, unnamed capturing parenthesis. */
  +
  +  else if (ptr[1] != CHAR_QUESTION_MARK)
  +    {
  +    *count += 1;
  +    if (name == NULL && *count == lorn) return *count;
  +    ptr++;
  +    }
  +
  +  /* All cases now have (? at the start. Remember when we are in a group
  +  where the parenthesis numbers are duplicated. */
  +
  +  else if (ptr[2] == CHAR_VERTICAL_LINE)
       {
       ptr += 3;
       dup_parens = TRUE;
       }
   
  -  /* Handle a normal, unnamed capturing parenthesis */
  +  /* Handle comments; all characters are allowed until a ket is reached. */
   
  -  else if (ptr[1] != CHAR_QUESTION_MARK && ptr[1] != CHAR_ASTERISK)
  +  else if (ptr[2] == CHAR_NUMBER_SIGN)
       {
  -    *count += 1;
  -    if (name == NULL && *count == lorn) return *count;
  -    ptr++;
  +    for (ptr += 3; *ptr != 0; ptr++) if (*ptr == CHAR_RIGHT_PARENTHESIS) break;
  +    goto FAIL_EXIT;
       }
   
     /* Handle a condition. If it is an assertion, just carry on so that it
     is processed as normal. If not, skip to the closing parenthesis of the
  -  condition (there can't be any nested parens. */
  +  condition (there can't be any nested parens). */
   
     else if (ptr[2] == CHAR_LEFT_PARENTHESIS)
       {
  @@ -1079,7 +1173,7 @@
         }
       }
   
  -  /* We have either (? or (* and not a condition */
  +  /* Start with (? but not a condition. */
   
     else
       {
  @@ -1201,8 +1295,7 @@
     else if (*ptr == CHAR_RIGHT_PARENTHESIS)
       {
       if (dup_parens && *count < hwm_count) *count = hwm_count;
  -    *ptrptr = ptr;
  -    return -1;
  +    goto FAIL_EXIT;
       }
   
     else if (*ptr == CHAR_VERTICAL_LINE && dup_parens)
  @@ -1442,6 +1535,7 @@
       case OP_CALLOUT:
       case OP_SOD:
       case OP_SOM:
  +    case OP_SET_SOM:
       case OP_EOD:
       case OP_EODN:
       case OP_CIRC:
  @@ -1601,7 +1695,8 @@
   
     /* Otherwise, we can get the item's length from the table, except that for
     repeated character types, we have to test for \p and \P, which have an extra
  -  two bytes of parameters. */
  +  two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
  +  must add in its length. */
   
     else
       {
  @@ -1625,6 +1720,13 @@
         case OP_TYPEPOSUPTO:
         if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
         break;
  +
  +      case OP_MARK:
  +      case OP_PRUNE_ARG:
  +      case OP_SKIP_ARG:
  +      case OP_THEN_ARG:
  +      code += code[1];
  +      break;
         }
   
       /* Add in the fixed length from the table */
  @@ -1696,7 +1798,8 @@
   
     /* Otherwise, we can get the item's length from the table, except that for
     repeated character types, we have to test for \p and \P, which have an extra
  -  two bytes of parameters. */
  +  two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
  +  must add in its length. */
   
     else
       {
  @@ -1720,6 +1823,13 @@
         case OP_TYPEEXACT:
         if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
         break;
  +
  +      case OP_MARK:
  +      case OP_PRUNE_ARG:
  +      case OP_SKIP_ARG:
  +      case OP_THEN_ARG:
  +      code += code[1];
  +      break;
         }
   
       /* Add in the fixed length from the table */
  @@ -1776,12 +1886,14 @@
     code        points to start of search
     endcode     points to where to stop
     utf8        TRUE if in UTF8 mode
  +  cd          contains pointers to tables etc.
   
   Returns:      TRUE if what is matched could be empty
   */
   
   static BOOL
  -could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8)
  +could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8,
  +  compile_data *cd)
   {
   register int c;
   for (code = first_significant_code(code + _pcre_OP_lengths[*code], NULL, 0, TRUE);
  @@ -1812,6 +1924,28 @@
       continue;
       }
   
  +  /* For a recursion/subroutine call, if its end has been reached, which
  +  implies a subroutine call, we can scan it. */
  +
  +  if (c == OP_RECURSE)
  +    {
  +    BOOL empty_branch = FALSE;
  +    const uschar *scode = cd->start_code + GET(code, 1);
  +    if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */
  +    do
  +      {
  +      if (could_be_empty_branch(scode, endcode, utf8, cd))
  +        {
  +        empty_branch = TRUE;
  +        break;
  +        }
  +      scode += GET(scode, 1);
  +      }
  +    while (*scode == OP_ALT);
  +    if (!empty_branch) return FALSE;  /* All branches are non-empty */
  +    continue;
  +    }
  +
     /* For other groups, scan the branches. */
   
     if (c == OP_BRA || c == OP_CBRA || c == OP_ONCE || c == OP_COND)
  @@ -1830,7 +1964,7 @@
         empty_branch = FALSE;
         do
           {
  -        if (!empty_branch && could_be_empty_branch(code, endcode, utf8))
  +        if (!empty_branch && could_be_empty_branch(code, endcode, utf8, cd))
             empty_branch = TRUE;
           code += GET(code, 1);
           }
  @@ -1964,6 +2098,21 @@
       if (utf8 && code[3] >= 0xc0) code += _pcre_utf8_table4[code[3] & 0x3f];
       break;
   #endif
  +
  +    /* MARK, and PRUNE/SKIP/THEN with an argument must skip over the argument
  +    string. */
  +
  +    case OP_MARK:
  +    case OP_PRUNE_ARG:
  +    case OP_SKIP_ARG:
  +    case OP_THEN_ARG:
  +    code += code[1];
  +    break;
  +
  +    /* None of the remaining opcodes are required to match a character. */
  +
  +    default:
  +    break;
       }
     }
   
  @@ -1986,17 +2135,19 @@
     endcode     points to where to stop (current RECURSE item)
     bcptr       points to the chain of current (unclosed) branch starts
     utf8        TRUE if in UTF-8 mode
  +  cd          pointers to tables etc
   
   Returns:      TRUE if what is matched could be empty
   */
   
   static BOOL
   could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,
  -  BOOL utf8)
  +  BOOL utf8, compile_data *cd)
   {
  -while (bcptr != NULL && bcptr->current >= code)
  +while (bcptr != NULL && bcptr->current_branch >= code)
     {
  -  if (!could_be_empty_branch(bcptr->current, endcode, utf8)) return FALSE;
  +  if (!could_be_empty_branch(bcptr->current_branch, endcode, utf8, cd))
  +    return FALSE;
     bcptr = bcptr->outer;
     }
   return TRUE;
  @@ -2178,8 +2329,8 @@
   {
   *code++ = OP_CALLOUT;
   *code++ = 255;
  -PUT(code, 0, ptr - cd->start_pattern);  /* Pattern offset */
  -PUT(code, LINK_SIZE, 0);                /* Default length */
  +PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */
  +PUT(code, LINK_SIZE, 0);                       /* Default length */
   return code + 2*LINK_SIZE;
   }
   
  @@ -2204,7 +2355,7 @@
   static void
   complete_callout(uschar *previous_callout, const uschar *ptr, compile_data *cd)
   {
  -int length = ptr - cd->start_pattern - GET(previous_callout, 2);
  +int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));
   PUT(previous_callout, 2 + LINK_SIZE, length);
   }
   
  @@ -2254,6 +2405,69 @@
   
   return TRUE;
   }
  +
  +
  +
  +/*************************************************
  +*        Check a character and a property        *
  +*************************************************/
  +
  +/* This function is called by check_auto_possessive() when a property item
  +is adjacent to a fixed character.
  +
  +Arguments:
  +  c            the character
  +  ptype        the property type
  +  pdata        the data for the type
  +  negated      TRUE if it's a negated property (\P or \p{^)
  +
  +Returns:       TRUE if auto-possessifying is OK
  +*/
  +
  +static BOOL
  +check_char_prop(int c, int ptype, int pdata, BOOL negated)
  +{
  +const ucd_record *prop = GET_UCD(c);
  +switch(ptype)
  +  {
  +  case PT_LAMP:
  +  return (prop->chartype == ucp_Lu ||
  +          prop->chartype == ucp_Ll ||
  +          prop->chartype == ucp_Lt) == negated;
  +
  +  case PT_GC:
  +  return (pdata == _pcre_ucp_gentype[prop->chartype]) == negated;
  +
  +  case PT_PC:
  +  return (pdata == prop->chartype) == negated;
  +
  +  case PT_SC:
  +  return (pdata == prop->script) == negated;
  +
  +  /* These are specials */
  +
  +  case PT_ALNUM:
  +  return (_pcre_ucp_gentype[prop->chartype] == ucp_L ||
  +          _pcre_ucp_gentype[prop->chartype] == ucp_N) == negated;
  +
  +  case PT_SPACE:    /* Perl space */
  +  return (_pcre_ucp_gentype[prop->chartype] == ucp_Z ||
  +          c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
  +          == negated;
  +
  +  case PT_PXSPACE:  /* POSIX space */
  +  return (_pcre_ucp_gentype[prop->chartype] == ucp_Z ||
  +          c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
  +          c == CHAR_FF || c == CHAR_CR)
  +          == negated;
  +
  +  case PT_WORD:
  +  return (_pcre_ucp_gentype[prop->chartype] == ucp_L ||
  +          _pcre_ucp_gentype[prop->chartype] == ucp_N ||
  +          c == CHAR_UNDERSCORE) == negated;
  +  }
  +return FALSE;
  +}
   #endif  /* SUPPORT_UCP */
   
   
  @@ -2267,10 +2481,8 @@
   sense to automatically possessify the repeated item.
   
   Arguments:
  -  op_code       the repeated op code
  -  this          data for this item, depends on the opcode
  +  previous      pointer to the repeated opcode
     utf8          TRUE in UTF-8 mode
  -  utf8_char     used for utf8 character bytes, NULL if not relevant
     ptr           next character in pattern
     options       options bits
     cd            contains pointers to tables etc.
  @@ -2279,10 +2491,11 @@
   */
   
   static BOOL
  -check_auto_possessive(int op_code, int item, BOOL utf8, uschar *utf8_char,
  -  const uschar *ptr, int options, compile_data *cd)
  +check_auto_possessive(const uschar *previous, BOOL utf8, const uschar *ptr,
  +  int options, compile_data *cd)
   {
  -int next;
  +int c, next;
  +int op_code = *previous++;
   
   /* Skip whitespace and comments in extended mode */
   
  @@ -2343,23 +2556,18 @@
     strncmp((char *)ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
       return FALSE;
   
  -/* Now compare the next item with the previous opcode. If the previous is a
  -positive single character match, "item" either contains the character or, if
  -"item" is greater than 127 in utf8 mode, the character's bytes are in
  -utf8_char. */
  -
  -
  -/* Handle cases when the next item is a character. */
  +/* Now compare the next item with the previous opcode. First, handle cases when
  +the next item is a character. */
   
   if (next >= 0) switch(op_code)
     {
     case OP_CHAR:
   #ifdef SUPPORT_UTF8
  -  if (utf8 && item > 127) { GETCHAR(item, utf8_char); }
  +  GETCHARTEST(c, previous);
   #else
  -  (void)(utf8_char);  /* Keep compiler happy by referencing function argument */
  +  c = *previous;
   #endif
  -  return item != next;
  +  return c != next;
   
     /* For CHARNC (caseless character) we must check the other case. If we have
     Unicode property support, we can use it to test the other case of
  @@ -2367,9 +2575,11 @@
   
     case OP_CHARNC:
   #ifdef SUPPORT_UTF8
  -  if (utf8 && item > 127) { GETCHAR(item, utf8_char); }
  +  GETCHARTEST(c, previous);
  +#else
  +  c = *previous;
   #endif
  -  if (item == next) return FALSE;
  +  if (c == next) return FALSE;
   #ifdef SUPPORT_UTF8
     if (utf8)
       {
  @@ -2380,16 +2590,16 @@
   #else
       othercase = NOTACHAR;
   #endif
  -    return (unsigned int)item != othercase;
  +    return (unsigned int)c != othercase;
       }
     else
   #endif  /* SUPPORT_UTF8 */
  -  return (item != cd->fcc[next]);  /* Non-UTF-8 mode */
  +  return (c != cd->fcc[next]);  /* Non-UTF-8 mode */
   
  -  /* For OP_NOT, "item" must be a single-byte character. */
  +  /* For OP_NOT, its data is always a single-byte character. */
   
     case OP_NOT:
  -  if (item == next) return TRUE;
  +  if ((c = *previous) == next) return TRUE;
     if ((options & PCRE_CASELESS) == 0) return FALSE;
   #ifdef SUPPORT_UTF8
     if (utf8)
  @@ -2401,11 +2611,14 @@
   #else
       othercase = NOTACHAR;
   #endif
  -    return (unsigned int)item == othercase;
  +    return (unsigned int)c == othercase;
       }
     else
   #endif  /* SUPPORT_UTF8 */
  -  return (item == cd->fcc[next]);  /* Non-UTF-8 mode */
  +  return (c == cd->fcc[next]);  /* Non-UTF-8 mode */
  +
  +  /* Note that OP_DIGIT etc. are generated only when PCRE_UCP is *not* set.
  +  When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
   
     case OP_DIGIT:
     return next > 127 || (cd->ctypes[next] & ctype_digit) == 0;
  @@ -2448,11 +2661,12 @@
       case 0x202f:
       case 0x205f:
       case 0x3000:
  -    return op_code != OP_HSPACE;
  +    return op_code == OP_NOT_HSPACE;
       default:
  -    return op_code == OP_HSPACE;
  +    return op_code != OP_NOT_HSPACE;
       }
   
  +  case OP_ANYNL:
     case OP_VSPACE:
     case OP_NOT_VSPACE:
     switch(next)
  @@ -2464,48 +2678,62 @@
       case 0x85:
       case 0x2028:
       case 0x2029:
  -    return op_code != OP_VSPACE;
  +    return op_code == OP_NOT_VSPACE;
       default:
  -    return op_code == OP_VSPACE;
  +    return op_code != OP_NOT_VSPACE;
       }
   
  +#ifdef SUPPORT_UCP
  +  case OP_PROP:
  +  return check_char_prop(next, previous[0], previous[1], FALSE);
  +
  +  case OP_NOTPROP:
  +  return check_char_prop(next, previous[0], previous[1], TRUE);
  +#endif
  +
     default:
     return FALSE;
     }
   
   
  -/* Handle the case when the next item is \d, \s, etc. */
  +/* Handle the case when the next item is \d, \s, etc. Note that when PCRE_UCP
  +is set, \d turns into ESC_du rather than ESC_d, etc., so ESC_d etc. are
  +generated only when PCRE_UCP is *not* set, that is, when only ASCII
  +characteristics are recognized. Similarly, the opcodes OP_DIGIT etc. are
  +replaced by OP_PROP codes when PCRE_UCP is set. */
   
   switch(op_code)
     {
     case OP_CHAR:
     case OP_CHARNC:
   #ifdef SUPPORT_UTF8
  -  if (utf8 && item > 127) { GETCHAR(item, utf8_char); }
  +  GETCHARTEST(c, previous);
  +#else
  +  c = *previous;
   #endif
     switch(-next)
       {
       case ESC_d:
  -    return item > 127 || (cd->ctypes[item] & ctype_digit) == 0;
  +    return c > 127 || (cd->ctypes[c] & ctype_digit) == 0;
   
       case ESC_D:
  -    return item <= 127 && (cd->ctypes[item] & ctype_digit) != 0;
  +    return c <= 127 && (cd->ctypes[c] & ctype_digit) != 0;
   
       case ESC_s:
  -    return item > 127 || (cd->ctypes[item] & ctype_space) == 0;
  +    return c > 127 || (cd->ctypes[c] & ctype_space) == 0;
   
       case ESC_S:
  -    return item <= 127 && (cd->ctypes[item] & ctype_space) != 0;
  +    return c <= 127 && (cd->ctypes[c] & ctype_space) != 0;
   
       case ESC_w:
  -    return item > 127 || (cd->ctypes[item] & ctype_word) == 0;
  +    return c > 127 || (cd->ctypes[c] & ctype_word) == 0;
   
       case ESC_W:
  -    return item <= 127 && (cd->ctypes[item] & ctype_word) != 0;
  +    return c <= 127 && (cd->ctypes[c] & ctype_word) != 0;
   
       case ESC_h:
       case ESC_H:
  -    switch(item)
  +    switch(c)
         {
         case 0x09:
         case 0x20:
  @@ -2533,7 +2761,7 @@
   
       case ESC_v:
       case ESC_V:
  -    switch(item)
  +    switch(c)
         {
         case 0x0a:
         case 0x0b:
  @@ -2547,38 +2775,92 @@
         return -next == ESC_v;
         }
   
  +    /* When PCRE_UCP is set, these values get generated for \d etc. Find
  +    their substitutions and process them. The result will always be either
  +    -ESC_p or -ESC_P. Then fall through to process those values. */
  +
  +#ifdef SUPPORT_UCP
  +    case ESC_du:
  +    case ESC_DU:
  +    case ESC_wu:
  +    case ESC_WU:
  +    case ESC_su:
  +    case ESC_SU:
  +      {
  +      int temperrorcode = 0;
  +      ptr = substitutes[-next - ESC_DU];
  +      next = check_escape(&ptr, &temperrorcode, 0, options, FALSE);
  +      if (temperrorcode != 0) return FALSE;
  +      ptr++;    /* For compatibility */
  +      }
  +    /* Fall through */
  +
  +    case ESC_p:
  +    case ESC_P:
  +      {
  +      int ptype, pdata, errorcodeptr;
  +      BOOL negated;
  +
  +      ptr--;      /* Make ptr point at the p or P */
  +      ptype = get_ucp(&ptr, &negated, &pdata, &errorcodeptr);
  +      if (ptype < 0) return FALSE;
  +      ptr++;      /* Point past the final curly ket */
  +
  +      /* If the property item is optional, we have to give up. (When generated
  +      from \d etc by PCRE_UCP, this test will have been applied much earlier,
  +      to the original \d etc. At this point, ptr will point to a zero byte. */
  +
  +      if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
  +        strncmp((char *)ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
  +          return FALSE;
  +
  +      /* Do the property check. */
  +
  +      return check_char_prop(c, ptype, pdata, (next == -ESC_P) != negated);
  +      }
  +#endif
  +
       default:
       return FALSE;
       }
   
  +  /* In principle, support for Unicode properties should be integrated here as
  +  well. It means re-organizing the above code so as to get hold of the property
  +  values before switching on the op-code. However, I wonder how many patterns
  +  combine ASCII \d etc with Unicode properties? (Note that if PCRE_UCP is set,
  +  these op-codes are never generated.) */
  +
     case OP_DIGIT:
     return next == -ESC_D || next == -ESC_s || next == -ESC_W ||
  -         next == -ESC_h || next == -ESC_v;
  +         next == -ESC_h || next == -ESC_v || next == -ESC_R;
   
     case OP_NOT_DIGIT:
     return next == -ESC_d;
   
     case OP_WHITESPACE:
  -  return next == -ESC_S || next == -ESC_d || next == -ESC_w;
  +  return next == -ESC_S || next == -ESC_d || next == -ESC_w || next == -ESC_R;
   
     case OP_NOT_WHITESPACE:
     return next == -ESC_s || next == -ESC_h || next == -ESC_v;
   
     case OP_HSPACE:
  -  return next == -ESC_S || next == -ESC_H || next == -ESC_d || next == -ESC_w;
  +  return next == -ESC_S || next == -ESC_H || next == -ESC_d ||
  +         next == -ESC_w || next == -ESC_v || next == -ESC_R;
   
     case OP_NOT_HSPACE:
     return next == -ESC_h;
   
     /* Can't have \S in here because VT matches \S (Perl anomaly) */
  +  case OP_ANYNL:
     case OP_VSPACE:
     return next == -ESC_V || next == -ESC_d || next == -ESC_w;
   
     case OP_NOT_VSPACE:
  -  return next == -ESC_v;
  +  return next == -ESC_v || next == -ESC_R;
   
     case OP_WORDCHAR:
  -  return next == -ESC_W || next == -ESC_s || next == -ESC_h || next == -ESC_v;
  +  return next == -ESC_W || next == -ESC_s || next == -ESC_h ||
  +         next == -ESC_v || next == -ESC_R;
   
     case OP_NOT_WORDCHAR:
     return next == -ESC_w || next == -ESC_d;
  @@ -2642,6 +2924,7 @@
   BOOL groupsetfirstbyte = FALSE;
   const uschar *ptr = *ptrptr;
   const uschar *tempptr;
  +const uschar *nestptr = NULL;
   uschar *previous = NULL;
   uschar *previous_callout = NULL;
   uschar *save_hwm = NULL;
  @@ -2658,7 +2941,7 @@
   uschar *utf8_char = NULL;
   #endif
   
  -#ifdef DEBUG
  +#ifdef PCRE_DEBUG
   if (lengthptr != NULL) DPRINTF((">> start branch\n"));
   #endif
   
  @@ -2712,15 +2995,25 @@
   
     c = *ptr;
   
  +  /* If we are at the end of a nested substitution, revert to the outer level
  +  string. Nesting only happens one level deep. */
  +
  +  if (c == 0 && nestptr != NULL)
  +    {
  +    ptr = nestptr;
  +    nestptr = NULL;
  +    c = *ptr;
  +    }
  +
     /* If we are in the pre-compile phase, accumulate the length used for the
     previous cycle of this loop. */
   
     if (lengthptr != NULL)
       {
  -#ifdef DEBUG
  +#ifdef PCRE_DEBUG
       if (code > cd->hwm) cd->hwm = code;                 /* High water info */
   #endif
  -    if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */
  +    if (code > cd->start_workspace + WORK_SIZE_CHECK)   /* Check for overrun */
         {
         *errorcodeptr = ERR52;
         goto FAILED;
  @@ -2742,7 +3035,7 @@
         goto FAILED;
         }
   
  -    *lengthptr += code - last_code;
  +    *lengthptr += (int)(code - last_code);
       DPRINTF(("length=%d added %d c=%c\n", *lengthptr, code - last_code, c));
   
       /* If "previous" is set and it is not at the start of the work space, move
  @@ -2769,7 +3062,7 @@
     /* In the real compile phase, just check the workspace used by the forward
     reference list. */
   
  -  else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE)
  +  else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK)
       {
       *errorcodeptr = ERR52;
       goto FAILED;
  @@ -2860,7 +3153,7 @@
           *errorcodeptr = ERR20;
           goto FAILED;
           }
  -      *lengthptr += code - last_code;   /* To include callout length */
  +      *lengthptr += (int)(code - last_code);   /* To include callout length */
         DPRINTF((">> end branch\n"));
         }
       return TRUE;
  @@ -3065,7 +3358,7 @@
             ptr++;
             }
   
  -        posix_class = check_posix_name(ptr, tempptr - ptr);
  +        posix_class = check_posix_name(ptr, (int)(tempptr - ptr));
           if (posix_class < 0)
             {
             *errorcodeptr = ERR30;
  @@ -3079,10 +3372,25 @@
           if ((options & PCRE_CASELESS) != 0 && posix_class <= 2)
             posix_class = 0;
   
  -        /* We build the bit map for the POSIX class in a chunk of local store
  -        because we may be adding and subtracting from it, and we don't want to
  -        subtract bits that may be in the main map already. At the end we or the
  -        result into the bit map that is being built. */
  +        /* When PCRE_UCP is set, some of the POSIX classes are converted to
  +        different escape sequences that use Unicode properties. */
  +
  +#ifdef SUPPORT_UCP
  +        if ((options & PCRE_UCP) != 0)
  +          {
  +          int pc = posix_class + ((local_negate)? POSIX_SUBSIZE/2 : 0);
  +          if (posix_substitutes[pc] != NULL)
  +            {
  +            nestptr = tempptr + 1;
  +            ptr = posix_substitutes[pc] - 1;
  +            continue;
  +            }
  +          }
  +#endif
  +        /* In the non-UCP case, we build the bit map for the POSIX class in a
  +        chunk of local store because we may be adding and subtracting from it,
  +        and we don't want to subtract bits that may be in the main map already.
  +        At the end we or the result into the bit map that is being built. */
   
           posix_class *= 3;
   
  @@ -3126,19 +3434,18 @@
   
         /* Backslash may introduce a single character, or it may introduce one
         of the specials, which just set a flag. The sequence \b is a special
  -      case. Inside a class (and only there) it is treated as backspace.
  -      Elsewhere it marks a word boundary. Other escapes have preset maps ready
  -      to 'or' into the one we are building. We assume they have more than one
  -      character in them, so set class_charcount bigger than one. */
  +      case. Inside a class (and only there) it is treated as backspace. We
  +      assume that other escapes have more than one character in them, so set
  +      class_charcount bigger than one. Unrecognized escapes fall through and
  +      are either treated as literal characters (by default), or are faulted if
  +      PCRE_EXTRA is set. */
   
         if (c == CHAR_BACKSLASH)
           {
           c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
           if (*errorcodeptr != 0) goto FAILED;
   
  -        if (-c == ESC_b) c = CHAR_BS;       /* \b is backspace in a class */
  -        else if (-c == ESC_X) c = CHAR_X;   /* \X is literal X in a class */
  -        else if (-c == ESC_R) c = CHAR_R;   /* \R is literal R in a class */
  +        if (-c == ESC_b) c = CHAR_BS;    /* \b is backspace in a class */
           else if (-c == ESC_Q)            /* Handle start of quoted string */
             {
             if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
  @@ -3155,10 +3462,20 @@
             register const uschar *cbits = cd->cbits;
             class_charcount += 2;     /* Greater than 1 is what matters */
   
  -          /* Save time by not doing this in the pre-compile phase. */
  -
  -          if (lengthptr == NULL) switch (-c)
  +          switch (-c)
               {
  +#ifdef SUPPORT_UCP
  +            case ESC_du:     /* These are the values given for \d etc */
  +            case ESC_DU:     /* when PCRE_UCP is set. We replace the */
  +            case ESC_wu:     /* escape sequence with an appropriate \p */
  +            case ESC_WU:     /* or \P to test Unicode properties instead */
  +            case ESC_su:     /* of the default ASCII testing. */
  +            case ESC_SU:
  +            nestptr = ptr;
  +            ptr = substitutes[-c - ESC_DU] - 1;  /* Just before substitute */
  +            class_charcount -= 2;                /* Undo! */
  +            continue;
  +#endif
               case ESC_d:
               for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_digit];
               continue;
  @@ -3188,20 +3505,7 @@
               classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */
               continue;
   
  -            default:    /* Not recognized; fall through */
  -            break;      /* Need "default" setting to stop compiler warning. */
  -            }
  -
  -          /* In the pre-compile phase, just do the recognition. */
  -
  -          else if (c == -ESC_d || c == -ESC_D || c == -ESC_w ||
  -                   c == -ESC_W || c == -ESC_s || c == -ESC_S) continue;
  -
  -          /* We need to deal with \H, \h, \V, and \v in both phases because
  -          they use extra memory. */
  -
  -          if (-c == ESC_h)
  -            {
  +            case ESC_h:
               SETBIT(classbits, 0x09); /* VT */
               SETBIT(classbits, 0x20); /* SPACE */
               SETBIT(classbits, 0xa0); /* NSBP */
  @@ -3225,10 +3529,8 @@
                 }
   #endif
               continue;
  -            }
   
  -          if (-c == ESC_H)
  -            {
  +            case ESC_H:
               for (c = 0; c < 32; c++)
                 {
                 int x = 0xff;
  @@ -3270,10 +3572,8 @@
                 }
   #endif
               continue;
  -            }
   
  -          if (-c == ESC_v)
  -            {
  +            case ESC_v:
               SETBIT(classbits, 0x0a); /* LF */
               SETBIT(classbits, 0x0b); /* VT */
               SETBIT(classbits, 0x0c); /* FF */
  @@ -3289,10 +3589,8 @@
                 }
   #endif
               continue;
  -            }
   
  -          if (-c == ESC_V)
  -            {
  +            case ESC_V:
               for (c = 0; c < 32; c++)
                 {
                 int x = 0xff;
  @@ -3322,38 +3620,38 @@
                 }
   #endif
               continue;
  -            }
  -
  -          /* We need to deal with \P and \p in both phases. */
   
   #ifdef SUPPORT_UCP
  -          if (-c == ESC_p || -c == ESC_P)
  -            {
  -            BOOL negated;
  -            int pdata;
  -            int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);
  -            if (ptype < 0) goto FAILED;
  -            class_utf8 = TRUE;
  -            *class_utf8data++ = ((-c == ESC_p) != negated)?
  -              XCL_PROP : XCL_NOTPROP;
  -            *class_utf8data++ = ptype;
  -            *class_utf8data++ = pdata;
  -            class_charcount -= 2;   /* Not a < 256 character */
  -            continue;
  -            }
  +            case ESC_p:
  +            case ESC_P:
  +              {
  +              BOOL negated;
  +              int pdata;
  +              int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);
  +              if (ptype < 0) goto FAILED;
  +              class_utf8 = TRUE;
  +              *class_utf8data++ = ((-c == ESC_p) != negated)?
  +                XCL_PROP : XCL_NOTPROP;
  +              *class_utf8data++ = ptype;
  +              *class_utf8data++ = pdata;
  +              class_charcount -= 2;   /* Not a < 256 character */
  +              continue;
  +              }
   #endif
  -          /* Unrecognized escapes are faulted if PCRE is running in its
  -          strict mode. By default, for compatibility with Perl, they are
  -          treated as literals. */
  +            /* Unrecognized escapes are faulted if PCRE is running in its
  +            strict mode. By default, for compatibility with Perl, they are
  +            treated as literals. */
   
  -          if ((options & PCRE_EXTRA) != 0)
  -            {
  -            *errorcodeptr = ERR7;
  -            goto FAILED;
  +            default:
  +            if ((options & PCRE_EXTRA) != 0)
  +              {
  +              *errorcodeptr = ERR7;
  +              goto FAILED;
  +              }
  +            class_charcount -= 2;  /* Undo the default count from above */
  +            c = *ptr;              /* Get the final character and fall through */
  +            break;
               }
  -
  -          class_charcount -= 2;  /* Undo the default count from above */
  -          c = *ptr;              /* Get the final character and fall through */
             }
   
           /* Fall through if we have a single character (c >= 0). This may be
  @@ -3423,14 +3721,11 @@
             d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
             if (*errorcodeptr != 0) goto FAILED;
   
  -          /* \b is backspace; \X is literal X; \R is literal R; any other
  -          special means the '-' was literal */
  +          /* \b is backspace; any other special means the '-' was literal */
   
             if (d < 0)
               {
  -            if (d == -ESC_b) d = CHAR_BS;
  -            else if (d == -ESC_X) d = CHAR_X;
  -            else if (d == -ESC_R) d = CHAR_R; else
  +            if (d == -ESC_b) d = CHAR_BS; else
                 {
                 ptr = oldptr;
                 goto LONE_SINGLE_CHARACTER;  /* A few lines below */
  @@ -3596,35 +3891,23 @@
           }
         }
   
  -    /* Loop until ']' reached. This "while" is the end of the "do" above. */
  +    /* Loop until ']' reached. This "while" is the end of the "do" far above.
  +    If we are at the end of an internal nested string, revert to the outer
  +    string. */
  +
  +    while (((c = *(++ptr)) != 0 ||
  +           (nestptr != NULL &&
  +             (ptr = nestptr, nestptr = NULL, c = *(++ptr)) != 0)) &&
  +           (c != CHAR_RIGHT_SQUARE_BRACKET || inescq));
   
  -    while ((c = *(++ptr)) != 0 && (c != CHAR_RIGHT_SQUARE_BRACKET || inescq));
  +    /* Check for missing terminating ']' */
   
  -    if (c == 0)                          /* Missing terminating ']' */
  +    if (c == 0)
         {
         *errorcodeptr = ERR6;
         goto FAILED;
         }
   
  -
  -/* This code has been disabled because it would mean that \s counts as
  -an explicit \r or \n reference, and that's not really what is wanted. Now
  -we set the flag only if there is a literal "\r" or "\n" in the class. */
  -
  -#if 0
  -    /* Remember whether \r or \n are in this class */
  -
  -    if (negate_class)
  -      {
  -      if ((classbits[1] & 0x24) != 0x24) cd->external_flags |= PCRE_HASCRORLF;
  -      }
  -    else
  -      {
  -      if ((classbits[1] & 0x24) != 0) cd->external_flags |= PCRE_HASCRORLF;
  -      }
  -#endif
  -
  -
       /* If class_charcount is 1, we saw precisely one character whose value is
       less than 256. As long as there were no characters >= 128 and there was no
       use of \p or \P, in other words, no use of any XCLASS features, we can
  @@ -3688,13 +3971,14 @@
   
       /* If there are characters with values > 255, we have to compile an
       extended class, with its own opcode, unless there was a negated special
  -    such as \S in the class, because in that case all characters > 255 are in
  -    the class, so any that were explicitly given as well can be ignored. If
  -    (when there are explicit characters > 255 that must be listed) there are no
  -    characters < 256, we can omit the bitmap in the actual compiled code. */
  +    such as \S in the class, and PCRE_UCP is not set, because in that case all
  +    characters > 255 are in the class, so any that were explicitly given as
  +    well can be ignored. If (when there are explicit characters > 255 that must
  +    be listed) there are no characters < 256, we can omit the bitmap in the
  +    actual compiled code. */
   
   #ifdef SUPPORT_UTF8
  -    if (class_utf8 && !should_flip_negation)
  +    if (class_utf8 && (!should_flip_negation || (options & PCRE_UCP) != 0))
         {
         *class_utf8data++ = XCL_END;    /* Marks the end of extra data */
         *code++ = OP_XCLASS;
  @@ -3720,10 +4004,11 @@
         }
   #endif
   
  -    /* If there are no characters > 255, set the opcode to OP_CLASS or
  -    OP_NCLASS, depending on whether the whole class was negated and whether
  -    there were negative specials such as \S in the class. Then copy the 32-byte
  -    map into the code vector, negating it if necessary. */
  +    /* If there are no characters > 255, or they are all to be included or
  +    excluded, set the opcode to OP_CLASS or OP_NCLASS, depending on whether the
  +    whole class was negated and whether there were negative specials such as \S
  +    (non-UCP) in the class. Then copy the 32-byte map into the code vector,
  +    negating it if necessary. */
   
       *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
       if (negate_class)
  @@ -3847,8 +4132,7 @@
   
         if (!possessive_quantifier &&
             repeat_max < 0 &&
  -          check_auto_possessive(*previous, c, utf8, utf8_char, ptr + 1,
  -            options, cd))
  +          check_auto_possessive(previous, utf8, ptr + 1, options, cd))
           {
           repeat_type = 0;    /* Force greedy */
           possessive_quantifier = TRUE;
  @@ -3869,7 +4153,7 @@
         c = previous[1];
         if (!possessive_quantifier &&
             repeat_max < 0 &&
  -          check_auto_possessive(OP_NOT, c, utf8, NULL, ptr + 1, options, cd))
  +          check_auto_possessive(previous, utf8, ptr + 1, options, cd))
           {
           repeat_type = 0;    /* Force greedy */
           possessive_quantifier = TRUE;
  @@ -3893,7 +4177,7 @@
   
         if (!possessive_quantifier &&
             repeat_max < 0 &&
  -          check_auto_possessive(c, 0, utf8, NULL, ptr + 1, options, cd))
  +          check_auto_possessive(previous, utf8, ptr + 1, options, cd))
           {
           repeat_type = 0;    /* Force greedy */
           possessive_quantifier = TRUE;
  @@ -4103,7 +4387,7 @@
         {
         register int i;
         int ketoffset = 0;
  -      int len = code - previous;
  +      int len = (int)(code - previous);
         uschar *bralink = NULL;
   
         /* Repeating a DEFINE group is pointless */
  @@ -4124,7 +4408,7 @@
           {
           register uschar *ket = previous;
           do ket += GET(ket, 1); while (*ket != OP_KET);
  -        ketoffset = code - ket;
  +        ketoffset = (int)(code - ket);
           }
   
         /* The case of a zero minimum is special because of the need to stick
  @@ -4192,7 +4476,7 @@
             /* We chain together the bracket offset fields that have to be
             filled in later when the ends of the brackets are reached. */
   
  -          offset = (bralink == NULL)? 0 : previous - bralink;
  +          offset = (bralink == NULL)? 0 : (int)(previous - bralink);
             bralink = previous;
             PUTINC(previous, 0, offset);
             }
  @@ -4213,13 +4497,15 @@
             {
             /* In the pre-compile phase, we don't actually do the replication. We
             just adjust the length as if we had. Do some paranoid checks for
  -          potential integer overflow. */
  +          potential integer overflow. The INT64_OR_DOUBLE type is a 64-bit
  +          integer type when available, otherwise double. */
   
             if (lengthptr != NULL)
               {
               int delta = (repeat_min - 1)*length_prevgroup;
  -            if ((double)(repeat_min - 1)*(double)length_prevgroup >
  -                                                            (double)INT_MAX ||
  +            if ((INT64_OR_DOUBLE)(repeat_min - 1)*
  +                  (INT64_OR_DOUBLE)length_prevgroup >
  +                    (INT64_OR_DOUBLE)INT_MAX ||
                   OFLOW_MAX - *lengthptr < delta)
                 {
                 *errorcodeptr = ERR20;
  @@ -4265,15 +4551,16 @@
           just adjust the length as if we had. For each repetition we must add 1
           to the length for BRAZERO and for all but the last repetition we must
           add 2 + 2*LINKSIZE to allow for the nesting that occurs. Do some
  -        paranoid checks to avoid integer overflow. */
  +        paranoid checks to avoid integer overflow. The INT64_OR_DOUBLE type is
  +        a 64-bit integer type when available, otherwise double. */
   
           if (lengthptr != NULL && repeat_max > 0)
             {
             int delta = repeat_max * (length_prevgroup + 1 + 2 + 2*LINK_SIZE) -
                         2 - 2*LINK_SIZE;   /* Last one doesn't nest */
  -          if ((double)repeat_max *
  -                (double)(length_prevgroup + 1 + 2 + 2*LINK_SIZE)
  -                  > (double)INT_MAX ||
  +          if ((INT64_OR_DOUBLE)repeat_max *
  +                (INT64_OR_DOUBLE)(length_prevgroup + 1 + 2 + 2*LINK_SIZE)
  +                  > (INT64_OR_DOUBLE)INT_MAX ||
                 OFLOW_MAX - *lengthptr < delta)
               {
               *errorcodeptr = ERR20;
  @@ -4298,7 +4585,7 @@
               {
               int offset;
               *code++ = OP_BRA;
  -            offset = (bralink == NULL)? 0 : code - bralink;
  +            offset = (bralink == NULL)? 0 : (int)(code - bralink);
               bralink = code;
               PUTINC(code, 0, offset);
               }
  @@ -4319,7 +4606,7 @@
           while (bralink != NULL)
             {
             int oldlinkoffset;
  -          int offset = code - bralink + 1;
  +          int offset = (int)(code - bralink + 1);
             uschar *bra = code - offset;
             oldlinkoffset = GET(bra, 1);
             bralink = (oldlinkoffset == 0)? NULL : bralink - oldlinkoffset;
  @@ -4350,7 +4637,7 @@
             uschar *scode = bracode;
             do
               {
  -            if (could_be_empty_branch(scode, ketcode, utf8))
  +            if (could_be_empty_branch(scode, ketcode, utf8, cd))
                 {
                 *bracode += OP_SBRA - OP_BRA;
                 break;
  @@ -4407,7 +4694,7 @@
   #endif
           }
   
  -      len = code - tempcode;
  +      len = (int)(code - tempcode);
         if (len > 0) switch (*tempcode)
           {
           case OP_STAR:  *tempcode = OP_POSSTAR; break;
  @@ -4425,7 +4712,12 @@
           case OP_NOTQUERY: *tempcode = OP_NOTPOSQUERY; break;
           case OP_NOTUPTO:  *tempcode = OP_NOTPOSUPTO; break;
   
  +        /* Because we are moving code along, we must ensure that any
  +        pending recursive references are updated. */
  +
           default:
  +        *code = OP_END;
  +        adjust_recurse(tempcode, 1 + LINK_SIZE, utf8, cd, save_hwm);
           memmove(tempcode + 1+LINK_SIZE, tempcode, len);
           code += 1 + LINK_SIZE;
           len += 1 + LINK_SIZE;
  @@ -4461,24 +4753,34 @@
   
       /* First deal with various "verbs" that can be introduced by '*'. */
   
  -    if (*(++ptr) == CHAR_ASTERISK && (cd->ctypes[ptr[1]] & ctype_letter) != 0)
  +    if (*(++ptr) == CHAR_ASTERISK &&
  +         ((cd->ctypes[ptr[1]] & ctype_letter) != 0 || ptr[1] == ':'))
         {
         int i, namelen;
  +      int arglen = 0;
         const char *vn = verbnames;
  -      const uschar *name = ++ptr;
  +      const uschar *name = ptr + 1;
  +      const uschar *arg = NULL;
         previous = NULL;
         while ((cd->ctypes[*++ptr] & ctype_letter) != 0) {};
  +      namelen = (int)(ptr - name);
  +
         if (*ptr == CHAR_COLON)
           {
  -        *errorcodeptr = ERR59;   /* Not supported */
  -        goto FAILED;
  +        arg = ++ptr;
  +        while ((cd->ctypes[*ptr] & (ctype_letter|ctype_digit)) != 0
  +          || *ptr == '_') ptr++;
  +        arglen = (int)(ptr - arg);
           }
  +
         if (*ptr != CHAR_RIGHT_PARENTHESIS)
           {
           *errorcodeptr = ERR60;
           goto FAILED;
           }
  -      namelen = ptr - name;
  +
  +      /* Scan the table of verb names */
  +
         for (i = 0; i < verbcount; i++)
           {
           if (namelen == verbs[i].len &&
  @@ -4496,13 +4798,41 @@
                 PUT2INC(code, 0, oc->number);
                 }
               }
  -          *code++ = verbs[i].op;
  -          break;
  +
  +          /* Handle the cases with/without an argument */
  +
  +          if (arglen == 0)
  +            {
  +            if (verbs[i].op < 0)   /* Argument is mandatory */
  +              {
  +              *errorcodeptr = ERR66;
  +              goto FAILED;
  +              }
  +            *code++ = verbs[i].op;
  +            }
  +
  +          else
  +            {
  +            if (verbs[i].op_arg < 0)   /* Argument is forbidden */
  +              {
  +              *errorcodeptr = ERR59;
  +              goto FAILED;
  +              }
  +            *code++ = verbs[i].op_arg;
  +            *code++ = arglen;
  +            memcpy(code, arg, arglen);
  +            code += arglen;
  +            *code++ = 0;
  +            }
  +
  +          break;  /* Found verb, exit loop */
             }
  +
           vn += verbs[i].len + 1;
           }
  -      if (i < verbcount) continue;
  -      *errorcodeptr = ERR60;
  +
  +      if (i < verbcount) continue;    /* Successfully handled a verb */
  +      *errorcodeptr = ERR60;          /* Verb not recognized */
         goto FAILED;
         }
   
  @@ -4621,7 +4951,7 @@
                 recno * 10 + *ptr - CHAR_0 : -1;
             ptr++;
             }
  -        namelen = ptr - name;
  +        namelen = (int)(ptr - name);
   
           if ((terminator > 0 && *ptr++ != terminator) ||
               *ptr++ != CHAR_RIGHT_PARENTHESIS)
  @@ -4817,8 +5147,8 @@
               goto FAILED;
               }
             *code++ = n;
  -          PUT(code, 0, ptr - cd->start_pattern + 1);  /* Pattern offset */
  -          PUT(code, LINK_SIZE, 0);                    /* Default length */
  +          PUT(code, 0, (int)(ptr - cd->start_pattern + 1)); /* Pattern offset */
  +          PUT(code, LINK_SIZE, 0);                          /* Default length */
             code += 2 * LINK_SIZE;
             }
           previous = NULL;
  @@ -4851,7 +5181,7 @@
             name = ++ptr;
   
             while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
  -          namelen = ptr - name;
  +          namelen = (int)(ptr - name);
   
             /* In the pre-compile phase, just do a syntax check. */
   
  @@ -4981,7 +5311,7 @@
           NAMED_REF_OR_RECURSE:
           name = ++ptr;
           while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
  -        namelen = ptr - name;
  +        namelen = (int)(ptr - name);
   
           /* In the pre-compile phase, do a syntax check and set a dummy
           reference number. */
  @@ -5144,8 +5474,13 @@
                   *errorcodeptr = ERR15;
                   goto FAILED;
                   }
  +
  +              /* Fudge the value of "called" so that when it is inserted as an
  +              offset below, what it actually inserted is the reference number
  +              of the group. */
  +
                 called = cd->start_code + recno;
  -              PUTINC(cd->hwm, 0, code + 2 + LINK_SIZE - cd->start_code);
  +              PUTINC(cd->hwm, 0, (int)(code + 2 + LINK_SIZE - cd->start_code));
                 }
   
               /* If not a forward reference, and the subpattern is still open,
  @@ -5153,7 +5488,7 @@
               recursion that could loop for ever, and diagnose that case. */
   
               else if (GET(called, 1) == 0 &&
  -                     could_be_empty(called, code, bcptr, utf8))
  +                     could_be_empty(called, code, bcptr, utf8, cd))
                 {
                 *errorcodeptr = ERR40;
                 goto FAILED;
  @@ -5169,7 +5504,7 @@
             code += 1 + LINK_SIZE;
   
             *code = OP_RECURSE;
  -          PUT(code, 1, called - cd->start_code);
  +          PUT(code, 1, (int)(called - cd->start_code));
             code += 1 + LINK_SIZE;
   
             *code = OP_KET;
  @@ -5248,7 +5583,7 @@
               {
               cd->external_options = newoptions;
               }
  -         else
  +          else
               {
               if ((options & PCRE_IMS) != (newoptions & PCRE_IMS))
                 {
  @@ -5280,8 +5615,8 @@
           }     /* End of switch for character following (? */
         }       /* End of (? handling */
   
  -    /* Opening parenthesis not followed by '?'. If PCRE_NO_AUTO_CAPTURE is set,
  -    all unadorned brackets become non-capturing and behave like (?:...)
  +    /* Opening parenthesis not followed by '*' or '?'. If PCRE_NO_AUTO_CAPTURE
  +    is set, all unadorned brackets become non-capturing and behave like (?:...)
       brackets. */
   
       else if ((options & PCRE_NO_AUTO_CAPTURE) != 0)
  @@ -5473,11 +5808,12 @@
   
       /* ===================================================================*/
       /* Handle metasequences introduced by \. For ones like \d, the ESC_ values
  -    are arranged to be the negation of the corresponding OP_values. For the
  -    back references, the values are ESC_REF plus the reference number. Only
  -    back references and those types that consume a character may be repeated.
  -    We can test for values between ESC_b and ESC_Z for the latter; this may
  -    have to change if any new ones are ever created. */
  +    are arranged to be the negation of the corresponding OP_values in the
  +    default case when PCRE_UCP is not set. For the back references, the values
  +    are ESC_REF plus the reference number. Only back references and those types
  +    that consume a character may be repeated. We can test for values between
  +    ESC_b and ESC_Z for the latter; this may have to change if any new ones are
  +    ever created. */
   
       case CHAR_BACKSLASH:
       tempptr = ptr;
  @@ -5585,6 +5921,7 @@
   
         if (-c >= ESC_REF)
           {
  +        open_capitem *oc;
           recno = -c - ESC_REF;
   
           HANDLE_REFERENCE:    /* Come here from named backref handling */
  @@ -5594,6 +5931,19 @@
           PUT2INC(code, 0, recno);
           cd->backref_map |= (recno < 32)? (1 << recno) : 1;
           if (recno > cd->top_backref) cd->top_backref = recno;
  +
  +        /* Check to see if this back reference is recursive, that it, it
  +        is inside the group that it references. A flag is set so that the
  +        group can be made atomic. */
  +
  +        for (oc = cd->open_caps; oc != NULL; oc = oc->next)
  +          {
  +          if (oc->number == recno)
  +            {
  +            oc->flag = TRUE;
  +            break;
  +            }
  +          }
           }
   
         /* So are Unicode property matches, if supported. */
  @@ -5623,12 +5973,24 @@
   #endif
   
         /* For the rest (including \X when Unicode properties are supported), we
  -      can obtain the OP value by negating the escape value. */
  +      can obtain the OP value by negating the escape value in the default
  +      situation when PCRE_UCP is not set. When it *is* set, we substitute
  +      Unicode property tests. */
   
         else
           {
  -        previous = (-c > ESC_b && -c < ESC_Z)? code : NULL;
  -        *code++ = -c;
  +#ifdef SUPPORT_UCP
  +        if (-c >= ESC_DU && -c <= ESC_wu)
  +          {
  +          nestptr = ptr + 1;                   /* Where to resume */
  +          ptr = substitutes[-c - ESC_DU] - 1;  /* Just before substitute */
  +          }
  +        else
  +#endif
  +          {
  +          previous = (-c > ESC_b && -c < ESC_Z)? code : NULL;
  +          *code++ = -c;
  +          }
           }
         continue;
         }
  @@ -5783,10 +6145,11 @@
   int length;
   int orig_bracount;
   int max_bracount;
  +int old_external_options = cd->external_options;
   branch_chain bc;
   
   bc.outer = bcptr;
  -bc.current = code;
  +bc.current_branch = code;
   
   firstbyte = reqbyte = REQ_UNSET;
   
  @@ -5805,13 +6168,15 @@
   pre-compile phase to find out whether anything has yet been compiled or not. */
   
   /* If this is a capturing subpattern, add to the chain of open capturing items
  -so that we can detect them if (*ACCEPT) is encountered. */
  +so that we can detect them if (*ACCEPT) is encountered. This is also used to
  +detect groups that contain recursive back references to themselves. */
   
   if (*code == OP_CBRA)
     {
     capnumber = GET2(code, 1 + LINK_SIZE);
     capitem.number = capnumber;
     capitem.next = cd->open_caps;
  +  capitem.flag = FALSE;
     cd->open_caps = &capitem;
     }
   
  @@ -5859,6 +6224,15 @@
       return FALSE;
       }
   
  +  /* If the external options have changed during this branch, it means that we
  +  are at the top level, and a leading option setting has been encountered. We
  +  need to re-set the original option values to take account of this so that,
  +  during the pre-compile phase, we know to allow for a re-set at the start of
  +  subsequent branches. */
  +
  +  if (old_external_options != cd->external_options)
  +    oldims = cd->external_options & PCRE_IMS;
  +
     /* Keep the highest bracket count in case (?| was used and some branch
     has fewer than the rest. */
   
  @@ -5948,7 +6322,7 @@
       {
       if (lengthptr == NULL)
         {
  -      int branch_length = code - last_branch;
  +      int branch_length = (int)(code - last_branch);
         do
           {
           int prev_length = GET(last_branch, 1);
  @@ -5959,17 +6333,34 @@
         while (branch_length > 0);
         }
   
  -    /* If it was a capturing subpattern, remove it from the chain. */
  -
  -    if (capnumber > 0) cd->open_caps = cd->open_caps->next;
  -
       /* Fill in the ket */
   
       *code = OP_KET;
  -    PUT(code, 1, code - start_bracket);
  +    PUT(code, 1, (int)(code - start_bracket));
       code += 1 + LINK_SIZE;
   
  -    /* Resetting option if needed */
  +    /* If it was a capturing subpattern, check to see if it contained any
  +    recursive back references. If so, we must wrap it in atomic brackets.
  +    In any event, remove the block from the chain. */
  +
  +    if (capnumber > 0)
  +      {
  +      if (cd->open_caps->flag)
  +        {
  +        memmove(start_bracket + 1 + LINK_SIZE, start_bracket,
  +          code - start_bracket);
  +        *start_bracket = OP_ONCE;
  +        code += 1 + LINK_SIZE;
  +        PUT(start_bracket, 1, (int)(code - start_bracket));
  +        *code = OP_KET;
  +        PUT(code, 1, (int)(code - start_bracket));
  +        code += 1 + LINK_SIZE;
  +        length += 2 + 2*LINK_SIZE;
  +        }
  +      cd->open_caps = cd->open_caps->next;
  +      }
  +
  +    /* Reset options if needed. */
   
       if ((options & PCRE_IMS) != oldims && *ptr == CHAR_RIGHT_PARENTHESIS)
         {
  @@ -6017,8 +6408,8 @@
     else
       {
       *code = OP_ALT;
  -    PUT(code, 1, code - last_branch);
  -    bc.current = last_branch = code;
  +    PUT(code, 1, (int)(code - last_branch));
  +    bc.current_branch = last_branch = code;
       code += 1 + LINK_SIZE;
       }
   
  @@ -6336,7 +6727,7 @@
   int firstbyte, reqbyte, newline;
   int errorcode = 0;
   int skipatstart = 0;
  -BOOL utf8 = (options & PCRE_UTF8) != 0;
  +BOOL utf8;
   size_t size;
   uschar *code;
   const uschar *codestart;
  @@ -6406,6 +6797,8 @@
   
     if (strncmp((char *)(ptr+skipatstart+2), STRING_UTF8_RIGHTPAR, 5) == 0)
       { skipatstart += 7; options |= PCRE_UTF8; continue; }
  +  else if (strncmp((char *)(ptr+skipatstart+2), STRING_UCP_RIGHTPAR, 4) == 0)
  +    { skipatstart += 6; options |= PCRE_UCP; continue; }
   
     if (strncmp((char *)(ptr+skipatstart+2), STRING_CR_RIGHTPAR, 3) == 0)
       { skipatstart += 5; newnl = PCRE_NEWLINE_CR; }
  @@ -6430,11 +6823,13 @@
     else break;
     }
   
  +utf8 = (options & PCRE_UTF8) != 0;
  +
   /* Can't support UTF8 unless PCRE has been compiled to include the code. */
   
   #ifdef SUPPORT_UTF8
   if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0 &&
  -     (*erroroffset = _pcre_valid_utf8((uschar *)pattern, -1)) >= 0)
  +     (*erroroffset = _pcre_valid_utf8((USPTR)pattern, -1)) >= 0)
     {
     errorcode = ERR44;
     goto PCRE_EARLY_ERROR_RETURN2;
  @@ -6447,6 +6842,16 @@
     }
   #endif
   
  +/* Can't support UCP unless PCRE has been compiled to include the code. */
  +
  +#ifndef SUPPORT_UCP
  +if ((options & PCRE_UCP) != 0)
  +  {
  +  errorcode = ERR67;
  +  goto PCRE_EARLY_ERROR_RETURN;
  +  }
  +#endif
  +
   /* Check validity of \R options. */
   
   switch (options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))
  @@ -6575,7 +6980,7 @@
   pointers. */
   
   re->magic_number = MAGIC_NUMBER;
  -re->size = size;
  +re->size = (int)size;
   re->options = cd->external_options;
   re->flags = cd->external_flags;
   re->dummy1 = 0;
  @@ -6631,7 +7036,7 @@
   
   *code++ = OP_END;
   
  -#ifndef DEBUG
  +#ifndef PCRE_DEBUG
   if (code - codestart > length) errorcode = ERR23;
   #endif
   
  @@ -6646,7 +7051,7 @@
     recno = GET(codestart, offset);
     groupptr = _pcre_find_bracket(codestart, utf8, recno);
     if (groupptr == NULL) errorcode = ERR53;
  -    else PUT(((uschar *)codestart), offset, groupptr - codestart);
  +    else PUT(((uschar *)codestart), offset, (int)(groupptr - codestart));
     }
   
   /* Give an error if there's back reference to a non-existent capturing
  @@ -6701,7 +7106,7 @@
     {
     (pcre_free)(re);
     PCRE_EARLY_ERROR_RETURN:
  -  *erroroffset = ptr - (const uschar *)pattern;
  +  *erroroffset = (int)(ptr - (const uschar *)pattern);
     PCRE_EARLY_ERROR_RETURN2:
     *errorptr = find_error_text(errorcode);
     if (errorcodeptr != NULL) *errorcodeptr = errorcode;
  @@ -6755,8 +7160,7 @@
   /* Print out the compiled data if debugging is enabled. This is never the
   case when building a production library. */
   
  -#ifdef DEBUG
  -
  +#ifdef PCRE_DEBUG
   printf("Length = %d top_bracket = %d top_backref = %d\n",
     length, re->top_bracket, re->top_backref);
   
  @@ -6793,7 +7197,7 @@
     if (errorcodeptr != NULL) *errorcodeptr = ERR23;
     return NULL;
     }
  -#endif   /* DEBUG */
  +#endif   /* PCRE_DEBUG */
   
   return (pcre *)re;
   }
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/pcre_dfa_exec.c
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 pcre_dfa_exec.c
  --- pcre/pcre_dfa_exec.c	5 Dec 2009 13:53:54 -0000	1.1.1.3
  +++ pcre/pcre_dfa_exec.c	21 Aug 2010 21:48:05 -0000	1.1.1.4
  @@ -7,7 +7,7 @@
   below for why this module is different).
   
                          Written by Philip Hazel
  -           Copyright (c) 1997-2009 University of Cambridge
  +           Copyright (c) 1997-2010 University of Cambridge
   
   -----------------------------------------------------------------------------
   Redistribution and use in source and binary forms, with or without
  @@ -106,7 +106,7 @@
   
   
   /* This table identifies those opcodes that are followed immediately by a
  -character that is to be tested in some way. This makes is possible to
  +character that is to be tested in some way. This makes it possible to
   centralize the loading of these characters. In the case of Type * etc, the
   "character" is the opcode for \D, \d, \S, \s, \W, or \w, which will always be a
   small value. Non-zero values in the table are the offsets from the opcode where
  @@ -118,8 +118,9 @@
     0, 0, 0, 0, 0,                 /* \A, \G, \K, \B, \b                     */
     0, 0, 0, 0, 0, 0,              /* \D, \d, \S, \s, \W, \w                 */
     0, 0, 0,                       /* Any, AllAny, Anybyte                   */
  -  0, 0, 0,                       /* NOTPROP, PROP, EXTUNI                  */
  +  0, 0,                          /* \P, \p                                 */
     0, 0, 0, 0, 0,                 /* \R, \H, \h, \V, \v                     */
  +  0,                             /* \X                                     */
     0, 0, 0, 0, 0,                 /* \Z, \z, Opt, ^, $                      */
     1,                             /* Char                                   */
     1,                             /* Charnc                                 */
  @@ -156,12 +157,13 @@
     0,                             /* Reverse                                */
     0, 0, 0, 0,                    /* ONCE, BRA, CBRA, COND                  */
     0, 0, 0,                       /* SBRA, SCBRA, SCOND                     */
  -  0,                             /* CREF                                   */
  -  0,                             /* RREF                                   */
  +  0, 0,                          /* CREF, NCREF                            */
  +  0, 0,                          /* RREF, NRREF                            */
     0,                             /* DEF                                    */
     0, 0,                          /* BRAZERO, BRAMINZERO                    */
  -  0, 0, 0, 0,                    /* PRUNE, SKIP, THEN, COMMIT              */
  -  0, 0, 0, 0                     /* FAIL, ACCEPT, CLOSE, SKIPZERO          */
  +  0, 0, 0,                       /* MARK, PRUNE, PRUNE_ARG,                */
  +  0, 0, 0, 0,                    /* SKIP, SKIP_ARG, THEN, THEN_ARG,        */
  +  0, 0, 0, 0, 0                  /* COMMIT, FAIL, ACCEPT, CLOSE, SKIPZERO  */
   };
   
   /* This table identifies those opcodes that inspect a character. It is used to
  @@ -174,8 +176,9 @@
     0, 0, 0, 1, 1,                 /* \A, \G, \K, \B, \b                     */
     1, 1, 1, 1, 1, 1,              /* \D, \d, \S, \s, \W, \w                 */
     1, 1, 1,                       /* Any, AllAny, Anybyte                   */
  -  1, 1, 1,                       /* NOTPROP, PROP, EXTUNI                  */
  +  1, 1,                          /* \P, \p                                 */
     1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */
  +  1,                             /* \X                                     */
     0, 0, 0, 0, 0,                 /* \Z, \z, Opt, ^, $                      */
     1,                             /* Char                                   */
     1,                             /* Charnc                                 */
  @@ -212,12 +215,13 @@
     0,                             /* Reverse                                */
     0, 0, 0, 0,                    /* ONCE, BRA, CBRA, COND                  */
     0, 0, 0,                       /* SBRA, SCBRA, SCOND                     */
  -  0,                             /* CREF                                   */
  -  0,                             /* RREF                                   */
  +  0, 0,                          /* CREF, NCREF                            */
  +  0, 0,                          /* RREF, NRREF                            */
     0,                             /* DEF                                    */
     0, 0,                          /* BRAZERO, BRAMINZERO                    */
  -  0, 0, 0, 0,                    /* PRUNE, SKIP, THEN, COMMIT              */
  -  0, 0, 0, 0                     /* FAIL, ACCEPT, CLOSE, SKIPZERO          */
  +  0, 0, 0,                       /* MARK, PRUNE, PRUNE_ARG,                */
  +  0, 0, 0, 0,                    /* SKIP, SKIP_ARG, THEN, THEN_ARG,        */
  +  0, 0, 0, 0, 0                  /* COMMIT, FAIL, ACCEPT, CLOSE, SKIPZERO  */
   };
   
   /* These 2 tables allow for compact code for testing for \D, \d, \S, \s, \W,
  @@ -255,7 +259,7 @@
   #define INTS_PER_STATEBLOCK  (sizeof(stateblock)/sizeof(int))
   
   
  -#ifdef DEBUG
  +#ifdef PCRE_DEBUG
   /*************************************************
   *             Print character string             *
   *************************************************/
  @@ -471,7 +475,7 @@
   
       {
       gone_back = (current_subject - max_back < start_subject)?
  -      current_subject - start_subject : max_back;
  +      (int)(current_subject - start_subject) : max_back;
       current_subject -= gone_back;
       }
   
  @@ -488,7 +492,7 @@
       int back = GET(end_code, 2+LINK_SIZE);
       if (back <= gone_back)
         {
  -      int bstate = end_code - start_code + 2 + 2*LINK_SIZE;
  +      int bstate = (int)(end_code - start_code + 2 + 2*LINK_SIZE);
         ADD_NEW_DATA(-bstate, 0, gone_back - back);
         }
       end_code += GET(end_code, 1);
  @@ -524,7 +528,7 @@
         ((*this_start_code == OP_CBRA || *this_start_code == OP_SCBRA)? 2:0);
       do
         {
  -      ADD_NEW(end_code - start_code + length, 0);
  +      ADD_NEW((int)(end_code - start_code + length), 0);
         end_code += GET(end_code, 1);
         length = 1 + LINK_SIZE;
         }
  @@ -559,7 +563,7 @@
     workspace[0] ^= 1;              /* Remember for the restarting feature */
     workspace[1] = active_count;
   
  -#ifdef DEBUG
  +#ifdef PCRE_DEBUG
     printf("%.*sNext character: rest of subject = \"", rlevel*2-2, SP);
     pchars((uschar *)ptr, strlen((char *)ptr), stdout);
     printf("\"\n");
  @@ -605,7 +609,7 @@
       int state_offset = current_state->offset;
       int count, codevalue, rrc;
   
  -#ifdef DEBUG
  +#ifdef PCRE_DEBUG
       printf ("%.*sProcessing state %d c=", rlevel*2-2, SP, state_offset);
       if (clen == 0) printf("EOL\n");
         else if (c > 32 && c < 127) printf("'%c'\n", c);
  @@ -706,6 +710,18 @@
   
       switch (codevalue)
         {
  +/* ========================================================================== */
  +      /* These cases are never obeyed. This is a fudge that causes a compile-
  +      time error if the vectors coptable or poptable, which are indexed by
  +      opcode, are not the correct length. It seems to be the only way to do
  +      such a check at compile time, as the sizeof() operator does not work
  +      in the C preprocessor. */
  +
  +      case OP_TABLE_LENGTH:
  +      case OP_TABLE_LENGTH +
  +        ((sizeof(coptable) == OP_TABLE_LENGTH) &&
  +         (sizeof(poptable) == OP_TABLE_LENGTH)):
  +      break;
   
   /* ========================================================================== */
         /* Reached a closing bracket. If not at the end of the pattern, carry
  @@ -739,8 +755,8 @@
             if (count > 0) memmove(offsets + 2, offsets, count * sizeof(int));
             if (offsetcount >= 2)
               {
  -            offsets[0] = current_subject - start_subject;
  -            offsets[1] = ptr - start_subject;
  +            offsets[0] = (int)(current_subject - start_subject);
  +            offsets[1] = (int)(ptr - start_subject);
               DPRINTF(("%.*sSet matched string = \"%.*s\"\n", rlevel*2-2, SP,
                 offsets[1] - offsets[0], current_subject));
               }
  @@ -762,7 +778,7 @@
         /*-----------------------------------------------------------------*/
         case OP_ALT:
         do { code += GET(code, 1); } while (*code == OP_ALT);
  -      ADD_ACTIVE(code - start_code, 0);
  +      ADD_ACTIVE((int)(code - start_code), 0);
         break;
   
         /*-----------------------------------------------------------------*/
  @@ -770,7 +786,7 @@
         case OP_SBRA:
         do
           {
  -        ADD_ACTIVE(code - start_code + 1 + LINK_SIZE, 0);
  +        ADD_ACTIVE((int)(code - start_code + 1 + LINK_SIZE), 0);
           code += GET(code, 1);
           }
         while (*code == OP_ALT);
  @@ -779,11 +795,11 @@
         /*-----------------------------------------------------------------*/
         case OP_CBRA:
         case OP_SCBRA:
  -      ADD_ACTIVE(code - start_code + 3 + LINK_SIZE,  0);
  +      ADD_ACTIVE((int)(code - start_code + 3 + LINK_SIZE),  0);
         code += GET(code, 1);
         while (*code == OP_ALT)
           {
  -        ADD_ACTIVE(code - start_code + 1 + LINK_SIZE,  0);
  +        ADD_ACTIVE((int)(code - start_code + 1 + LINK_SIZE),  0);
           code += GET(code, 1);
           }
         break;
  @@ -794,14 +810,14 @@
         ADD_ACTIVE(state_offset + 1, 0);
         code += 1 + GET(code, 2);
         while (*code == OP_ALT) code += GET(code, 1);
  -      ADD_ACTIVE(code - start_code + 1 + LINK_SIZE, 0);
  +      ADD_ACTIVE((int)(code - start_code + 1 + LINK_SIZE), 0);
         break;
   
         /*-----------------------------------------------------------------*/
         case OP_SKIPZERO:
         code += 1 + GET(code, 2);
         while (*code == OP_ALT) code += GET(code, 1);
  -      ADD_ACTIVE(code - start_code + 1 + LINK_SIZE, 0);
  +      ADD_ACTIVE((int)(code - start_code + 1 + LINK_SIZE), 0);
         break;
   
         /*-----------------------------------------------------------------*/
  @@ -906,13 +922,37 @@
             if (utf8) BACKCHAR(temp);
   #endif
             GETCHARTEST(d, temp);
  +#ifdef SUPPORT_UCP
  +          if ((md->poptions & PCRE_UCP) != 0)
  +            {
  +            if (d == '_') left_word = TRUE; else
  +              {
  +              int cat = UCD_CATEGORY(d);
  +              left_word = (cat == ucp_L || cat == ucp_N);
  +              }
  +            }
  +          else
  +#endif
             left_word = d < 256 && (ctypes[d] & ctype_word) != 0;
             }
  -        else left_word = 0;
  +        else left_word = FALSE;
   
           if (clen > 0)
  +          {
  +#ifdef SUPPORT_UCP
  +          if ((md->poptions & PCRE_UCP) != 0)
  +            {
  +            if (c == '_') right_word = TRUE; else
  +              {
  +              int cat = UCD_CATEGORY(c);
  +              right_word = (cat == ucp_L || cat == ucp_N);
  +              }
  +            }
  +          else
  +#endif
             right_word = c < 256 && (ctypes[c] & ctype_word) != 0;
  -        else right_word = 0;
  +          }
  +        else right_word = FALSE;
   
           if ((left_word == right_word) == (codevalue == OP_NOT_WORD_BOUNDARY))
             { ADD_ACTIVE(state_offset + 1, 0); }
  @@ -939,7 +979,8 @@
             break;
   
             case PT_LAMP:
  -          OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll || prop->chartype == ucp_Lt;
  +          OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll ||
  +               prop->chartype == ucp_Lt;
             break;
   
             case PT_GC:
  @@ -954,6 +995,30 @@
             OK = prop->script == code[2];
             break;
   
  +          /* These are specials for combination cases. */
  +
  +          case PT_ALNUM:
  +          OK = _pcre_ucp_gentype[prop->chartype] == ucp_L ||
  +               _pcre_ucp_gentype[prop->chartype] == ucp_N;
  +          break;
  +
  +          case PT_SPACE:    /* Perl space */
  +          OK = _pcre_ucp_gentype[prop->chartype] == ucp_Z ||
  +               c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR;
  +          break;
  +
  +          case PT_PXSPACE:  /* POSIX space */
  +          OK = _pcre_ucp_gentype[prop->chartype] == ucp_Z ||
  +               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
  +               c == CHAR_FF || c == CHAR_CR;
  +          break;
  +
  +          case PT_WORD:
  +          OK = _pcre_ucp_gentype[prop->chartype] == ucp_L ||
  +               _pcre_ucp_gentype[prop->chartype] == ucp_N ||
  +               c == CHAR_UNDERSCORE;
  +          break;
  +
             /* Should never occur, but keep compilers from grumbling. */
   
             default:
  @@ -1108,7 +1173,8 @@
             break;
   
             case PT_LAMP:
  -          OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll || prop->chartype == ucp_Lt;
  +          OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll ||
  +            prop->chartype == ucp_Lt;
             break;
   
             case PT_GC:
  @@ -1123,6 +1189,30 @@
             OK = prop->script == code[3];
             break;
   
  +          /* These are specials for combination cases. */
  +
  +          case PT_ALNUM:
  +          OK = _pcre_ucp_gentype[prop->chartype] == ucp_L ||
  +               _pcre_ucp_gentype[prop->chartype] == ucp_N;
  +          break;
  +
  +          case PT_SPACE:    /* Perl space */
  +          OK = _pcre_ucp_gentype[prop->chartype] == ucp_Z ||
  +               c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR;
  +          break;
  +
  +          case PT_PXSPACE:  /* POSIX space */
  +          OK = _pcre_ucp_gentype[prop->chartype] == ucp_Z ||
  +               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
  +               c == CHAR_FF || c == CHAR_CR;
  +          break;
  +
  +          case PT_WORD:
  +          OK = _pcre_ucp_gentype[prop->chartype] == ucp_L ||
  +               _pcre_ucp_gentype[prop->chartype] == ucp_N ||
  +               c == CHAR_UNDERSCORE;
  +          break;
  +
             /* Should never occur, but keep compilers from grumbling. */
   
             default:
  @@ -1330,7 +1420,8 @@
             break;
   
             case PT_LAMP:
  -          OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll || prop->chartype == ucp_Lt;
  +          OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll ||
  +            prop->chartype == ucp_Lt;
             break;
   
             case PT_GC:
  @@ -1345,6 +1436,30 @@
             OK = prop->script == code[3];
             break;
   
  +          /* These are specials for combination cases. */
  +
  +          case PT_ALNUM:
  +          OK = _pcre_ucp_gentype[prop->chartype] == ucp_L ||
  +               _pcre_ucp_gentype[prop->chartype] == ucp_N;
  +          break;
  +
  +          case PT_SPACE:    /* Perl space */
  +          OK = _pcre_ucp_gentype[prop->chartype] == ucp_Z ||
  +               c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR;
  +          break;
  +
  +          case PT_PXSPACE:  /* POSIX space */
  +          OK = _pcre_ucp_gentype[prop->chartype] == ucp_Z ||
  +               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
  +               c == CHAR_FF || c == CHAR_CR;
  +          break;
  +
  +          case PT_WORD:
  +          OK = _pcre_ucp_gentype[prop->chartype] == ucp_L ||
  +               _pcre_ucp_gentype[prop->chartype] == ucp_N ||
  +               c == CHAR_UNDERSCORE;
  +          break;
  +
             /* Should never occur, but keep compilers from grumbling. */
   
             default:
  @@ -1577,7 +1692,8 @@
             break;
   
             case PT_LAMP:
  -          OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll || prop->chartype == ucp_Lt;
  +          OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll ||
  +            prop->chartype == ucp_Lt;
             break;
   
             case PT_GC:
  @@ -1592,6 +1708,30 @@
             OK = prop->script == code[5];
             break;
   
  +          /* These are specials for combination cases. */
  +
  +          case PT_ALNUM:
  +          OK = _pcre_ucp_gentype[prop->chartype] == ucp_L ||
  +               _pcre_ucp_gentype[prop->chartype] == ucp_N;
  +          break;
  +
  +          case PT_SPACE:    /* Perl space */
  +          OK = _pcre_ucp_gentype[prop->chartype] == ucp_Z ||
  +               c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR;
  +          break;
  +
  +          case PT_PXSPACE:  /* POSIX space */
  +          OK = _pcre_ucp_gentype[prop->chartype] == ucp_Z ||
  +               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
  +               c == CHAR_FF || c == CHAR_CR;
  +          break;
  +
  +          case PT_WORD:
  +          OK = _pcre_ucp_gentype[prop->chartype] == ucp_L ||
  +               _pcre_ucp_gentype[prop->chartype] == ucp_N ||
  +               c == CHAR_UNDERSCORE;
  +          break;
  +
             /* Should never occur, but keep compilers from grumbling. */
   
             default:
  @@ -2219,7 +2359,7 @@
           points to the byte after the end of the class. If there is a
           quantifier, this is where it will be. */
   
  -        next_state_offset = ecode - start_code;
  +        next_state_offset = (int)(ecode - start_code);
   
           switch (*ecode)
             {
  @@ -2290,7 +2430,7 @@
             md,                                   /* static match data */
             code,                                 /* this subexpression's code */
             ptr,                                  /* where we currently are */
  -          ptr - start_subject,                  /* start offset */
  +          (int)(ptr - start_subject),           /* start offset */
             local_offsets,                        /* offset vector */
             sizeof(local_offsets)/sizeof(int),    /* size of same */
             local_workspace,                      /* workspace vector */
  @@ -2299,8 +2439,9 @@
             rlevel,                               /* function recursion level */
             recursing);                           /* pass on regex recursion */
   
  +        if (rc == PCRE_ERROR_DFA_UITEM) return rc;
           if ((rc >= 0) == (codevalue == OP_ASSERT || codevalue == OP_ASSERTBACK))
  -            { ADD_ACTIVE(endasscode + LINK_SIZE + 1 - start_code, 0); }
  +            { ADD_ACTIVE((int)(endasscode + LINK_SIZE + 1 - start_code), 0); }
           }
         break;
   
  @@ -2327,9 +2468,9 @@
               cb.callout_number   = code[LINK_SIZE+2];
               cb.offset_vector    = offsets;
               cb.subject          = (PCRE_SPTR)start_subject;
  -            cb.subject_length   = end_subject - start_subject;
  -            cb.start_match      = current_subject - start_subject;
  -            cb.current_position = ptr - start_subject;
  +            cb.subject_length   = (int)(end_subject - start_subject);
  +            cb.start_match      = (int)(current_subject - start_subject);
  +            cb.current_position = (int)(ptr - start_subject);
               cb.pattern_position = GET(code, LINK_SIZE + 3);
               cb.next_item_length = GET(code, 3 + 2*LINK_SIZE);
               cb.capture_top      = 1;
  @@ -2380,7 +2521,7 @@
               md,                                   /* fixed match data */
               asscode,                              /* this subexpression's code */
               ptr,                                  /* where we currently are */
  -            ptr - start_subject,                  /* start offset */
  +            (int)(ptr - start_subject),           /* start offset */
               local_offsets,                        /* offset vector */
               sizeof(local_offsets)/sizeof(int),    /* size of same */
               local_workspace,                      /* workspace vector */
  @@ -2389,9 +2530,10 @@
               rlevel,                               /* function recursion level */
               recursing);                           /* pass on regex recursion */
   
  +          if (rc == PCRE_ERROR_DFA_UITEM) return rc;
             if ((rc >= 0) ==
                   (condcode == OP_ASSERT || condcode == OP_ASSERTBACK))
  -            { ADD_ACTIVE(endasscode + LINK_SIZE + 1 - start_code, 0); }
  +            { ADD_ACTIVE((int)(endasscode + LINK_SIZE + 1 - start_code), 0); }
             else
               { ADD_ACTIVE(state_offset + codelink + LINK_SIZE + 1, 0); }
             }
  @@ -2412,7 +2554,7 @@
             md,                                   /* fixed match data */
             start_code + GET(code, 1),            /* this subexpression's code */
             ptr,                                  /* where we currently are */
  -          ptr - start_subject,                  /* start offset */
  +          (int)(ptr - start_subject),           /* start offset */
             local_offsets,                        /* offset vector */
             sizeof(local_offsets)/sizeof(int),    /* size of same */
             local_workspace,                      /* workspace vector */
  @@ -2464,7 +2606,7 @@
             md,                                   /* fixed match data */
             code,                                 /* this subexpression's code */
             ptr,                                  /* where we currently are */
  -          ptr - start_subject,                  /* start offset */
  +          (int)(ptr - start_subject),           /* start offset */
             local_offsets,                        /* offset vector */
             sizeof(local_offsets)/sizeof(int),    /* size of same */
             local_workspace,                      /* workspace vector */
  @@ -2481,7 +2623,8 @@
   
             do { end_subpattern += GET(end_subpattern, 1); }
               while (*end_subpattern == OP_ALT);
  -          next_state_offset = end_subpattern - start_code + LINK_SIZE + 1;
  +          next_state_offset =
  +            (int)(end_subpattern - start_code + LINK_SIZE + 1);
   
             /* If the end of this subpattern is KETRMAX or KETRMIN, we must
             arrange for the repeat state also to be added to the relevant list.
  @@ -2489,7 +2632,7 @@
   
             repeat_state_offset = (*end_subpattern == OP_KETRMAX ||
                                    *end_subpattern == OP_KETRMIN)?
  -            end_subpattern - start_code - GET(end_subpattern, 1) : -1;
  +            (int)(end_subpattern - start_code - GET(end_subpattern, 1)) : -1;
   
             /* If we have matched an empty string, add the next state at the
             current character pointer. This is important so that the duplicate
  @@ -2553,9 +2696,9 @@
           cb.callout_number   = code[1];
           cb.offset_vector    = offsets;
           cb.subject          = (PCRE_SPTR)start_subject;
  -        cb.subject_length   = end_subject - start_subject;
  -        cb.start_match      = current_subject - start_subject;
  -        cb.current_position = ptr - start_subject;
  +        cb.subject_length   = (int)(end_subject - start_subject);
  +        cb.start_match      = (int)(current_subject - start_subject);
  +        cb.current_position = (int)(ptr - start_subject);
           cb.pattern_position = GET(code, 2);
           cb.next_item_length = GET(code, 2 + LINK_SIZE);
           cb.capture_top      = 1;
  @@ -2606,8 +2749,8 @@
         {
         if (offsetcount >= 2)
           {
  -        offsets[0] = md->start_used_ptr - start_subject;
  -        offsets[1] = end_subject - start_subject;
  +        offsets[0] = (int)(md->start_used_ptr - start_subject);
  +        offsets[1] = (int)(end_subject - start_subject);
           }
         match_count = PCRE_ERROR_PARTIAL;
         }
  @@ -2966,8 +3109,16 @@
           while (current_subject < end_subject)
             {
             register unsigned int c = *current_subject;
  -          if ((start_bits[c/8] & (1 << (c&7))) == 0) current_subject++;
  -            else break;
  +          if ((start_bits[c/8] & (1 << (c&7))) == 0)
  +            {
  +            current_subject++;
  +#ifdef SUPPORT_UTF8
  +            if (utf8)
  +              while(current_subject < end_subject &&
  +                    (*current_subject & 0xc0) == 0x80) current_subject++;
  +#endif
  +            }
  +          else break;
             }
           }
         }
  @@ -2989,7 +3140,7 @@
         bytes to avoid spending too much time in this optimization. */
   
         if (study != NULL && (study->flags & PCRE_STUDY_MINLEN) != 0 &&
  -          end_subject - current_subject < study->minlength)
  +          (pcre_uint32)(end_subject - current_subject) < study->minlength)
           return PCRE_ERROR_NOMATCH;
   
         /* If req_byte is set, we know that that character must appear in the
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/pcre_exec.c
  ============================================================================
  $ cvs diff -u -r1.1.1.3 -r1.1.1.4 pcre_exec.c
  --- pcre/pcre_exec.c	5 Dec 2009 13:53:53 -0000	1.1.1.3
  +++ pcre/pcre_exec.c	21 Aug 2010 21:48:05 -0000	1.1.1.4
  @@ -6,7 +6,7 @@
   and semantics are as close as possible to those of the Perl 5 language.
   
                          Written by Philip Hazel
  -           Copyright (c) 1997-2009 University of Cambridge
  +           Copyright (c) 1997-2010 University of Cambridge
   
   -----------------------------------------------------------------------------
   Redistribution and use in source and binary forms, with or without
  @@ -71,10 +71,20 @@
   /* Special internal returns from the match() function. Make them sufficiently
   negative to avoid the external error codes. */
   
  -#define MATCH_COMMIT       (-999)
  -#define MATCH_PRUNE        (-998)
  -#define MATCH_SKIP         (-997)
  -#define MATCH_THEN         (-996)
  +#define MATCH_ACCEPT       (-999)
  +#define MATCH_COMMIT       (-998)
  +#define MATCH_PRUNE        (-997)
  +#define MATCH_SKIP         (-996)
  +#define MATCH_SKIP_ARG     (-995)
  +#define MATCH_THEN         (-994)
  +
  +/* This is a convenience macro for code that occurs many times. */
  +
  +#define MRRETURN(ra) \
  +  { \
  +  md->mark = markptr; \
  +  RRETURN(ra); \
  +  }
   
   /* Maximum number of ints of offset to save on the stack for recursive calls.
   If the offset vector is bigger, malloc is used. This should be a multiple of 3,
  @@ -89,7 +99,7 @@
   
   
   
  -#ifdef DEBUG
  +#ifdef PCRE_DEBUG
   /*************************************************
   *        Debugging function to print chars       *
   *************************************************/
  @@ -141,7 +151,7 @@
   {
   USPTR p = md->start_subject + md->offset_vector[offset];
   
  -#ifdef DEBUG
  +#ifdef PCRE_DEBUG
   if (eptr >= md->end_subject)
     printf("matching subject <null>");
   else
  @@ -245,20 +255,21 @@
          RM21,  RM22, RM23, RM24, RM25, RM26, RM27, RM28, RM29, RM30,
          RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,
          RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,
  -       RM51,  RM52, RM53, RM54 };
  +       RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,
  +       RM61,  RM62 };
   
   /* These versions of the macros use the stack, as normal. There are debugging
   versions and production versions. Note that the "rw" argument of RMATCH isn't
  -actuall used in this definition. */
  +actually used in this definition. */
   
   #ifndef NO_RECURSE
   #define REGISTER register
   
  -#ifdef DEBUG
  +#ifdef PCRE_DEBUG
   #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw) \
     { \
     printf("match() called in line %d\n", __LINE__); \
  -  rrc = match(ra,rb,mstart,rc,rd,re,rf,rg,rdepth+1); \
  +  rrc = match(ra,rb,mstart,markptr,rc,rd,re,rf,rg,rdepth+1); \
     printf("to line %d\n", __LINE__); \
     }
   #define RRETURN(ra) \
  @@ -268,7 +279,7 @@
     }
   #else
   #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw) \
  -  rrc = match(ra,rb,mstart,rc,rd,re,rf,rg,rdepth+1)
  +  rrc = match(ra,rb,mstart,markptr,rc,rd,re,rf,rg,rdepth+1)
   #define RRETURN(ra) return ra
   #endif
   
  @@ -284,10 +295,12 @@
   #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw)\
     {\
     heapframe *newframe = (pcre_stack_malloc)(sizeof(heapframe));\
  +  if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\
     frame->Xwhere = rw; \
     newframe->Xeptr = ra;\
     newframe->Xecode = rb;\
     newframe->Xmstart = mstart;\
  +  newframe->Xmarkptr = markptr;\
     newframe->Xoffset_top = rc;\
     newframe->Xims = re;\
     newframe->Xeptrb = rf;\
  @@ -303,9 +316,9 @@
   
   #define RRETURN(ra)\
     {\
  -  heapframe *newframe = frame;\
  -  frame = newframe->Xprevframe;\
  -  (pcre_stack_free)(newframe);\
  +  heapframe *oldframe = frame;\
  +  frame = oldframe->Xprevframe;\
  +  (pcre_stack_free)(oldframe);\
     if (frame != NULL)\
       {\
       rrc = ra;\
  @@ -325,6 +338,7 @@
     USPTR Xeptr;
     const uschar *Xecode;
     USPTR Xmstart;
  +  USPTR Xmarkptr;
     int Xoffset_top;
     long int Xims;
     eptrblock *Xeptrb;
  @@ -411,14 +425,14 @@
     if (md->partial != 0 && eptr >= md->end_subject && eptr > mstart)\
       {\
       md->hitend = TRUE;\
  -    if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);\
  +    if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL);\
       }
   
   #define SCHECK_PARTIAL()\
     if (md->partial != 0 && eptr > mstart)\
       {\
       md->hitend = TRUE;\
  -    if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);\
  +    if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL);\
       }
   
   
  @@ -432,6 +446,7 @@
      ecode       pointer to current position in compiled code
      mstart      pointer to the current match start position (can be modified
                    by encountering \K)
  +   markptr     pointer to the most recent MARK name, or NULL
      offset_top  current top pointer
      md          pointer to "static" info for the match
      ims         current /i, /m, and /s options
  @@ -445,14 +460,15 @@
   
   Returns:       MATCH_MATCH if matched            )  these values are >= 0
                  MATCH_NOMATCH if failed to match  )
  +               a negative MATCH_xxx value for PRUNE, SKIP, etc
                  a negative PCRE_ERROR_xxx value if aborted by an error condition
                    (e.g. stopped by repeated call or recursion limit)
   */
   
   static int
   match(REGISTER USPTR eptr, REGISTER const uschar *ecode, USPTR mstart,
  -  int offset_top, match_data *md, unsigned long int ims, eptrblock *eptrb,
  -  int flags, unsigned int rdepth)
  +  const uschar *markptr, int offset_top, match_data *md, unsigned long int ims,
  +  eptrblock *eptrb, int flags, unsigned int rdepth)
   {
   /* These variables do not need to be preserved over recursion in this function,
   so they can be ordinary variables in all cases. Mark some of them with
  @@ -473,6 +489,7 @@
   
   #ifdef NO_RECURSE
   heapframe *frame = (pcre_stack_malloc)(sizeof(heapframe));
  +if (frame == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
   frame->Xprevframe = NULL;            /* Marks the top level */
   
   /* Copy in the original argument variables */
  @@ -480,6 +497,7 @@
   frame->Xeptr = eptr;
   frame->Xecode = ecode;
   frame->Xmstart = mstart;
  +frame->Xmarkptr = markptr;
   frame->Xoffset_top = offset_top;
   frame->Xims = ims;
   frame->Xeptrb = eptrb;
  @@ -495,6 +513,7 @@
   #define eptr               frame->Xeptr
   #define ecode              frame->Xecode
   #define mstart             frame->Xmstart
  +#define markptr            frame->Xmarkptr
   #define offset_top         frame->Xoffset_top
   #define ims                frame->Xims
   #define eptrb              frame->Xeptrb
  @@ -622,7 +641,7 @@
   /* OK, now we can get on with the real code of the function. Recursive calls
   are specified by the macro RMATCH and RRETURN is used to return. When
   NO_RECURSE is *not* defined, these just turn into a recursive call to match()
  -and a "return", respectively (possibly with some debugging if DEBUG is
  +and a "return", respectively (possibly with some debugging if PCRE_DEBUG is
   defined). However, RMATCH isn't like a function call because it's quite a
   complicated macro. It has to be used in one particular way. This shouldn't,
   however, impact performance when true recursion is being used. */
  @@ -666,32 +685,81 @@
   
     switch(op)
       {
  +    case OP_MARK:
  +    markptr = ecode + 2;
  +    RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
  +      ims, eptrb, flags, RM55);
  +
  +    /* A return of MATCH_SKIP_ARG means that matching failed at SKIP with an
  +    argument, and we must check whether that argument matches this MARK's
  +    argument. It is passed back in md->start_match_ptr (an overloading of that
  +    variable). If it does match, we reset that variable to the current subject
  +    position and return MATCH_SKIP. Otherwise, pass back the return code
  +    unaltered. */
  +
  +    if (rrc == MATCH_SKIP_ARG &&
  +        strcmp((char *)markptr, (char *)(md->start_match_ptr)) == 0)
  +      {
  +      md->start_match_ptr = eptr;
  +      RRETURN(MATCH_SKIP);
  +      }
  +
  +    if (md->mark == NULL) md->mark = markptr;
  +    RRETURN(rrc);
  +
       case OP_FAIL:
  -    RRETURN(MATCH_NOMATCH);
  +    MRRETURN(MATCH_NOMATCH);
  +
  +    case OP_COMMIT:
  +    RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
  +      ims, eptrb, flags, RM52);
  +    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  +    MRRETURN(MATCH_COMMIT);
   
       case OP_PRUNE:
       RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
         ims, eptrb, flags, RM51);
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -    RRETURN(MATCH_PRUNE);
  +    MRRETURN(MATCH_PRUNE);
   
  -    case OP_COMMIT:
  -    RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
  -      ims, eptrb, flags, RM52);
  +    case OP_PRUNE_ARG:
  +    RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
  +      ims, eptrb, flags, RM56);
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -    RRETURN(MATCH_COMMIT);
  +    md->mark = ecode + 2;
  +    RRETURN(MATCH_PRUNE);
   
       case OP_SKIP:
       RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
         ims, eptrb, flags, RM53);
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
       md->start_match_ptr = eptr;   /* Pass back current position */
  -    RRETURN(MATCH_SKIP);
  +    MRRETURN(MATCH_SKIP);
  +
  +    case OP_SKIP_ARG:
  +    RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
  +      ims, eptrb, flags, RM57);
  +    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  +
  +    /* Pass back the current skip name by overloading md->start_match_ptr and
  +    returning the special MATCH_SKIP_ARG return code. This will either be
  +    caught by a matching MARK, or get to the top, where it is treated the same
  +    as PRUNE. */
  +
  +    md->start_match_ptr = ecode + 2;
  +    RRETURN(MATCH_SKIP_ARG);
   
       case OP_THEN:
       RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
         ims, eptrb, flags, RM54);
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  +    MRRETURN(MATCH_THEN);
  +
  +    case OP_THEN_ARG:
  +    RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
  +      ims, eptrb, flags, RM58);
  +    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  +    md->mark = ecode + 2;
       RRETURN(MATCH_THEN);
   
       /* Handle a capturing bracket. If there is space in the offset vector, save
  @@ -713,7 +781,7 @@
       number = GET2(ecode, 1+LINK_SIZE);
       offset = number << 1;
   
  -#ifdef DEBUG
  +#ifdef PCRE_DEBUG
       printf("start bracket %d\n", number);
       printf("subject=");
       pchars(eptr, 16, TRUE, md);
  @@ -728,7 +796,8 @@
         save_capture_last = md->capture_last;
   
         DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
  -      md->offset_vector[md->offset_end - number] = eptr - md->start_subject;
  +      md->offset_vector[md->offset_end - number] =
  +        (int)(eptr - md->start_subject);
   
         flags = (op == OP_SCBRA)? match_cbegroup : 0;
         do
  @@ -747,6 +816,7 @@
         md->offset_vector[offset+1] = save_offset2;
         md->offset_vector[md->offset_end - number] = save_offset3;
   
  +      if (rrc != MATCH_THEN) md->mark = markptr;
         RRETURN(MATCH_NOMATCH);
         }
   
  @@ -786,6 +856,7 @@
   
           RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, ims,
             eptrb, flags, RM48);
  +        if (rrc == MATCH_NOMATCH) md->mark = markptr;
           RRETURN(rrc);
           }
   
  @@ -821,15 +892,15 @@
           cb.callout_number   = ecode[LINK_SIZE+2];
           cb.offset_vector    = md->offset_vector;
           cb.subject          = (PCRE_SPTR)md->start_subject;
  -        cb.subject_length   = md->end_subject - md->start_subject;
  -        cb.start_match      = mstart - md->start_subject;
  -        cb.current_position = eptr - md->start_subject;
  +        cb.subject_length   = (int)(md->end_subject - md->start_subject);
  +        cb.start_match      = (int)(mstart - md->start_subject);
  +        cb.current_position = (int)(eptr - md->start_subject);
           cb.pattern_position = GET(ecode, LINK_SIZE + 3);
           cb.next_item_length = GET(ecode, 3 + 2*LINK_SIZE);
           cb.capture_top      = offset_top/2;
           cb.capture_last     = md->capture_last;
           cb.callout_data     = md->callout_data;
  -        if ((rrc = (*pcre_callout)(&cb)) > 0) RRETURN(MATCH_NOMATCH);
  +        if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);
           if (rrc < 0) RRETURN(rrc);
           }
         ecode += _pcre_OP_lengths[OP_CALLOUT];
  @@ -1039,7 +1110,7 @@
       number = GET2(ecode, 1);
       offset = number << 1;
   
  -#ifdef DEBUG
  +#ifdef PCRE_DEBUG
         printf("end bracket %d at *ACCEPT", number);
         printf("\n");
   #endif
  @@ -1049,7 +1120,7 @@
         {
         md->offset_vector[offset] =
           md->offset_vector[md->offset_end - number];
  -      md->offset_vector[offset+1] = eptr - md->start_subject;
  +      md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
         if (offset_top <= offset) offset_top = offset + 2;
         }
       ecode += 3;
  @@ -1070,7 +1141,6 @@
         memmove(md->offset_vector, rec->offset_save,
           rec->saved_max * sizeof(int));
         offset_top = rec->save_offset_top;
  -      mstart = rec->save_start;
         ims = original_ims;
         ecode = rec->after_call;
         break;
  @@ -1085,14 +1155,19 @@
           (md->notempty ||
             (md->notempty_atstart &&
               mstart == md->start_subject + md->start_offset)))
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
   
       /* Otherwise, we have a match. */
   
       md->end_match_ptr = eptr;           /* Record where we ended */
       md->end_offset_top = offset_top;    /* and how many extracts were taken */
       md->start_match_ptr = mstart;       /* and the start (\K can modify) */
  -    RRETURN(MATCH_MATCH);
  +
  +    /* For some reason, the macros don't work properly if an expression is
  +    given as the argument to MRRETURN when the heap is in use. */
  +
  +    rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;
  +    MRRETURN(rrc);
   
       /* Change option settings */
   
  @@ -1114,12 +1189,16 @@
         {
         RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,
           RM4);
  -      if (rrc == MATCH_MATCH) break;
  +      if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
  +        {
  +        mstart = md->start_match_ptr;   /* In case \K reset it */
  +        break;
  +        }
         if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
         ecode += GET(ecode, 1);
         }
       while (*ecode == OP_ALT);
  -    if (*ecode == OP_KET) RRETURN(MATCH_NOMATCH);
  +    if (*ecode == OP_KET) MRRETURN(MATCH_NOMATCH);
   
       /* If checking an assertion for a condition, return MATCH_MATCH. */
   
  @@ -1133,7 +1212,9 @@
       offset_top = md->end_offset_top;
       continue;
   
  -    /* Negative assertion: all branches must fail to match */
  +    /* Negative assertion: all branches must fail to match. Encountering SKIP,
  +    PRUNE, or COMMIT means we must assume failure without checking subsequent
  +    branches. */
   
       case OP_ASSERT_NOT:
       case OP_ASSERTBACK_NOT:
  @@ -1141,7 +1222,12 @@
         {
         RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,
           RM5);
  -      if (rrc == MATCH_MATCH) RRETURN(MATCH_NOMATCH);
  +      if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) MRRETURN(MATCH_NOMATCH);
  +      if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)
  +        {
  +        do ecode += GET(ecode,1); while (*ecode == OP_ALT);
  +        break;
  +        }
         if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
         ecode += GET(ecode,1);
         }
  @@ -1165,7 +1251,7 @@
         while (i-- > 0)
           {
           eptr--;
  -        if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
  +        if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);
           BACKCHAR(eptr);
           }
         }
  @@ -1176,7 +1262,7 @@
   
         {
         eptr -= GET(ecode, 1);
  -      if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
  +      if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);
         }
   
       /* Save the earliest consulted character, then skip to next op code */
  @@ -1197,15 +1283,15 @@
         cb.callout_number   = ecode[1];
         cb.offset_vector    = md->offset_vector;
         cb.subject          = (PCRE_SPTR)md->start_subject;
  -      cb.subject_length   = md->end_subject - md->start_subject;
  -      cb.start_match      = mstart - md->start_subject;
  -      cb.current_position = eptr - md->start_subject;
  +      cb.subject_length   = (int)(md->end_subject - md->start_subject);
  +      cb.start_match      = (int)(mstart - md->start_subject);
  +      cb.current_position = (int)(eptr - md->start_subject);
         cb.pattern_position = GET(ecode, 2);
         cb.next_item_length = GET(ecode, 2 + LINK_SIZE);
         cb.capture_top      = offset_top/2;
         cb.capture_last     = md->capture_last;
         cb.callout_data     = md->callout_data;
  -      if ((rrc = (*pcre_callout)(&cb)) > 0) RRETURN(MATCH_NOMATCH);
  +      if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);
         if (rrc < 0) RRETURN(rrc);
         }
       ecode += 2 + 2*LINK_SIZE;
  @@ -1260,9 +1346,7 @@
   
         memcpy(new_recursive.offset_save, md->offset_vector,
               new_recursive.saved_max * sizeof(int));
  -      new_recursive.save_start = mstart;
         new_recursive.save_offset_top = offset_top;
  -      mstart = eptr;
   
         /* OK, now we can do the recursion. For each top-level alternative we
         restore the offset and recursion data. */
  @@ -1273,13 +1357,13 @@
           {
           RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,
             md, ims, eptrb, flags, RM6);
  -        if (rrc == MATCH_MATCH)
  +        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
             {
             DPRINTF(("Recursion matched\n"));
             md->recursive = new_recursive.prevrec;
             if (new_recursive.offset_save != stacksave)
               (pcre_free)(new_recursive.offset_save);
  -          RRETURN(MATCH_MATCH);
  +          MRRETURN(MATCH_MATCH);
             }
           else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
             {
  @@ -1300,7 +1384,7 @@
         md->recursive = new_recursive.prevrec;
         if (new_recursive.offset_save != stacksave)
           (pcre_free)(new_recursive.offset_save);
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
         }
       /* Control never reaches here */
   
  @@ -1309,7 +1393,8 @@
       a move back into the brackets. Friedl calls these "atomic" subpatterns.
       Check the alternative branches in turn - the matching won't pass the KET
       for this kind of subpattern. If any one branch matches, we carry on as at
  -    the end of a normal bracket, leaving the subject pointer. */
  +    the end of a normal bracket, leaving the subject pointer, but resetting
  +    the start-of-match value in case it was changed by \K. */
   
       case OP_ONCE:
       prev = ecode;
  @@ -1318,7 +1403,11 @@
       do
         {
         RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM7);
  -      if (rrc == MATCH_MATCH) break;
  +      if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */
  +        {
  +        mstart = md->start_match_ptr;
  +        break;
  +        }
         if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
         ecode += GET(ecode,1);
         }
  @@ -1437,9 +1526,10 @@
         }
       else saved_eptr = NULL;
   
  -    /* If we are at the end of an assertion group, stop matching and return
  -    MATCH_MATCH, but record the current high water mark for use by positive
  -    assertions. Do this also for the "once" (atomic) groups. */
  +    /* If we are at the end of an assertion group or an atomic group, stop
  +    matching and return MATCH_MATCH, but record the current high water mark for
  +    use by positive assertions. We also need to record the match start in case
  +    it was changed by \K. */
   
       if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||
           *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT ||
  @@ -1447,7 +1537,8 @@
         {
         md->end_match_ptr = eptr;      /* For ONCE */
         md->end_offset_top = offset_top;
  -      RRETURN(MATCH_MATCH);
  +      md->start_match_ptr = mstart;
  +      MRRETURN(MATCH_MATCH);
         }
   
       /* For capturing groups we have to check the group number back at the start
  @@ -1461,7 +1552,7 @@
         number = GET2(prev, 1+LINK_SIZE);
         offset = number << 1;
   
  -#ifdef DEBUG
  +#ifdef PCRE_DEBUG
         printf("end bracket %d", number);
         printf("\n");
   #endif
  @@ -1471,7 +1562,7 @@
           {
           md->offset_vector[offset] =
             md->offset_vector[md->offset_end - number];
  -        md->offset_vector[offset+1] = eptr - md->start_subject;
  +        md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
           if (offset_top <= offset) offset_top = offset + 2;
           }
   
  @@ -1483,7 +1574,6 @@
           recursion_info *rec = md->recursive;
           DPRINTF(("Recursion (%d) succeeded - continuing\n", number));
           md->recursive = rec->prevrec;
  -        mstart = rec->save_start;
           memcpy(md->offset_vector, rec->offset_save,
             rec->saved_max * sizeof(int));
           offset_top = rec->save_offset_top;
  @@ -1543,12 +1633,12 @@
       /* Start of subject unless notbol, or after internal newline if multiline */
   
       case OP_CIRC:
  -    if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
  +    if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);
       if ((ims & PCRE_MULTILINE) != 0)
         {
         if (eptr != md->start_subject &&
             (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
  -        RRETURN(MATCH_NOMATCH);
  +        MRRETURN(MATCH_NOMATCH);
         ecode++;
         break;
         }
  @@ -1557,14 +1647,14 @@
       /* Start of subject assertion */
   
       case OP_SOD:
  -    if (eptr != md->start_subject) RRETURN(MATCH_NOMATCH);
  +    if (eptr != md->start_subject) MRRETURN(MATCH_NOMATCH);
       ecode++;
       break;
   
       /* Start of match assertion */
   
       case OP_SOM:
  -    if (eptr != md->start_subject + md->start_offset) RRETURN(MATCH_NOMATCH);
  +    if (eptr != md->start_subject + md->start_offset) MRRETURN(MATCH_NOMATCH);
       ecode++;
       break;
   
  @@ -1582,20 +1672,20 @@
       if ((ims & PCRE_MULTILINE) != 0)
         {
         if (eptr < md->end_subject)
  -        { if (!IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH); }
  +        { if (!IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH); }
         else
  -        { if (md->noteol) RRETURN(MATCH_NOMATCH); }
  +        { if (md->noteol) MRRETURN(MATCH_NOMATCH); }
         ecode++;
         break;
         }
       else
         {
  -      if (md->noteol) RRETURN(MATCH_NOMATCH);
  +      if (md->noteol) MRRETURN(MATCH_NOMATCH);
         if (!md->endonly)
           {
           if (eptr != md->end_subject &&
               (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
  -          RRETURN(MATCH_NOMATCH);
  +          MRRETURN(MATCH_NOMATCH);
           ecode++;
           break;
           }
  @@ -1605,7 +1695,7 @@
       /* End of subject assertion (\z) */
   
       case OP_EOD:
  -    if (eptr < md->end_subject) RRETURN(MATCH_NOMATCH);
  +    if (eptr < md->end_subject) MRRETURN(MATCH_NOMATCH);
       ecode++;
       break;
   
  @@ -1614,7 +1704,7 @@
       case OP_EODN:
       if (eptr != md->end_subject &&
           (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
       ecode++;
       break;
   
  @@ -1632,14 +1722,30 @@
   #ifdef SUPPORT_UTF8
         if (utf8)
           {
  +        /* Get status of previous character */
  +
           if (eptr == md->start_subject) prev_is_word = FALSE; else
             {
             USPTR lastptr = eptr - 1;
             while((*lastptr & 0xc0) == 0x80) lastptr--;
             if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;
             GETCHAR(c, lastptr);
  +#ifdef SUPPORT_UCP
  +          if (md->use_ucp)
  +            {
  +            if (c == '_') prev_is_word = TRUE; else
  +              {
  +              int cat = UCD_CATEGORY(c);
  +              prev_is_word = (cat == ucp_L || cat == ucp_N);
  +              }
  +            }
  +          else
  +#endif
             prev_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;
             }
  +
  +        /* Get status of next character */
  +
           if (eptr >= md->end_subject)
             {
             SCHECK_PARTIAL();
  @@ -1648,47 +1754,89 @@
           else
             {
             GETCHAR(c, eptr);
  +#ifdef SUPPORT_UCP
  +          if (md->use_ucp)
  +            {
  +            if (c == '_') cur_is_word = TRUE; else
  +              {
  +              int cat = UCD_CATEGORY(c);
  +              cur_is_word = (cat == ucp_L || cat == ucp_N);
  +              }
  +            }
  +          else
  +#endif
             cur_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;
             }
           }
         else
   #endif
   
  -      /* Not in UTF-8 mode */
  +      /* Not in UTF-8 mode, but we may still have PCRE_UCP set, and for
  +      consistency with the behaviour of \w we do use it in this case. */
   
           {
  +        /* Get status of previous character */
  +
           if (eptr == md->start_subject) prev_is_word = FALSE; else
             {
             if (eptr <= md->start_used_ptr) md->start_used_ptr = eptr - 1;
  +#ifdef SUPPORT_UCP
  +          if (md->use_ucp)
  +            {
  +            c = eptr[-1];
  +            if (c == '_') prev_is_word = TRUE; else
  +              {
  +              int cat = UCD_CATEGORY(c);
  +              prev_is_word = (cat == ucp_L || cat == ucp_N);
  +              }
  +            }
  +          else
  +#endif
             prev_is_word = ((md->ctypes[eptr[-1]] & ctype_word) != 0);
             }
  +
  +        /* Get status of next character */
  +
           if (eptr >= md->end_subject)
             {
             SCHECK_PARTIAL();
             cur_is_word = FALSE;
             }
  -        else cur_is_word = ((md->ctypes[*eptr] & ctype_word) != 0);
  +        else
  +#ifdef SUPPORT_UCP
  +        if (md->use_ucp)
  +          {
  +          c = *eptr;
  +          if (c == '_') cur_is_word = TRUE; else
  +            {
  +            int cat = UCD_CATEGORY(c);
  +            cur_is_word = (cat == ucp_L || cat == ucp_N);
  +            }
  +          }
  +        else
  +#endif
  +        cur_is_word = ((md->ctypes[*eptr] & ctype_word) != 0);
           }
   
         /* Now see if the situation is what we want */
   
         if ((*ecode++ == OP_WORD_BOUNDARY)?
              cur_is_word == prev_is_word : cur_is_word != prev_is_word)
  -        RRETURN(MATCH_NOMATCH);
  +        MRRETURN(MATCH_NOMATCH);
         }
       break;
   
       /* Match a single character type; inline for speed */
   
       case OP_ANY:
  -    if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
  +    if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);
       /* Fall through */
   
       case OP_ALLANY:
       if (eptr++ >= md->end_subject)
         {
         SCHECK_PARTIAL();
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
         }
       if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
       ecode++;
  @@ -1701,7 +1849,7 @@
       if (eptr++ >= md->end_subject)
         {
         SCHECK_PARTIAL();
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
         }
       ecode++;
       break;
  @@ -1710,7 +1858,7 @@
       if (eptr >= md->end_subject)
         {
         SCHECK_PARTIAL();
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
         }
       GETCHARINCTEST(c, eptr);
       if (
  @@ -1719,7 +1867,7 @@
   #endif
          (md->ctypes[c] & ctype_digit) != 0
          )
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
       ecode++;
       break;
   
  @@ -1727,7 +1875,7 @@
       if (eptr >= md->end_subject)
         {
         SCHECK_PARTIAL();
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
         }
       GETCHARINCTEST(c, eptr);
       if (
  @@ -1736,7 +1884,7 @@
   #endif
          (md->ctypes[c] & ctype_digit) == 0
          )
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
       ecode++;
       break;
   
  @@ -1744,7 +1892,7 @@
       if (eptr >= md->end_subject)
         {
         SCHECK_PARTIAL();
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
         }
       GETCHARINCTEST(c, eptr);
       if (
  @@ -1753,7 +1901,7 @@
   #endif
          (md->ctypes[c] & ctype_space) != 0
          )
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
       ecode++;
       break;
   
  @@ -1761,7 +1909,7 @@
       if (eptr >= md->end_subject)
         {
         SCHECK_PARTIAL();
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
         }
       GETCHARINCTEST(c, eptr);
       if (
  @@ -1770,7 +1918,7 @@
   #endif
          (md->ctypes[c] & ctype_space) == 0
          )
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
       ecode++;
       break;
   
  @@ -1778,7 +1926,7 @@
       if (eptr >= md->end_subject)
         {
         SCHECK_PARTIAL();
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
         }
       GETCHARINCTEST(c, eptr);
       if (
  @@ -1787,7 +1935,7 @@
   #endif
          (md->ctypes[c] & ctype_word) != 0
          )
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
       ecode++;
       break;
   
  @@ -1795,7 +1943,7 @@
       if (eptr >= md->end_subject)
         {
         SCHECK_PARTIAL();
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
         }
       GETCHARINCTEST(c, eptr);
       if (
  @@ -1804,7 +1952,7 @@
   #endif
          (md->ctypes[c] & ctype_word) == 0
          )
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
       ecode++;
       break;
   
  @@ -1812,12 +1960,12 @@
       if (eptr >= md->end_subject)
         {
         SCHECK_PARTIAL();
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
         }
       GETCHARINCTEST(c, eptr);
       switch(c)
         {
  -      default: RRETURN(MATCH_NOMATCH);
  +      default: MRRETURN(MATCH_NOMATCH);
         case 0x000d:
         if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
         break;
  @@ -1830,7 +1978,7 @@
         case 0x0085:
         case 0x2028:
         case 0x2029:
  -      if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
  +      if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);
         break;
         }
       ecode++;
  @@ -1840,7 +1988,7 @@
       if (eptr >= md->end_subject)
         {
         SCHECK_PARTIAL();
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
         }
       GETCHARINCTEST(c, eptr);
       switch(c)
  @@ -1865,7 +2013,7 @@
         case 0x202f:    /* NARROW NO-BREAK SPACE */
         case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
         case 0x3000:    /* IDEOGRAPHIC SPACE */
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
         }
       ecode++;
       break;
  @@ -1874,12 +2022,12 @@
       if (eptr >= md->end_subject)
         {
         SCHECK_PARTIAL();
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
         }
       GETCHARINCTEST(c, eptr);
       switch(c)
         {
  -      default: RRETURN(MATCH_NOMATCH);
  +      default: MRRETURN(MATCH_NOMATCH);
         case 0x09:      /* HT */
         case 0x20:      /* SPACE */
         case 0xa0:      /* NBSP */
  @@ -1908,7 +2056,7 @@
       if (eptr >= md->end_subject)
         {
         SCHECK_PARTIAL();
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
         }
       GETCHARINCTEST(c, eptr);
       switch(c)
  @@ -1921,7 +2069,7 @@
         case 0x85:      /* NEL */
         case 0x2028:    /* LINE SEPARATOR */
         case 0x2029:    /* PARAGRAPH SEPARATOR */
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
         }
       ecode++;
       break;
  @@ -1930,12 +2078,12 @@
       if (eptr >= md->end_subject)
         {
         SCHECK_PARTIAL();
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
         }
       GETCHARINCTEST(c, eptr);
       switch(c)
         {
  -      default: RRETURN(MATCH_NOMATCH);
  +      default: MRRETURN(MATCH_NOMATCH);
         case 0x0a:      /* LF */
         case 0x0b:      /* VT */
         case 0x0c:      /* FF */
  @@ -1957,7 +2105,7 @@
       if (eptr >= md->end_subject)
         {
         SCHECK_PARTIAL();
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
         }
       GETCHARINCTEST(c, eptr);
         {
  @@ -1966,31 +2114,63 @@
         switch(ecode[1])
           {
           case PT_ANY:
  -        if (op == OP_NOTPROP) RRETURN(MATCH_NOMATCH);
  +        if (op == OP_NOTPROP) MRRETURN(MATCH_NOMATCH);
           break;
   
           case PT_LAMP:
           if ((prop->chartype == ucp_Lu ||
                prop->chartype == ucp_Ll ||
                prop->chartype == ucp_Lt) == (op == OP_NOTPROP))
  -          RRETURN(MATCH_NOMATCH);
  -         break;
  +          MRRETURN(MATCH_NOMATCH);
  +        break;
   
           case PT_GC:
           if ((ecode[2] != _pcre_ucp_gentype[prop->chartype]) == (op == OP_PROP))
  -          RRETURN(MATCH_NOMATCH);
  +          MRRETURN(MATCH_NOMATCH);
           break;
   
           case PT_PC:
           if ((ecode[2] != prop->chartype) == (op == OP_PROP))
  -          RRETURN(MATCH_NOMATCH);
  +          MRRETURN(MATCH_NOMATCH);
           break;
   
           case PT_SC:
           if ((ecode[2] != prop->script) == (op == OP_PROP))
  -          RRETURN(MATCH_NOMATCH);
  +          MRRETURN(MATCH_NOMATCH);
           break;
   
  +        /* These are specials */
  +
  +        case PT_ALNUM:
  +        if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||
  +             _pcre_ucp_gentype[prop->chartype] == ucp_N) == (op == OP_NOTPROP))
  +          MRRETURN(MATCH_NOMATCH);
  +        break;
  +
  +        case PT_SPACE:    /* Perl space */
  +        if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||
  +             c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
  +               == (op == OP_NOTPROP))
  +          MRRETURN(MATCH_NOMATCH);
  +        break;
  +
  +        case PT_PXSPACE:  /* POSIX space */
  +        if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||
  +             c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
  +             c == CHAR_FF || c == CHAR_CR)
  +               == (op == OP_NOTPROP))
  +          MRRETURN(MATCH_NOMATCH);
  +        break;
  +
  +        case PT_WORD:
  +        if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||
  +             _pcre_ucp_gentype[prop->chartype] == ucp_N ||
  +             c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))
  +          MRRETURN(MATCH_NOMATCH);
  +        break;
  +
  +        /* This should never occur */
  +
           default:
           RRETURN(PCRE_ERROR_INTERNAL);
           }
  @@ -2006,12 +2186,12 @@
       if (eptr >= md->end_subject)
         {
         SCHECK_PARTIAL();
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
         }
       GETCHARINCTEST(c, eptr);
         {
         int category = UCD_CATEGORY(c);
  -      if (category == ucp_M) RRETURN(MATCH_NOMATCH);
  +      if (category == ucp_M) MRRETURN(MATCH_NOMATCH);
         while (eptr < md->end_subject)
           {
           int len = 1;
  @@ -2056,7 +2236,7 @@
         referenced subpattern. */
   
         if (offset >= offset_top || md->offset_vector[offset] < 0)
  -        length = (md->jscript_compat)? 0 : md->end_subject - eptr + 1;
  +        length = (md->jscript_compat)? 0 : (int)(md->end_subject - eptr + 1);
         else
           length = md->offset_vector[offset+1] - md->offset_vector[offset];
   
  @@ -2090,7 +2270,7 @@
           if (!match_ref(offset, eptr, length, md, ims))
             {
             CHECK_PARTIAL();
  -          RRETURN(MATCH_NOMATCH);
  +          MRRETURN(MATCH_NOMATCH);
             }
           eptr += length;
           continue;              /* With the main loop */
  @@ -2110,7 +2290,7 @@
           if (!match_ref(offset, eptr, length, md, ims))
             {
             CHECK_PARTIAL();
  -          RRETURN(MATCH_NOMATCH);
  +          MRRETURN(MATCH_NOMATCH);
             }
           eptr += length;
           }
  @@ -2128,11 +2308,11 @@
             {
             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM14);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -          if (fi >= max) RRETURN(MATCH_NOMATCH);
  +          if (fi >= max) MRRETURN(MATCH_NOMATCH);
             if (!match_ref(offset, eptr, length, md, ims))
               {
               CHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             eptr += length;
             }
  @@ -2159,7 +2339,7 @@
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             eptr -= length;
             }
  -        RRETURN(MATCH_NOMATCH);
  +        MRRETURN(MATCH_NOMATCH);
           }
         }
       /* Control never gets here */
  @@ -2221,16 +2401,16 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             GETCHARINC(c, eptr);
             if (c > 255)
               {
  -            if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
  +            if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);
               }
             else
               {
  -            if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
  +            if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
               }
             }
           }
  @@ -2243,10 +2423,10 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             c = *eptr++;
  -          if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
  +          if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
             }
           }
   
  @@ -2268,20 +2448,20 @@
               {
               RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM16);
               if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -            if (fi >= max) RRETURN(MATCH_NOMATCH);
  +            if (fi >= max) MRRETURN(MATCH_NOMATCH);
               if (eptr >= md->end_subject)
                 {
                 SCHECK_PARTIAL();
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
                 }
               GETCHARINC(c, eptr);
               if (c > 255)
                 {
  -              if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
  +              if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);
                 }
               else
                 {
  -              if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
  +              if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
                 }
               }
             }
  @@ -2293,14 +2473,14 @@
               {
               RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM17);
               if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -            if (fi >= max) RRETURN(MATCH_NOMATCH);
  +            if (fi >= max) MRRETURN(MATCH_NOMATCH);
               if (eptr >= md->end_subject)
                 {
                 SCHECK_PARTIAL();
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
                 }
               c = *eptr++;
  -            if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
  +            if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
               }
             }
           /* Control never gets here */
  @@ -2366,7 +2546,7 @@
               }
             }
   
  -        RRETURN(MATCH_NOMATCH);
  +        MRRETURN(MATCH_NOMATCH);
           }
         }
       /* Control never gets here */
  @@ -2418,10 +2598,10 @@
           if (eptr >= md->end_subject)
             {
             SCHECK_PARTIAL();
  -          RRETURN(MATCH_NOMATCH);
  +          MRRETURN(MATCH_NOMATCH);
             }
           GETCHARINCTEST(c, eptr);
  -        if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);
  +        if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);
           }
   
         /* If max == min we can continue with the main loop without the
  @@ -2438,14 +2618,14 @@
             {
             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM20);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -          if (fi >= max) RRETURN(MATCH_NOMATCH);
  +          if (fi >= max) MRRETURN(MATCH_NOMATCH);
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             GETCHARINCTEST(c, eptr);
  -          if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);
  +          if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);
             }
           /* Control never gets here */
           }
  @@ -2474,7 +2654,7 @@
             if (eptr-- == pp) break;        /* Stop if tried at original pos */
             if (utf8) BACKCHAR(eptr);
             }
  -        RRETURN(MATCH_NOMATCH);
  +        MRRETURN(MATCH_NOMATCH);
           }
   
         /* Control never gets here */
  @@ -2493,9 +2673,9 @@
         if (length > md->end_subject - eptr)
           {
           CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */
  -        RRETURN(MATCH_NOMATCH);
  +        MRRETURN(MATCH_NOMATCH);
           }
  -      while (length-- > 0) if (*ecode++ != *eptr++) RRETURN(MATCH_NOMATCH);
  +      while (length-- > 0) if (*ecode++ != *eptr++) MRRETURN(MATCH_NOMATCH);
         }
       else
   #endif
  @@ -2505,9 +2685,9 @@
         if (md->end_subject - eptr < 1)
           {
           SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */
  -        RRETURN(MATCH_NOMATCH);
  +        MRRETURN(MATCH_NOMATCH);
           }
  -      if (ecode[1] != *eptr++) RRETURN(MATCH_NOMATCH);
  +      if (ecode[1] != *eptr++) MRRETURN(MATCH_NOMATCH);
         ecode += 2;
         }
       break;
  @@ -2525,7 +2705,7 @@
         if (length > md->end_subject - eptr)
           {
           CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */
  -        RRETURN(MATCH_NOMATCH);
  +        MRRETURN(MATCH_NOMATCH);
           }
   
         /* If the pattern character's value is < 128, we have only one byte, and
  @@ -2533,7 +2713,7 @@
   
         if (fc < 128)
           {
  -        if (md->lcc[*ecode++] != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
  +        if (md->lcc[*ecode++] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
           }
   
         /* Otherwise we must pick up the subject character */
  @@ -2552,7 +2732,7 @@
   #ifdef SUPPORT_UCP
             if (dc != UCD_OTHERCASE(fc))
   #endif
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
             }
           }
         }
  @@ -2564,9 +2744,9 @@
         if (md->end_subject - eptr < 1)
           {
           SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */
  -        RRETURN(MATCH_NOMATCH);
  +        MRRETURN(MATCH_NOMATCH);
           }
  -      if (md->lcc[ecode[1]] != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
  +      if (md->lcc[ecode[1]] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
         ecode += 2;
         }
       break;
  @@ -2660,7 +2840,7 @@
             else
               {
               CHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             }
   
  @@ -2672,7 +2852,7 @@
               {
               RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM22);
               if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -            if (fi >= max) RRETURN(MATCH_NOMATCH);
  +            if (fi >= max) MRRETURN(MATCH_NOMATCH);
               if (eptr <= md->end_subject - length &&
                 memcmp(eptr, charptr, length) == 0) eptr += length;
   #ifdef SUPPORT_UCP
  @@ -2683,7 +2863,7 @@
               else
                 {
                 CHECK_PARTIAL();
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
                 }
               }
             /* Control never gets here */
  @@ -2714,7 +2894,7 @@
               {
               RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM23);
               if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -            if (eptr == pp) { RRETURN(MATCH_NOMATCH); }
  +            if (eptr == pp) { MRRETURN(MATCH_NOMATCH); }
   #ifdef SUPPORT_UCP
               eptr--;
               BACKCHAR(eptr);
  @@ -2757,9 +2937,9 @@
           if (eptr >= md->end_subject)
             {
             SCHECK_PARTIAL();
  -          RRETURN(MATCH_NOMATCH);
  +          MRRETURN(MATCH_NOMATCH);
             }
  -        if (fc != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
  +        if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
           }
         if (min == max) continue;
         if (minimize)
  @@ -2768,13 +2948,13 @@
             {
             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM24);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -          if (fi >= max) RRETURN(MATCH_NOMATCH);
  +          if (fi >= max) MRRETURN(MATCH_NOMATCH);
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
  -          if (fc != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
  +          if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
             }
           /* Control never gets here */
           }
  @@ -2800,7 +2980,7 @@
             eptr--;
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             }
  -        RRETURN(MATCH_NOMATCH);
  +        MRRETURN(MATCH_NOMATCH);
           }
         /* Control never gets here */
         }
  @@ -2814,9 +2994,9 @@
           if (eptr >= md->end_subject)
             {
             SCHECK_PARTIAL();
  -          RRETURN(MATCH_NOMATCH);
  +          MRRETURN(MATCH_NOMATCH);
             }
  -        if (fc != *eptr++) RRETURN(MATCH_NOMATCH);
  +        if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);
           }
   
         if (min == max) continue;
  @@ -2827,13 +3007,13 @@
             {
             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM26);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -          if (fi >= max) RRETURN(MATCH_NOMATCH);
  +          if (fi >= max) MRRETURN(MATCH_NOMATCH);
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
  -          if (fc != *eptr++) RRETURN(MATCH_NOMATCH);
  +          if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);
             }
           /* Control never gets here */
           }
  @@ -2858,7 +3038,7 @@
             eptr--;
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             }
  -        RRETURN(MATCH_NOMATCH);
  +        MRRETURN(MATCH_NOMATCH);
           }
         }
       /* Control never gets here */
  @@ -2870,7 +3050,7 @@
       if (eptr >= md->end_subject)
         {
         SCHECK_PARTIAL();
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
         }
       ecode++;
       GETCHARINCTEST(c, eptr);
  @@ -2880,11 +3060,11 @@
         if (c < 256)
   #endif
         c = md->lcc[c];
  -      if (md->lcc[*ecode++] == c) RRETURN(MATCH_NOMATCH);
  +      if (md->lcc[*ecode++] == c) MRRETURN(MATCH_NOMATCH);
         }
       else
         {
  -      if (*ecode++ == c) RRETURN(MATCH_NOMATCH);
  +      if (*ecode++ == c) MRRETURN(MATCH_NOMATCH);
         }
       break;
   
  @@ -2978,11 +3158,11 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             GETCHARINC(d, eptr);
             if (d < 256) d = md->lcc[d];
  -          if (fc == d) RRETURN(MATCH_NOMATCH);
  +          if (fc == d) MRRETURN(MATCH_NOMATCH);
             }
           }
         else
  @@ -2995,9 +3175,9 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
  -          if (fc == md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
  +          if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
             }
           }
   
  @@ -3014,15 +3194,15 @@
               {
               RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM28);
               if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -            if (fi >= max) RRETURN(MATCH_NOMATCH);
  +            if (fi >= max) MRRETURN(MATCH_NOMATCH);
               if (eptr >= md->end_subject)
                 {
                 SCHECK_PARTIAL();
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
                 }
               GETCHARINC(d, eptr);
               if (d < 256) d = md->lcc[d];
  -            if (fc == d) RRETURN(MATCH_NOMATCH);
  +            if (fc == d) MRRETURN(MATCH_NOMATCH);
               }
             }
           else
  @@ -3033,13 +3213,13 @@
               {
               RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM29);
               if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -            if (fi >= max) RRETURN(MATCH_NOMATCH);
  +            if (fi >= max) MRRETURN(MATCH_NOMATCH);
               if (eptr >= md->end_subject)
                 {
                 SCHECK_PARTIAL();
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
                 }
  -            if (fc == md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
  +            if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
               }
             }
           /* Control never gets here */
  @@ -3101,7 +3281,7 @@
               }
             }
   
  -        RRETURN(MATCH_NOMATCH);
  +        MRRETURN(MATCH_NOMATCH);
           }
         /* Control never gets here */
         }
  @@ -3120,10 +3300,10 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             GETCHARINC(d, eptr);
  -          if (fc == d) RRETURN(MATCH_NOMATCH);
  +          if (fc == d) MRRETURN(MATCH_NOMATCH);
             }
           }
         else
  @@ -3135,9 +3315,9 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
  -          if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
  +          if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);
             }
           }
   
  @@ -3154,14 +3334,14 @@
               {
               RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM32);
               if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -            if (fi >= max) RRETURN(MATCH_NOMATCH);
  +            if (fi >= max) MRRETURN(MATCH_NOMATCH);
               if (eptr >= md->end_subject)
                 {
                 SCHECK_PARTIAL();
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
                 }
               GETCHARINC(d, eptr);
  -            if (fc == d) RRETURN(MATCH_NOMATCH);
  +            if (fc == d) MRRETURN(MATCH_NOMATCH);
               }
             }
           else
  @@ -3172,13 +3352,13 @@
               {
               RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM33);
               if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -            if (fi >= max) RRETURN(MATCH_NOMATCH);
  +            if (fi >= max) MRRETURN(MATCH_NOMATCH);
               if (eptr >= md->end_subject)
                 {
                 SCHECK_PARTIAL();
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
                 }
  -            if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
  +            if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);
               }
             }
           /* Control never gets here */
  @@ -3239,7 +3419,7 @@
               }
             }
   
  -        RRETURN(MATCH_NOMATCH);
  +        MRRETURN(MATCH_NOMATCH);
           }
         }
       /* Control never gets here */
  @@ -3333,13 +3513,13 @@
           switch(prop_type)
             {
             case PT_ANY:
  -          if (prop_fail_result) RRETURN(MATCH_NOMATCH);
  +          if (prop_fail_result) MRRETURN(MATCH_NOMATCH);
             for (i = 1; i <= min; i++)
               {
               if (eptr >= md->end_subject)
                 {
                 SCHECK_PARTIAL();
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
                 }
               GETCHARINCTEST(c, eptr);
               }
  @@ -3351,14 +3531,14 @@
               if (eptr >= md->end_subject)
                 {
                 SCHECK_PARTIAL();
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
                 }
               GETCHARINCTEST(c, eptr);
               prop_chartype = UCD_CHARTYPE(c);
               if ((prop_chartype == ucp_Lu ||
                    prop_chartype == ucp_Ll ||
                    prop_chartype == ucp_Lt) == prop_fail_result)
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
               }
             break;
   
  @@ -3368,12 +3548,12 @@
               if (eptr >= md->end_subject)
                 {
                 SCHECK_PARTIAL();
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
                 }
               GETCHARINCTEST(c, eptr);
               prop_category = UCD_CATEGORY(c);
               if ((prop_category == prop_value) == prop_fail_result)
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
               }
             break;
   
  @@ -3383,12 +3563,12 @@
               if (eptr >= md->end_subject)
                 {
                 SCHECK_PARTIAL();
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
                 }
               GETCHARINCTEST(c, eptr);
               prop_chartype = UCD_CHARTYPE(c);
               if ((prop_chartype == prop_value) == prop_fail_result)
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
               }
             break;
   
  @@ -3398,15 +3578,84 @@
               if (eptr >= md->end_subject)
                 {
                 SCHECK_PARTIAL();
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
                 }
               GETCHARINCTEST(c, eptr);
               prop_script = UCD_SCRIPT(c);
               if ((prop_script == prop_value) == prop_fail_result)
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
  +            }
  +          break;
  +
  +          case PT_ALNUM:
  +          for (i = 1; i <= min; i++)
  +            {
  +            if (eptr >= md->end_subject)
  +              {
  +              SCHECK_PARTIAL();
  +              MRRETURN(MATCH_NOMATCH);
  +              }
  +            GETCHARINCTEST(c, eptr);
  +            prop_category = UCD_CATEGORY(c);
  +            if ((prop_category == ucp_L || prop_category == ucp_N)
  +                   == prop_fail_result)
  +              MRRETURN(MATCH_NOMATCH);
  +            }
  +          break;
  +
  +          case PT_SPACE:    /* Perl space */
  +          for (i = 1; i <= min; i++)
  +            {
  +            if (eptr >= md->end_subject)
  +              {
  +              SCHECK_PARTIAL();
  +              MRRETURN(MATCH_NOMATCH);
  +              }
  +            GETCHARINCTEST(c, eptr);
  +            prop_category = UCD_CATEGORY(c);
  +            if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
  +                 c == CHAR_FF || c == CHAR_CR)
  +                   == prop_fail_result)
  +              MRRETURN(MATCH_NOMATCH);
               }
             break;
   
  +          case PT_PXSPACE:  /* POSIX space */
  +          for (i = 1; i <= min; i++)
  +            {
  +            if (eptr >= md->end_subject)
  +              {
  +              SCHECK_PARTIAL();
  +              MRRETURN(MATCH_NOMATCH);
  +              }
  +            GETCHARINCTEST(c, eptr);
  +            prop_category = UCD_CATEGORY(c);
  +            if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
  +                 c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)
  +                   == prop_fail_result)
  +              MRRETURN(MATCH_NOMATCH);
  +            }
  +          break;
  +
  +          case PT_WORD:
  +          for (i = 1; i <= min; i++)
  +            {
  +            if (eptr >= md->end_subject)
  +              {
  +              SCHECK_PARTIAL();
  +              MRRETURN(MATCH_NOMATCH);
  +              }
  +            GETCHARINCTEST(c, eptr);
  +            prop_category = UCD_CATEGORY(c);
  +            if ((prop_category == ucp_L || prop_category == ucp_N ||
  +                 c == CHAR_UNDERSCORE)
  +                   == prop_fail_result)
  +              MRRETURN(MATCH_NOMATCH);
  +            }
  +          break;
  +
  +          /* This should not occur */
  +
             default:
             RRETURN(PCRE_ERROR_INTERNAL);
             }
  @@ -3422,11 +3671,11 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             GETCHARINCTEST(c, eptr);
             prop_category = UCD_CATEGORY(c);
  -          if (prop_category == ucp_M) RRETURN(MATCH_NOMATCH);
  +          if (prop_category == ucp_M) MRRETURN(MATCH_NOMATCH);
             while (eptr < md->end_subject)
               {
               int len = 1;
  @@ -3453,9 +3702,9 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
  -          if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
  +          if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);
             eptr++;
             while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
             }
  @@ -3467,7 +3716,7 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             eptr++;
             while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
  @@ -3475,7 +3724,7 @@
           break;
   
           case OP_ANYBYTE:
  -        if (eptr > md->end_subject - min) RRETURN(MATCH_NOMATCH);
  +        if (eptr > md->end_subject - min) MRRETURN(MATCH_NOMATCH);
           eptr += min;
           break;
   
  @@ -3485,12 +3734,12 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             GETCHARINC(c, eptr);
             switch(c)
               {
  -            default: RRETURN(MATCH_NOMATCH);
  +            default: MRRETURN(MATCH_NOMATCH);
               case 0x000d:
               if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
               break;
  @@ -3503,7 +3752,7 @@
               case 0x0085:
               case 0x2028:
               case 0x2029:
  -            if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
  +            if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);
               break;
               }
             }
  @@ -3515,7 +3764,7 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             GETCHARINC(c, eptr);
             switch(c)
  @@ -3540,7 +3789,7 @@
               case 0x202f:    /* NARROW NO-BREAK SPACE */
               case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
               case 0x3000:    /* IDEOGRAPHIC SPACE */
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             }
           break;
  @@ -3551,12 +3800,12 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             GETCHARINC(c, eptr);
             switch(c)
               {
  -            default: RRETURN(MATCH_NOMATCH);
  +            default: MRRETURN(MATCH_NOMATCH);
               case 0x09:      /* HT */
               case 0x20:      /* SPACE */
               case 0xa0:      /* NBSP */
  @@ -3587,7 +3836,7 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             GETCHARINC(c, eptr);
             switch(c)
  @@ -3600,7 +3849,7 @@
               case 0x85:      /* NEL */
               case 0x2028:    /* LINE SEPARATOR */
               case 0x2029:    /* PARAGRAPH SEPARATOR */
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             }
           break;
  @@ -3611,12 +3860,12 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             GETCHARINC(c, eptr);
             switch(c)
               {
  -            default: RRETURN(MATCH_NOMATCH);
  +            default: MRRETURN(MATCH_NOMATCH);
               case 0x0a:      /* LF */
               case 0x0b:      /* VT */
               case 0x0c:      /* FF */
  @@ -3635,11 +3884,11 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             GETCHARINC(c, eptr);
             if (c < 128 && (md->ctypes[c] & ctype_digit) != 0)
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
             }
           break;
   
  @@ -3649,10 +3898,10 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_digit) == 0)
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
             /* No need to skip more bytes - we know it's a 1-byte character */
             }
           break;
  @@ -3663,10 +3912,10 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             if (*eptr < 128 && (md->ctypes[*eptr] & ctype_space) != 0)
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
             while (++eptr < md->end_subject && (*eptr & 0xc0) == 0x80);
             }
           break;
  @@ -3677,10 +3926,10 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_space) == 0)
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
             /* No need to skip more bytes - we know it's a 1-byte character */
             }
           break;
  @@ -3688,9 +3937,13 @@
           case OP_NOT_WORDCHAR:
           for (i = 1; i <= min; i++)
             {
  -          if (eptr >= md->end_subject ||
  -             (*eptr < 128 && (md->ctypes[*eptr] & ctype_word) != 0))
  -            RRETURN(MATCH_NOMATCH);
  +          if (eptr >= md->end_subject)
  +            {
  +            SCHECK_PARTIAL();
  +            MRRETURN(MATCH_NOMATCH);
  +            }
  +          if (*eptr < 128 && (md->ctypes[*eptr] & ctype_word) != 0)
  +            MRRETURN(MATCH_NOMATCH);
             while (++eptr < md->end_subject && (*eptr & 0xc0) == 0x80);
             }
           break;
  @@ -3701,10 +3954,10 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_word) == 0)
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
             /* No need to skip more bytes - we know it's a 1-byte character */
             }
           break;
  @@ -3727,9 +3980,9 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
  -          if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
  +          if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);
             eptr++;
             }
           break;
  @@ -3738,7 +3991,7 @@
           if (eptr > md->end_subject - min)
             {
             SCHECK_PARTIAL();
  -          RRETURN(MATCH_NOMATCH);
  +          MRRETURN(MATCH_NOMATCH);
             }
           eptr += min;
           break;
  @@ -3747,7 +4000,7 @@
           if (eptr > md->end_subject - min)
             {
             SCHECK_PARTIAL();
  -          RRETURN(MATCH_NOMATCH);
  +          MRRETURN(MATCH_NOMATCH);
             }
           eptr += min;
           break;
  @@ -3758,11 +4011,11 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             switch(*eptr++)
               {
  -            default: RRETURN(MATCH_NOMATCH);
  +            default: MRRETURN(MATCH_NOMATCH);
               case 0x000d:
               if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
               break;
  @@ -3772,7 +4025,7 @@
               case 0x000b:
               case 0x000c:
               case 0x0085:
  -            if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
  +            if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);
               break;
               }
             }
  @@ -3784,7 +4037,7 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             switch(*eptr++)
               {
  @@ -3792,7 +4045,7 @@
               case 0x09:      /* HT */
               case 0x20:      /* SPACE */
               case 0xa0:      /* NBSP */
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             }
           break;
  @@ -3803,11 +4056,11 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             switch(*eptr++)
               {
  -            default: RRETURN(MATCH_NOMATCH);
  +            default: MRRETURN(MATCH_NOMATCH);
               case 0x09:      /* HT */
               case 0x20:      /* SPACE */
               case 0xa0:      /* NBSP */
  @@ -3822,7 +4075,7 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             switch(*eptr++)
               {
  @@ -3832,7 +4085,7 @@
               case 0x0c:      /* FF */
               case 0x0d:      /* CR */
               case 0x85:      /* NEL */
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             }
           break;
  @@ -3843,11 +4096,11 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             switch(*eptr++)
               {
  -            default: RRETURN(MATCH_NOMATCH);
  +            default: MRRETURN(MATCH_NOMATCH);
               case 0x0a:      /* LF */
               case 0x0b:      /* VT */
               case 0x0c:      /* FF */
  @@ -3864,9 +4117,9 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
  -          if ((md->ctypes[*eptr++] & ctype_digit) != 0) RRETURN(MATCH_NOMATCH);
  +          if ((md->ctypes[*eptr++] & ctype_digit) != 0) MRRETURN(MATCH_NOMATCH);
             }
           break;
   
  @@ -3876,9 +4129,9 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
  -          if ((md->ctypes[*eptr++] & ctype_digit) == 0) RRETURN(MATCH_NOMATCH);
  +          if ((md->ctypes[*eptr++] & ctype_digit) == 0) MRRETURN(MATCH_NOMATCH);
             }
           break;
   
  @@ -3888,9 +4141,9 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
  -          if ((md->ctypes[*eptr++] & ctype_space) != 0) RRETURN(MATCH_NOMATCH);
  +          if ((md->ctypes[*eptr++] & ctype_space) != 0) MRRETURN(MATCH_NOMATCH);
             }
           break;
   
  @@ -3900,9 +4153,9 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
  -          if ((md->ctypes[*eptr++] & ctype_space) == 0) RRETURN(MATCH_NOMATCH);
  +          if ((md->ctypes[*eptr++] & ctype_space) == 0) MRRETURN(MATCH_NOMATCH);
             }
           break;
   
  @@ -3912,10 +4165,10 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             if ((md->ctypes[*eptr++] & ctype_word) != 0)
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
             }
           break;
   
  @@ -3925,10 +4178,10 @@
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             if ((md->ctypes[*eptr++] & ctype_word) == 0)
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
             }
           break;
   
  @@ -3957,14 +4210,14 @@
               {
               RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM36);
               if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -            if (fi >= max) RRETURN(MATCH_NOMATCH);
  +            if (fi >= max) MRRETURN(MATCH_NOMATCH);
               if (eptr >= md->end_subject)
                 {
                 SCHECK_PARTIAL();
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
                 }
  -            GETCHARINC(c, eptr);
  -            if (prop_fail_result) RRETURN(MATCH_NOMATCH);
  +            GETCHARINCTEST(c, eptr);
  +            if (prop_fail_result) MRRETURN(MATCH_NOMATCH);
               }
             /* Control never gets here */
   
  @@ -3973,18 +4226,18 @@
               {
               RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM37);
               if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -            if (fi >= max) RRETURN(MATCH_NOMATCH);
  +            if (fi >= max) MRRETURN(MATCH_NOMATCH);
               if (eptr >= md->end_subject)
                 {
                 SCHECK_PARTIAL();
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
                 }
  -            GETCHARINC(c, eptr);
  +            GETCHARINCTEST(c, eptr);
               prop_chartype = UCD_CHARTYPE(c);
               if ((prop_chartype == ucp_Lu ||
                    prop_chartype == ucp_Ll ||
                    prop_chartype == ucp_Lt) == prop_fail_result)
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
               }
             /* Control never gets here */
   
  @@ -3993,16 +4246,16 @@
               {
               RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM38);
               if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -            if (fi >= max) RRETURN(MATCH_NOMATCH);
  +            if (fi >= max) MRRETURN(MATCH_NOMATCH);
               if (eptr >= md->end_subject)
                 {
                 SCHECK_PARTIAL();
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
                 }
  -            GETCHARINC(c, eptr);
  +            GETCHARINCTEST(c, eptr);
               prop_category = UCD_CATEGORY(c);
               if ((prop_category == prop_value) == prop_fail_result)
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
               }
             /* Control never gets here */
   
  @@ -4011,16 +4264,16 @@
               {
               RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM39);
               if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -            if (fi >= max) RRETURN(MATCH_NOMATCH);
  +            if (fi >= max) MRRETURN(MATCH_NOMATCH);
               if (eptr >= md->end_subject)
                 {
                 SCHECK_PARTIAL();
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
                 }
  -            GETCHARINC(c, eptr);
  +            GETCHARINCTEST(c, eptr);
               prop_chartype = UCD_CHARTYPE(c);
               if ((prop_chartype == prop_value) == prop_fail_result)
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
               }
             /* Control never gets here */
   
  @@ -4029,19 +4282,101 @@
               {
               RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM40);
               if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -            if (fi >= max) RRETURN(MATCH_NOMATCH);
  +            if (fi >= max) MRRETURN(MATCH_NOMATCH);
               if (eptr >= md->end_subject)
                 {
                 SCHECK_PARTIAL();
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
                 }
  -            GETCHARINC(c, eptr);
  +            GETCHARINCTEST(c, eptr);
               prop_script = UCD_SCRIPT(c);
               if ((prop_script == prop_value) == prop_fail_result)
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
  +            }
  +          /* Control never gets here */
  +
  +          case PT_ALNUM:
  +          for (fi = min;; fi++)
  +            {
  +            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM59);
  +            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  +            if (fi >= max) MRRETURN(MATCH_NOMATCH);
  +            if (eptr >= md->end_subject)
  +              {
  +              SCHECK_PARTIAL();
  +              MRRETURN(MATCH_NOMATCH);
  +              }
  +            GETCHARINCTEST(c, eptr);
  +            prop_category = UCD_CATEGORY(c);
  +            if ((prop_category == ucp_L || prop_category == ucp_N)
  +                   == prop_fail_result)
  +              MRRETURN(MATCH_NOMATCH);
  +            }
  +          /* Control never gets here */
  +
  +          case PT_SPACE:    /* Perl space */
  +          for (fi = min;; fi++)
  +            {
  +            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM60);
  +            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  +            if (fi >= max) MRRETURN(MATCH_NOMATCH);
  +            if (eptr >= md->end_subject)
  +              {
  +              SCHECK_PARTIAL();
  +              MRRETURN(MATCH_NOMATCH);
  +              }
  +            GETCHARINCTEST(c, eptr);
  +            prop_category = UCD_CATEGORY(c);
  +            if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
  +                 c == CHAR_FF || c == CHAR_CR)
  +                   == prop_fail_result)
  +              MRRETURN(MATCH_NOMATCH);
  +            }
  +          /* Control never gets here */
  +
  +          case PT_PXSPACE:  /* POSIX space */
  +          for (fi = min;; fi++)
  +            {
  +            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM61);
  +            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  +            if (fi >= max) MRRETURN(MATCH_NOMATCH);
  +            if (eptr >= md->end_subject)
  +              {
  +              SCHECK_PARTIAL();
  +              MRRETURN(MATCH_NOMATCH);
  +              }
  +            GETCHARINCTEST(c, eptr);
  +            prop_category = UCD_CATEGORY(c);
  +            if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
  +                 c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)
  +                   == prop_fail_result)
  +              MRRETURN(MATCH_NOMATCH);
  +            }
  +          /* Control never gets here */
  +
  +          case PT_WORD:
  +          for (fi = min;; fi++)
  +            {
  +            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM62);
  +            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  +            if (fi >= max) MRRETURN(MATCH_NOMATCH);
  +            if (eptr >= md->end_subject)
  +              {
  +              SCHECK_PARTIAL();
  +              MRRETURN(MATCH_NOMATCH);
  +              }
  +            GETCHARINCTEST(c, eptr);
  +            prop_category = UCD_CATEGORY(c);
  +            if ((prop_category == ucp_L ||
  +                 prop_category == ucp_N ||
  +                 c == CHAR_UNDERSCORE)
  +                   == prop_fail_result)
  +              MRRETURN(MATCH_NOMATCH);
               }
             /* Control never gets here */
   
  +          /* This should never occur */
  +
             default:
             RRETURN(PCRE_ERROR_INTERNAL);
             }
  @@ -4056,15 +4391,15 @@
             {
             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM41);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -          if (fi >= max) RRETURN(MATCH_NOMATCH);
  +          if (fi >= max) MRRETURN(MATCH_NOMATCH);
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             GETCHARINCTEST(c, eptr);
             prop_category = UCD_CATEGORY(c);
  -          if (prop_category == ucp_M) RRETURN(MATCH_NOMATCH);
  +          if (prop_category == ucp_M) MRRETURN(MATCH_NOMATCH);
             while (eptr < md->end_subject)
               {
               int len = 1;
  @@ -4088,14 +4423,14 @@
             {
             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM42);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -          if (fi >= max) RRETURN(MATCH_NOMATCH);
  +          if (fi >= max) MRRETURN(MATCH_NOMATCH);
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             if (ctype == OP_ANY && IS_NEWLINE(eptr))
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
             GETCHARINC(c, eptr);
             switch(ctype)
               {
  @@ -4107,7 +4442,7 @@
               case OP_ANYNL:
               switch(c)
                 {
  -              default: RRETURN(MATCH_NOMATCH);
  +              default: MRRETURN(MATCH_NOMATCH);
                 case 0x000d:
                 if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
                 break;
  @@ -4119,7 +4454,7 @@
                 case 0x0085:
                 case 0x2028:
                 case 0x2029:
  -              if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
  +              if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);
                 break;
                 }
               break;
  @@ -4147,14 +4482,14 @@
                 case 0x202f:    /* NARROW NO-BREAK SPACE */
                 case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
                 case 0x3000:    /* IDEOGRAPHIC SPACE */
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
                 }
               break;
   
               case OP_HSPACE:
               switch(c)
                 {
  -              default: RRETURN(MATCH_NOMATCH);
  +              default: MRRETURN(MATCH_NOMATCH);
                 case 0x09:      /* HT */
                 case 0x20:      /* SPACE */
                 case 0xa0:      /* NBSP */
  @@ -4189,14 +4524,14 @@
                 case 0x85:      /* NEL */
                 case 0x2028:    /* LINE SEPARATOR */
                 case 0x2029:    /* PARAGRAPH SEPARATOR */
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
                 }
               break;
   
               case OP_VSPACE:
               switch(c)
                 {
  -              default: RRETURN(MATCH_NOMATCH);
  +              default: MRRETURN(MATCH_NOMATCH);
                 case 0x0a:      /* LF */
                 case 0x0b:      /* VT */
                 case 0x0c:      /* FF */
  @@ -4210,32 +4545,32 @@
   
               case OP_NOT_DIGIT:
               if (c < 256 && (md->ctypes[c] & ctype_digit) != 0)
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
               break;
   
               case OP_DIGIT:
               if (c >= 256 || (md->ctypes[c] & ctype_digit) == 0)
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
               break;
   
               case OP_NOT_WHITESPACE:
               if (c < 256 && (md->ctypes[c] & ctype_space) != 0)
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
               break;
   
               case OP_WHITESPACE:
               if  (c >= 256 || (md->ctypes[c] & ctype_space) == 0)
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
               break;
   
               case OP_NOT_WORDCHAR:
               if (c < 256 && (md->ctypes[c] & ctype_word) != 0)
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
               break;
   
               case OP_WORDCHAR:
               if (c >= 256 || (md->ctypes[c] & ctype_word) == 0)
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
               break;
   
               default:
  @@ -4251,14 +4586,14 @@
             {
             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM43);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
  -          if (fi >= max) RRETURN(MATCH_NOMATCH);
  +          if (fi >= max) MRRETURN(MATCH_NOMATCH);
             if (eptr >= md->end_subject)
               {
               SCHECK_PARTIAL();
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
               }
             if (ctype == OP_ANY && IS_NEWLINE(eptr))
  -            RRETURN(MATCH_NOMATCH);
  +            MRRETURN(MATCH_NOMATCH);
             c = *eptr++;
             switch(ctype)
               {
  @@ -4270,7 +4605,7 @@
               case OP_ANYNL:
               switch(c)
                 {
  -              default: RRETURN(MATCH_NOMATCH);
  +              default: MRRETURN(MATCH_NOMATCH);
                 case 0x000d:
                 if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
                 break;
  @@ -4281,7 +4616,7 @@
                 case 0x000b:
                 case 0x000c:
                 case 0x0085:
  -              if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
  +              if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);
                 break;
                 }
               break;
  @@ -4293,14 +4628,14 @@
                 case 0x09:      /* HT */
                 case 0x20:      /* SPACE */
                 case 0xa0:      /* NBSP */
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
                 }
               break;
   
               case OP_HSPACE:
               switch(c)
                 {
  -              default: RRETURN(MATCH_NOMATCH);
  +              default: MRRETURN(MATCH_NOMATCH);
                 case 0x09:      /* HT */
                 case 0x20:      /* SPACE */
                 case 0xa0:      /* NBSP */
  @@ -4317,14 +4652,14 @@
                 case 0x0c:      /* FF */
                 case 0x0d:      /* CR */
                 case 0x85:      /* NEL */
  -              RRETURN(MATCH_NOMATCH);
  +              MRRETURN(MATCH_NOMATCH);
                 }
               break;
   
               case OP_VSPACE:
               switch(c)
                 {
  -              default: RRETURN(MATCH_NOMATCH);
  +              default: MRRETURN(MATCH_NOMATCH);
                 case 0x0a:      /* LF */
                 case 0x0b:      /* VT */
                 case 0x0c:      /* FF */
  @@ -4335,27 +4670,27 @@
               break;
   
               case OP_NOT_DIGIT:
  -            if ((md->ctypes[c] & ctype_digit) != 0) RRETURN(MATCH_NOMATCH);
  +            if ((md->ctypes[c] & ctype_digit) != 0) MRRETURN(MATCH_NOMATCH);
               break;
   
               case OP_DIGIT:
  -            if ((md->ctypes[c] & ctype_digit) == 0) RRETURN(MATCH_NOMATCH);
  +            if ((md->ctypes[c] & ctype_digit) == 0) MRRETURN(MATCH_NOMATCH);
               break;
   
               case OP_NOT_WHITESPACE:
  -            if ((md->ctypes[c] & ctype_space) != 0) RRETURN(MATCH_NOMATCH);
  +            if ((md->ctypes[c] & ctype_space) != 0) MRRETURN(MATCH_NOMATCH);
               break;
   
               case OP_WHITESPACE:
  -            if  ((md->ctypes[c] & ctype_space) == 0) RRETURN(MATCH_NOMATCH);
  +            if  ((md->ctypes[c] & ctype_space) == 0) MRRETURN(MATCH_NOMATCH);
               break;
   
               case OP_NOT_WORDCHAR:
  -            if ((md->ctypes[c] & ctype_word) != 0) RRETURN(MATCH_NOMATCH);
  +            if ((md->ctypes[c] & ctype_word) != 0) MRRETURN(MATCH_NOMATCH);
               break;
   
               case OP_WORDCHAR:
  -            if ((md->ctypes[c] & ctype_word) == 0) RRETURN(MATCH_NOMATCH);
  +            if ((md->ctypes[c] & ctype_word) == 0) MRRETURN(MATCH_NOMATCH);
               break;
   
               default:
  @@ -4388,7 +4723,7 @@
                 SCHECK_PARTIAL();
                 break;
                 }
  -            GETCHARLEN(c, eptr, len);
  +            GETCHARLENTEST(c, eptr, len);
               if (prop_fail_result) break;
               eptr+= len;
               }
  @@ -4403,7 +4738,7 @@
                 SCHECK_PARTIAL();
                 break;
                 }
  -            GETCHARLEN(c, eptr, len);
  +            GETCHARLENTEST(c, eptr, len);
               prop_chartype = UCD_CHARTYPE(c);
               if ((prop_chartype == ucp_Lu ||
                    prop_chartype == ucp_Ll ||
  @@ -4422,7 +4757,7 @@
                 SCHECK_PARTIAL();
                 break;
                 }
  -            GETCHARLEN(c, eptr, len);
  +            GETCHARLENTEST(c, eptr, len);
               prop_category = UCD_CATEGORY(c);
               if ((prop_category == prop_value) == prop_fail_result)
                 break;
  @@ -4439,7 +4774,7 @@
                 SCHECK_PARTIAL();
                 break;
                 }
  -            GETCHARLEN(c, eptr, len);
  +            GETCHARLENTEST(c, eptr, len);
               prop_chartype = UCD_CHARTYPE(c);
               if ((prop_chartype == prop_value) == prop_fail_result)
                 break;
  @@ -4456,13 +4791,90 @@
                 SCHECK_PARTIAL();
                 break;
                 }
  -            GETCHARLEN(c, eptr, len);
  +            GETCHARLENTEST(c, eptr, len);
               prop_script = UCD_SCRIPT(c);
               if ((prop_script == prop_value) == prop_fail_result)
                 break;
               eptr+= len;
               }
             break;
  +
  +          case PT_ALNUM:
  +          for (i = min; i < max; i++)
  +            {
  +            int len = 1;
  +            if (eptr >= md->end_subject)
  +              {
  +              SCHECK_PARTIAL();
  +              break;
  +              }
  +            GETCHARLENTEST(c, eptr, len);
  +            prop_category = UCD_CATEGORY(c);
  +            if ((prop_category == ucp_L || prop_category == ucp_N)
  +                 == prop_fail_result)
  +              break;
  +            eptr+= len;
  +            }
  +          break;
  +
  +          case PT_SPACE:    /* Perl space */
  +          for (i = min; i < max; i++)
  +            {
  +            int len = 1;
  +            if (eptr >= md->end_subject)
  +              {
  +              SCHECK_PARTIAL();
  +              break;
  +              }
  +            GETCHARLENTEST(c, eptr, len);
  +            prop_category = UCD_CATEGORY(c);
  +            if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
  +                 c == CHAR_FF || c == CHAR_CR)
  +                 == prop_fail_result)
  +              break;
  +            eptr+= len;
  +            }
  +          break;
  +
  +          case PT_PXSPACE:  /* POSIX space */
  +          for (i = min; i < max; i++)
  +            {
  +            int len = 1;
  +            if (eptr >= md->end_subject)
  +              {
  +              SCHECK_PARTIAL();
  +              break;
  +              }
  +            GETCHARLENTEST(c, eptr, len);
  +            prop_category = UCD_CATEGORY(c);
  +            if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
  +                 c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)
  +                 == prop_fail_result)
  +              break;
  +            eptr+= len;
  +            }
  +          break;
  +
  +          case PT_WORD:
  +          for (i = min; i < max; i++)
  +            {
  +            int len = 1;
  +            if (eptr >= md->end_subject)
  +              {
  +              SCHECK_PARTIAL();
  +              break;
  +              }
  +            GETCHARLENTEST(c, eptr, len);
  +            prop_category = UCD_CATEGORY(c);
  +            if ((prop_category == ucp_L || prop_category == ucp_N ||
  +                 c == CHAR_UNDERSCORE) == prop_fail_result)
  +              break;
  +            eptr+= len;
  +            }
  +          break;
  +
  +          default:
  +          RRETURN(PCRE_ERROR_INTERNAL);
             }
   
           /* eptr is now past the end of the maximum run */
  @@ -5015,7 +5427,7 @@
   
         /* Get here if we can't make it match with any permitted repetitions */
   
  -      RRETURN(MATCH_NOMATCH);
  +      MRRETURN(MATCH_NOMATCH);
         }
       /* Control never gets here */
   
  @@ -5048,12 +5460,13 @@
     LBL( 9) LBL(10) LBL(11) LBL(12) LBL(13) LBL(14) LBL(15) LBL(17)
     LBL(19) LBL(24) LBL(25) LBL(26) LBL(27) LBL(29) LBL(31) LBL(33)
     LBL(35) LBL(43) LBL(47) LBL(48) LBL(49) LBL(50) LBL(51) LBL(52)
  -  LBL(53) LBL(54)
  +  LBL(53) LBL(54) LBL(55) LBL(56) LBL(57) LBL(58)
   #ifdef SUPPORT_UTF8
     LBL(16) LBL(18) LBL(20) LBL(21) LBL(22) LBL(23) LBL(28) LBL(30)
     LBL(32) LBL(34) LBL(42) LBL(46)
   #ifdef SUPPORT_UCP
     LBL(36) LBL(37) LBL(38) LBL(39) LBL(40) LBL(41) LBL(44) LBL(45)
  +  LBL(59) LBL(60) LBL(61) LBL(62)
   #endif  /* SUPPORT_UCP */
   #endif  /* SUPPORT_UTF8 */
     default:
  @@ -5257,6 +5670,7 @@
   
   md->endonly = (re->options & PCRE_DOLLAR_ENDONLY) != 0;
   utf8 = md->utf8 = (re->options & PCRE_UTF8) != 0;
  +md->use_ucp = (re->options & PCRE_UCP) != 0;
   md->jscript_compat = (re->options & PCRE_JAVASCRIPT_COMPAT) != 0;
   
   md->notbol = (options & PCRE_NOTBOL) != 0;
  @@ -5266,6 +5680,7 @@
   md->partial = ((options & PCRE_PARTIAL_HARD) != 0)? 2 :
                 ((options & PCRE_PARTIAL_SOFT) != 0)? 1 : 0;
   md->hitend = FALSE;
  +md->mark = NULL;                        /* In case never set */
   
   md->recursive = NULL;                   /* No recursion at top level */
   
  @@ -5544,8 +5959,16 @@
         while (start_match < end_subject)
           {
           register unsigned int c = *start_match;
  -        if ((start_bits[c/8] & (1 << (c&7))) == 0) start_match++;
  -          else break;
  +        if ((start_bits[c/8] & (1 << (c&7))) == 0)
  +          {
  +          start_match++;
  +#ifdef SUPPORT_UTF8
  +          if (utf8)
  +            while(start_match < end_subject && (*start_match & 0xc0) == 0x80)
  +              start_match++;
  +#endif
  +          }
  +        else break;
           }
         }
       }   /* Starting optimizations */
  @@ -5565,7 +5988,7 @@
       bytes to avoid spending too much time in this optimization. */
   
       if (study != NULL && (study->flags & PCRE_STUDY_MINLEN) != 0 &&
  -        end_subject - start_match < study->minlength)
  +        (pcre_uint32)(end_subject - start_match) < study->minlength)
         {
         rc = MATCH_NOMATCH;
         break;
  @@ -5628,7 +6051,7 @@
         }
       }
   
  -#ifdef DEBUG  /* Sigh. Some compilers never learn. */
  +#ifdef PCRE_DEBUG  /* Sigh. Some compilers never learn. */
     printf(">>>> Match against: ");
     pchars(start_match, end_subject - start_match, TRUE, md);
     printf("\n");
  @@ -5640,11 +6063,29 @@
     md->start_match_ptr = start_match;
     md->start_used_ptr = start_match;
     md->match_call_count = 0;
  -  rc = match(start_match, md->start_code, start_match, 2, md, ims, NULL, 0, 0);
  +  rc = match(start_match, md->start_code, start_match, NULL, 2, md, ims, NULL,
  +    0, 0);
     if (md->hitend && start_partial == NULL) start_partial = md->start_used_ptr;
   
     switch(rc)
       {
  +    /* SKIP passes back the next starting point explicitly, but if it is the
  +    same as the match we have just done, treat it as NOMATCH. */
  +
  +    case MATCH_SKIP:
  +    if (md->start_match_ptr != start_match)
  +      {
  +      new_start_match = md->start_match_ptr;
  +      break;
  +      }
  +    /* Fall through */
  +
  +    /* If MATCH_SKIP_ARG reaches this level it means that a MARK that matched
  +    the SKIP's arg was not found. We also treat this as NOMATCH. */
  +
  +    case MATCH_SKIP_ARG:
  +    /* Fall through */
  +
       /* NOMATCH and PRUNE advance by one character. THEN at this level acts
       exactly like PRUNE. */
   
  @@ -5659,12 +6100,6 @@
   #endif
       break;
   
  -    /* SKIP passes back the next starting point explicitly. */
  -
  -    case MATCH_SKIP:
  -    new_start_match = md->start_match_ptr;
  -    break;
  -
       /* COMMIT disables the bumpalong, but otherwise behaves as NOMATCH. */
   
       case MATCH_COMMIT:
  @@ -5710,7 +6145,8 @@
            md->nllen == 2))
       start_match++;
   
  -  }   /* End of for(;;) "bumpalong" loop */
  +  md->mark = NULL;   /* Reset for start of next match attempt */
  +  }                  /* End of for(;;) "bumpalong" loop */
   
   /* ==========================================================================*/
   
  @@ -5734,7 +6170,7 @@
   
   ENDLOOP:
   
  -if (rc == MATCH_MATCH)
  +if (rc == MATCH_MATCH || rc == MATCH_ACCEPT)
     {
     if (using_temporary_offsets)
       {
  @@ -5760,12 +6196,12 @@
   
     if (offsetcount < 2) rc = 0; else
       {
  -    offsets[0] = md->start_match_ptr - md->start_subject;
  -    offsets[1] = md->end_match_ptr - md->start_subject;
  +    offsets[0] = (int)(md->start_match_ptr - md->start_subject);
  +    offsets[1] = (int)(md->end_match_ptr - md->start_subject);
       }
   
     DPRINTF((">>>> returning %d\n", rc));
  -  return rc;
  +  goto RETURN_MARK;
     }
   
   /* Control gets here if there has been an error, or if the overall match
  @@ -5777,26 +6213,43 @@
     (pcre_free)(md->offset_vector);
     }
   
  +/* For anything other than nomatch or partial match, just return the code. */
  +
   if (rc != MATCH_NOMATCH && rc != PCRE_ERROR_PARTIAL)
     {
     DPRINTF((">>>> error: returning %d\n", rc));
     return rc;
     }
  -else if (start_partial != NULL)
  +
  +/* Handle partial matches - disable any mark data */
  +
  +if (start_partial != NULL)
     {
     DPRINTF((">>>> returning PCRE_ERROR_PARTIAL\n"));
  +  md->mark = NULL;
     if (offsetcount > 1)
       {
  -    offsets[0] = start_partial - (USPTR)subject;
  -    offsets[1] = end_subject - (USPTR)subject;
  +    offsets[0] = (int)(start_partial - (USPTR)subject);
  +    offsets[1] = (int)(end_subject - (USPTR)subject);
       }
  -  return PCRE_ERROR_PARTIAL;
  +  rc = PCRE_ERROR_PARTIAL;
     }
  +
  +/* This is the classic nomatch case */
  +
   else
     {
     DPRINTF((">>>> returning PCRE_ERROR_NOMATCH\n"));
  -  return PCRE_ERROR_NOMATCH;
  +  rc = PCRE_ERROR_NOMATCH;
     }
  +
  +/* Return the MARK data if it has been requested. */
  +
  +RETURN_MARK:
  +
  +if (extra_data != NULL && (extra_data->flags & PCRE_EXTRA_MARK) != 0)
  +  *(extra_data->mark) = (unsigned char *)(md->mark);
  +return rc;
   }
   
   /* End of pcre_exec.c */
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/pcre_globals.c
  ============================================================================
  $ cvs diff -u -r1.1.1.1 -r1.1.1.2 pcre_globals.c
  --- pcre/pcre_globals.c	14 Jan 2009 20:19:07 -0000	1.1.1.1
  +++ pcre/pcre_globals.c	21 Aug 2010 21:48:05 -0000	1.1.1.2
  @@ -43,8 +43,14 @@
   However, it calls memory allocation and freeing functions via the four
   indirections below, and it can optionally do callouts, using the fifth
   indirection. These values can be changed by the caller, but are shared between
  -all threads. However, when compiling for Virtual Pascal, things are done
  -differently, and global variables are not used (see pcre.in). */
  +all threads.
  +
  +For MS Visual Studio and Symbian OS, there are problems in initializing these
  +variables to non-local functions. In these cases, therefore, an indirection via
  +a local function is used.
  +
  +Also, when compiling for Virtual Pascal, things are done differently, and
  +global variables are not used. */
   
   #ifdef HAVE_CONFIG_H
   #include "config.h"
  @@ -52,7 +58,22 @@
   
   #include "pcre_internal.h"
   
  -#ifndef VPCOMPAT
  +#if defined _MSC_VER || defined  __SYMBIAN32__
  +static void* LocalPcreMalloc(size_t aSize)
  +  {
  +  return malloc(aSize);
  +