Update to gettext 0.10.39.

diff --git a/ABOUT-NLS b/ABOUT-NLS
index 7e6b380934937451fc5631b168b228fb9130c074..a4fb870be80904bd3988007bd0cbd9bdf6f7dc0b 100644 (file)
--- a/ABOUT-NLS
+++ b/ABOUT-NLS
@@ -164,102 +164,124 @@ Available Packages
 ==================
 
    Languages are not equally supported in all packages.  The following
 ==================
 
    Languages are not equally supported in all packages.  The following

-matrix shows the current state of internationalization, as of May 2001.
-The matrix shows, in regard of each package, for which languages PO
-files have been submitted to translation coordination, with a
+matrix shows the current state of internationalization, as of July
+2001.  The matrix shows, in regard of each package, for which languages
+PO files have been submitted to translation coordination, with a

 translation percentage of at least 50%.
 
 translation percentage of at least 50%.
 

-     Ready PO files    bg cs da de el en eo es et fi fr gl hr id it
-                     +----------------------------------------------+
-     a2ps            |          []             []                   |
-     bash            |          []       [] []       []             |
-     bison           |          []          [] []    []             |
-     clisp           |          []    []    []       []             |
-     cpio            |       [] []          []       []             |
-     diffutils       |       [] []       [] []       [] []    []    |
-     enscript        |          []                   []             |
-     error           |                               []             |
-     fileutils       |    [] [] [] []       []       [] []          |
-     findutils       |       [] []          [] []    [] []    [] [] |
-     flex            |       []             []       []             |
-     gawk            |                                              |
-     gcal            |                                              |
-     gcc             |       []                                     |
-     gettext         |    [] [] [] []       []       [] []    [] [] |
-     gnupg           |          []       []    []    []          [] |
-     grep            |                   []    []                [] |
-     hello           |       [] []       [] [] [] [] []       [] [] |
-     id-utils        |       []                      []             |
-     indent          |       [] []             []    [] []          |
-     libc            |    [] [] [] []       []       [] []       [] |
-     lilypond        |                                              |
-     lynx            |    [] [] []                                  |
-     m4              |    [] [] [] []                [] []    []    |
-     make            |          []          []       [] []          |
-     parted          |          []                      []          |
-     ptx             |       [] []          [] []    [] []    []    |
-     python          |                                              |
-     recode          |       [] [] []    [] []       [] []       [] |
-     sed             |    []    [] []    []    []    [] []    [] [] |
-     sh-utils        |    [] [] [] []       [] []    [] []       [] |
-     sharutils       |    [] [] [] []       []       [] []          |
-     soundtracker    |                                              |
-     sp              |                                              |
-     tar             |    [] [] []          [] []    []       [] [] |
-     texinfo         |    []    []       []          []             |
-     textutils       |    [] [] [] []       []       [] []          |
-     util-linux      |    []                                        |
-     wdiff           |    [] []             [] []    [] []    []    |
-     wget            |    [] [] [] []       [] []    [] []       [] |
-                     +----------------------------------------------+
-                       bg cs da de el en eo es et fi fr gl hr id it
-                        0 14 21 27 10  1  8 20 13  1 28 17  0  9 11
+     Ready PO files    bg cs da de el en eo es et fi fr gl he hr id it
+                     +-------------------------------------------------+
+     a2ps            |          []             []                      |
+     bash            |          []       [] []       []                |
+     bfd             |                                                 |
+     binutils        |                                                 |
+     bison           |          []          [] []    []                |
+     clisp           |          []    []    []       []                |
+     cpio            |       [] []          []       [] []             |
+     diffutils       |       [] []       [] []       [] []       []    |
+     enscript        |          []                   []                |
+     error           |                      []       []                |
+     fetchmail       |                                                 |
+     fileutils       |    [] [] [] []       []       [] []             |
+     findutils       |       [] []          [] []    [] []       [] [] |
+     flex            |       []             []       []                |
+     freetype        |                                                 |
+     gas             |                                                 |
+     gawk            |                                     []          |
+     gcal            |                                                 |
+     gcc             |                                                 |
+     gettext         |    [] [] [] []       []       [] []       [] [] |
+     gnupg           |          []       []    []    [] []          [] |
+     gprof           |                                                 |
+     grep            |          []       [] [] []    [] []          [] |
+     hello           |       [] [] []    [] [] [] [] [] []          [] |
+     id-utils        |       [] []                   []                |
+     indent          |       [] []             []    [] []             |
+     jpilot          |                               []                |
+     kbd             |                                                 |
+     ld              |                                                 |
+     libc            |    [] [] [] []       []       [] []          [] |
+     lilypond        |                                                 |
+     lynx            |    [] [] []                                     |
+     m4              |    [] [] [] []                [] []       []    |
+     make            |       [] []          []       [] []             |
+     nano            |                                  []       []    |
+     opcodes         |                                                 |
+     parted          |          []                      []             |
+     ptx             |       [] []          [] []    [] []       []    |
+     python          |                                                 |
+     recode          |       [] [] []    [] []       [] [] []       [] |
+     sed             |    [] [] [] []    []    []    [] []       [] [] |
+     sh-utils        |    [] [] [] []       [] []    [] []          [] |
+     sharutils       |    [] [] [] []       []       [] []             |
+     soundtracker    |                                  []             |
+     sp              |                                                 |
+     tar             |    [] [] []          [] []    []          [] [] |
+     texinfo         |    [] [] []       []          []                |
+     textutils       |    [] [] [] []       []       [] []             |
+     util-linux      |    [] []                                        |
+     wdiff           |          []             []                      |
+     wget            |    [] [] [] []       [] []    [] [] []          |
+                     +-------------------------------------------------+
+                       bg cs da de el en eo es et fi fr gl he hr id it
+                        0 13 23 30 11  1  8 21 13  1 29 22  3  0  8 10

      
      

-                       ja ko lv nl no pl pt pt_BR ru sk sl sv tr zh
-                     +----------------------------------------------+
-     a2ps            |          []                []    []          |  5
-     bash            |                                              |  4
-     bison           | []       []                []                |  7
-     clisp           |          []                                  |  5
-     cpio            |    []    []    []     []   []                |  9
-     diffutils       |                []          []       []       | 10
-     enscript        |          []           []   []                |  5
-     error           |                                              |  1
-     fileutils       | [] []    []    []     []   [] [] [] []       | 16
-     findutils       |    []    []    []     []   []       []       | 14
-     flex            |    []                      []       []       |  6
-     gawk            |                                              |  0
-     gcal            |                                              |  0
-     gcc             | []                                           |  2
-     gettext         | [] []    []    []     []   []    [] [] [] [] | 19
-     gnupg           | []             []                   []       |  8
-     grep            |                                              |  3
-     hello           | [] []    []    []     []   [] []    []       | 17
-     id-utils        |          []                []       []       |  5
-     indent          |    []    []    []          [] []    [] []    | 12
-     libc            | [] []       [] []     []      []    []       | 15
-     lilypond        |          []                                  |  1
-     lynx            | []       []           []   []       []       |  8
-     m4              | []       []    []          []       []       | 12
-     make            | []       []    []     []   []                |  9
-     parted          | []       []                []                |  5
-     ptx             |          [] [] [] []       []       []       | 13
-     python          |                                              |  0
-     recode          |                            []    [] []       | 11
-     sed             | []       []           []   [] [] [] []       | 16
-     sh-utils        | []       [] [] []     []   [] [] [] []    [] | 19
-     sharutils       | []       []                []       []       | 11
-     soundtracker    |                                              |  0
-     sp              |                                              |  0
-     tar             | []       [] [] []     []   []    [] []       | 16
-     texinfo         | []                         []                |  6
-     textutils       | []       [] [] []     []   [] [] []          | 15
-     util-linux      |                       []                     |  2
-     wdiff           |          []    []          [] []    []       | 12
-     wget            | []          []        []   [] [] [] []    [] | 17
-                     +----------------------------------------------+
-       29 teams        ja ko lv nl no pl pt pt_BR ru sk sl sv tr zh
-       40 domains      18  8  0 23  6 16  1  15   26  9  9 20  2  3  336
+                       ja ko lv nl no pl pt pt_BR ru sk sl sv tr uk zh
+                     +-------------------------------------------------+
+     a2ps            |          []                []    []             |  5
+     bash            |                                                 |  4
+     bfd             |                                                 |  0
+     binutils        |                                                 |  0
+     bison           | []       []                []                   |  7
+     clisp           |          []                                     |  5
+     cpio            |    []    []    []     []   []                   | 10
+     diffutils       |                []          []       []          | 10
+     enscript        |          []           []   []                   |  5
+     error           |                                        []       |  3
+     fetchmail       |                                                 |  0
+     fileutils       | [] []    []    []     []   [] [] [] [] []       | 17
+     findutils       |    []    []    []     []   []    [] [] []       | 16
+     flex            |    []                      []       []          |  6
+     freetype        |                                                 |  0
+     gas             |                                                 |  0
+     gawk            |                                        []       |  2
+     gcal            |                                                 |  0
+     gcc             |                                                 |  0
+     gettext         | [] []          []     []   []    [] [] []    [] | 18
+     gnupg           | []             []                   [] []       | 10
+     gprof           |                                                 |  0
+     grep            |                []                []    []       | 10
+     hello           | [] [] [] [] [] []          [] []    [] [] []    | 21
+     id-utils        |          []                []       []          |  6
+     indent          |    []    []    []          [] []    [] []       | 12
+     jpilot          |                                                 |  1
+     kbd             |                                        []       |  1
+     ld              |                                                 |  0
+     libc            | [] []    [] [] []     []      []    [] []       | 17
+     lilypond        | []       []                                     |  2
+     lynx            | []       []           []   []       []          |  8
+     m4              | []       []    []          []       []          | 12
+     make            | [] []    []    []     []   []          []       | 12
+     nano            |                                     []          |  3
+     opcodes         |                                                 |  0
+     parted          | []       []                []                   |  5
+     ptx             |          [] [] [] []       []       [] []       | 14
+     python          |                                                 |  0
+     recode          |                []          []    [] []          | 13
+     sed             | []       []           []   [] [] [] [] []       | 18
+     sh-utils        | []       [] [] []     []   [] [] [] [] []    [] | 20
+     sharutils       | []       []                []       []          | 11
+     soundtracker    |                                                 |  1
+     sp              |                                                 |  0
+     tar             | []       [] [] []     []   []    [] [] []       | 17
+     texinfo         | []                         []                   |  7
+     textutils       | []       [] [] []     []   [] [] []             | 15
+     util-linux      |                       []               []       |  4
+     wdiff           |                            [] []       []       |  5
+     wget            |          []                [] [] [] [] [] []    | 16
+                     +-------------------------------------------------+
+       31 teams        ja ko lv nl no pl pt pt_BR ru sk sl sv tr uk zh
+       51 domains      17  9  1 23  6 17  1  13   26  9 11 20 19  2  2  369

 
    Some counters in the preceding matrix are higher than the number of
 visible blocks let us expect.  This is because a few extra PO files are
 
    Some counters in the preceding matrix are higher than the number of
 visible blocks let us expect.  This is because a few extra PO files are


@@ -272,7 +294,7 @@ distributed as such by its maintainer.  There might be an observable
 lag between the mere existence a PO file and its wide availability in a
 distribution.
 
 lag between the mere existence a PO file and its wide availability in a
 distribution.
 

-   If May 2001 seems to be old, you may fetch a more recent copy of
+   If July 2001 seems to be old, you may fetch a more recent copy of

 this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
 matrix with full percentage details can be found at
 `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
 this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
 matrix with full percentage details can be found at
 `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.


@@ -282,13 +304,14 @@ Using `gettext' in new packages
 
    If you are writing a freely available program and want to
 internationalize it you are welcome to use GNU `gettext' in your
 
    If you are writing a freely available program and want to
 internationalize it you are welcome to use GNU `gettext' in your

-package.  Of course the GNU Public License applies to your sources from
-then if you include `gettext' directly in your distribution on but
-since you are writing free software anyway this is no restriction.
-
-   Once the sources are change appropriately and the setup can handle to
-use of `gettext' the only thing missing are the translations.  The Free
-Translation Project is also available for packages which are not
+package.  Of course the GNU General Public License applies to your
+sources from then on if you include `gettext' directly in your
+distribution but since you are writing free software anyway this is no
+restriction.
+
+   Once the sources are changed appropriately and the setup can handle
+to use of `gettext' the only thing missing are the translations.  The
+Free Translation Project is also available for packages which are not

 developed inside the GNU project.  Therefore the information given above
 applies also for every other Free Software Project.  Contact
 `translation@iro.umontreal.ca' to make the `.pot' files available to
 developed inside the GNU project.  Therefore the information given above
 applies also for every other Free Software Project.  Contact
 `translation@iro.umontreal.ca' to make the `.pot' files available to

diff --git a/ChangeLog b/ChangeLog
index 610b3ee1c2fd2a30456ad8ef157421ebcb80a6ab..2ee61339258685dad64efade14a76454f2cc476d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-03  Akim Demaille  <akim@epita.fr>
+
+       Update to gettext 0.10.39.
+

 2001-08-03  Akim Demaille  <akim@epita.fr>
 
        * lib/strspn.c: New.
 2001-08-03  Akim Demaille  <akim@epita.fr>
 
        * lib/strspn.c: New.

diff --git a/configure b/configure
index e5c8b06eed9054092a08a079a64434b1b2a51382..f1f6c8d00df7b4279f5602c2957576c553b488ee 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.

-# Generated by Autoconf 2.50 for bison 1.28a.
+# Generated by Autoconf 2.52 for bison 1.28a.

 #
 # Report bugs to <bug-bison@gnu.org>.
 #
 #
 # Report bugs to <bug-bison@gnu.org>.
 #


@@ -9,6 +9,19 @@
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 

+# 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
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+

 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh


@@ -93,21 +106,15 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # only ac_max_sed_lines should be used.
 : ${ac_max_here_lines=38}
 
 # only ac_max_sed_lines should be used.
 : ${ac_max_here_lines=38}
 

-# Avoid depending upon Character Ranges.
-ac_cr_az='abcdefghijklmnopqrstuvwxyz'
-ac_cr_AZ='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-ac_cr_09='0123456789'
-ac_cr_alnum=$ac_cr_az$ac_cr_AZ$ac_cr_09
-
-# Sed expression to map a string onto a valid sh and CPP variable names.
-ac_tr_sh="sed y%*+%pp%;s%[^_$ac_cr_alnum]%_%g"
-ac_tr_cpp="sed y%*$ac_cr_az%P$ac_cr_AZ%;s%[^_$ac_cr_alnum]%_%g"
-

 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>

-#include <sys/types.h>
-#include <sys/stat.h>
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif

 #if STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #if STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>


@@ -121,13 +128,16 @@ ac_includes_default="\
 #  include <memory.h>
 # endif
 # include <string.h>
 #  include <memory.h>
 # endif
 # include <string.h>

-#else
-# if HAVE_STRINGS_H
-#  include <strings.h>
-# endif
+#endif
+#if HAVE_STRINGS_H
+# include <strings.h>

 #endif
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #if HAVE_INTTYPES_H
 # include <inttypes.h>

+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif

 #endif
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 #if HAVE_UNISTD_H
 # include <unistd.h>


@@ -223,7 +233,7 @@ do
   -disable-* | --disable-*)
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
   -disable-* | --disable-*)
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.

-    expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&

       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
     ac_feature=`echo $ac_feature | sed 's/-/_/g'`


@@ -232,7 +242,7 @@ do
   -enable-* | --enable-*)
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
   -enable-* | --enable-*)
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.

-    expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&

       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
     ac_feature=`echo $ac_feature | sed 's/-/_/g'`


@@ -414,7 +424,7 @@ do
   -with-* | --with-*)
     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
   -with-* | --with-*)
     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.

-    expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&

       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
     ac_package=`echo $ac_package| sed 's/-/_/g'`
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
     ac_package=`echo $ac_package| sed 's/-/_/g'`


@@ -427,7 +437,7 @@ do
   -without-* | --without-*)
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
   -without-* | --without-*)
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.

-    expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&

       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
     ac_package=`echo $ac_package | sed 's/-/_/g'`
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
     ac_package=`echo $ac_package | sed 's/-/_/g'`


@@ -459,7 +469,7 @@ Try \`$0 --help' for more information." >&2
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.

-    expr "x$ac_envvar" : ".*[^_$ac_cr_alnum]" >/dev/null &&
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&

       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`


@@ -469,7 +479,7 @@ Try \`$0 --help' for more information." >&2
   *)
     # FIXME: should be removed in autoconf 3.0.
     echo "$as_me: WARNING: you should use --build, --host, --target" >&2
   *)
     # FIXME: should be removed in autoconf 3.0.
     echo "$as_me: WARNING: you should use --build, --host, --target" >&2

-    expr "x$ac_option" : ".*[^-._$ac_cr_alnum]" >/dev/null &&
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&

       echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
       echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;


@@ -483,15 +493,24 @@ if test -n "$ac_prev"; then
    { (exit 1); exit 1; }; }
 fi
 
    { (exit 1); exit 1; }; }
 fi
 

+# Be sure to have absolute paths.
+for ac_var in exec_prefix prefix
+do
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
+  esac
+done
+

 # Be sure to have absolute paths.
 for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
 # Be sure to have absolute paths.
 for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \

-              localstatedir libdir includedir oldincludedir infodir mandir \
-              exec_prefix prefix
+              localstatedir libdir includedir oldincludedir infodir mandir

 do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
     [\\/$]* | ?:[\\/]* ) ;;
 do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
     [\\/$]* | ?:[\\/]* ) ;;

-    NONE ) ;;

     *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; };;
   esac
     *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; };;
   esac


@@ -721,7 +740,7 @@ test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\EOF
 bison configure 1.28a
 if $ac_init_version; then
   cat <<\EOF
 bison configure 1.28a

-generated by GNU Autoconf 2.50
+generated by GNU Autoconf 2.52

 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.


@@ -736,7 +755,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by bison $as_me 1.28a, which was
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by bison $as_me 1.28a, which was

-generated by GNU Autoconf 2.50.  Invocation command line was
+generated by GNU Autoconf 2.52.  Invocation command line was

 
   $ $0 $@
 
 
   $ $0 $@
 


@@ -815,11 +834,11 @@ trap 'exit_status=$?
     *ac_space=\ *)
       sed -n \
         "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
     *ac_space=\ *)
       sed -n \
         "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;

-         s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"

       ;;
     *)
       sed -n \
       ;;
     *)
       sed -n \

-        "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"

       ;;
     esac;
 } >&5
       ;;
     esac;
 } >&5


@@ -840,7 +859,7 @@ trap 'exit_status=$?
     exit $exit_status
      ' 0
 for ac_signal in 1 2 13 15; do
     exit $exit_status
      ' 0
 for ac_signal in 1 2 13 15; do

-  trap 'ac_status=$?; ac_signal='$ac_signal'; { (exit $ac_status); exit $ac_status; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal

 done
 ac_signal=0
 
 done
 ac_signal=0
 


@@ -860,7 +879,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then

-    { echo "$as_me:863: loading site script $ac_site_file" >&5
+    { echo "$as_me:882: loading site script $ac_site_file" >&5

 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"
 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"


@@ -871,7 +890,7 @@ 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
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then

-    { echo "$as_me:874: loading cache $cache_file" >&5
+    { echo "$as_me:893: loading cache $cache_file" >&5

 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;


@@ -879,14 +898,14 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
     esac
   fi
 else

-  { echo "$as_me:882: creating cache $cache_file" >&5
+  { echo "$as_me:901: creating cache $cache_file" >&5

 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.
 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_suggest_removing_cache=false
+ac_cache_corrupted=false

 for ac_var in `(set) 2>&1 |
                sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
 for ac_var in `(set) 2>&1 |
                sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set


@@ -895,31 +914,44 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)

-      { echo "$as_me:898: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_suggest_removing_cache=: ;;
+      { echo "$as_me:917: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;

     ,set)
     ,set)

-      { echo "$as_me:902: WARNING: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: WARNING: \`$ac_var' was not set in the previous run" >&2;}
-      ac_suggest_removing_cache=: ;;
+      { echo "$as_me:921: error: \`$ac_var' was not set in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;

     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then

-        { echo "$as_me:908: WARNING: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: WARNING: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:910: WARNING:   former value:  $ac_old_val" >&5
-echo "$as_me: WARNING:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:912: WARNING:   current value: $ac_new_val" >&5
-echo "$as_me: WARNING:   current value: $ac_new_val" >&2;}
-        ac_suggest_removing_cache=:
+        { echo "$as_me:927: error: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+        { echo "$as_me:929:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+        { echo "$as_me:931:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+        ac_cache_corrupted=:

       fi;;
   esac
       fi;;
   esac

+  # Pass precious variables to config.status.  It doesn't matter if
+  # we pass some twice (in addition to the command line arguments).
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *" "*|*"   "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"`
+      ac_configure_args="$ac_configure_args '$ac_arg'"
+      ;;
+    *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val"
+       ;;
+    esac
+  fi

 done
 done

-if $ac_suggest_removing_cache; then
-  { echo "$as_me:919: WARNING: changes in the environment can compromise the build" >&5
-echo "$as_me: WARNING: changes in the environment can compromise the build" >&2;}
-  { echo "$as_me:921: WARNING: consider removing $cache_file and starting over" >&5
-echo "$as_me: WARNING: consider removing $cache_file and starting over" >&2;}
+if $ac_cache_corrupted; then
+  { echo "$as_me:950: error: changes in the environment can compromise the build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { echo "$as_me:952: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { (exit 1); exit 1; }; }

 fi
 
 ac_ext=c
 fi
 
 ac_ext=c


@@ -937,10 +969,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh

-if { (echo "$as_me:940: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:972: PATH=\".;.\"; conftest.sh") >&5

   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?

-  echo "$as_me:943: \$? = $ac_status" >&5
+  echo "$as_me:975: \$? = $ac_status" >&5

   (exit $ac_status); }; then
   ac_path_separator=';'
 else
   (exit $ac_status); }; then
   ac_path_separator=';'
 else


@@ -966,7 +998,7 @@ for ac_dir in config $srcdir/config; do
   fi
 done
 if test -z "$ac_aux_dir"; then
   fi
 done
 if test -z "$ac_aux_dir"; then

-  { { echo "$as_me:969: error: cannot find install-sh or install.sh in config $srcdir/config" >&5
+  { { echo "$as_me:1001: error: cannot find install-sh or install.sh in config $srcdir/config" >&5

 echo "$as_me: error: cannot find install-sh or install.sh in config $srcdir/config" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: cannot find install-sh or install.sh in config $srcdir/config" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -986,7 +1018,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.

-echo "$as_me:989: checking for a BSD compatible install" >&5
+echo "$as_me:1021: checking for a BSD compatible install" >&5

 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then


@@ -1035,7 +1067,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
     INSTALL=$ac_install_sh
   fi
 fi

-echo "$as_me:1038: result: $INSTALL" >&5
+echo "$as_me:1070: result: $INSTALL" >&5

 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.


@@ -1046,7 +1078,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 

-echo "$as_me:1049: checking whether build environment is sane" >&5
+echo "$as_me:1081: checking whether build environment is sane" >&5

 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1


@@ -1069,7 +1101,7 @@ if (
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
       # 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".

-      { { echo "$as_me:1072: error: ls -t appears to fail.  Make sure there is not a broken
+      { { echo "$as_me:1104: error: ls -t appears to fail.  Make sure there is not a broken

 alias in your environment" >&5
 echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&2;}
 alias in your environment" >&5
 echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&2;}


@@ -1082,35 +1114,29 @@ then
    # Ok.
    :
 else
    # Ok.
    :
 else

-   { { echo "$as_me:1085: error: newly created file is older than distributed files!
+   { { echo "$as_me:1117: error: newly created file is older than distributed files!

 Check your system clock" >&5
 echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
 rm -f conftest*
 Check your system clock" >&5
 echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
 rm -f conftest*

-echo "$as_me:1092: result: yes" >&5
+echo "$as_me:1124: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF >conftest.sed
-s,\\,\\\\,g; s,\$,$$,g
-EOF
-  program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-  rm -f conftest.sed
-fi

 test "$program_prefix" != NONE &&
 test "$program_prefix" != NONE &&

-  program_transform_name="s,^,${program_prefix},;$program_transform_name"
+  program_transform_name="s,^,$program_prefix,;$program_transform_name"

 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&

-  program_transform_name="s,\$\$,${program_suffix},;$program_transform_name"
-
-# sed with no file args requires a program.
-test -z "$program_transform_name" && program_transform_name="s,x,x,"
+  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
+# Double any \ or $.  echo might interpret backslashes.
+# By default was `s,x,x', remove it if useless.
+cat <<\_ACEOF >conftest.sed
+s/[\\$]/&&/g;s/;s,x,x,$//
+_ACEOF
+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+rm conftest.sed

 
 

-echo "$as_me:1113: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:1139: checking whether ${MAKE-make} sets \${MAKE}" >&5

 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then


@@ -1130,11 +1156,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then

-  echo "$as_me:1133: result: yes" >&5
+  echo "$as_me:1159: result: yes" >&5

 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else

-  echo "$as_me:1137: result: no" >&5
+  echo "$as_me:1163: result: no" >&5

 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi


@@ -1144,7 +1170,7 @@ PACKAGE=bison
 VERSION=1.28a
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
 VERSION=1.28a
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then

-  { { echo "$as_me:1147: error: source directory already configured; run \"make distclean\" there first" >&5
+  { { echo "$as_me:1173: error: source directory already configured; run \"make distclean\" there first" >&5

 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -1158,78 +1184,78 @@ cat >>confdefs.h <<EOF
 EOF
 
 missing_dir=`cd $ac_aux_dir && pwd`
 EOF
 
 missing_dir=`cd $ac_aux_dir && pwd`

-echo "$as_me:1161: checking for working aclocal" >&5
+echo "$as_me:1187: checking for working aclocal" >&5

 echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (aclocal --version) < /dev/null > /dev/null 2>&1; then
    ACLOCAL=aclocal
 echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (aclocal --version) < /dev/null > /dev/null 2>&1; then
    ACLOCAL=aclocal

-   echo "$as_me:1168: result: found" >&5
+   echo "$as_me:1194: result: found" >&5

 echo "${ECHO_T}found" >&6
 else
    ACLOCAL="$missing_dir/missing aclocal"
 echo "${ECHO_T}found" >&6
 else
    ACLOCAL="$missing_dir/missing aclocal"

-   echo "$as_me:1172: result: missing" >&5
+   echo "$as_me:1198: result: missing" >&5

 echo "${ECHO_T}missing" >&6
 fi
 
 echo "${ECHO_T}missing" >&6
 fi
 

-echo "$as_me:1176: checking for working autoconf" >&5
+echo "$as_me:1202: checking for working autoconf" >&5

 echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (autoconf --version) < /dev/null > /dev/null 2>&1; then
    AUTOCONF=autoconf
 echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (autoconf --version) < /dev/null > /dev/null 2>&1; then
    AUTOCONF=autoconf

-   echo "$as_me:1183: result: found" >&5
+   echo "$as_me:1209: result: found" >&5

 echo "${ECHO_T}found" >&6
 else
    AUTOCONF="$missing_dir/missing autoconf"
 echo "${ECHO_T}found" >&6
 else
    AUTOCONF="$missing_dir/missing autoconf"

-   echo "$as_me:1187: result: missing" >&5
+   echo "$as_me:1213: result: missing" >&5

 echo "${ECHO_T}missing" >&6
 fi
 
 echo "${ECHO_T}missing" >&6
 fi
 

-echo "$as_me:1191: checking for working automake" >&5
+echo "$as_me:1217: checking for working automake" >&5

 echo $ECHO_N "checking for working automake... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (automake --version) < /dev/null > /dev/null 2>&1; then
    AUTOMAKE=automake
 echo $ECHO_N "checking for working automake... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (automake --version) < /dev/null > /dev/null 2>&1; then
    AUTOMAKE=automake

-   echo "$as_me:1198: result: found" >&5
+   echo "$as_me:1224: result: found" >&5

 echo "${ECHO_T}found" >&6
 else
    AUTOMAKE="$missing_dir/missing automake"
 echo "${ECHO_T}found" >&6
 else
    AUTOMAKE="$missing_dir/missing automake"

-   echo "$as_me:1202: result: missing" >&5
+   echo "$as_me:1228: result: missing" >&5

 echo "${ECHO_T}missing" >&6
 fi
 
 echo "${ECHO_T}missing" >&6
 fi
 

-echo "$as_me:1206: checking for working autoheader" >&5
+echo "$as_me:1232: checking for working autoheader" >&5

 echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (autoheader --version) < /dev/null > /dev/null 2>&1; then
    AUTOHEADER=autoheader
 echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (autoheader --version) < /dev/null > /dev/null 2>&1; then
    AUTOHEADER=autoheader

-   echo "$as_me:1213: result: found" >&5
+   echo "$as_me:1239: result: found" >&5

 echo "${ECHO_T}found" >&6
 else
    AUTOHEADER="$missing_dir/missing autoheader"
 echo "${ECHO_T}found" >&6
 else
    AUTOHEADER="$missing_dir/missing autoheader"

-   echo "$as_me:1217: result: missing" >&5
+   echo "$as_me:1243: result: missing" >&5

 echo "${ECHO_T}missing" >&6
 fi
 
 echo "${ECHO_T}missing" >&6
 fi
 

-echo "$as_me:1221: checking for working makeinfo" >&5
+echo "$as_me:1247: checking for working makeinfo" >&5

 echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
    MAKEINFO=makeinfo
 echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
    MAKEINFO=makeinfo

-   echo "$as_me:1228: result: found" >&5
+   echo "$as_me:1254: result: found" >&5

 echo "${ECHO_T}found" >&6
 else
    MAKEINFO="$missing_dir/missing makeinfo"
 echo "${ECHO_T}found" >&6
 else
    MAKEINFO="$missing_dir/missing makeinfo"

-   echo "$as_me:1232: result: missing" >&5
+   echo "$as_me:1258: result: missing" >&5

 echo "${ECHO_T}missing" >&6
 fi
 
 echo "${ECHO_T}missing" >&6
 fi
 


@@ -1257,7 +1283,7 @@ 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
 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

-echo "$as_me:1260: checking for $ac_word" >&5
+echo "$as_me:1286: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1272,7 +1298,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"

-echo "$as_me:1275: found $ac_dir/$ac_word" >&5
+echo "$as_me:1301: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1280,10 +1306,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then

-  echo "$as_me:1283: result: $CC" >&5
+  echo "$as_me:1309: result: $CC" >&5

 echo "${ECHO_T}$CC" >&6
 else
 echo "${ECHO_T}$CC" >&6
 else

-  echo "$as_me:1286: result: no" >&5
+  echo "$as_me:1312: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -1292,7 +1318,7 @@ 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
   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

-echo "$as_me:1295: checking for $ac_word" >&5
+echo "$as_me:1321: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1307,7 +1333,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"

-echo "$as_me:1310: found $ac_dir/$ac_word" >&5
+echo "$as_me:1336: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1315,10 +1341,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then

-  echo "$as_me:1318: result: $ac_ct_CC" >&5
+  echo "$as_me:1344: result: $ac_ct_CC" >&5

 echo "${ECHO_T}$ac_ct_CC" >&6
 else
 echo "${ECHO_T}$ac_ct_CC" >&6
 else

-  echo "$as_me:1321: result: no" >&5
+  echo "$as_me:1347: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -1331,7 +1357,7 @@ 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
   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

-echo "$as_me:1334: checking for $ac_word" >&5
+echo "$as_me:1360: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1346,7 +1372,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"

-echo "$as_me:1349: found $ac_dir/$ac_word" >&5
+echo "$as_me:1375: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1354,10 +1380,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then

-  echo "$as_me:1357: result: $CC" >&5
+  echo "$as_me:1383: result: $CC" >&5

 echo "${ECHO_T}$CC" >&6
 else
 echo "${ECHO_T}$CC" >&6
 else

-  echo "$as_me:1360: result: no" >&5
+  echo "$as_me:1386: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -1366,7 +1392,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2

-echo "$as_me:1369: checking for $ac_word" >&5
+echo "$as_me:1395: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1381,7 +1407,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"

-echo "$as_me:1384: found $ac_dir/$ac_word" >&5
+echo "$as_me:1410: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1389,10 +1415,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then

-  echo "$as_me:1392: result: $ac_ct_CC" >&5
+  echo "$as_me:1418: result: $ac_ct_CC" >&5

 echo "${ECHO_T}$ac_ct_CC" >&6
 else
 echo "${ECHO_T}$ac_ct_CC" >&6
 else

-  echo "$as_me:1395: result: no" >&5
+  echo "$as_me:1421: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -1405,7 +1431,7 @@ 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
 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

-echo "$as_me:1408: checking for $ac_word" >&5
+echo "$as_me:1434: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1425,7 +1451,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
   continue
 fi
 ac_cv_prog_CC="cc"

-echo "$as_me:1428: found $ac_dir/$ac_word" >&5
+echo "$as_me:1454: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1447,10 +1473,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then

-  echo "$as_me:1450: result: $CC" >&5
+  echo "$as_me:1476: result: $CC" >&5

 echo "${ECHO_T}$CC" >&6
 else
 echo "${ECHO_T}$CC" >&6
 else

-  echo "$as_me:1453: result: no" >&5
+  echo "$as_me:1479: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -1461,7 +1487,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
   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

-echo "$as_me:1464: checking for $ac_word" >&5
+echo "$as_me:1490: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1476,7 +1502,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

-echo "$as_me:1479: found $ac_dir/$ac_word" >&5
+echo "$as_me:1505: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1484,10 +1510,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then

-  echo "$as_me:1487: result: $CC" >&5
+  echo "$as_me:1513: result: $CC" >&5

 echo "${ECHO_T}$CC" >&6
 else
 echo "${ECHO_T}$CC" >&6
 else

-  echo "$as_me:1490: result: no" >&5
+  echo "$as_me:1516: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -1500,7 +1526,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-echo "$as_me:1503: checking for $ac_word" >&5
+echo "$as_me:1529: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1515,7 +1541,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"

-echo "$as_me:1518: found $ac_dir/$ac_word" >&5
+echo "$as_me:1544: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1523,10 +1549,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then

-  echo "$as_me:1526: result: $ac_ct_CC" >&5
+  echo "$as_me:1552: result: $ac_ct_CC" >&5

 echo "${ECHO_T}$ac_ct_CC" >&6
 else
 echo "${ECHO_T}$ac_ct_CC" >&6
 else

-  echo "$as_me:1529: result: no" >&5
+  echo "$as_me:1555: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -1538,12 +1564,32 @@ fi
 
 fi
 
 
 fi
 

-test -z "$CC" && { { echo "$as_me:1541: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1567: error: no acceptable cc found in \$PATH" >&5

 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 

+# Provide some information about the compiler.
+echo "$as_me:1572:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:1575: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1578: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1580: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1583: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1585: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1588: \$? = $ac_status" >&5
+  (exit $ac_status); }
+

 cat >conftest.$ac_ext <<_ACEOF
 cat >conftest.$ac_ext <<_ACEOF

-#line 1546 "configure"
+#line 1592 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -1557,23 +1603,29 @@ _ACEOF
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files a.out a.exe"
 # Try to create an executable without -o first, disregard a.out.
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files a.out a.exe"
 # Try to create an executable without -o first, disregard a.out.

-# It will help us diagnose broken compiler, and finding out an intuition
+# It will help us diagnose broken compilers, and finding out an intuition

 # of exeext.
 # of exeext.

-echo "$as_me:1562: checking for C compiler default output" >&5
+echo "$as_me:1608: checking for C compiler default output" >&5

 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`

-if { (eval echo "$as_me:1565: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1611: \"$ac_link_default\"") >&5

   (eval $ac_link_default) 2>&5
   ac_status=$?
   (eval $ac_link_default) 2>&5
   ac_status=$?

-  echo "$as_me:1568: \$? = $ac_status" >&5
+  echo "$as_me:1614: \$? = $ac_status" >&5

   (exit $ac_status); }; then
   (exit $ac_status); }; then

-  for ac_file in `ls a.exe conftest.exe a.* conftest conftest.* 2>/dev/null`; do
+  # Find the output, starting from the most likely.  This scheme is
+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+# resort.
+for ac_file in `ls a.exe conftest.exe 2>/dev/null;
+                ls a.out conftest 2>/dev/null;
+                ls a.* conftest.* 2>/dev/null`; do

   case $ac_file in
     *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
     a.out ) # We found the default executable, but exeext='' is most
             # certainly right.
             break;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
   case $ac_file in
     *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
     a.out ) # We found the default executable, but exeext='' is most
             # certainly right.
             break;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`

+          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.

           export ac_cv_exeext
           break;;
     * ) break;;
           export ac_cv_exeext
           break;;
     * ) break;;


@@ -1582,34 +1634,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-{ { echo "$as_me:1585: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1637: error: C compiler cannot create executables" >&5

 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext

-echo "$as_me:1591: result: $ac_file" >&5
+echo "$as_me:1643: result: $ac_file" >&5

 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.

-echo "$as_me:1596: checking whether the C compiler works" >&5
+echo "$as_me:1648: checking whether the C compiler works" >&5

 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'

-  { (eval echo "$as_me:1602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1654: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:1605: \$? = $ac_status" >&5
+  echo "$as_me:1657: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
        cross_compiling=yes
     else
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
        cross_compiling=yes
     else

-       { { echo "$as_me:1612: error: cannot run C compiled programs.
+       { { echo "$as_me:1664: error: cannot run C compiled programs.

 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}


@@ -1617,24 +1669,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
     fi
   fi
 fi

-echo "$as_me:1620: result: yes" >&5
+echo "$as_me:1672: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.

-echo "$as_me:1627: checking whether we are cross compiling" >&5
+echo "$as_me:1679: checking whether we are cross compiling" >&5

 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6

-echo "$as_me:1629: result: $cross_compiling" >&5
+echo "$as_me:1681: result: $cross_compiling" >&5

 echo "${ECHO_T}$cross_compiling" >&6
 
 echo "${ECHO_T}$cross_compiling" >&6
 

-echo "$as_me:1632: checking for executable suffix" >&5
+echo "$as_me:1684: checking for executable suffix" >&5

 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6

-if { (eval echo "$as_me:1634: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1686: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:1637: \$? = $ac_status" >&5
+  echo "$as_me:1689: \$? = $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
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will


@@ -1650,25 +1702,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
   esac
 done
 else

-  { { echo "$as_me:1653: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1705: error: cannot compute EXEEXT: cannot compile and link" >&5

 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext

-echo "$as_me:1659: result: $ac_cv_exeext" >&5
+echo "$as_me:1711: result: $ac_cv_exeext" >&5

 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT

-echo "$as_me:1665: checking for object suffix" >&5
+echo "$as_me:1717: checking for object suffix" >&5

 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 1671 "configure"
+#line 1723 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -1680,10 +1732,10 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
 }
 _ACEOF
 rm -f conftest.o conftest.obj

-if { (eval echo "$as_me:1683: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1735: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:1686: \$? = $ac_status" >&5
+  echo "$as_me:1738: \$? = $ac_status" >&5

   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in


@@ -1695,24 +1747,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-{ { echo "$as_me:1698: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1750: error: cannot compute OBJEXT: cannot compile" >&5

 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi

-echo "$as_me:1705: result: $ac_cv_objext" >&5
+echo "$as_me:1757: result: $ac_cv_objext" >&5

 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT

-echo "$as_me:1709: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1761: checking whether we are using the GNU C compiler" >&5

 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 1715 "configure"
+#line 1767 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -1727,16 +1779,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:1730: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1782: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:1733: \$? = $ac_status" >&5
+  echo "$as_me:1785: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:1736: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1788: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:1739: \$? = $ac_status" >&5
+  echo "$as_me:1791: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else


@@ -1748,19 +1800,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi

-echo "$as_me:1751: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1803: result: $ac_cv_c_compiler_gnu" >&5

 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"

-echo "$as_me:1757: checking whether $CC accepts -g" >&5
+echo "$as_me:1809: checking whether $CC accepts -g" >&5

 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 1763 "configure"
+#line 1815 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -1772,16 +1824,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:1775: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1827: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:1778: \$? = $ac_status" >&5
+  echo "$as_me:1830: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:1781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1833: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:1784: \$? = $ac_status" >&5
+  echo "$as_me:1836: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else


@@ -1791,7 +1843,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:1794: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1846: result: $ac_cv_prog_cc_g" >&5

 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS


@@ -1818,16 +1870,16 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
 #endif
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:1821: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1873: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:1824: \$? = $ac_status" >&5
+  echo "$as_me:1876: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:1827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1879: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:1830: \$? = $ac_status" >&5
+  echo "$as_me:1882: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\


@@ -1839,7 +1891,7 @@ if { (eval echo "$as_me:1821: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF

-#line 1842 "configure"
+#line 1894 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration


@@ -1852,16 +1904,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:1855: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1907: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:1858: \$? = $ac_status" >&5
+  echo "$as_me:1910: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:1861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1913: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:1864: \$? = $ac_status" >&5
+  echo "$as_me:1916: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -1871,7 +1923,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF

-#line 1874 "configure"
+#line 1926 "configure"

 #include "confdefs.h"
 $ac_declaration
 int
 #include "confdefs.h"
 $ac_declaration
 int


@@ -1883,16 +1935,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:1886: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1938: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:1889: \$? = $ac_status" >&5
+  echo "$as_me:1941: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:1892: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1944: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:1895: \$? = $ac_status" >&5
+  echo "$as_me:1947: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   break
 else
   (exit $ac_status); }; }; then
   break
 else


@@ -1901,9 +1953,12 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 done
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 done

-echo '#ifdef __cplusplus' >>confdefs.h
-echo $ac_declaration      >>confdefs.h
-echo '#endif'             >>confdefs.h
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
+fi

 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5


@@ -1921,7 +1976,7 @@ 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_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

-echo "$as_me:1924: checking how to run the C preprocessor" >&5
+echo "$as_me:1979: checking how to run the C preprocessor" >&5

 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then


@@ -1934,7 +1989,6 @@ else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
     do
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
     do

-      # break 2 since there is a loop in there.

       ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
       ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do


@@ -1943,18 +1997,18 @@ do
   # 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
   # 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

-#line 1946 "configure"
+#line 2000 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:1951: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2005: \"$ac_cpp conftest.$ac_ext\"") >&5

   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:1957: \$? = $ac_status" >&5
+  echo "$as_me:2011: \$? = $ac_status" >&5

   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -1977,17 +2031,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF

-#line 1980 "configure"
+#line 2034 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:1984: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2038: \"$ac_cpp conftest.$ac_ext\"") >&5

   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:1990: \$? = $ac_status" >&5
+  echo "$as_me:2044: \$? = $ac_status" >&5

   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -2013,7 +2067,7 @@ done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then

-  break 2
+  break

 fi
 
     done
 fi
 
     done


@@ -2024,7 +2078,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
 else
   ac_cv_prog_CPP=$CPP
 fi

-echo "$as_me:2027: result: $CPP" >&5
+echo "$as_me:2081: result: $CPP" >&5

 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes


@@ -2034,18 +2088,18 @@ do
   # 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
   # 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

-#line 2037 "configure"
+#line 2091 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:2042: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2096: \"$ac_cpp conftest.$ac_ext\"") >&5

   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:2048: \$? = $ac_status" >&5
+  echo "$as_me:2102: \$? = $ac_status" >&5

   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -2068,17 +2122,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF

-#line 2071 "configure"
+#line 2125 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:2075: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2129: \"$ac_cpp conftest.$ac_ext\"") >&5

   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:2081: \$? = $ac_status" >&5
+  echo "$as_me:2135: \$? = $ac_status" >&5

   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -2106,7 +2160,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
 if $ac_preproc_ok; then
   :
 else

-  { { echo "$as_me:2109: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2163: error: C preprocessor \"$CPP\" fails sanity check" >&5

 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -2117,23 +2171,23 @@ 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_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 

-echo "$as_me:2120: checking for minix/config.h" >&5
+echo "$as_me:2174: checking for minix/config.h" >&5

 echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
 if test "${ac_cv_header_minix_config_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
 if test "${ac_cv_header_minix_config_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 2126 "configure"
+#line 2180 "configure"

 #include "confdefs.h"
 #include <minix/config.h>
 _ACEOF
 #include "confdefs.h"
 #include <minix/config.h>
 _ACEOF

-if { (eval echo "$as_me:2130: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2184: \"$ac_cpp conftest.$ac_ext\"") >&5

   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:2136: \$? = $ac_status" >&5
+  echo "$as_me:2190: \$? = $ac_status" >&5

   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -2152,7 +2206,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:2155: result: $ac_cv_header_minix_config_h" >&5
+echo "$as_me:2209: result: $ac_cv_header_minix_config_h" >&5

 echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
 if test $ac_cv_header_minix_config_h = yes; then
   MINIX=yes
 echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
 if test $ac_cv_header_minix_config_h = yes; then
   MINIX=yes


@@ -2176,7 +2230,7 @@ EOF
 
 fi
 
 
 fi
 

-        echo "$as_me:2179: checking for strerror in -lcposix" >&5
+        echo "$as_me:2233: checking for strerror in -lcposix" >&5

 echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
 if test "${ac_cv_lib_cposix_strerror+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
 if test "${ac_cv_lib_cposix_strerror+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -2184,7 +2238,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 2187 "configure"
+#line 2241 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -2203,16 +2257,16 @@ strerror ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:2206: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2260: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:2209: \$? = $ac_status" >&5
+  echo "$as_me:2263: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:2212: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2266: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2215: \$? = $ac_status" >&5
+  echo "$as_me:2269: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_cposix_strerror=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_cposix_strerror=yes
 else


@@ -2223,13 +2277,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:2226: result: $ac_cv_lib_cposix_strerror" >&5
+echo "$as_me:2280: result: $ac_cv_lib_cposix_strerror" >&5

 echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6
 if test $ac_cv_lib_cposix_strerror = yes; then
   LIBS="$LIBS -lcposix"
 fi
 
 echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6
 if test $ac_cv_lib_cposix_strerror = yes; then
   LIBS="$LIBS -lcposix"
 fi
 

-echo "$as_me:2232: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "$as_me:2286: checking for ${CC-cc} option to accept ANSI C" >&5

 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
 if test "${am_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
 if test "${am_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -2246,7 +2300,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__
 do
   CC="$ac_save_CC $ac_arg"
   cat >conftest.$ac_ext <<_ACEOF
 do
   CC="$ac_save_CC $ac_arg"
   cat >conftest.$ac_ext <<_ACEOF

-#line 2249 "configure"
+#line 2303 "configure"

 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>


@@ -2288,16 +2342,16 @@ return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:2291: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2345: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2294: \$? = $ac_status" >&5
+  echo "$as_me:2348: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:2297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2351: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2300: \$? = $ac_status" >&5
+  echo "$as_me:2354: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   am_cv_prog_cc_stdc="$ac_arg"; break
 else
   (exit $ac_status); }; }; then
   am_cv_prog_cc_stdc="$ac_arg"; break
 else


@@ -2311,10 +2365,10 @@ CC="$ac_save_CC"
 fi
 
 if test -z "$am_cv_prog_cc_stdc"; then
 fi
 
 if test -z "$am_cv_prog_cc_stdc"; then

-  echo "$as_me:2314: result: none needed" >&5
+  echo "$as_me:2368: result: none needed" >&5

 echo "${ECHO_T}none needed" >&6
 else
 echo "${ECHO_T}none needed" >&6
 else

-  echo "$as_me:2317: result: $am_cv_prog_cc_stdc" >&5
+  echo "$as_me:2371: result: $am_cv_prog_cc_stdc" >&5

 echo "${ECHO_T}$am_cv_prog_cc_stdc" >&6
 fi
 case "x$am_cv_prog_cc_stdc" in
 echo "${ECHO_T}$am_cv_prog_cc_stdc" >&6
 fi
 case "x$am_cv_prog_cc_stdc" in


@@ -2325,7 +2379,7 @@ esac
 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
 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

-echo "$as_me:2328: checking for $ac_word" >&5
+echo "$as_me:2382: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -2340,7 +2394,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"

-echo "$as_me:2343: found $ac_dir/$ac_word" >&5
+echo "$as_me:2397: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2348,10 +2402,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then

-  echo "$as_me:2351: result: $RANLIB" >&5
+  echo "$as_me:2405: result: $RANLIB" >&5

 echo "${ECHO_T}$RANLIB" >&6
 else
 echo "${ECHO_T}$RANLIB" >&6
 else

-  echo "$as_me:2354: result: no" >&5
+  echo "$as_me:2408: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -2360,7 +2414,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
   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

-echo "$as_me:2363: checking for $ac_word" >&5
+echo "$as_me:2417: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -2375,7 +2429,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"

-echo "$as_me:2378: found $ac_dir/$ac_word" >&5
+echo "$as_me:2432: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2384,10 +2438,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then

-  echo "$as_me:2387: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:2441: result: $ac_ct_RANLIB" >&5

 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else

-  echo "$as_me:2390: result: no" >&5
+  echo "$as_me:2444: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -2401,7 +2455,7 @@ for ac_prog in gm4 gnum4 m4
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-echo "$as_me:2404: checking for $ac_word" >&5
+echo "$as_me:2458: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_M4+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_M4+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -2418,7 +2472,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_M4="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_M4="$ac_dir/$ac_word"

-   echo "$as_me:2421: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2475: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -2429,10 +2483,10 @@ fi
 M4=$ac_cv_path_M4
 
 if test -n "$M4"; then
 M4=$ac_cv_path_M4
 
 if test -n "$M4"; then

-  echo "$as_me:2432: result: $M4" >&5
+  echo "$as_me:2486: result: $M4" >&5

 echo "${ECHO_T}$M4" >&6
 else
 echo "${ECHO_T}$M4" >&6
 else

-  echo "$as_me:2435: result: no" >&5
+  echo "$as_me:2489: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -2440,7 +2494,7 @@ fi
 done
 test -n "$M4" || M4="m4"
 
 done
 test -n "$M4" || M4="m4"
 

-echo "$as_me:2443: checking whether m4 supports frozen files" >&5
+echo "$as_me:2497: checking whether m4 supports frozen files" >&5

 echo $ECHO_N "checking whether m4 supports frozen files... $ECHO_C" >&6
 if test "${ac_cv_prog_gnu_m4+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking whether m4 supports frozen files... $ECHO_C" >&6
 if test "${ac_cv_prog_gnu_m4+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -2452,7 +2506,7 @@ if test x"$M4" != x; then
   esac
 fi
 fi
   esac
 fi
 fi

-echo "$as_me:2455: result: $ac_cv_prog_gnu_m4" >&5
+echo "$as_me:2509: result: $ac_cv_prog_gnu_m4" >&5

 echo "${ECHO_T}$ac_cv_prog_gnu_m4" >&6
 
 if test "$ac_cv_prog_gnu_m4" != yes; then
 echo "${ECHO_T}$ac_cv_prog_gnu_m4" >&6
 
 if test "$ac_cv_prog_gnu_m4" != yes; then


@@ -2465,7 +2519,7 @@ if test "${enable_gcc_warnings+set}" = set; then
   enableval="$enable_gcc_warnings"
   case "${enableval}" in
    yes|no) ;;
   enableval="$enable_gcc_warnings"
   case "${enableval}" in
    yes|no) ;;

-   *)      { { echo "$as_me:2468: error: bad value ${enableval} for gcc-warnings option" >&5
+   *)      { { echo "$as_me:2522: error: bad value ${enableval} for gcc-warnings option" >&5

 echo "$as_me: error: bad value ${enableval} for gcc-warnings option" >&2;}
    { (exit 1); exit 1; }; } ;;
  esac
 echo "$as_me: error: bad value ${enableval} for gcc-warnings option" >&2;}
    { (exit 1); exit 1; }; } ;;
  esac


@@ -2473,13 +2527,13 @@ else
   enableval=no
 fi;
 if test "${enableval}" = yes; then
   enableval=no
 fi;
 if test "${enableval}" = yes; then

-  echo "$as_me:2476: checking whether compiler accepts -Wall" >&5
+  echo "$as_me:2530: checking whether compiler accepts -Wall" >&5

 echo $ECHO_N "checking whether compiler accepts -Wall... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wall"
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether compiler accepts -Wall... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wall"
 cat >conftest.$ac_ext <<_ACEOF

-#line 2482 "configure"
+#line 2536 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -2491,35 +2545,35 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:2494: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2548: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2497: \$? = $ac_status" >&5
+  echo "$as_me:2551: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:2500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2554: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2503: \$? = $ac_status" >&5
+  echo "$as_me:2557: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -Wall"
   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -Wall"

-echo "$as_me:2506: result: yes" >&5
+echo "$as_me:2560: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:2511: result: no" >&5
+echo "$as_me:2565: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"

-  echo "$as_me:2516: checking whether compiler accepts -W" >&5
+  echo "$as_me:2570: checking whether compiler accepts -W" >&5

 echo $ECHO_N "checking whether compiler accepts -W... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -W"
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether compiler accepts -W... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -W"
 cat >conftest.$ac_ext <<_ACEOF

-#line 2522 "configure"
+#line 2576 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -2531,35 +2585,35 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:2534: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2588: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2537: \$? = $ac_status" >&5
+  echo "$as_me:2591: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:2540: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2594: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2543: \$? = $ac_status" >&5
+  echo "$as_me:2597: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -W"
   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -W"

-echo "$as_me:2546: result: yes" >&5
+echo "$as_me:2600: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:2551: result: no" >&5
+echo "$as_me:2605: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"

-  echo "$as_me:2556: checking whether compiler accepts -Wbad-function-cast" >&5
+  echo "$as_me:2610: checking whether compiler accepts -Wbad-function-cast" >&5

 echo $ECHO_N "checking whether compiler accepts -Wbad-function-cast... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wbad-function-cast"
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether compiler accepts -Wbad-function-cast... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wbad-function-cast"
 cat >conftest.$ac_ext <<_ACEOF

-#line 2562 "configure"
+#line 2616 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -2571,35 +2625,35 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:2574: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2628: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2577: \$? = $ac_status" >&5
+  echo "$as_me:2631: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:2580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2634: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2583: \$? = $ac_status" >&5
+  echo "$as_me:2637: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -Wbad-function-cast"
   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -Wbad-function-cast"

-echo "$as_me:2586: result: yes" >&5
+echo "$as_me:2640: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:2591: result: no" >&5
+echo "$as_me:2645: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"

-  echo "$as_me:2596: checking whether compiler accepts -Wcast-align" >&5
+  echo "$as_me:2650: checking whether compiler accepts -Wcast-align" >&5

 echo $ECHO_N "checking whether compiler accepts -Wcast-align... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wcast-align"
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether compiler accepts -Wcast-align... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wcast-align"
 cat >conftest.$ac_ext <<_ACEOF

-#line 2602 "configure"
+#line 2656 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -2611,35 +2665,35 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:2614: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2668: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2617: \$? = $ac_status" >&5
+  echo "$as_me:2671: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:2620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2674: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2623: \$? = $ac_status" >&5
+  echo "$as_me:2677: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -Wcast-align"
   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -Wcast-align"

-echo "$as_me:2626: result: yes" >&5
+echo "$as_me:2680: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:2631: result: no" >&5
+echo "$as_me:2685: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"

-  echo "$as_me:2636: checking whether compiler accepts -Wcast-qual" >&5
+  echo "$as_me:2690: checking whether compiler accepts -Wcast-qual" >&5

 echo $ECHO_N "checking whether compiler accepts -Wcast-qual... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wcast-qual"
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether compiler accepts -Wcast-qual... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wcast-qual"
 cat >conftest.$ac_ext <<_ACEOF

-#line 2642 "configure"
+#line 2696 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -2651,35 +2705,35 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:2654: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2708: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2657: \$? = $ac_status" >&5
+  echo "$as_me:2711: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:2660: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2714: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2663: \$? = $ac_status" >&5
+  echo "$as_me:2717: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -Wcast-qual"
   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -Wcast-qual"

-echo "$as_me:2666: result: yes" >&5
+echo "$as_me:2720: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:2671: result: no" >&5
+echo "$as_me:2725: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"

-  echo "$as_me:2676: checking whether compiler accepts -Wmissing-declarations" >&5
+  echo "$as_me:2730: checking whether compiler accepts -Wmissing-declarations" >&5

 echo $ECHO_N "checking whether compiler accepts -Wmissing-declarations... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wmissing-declarations"
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether compiler accepts -Wmissing-declarations... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wmissing-declarations"
 cat >conftest.$ac_ext <<_ACEOF

-#line 2682 "configure"
+#line 2736 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -2691,35 +2745,35 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:2694: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2748: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2697: \$? = $ac_status" >&5
+  echo "$as_me:2751: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:2700: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2754: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2703: \$? = $ac_status" >&5
+  echo "$as_me:2757: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -Wmissing-declarations"
   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -Wmissing-declarations"

-echo "$as_me:2706: result: yes" >&5
+echo "$as_me:2760: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:2711: result: no" >&5
+echo "$as_me:2765: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"

-  echo "$as_me:2716: checking whether compiler accepts -Wmissing-prototypes" >&5
+  echo "$as_me:2770: checking whether compiler accepts -Wmissing-prototypes" >&5

 echo $ECHO_N "checking whether compiler accepts -Wmissing-prototypes... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wmissing-prototypes"
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether compiler accepts -Wmissing-prototypes... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wmissing-prototypes"
 cat >conftest.$ac_ext <<_ACEOF

-#line 2722 "configure"
+#line 2776 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -2731,35 +2785,35 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:2734: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2788: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2737: \$? = $ac_status" >&5
+  echo "$as_me:2791: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:2740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2794: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2743: \$? = $ac_status" >&5
+  echo "$as_me:2797: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -Wmissing-prototypes"
   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -Wmissing-prototypes"

-echo "$as_me:2746: result: yes" >&5
+echo "$as_me:2800: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:2751: result: no" >&5
+echo "$as_me:2805: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"

-  echo "$as_me:2756: checking whether compiler accepts -Wnested-externs" >&5
+  echo "$as_me:2810: checking whether compiler accepts -Wnested-externs" >&5

 echo $ECHO_N "checking whether compiler accepts -Wnested-externs... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wnested-externs"
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether compiler accepts -Wnested-externs... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wnested-externs"
 cat >conftest.$ac_ext <<_ACEOF

-#line 2762 "configure"
+#line 2816 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -2771,35 +2825,35 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:2774: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2828: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2777: \$? = $ac_status" >&5
+  echo "$as_me:2831: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:2780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2834: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2783: \$? = $ac_status" >&5
+  echo "$as_me:2837: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -Wnested-externs"
   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -Wnested-externs"

-echo "$as_me:2786: result: yes" >&5
+echo "$as_me:2840: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:2791: result: no" >&5
+echo "$as_me:2845: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"

-  echo "$as_me:2796: checking whether compiler accepts -Wshadow" >&5
+  echo "$as_me:2850: checking whether compiler accepts -Wshadow" >&5

 echo $ECHO_N "checking whether compiler accepts -Wshadow... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wshadow"
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether compiler accepts -Wshadow... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wshadow"
 cat >conftest.$ac_ext <<_ACEOF

-#line 2802 "configure"
+#line 2856 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -2811,35 +2865,35 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:2814: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2868: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2817: \$? = $ac_status" >&5
+  echo "$as_me:2871: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:2820: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2874: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2823: \$? = $ac_status" >&5
+  echo "$as_me:2877: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -Wshadow"
   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -Wshadow"

-echo "$as_me:2826: result: yes" >&5
+echo "$as_me:2880: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:2831: result: no" >&5
+echo "$as_me:2885: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"

-  echo "$as_me:2836: checking whether compiler accepts -Wstrict-prototypes" >&5
+  echo "$as_me:2890: checking whether compiler accepts -Wstrict-prototypes" >&5

 echo $ECHO_N "checking whether compiler accepts -Wstrict-prototypes... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wstrict-prototypes"
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether compiler accepts -Wstrict-prototypes... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wstrict-prototypes"
 cat >conftest.$ac_ext <<_ACEOF

-#line 2842 "configure"
+#line 2896 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -2851,35 +2905,35 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:2854: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2908: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2857: \$? = $ac_status" >&5
+  echo "$as_me:2911: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:2860: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2914: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2863: \$? = $ac_status" >&5
+  echo "$as_me:2917: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -Wstrict-prototypes"
   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -Wstrict-prototypes"

-echo "$as_me:2866: result: yes" >&5
+echo "$as_me:2920: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:2871: result: no" >&5
+echo "$as_me:2925: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"

-  echo "$as_me:2876: checking whether compiler accepts -Wwrite-strings" >&5
+  echo "$as_me:2930: checking whether compiler accepts -Wwrite-strings" >&5

 echo $ECHO_N "checking whether compiler accepts -Wwrite-strings... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wwrite-strings"
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether compiler accepts -Wwrite-strings... $ECHO_C" >&6
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wwrite-strings"
 cat >conftest.$ac_ext <<_ACEOF

-#line 2882 "configure"
+#line 2936 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -2891,24 +2945,24 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:2894: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2948: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2897: \$? = $ac_status" >&5
+  echo "$as_me:2951: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:2900: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2954: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2903: \$? = $ac_status" >&5
+  echo "$as_me:2957: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -Wwrite-strings"
   (exit $ac_status); }; }; then
   WARNING_CFLAGS="$WARNING_CFLAGS -Wwrite-strings"

-echo "$as_me:2906: result: yes" >&5
+echo "$as_me:2960: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:2911: result: no" >&5
+echo "$as_me:2965: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext


@@ -2923,13 +2977,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 # Checks for header files.
 EOF
 
 # Checks for header files.

-echo "$as_me:2926: checking for ANSI C header files" >&5
+echo "$as_me:2980: checking for ANSI C header files" >&5

 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 2932 "configure"
+#line 2986 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -2937,13 +2991,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:2940: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2994: \"$ac_cpp conftest.$ac_ext\"") >&5

   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:2946: \$? = $ac_status" >&5
+  echo "$as_me:3000: \$? = $ac_status" >&5

   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -2965,7 +3019,7 @@ rm -f conftest.err 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
 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

-#line 2968 "configure"
+#line 3022 "configure"

 #include "confdefs.h"
 #include <string.h>
 
 #include "confdefs.h"
 #include <string.h>
 


@@ -2983,7 +3037,7 @@ 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
 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

-#line 2986 "configure"
+#line 3040 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 
 #include "confdefs.h"
 #include <stdlib.h>
 


@@ -3004,7 +3058,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
   :
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 3007 "configure"
+#line 3061 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -3030,15 +3084,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:3033: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3087: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:3036: \$? = $ac_status" >&5
+  echo "$as_me:3090: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:3038: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3092: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3041: \$? = $ac_status" >&5
+  echo "$as_me:3095: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -3047,11 +3101,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:3054: result: $ac_cv_header_stdc" >&5
+echo "$as_me:3108: result: $ac_cv_header_stdc" >&5

 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 


@@ -3063,24 +3117,24 @@ fi
 
 for ac_header in ctype.h locale.h memory.h stdlib.h string.h unistd.h
 do
 
 for ac_header in ctype.h locale.h memory.h stdlib.h string.h unistd.h
 do

-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:3067: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:3121: checking for $ac_header" >&5

 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 3073 "configure"
+#line 3127 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:3077: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3131: \"$ac_cpp conftest.$ac_ext\"") >&5

   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:3083: \$? = $ac_status" >&5
+  echo "$as_me:3137: \$? = $ac_status" >&5

   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -3091,19 +3145,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then

-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"

 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5

-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"

 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:3102: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:3156: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then

   cat >>confdefs.h <<EOF
   cat >>confdefs.h <<EOF

-#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

 EOF
 
 fi
 EOF
 
 fi


@@ -3114,7 +3168,7 @@ done
 # Checks for structures.
 
 # Checks for compiler characteristics.
 # Checks for structures.
 
 # Checks for compiler characteristics.

-echo "$as_me:3117: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:3171: checking for $CC option to accept ANSI C" >&5

 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -3122,7 +3176,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF

-#line 3125 "configure"
+#line 3179 "configure"

 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>


@@ -3171,16 +3225,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext

-if { (eval echo "$as_me:3174: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3228: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3177: \$? = $ac_status" >&5
+  echo "$as_me:3231: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:3180: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3234: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3183: \$? = $ac_status" >&5
+  echo "$as_me:3237: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break


@@ -3197,21 +3251,21 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)

-    echo "$as_me:3200: result: none needed" >&5
+    echo "$as_me:3254: result: none needed" >&5

 echo "${ECHO_T}none needed" >&6 ;;
   *)
 echo "${ECHO_T}none needed" >&6 ;;
   *)

-    echo "$as_me:3203: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:3257: result: $ac_cv_prog_cc_stdc" >&5

 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 

-echo "$as_me:3208: checking for an ANSI C-conforming const" >&5
+echo "$as_me:3262: checking for an ANSI C-conforming const" >&5

 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 3214 "configure"
+#line 3268 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -3269,16 +3323,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:3272: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3326: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3275: \$? = $ac_status" >&5
+  echo "$as_me:3329: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:3278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3332: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3281: \$? = $ac_status" >&5
+  echo "$as_me:3335: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else


@@ -3288,7 +3342,7 @@ ac_cv_c_const=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:3291: result: $ac_cv_c_const" >&5
+echo "$as_me:3345: result: $ac_cv_c_const" >&5

 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 


@@ -3298,7 +3352,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:3301: checking for inline" >&5
+echo "$as_me:3355: checking for inline" >&5

 echo $ECHO_N "checking for inline... $ECHO_C" >&6
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for inline... $ECHO_C" >&6
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -3306,7 +3360,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF

-#line 3309 "configure"
+#line 3363 "configure"

 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }


@@ -3315,16 +3369,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
 
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:3318: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3372: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3321: \$? = $ac_status" >&5
+  echo "$as_me:3375: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:3324: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3378: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3327: \$? = $ac_status" >&5
+  echo "$as_me:3381: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else


@@ -3335,7 +3389,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:3338: result: $ac_cv_c_inline" >&5
+echo "$as_me:3392: result: $ac_cv_c_inline" >&5

 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;


@@ -3350,10 +3404,10 @@ EOF
  ;;
 esac
 
  ;;
 esac
 

-echo "$as_me:3353: checking for function prototypes" >&5
+echo "$as_me:3407: checking for function prototypes" >&5

 echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6
 if test "$am_cv_prog_cc_stdc" != no; then
 echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6
 if test "$am_cv_prog_cc_stdc" != no; then

-  echo "$as_me:3356: result: yes" >&5
+  echo "$as_me:3410: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF


@@ -3362,17 +3416,17 @@ EOF
 
   U= ANSI2KNR=
 else
 
   U= ANSI2KNR=
 else

-  echo "$as_me:3365: result: no" >&5
+  echo "$as_me:3419: result: no" >&5

 echo "${ECHO_T}no" >&6
   U=_ ANSI2KNR=./ansi2knr
   # Ensure some checks needed by ansi2knr itself.
 echo "${ECHO_T}no" >&6
   U=_ ANSI2KNR=./ansi2knr
   # Ensure some checks needed by ansi2knr itself.

-  echo "$as_me:3369: checking for ANSI C header files" >&5
+  echo "$as_me:3423: checking for ANSI C header files" >&5

 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 3375 "configure"
+#line 3429 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -3380,13 +3434,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:3383: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3437: \"$ac_cpp conftest.$ac_ext\"") >&5

   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:3389: \$? = $ac_status" >&5
+  echo "$as_me:3443: \$? = $ac_status" >&5

   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -3408,7 +3462,7 @@ rm -f conftest.err 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
 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

-#line 3411 "configure"
+#line 3465 "configure"

 #include "confdefs.h"
 #include <string.h>
 
 #include "confdefs.h"
 #include <string.h>
 


@@ -3426,7 +3480,7 @@ 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
 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

-#line 3429 "configure"
+#line 3483 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 
 #include "confdefs.h"
 #include <stdlib.h>
 


@@ -3447,7 +3501,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
   :
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 3450 "configure"
+#line 3504 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -3473,15 +3527,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:3476: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3530: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:3479: \$? = $ac_status" >&5
+  echo "$as_me:3533: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:3481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3535: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3484: \$? = $ac_status" >&5
+  echo "$as_me:3538: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -3490,11 +3544,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:3497: result: $ac_cv_header_stdc" >&5
+echo "$as_me:3551: result: $ac_cv_header_stdc" >&5

 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 


@@ -3506,24 +3560,24 @@ fi
 
 for ac_header in string.h
 do
 
 for ac_header in string.h
 do

-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:3510: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:3564: checking for $ac_header" >&5

 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 3516 "configure"
+#line 3570 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:3520: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3574: \"$ac_cpp conftest.$ac_ext\"") >&5

   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:3526: \$? = $ac_status" >&5
+  echo "$as_me:3580: \$? = $ac_status" >&5

   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -3534,19 +3588,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then

-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"

 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5

-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"

 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:3545: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:3599: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then

   cat >>confdefs.h <<EOF
   cat >>confdefs.h <<EOF

-#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

 EOF
 
 fi
 EOF
 
 fi


@@ -3557,13 +3611,13 @@ fi
 # Checks for library functions.
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 # Checks for library functions.
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!

-echo "$as_me:3560: checking for working alloca.h" >&5
+echo "$as_me:3614: checking for working alloca.h" >&5

 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
 if test "${ac_cv_working_alloca_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
 if test "${ac_cv_working_alloca_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 3566 "configure"
+#line 3620 "configure"

 #include "confdefs.h"
 #include <alloca.h>
 int
 #include "confdefs.h"
 #include <alloca.h>
 int


@@ -3575,16 +3629,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:3578: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3632: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:3581: \$? = $ac_status" >&5
+  echo "$as_me:3635: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:3584: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3638: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3587: \$? = $ac_status" >&5
+  echo "$as_me:3641: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else


@@ -3594,7 +3648,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:3597: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:3651: result: $ac_cv_working_alloca_h" >&5

 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
 if test $ac_cv_working_alloca_h = yes; then
 
 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
 if test $ac_cv_working_alloca_h = yes; then
 


@@ -3604,13 +3658,13 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:3607: checking for alloca" >&5
+echo "$as_me:3661: checking for alloca" >&5

 echo $ECHO_N "checking for alloca... $ECHO_C" >&6
 if test "${ac_cv_func_alloca_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for alloca... $ECHO_C" >&6
 if test "${ac_cv_func_alloca_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 3613 "configure"
+#line 3667 "configure"

 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca


@@ -3642,16 +3696,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:3645: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3699: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:3648: \$? = $ac_status" >&5
+  echo "$as_me:3702: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:3651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3705: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3654: \$? = $ac_status" >&5
+  echo "$as_me:3708: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else


@@ -3661,7 +3715,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:3664: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:3718: result: $ac_cv_func_alloca_works" >&5

 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
 
 if test $ac_cv_func_alloca_works = yes; then
 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
 
 if test $ac_cv_func_alloca_works = yes; then


@@ -3682,13 +3736,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
 #define C_ALLOCA 1
 EOF
 

-echo "$as_me:3685: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:3739: checking whether \`alloca.c' needs Cray hooks" >&5

 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
 if test "${ac_cv_os_cray+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
 if test "${ac_cv_os_cray+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 3691 "configure"
+#line 3745 "configure"

 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray


@@ -3706,18 +3760,18 @@ fi
 rm -f conftest*
 
 fi
 rm -f conftest*
 
 fi

-echo "$as_me:3709: result: $ac_cv_os_cray" >&5
+echo "$as_me:3763: result: $ac_cv_os_cray" >&5

 echo "${ECHO_T}$ac_cv_os_cray" >&6
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
 echo "${ECHO_T}$ac_cv_os_cray" >&6
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do

-    ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:3714: checking for $ac_func" >&5
+    as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:3768: checking for $ac_func" >&5

 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 3720 "configure"
+#line 3774 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -3748,28 +3802,28 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:3751: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3805: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:3754: \$? = $ac_status" >&5
+  echo "$as_me:3808: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:3757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3811: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3760: \$? = $ac_status" >&5
+  echo "$as_me:3814: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   (exit $ac_status); }; }; then

-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"

 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"

 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:3770: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:3824: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then

 
 cat >>confdefs.h <<EOF
 #define CRAY_STACKSEG_END $ac_func
 
 cat >>confdefs.h <<EOF
 #define CRAY_STACKSEG_END $ac_func


@@ -3781,7 +3835,7 @@ fi
   done
 fi
 
   done
 fi
 

-echo "$as_me:3784: checking stack direction for C alloca" >&5
+echo "$as_me:3838: checking stack direction for C alloca" >&5

 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
 if test "${ac_cv_c_stack_direction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
 if test "${ac_cv_c_stack_direction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -3790,7 +3844,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 3793 "configure"
+#line 3847 "configure"

 #include "confdefs.h"
 int
 find_stack_direction ()
 #include "confdefs.h"
 int
 find_stack_direction ()


@@ -3813,15 +3867,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:3816: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3870: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:3819: \$? = $ac_status" >&5
+  echo "$as_me:3873: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:3821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3875: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3824: \$? = $ac_status" >&5
+  echo "$as_me:3878: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else


@@ -3830,10 +3884,10 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_c_stack_direction=-1
 fi
 cat conftest.$ac_ext >&5
 ac_cv_c_stack_direction=-1
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi
 fi
 fi

-echo "$as_me:3836: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:3890: result: $ac_cv_c_stack_direction" >&5

 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF


@@ -3844,14 +3898,14 @@ fi
 
 for ac_func in mkstemp setlocale
 do
 
 for ac_func in mkstemp setlocale
 do

-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:3848: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:3902: checking for $ac_func" >&5

 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 3854 "configure"
+#line 3908 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -3882,90 +3936,89 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:3885: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3939: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:3888: \$? = $ac_status" >&5
+  echo "$as_me:3942: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:3891: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3945: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3894: \$? = $ac_status" >&5
+  echo "$as_me:3948: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   (exit $ac_status); }; }; then

-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"

 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"

 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:3904: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:3958: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then

   cat >>confdefs.h <<EOF
   cat >>confdefs.h <<EOF

-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

 EOF
 
 fi
 done
 
 EOF
 
 fi
 done
 

-for ac_header in stdlib.h string.h memory.h strings.h inttypes.h unistd.h
+# 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
 do

-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:3917: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:3974: checking for $ac_header" >&5

 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 3923 "configure"
+#line 3980 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

+$ac_includes_default

 #include <$ac_header>
 _ACEOF
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:3927: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3986: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:3933: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  echo "$as_me:3989: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:3992: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3995: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"

 else
   echo "$as_me: failed program was:" >&5
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+cat conftest.$ac_ext >&5
+eval "$as_ac_Header=no"

 fi
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-echo "$as_me:3952: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:4005: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then

   cat >>confdefs.h <<EOF
   cat >>confdefs.h <<EOF

-#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

 EOF
 
 fi
 done
 
 EOF
 
 fi
 done
 

-echo "$as_me:3962: checking whether stpcpy is declared" >&5
+echo "$as_me:4015: checking whether stpcpy is declared" >&5

 echo $ECHO_N "checking whether stpcpy is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_stpcpy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether stpcpy is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_stpcpy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 3968 "configure"
+#line 4021 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -3980,16 +4033,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:3983: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4036: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3986: \$? = $ac_status" >&5
+  echo "$as_me:4039: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:3989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4042: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3992: \$? = $ac_status" >&5
+  echo "$as_me:4045: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_have_decl_stpcpy=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_have_decl_stpcpy=yes
 else


@@ -3999,7 +4052,7 @@ ac_cv_have_decl_stpcpy=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:4002: result: $ac_cv_have_decl_stpcpy" >&5
+echo "$as_me:4055: result: $ac_cv_have_decl_stpcpy" >&5

 echo "${ECHO_T}$ac_cv_have_decl_stpcpy" >&6
 if test $ac_cv_have_decl_stpcpy = yes; then
 
 echo "${ECHO_T}$ac_cv_have_decl_stpcpy" >&6
 if test $ac_cv_have_decl_stpcpy = yes; then
 


@@ -4013,13 +4066,13 @@ else
 EOF
 
 fi
 EOF
 
 fi

-echo "$as_me:4016: checking whether strndup is declared" >&5
+echo "$as_me:4069: checking whether strndup is declared" >&5

 echo $ECHO_N "checking whether strndup is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_strndup+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether strndup is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_strndup+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 4022 "configure"
+#line 4075 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -4034,16 +4087,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:4037: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4090: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4040: \$? = $ac_status" >&5
+  echo "$as_me:4093: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:4043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4096: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4046: \$? = $ac_status" >&5
+  echo "$as_me:4099: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_have_decl_strndup=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_have_decl_strndup=yes
 else


@@ -4053,7 +4106,7 @@ ac_cv_have_decl_strndup=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:4056: result: $ac_cv_have_decl_strndup" >&5
+echo "$as_me:4109: result: $ac_cv_have_decl_strndup" >&5

 echo "${ECHO_T}$ac_cv_have_decl_strndup" >&6
 if test $ac_cv_have_decl_strndup = yes; then
 
 echo "${ECHO_T}$ac_cv_have_decl_strndup" >&6
 if test $ac_cv_have_decl_strndup = yes; then
 


@@ -4067,13 +4120,13 @@ else
 EOF
 
 fi
 EOF
 
 fi

-echo "$as_me:4070: checking whether strnlen is declared" >&5
+echo "$as_me:4123: checking whether strnlen is declared" >&5

 echo $ECHO_N "checking whether strnlen is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_strnlen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether strnlen is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_strnlen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 4076 "configure"
+#line 4129 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -4088,16 +4141,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:4091: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4144: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4094: \$? = $ac_status" >&5
+  echo "$as_me:4147: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:4097: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4150: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4100: \$? = $ac_status" >&5
+  echo "$as_me:4153: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_have_decl_strnlen=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_have_decl_strnlen=yes
 else


@@ -4107,7 +4160,7 @@ ac_cv_have_decl_strnlen=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:4110: result: $ac_cv_have_decl_strnlen" >&5
+echo "$as_me:4163: result: $ac_cv_have_decl_strnlen" >&5

 echo "${ECHO_T}$ac_cv_have_decl_strnlen" >&6
 if test $ac_cv_have_decl_strnlen = yes; then
 
 echo "${ECHO_T}$ac_cv_have_decl_strnlen" >&6
 if test $ac_cv_have_decl_strnlen = yes; then
 


@@ -4121,13 +4174,13 @@ else
 EOF
 
 fi
 EOF
 
 fi

-echo "$as_me:4124: checking whether memchr is declared" >&5
+echo "$as_me:4177: checking whether memchr is declared" >&5

 echo $ECHO_N "checking whether memchr is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_memchr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether memchr is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_memchr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 4130 "configure"
+#line 4183 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -4142,16 +4195,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:4145: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4198: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4148: \$? = $ac_status" >&5
+  echo "$as_me:4201: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:4151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4204: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4154: \$? = $ac_status" >&5
+  echo "$as_me:4207: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_have_decl_memchr=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_have_decl_memchr=yes
 else


@@ -4161,7 +4214,7 @@ ac_cv_have_decl_memchr=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:4164: result: $ac_cv_have_decl_memchr" >&5
+echo "$as_me:4217: result: $ac_cv_have_decl_memchr" >&5

 echo "${ECHO_T}$ac_cv_have_decl_memchr" >&6
 if test $ac_cv_have_decl_memchr = yes; then
 
 echo "${ECHO_T}$ac_cv_have_decl_memchr" >&6
 if test $ac_cv_have_decl_memchr = yes; then
 


@@ -4176,16 +4229,16 @@ EOF
 
 fi
 
 
 fi
 

-for ac_func in stpcpy strndup strnlen memchr
+for ac_func in stpcpy strndup strnlen strspn memchr

 do
 do

-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:4182: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:4235: checking for $ac_func" >&5

 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 4188 "configure"
+#line 4241 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -4216,30 +4269,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:4219: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4272: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:4222: \$? = $ac_status" >&5
+  echo "$as_me:4275: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:4225: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4278: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4228: \$? = $ac_status" >&5
+  echo "$as_me:4281: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   (exit $ac_status); }; }; then

-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"

 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"

 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:4238: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:4291: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then

   cat >>confdefs.h <<EOF
   cat >>confdefs.h <<EOF

-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

 EOF
 
 else
 EOF
 
 else


@@ -4251,7 +4304,7 @@ cat >>confdefs.h <<EOF
 #define HAVE_DONE_WORKING_MALLOC_CHECK 1
 EOF
 
 #define HAVE_DONE_WORKING_MALLOC_CHECK 1
 EOF
 

- echo "$as_me:4254: checking for working malloc" >&5
+ echo "$as_me:4307: checking for working malloc" >&5

 echo $ECHO_N "checking for working malloc... $ECHO_C" >&6
 if test "${jm_cv_func_working_malloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for working malloc... $ECHO_C" >&6
 if test "${jm_cv_func_working_malloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -4260,7 +4313,7 @@ else
         jm_cv_func_working_malloc=no
 else
   cat >conftest.$ac_ext <<_ACEOF
         jm_cv_func_working_malloc=no
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 4263 "configure"
+#line 4316 "configure"

 #include "confdefs.h"
 
     char *malloc ();
 #include "confdefs.h"
 
     char *malloc ();


@@ -4272,15 +4325,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:4275: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4328: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:4278: \$? = $ac_status" >&5
+  echo "$as_me:4331: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:4280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4333: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4283: \$? = $ac_status" >&5
+  echo "$as_me:4336: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   jm_cv_func_working_malloc=yes
 else
   (exit $ac_status); }; }; then
   jm_cv_func_working_malloc=yes
 else


@@ -4289,11 +4342,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 jm_cv_func_working_malloc=no
 fi
 cat conftest.$ac_ext >&5
 jm_cv_func_working_malloc=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 
 fi
 fi
 
 fi

-echo "$as_me:4296: result: $jm_cv_func_working_malloc" >&5
+echo "$as_me:4349: result: $jm_cv_func_working_malloc" >&5

 echo "${ECHO_T}$jm_cv_func_working_malloc" >&6
   if test $jm_cv_func_working_malloc = no; then
 
 echo "${ECHO_T}$jm_cv_func_working_malloc" >&6
   if test $jm_cv_func_working_malloc = no; then
 


@@ -4309,7 +4362,7 @@ cat >>confdefs.h <<EOF
 #define HAVE_DONE_WORKING_REALLOC_CHECK 1
 EOF
 
 #define HAVE_DONE_WORKING_REALLOC_CHECK 1
 EOF
 

- echo "$as_me:4312: checking for working realloc" >&5
+ echo "$as_me:4365: checking for working realloc" >&5

 echo $ECHO_N "checking for working realloc... $ECHO_C" >&6
 if test "${jm_cv_func_working_realloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for working realloc... $ECHO_C" >&6
 if test "${jm_cv_func_working_realloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -4318,7 +4371,7 @@ else
         jm_cv_func_working_realloc=no
 else
   cat >conftest.$ac_ext <<_ACEOF
         jm_cv_func_working_realloc=no
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 4321 "configure"
+#line 4374 "configure"

 #include "confdefs.h"
 
     char *realloc ();
 #include "confdefs.h"
 
     char *realloc ();


@@ -4330,15 +4383,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:4333: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4386: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:4336: \$? = $ac_status" >&5
+  echo "$as_me:4389: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:4338: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4391: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4341: \$? = $ac_status" >&5
+  echo "$as_me:4394: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   jm_cv_func_working_realloc=yes
 else
   (exit $ac_status); }; }; then
   jm_cv_func_working_realloc=yes
 else


@@ -4347,11 +4400,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 jm_cv_func_working_realloc=no
 fi
 cat conftest.$ac_ext >&5
 jm_cv_func_working_realloc=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 
 fi
 fi
 
 fi

-echo "$as_me:4354: result: $jm_cv_func_working_realloc" >&5
+echo "$as_me:4407: result: $jm_cv_func_working_realloc" >&5

 echo "${ECHO_T}$jm_cv_func_working_realloc" >&6
   if test $jm_cv_func_working_realloc = no; then
 
 echo "${ECHO_T}$jm_cv_func_working_realloc" >&6
   if test $jm_cv_func_working_realloc = no; then
 


@@ -4365,14 +4418,14 @@ EOF
 
 for ac_func in isascii iswprint mbrtowc
 do
 
 for ac_func in isascii iswprint mbrtowc
 do

-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:4369: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:4422: checking for $ac_func" >&5

 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 4375 "configure"
+#line 4428 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -4403,30 +4456,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:4406: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4459: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:4409: \$? = $ac_status" >&5
+  echo "$as_me:4462: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:4412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4465: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4415: \$? = $ac_status" >&5
+  echo "$as_me:4468: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   (exit $ac_status); }; }; then

-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"

 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"

 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:4425: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:4478: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then

   cat >>confdefs.h <<EOF
   cat >>confdefs.h <<EOF

-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

 EOF
 
 fi
 EOF
 
 fi


@@ -4434,24 +4487,24 @@ done
 
 for ac_header in limits.h stdlib.h string.h wchar.h wctype.h
 do
 
 for ac_header in limits.h stdlib.h string.h wchar.h wctype.h
 do

-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:4438: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:4491: checking for $ac_header" >&5

 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 4444 "configure"
+#line 4497 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:4448: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4501: \"$ac_cpp conftest.$ac_ext\"") >&5

   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:4454: \$? = $ac_status" >&5
+  echo "$as_me:4507: \$? = $ac_status" >&5

   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -4462,31 +4515,31 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then

-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"

 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5

-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"

 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:4473: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:4526: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then

   cat >>confdefs.h <<EOF
   cat >>confdefs.h <<EOF

-#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

 EOF
 
 fi
 done
 
 EOF
 
 fi
 done
 

-  echo "$as_me:4483: checking for ANSI C header files" >&5
+  echo "$as_me:4536: checking for ANSI C header files" >&5

 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 4489 "configure"
+#line 4542 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -4494,13 +4547,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:4497: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4550: \"$ac_cpp conftest.$ac_ext\"") >&5

   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:4503: \$? = $ac_status" >&5
+  echo "$as_me:4556: \$? = $ac_status" >&5

   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -4522,7 +4575,7 @@ rm -f conftest.err 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
 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

-#line 4525 "configure"
+#line 4578 "configure"

 #include "confdefs.h"
 #include <string.h>
 
 #include "confdefs.h"
 #include <string.h>
 


@@ -4540,7 +4593,7 @@ 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
 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

-#line 4543 "configure"
+#line 4596 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 
 #include "confdefs.h"
 #include <stdlib.h>
 


@@ -4561,7 +4614,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
   :
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 4564 "configure"
+#line 4617 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -4587,15 +4640,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:4590: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4643: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:4593: \$? = $ac_status" >&5
+  echo "$as_me:4646: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:4595: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4648: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4598: \$? = $ac_status" >&5
+  echo "$as_me:4651: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -4604,11 +4657,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:4611: result: $ac_cv_header_stdc" >&5
+echo "$as_me:4664: result: $ac_cv_header_stdc" >&5

 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 


@@ -4618,13 +4671,13 @@ EOF
 
 fi
 
 
 fi
 

-  echo "$as_me:4621: checking whether backslash-a works in strings" >&5
+  echo "$as_me:4674: checking whether backslash-a works in strings" >&5

 echo $ECHO_N "checking whether backslash-a works in strings... $ECHO_C" >&6
 if test "${ac_cv_c_backslash_a+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether backslash-a works in strings... $ECHO_C" >&6
 if test "${ac_cv_c_backslash_a+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 4627 "configure"
+#line 4680 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -4643,16 +4696,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:4646: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4699: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4649: \$? = $ac_status" >&5
+  echo "$as_me:4702: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:4652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4705: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4655: \$? = $ac_status" >&5
+  echo "$as_me:4708: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_c_backslash_a=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_c_backslash_a=yes
 else


@@ -4662,7 +4715,7 @@ ac_cv_c_backslash_a=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:4665: result: $ac_cv_c_backslash_a" >&5
+echo "$as_me:4718: result: $ac_cv_c_backslash_a" >&5

 echo "${ECHO_T}$ac_cv_c_backslash_a" >&6
   if test $ac_cv_c_backslash_a = yes; then
 
 echo "${ECHO_T}$ac_cv_c_backslash_a" >&6
   if test $ac_cv_c_backslash_a = yes; then
 


@@ -4674,24 +4727,24 @@ EOF
 
 for ac_header in stdlib.h
 do
 
 for ac_header in stdlib.h
 do

-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:4678: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:4731: checking for $ac_header" >&5

 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 4684 "configure"
+#line 4737 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:4688: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4741: \"$ac_cpp conftest.$ac_ext\"") >&5

   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:4694: \$? = $ac_status" >&5
+  echo "$as_me:4747: \$? = $ac_status" >&5

   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -4702,31 +4755,31 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then

-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"

 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5

-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"

 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:4713: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:4766: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then

   cat >>confdefs.h <<EOF
   cat >>confdefs.h <<EOF

-#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

 EOF
 
 fi
 done
 
 EOF
 
 fi
 done
 

-   echo "$as_me:4723: checking for mbstate_t" >&5
+   echo "$as_me:4776: checking for mbstate_t" >&5

 echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6
 if test "${ac_cv_type_mbstate_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6
 if test "${ac_cv_type_mbstate_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 4729 "configure"
+#line 4782 "configure"

 #include "confdefs.h"
 
 #if HAVE_STDLIB_H
 #include "confdefs.h"
 
 #if HAVE_STDLIB_H


@@ -4742,16 +4795,16 @@ mbstate_t x; return sizeof x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:4745: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4798: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4748: \$? = $ac_status" >&5
+  echo "$as_me:4801: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:4751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4804: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4754: \$? = $ac_status" >&5
+  echo "$as_me:4807: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_type_mbstate_t=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_type_mbstate_t=yes
 else


@@ -4761,7 +4814,7 @@ ac_cv_type_mbstate_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:4764: result: $ac_cv_type_mbstate_t" >&5
+echo "$as_me:4817: result: $ac_cv_type_mbstate_t" >&5

 echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6
    if test $ac_cv_type_mbstate_t = no; then
 
 echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6
    if test $ac_cv_type_mbstate_t = no; then
 


@@ -4771,10 +4824,10 @@ EOF
 
    fi
 
 
    fi
 

-echo "$as_me:4774: checking for function prototypes" >&5
+echo "$as_me:4827: checking for function prototypes" >&5

 echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6
 if test "$am_cv_prog_cc_stdc" != no; then
 echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6
 if test "$am_cv_prog_cc_stdc" != no; then

-  echo "$as_me:4777: result: yes" >&5
+  echo "$as_me:4830: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF


@@ -4783,17 +4836,17 @@ EOF
 
   U= ANSI2KNR=
 else
 
   U= ANSI2KNR=
 else

-  echo "$as_me:4786: result: no" >&5
+  echo "$as_me:4839: result: no" >&5

 echo "${ECHO_T}no" >&6
   U=_ ANSI2KNR=./ansi2knr
   # Ensure some checks needed by ansi2knr itself.
 echo "${ECHO_T}no" >&6
   U=_ ANSI2KNR=./ansi2knr
   # Ensure some checks needed by ansi2knr itself.

-  echo "$as_me:4790: checking for ANSI C header files" >&5
+  echo "$as_me:4843: checking for ANSI C header files" >&5

 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 4796 "configure"
+#line 4849 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -4801,13 +4854,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:4804: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4857: \"$ac_cpp conftest.$ac_ext\"") >&5

   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:4810: \$? = $ac_status" >&5
+  echo "$as_me:4863: \$? = $ac_status" >&5

   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -4829,7 +4882,7 @@ rm -f conftest.err 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
 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

-#line 4832 "configure"
+#line 4885 "configure"

 #include "confdefs.h"
 #include <string.h>
 
 #include "confdefs.h"
 #include <string.h>
 


@@ -4847,7 +4900,7 @@ 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
 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

-#line 4850 "configure"
+#line 4903 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 
 #include "confdefs.h"
 #include <stdlib.h>
 


@@ -4868,7 +4921,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
   :
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 4871 "configure"
+#line 4924 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -4894,15 +4947,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:4897: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4950: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:4900: \$? = $ac_status" >&5
+  echo "$as_me:4953: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:4902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4955: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4905: \$? = $ac_status" >&5
+  echo "$as_me:4958: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -4911,11 +4964,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:4918: result: $ac_cv_header_stdc" >&5
+echo "$as_me:4971: result: $ac_cv_header_stdc" >&5

 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 


@@ -4927,24 +4980,24 @@ fi
 
 for ac_header in string.h
 do
 
 for ac_header in string.h
 do

-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:4931: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:4984: checking for $ac_header" >&5

 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 4937 "configure"
+#line 4990 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:4941: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4994: \"$ac_cpp conftest.$ac_ext\"") >&5

   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:4947: \$? = $ac_status" >&5
+  echo "$as_me:5000: \$? = $ac_status" >&5

   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -4955,19 +5008,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then

-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"

 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5

-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"

 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:4966: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:5019: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then

   cat >>confdefs.h <<EOF
   cat >>confdefs.h <<EOF

-#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

 EOF
 
 fi
 EOF
 
 fi


@@ -4977,14 +5030,14 @@ fi
 
 for ac_func in strerror strerror_r vprintf doprnt
 do
 
 for ac_func in strerror strerror_r vprintf doprnt
 do

-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:4981: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:5034: checking for $ac_func" >&5

 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 4987 "configure"
+#line 5040 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -5015,42 +5068,42 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:5018: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5071: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5021: \$? = $ac_status" >&5
+  echo "$as_me:5074: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:5024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5077: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5027: \$? = $ac_status" >&5
+  echo "$as_me:5080: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   (exit $ac_status); }; }; then

-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"

 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"

 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:5037: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:5090: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then

   cat >>confdefs.h <<EOF
   cat >>confdefs.h <<EOF

-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

 EOF
 
 fi
 done
 
 EOF
 
 fi
 done
 

-  echo "$as_me:5047: checking for ANSI C header files" >&5
+  echo "$as_me:5100: checking for ANSI C header files" >&5

 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 5053 "configure"
+#line 5106 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -5058,13 +5111,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:5061: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5114: \"$ac_cpp conftest.$ac_ext\"") >&5

   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:5067: \$? = $ac_status" >&5
+  echo "$as_me:5120: \$? = $ac_status" >&5

   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -5086,7 +5139,7 @@ rm -f conftest.err 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
 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

-#line 5089 "configure"
+#line 5142 "configure"

 #include "confdefs.h"
 #include <string.h>
 
 #include "confdefs.h"
 #include <string.h>
 


@@ -5104,7 +5157,7 @@ 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
 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

-#line 5107 "configure"
+#line 5160 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 
 #include "confdefs.h"
 #include <stdlib.h>
 


@@ -5125,7 +5178,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
   :
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 5128 "configure"
+#line 5181 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -5151,15 +5204,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:5154: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5207: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5157: \$? = $ac_status" >&5
+  echo "$as_me:5210: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:5159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5212: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5162: \$? = $ac_status" >&5
+  echo "$as_me:5215: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -5168,11 +5221,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:5175: result: $ac_cv_header_stdc" >&5
+echo "$as_me:5228: result: $ac_cv_header_stdc" >&5

 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 


@@ -5182,13 +5235,13 @@ EOF
 
 fi
 
 
 fi
 

-  echo "$as_me:5185: checking whether strerror_r is declared" >&5
+  echo "$as_me:5238: checking whether strerror_r is declared" >&5

 echo $ECHO_N "checking whether strerror_r is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_strerror_r+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether strerror_r is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_strerror_r+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 5191 "configure"
+#line 5244 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -5203,16 +5256,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:5206: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5259: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5209: \$? = $ac_status" >&5
+  echo "$as_me:5262: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:5212: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5265: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5215: \$? = $ac_status" >&5
+  echo "$as_me:5268: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_have_decl_strerror_r=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_have_decl_strerror_r=yes
 else


@@ -5222,7 +5275,7 @@ ac_cv_have_decl_strerror_r=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:5225: result: $ac_cv_have_decl_strerror_r" >&5
+echo "$as_me:5278: result: $ac_cv_have_decl_strerror_r" >&5

 echo "${ECHO_T}$ac_cv_have_decl_strerror_r" >&6
 if test $ac_cv_have_decl_strerror_r = yes; then
 
 echo "${ECHO_T}$ac_cv_have_decl_strerror_r" >&6
 if test $ac_cv_have_decl_strerror_r = yes; then
 


@@ -5239,14 +5292,14 @@ fi
 
 for ac_func in strerror_r
 do
 
 for ac_func in strerror_r
 do

-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:5243: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:5296: checking for $ac_func" >&5

 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 5249 "configure"
+#line 5302 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -5277,30 +5330,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:5280: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5333: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5283: \$? = $ac_status" >&5
+  echo "$as_me:5336: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:5286: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5339: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5289: \$? = $ac_status" >&5
+  echo "$as_me:5342: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   (exit $ac_status); }; }; then

-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"

 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"

 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:5299: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:5352: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then

   cat >>confdefs.h <<EOF
   cat >>confdefs.h <<EOF

-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

 EOF
 
 fi
 EOF
 
 fi


@@ -5310,24 +5363,24 @@ if test $ac_cv_func_strerror_r = yes; then
 
 for ac_header in string.h
 do
 
 for ac_header in string.h
 do

-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:5314: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:5367: checking for $ac_header" >&5

 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 5320 "configure"
+#line 5373 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:5324: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5377: \"$ac_cpp conftest.$ac_ext\"") >&5

   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:5330: \$? = $ac_status" >&5
+  echo "$as_me:5383: \$? = $ac_status" >&5

   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -5338,32 +5391,32 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then

-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"

 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5

-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"

 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:5349: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:5402: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then

   cat >>confdefs.h <<EOF
   cat >>confdefs.h <<EOF

-#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

 EOF
 
 fi
 done
 
 EOF
 
 fi
 done
 

-  echo "$as_me:5359: checking for working strerror_r" >&5
+  echo "$as_me:5412: checking for working strerror_r" >&5

 echo $ECHO_N "checking for working strerror_r... $ECHO_C" >&6
 if test "${ac_cv_func_strerror_r_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for working strerror_r... $ECHO_C" >&6
 if test "${ac_cv_func_strerror_r_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF

-#line 5366 "configure"
+#line 5419 "configure"

 #include "confdefs.h"
 
 #       include <stdio.h>
 #include "confdefs.h"
 
 #       include <stdio.h>


@@ -5383,16 +5436,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:5386: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5439: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5389: \$? = $ac_status" >&5
+  echo "$as_me:5442: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:5392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5445: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5395: \$? = $ac_status" >&5
+  echo "$as_me:5448: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_strerror_r_works=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_strerror_r_works=yes
 else


@@ -5413,7 +5466,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   ac_cv_func_strerror_r_works=no
 else
   cat >conftest.$ac_ext <<_ACEOF
   ac_cv_func_strerror_r_works=no
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 5416 "configure"
+#line 5469 "configure"

 #include "confdefs.h"
 
 #       include <stdio.h>
 #include "confdefs.h"
 
 #       include <stdio.h>


@@ -5432,15 +5485,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:5435: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5488: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5438: \$? = $ac_status" >&5
+  echo "$as_me:5491: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:5440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5493: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5443: \$? = $ac_status" >&5
+  echo "$as_me:5496: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_strerror_r_works=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_strerror_r_works=yes
 else


@@ -5449,12 +5502,12 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_strerror_r_works=no
 fi
 cat conftest.$ac_ext >&5
 ac_cv_func_strerror_r_works=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
     fi
 
 fi
 fi
     fi
 
 fi

-echo "$as_me:5457: result: $ac_cv_func_strerror_r_works" >&5
+echo "$as_me:5510: result: $ac_cv_func_strerror_r_works" >&5

 echo "${ECHO_T}$ac_cv_func_strerror_r_works" >&6
   if test $ac_cv_func_strerror_r_works = yes; then
 
 echo "${ECHO_T}$ac_cv_func_strerror_r_works" >&6
   if test $ac_cv_func_strerror_r_works = yes; then
 


@@ -5468,11 +5521,11 @@ fi
 ALL_LINGUAS="de es et fr ja nl ru"
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
 ALL_LINGUAS="de es et fr ja nl ru"
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||

-  { { echo "$as_me:5471: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:5524: error: cannot run $ac_config_sub" >&5

 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 

-echo "$as_me:5475: checking build system type" >&5
+echo "$as_me:5528: checking build system type" >&5

 echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -5481,23 +5534,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&

-  { { echo "$as_me:5484: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:5537: error: cannot guess build type; you must specify one" >&5

 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||

-  { { echo "$as_me:5488: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:5541: error: $ac_config_sub $ac_cv_build_alias failed." >&5

 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    { (exit 1); exit 1; }; }
 
 fi

-echo "$as_me:5493: result: $ac_cv_build" >&5
+echo "$as_me:5546: result: $ac_cv_build" >&5

 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 

-echo "$as_me:5500: checking host system type" >&5
+echo "$as_me:5553: checking host system type" >&5

 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -5506,25 +5559,25 @@ else
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||

-  { { echo "$as_me:5509: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:5562: error: $ac_config_sub $ac_cv_host_alias failed" >&5

 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi

-echo "$as_me:5514: result: $ac_cv_host" >&5
+echo "$as_me:5567: result: $ac_cv_host" >&5

 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 

-echo "$as_me:5521: checking for off_t" >&5
+echo "$as_me:5574: checking for off_t" >&5

 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 5527 "configure"
+#line 5580 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -5539,16 +5592,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:5542: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5595: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5545: \$? = $ac_status" >&5
+  echo "$as_me:5598: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:5548: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5601: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5551: \$? = $ac_status" >&5
+  echo "$as_me:5604: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else


@@ -5558,7 +5611,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:5561: result: $ac_cv_type_off_t" >&5
+echo "$as_me:5614: result: $ac_cv_type_off_t" >&5

 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 if test $ac_cv_type_off_t = yes; then
   :
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 if test $ac_cv_type_off_t = yes; then
   :


@@ -5570,13 +5623,13 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:5573: checking for size_t" >&5
+echo "$as_me:5626: checking for size_t" >&5

 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 5579 "configure"
+#line 5632 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -5591,16 +5644,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:5594: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5647: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5597: \$? = $ac_status" >&5
+  echo "$as_me:5650: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:5600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5653: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5603: \$? = $ac_status" >&5
+  echo "$as_me:5656: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else


@@ -5610,7 +5663,7 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:5613: result: $ac_cv_type_size_t" >&5
+echo "$as_me:5666: result: $ac_cv_type_size_t" >&5

 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test $ac_cv_type_size_t = yes; then
   :
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test $ac_cv_type_size_t = yes; then
   :


@@ -5624,24 +5677,24 @@ fi
 
 for ac_header in stdlib.h unistd.h
 do
 
 for ac_header in stdlib.h unistd.h
 do

-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:5628: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:5681: checking for $ac_header" >&5

 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 5634 "configure"
+#line 5687 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:5638: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5691: \"$ac_cpp conftest.$ac_ext\"") >&5

   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:5644: \$? = $ac_status" >&5
+  echo "$as_me:5697: \$? = $ac_status" >&5

   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -5652,19 +5705,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then

-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"

 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5

-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"

 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:5663: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:5716: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then

   cat >>confdefs.h <<EOF
   cat >>confdefs.h <<EOF

-#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

 EOF
 
 fi
 EOF
 
 fi


@@ -5672,14 +5725,14 @@ done
 
 for ac_func in getpagesize
 do
 
 for ac_func in getpagesize
 do

-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:5676: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:5729: checking for $ac_func" >&5

 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 5682 "configure"
+#line 5735 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -5710,36 +5763,36 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:5713: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5766: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5716: \$? = $ac_status" >&5
+  echo "$as_me:5769: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:5719: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5772: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5722: \$? = $ac_status" >&5
+  echo "$as_me:5775: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   (exit $ac_status); }; }; then

-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"

 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"

 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:5732: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:5785: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then

   cat >>confdefs.h <<EOF
   cat >>confdefs.h <<EOF

-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

 EOF
 
 fi
 done
 
 EOF
 
 fi
 done
 

-echo "$as_me:5742: checking for working mmap" >&5
+echo "$as_me:5795: checking for working mmap" >&5

 echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -5748,8 +5801,9 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >conftest.$ac_ext <<_ACEOF
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 5751 "configure"
+#line 5804 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

+$ac_includes_default

 /* Thanks to Mike Haertel and Jim Avera for this test.
    Here is a matrix of mmap possibilities:
        mmap private not fixed
 /* Thanks to Mike Haertel and Jim Avera for this test.
    Here is a matrix of mmap possibilities:
        mmap private not fixed


@@ -5771,19 +5825,13 @@ else
    The main things grep needs to know about mmap are:
    * does it exist and is it safe to write into the mmap'd area
    * how to use it (BSD variants)  */
    The main things grep needs to know about mmap are:
    * does it exist and is it safe to write into the mmap'd area
    * how to use it (BSD variants)  */

-#include <sys/types.h>
+

 #include <fcntl.h>
 #include <sys/mman.h>
 
 #include <fcntl.h>
 #include <sys/mman.h>
 

-#if STDC_HEADERS || HAVE_STDLIB_H
-# include <stdlib.h>
-#else
+#if !STDC_HEADERS && !HAVE_STDLIB_H

 char *malloc ();
 #endif
 char *malloc ();
 #endif

-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#include <sys/stat.h>

 
 /* This mess was copied from the GNU getpagesize.h.  */
 #if !HAVE_GETPAGESIZE
 
 /* This mess was copied from the GNU getpagesize.h.  */
 #if !HAVE_GETPAGESIZE


@@ -5880,15 +5928,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:5883: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5931: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5886: \$? = $ac_status" >&5
+  echo "$as_me:5934: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:5888: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5936: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5891: \$? = $ac_status" >&5
+  echo "$as_me:5939: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else


@@ -5897,10 +5945,10 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_mmap_fixed_mapped=no
 fi
 cat conftest.$ac_ext >&5
 ac_cv_func_mmap_fixed_mapped=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi
 fi
 fi

-echo "$as_me:5903: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:5951: result: $ac_cv_func_mmap_fixed_mapped" >&5

 echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
 
 echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
 


@@ -5911,13 +5959,13 @@ EOF
 fi
 rm -f conftest.mmap
 
 fi
 rm -f conftest.mmap
 

-    echo "$as_me:5914: checking whether we are using the GNU C Library 2.1 or newer" >&5
+    echo "$as_me:5962: checking whether we are using the GNU C Library 2.1 or newer" >&5

 echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
 if test "${ac_cv_gnu_library_2_1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
 if test "${ac_cv_gnu_library_2_1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 5920 "configure"
+#line 5968 "configure"

 #include "confdefs.h"
 
 #include <features.h>
 #include "confdefs.h"
 
 #include <features.h>


@@ -5937,7 +5985,7 @@ fi
 rm -f conftest*
 
 fi
 rm -f conftest*
 
 fi

-echo "$as_me:5940: result: $ac_cv_gnu_library_2_1" >&5
+echo "$as_me:5988: result: $ac_cv_gnu_library_2_1" >&5

 echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
 
     GLIBC21="$ac_cv_gnu_library_2_1"
 echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
 
     GLIBC21="$ac_cv_gnu_library_2_1"


@@ -5945,24 +5993,24 @@ echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
 for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h
 do
 for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h
 do

-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:5949: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:5997: checking for $ac_header" >&5

 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 5955 "configure"
+#line 6003 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:5959: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6007: \"$ac_cpp conftest.$ac_ext\"") >&5

   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:5965: \$? = $ac_status" >&5
+  echo "$as_me:6013: \$? = $ac_status" >&5

   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -5973,19 +6021,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then

-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"

 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5

-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"

 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:5984: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:6032: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then

   cat >>confdefs.h <<EOF
   cat >>confdefs.h <<EOF

-#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

 EOF
 
 fi
 EOF
 
 fi


@@ -5995,14 +6043,14 @@ for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \
 getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
 strdup strtoul tsearch __argz_count __argz_stringify __argz_next
 do
 getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
 strdup strtoul tsearch __argz_count __argz_stringify __argz_next
 do

-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:5999: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:6047: checking for $ac_func" >&5

 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 6005 "configure"
+#line 6053 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -6033,30 +6081,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:6036: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6084: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6039: \$? = $ac_status" >&5
+  echo "$as_me:6087: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:6042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6090: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6045: \$? = $ac_status" >&5
+  echo "$as_me:6093: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   (exit $ac_status); }; }; then

-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"

 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"

 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:6055: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:6103: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then

   cat >>confdefs.h <<EOF
   cat >>confdefs.h <<EOF

-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

 EOF
 
 fi
 EOF
 
 fi


@@ -6073,7 +6121,7 @@ if test "${with_libiconv_prefix+set}" = set; then
 
 fi;
 
 
 fi;
 

-  echo "$as_me:6076: checking for iconv" >&5
+  echo "$as_me:6124: checking for iconv" >&5

 echo $ECHO_N "checking for iconv... $ECHO_C" >&6
 if test "${am_cv_func_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for iconv... $ECHO_C" >&6
 if test "${am_cv_func_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -6082,7 +6130,7 @@ else
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat >conftest.$ac_ext <<_ACEOF
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat >conftest.$ac_ext <<_ACEOF

-#line 6085 "configure"
+#line 6133 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>


@@ -6097,16 +6145,16 @@ iconv_t cd = iconv_open("","");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:6100: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6148: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6103: \$? = $ac_status" >&5
+  echo "$as_me:6151: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:6106: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6154: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6109: \$? = $ac_status" >&5
+  echo "$as_me:6157: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   am_cv_func_iconv=yes
 else
   (exit $ac_status); }; }; then
   am_cv_func_iconv=yes
 else


@@ -6118,7 +6166,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       am_save_LIBS="$LIBS"
       LIBS="$LIBS -liconv"
       cat >conftest.$ac_ext <<_ACEOF
       am_save_LIBS="$LIBS"
       LIBS="$LIBS -liconv"
       cat >conftest.$ac_ext <<_ACEOF

-#line 6121 "configure"
+#line 6169 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>


@@ -6133,16 +6181,16 @@ iconv_t cd = iconv_open("","");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:6136: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6184: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6139: \$? = $ac_status" >&5
+  echo "$as_me:6187: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:6142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6190: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6145: \$? = $ac_status" >&5
+  echo "$as_me:6193: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
   (exit $ac_status); }; }; then
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes


@@ -6155,7 +6203,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
 
 fi
     fi
 
 fi

-echo "$as_me:6158: result: $am_cv_func_iconv" >&5
+echo "$as_me:6206: result: $am_cv_func_iconv" >&5

 echo "${ECHO_T}$am_cv_func_iconv" >&6
   if test "$am_cv_func_iconv" = yes; then
 
 echo "${ECHO_T}$am_cv_func_iconv" >&6
   if test "$am_cv_func_iconv" = yes; then
 


@@ -6163,14 +6211,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
 #define HAVE_ICONV 1
 EOF
 

-    echo "$as_me:6166: checking for iconv declaration" >&5
+    echo "$as_me:6214: checking for iconv declaration" >&5

 echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6
     if test "${am_cv_proto_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
       cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6
     if test "${am_cv_proto_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
       cat >conftest.$ac_ext <<_ACEOF

-#line 6173 "configure"
+#line 6221 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -6194,16 +6242,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:6197: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6245: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:6200: \$? = $ac_status" >&5
+  echo "$as_me:6248: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:6203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6251: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6206: \$? = $ac_status" >&5
+  echo "$as_me:6254: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   am_cv_proto_iconv_arg1=""
 else
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_arg1=""
 else


@@ -6216,7 +6264,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
     am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
 fi
 
     am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`

-    echo "$as_me:6219: result: ${ac_t:-
+    echo "$as_me:6267: result: ${ac_t:-

          }$am_cv_proto_iconv" >&5
 echo "${ECHO_T}${ac_t:-
          }$am_cv_proto_iconv" >&6
          }$am_cv_proto_iconv" >&5
 echo "${ECHO_T}${ac_t:-
          }$am_cv_proto_iconv" >&6


@@ -6231,13 +6279,13 @@ EOF
     LIBICONV="-liconv"
   fi
 
     LIBICONV="-liconv"
   fi
 

-  echo "$as_me:6234: checking for nl_langinfo and CODESET" >&5
+  echo "$as_me:6282: checking for nl_langinfo and CODESET" >&5

 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
 if test "${am_cv_langinfo_codeset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
 if test "${am_cv_langinfo_codeset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 6240 "configure"
+#line 6288 "configure"

 #include "confdefs.h"
 #include <langinfo.h>
 int
 #include "confdefs.h"
 #include <langinfo.h>
 int


@@ -6249,16 +6297,16 @@ char* cs = nl_langinfo(CODESET);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:6252: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6300: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6255: \$? = $ac_status" >&5
+  echo "$as_me:6303: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:6258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6306: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6261: \$? = $ac_status" >&5
+  echo "$as_me:6309: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else
   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else


@@ -6269,7 +6317,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi

-echo "$as_me:6272: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:6320: result: $am_cv_langinfo_codeset" >&5

 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
   if test $am_cv_langinfo_codeset = yes; then
 
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
   if test $am_cv_langinfo_codeset = yes; then
 


@@ -6280,13 +6328,13 @@ EOF
   fi
 
    if test $ac_cv_header_locale_h = yes; then
   fi
 
    if test $ac_cv_header_locale_h = yes; then

-    echo "$as_me:6283: checking for LC_MESSAGES" >&5
+    echo "$as_me:6331: checking for LC_MESSAGES" >&5

 echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
 if test "${am_cv_val_LC_MESSAGES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
 if test "${am_cv_val_LC_MESSAGES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 6289 "configure"
+#line 6337 "configure"

 #include "confdefs.h"
 #include <locale.h>
 int
 #include "confdefs.h"
 #include <locale.h>
 int


@@ -6298,16 +6346,16 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:6301: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6349: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6304: \$? = $ac_status" >&5
+  echo "$as_me:6352: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:6307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6355: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6310: \$? = $ac_status" >&5
+  echo "$as_me:6358: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
   (exit $ac_status); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else


@@ -6317,7 +6365,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:6320: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:6368: result: $am_cv_val_LC_MESSAGES" >&5

 echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
     if test $am_cv_val_LC_MESSAGES = yes; then
 
 echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
     if test $am_cv_val_LC_MESSAGES = yes; then
 


@@ -6327,7 +6375,7 @@ EOF
 
     fi
   fi
 
     fi
   fi

-   echo "$as_me:6330: checking whether NLS is requested" >&5
+   echo "$as_me:6378: checking whether NLS is requested" >&5

 echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
         # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
 echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
         # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then


@@ -6336,7 +6384,7 @@ if test "${enable_nls+set}" = set; then
 else
   USE_NLS=yes
 fi;
 else
   USE_NLS=yes
 fi;

-    echo "$as_me:6339: result: $USE_NLS" >&5
+    echo "$as_me:6387: result: $USE_NLS" >&5

 echo "${ECHO_T}$USE_NLS" >&6
 
     BUILD_INCLUDED_LIBINTL=no
 echo "${ECHO_T}$USE_NLS" >&6
 
     BUILD_INCLUDED_LIBINTL=no


@@ -6349,7 +6397,7 @@ cat >>confdefs.h <<\EOF
 #define ENABLE_NLS 1
 EOF
 
 #define ENABLE_NLS 1
 EOF
 

-      echo "$as_me:6352: checking whether included gettext is requested" >&5
+      echo "$as_me:6400: checking whether included gettext is requested" >&5

 echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
 
 # Check whether --with-included-gettext or --without-included-gettext was given.
 echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
 
 # Check whether --with-included-gettext or --without-included-gettext was given.


@@ -6359,30 +6407,30 @@ if test "${with_included_gettext+set}" = set; then
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
 else
   nls_cv_force_use_gnu_gettext=no
 fi;

-      echo "$as_me:6362: result: $nls_cv_force_use_gnu_gettext" >&5
+      echo "$as_me:6410: result: $nls_cv_force_use_gnu_gettext" >&5

 echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
 
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
                                CATOBJEXT=NONE
 
 echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
 
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
                                CATOBJEXT=NONE
 

-       echo "$as_me:6369: checking for libintl.h" >&5
+       echo "$as_me:6417: checking for libintl.h" >&5

 echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
 if test "${ac_cv_header_libintl_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
 if test "${ac_cv_header_libintl_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 6375 "configure"
+#line 6423 "configure"

 #include "confdefs.h"
 #include <libintl.h>
 _ACEOF
 #include "confdefs.h"
 #include <libintl.h>
 _ACEOF

-if { (eval echo "$as_me:6379: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6427: \"$ac_cpp conftest.$ac_ext\"") >&5

   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:6385: \$? = $ac_status" >&5
+  echo "$as_me:6433: \$? = $ac_status" >&5

   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -6401,16 +6449,16 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:6404: result: $ac_cv_header_libintl_h" >&5
+echo "$as_me:6452: result: $ac_cv_header_libintl_h" >&5

 echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
 if test $ac_cv_header_libintl_h = yes; then
 echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
 if test $ac_cv_header_libintl_h = yes; then

-  echo "$as_me:6407: checking for GNU gettext in libc" >&5
+  echo "$as_me:6455: checking for GNU gettext in libc" >&5

 echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6
 if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6
 if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 6413 "configure"
+#line 6461 "configure"

 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;


@@ -6424,16 +6472,16 @@ return (int) gettext ("") + _nl_msg_cat_cntr
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:6427: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6475: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6430: \$? = $ac_status" >&5
+  echo "$as_me:6478: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:6433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6481: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6436: \$? = $ac_status" >&5
+  echo "$as_me:6484: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   gt_cv_func_gnugettext1_libc=yes
 else
   (exit $ac_status); }; }; then
   gt_cv_func_gnugettext1_libc=yes
 else


@@ -6443,11 +6491,11 @@ gt_cv_func_gnugettext1_libc=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:6446: result: $gt_cv_func_gnugettext1_libc" >&5
+echo "$as_me:6494: result: $gt_cv_func_gnugettext1_libc" >&5

 echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6
 
           if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
 echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6
 
           if test "$gt_cv_func_gnugettext1_libc" != "yes"; then

-            echo "$as_me:6450: checking for GNU gettext in libintl" >&5
+            echo "$as_me:6498: checking for GNU gettext in libintl" >&5

 echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6
 if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6
 if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -6455,7 +6503,7 @@ else
   gt_save_LIBS="$LIBS"
                LIBS="$LIBS -lintl $LIBICONV"
                cat >conftest.$ac_ext <<_ACEOF
   gt_save_LIBS="$LIBS"
                LIBS="$LIBS -lintl $LIBICONV"
                cat >conftest.$ac_ext <<_ACEOF

-#line 6458 "configure"
+#line 6506 "configure"

 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;


@@ -6469,16 +6517,16 @@ return (int) gettext ("") + _nl_msg_cat_cntr
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:6472: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6520: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6475: \$? = $ac_status" >&5
+  echo "$as_me:6523: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:6478: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6526: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6481: \$? = $ac_status" >&5
+  echo "$as_me:6529: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   gt_cv_func_gnugettext1_libintl=yes
 else
   (exit $ac_status); }; }; then
   gt_cv_func_gnugettext1_libintl=yes
 else


@@ -6489,7 +6537,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                LIBS="$gt_save_LIBS"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                LIBS="$gt_save_LIBS"
 fi

-echo "$as_me:6492: result: $gt_cv_func_gnugettext1_libintl" >&5
+echo "$as_me:6540: result: $gt_cv_func_gnugettext1_libintl" >&5

 echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6
           fi
 
 echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6
           fi
 


@@ -6510,14 +6558,14 @@ EOF
 
 for ac_func in dcgettext
 do
 
 for ac_func in dcgettext
 do

-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:6514: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:6562: checking for $ac_func" >&5

 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 6520 "configure"
+#line 6568 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -6548,30 +6596,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:6551: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6599: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6554: \$? = $ac_status" >&5
+  echo "$as_me:6602: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:6557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6605: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6560: \$? = $ac_status" >&5
+  echo "$as_me:6608: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   (exit $ac_status); }; }; then

-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"

 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"

 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:6570: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:6618: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then

   cat >>confdefs.h <<EOF
   cat >>confdefs.h <<EOF

-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

 EOF
 
 fi
 EOF
 
 fi


@@ -6579,9 +6627,9 @@ done
 
             LIBS="$gt_save_LIBS"
 
 
             LIBS="$gt_save_LIBS"
 

-            # Extract the first word of "msgfmt", so it can be a program name with args.
+                    # Extract the first word of "msgfmt", so it can be a program name with args.

 set dummy msgfmt; ac_word=$2
 set dummy msgfmt; ac_word=$2

-echo "$as_me:6584: checking for $ac_word" >&5
+echo "$as_me:6632: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -6595,29 +6643,29 @@ else
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then

-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
+      if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then

        ac_cv_path_MSGFMT="$ac_dir/$ac_word"
        break
       fi
     fi
   done
   IFS="$ac_save_ifs"
        ac_cv_path_MSGFMT="$ac_dir/$ac_word"
        break
       fi
     fi
   done
   IFS="$ac_save_ifs"

-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"

   ;;
 esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
   ;;
 esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"

-if test -n "$MSGFMT"; then
-  echo "$as_me:6611: result: $MSGFMT" >&5
+if test "$MSGFMT" != ":"; then
+  echo "$as_me:6659: result: $MSGFMT" >&5

 echo "${ECHO_T}$MSGFMT" >&6
 else
 echo "${ECHO_T}$MSGFMT" >&6
 else

-  echo "$as_me:6614: result: no" >&5
+  echo "$as_me:6662: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 echo "${ECHO_T}no" >&6
 fi

-            if test "$MSGFMT" != "no"; then
-              # Extract the first word of "gmsgfmt", so it can be a program name with args.
+
+            # Extract the first word of "gmsgfmt", so it can be a program name with args.

 set dummy gmsgfmt; ac_word=$2
 set dummy gmsgfmt; ac_word=$2

-echo "$as_me:6620: checking for $ac_word" >&5
+echo "$as_me:6668: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -6634,7 +6682,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GMSGFMT="$ac_dir/$ac_word"

-   echo "$as_me:6637: found $ac_dir/$ac_word" >&5
+   echo "$as_me:6685: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -6646,18 +6694,16 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then

-  echo "$as_me:6649: result: $GMSGFMT" >&5
+  echo "$as_me:6697: result: $GMSGFMT" >&5

 echo "${ECHO_T}$GMSGFMT" >&6
 else
 echo "${ECHO_T}$GMSGFMT" >&6
 else

-  echo "$as_me:6652: result: no" >&5
+  echo "$as_me:6700: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-            fi
-
-            # Extract the first word of "xgettext", so it can be a program name with args.
+                    # Extract the first word of "xgettext", so it can be a program name with args.

 set dummy xgettext; ac_word=$2
 set dummy xgettext; ac_word=$2

-echo "$as_me:6660: checking for $ac_word" >&5
+echo "$as_me:6706: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -6671,7 +6717,7 @@ else
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then

-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
+      if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then

        ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
        break
       fi
        ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
        break
       fi


@@ -6683,11 +6729,11 @@ else
 esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"

-if test -n "$XGETTEXT"; then
-  echo "$as_me:6687: result: $XGETTEXT" >&5
+if test "$XGETTEXT" != ":"; then
+  echo "$as_me:6733: result: $XGETTEXT" >&5

 echo "${ECHO_T}$XGETTEXT" >&6
 else
 echo "${ECHO_T}$XGETTEXT" >&6
 else

-  echo "$as_me:6690: result: no" >&5
+  echo "$as_me:6736: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -6705,7 +6751,7 @@ fi
                 INTLOBJS="\$(GETTOBJS)"
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
                 INTLOBJS="\$(GETTOBJS)"
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2

-echo "$as_me:6708: checking for $ac_word" >&5
+echo "$as_me:6754: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -6719,29 +6765,29 @@ else
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then

-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
+      if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then

        ac_cv_path_MSGFMT="$ac_dir/$ac_word"
        break
       fi
     fi
   done
   IFS="$ac_save_ifs"
        ac_cv_path_MSGFMT="$ac_dir/$ac_word"
        break
       fi
     fi
   done
   IFS="$ac_save_ifs"

-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="msgfmt"
+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"

   ;;
 esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
   ;;
 esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"

-if test -n "$MSGFMT"; then
-  echo "$as_me:6735: result: $MSGFMT" >&5
+if test "$MSGFMT" != ":"; then
+  echo "$as_me:6781: result: $MSGFMT" >&5

 echo "${ECHO_T}$MSGFMT" >&6
 else
 echo "${ECHO_T}$MSGFMT" >&6
 else

-  echo "$as_me:6738: result: no" >&5
+  echo "$as_me:6784: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo "${ECHO_T}no" >&6
 fi
 
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2

-echo "$as_me:6744: checking for $ac_word" >&5
+echo "$as_me:6790: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -6758,7 +6804,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GMSGFMT="$ac_dir/$ac_word"

-   echo "$as_me:6761: found $ac_dir/$ac_word" >&5
+   echo "$as_me:6807: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -6770,16 +6816,16 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then

-  echo "$as_me:6773: result: $GMSGFMT" >&5
+  echo "$as_me:6819: result: $GMSGFMT" >&5

 echo "${ECHO_T}$GMSGFMT" >&6
 else
 echo "${ECHO_T}$GMSGFMT" >&6
 else

-  echo "$as_me:6776: result: no" >&5
+  echo "$as_me:6822: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo "${ECHO_T}no" >&6
 fi
 
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2

-echo "$as_me:6782: checking for $ac_word" >&5
+echo "$as_me:6828: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -6793,7 +6839,7 @@ else
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then

-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
+      if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then

        ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
        break
       fi
        ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
        break
       fi


@@ -6805,11 +6851,11 @@ else
 esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"

-if test -n "$XGETTEXT"; then
-  echo "$as_me:6809: result: $XGETTEXT" >&5
+if test "$XGETTEXT" != ":"; then
+  echo "$as_me:6855: result: $XGETTEXT" >&5

 echo "${ECHO_T}$XGETTEXT" >&6
 else
 echo "${ECHO_T}$XGETTEXT" >&6
 else

-  echo "$as_me:6812: result: no" >&5
+  echo "$as_me:6858: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -6820,11 +6866,21 @@ fi
        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi
 
        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi
 

-            if test "$XGETTEXT" != ":"; then
-                       if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+                  if test "$GMSGFMT" != ":"; then
+                       if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then

          : ;
        else
          : ;
        else

-         echo "$as_me:6827: result: found xgettext program is not GNU xgettext; ignore it" >&5
+         echo "$as_me:6873: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
+         GMSGFMT=":"
+       fi
+      fi
+
+                  if test "$XGETTEXT" != ":"; then
+                       if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
+         : ;
+       else
+         echo "$as_me:6883: result: found xgettext program is not GNU xgettext; ignore it" >&5

 echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
          XGETTEXT=":"
        fi
 echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
          XGETTEXT=":"
        fi


@@ -6842,7 +6898,7 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-echo "$as_me:6845: checking for $ac_word" >&5
+echo "$as_me:6901: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INTLBISON+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INTLBISON+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -6857,7 +6913,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INTLBISON="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INTLBISON="$ac_prog"

-echo "$as_me:6860: found $ac_dir/$ac_word" >&5
+echo "$as_me:6916: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -6865,10 +6921,10 @@ fi
 fi
 INTLBISON=$ac_cv_prog_INTLBISON
 if test -n "$INTLBISON"; then
 fi
 INTLBISON=$ac_cv_prog_INTLBISON
 if test -n "$INTLBISON"; then

-  echo "$as_me:6868: result: $INTLBISON" >&5
+  echo "$as_me:6924: result: $INTLBISON" >&5

 echo "${ECHO_T}$INTLBISON" >&6
 else
 echo "${ECHO_T}$INTLBISON" >&6
 else

-  echo "$as_me:6871: result: no" >&5
+  echo "$as_me:6927: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -6878,7 +6934,7 @@ done
     if test -z "$INTLBISON"; then
       ac_verc_fail=yes
     else
     if test -z "$INTLBISON"; then
       ac_verc_fail=yes
     else

-            echo "$as_me:6881: checking version of bison" >&5
+            echo "$as_me:6937: checking version of bison" >&5

 echo $ECHO_N "checking version of bison... $ECHO_C" >&6
       ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'`
       case $ac_prog_version in
 echo $ECHO_N "checking version of bison... $ECHO_C" >&6
       ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'`
       case $ac_prog_version in


@@ -6887,7 +6943,7 @@ echo $ECHO_N "checking version of bison... $ECHO_C" >&6
            ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
         *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
       esac
            ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
         *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
       esac

-      echo "$as_me:6890: result: $ac_prog_version" >&5
+      echo "$as_me:6946: result: $ac_prog_version" >&5

 echo "${ECHO_T}$ac_prog_version" >&6
     fi
     if test $ac_verc_fail = yes; then
 echo "${ECHO_T}$ac_prog_version" >&6
     fi
     if test $ac_verc_fail = yes; then


@@ -6912,7 +6968,7 @@ echo "${ECHO_T}$ac_prog_version" >&6
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else

-       echo "$as_me:6915: checking for catalogs to be installed" >&5
+       echo "$as_me:6971: checking for catalogs to be installed" >&5

 echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
        NEW_LINGUAS=
        for presentlang in $ALL_LINGUAS; do
 echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
        NEW_LINGUAS=
        for presentlang in $ALL_LINGUAS; do


@@ -6932,7 +6988,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
          fi
        done
        LINGUAS=$NEW_LINGUAS
          fi
        done
        LINGUAS=$NEW_LINGUAS

-       echo "$as_me:6935: result: $LINGUAS" >&5
+       echo "$as_me:6991: result: $LINGUAS" >&5

 echo "${ECHO_T}$LINGUAS" >&6
      fi
 
 echo "${ECHO_T}$LINGUAS" >&6
      fi
 


@@ -6985,12 +7041,12 @@ _ACEOF
       # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
         "s/'/'\\\\''/g;
       # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
         "s/'/'\\\\''/g;

-         s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"

       ;;
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n \
       ;;
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n \

-        "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"

       ;;
     esac;
 } |
       ;;
     esac;
 } |


@@ -7035,7 +7091,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"

-{ echo "$as_me:7038: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:7094: creating $CONFIG_STATUS" >&5

 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL


@@ -7167,7 +7223,7 @@ EOF
 cat >>$CONFIG_STATUS <<EOF
 ac_cs_version="\\
 bison config.status 1.28a
 cat >>$CONFIG_STATUS <<EOF
 ac_cs_version="\\
 bison config.status 1.28a

-configured by $0, generated by GNU Autoconf 2.50,
+configured by $0, generated by GNU Autoconf 2.52,

   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001


@@ -7211,7 +7267,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header

-    { { echo "$as_me:7214: error: ambiguous option: $1
+    { { echo "$as_me:7270: error: ambiguous option: $1

 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}


@@ -7229,30 +7285,15 @@ Try \`$0 --help' for more information." >&2;}
     CONFIG_HEADERS="$CONFIG_HEADERS $1"
     ac_need_defaults=false;;
 
     CONFIG_HEADERS="$CONFIG_HEADERS $1"
     ac_need_defaults=false;;
 

-  # Handling of arguments.
-  'Makefile' ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  'config/Makefile' ) CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
-  'intl/Makefile' ) CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
-  'po/Makefile.in' ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-  'lib/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
-  'src/Makefile' ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-  'doc/Makefile' ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-  'm4/Makefile' ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
-  'tests/Makefile' ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
-  'tests/atconfig' ) CONFIG_FILES="$CONFIG_FILES tests/atconfig" ;;
-  'default-1' ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-  'default-2' ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
-  'config.h' ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.hin" ;;
-

   # This is an error.
   # This is an error.

-  -*) { { echo "$as_me:7248: error: unrecognized option: $1
+  -*) { { echo "$as_me:7289: error: unrecognized option: $1

 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
    { (exit 1); exit 1; }; } ;;
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
    { (exit 1); exit 1; }; } ;;

-  *) { { echo "$as_me:7253: error: invalid argument: $1" >&5
-echo "$as_me: error: invalid argument: $1" >&2;}
-   { (exit 1); exit 1; }; };;
+
+  *) ac_config_targets="$ac_config_targets $1" ;;
+

   esac
   shift
 done
   esac
   shift
 done


@@ -7264,14 +7305,48 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
 ## Running config.status.  ##
 ## ----------------------- ##
 

-This file was extended by $as_me (bison 1.28a) 2.50, executed with
+This file was extended by $as_me (bison 1.28a) 2.52, executed with
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS

   > $ac_cs_invocation
 on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 EOF
 
   > $ac_cs_invocation
 on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 EOF
 

+cat >>$CONFIG_STATUS <<EOF
+#
+# INIT-COMMANDS section.
+#
+
+EOF
+

 cat >>$CONFIG_STATUS <<\EOF
 cat >>$CONFIG_STATUS <<\EOF

+for ac_config_target in $ac_config_targets
+do
+  case "$ac_config_target" in
+  # Handling of arguments.
+  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+  "config/Makefile" ) CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
+  "intl/Makefile" ) CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
+  "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+  "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
+  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+  "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+  "m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
+  "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+  "tests/atconfig" ) CONFIG_FILES="$CONFIG_FILES tests/atconfig" ;;
+  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+  "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
+  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.hin" ;;
+  *) { { echo "$as_me:7344: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+done
+

 # If the user did not use the arguments to specify the items to instantiate,
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely
 # If the user did not use the arguments to specify the items to instantiate,
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely


@@ -7286,7 +7361,7 @@ fi
 $debug ||
 {
   trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
 $debug ||
 {
   trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0

-  trap '{ (exit $?); exit $?; }' 1 2 13 15
+  trap '{ (exit 1); exit 1; }' 1 2 13 15

 }
 
 # Create a (secure) tmp directory for tmp files.
 }
 
 # Create a (secure) tmp directory for tmp files.


@@ -7306,13 +7381,6 @@ $debug ||
 
 EOF
 
 
 EOF
 

-cat >>$CONFIG_STATUS <<EOF
-#
-# INIT-COMMANDS section.
-#
-
-EOF
-

 cat >>$CONFIG_STATUS <<EOF
 
 #
 cat >>$CONFIG_STATUS <<EOF
 
 #


@@ -7346,6 +7414,9 @@ s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
 s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
 s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
 s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
 s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
 s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
 s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t

+s,@build_alias@,$build_alias,;t t
+s,@host_alias@,$host_alias,;t t
+s,@target_alias@,$target_alias,;t t

 s,@ECHO_C@,$ECHO_C,;t t
 s,@ECHO_N@,$ECHO_N,;t t
 s,@ECHO_T@,$ECHO_T,;t t
 s,@ECHO_C@,$ECHO_C,;t t
 s,@ECHO_N@,$ECHO_N,;t t
 s,@ECHO_T@,$ECHO_T,;t t


@@ -7523,7 +7594,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
   esac
 
   if test x"$ac_file" != x-; then

-    { echo "$as_me:7526: creating $ac_file" >&5
+    { echo "$as_me:7597: creating $ac_file" >&5

 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi


@@ -7541,7 +7612,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)

-         test -f "$f" || { { echo "$as_me:7544: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:7615: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;


@@ -7554,7 +7625,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
            echo $srcdir/$f
          else
            # /dev/null tree

-           { { echo "$as_me:7557: error: cannot find input file: $f" >&5
+           { { echo "$as_me:7628: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;


@@ -7615,7 +7686,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
   * )   ac_file_in=$ac_file.in ;;
   esac
 

-  test x"$ac_file" != x- && { echo "$as_me:7618: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:7689: creating $ac_file" >&5

 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the


@@ -7626,7 +7697,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)

-         test -f "$f" || { { echo "$as_me:7629: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:7700: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;


@@ -7639,7 +7710,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
            echo $srcdir/$f
          else
            # /dev/null tree

-           { { echo "$as_me:7642: error: cannot find input file: $f" >&5
+           { { echo "$as_me:7713: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;


@@ -7756,7 +7827,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then

-      { echo "$as_me:7759: $ac_file is unchanged" >&5
+      { echo "$as_me:7830: $ac_file is unchanged" >&5

 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \


@@ -7819,6 +7890,8 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
           ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
           ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
           ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
           ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
           ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
           ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`

+          # In autoconf-2.13 it is called $ac_given_srcdir.
+          # In autoconf-2.50 it is called $srcdir.

           test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
           case "$ac_given_srcdir" in
             .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
           test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
           case "$ac_given_srcdir" in
             .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;

diff --git a/intl/ChangeLog b/intl/ChangeLog
index df904de3736bf40000be3d35cf76fd7f641d5e92..e62afd415e1c51c5fbf508830389c3b68166bfad 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,4 +1,4 @@
-2001-05-23  GNU  <bug-gnu-utils@gnu.org>
+2001-07-24  GNU  <bug-gnu-utils@gnu.org>

 
 

-       * Version 0.10.38 released.
+       * Version 0.10.39 released.

 
 

diff --git a/intl/VERSION b/intl/VERSION
index 268da64a59e9ff82cd4866808e0b100545c2b694..be17e2701f1a6b5c8c3452e1d33743cc805b3f9a 100644 (file)
--- a/intl/VERSION
+++ b/intl/VERSION
@@ -1 +1 @@
-GNU gettext library from gettext-0.10.38
+GNU gettext library from gettext-0.10.39

diff --git a/intl/config.charset b/intl/config.charset
index d6f369558d1d4ff9033e664ef31f242f0d3aee92..f4f2611c5ecbd837f86df20638b117e577e3a969 100755 (executable)
--- a/intl/config.charset
+++ b/intl/config.charset
@@ -80,10 +80,10 @@
 #   EUC-KR                    glibc aix hpux irix osf solaris freebsd   yes
 #   EUC-TW                    glibc aix hpux irix osf solaris
 #   BIG5                      glibc aix hpux osf solaris freebsd        yes
 #   EUC-KR                    glibc aix hpux irix osf solaris freebsd   yes
 #   EUC-TW                    glibc aix hpux irix osf solaris
 #   BIG5                      glibc aix hpux osf solaris freebsd        yes

-#   BIG5HKSCS                 glibc
+#   BIG5-HKSCS                glibc

 #   GBK                       aix osf win32 dos
 #   GB18030                   glibc
 #   GBK                       aix osf win32 dos
 #   GB18030                   glibc

-#   SJIS                      hpux osf solaris freebsd
+#   SHIFT_JIS                 hpux osf solaris freebsd                  yes

 #   JOHAB                     glibc win32
 #   TIS-620                   glibc aix hpux osf solaris
 #   VISCII                    glibc                                     yes
 #   JOHAB                     glibc win32
 #   TIS-620                   glibc aix hpux osf solaris
 #   VISCII                    glibc                                     yes


@@ -174,7 +174,7 @@ case "$os" in
        echo "eucTW EUC-TW"
        echo "hp15CN GB2312"
        #echo "ccdc ?" # what is this?
        echo "eucTW EUC-TW"
        echo "hp15CN GB2312"
        #echo "ccdc ?" # what is this?

-       echo "SJIS SJIS"
+       echo "SJIS SHIFT_JIS"

        echo "utf8 UTF-8"
        ;;
     irix*)
        echo "utf8 UTF-8"
        ;;
     irix*)


@@ -209,7 +209,7 @@ case "$os" in
        echo "GBK GBK"
        echo "KSC5601 CP949"
        echo "sdeckanji EUC-JP"
        echo "GBK GBK"
        echo "KSC5601 CP949"
        echo "sdeckanji EUC-JP"

-       echo "SJIS SJIS"
+       echo "SJIS SHIFT_JIS"

        echo "TACTIS TIS-620"
        echo "UTF-8 UTF-8"
        ;;
        echo "TACTIS TIS-620"
        echo "UTF-8 UTF-8"
        ;;


@@ -230,7 +230,7 @@ case "$os" in
        echo "cns11643 EUC-TW"
        echo "5601 EUC-KR"
        echo "eucJP EUC-JP"
        echo "cns11643 EUC-TW"
        echo "5601 EUC-KR"
        echo "eucJP EUC-JP"

-       echo "PCK SJIS"
+       echo "PCK SHIFT_JIS"

        echo "TIS620.2533 TIS-620"
        #echo "sun_eu_greek ?" # what is this?
        echo "UTF-8 UTF-8"
        echo "TIS620.2533 TIS-620"
        #echo "sun_eu_greek ?" # what is this?
        echo "UTF-8 UTF-8"


@@ -266,8 +266,8 @@ case "$os" in
        echo "zh_TW.Big5 BIG5"
        echo "zh_CN.EUC GB2312"
        echo "ja_JP.EUC EUC-JP"
        echo "zh_TW.Big5 BIG5"
        echo "zh_CN.EUC GB2312"
        echo "ja_JP.EUC EUC-JP"

-       echo "ja_JP.SJIS SJIS"
-       echo "ja_JP.Shift_JIS SJIS"
+       echo "ja_JP.SJIS SHIFT_JIS"
+       echo "ja_JP.Shift_JIS SHIFT_JIS"

        echo "ko_KR.EUC EUC-KR"
        ;;
     beos*)
        echo "ko_KR.EUC EUC-KR"
        ;;
     beos*)

diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index 8456550d03bb243928713b655342222370b82979..b7627bf611cd01abe9da98f7a5d8aed68599690f 100644 (file)
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -517,6 +517,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
          /* We cannot get the current working directory.  Don't signal an
             error but simply return the default string.  */
          FREE_BLOCKS (block_list);
          /* We cannot get the current working directory.  Don't signal an
             error but simply return the default string.  */
          FREE_BLOCKS (block_list);

+         __libc_rwlock_unlock (_nl_state_lock);

          __set_errno (saved_errno);
          return (plural == 0
                  ? (char *) msgid1
          __set_errno (saved_errno);
          return (plural == 0
                  ? (char *) msgid1

diff --git a/intl/localcharset.c b/intl/localcharset.c
index 22e09e410a9682ad919c66044d8c0ca25d738993..61f8f3e8529ed4b5de04fad2f0f84642c14cf0af 100644 (file)
--- a/intl/localcharset.c
+++ b/intl/localcharset.c
@@ -75,13 +75,13 @@
 /* Pointer to the contents of the charset.alias file, if it has already been
    read, else NULL.  Its format is:
    ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0'  */
 /* Pointer to the contents of the charset.alias file, if it has already been
    read, else NULL.  Its format is:
    ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0'  */

-static char * volatile charset_aliases;
+static const char * volatile charset_aliases;

 
 /* Return a pointer to the contents of the charset.alias file.  */
 static const char *
 get_charset_aliases ()
 {
 
 /* Return a pointer to the contents of the charset.alias file.  */
 static const char *
 get_charset_aliases ()
 {

-  char *cp;
+  const char *cp;

 
   cp = charset_aliases;
   if (cp == NULL)
 
   cp = charset_aliases;
   if (cp == NULL)

diff --git a/m4/Makefile.am b/m4/Makefile.am
index 57ea7a06b71c0aa85a197f92cc22bb5ad93318c5..82e99cd9a6c544e2de3f423fe9903090ecdf202b 100644 (file)
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,19 +1,19 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 EXTRA_DIST =                                   \
 atconfig.m4                                    \
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 EXTRA_DIST =                                   \
 atconfig.m4                                    \

-error.m4                                       \
-iconv.m4                                       \
-m4.m4                                          \
-prereq.m4                                      \
-strerror_r.m4                                  \

 c-bs-a.m4                                      \
 c-bs-a.m4                                      \

-gettext.m4                                     \
-isc-posix.m4                                   \
-malloc.m4                                      \
-progtest.m4                                    \
-warning.m4                                     \

 codeset.m4                                     \
 codeset.m4                                     \

+error.m4                                       \
+gettext.m4                                     \

 glibc21.m4                                     \
 glibc21.m4                                     \

+iconv.m4                                       \
+isc-posix.m4                                   \

 lcmessage.m4                                   \
 lcmessage.m4                                   \

+m4.m4                                          \
+malloc.m4                                      \

 mbstate_t.m4                                   \
 mbstate_t.m4                                   \

-realloc.m4
+prereq.m4                                      \
+progtest.m4                                    \
+realloc.m4                                     \
+strerror_r.m4                                  \
+warning.m4

diff --git a/m4/Makefile.in b/m4/Makefile.in
index c5aa9e3e3138c90a795669bc30bdc095ba47c0ae..ddeb0d41472fea3de00c4a70a59e5616a159e7d7 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -94,7 +94,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 

-EXTRA_DIST =  atconfig.m4                                      error.m4                                        iconv.m4                                        m4.m4                                           prereq.m4                                       strerror_r.m4                                   c-bs-a.m4                                       gettext.m4                                      isc-posix.m4                                    malloc.m4                                       progtest.m4                                     warning.m4                                      codeset.m4                                      glibc21.m4                                      lcmessage.m4                                    mbstate_t.m4                                    realloc.m4
+EXTRA_DIST =  atconfig.m4                                      c-bs-a.m4                                       codeset.m4                                      error.m4                                        gettext.m4                                      glibc21.m4                                      iconv.m4                                        isc-posix.m4                                    lcmessage.m4                                    m4.m4                                           malloc.m4                                       mbstate_t.m4                                    prereq.m4                                       progtest.m4                                     realloc.m4                                      strerror_r.m4                                   warning.m4

 
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = ../config.h
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = ../config.h

diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 57c674c879fab7a0489f54304f5f6adc1e152407..bbb0e9c71ec129502554991394436f7a2ff184e1 100644 (file)
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -2,11 +2,13 @@
 # Ulrich Drepper <drepper@cygnus.com>, 1995.
 #
 # This file can be copied and used freely without restrictions.  It can
 # Ulrich Drepper <drepper@cygnus.com>, 1995.
 #
 # This file can be copied and used freely without restrictions.  It can

-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.

 
 

-# serial 9
+# serial 10

 
 dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]).
 dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library
 
 dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]).
 dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library


@@ -117,14 +119,14 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
             AC_CHECK_FUNCS(dcgettext)
             LIBS="$gt_save_LIBS"
 
             AC_CHECK_FUNCS(dcgettext)
             LIBS="$gt_save_LIBS"
 

+            dnl Search for GNU msgfmt in the PATH.

             AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
             AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,

-              [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-            if test "$MSGFMT" != "no"; then
-              AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-            fi
+              [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
+            AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)

 
 

+            dnl Search for GNU xgettext in the PATH.

             AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
             AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,

-              [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+              [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)

 
             CATOBJEXT=.gmo
           fi
 
             CATOBJEXT=.gmo
           fi


@@ -141,10 +143,10 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
         dnl Mark actions used to generate GNU NLS library.
         INTLOBJS="\$(GETTOBJS)"
         AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
         dnl Mark actions used to generate GNU NLS library.
         INTLOBJS="\$(GETTOBJS)"
         AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,

-         [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
+         [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)

         AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
         AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
         AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
         AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,

-         [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+         [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)

         AC_SUBST(MSGFMT)
        BUILD_INCLUDED_LIBINTL=yes
        USE_INCLUDED_LIBINTL=yes
         AC_SUBST(MSGFMT)
        BUILD_INCLUDED_LIBINTL=yes
        USE_INCLUDED_LIBINTL=yes


@@ -153,11 +155,26 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi
 
        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi
 

+      dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+      dnl Test whether we really found GNU msgfmt.
+      if test "$GMSGFMT" != ":"; then
+       dnl If it is no GNU msgfmt we define it as : so that the
+       dnl Makefiles still can work.
+       if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
+         : ;
+       else
+         AC_MSG_RESULT(
+           [found msgfmt program is not GNU msgfmt; ignore it])
+         GMSGFMT=":"
+       fi
+      fi
+
+      dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.

       dnl Test whether we really found GNU xgettext.
       if test "$XGETTEXT" != ":"; then
        dnl If it is no GNU xgettext we define it as : so that the
        dnl Makefiles still can work.
       dnl Test whether we really found GNU xgettext.
       if test "$XGETTEXT" != ":"; then
        dnl If it is no GNU xgettext we define it as : so that the
        dnl Makefiles still can work.

-       if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+       if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then

          : ;
        else
          AC_MSG_RESULT(
          : ;
        else
          AC_MSG_RESULT(


@@ -181,6 +198,8 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
           ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
           ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
           ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
           ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
           ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
           ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`

+          # In autoconf-2.13 it is called $ac_given_srcdir.
+          # In autoconf-2.50 it is called $srcdir.

           test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
           case "$ac_given_srcdir" in
             .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
           test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
           case "$ac_given_srcdir" in
             .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;

diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4
index 929b51f07fc7fdf4b6958786abd9805671f5f1df..acfd3ace16d6716cc89ca3c734cc995daa1a07d0 100644 (file)
--- a/m4/lcmessage.m4
+++ b/m4/lcmessage.m4
@@ -2,9 +2,11 @@
 # Ulrich Drepper <drepper@cygnus.com>, 1995.
 #
 # This file can be copied and used freely without restrictions.  It can
 # Ulrich Drepper <drepper@cygnus.com>, 1995.
 #
 # This file can be copied and used freely without restrictions.  It can

-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.

 
 # serial 2
 
 
 # serial 2
 

diff --git a/m4/progtest.m4 b/m4/progtest.m4
index aa3c2180941807aca5c94581fb5307e85ab994fb..08840d5ddcf6fcbf41947f8011cba97102fa70c9 100644 (file)
--- a/m4/progtest.m4
+++ b/m4/progtest.m4
@@ -2,11 +2,13 @@
 # Ulrich Drepper <drepper@cygnus.com>, 1996.
 #
 # This file can be copied and used freely without restrictions.  It can
 # Ulrich Drepper <drepper@cygnus.com>, 1996.
 #
 # This file can be copied and used freely without restrictions.  It can

-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.

 
 

-# serial 1
+# serial 2

 
 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
 dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
 
 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
 dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])


@@ -38,7 +40,7 @@ ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
   ;;
 esac])dnl
 $1="$ac_cv_path_$1"
   ;;
 esac])dnl
 $1="$ac_cv_path_$1"

-if test -n "[$]$1"; then
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then

   AC_MSG_RESULT([$]$1)
 else
   AC_MSG_RESULT(no)
   AC_MSG_RESULT([$]$1)
 else
   AC_MSG_RESULT(no)

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 32b7376550aeceffdff220b7d58d7928ab2498e8..28726a21f2806123cfcbd7288392abd644e8cc12 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -2,7 +2,7 @@
 # Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
 # This file file be copied and used freely without restrictions.  It can
 # Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
 # This file file be copied and used freely without restrictions.  It can

-# be used in projects which are not available under the GNU Public License
+# be used in projects which are not available under the GNU General Public License

 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
 
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.