From: Bruno Haible <bruno@clisp.org>
Date: Wed, 17 Jul 2002 16:35:30 +0000 (+0000)
Subject: Update for 0.11.3.
X-Git-Tag: v0.11.3~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02849a533b6a0490df05088c0b3ef5c24fc52ff5;p=thirdparty%2Fgettext.git

Update for 0.11.3.
---

diff --git a/ABOUT-NLS b/ABOUT-NLS
index 224f72c57..57e4b6760 100644
--- a/ABOUT-NLS
+++ b/ABOUT-NLS
@@ -171,126 +171,144 @@ Available Packages
 ==================
 
    Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of April
+matrix shows the current state of internationalization, as of July
 2002.  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%.
 
-     Ready PO files    bg ca cs da de el en eo es et fi fr
-                     +-------------------------------------+
-     a2ps            |          [] []             []    [] |
-     bash            |             []       [] []       [] |
-     bfd             |                         []       [] |
-     binutils        |                         []       [] |
-     bison           |             []          [] []    [] |
-     clisp           |             []    []    []       [] |
-     cpio            |          [] []          []       [] |
-     diffutils       |       [] [] []       [] []       [] |
-     enscript        |             []                   [] |
-     error           |                         []       [] |
-     fetchmail       |    [] () [] []          []       () |
-     fileutils       |          [] []          [] []    [] |
-     findutils       |          [] []          [] []    [] |
-     flex            |    []    [] []          []       [] |
-     gas             |                         []       [] |
-     gawk            |             []          []       [] |
-     gcal            |    []                            [] |
-     gcc             |                         []       [] |
-     gettext         |    []    [] []          []       [] |
-     gnupg           |             [] []    [] [] []    [] |
-     gprof           |                         []       [] |
-     gpsdrive        |          () ()    ()    ()       () |
-     grep            | [] []       [] []       [] []    [] |
-     gretl           |                                     |
-     hello           |          [] [] []    [] [] [] [] [] |
-     id-utils        |          [] []                   [] |
-     indent          |    []       []       []    []    [] |
-     jpilot          |       () [] []                   [] |
-     jwhois          |                         []       [] |
-     kbd             |                         []       [] |
-     ld              |                         []       [] |
-     libc            |    [] [] [] [] []       []       [] |
-     lilypond        |          []                      [] |
-     lynx            |       [] [] []             []       |
-     m4              |       [] [] [] []                [] |
-     make            |          [] []          []       [] |
-     mysecretdiary   |             []                   [] |
-     nano            |    [] () [] []          []       [] |
-     nano_1_0        |    [] () [] []          []       [] |
-     opcodes         |          []             []       [] |
-     parted          |    []    [] []          []       [] |
-     ptx             |          [] []          [] []    [] |
-     python          |                                     |
-     recode          |          [] [] []    [] []       [] |
-     sed             |       [] [] [] []    [] [] []    [] |
-     sh-utils        |    [] [] [] [] []       [] []    [] |
-     sharutils       |       [] [] [] []       []       [] |
-     sketch          |             ()          []       () |
-     soundtracker    |             []          []       [] |
-     sp              |             []                      |
-     tar             |       [] [] []          [] []    [] |
-     texinfo         |       [] [] []       []          [] |
-     textutils       |    []    [] []          []       [] |
-     util-linux      |       [] [] []          [] []    [] |
-     vorbis-tools    |                                     |
-     wastesedge      |                                     |
-     wdiff           |    []    [] []          [] []    [] |
-     wget            | [] [] [] [] [] []       [] []    [] |
-                     +-------------------------------------+
-                       bg ca cs da de el en eo es et fi fr
-                        2 14 11 31 40 10  1  8 41 16  1 50
+     Ready PO files    be bg ca cs da de el en eo es et fi fr
+                     +----------------------------------------+
+     a2ps            |             [] []             []    [] |
+     bash            |                []       [] []       [] |
+     bfd             |                            []       [] |
+     binutils        |                            []       [] |
+     bison           |                []          [] []    [] |
+     clisp           |                []    []    []       [] |
+     clisp           |                                        |
+     clisplow        |                                        |
+     cpio            |             [] []          []       [] |
+     darkstat        |             ()                         |
+     diffutils       |          [] [] []       [] []       [] |
+     enscript        |                []                   [] |
+     error           |                []          []       [] |
+     fetchmail       |       [] () [] []          []       () |
+     fileutils       |             [] []          [] []    [] |
+     findutils       |             [] []       [] [] []    [] |
+     flex            |       []    [] []          []       [] |
+     gas             |                            []       [] |
+     gawk            |                []          []       [] |
+     gcal            |       []                            [] |
+     gcc             |                            []       [] |
+     gettext         |       []    [] []          []       [] |
+     gnupg           |       []       [] []    [] [] []    [] |
+     gprof           |                            []       [] |
+     gpsdrive        |             () ()    ()    ()       () |
+     grep            |    [] []       [] []       [] []    [] |
+     gretl           |                            []          |
+     gthumb          |                ()          ()       () |
+     hello           |       []    [] [] []    [] [] [] [] [] |
+     id-utils        |             [] []                   [] |
+     indent          |       []       []       []    []    [] |
+     jpilot          |          () [] []                   [] |
+     jwhois          |                            []       [] |
+     kbd             |                []          []       [] |
+     ld              |                            []       [] |
+     libc            |       [] [] [] [] []       []       [] |
+     libiconv        |       []       []       [] []          |
+     lifelines       |                ()                   () |
+     lilypond        |             []             []       [] |
+     lingoteach      |                         []          [] |
+     lingoteach_lessons|                ()          ()          |
+     lynx            |       [] [] [] []             []       |
+     m4              |          [] [] [] []                [] |
+     make            |             [] []          []       [] |
+     man-db          |       [] () () []          ()       () |
+     mysecretdiary   |                []          []       [] |
+     nano            |       [] () [] []          []       [] |
+     nano_1_0        |       [] () [] []          []       [] |
+     opcodes         |             []             []       [] |
+     parted          |       []    [] []          []       [] |
+     ptx             |             [] []       [] [] [] [] [] |
+     python          |                                        |
+     recode          |             [] [] []    [] []       [] |
+     sed             |       [] [] [] [] []    [] [] []    [] |
+     sh-utils        |                []          [] []    [] |
+     sharutils       |          [] [] [] []       []       [] |
+     sketch          |                ()          []       () |
+     soundtracker    |                []          []       [] |
+     sp              |                []                      |
+     tar             |          [] [] []          [] []    [] |
+     texinfo         |          [] [] []       []          [] |
+     textutils       |       []    [] []          []       [] |
+     util-linux      |          [] [] []          [] []    [] |
+     vorbis-tools    |                                     [] |
+     wastesedge      |                                        |
+     wdiff           |       []    [] []          [] []    [] |
+     wget            |    [] [] [] [] [] []       [] [] [] [] |
+                     +----------------------------------------+
+                       be bg ca cs da de el en eo es et fi fr
+                        0  2 19 10 30 44  9  1 12 45 16  3 53
      
                        gl he hr hu id it ja ko lv nb nl nn
                      +-------------------------------------+
      a2ps            |                ()    ()       []    |
-     bash            |                                     |
+     bash            |          []                         |
      bfd             |                   []                |
      binutils        |                   []                |
-     bison           |                   []          []    |
+     bison           |       []       [] []          []    |
      clisp           |                               []    |
-     cpio            | []                   []       []    |
-     diffutils       | [] []       []    []                |
+     clisp           |                                     |
+     clisplow        |                                     |
+     cpio            | []       []          []       []    |
+     darkstat        |       ()                            |
+     diffutils       | [] []    [] []    []                |
      enscript        |       []                      []    |
      error           |          []                         |
      fetchmail       |                   []                |
      fileutils       |          []    [] []                |
-     findutils       | []    []    [] [] [] []       []    |
+     findutils       | []    [] [] [] [] [] []       []    |
      flex            |                      []             |
      gas             |                                     |
      gawk            |    []                               |
      gcal            |                                     |
-     gcc             |                                     |
+     gcc             |                   []                |
      gettext         |                   [] []             |
      gnupg           | []          [] [] []                |
      gprof           |                                     |
-     gpsdrive        |                ()             ()    |
-     grep            | [] [] []    [] [] []                |
+     gpsdrive        |          []    ()             ()    |
+     grep            | [] [] [] [] [] [] []                |
      gretl           |                                     |
+     gthumb          |                () ()                |
      hello           | [] [] [] [] [] [] [] [] [] [] [] [] |
-     id-utils        |                               []    |
-     indent          | []                []          []    |
+     id-utils        |          []                   []    |
+     indent          | []       []       []          []    |
      jpilot          |                   ()          ()    |
-     jwhois          |             []                      |
+     jwhois          |          [] []                      |
      kbd             |                                     |
      ld              |                                     |
      libc            | []                [] []    []       |
+     libiconv        | []    [] []                         |
+     lifelines       |                                     |
      lilypond        |                   []          []    |
-     lynx            |                [] []          []    |
+     lingoteach      |          []                         |
+     lingoteach_lessons|                                     |
+     lynx            |          []    [] []          []    |
      m4              | []          []    []          []    |
      make            | [] [] []          [] []       []    |
-     mysecretdiary   |                                     |
-     nano            | []          [] [] ()       [] [] [] |
-     nano_1_0        | []          [] [] ()       []    [] |
-     opcodes         |                               []    |
+     man-db          |                () ()                |
+     mysecretdiary   |             []                      |
+     nano            | []          [] []          [] [] [] |
+     nano_1_0        | []          [] []          []    [] |
+     opcodes         |             []                []    |
      parted          | []                []             [] |
-     ptx             | []          []             [] []    |
+     ptx             | []       [] []             [] []    |
      python          |                                     |
      recode          | [] []          []                   |
-     sed             | [] []       [] [] [] []       []    |
-     sh-utils        | []             [] []       [] []    |
+     sed             | [] [] []    [] [] [] []       []    |
+     sh-utils        |                [] []       []       |
      sharutils       | []                []          []    |
      sketch          |                ()                   |
-     soundtracker    | []                                  |
+     soundtracker    | []    []                            |
      sp              |                                     |
      tar             | []    []       [] []       []       |
      texinfo         |    [] []          []                |
@@ -298,75 +316,84 @@ translation percentage of at least 50%.
      util-linux      |                () []                |
      vorbis-tools    |                                     |
      wastesedge      |                                     |
-     wdiff           | []          []                      |
+     wdiff           | []       [] []                      |
      wget            | [] [] [] []       []          []    |
                      +-------------------------------------+
                        gl he hr hu id it ja ko lv nb nl nn
-                       23  9  8  4 12 12 25  9  1  8 20  4
+                       23  9 12 18 14 13 26  9  1  8 19  4
      
                        no pl pt pt_BR ru sk sl sv tr uk zh_TW
                      +----------------------------------------+
-     a2ps            | () () ()  []   []    [] [] ()          |  9
-     bash            |                                        |  4
+     a2ps            | () () ()  []   []    [] [] []          | 10
+     bash            |           []                           |  6
      bfd             |                         [] []          |  5
-     binutils        |                            []          |  4
-     bison           |                []       [] []          |  9
+     binutils        |                         [] []          |  5
+     bison           |                []       [] []          | 11
      clisp           |                                        |  5
-     cpio            |    []     []   []       []             | 11
-     diffutils       |    []     []   []       [] []     []   | 16
-     enscript        |           []   []       []             |  7
-     error           |                   []       []     []   |  6
+     clisp           |                                        |  0
+     clisplow        |                                        |  0
+     cpio            |    []     []   []       []             | 12
+     darkstat        |           []                      ()   |  1
+     diffutils       |    []     []   []       [] []     []   | 17
+     enscript        |           []   []       [] []          |  8
+     error           |                   []       []     []   |  7
      fetchmail       |    ()     ()               []          |  6
      fileutils       |                []    [] [] []     []   | 13
-     findutils       |    []     []   [] [] [] [] []          | 19
+     findutils       |    []     []   [] [] [] [] []          | 21
      flex            |                []       [] []          |  9
      gas             |                            []          |  3
      gawk            |                         [] []          |  6
      gcal            |                         [] []          |  4
-     gcc             |                            []          |  3
+     gcc             |                            []          |  4
      gettext         |                [] [] [] [] []     []   | 13
-     gnupg           |    []                   [] []          | 13
+     gnupg           |    []                   [] []          | 14
      gprof           |                         [] []          |  4
-     gpsdrive        |                            ()          |  0
-     grep            |    []          []    []    []          | 17
-     gretl           |                                        |  0
-     hello           | [] []          [] []    [] [] []       | 27
-     id-utils        |                []       []             |  6
-     indent          |                [] []    [] []          | 12
+     gpsdrive        |                   []    [] ()          |  3
+     grep            |    []          []    []    []          | 18
+     gretl           |                                        |  1
+     gthumb          |           ()   ()       []             |  1
+     hello           | [] []          [] []    [] [] []       | 28
+     id-utils        |           []   []       [] []          |  9
+     indent          |           []   [] []    [] []          | 14
      jpilot          | ()                      () []          |  4
-     jwhois          |                ()       () []     []   |  5
-     kbd             |                         [] []          |  4
+     jwhois          |           []   ()       () []     []   |  7
+     kbd             |                         [] []          |  5
      ld              |                         [] []          |  4
      libc            | [] []     []      []    [] []          | 17
-     lilypond        |                         []             |  5
-     lynx            |           []   []       []             | 10
+     libiconv        |           []      []    [] []          | 11
+     lifelines       |                         []             |  1
+     lilypond        |                         []             |  6
+     lingoteach      |           []            []             |  5
+     lingoteach_lessons|                                        |  0
+     lynx            |           []   []       [] []          | 13
      m4              |    []          []       []             | 12
      make            |    []     []   []          []          | 14
-     mysecretdiary   |                         [] []          |  4
-     nano            | () []          []       []    []       | 15
-     nano_1_0        | () []          []       []    []       | 14
-     opcodes         |                         [] []          |  6
+     man-db          |                                        |  3
+     mysecretdiary   |           []            [] []          |  7
+     nano            |    []          []       []    []       | 15
+     nano_1_0        |    []          []       []    []       | 14
+     opcodes         |                         [] []          |  7
      parted          |       []  []            []             | 11
-     ptx             | [] [] []       []       [] []          | 15
+     ptx             | [] [] []  []   []       [] []          | 19
      python          |                                        |  0
-     recode          |    []          []    [] []             | 13
-     sed             |           []   [] [] [] [] []          | 21
-     sh-utils        | [] []     []   [] [] [] [] []     []   | 22
+     recode          |    []     []   []    [] [] []          | 15
+     sed             |           []   [] [] [] [] []          | 23
+     sh-utils        |                            []          |  8
      sharutils       |                []       [] []     []   | 13
-     sketch          |           []   ()                      |  3
-     soundtracker    |                         []             |  5
+     sketch          |           []   ()       []             |  4
+     soundtracker    |                         []             |  6
      sp              |                                        |  1
      tar             | [] []     []      [] [] [] []          | 18
      texinfo         |                []       []             | 10
      textutils       |                []    [] [] []     []   | 13
      util-linux      |           []            [] []          | 10
-     vorbis-tools    |                         []             |  1
+     vorbis-tools    |                         []             |  2
      wastesedge      |                                        |  0
-     wdiff           |                [] []    [] []          | 12
-     wget            |    []          [] [] [] [] [] []  []   | 23
+     wdiff           |           []   [] []    [] []          | 14
+     wget            |    []          [] [] [] [] [] []  []   | 24
                      +----------------------------------------+
-       35 teams        no pl pt pt_BR ru sk sl sv tr uk zh_TW
-       58 domains       5 16  2  14   27 11 11 41 36  4   9    536
+       36 teams        no pl pt pt_BR ru sk sl sv tr uk zh_TW
+       67 domains       4 15  2  24   26 12 10 47 42  4   8    594
 
    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
@@ -379,7 +406,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.
 
-   If April 2002 seems to be old, you may fetch a more recent copy of
+   If July 2002 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'.
diff --git a/Makefile.in b/Makefile.in
index c0123f92a..4d422922d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,6 +61,7 @@ AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
 BUILDJAVA = @BUILDJAVA@
+BUILDJAVAEXE = @BUILDJAVAEXE@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -76,10 +77,13 @@ ECHO = @ECHO@
 EMACS = @EMACS@
 EXEEXT = @EXEEXT@
 GCC = @GCC@
+GCJ = @GCJ@
+GCJFLAGS = @GCJFLAGS@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 HAVE_GCJ = @HAVE_GCJ@
+HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
 HAVE_GIJ = @HAVE_GIJ@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
@@ -94,6 +98,7 @@ HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
 HAVE_JVIEW = @HAVE_JVIEW@
 HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
 HAVE_LIB = @HAVE_LIB@
+HAVE__BOOL = @HAVE__BOOL@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -148,9 +153,9 @@ MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@
 
 gettextsrcdir = $(datadir)/gettext
 gettextsrc_DATA = ABOUT-NLS
-gettextsrc_SCRIPTS = config.rpath
+gettextsrc_SCRIPTS = config.rpath mkinstalldirs
 
-SUBDIRS = doc intl intl-java lib libuniname src po man m4 projects misc tests
+SUBDIRS = doc intl intl-java lib libuniname src po projects misc man m4 tests
 
 EXTRA_DIST = config.rpath BUGS DISCLAIM PACKAGING README.gemtext \
              djgpp/COPYING.DJ djgpp/Makefile.maint djgpp/README.DJ \
@@ -168,13 +173,19 @@ CONFIGURES_RPATHX = $(srcdir)/tests/rpathx/Makefile.in $(srcdir)/tests/rpathx/ac
 
 CONFIGURES_RPATHY = $(srcdir)/tests/rpathy/Makefile.in $(srcdir)/tests/rpathy/aclocal.m4 $(srcdir)/tests/rpathy/configure
 
+CONFIGURES_RPATHZ = $(srcdir)/tests/rpathz/Makefile.in $(srcdir)/tests/rpathz/aclocal.m4 $(srcdir)/tests/rpathz/configure
+
 CONFIGURES_RPATHLX = $(srcdir)/tests/rpathlx/Makefile.in $(srcdir)/tests/rpathlx/aclocal.m4 $(srcdir)/tests/rpathlx/configure
 
 CONFIGURES_RPATHLY = $(srcdir)/tests/rpathly/Makefile.in $(srcdir)/tests/rpathly/aclocal.m4 $(srcdir)/tests/rpathly/configure
 
 CONFIGURES_RPATHLYX = $(srcdir)/tests/rpathlyx/Makefile.in $(srcdir)/tests/rpathlyx/aclocal.m4 $(srcdir)/tests/rpathlyx/configure
 
-SUBCONFIGURES = $(CONFIGURES_RPATHX) $(CONFIGURES_RPATHY) $(CONFIGURES_RPATHLX) $(CONFIGURES_RPATHLY) $(CONFIGURES_RPATHLYX)
+CONFIGURES_RPATHLZ = $(srcdir)/tests/rpathlz/Makefile.in $(srcdir)/tests/rpathlz/aclocal.m4 $(srcdir)/tests/rpathlz/configure
+
+CONFIGURES_RPATHLZYX = $(srcdir)/tests/rpathlzyx/Makefile.in $(srcdir)/tests/rpathlzyx/aclocal.m4 $(srcdir)/tests/rpathlzyx/configure
+
+SUBCONFIGURES = $(CONFIGURES_RPATHX) $(CONFIGURES_RPATHY) $(CONFIGURES_RPATHZ) $(CONFIGURES_RPATHLX) $(CONFIGURES_RPATHLY) $(CONFIGURES_RPATHLYX) $(CONFIGURES_RPATHLZ) $(CONFIGURES_RPATHLZYX)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -192,9 +203,9 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
 	install-exec-recursive installdirs-recursive install-recursive \
 	uninstall-recursive check-recursive installcheck-recursive
 DIST_COMMON = README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \
-	INSTALL Makefile.am Makefile.in NEWS THANKS TODO acconfig.h \
-	aclocal.m4 config.guess config.h.in config.sub configure \
-	configure.in install-sh ltmain.sh missing mkinstalldirs ylwrap
+	INSTALL Makefile.am Makefile.in NEWS THANKS TODO aclocal.m4 \
+	config.guess config.h.in config.sub configure configure.in \
+	install-sh ltmain.sh missing mkinstalldirs ylwrap
 DIST_SUBDIRS = $(SUBDIRS)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -222,7 +233,7 @@ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
-$(ACLOCAL_M4):  configure.in m4/backupfile.m4 m4/c-bs-a.m4 m4/codeset.m4 m4/error.m4 m4/flex.m4 m4/fnmatch.m4 m4/getline.m4 m4/gettext.m4 m4/glibc21.m4 m4/hostname.m4 m4/iconv.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/javacomp.m4 m4/javaexec.m4 m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/libtool.m4 m4/mbrtowc.m4 m4/mbstate_t.m4 m4/mbswidth.m4 m4/mkdtemp.m4 m4/progtest.m4 m4/setenv.m4 m4/setlocale.m4 m4/siginfo.m4 m4/signalblocking.m4 m4/signed.m4 m4/ssize_t.m4 m4/stdbool.m4 m4/stdint_h.m4 m4/tmpdir.m4 m4/uintmax_t.m4 m4/ulonglong.m4 m4/unionwait.m4
+$(ACLOCAL_M4):  configure.in m4/backupfile.m4 m4/c-bs-a.m4 m4/codeset.m4 m4/error.m4 m4/flex.m4 m4/fnmatch.m4 m4/gcj.m4 m4/getline.m4 m4/gettext.m4 m4/glibc21.m4 m4/hostname.m4 m4/iconv.m4 m4/intdiv0.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/javacomp.m4 m4/javaexec.m4 m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/libtool.m4 m4/mbrtowc.m4 m4/mbstate_t.m4 m4/mbswidth.m4 m4/mkdtemp.m4 m4/progtest.m4 m4/setenv.m4 m4/setlocale.m4 m4/siginfo.m4 m4/signalblocking.m4 m4/signed.m4 m4/ssize_t.m4 m4/stdbool.m4 m4/stdint_h.m4 m4/tmpdir.m4 m4/uintmax_t.m4 m4/ulonglong.m4 m4/unionwait.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 config.h: stamp-h
 	@if test ! -f $@; then \
@@ -241,7 +252,7 @@ $(srcdir)/config.h.in:  $(srcdir)/./stamp-h.in
 		rm -f $(srcdir)/./stamp-h.in; \
 		$(MAKE) $(srcdir)/./stamp-h.in; \
 	else :; fi
-$(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h
+$(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	@rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT
 	@echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null
 	cd $(top_srcdir) && $(AUTOHEADER)
@@ -583,6 +594,12 @@ $(srcdir)/tests/rpathy/aclocal.m4: $(srcdir)/tests/rpathy/configure.in $(srcdir)
 	cd $(srcdir)/tests/rpathy && aclocal -I ../../m4
 $(srcdir)/tests/rpathy/configure: $(srcdir)/tests/rpathy/configure.in $(srcdir)/tests/rpathy/aclocal.m4
 	cd $(srcdir)/tests/rpathy && autoconf
+$(srcdir)/tests/rpathz/Makefile.in: $(srcdir)/tests/rpathz/Makefile.am $(srcdir)/tests/rpathz/configure.in
+	cd $(srcdir)/tests/rpathz && automake Makefile
+$(srcdir)/tests/rpathz/aclocal.m4: $(srcdir)/tests/rpathz/configure.in $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4
+	cd $(srcdir)/tests/rpathz && aclocal -I ../../m4
+$(srcdir)/tests/rpathz/configure: $(srcdir)/tests/rpathz/configure.in $(srcdir)/tests/rpathz/aclocal.m4
+	cd $(srcdir)/tests/rpathz && autoconf
 $(srcdir)/tests/rpathlx/Makefile.in: $(srcdir)/tests/rpathlx/Makefile.am $(srcdir)/tests/rpathlx/configure.in
 	cd $(srcdir)/tests/rpathlx && automake Makefile
 $(srcdir)/tests/rpathlx/aclocal.m4: $(srcdir)/tests/rpathlx/configure.in $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4
@@ -601,6 +618,18 @@ $(srcdir)/tests/rpathlyx/aclocal.m4: $(srcdir)/tests/rpathlyx/configure.in $(src
 	cd $(srcdir)/tests/rpathlyx && aclocal -I ../../m4
 $(srcdir)/tests/rpathlyx/configure: $(srcdir)/tests/rpathlyx/configure.in $(srcdir)/tests/rpathlyx/aclocal.m4
 	cd $(srcdir)/tests/rpathlyx && autoconf
+$(srcdir)/tests/rpathlz/Makefile.in: $(srcdir)/tests/rpathlz/Makefile.am $(srcdir)/tests/rpathlz/configure.in
+	cd $(srcdir)/tests/rpathlz && automake Makefile
+$(srcdir)/tests/rpathlz/aclocal.m4: $(srcdir)/tests/rpathlz/configure.in $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4
+	cd $(srcdir)/tests/rpathlz && aclocal -I ../../m4
+$(srcdir)/tests/rpathlz/configure: $(srcdir)/tests/rpathlz/configure.in $(srcdir)/tests/rpathlz/aclocal.m4
+	cd $(srcdir)/tests/rpathlz && autoconf
+$(srcdir)/tests/rpathlzyx/Makefile.in: $(srcdir)/tests/rpathlzyx/Makefile.am $(srcdir)/tests/rpathlzyx/configure.in
+	cd $(srcdir)/tests/rpathlzyx && automake Makefile
+$(srcdir)/tests/rpathlzyx/aclocal.m4: $(srcdir)/tests/rpathlzyx/configure.in $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4
+	cd $(srcdir)/tests/rpathlzyx && aclocal -I ../../m4
+$(srcdir)/tests/rpathlzyx/configure: $(srcdir)/tests/rpathlzyx/configure.in $(srcdir)/tests/rpathlzyx/aclocal.m4
+	cd $(srcdir)/tests/rpathlzyx && autoconf
 
 subconfigures: $(SUBCONFIGURES)
 
diff --git a/aclocal.m4 b/aclocal.m4
index 6f5a5dc3b..36d521396 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -504,18 +504,16 @@ AC_PREREQ([2.12])
 
 AC_DEFUN([AM_CONFIG_HEADER],
 [ifdef([AC_FOREACH],dnl
-	 [dnl init our file count if it isn't already
-	 m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0]))
+	 [
 	 dnl prepare to store our destination file list for use in config.status
 	 AC_FOREACH([_AM_File], [$1],
 		    [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*]))
-		    m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index))
 		    dnl and add it to the list of files AC keeps track of, along
 		    dnl with our hook
 		    AC_CONFIG_HEADERS(_AM_File,
 dnl COMMANDS, [, INIT-CMDS]
 [# update the timestamp
-echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index["
+echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h"
 ][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS
 		    m4_popdef([_AM_Dest])])],dnl
 [AC_CONFIG_HEADER([$1])
@@ -581,6 +579,83 @@ AC_DEFUN([gt_PROG_LEX],
   AC_SUBST(LEX_OUTPUT_ROOT)
 ])
 
+# gcj.m4 serial 1 (gettext-0.11.3)
+dnl Copyright (C) 2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+# Check for a Java compiler that creates executables.
+# Assigns the variables GCJ and GCJFLAGS, and set HAVE_GCJ to nonempty,
+# if found. Otherwise sets HAVE_GCJ to empty.
+
+AC_DEFUN([gt_GCJ],
+[
+  AC_ARG_VAR([GCJ], [Java native code compiler command])
+  AC_ARG_VAR([GCJFLAGS], [Java native code compiler flags])
+
+  AC_MSG_CHECKING([for Java to native code compiler])
+  # Search for the gcj command or use the one provided by the user.
+  if test -z "$GCJ"; then
+    pushdef([AC_MSG_CHECKING],[:])dnl
+    pushdef([AC_CHECKING],[:])dnl
+    pushdef([AC_MSG_RESULT],[:])dnl
+    AC_CHECK_PROGS(GCJ, [gcj], [none])
+    popdef([AC_MSG_RESULT])dnl
+    popdef([AC_CHECKING])dnl
+    popdef([AC_MSG_CHECKING])dnl
+  fi
+  # Choose GCJFLAGS or use the one provided by the user.
+  if test "$GCJ" != none; then
+    test "${GCJFLAGS+set}" != set || GCJFLAGS="-O2 -g"
+  fi
+  # Check whether the version is ok and it can create executables.
+  ac_gcj_link="$GCJ $GCJFLAGS conftest.java --main=conftest -o conftest$ac_exeext"
+changequote(,)dnl
+  if test "$GCJ" != none \
+     && $GCJ --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | grep '^[3-9]' >/dev/null \
+     && (
+      # See if libgcj.so is well installed and if exception handling works.
+      cat > conftest.java <<EOF
+public class conftest {
+  public static void main (String[] args) {
+    try {
+      java.util.ResourceBundle.getBundle("foobar");
+    } catch (Exception e) {
+    }
+    System.exit(0);
+  }
+}
+EOF
+changequote([,])dnl
+      AC_TRY_EVAL([ac_gcj_link])
+      error=$?
+      if test $error = 0 && test "$cross_compiling" != yes; then
+        # Run conftest and catch its exit status, but silently.
+        error=`./conftest >/dev/null 2>&1; echo $?`
+        test $error = 0 || error=1
+        rm -f core conftest.core
+      fi
+      rm -f conftest.java conftest$ac_exeext
+      exit $error
+     ); then
+    :
+  else
+    GCJ=none
+  fi
+  AC_MSG_RESULT($GCJ)
+  if test "$GCJ" != none; then
+    HAVE_GCJ=1
+  else
+    HAVE_GCJ=
+  fi
+  AC_SUBST(GCJ)
+  AC_SUBST(GCJFLAGS)
+  AC_SUBST(HAVE_GCJ)
+])
+
 # javacomp.m4 serial 4 (gettext-0.11.3)
 dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
@@ -629,7 +704,7 @@ EOF
         rm -f conftest.java conftest.class
         exit $error
        ); then
-      HAVE_GCJ=1
+      HAVE_GCJ_C=1
       ac_result="gcj -C"
     else
       if test -n "$HAVE_JAVAC_IN_PATH" \
@@ -668,7 +743,7 @@ changequote([,])dnl
   AC_SUBST(JAVAC)
   AC_SUBST(CLASSPATH)
   AC_SUBST(CLASSPATH_SEPARATOR)
-  AC_SUBST(HAVE_GCJ)
+  AC_SUBST(HAVE_GCJ_C)
   AC_SUBST(HAVE_JAVAC)
   AC_SUBST(HAVE_JIKES)
 ])
@@ -5866,7 +5941,7 @@ AC_DEFUN([AC_LIB_RPATH],
   sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
   dnl Determine whether the user wants rpath handling at all.
   AC_ARG_ENABLE(rpath,
-    [  --disable-rpath         do not use hardcode runtime library paths],
+    [  --disable-rpath         do not hardcode runtime library paths],
     :, enable_rpath=yes)
 ])
 
diff --git a/configure b/configure
index 9ed4339ce..a12d43145 100755
--- a/configure
+++ b/configure
@@ -745,6 +745,14 @@ ac_env_CPPFLAGS_set=${CPPFLAGS+set}
 ac_env_CPPFLAGS_value=$CPPFLAGS
 ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
 ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_GCJ_set=${GCJ+set}
+ac_env_GCJ_value=$GCJ
+ac_cv_env_GCJ_set=${GCJ+set}
+ac_cv_env_GCJ_value=$GCJ
+ac_env_GCJFLAGS_set=${GCJFLAGS+set}
+ac_env_GCJFLAGS_value=$GCJFLAGS
+ac_cv_env_GCJFLAGS_set=${GCJFLAGS+set}
+ac_cv_env_GCJFLAGS_value=$GCJFLAGS
 ac_env_CPP_set=${CPP+set}
 ac_env_CPP_value=$CPP
 ac_cv_env_CPP_set=${CPP+set}
@@ -842,7 +850,7 @@ Optional Features:
   --enable-static=PKGS  build static libraries default=yes
   --enable-fast-install=PKGS  optimize for fast installation default=yes
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --disable-rpath         do not use hardcode runtime library paths
+  --disable-rpath         do not hardcode runtime library paths
   --disable-nls           do not use Native Language Support
 
 Optional Packages:
@@ -866,6 +874,8 @@ Some influential environment variables:
               nonstandard directory <lib dir>
   CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
               headers in a nonstandard directory <include dir>
+  GCJ         Java native code compiler command
+  GCJFLAGS    Java native code compiler flags
   CPP         C preprocessor
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
@@ -1053,7 +1063,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:1056: loading site script $ac_site_file" >&5
+    { echo "$as_me:1066: 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"
@@ -1064,7 +1074,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
-    { echo "$as_me:1067: loading cache $cache_file" >&5
+    { echo "$as_me:1077: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -1072,7 +1082,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:1075: creating cache $cache_file" >&5
+  { echo "$as_me:1085: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1088,21 +1098,21 @@ 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,)
-      { echo "$as_me:1091: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:1101: 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)
-      { echo "$as_me:1095: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:1105: 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
-        { echo "$as_me:1101: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:1111: 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:1103:   former value:  $ac_old_val" >&5
+        { echo "$as_me:1113:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:1105:   current value: $ac_new_val" >&5
+        { echo "$as_me:1115:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1121,9 +1131,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:1124: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1134: 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:1126: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1136: 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
@@ -1143,10 +1153,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1146: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1156: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1149: \$? = $ac_status" >&5
+  echo "$as_me:1159: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_path_separator=';'
 else
@@ -1172,7 +1182,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1175: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1185: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1192,7 +1202,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.
-echo "$as_me:1195: checking for a BSD compatible install" >&5
+echo "$as_me:1205: 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
@@ -1241,7 +1251,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:1244: result: $INSTALL" >&5
+echo "$as_me:1254: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -1252,7 +1262,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:1255: checking whether build environment is sane" >&5
+echo "$as_me:1265: checking whether build environment is sane" >&5
 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
@@ -1276,7 +1286,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".
-      { { echo "$as_me:1279: error: ls -t appears to fail.  Make sure there is not a broken
+      { { echo "$as_me:1289: 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;}
@@ -1289,13 +1299,13 @@ then
    # Ok.
    :
 else
-   { { echo "$as_me:1292: error: newly created file is older than distributed files!
+   { { echo "$as_me:1302: 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
-echo "$as_me:1298: result: yes" >&5
+echo "$as_me:1308: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 test "$program_prefix" != NONE &&
   program_transform_name="s,^,$program_prefix,;$program_transform_name"
@@ -1320,7 +1330,7 @@ if eval "$MISSING --run true"; then
 else
   am_missing_run=
   am_backtick='`'
-  { echo "$as_me:1323: WARNING: ${am_backtick}missing' script is too old or missing" >&5
+  { echo "$as_me:1333: WARNING: ${am_backtick}missing' script is too old or missing" >&5
 echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;}
 fi
 
@@ -1328,7 +1338,7 @@ for ac_prog in mawk gawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1331: checking for $ac_word" >&5
+echo "$as_me:1341: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1343,7 +1353,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_AWK="$ac_prog"
-echo "$as_me:1346: found $ac_dir/$ac_word" >&5
+echo "$as_me:1356: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1351,17 +1361,17 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:1354: result: $AWK" >&5
+  echo "$as_me:1364: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:1357: result: no" >&5
+  echo "$as_me:1367: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-echo "$as_me:1364: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:1374: 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
@@ -1381,11 +1391,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:1384: result: yes" >&5
+  echo "$as_me:1394: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:1388: result: no" >&5
+  echo "$as_me:1398: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -1421,14 +1431,14 @@ rmdir .deps 2>/dev/null
 # test to see if srcdir already configured
 if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
-  { { echo "$as_me:1424: error: source directory already configured; run \"make distclean\" there first" >&5
+  { { echo "$as_me:1434: 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
 
 # Define the identity of the package.
 PACKAGE=gettext
-VERSION=0.11.3-pre2
+VERSION=0.11.3
 
 cat >>confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
@@ -1470,7 +1480,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 
-RELEASE_DATE=2002-04-24
+RELEASE_DATE=2002-07-17
 
 		    		    		    ac_config_headers="$ac_config_headers config.h"
 
@@ -1482,7 +1492,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
-echo "$as_me:1485: checking for $ac_word" >&5
+echo "$as_me:1495: 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
@@ -1497,7 +1507,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"
-echo "$as_me:1500: found $ac_dir/$ac_word" >&5
+echo "$as_me:1510: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1505,10 +1515,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1508: result: $CC" >&5
+  echo "$as_me:1518: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1511: result: no" >&5
+  echo "$as_me:1521: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1517,7 +1527,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
-echo "$as_me:1520: checking for $ac_word" >&5
+echo "$as_me:1530: 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
@@ -1532,7 +1542,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"
-echo "$as_me:1535: found $ac_dir/$ac_word" >&5
+echo "$as_me:1545: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1540,10 +1550,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1543: result: $ac_ct_CC" >&5
+  echo "$as_me:1553: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1546: result: no" >&5
+  echo "$as_me:1556: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1556,7 +1566,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
-echo "$as_me:1559: checking for $ac_word" >&5
+echo "$as_me:1569: 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
@@ -1571,7 +1581,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"
-echo "$as_me:1574: found $ac_dir/$ac_word" >&5
+echo "$as_me:1584: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1579,10 +1589,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1582: result: $CC" >&5
+  echo "$as_me:1592: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1585: result: no" >&5
+  echo "$as_me:1595: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1591,7 +1601,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
-echo "$as_me:1594: checking for $ac_word" >&5
+echo "$as_me:1604: 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
@@ -1606,7 +1616,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"
-echo "$as_me:1609: found $ac_dir/$ac_word" >&5
+echo "$as_me:1619: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1614,10 +1624,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1617: result: $ac_ct_CC" >&5
+  echo "$as_me:1627: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1620: result: no" >&5
+  echo "$as_me:1630: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1630,7 +1640,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
-echo "$as_me:1633: checking for $ac_word" >&5
+echo "$as_me:1643: 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
@@ -1650,7 +1660,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1653: found $ac_dir/$ac_word" >&5
+echo "$as_me:1663: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1672,10 +1682,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1675: result: $CC" >&5
+  echo "$as_me:1685: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1678: result: no" >&5
+  echo "$as_me:1688: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1686,7 +1696,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
-echo "$as_me:1689: checking for $ac_word" >&5
+echo "$as_me:1699: 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
@@ -1701,7 +1711,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"
-echo "$as_me:1704: found $ac_dir/$ac_word" >&5
+echo "$as_me:1714: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1709,10 +1719,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1712: result: $CC" >&5
+  echo "$as_me:1722: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1715: result: no" >&5
+  echo "$as_me:1725: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1725,7 +1735,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
-echo "$as_me:1728: checking for $ac_word" >&5
+echo "$as_me:1738: 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
@@ -1740,7 +1750,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"
-echo "$as_me:1743: found $ac_dir/$ac_word" >&5
+echo "$as_me:1753: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1748,10 +1758,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1751: result: $ac_ct_CC" >&5
+  echo "$as_me:1761: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1754: result: no" >&5
+  echo "$as_me:1764: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1763,32 +1773,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1766: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1776: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:1771:" \
+echo "$as_me:1781:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1774: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1784: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1777: \$? = $ac_status" >&5
+  echo "$as_me:1787: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1779: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1789: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1782: \$? = $ac_status" >&5
+  echo "$as_me:1792: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1784: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1794: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1787: \$? = $ac_status" >&5
+  echo "$as_me:1797: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 1791 "configure"
+#line 1801 "configure"
 #include "confdefs.h"
 
 int
@@ -1804,13 +1814,13 @@ 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 compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:1807: checking for C compiler default output" >&5
+echo "$as_me:1817: 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[^ ]*//'`
-if { (eval echo "$as_me:1810: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1820: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1813: \$? = $ac_status" >&5
+  echo "$as_me:1823: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # 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
@@ -1833,34 +1843,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1836: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1846: 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:1842: result: $ac_file" >&5
+echo "$as_me:1852: 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 "$as_me:1847: checking whether the C compiler works" >&5
+echo "$as_me:1857: 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'
-  { (eval echo "$as_me:1853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1863: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1856: \$? = $ac_status" >&5
+  echo "$as_me:1866: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1863: error: cannot run C compiled programs.
+	{ { echo "$as_me:1873: 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;}
@@ -1868,24 +1878,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1871: result: yes" >&5
+echo "$as_me:1881: 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 "$as_me:1878: checking whether we are cross compiling" >&5
+echo "$as_me:1888: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1880: result: $cross_compiling" >&5
+echo "$as_me:1890: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1883: checking for executable suffix" >&5
+echo "$as_me:1893: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1885: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1895: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1888: \$? = $ac_status" >&5
+  echo "$as_me:1898: \$? = $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
@@ -1901,25 +1911,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1904: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1914: 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:1910: result: $ac_cv_exeext" >&5
+echo "$as_me:1920: 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 "$as_me:1916: checking for object suffix" >&5
+echo "$as_me:1926: 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
-#line 1922 "configure"
+#line 1932 "configure"
 #include "confdefs.h"
 
 int
@@ -1931,10 +1941,10 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1934: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1944: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1937: \$? = $ac_status" >&5
+  echo "$as_me:1947: \$? = $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
@@ -1946,24 +1956,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1949: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1959: 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:1956: result: $ac_cv_objext" >&5
+echo "$as_me:1966: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1960: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1970: 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
-#line 1966 "configure"
+#line 1976 "configure"
 #include "confdefs.h"
 
 int
@@ -1978,16 +1988,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1981: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1991: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1984: \$? = $ac_status" >&5
+  echo "$as_me:1994: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1990: \$? = $ac_status" >&5
+  echo "$as_me:2000: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1999,19 +2009,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:2002: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:2012: 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 "$as_me:2008: checking whether $CC accepts -g" >&5
+echo "$as_me:2018: 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
-#line 2014 "configure"
+#line 2024 "configure"
 #include "confdefs.h"
 
 int
@@ -2023,16 +2033,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2026: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2036: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2029: \$? = $ac_status" >&5
+  echo "$as_me:2039: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2032: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2042: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2035: \$? = $ac_status" >&5
+  echo "$as_me:2045: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -2042,7 +2052,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2045: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:2055: 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
@@ -2069,16 +2079,16 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2072: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2082: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2075: \$? = $ac_status" >&5
+  echo "$as_me:2085: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2088: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2081: \$? = $ac_status" >&5
+  echo "$as_me:2091: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -2090,7 +2100,7 @@ if { (eval echo "$as_me:2072: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 2093 "configure"
+#line 2103 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -2103,16 +2113,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2106: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2116: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2109: \$? = $ac_status" >&5
+  echo "$as_me:2119: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2112: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2122: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2115: \$? = $ac_status" >&5
+  echo "$as_me:2125: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -2122,7 +2132,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 2125 "configure"
+#line 2135 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2134,16 +2144,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2137: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2147: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2140: \$? = $ac_status" >&5
+  echo "$as_me:2150: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2143: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2146: \$? = $ac_status" >&5
+  echo "$as_me:2156: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -2178,7 +2188,7 @@ doit:
 	@echo done
 END
 # If we don't find an include directive, just comment out the code.
-echo "$as_me:2181: checking for style of include used by $am_make" >&5
+echo "$as_me:2191: checking for style of include used by $am_make" >&5
 echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
 am__include='#'
 am__quote=
@@ -2205,13 +2215,13 @@ if test "$am__include" = "#"; then
    fi
 fi
 
-echo "$as_me:2208: result: $_am_result" >&5
+echo "$as_me:2218: result: $_am_result" >&5
 echo "${ECHO_T}$_am_result" >&6
 rm -f confinc confmf
 
 depcc="$CC"   am_compiler_list=
 
-echo "$as_me:2214: checking dependency style of $depcc" >&5
+echo "$as_me:2224: checking dependency style of $depcc" >&5
 echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2273,7 +2283,7 @@ else
 fi
 
 fi
-echo "$as_me:2276: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "$as_me:2286: result: $am_cv_CC_dependencies_compiler_type" >&5
 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
 
@@ -2289,7 +2299,7 @@ CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
 # 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:2292: checking for a BSD compatible install" >&5
+echo "$as_me:2302: 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
@@ -2338,7 +2348,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2341: result: $INSTALL" >&5
+echo "$as_me:2351: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2353,7 +2363,7 @@ for ac_prog in 'bison -y' byacc
 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:2356: checking for $ac_word" >&5
+echo "$as_me:2366: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_YACC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2368,7 +2378,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_YACC="$ac_prog"
-echo "$as_me:2371: found $ac_dir/$ac_word" >&5
+echo "$as_me:2381: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2376,10 +2386,10 @@ fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  echo "$as_me:2379: result: $YACC" >&5
+  echo "$as_me:2389: result: $YACC" >&5
 echo "${ECHO_T}$YACC" >&6
 else
-  echo "$as_me:2382: result: no" >&5
+  echo "$as_me:2392: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2389,7 +2399,7 @@ test -n "$YACC" || YACC="yacc"
 
       # Extract the first word of "flex", so it can be a program name with args.
 set dummy flex; ac_word=$2
-echo "$as_me:2392: checking for $ac_word" >&5
+echo "$as_me:2402: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_LEX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2404,7 +2414,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_LEX="flex"
-echo "$as_me:2407: found $ac_dir/$ac_word" >&5
+echo "$as_me:2417: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2413,21 +2423,115 @@ fi
 fi
 LEX=$ac_cv_prog_LEX
 if test -n "$LEX"; then
-  echo "$as_me:2416: result: $LEX" >&5
+  echo "$as_me:2426: result: $LEX" >&5
 echo "${ECHO_T}$LEX" >&6
 else
-  echo "$as_me:2419: result: no" >&5
+  echo "$as_me:2429: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
     LEX_OUTPUT_ROOT=lex.yy
 
+  echo "$as_me:2435: checking for Java to native code compiler" >&5
+echo $ECHO_N "checking for Java to native code compiler... $ECHO_C" >&6
+  # Search for the gcj command or use the one provided by the user.
+  if test -z "$GCJ"; then
+                for ac_prog in gcj
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+:
+if test "${ac_cv_prog_GCJ+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$GCJ"; then
+  ac_cv_prog_GCJ="$GCJ" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_GCJ="$ac_prog"
+echo "$as_me:2457: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+GCJ=$ac_cv_prog_GCJ
+if test -n "$GCJ"; then
+  :
+else
+  :
+fi
+
+  test -n "$GCJ" && break
+done
+test -n "$GCJ" || GCJ="none"
+
+              fi
+  # Choose GCJFLAGS or use the one provided by the user.
+  if test "$GCJ" != none; then
+    test "${GCJFLAGS+set}" != set || GCJFLAGS="-O2 -g"
+  fi
+  # Check whether the version is ok and it can create executables.
+  ac_gcj_link="$GCJ $GCJFLAGS conftest.java --main=conftest -o conftest$ac_exeext"
+  if test "$GCJ" != none \
+     && $GCJ --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | grep '^[3-9]' >/dev/null \
+     && (
+      # See if libgcj.so is well installed and if exception handling works.
+      cat > conftest.java <<EOF
+public class conftest {
+  public static void main (String[] args) {
+    try {
+      java.util.ResourceBundle.getBundle("foobar");
+    } catch (Exception e) {
+    }
+    System.exit(0);
+  }
+}
+EOF
+      { (eval echo "$as_me:2496: \"$ac_gcj_link\"") >&5
+  (eval $ac_gcj_link) 2>&5
+  ac_status=$?
+  echo "$as_me:2499: \$? = $ac_status" >&5
+  (exit $ac_status); }
+      error=$?
+      if test $error = 0 && test "$cross_compiling" != yes; then
+        # Run conftest and catch its exit status, but silently.
+        error=`./conftest >/dev/null 2>&1; echo $?`
+        test $error = 0 || error=1
+        rm -f core conftest.core
+      fi
+      rm -f conftest.java conftest$ac_exeext
+      exit $error
+     ); then
+    :
+  else
+    GCJ=none
+  fi
+  echo "$as_me:2515: result: $GCJ" >&5
+echo "${ECHO_T}$GCJ" >&6
+  if test "$GCJ" != none; then
+    HAVE_GCJ=1
+  else
+    HAVE_GCJ=
+  fi
+
+if test -n "$HAVE_GCJ"; then
+  BUILDJAVAEXE=yes
+else
+  BUILDJAVAEXE=no
+fi
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:2430: checking how to run the C preprocessor" >&5
+echo "$as_me:2534: 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
@@ -2448,18 +2552,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
-#line 2451 "configure"
+#line 2555 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2456: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2560: \"$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
-  echo "$as_me:2462: \$? = $ac_status" >&5
+  echo "$as_me:2566: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2482,17 +2586,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
-#line 2485 "configure"
+#line 2589 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2489: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2593: \"$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
-  echo "$as_me:2495: \$? = $ac_status" >&5
+  echo "$as_me:2599: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2529,7 +2633,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2532: result: $CPP" >&5
+echo "$as_me:2636: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2539,18 +2643,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
-#line 2542 "configure"
+#line 2646 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2547: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2651: \"$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
-  echo "$as_me:2553: \$? = $ac_status" >&5
+  echo "$as_me:2657: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2573,17 +2677,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
-#line 2576 "configure"
+#line 2680 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2580: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2684: \"$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
-  echo "$as_me:2586: \$? = $ac_status" >&5
+  echo "$as_me:2690: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2611,7 +2715,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2614: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2718: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2622,10 +2726,10 @@ 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:2625: checking for Java compiler" >&5
+  echo "$as_me:2729: checking for Java compiler" >&5
 echo $ECHO_N "checking for Java compiler... $ECHO_C" >&6
   cat >conftest.$ac_ext <<_ACEOF
-#line 2628 "configure"
+#line 2732 "configure"
 #include "confdefs.h"
 
 #if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
@@ -2661,7 +2765,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_HAVE_GCJ_IN_PATH="yes"
-echo "$as_me:2664: found $ac_dir/$ac_word" >&5
+echo "$as_me:2768: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2690,7 +2794,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_HAVE_JAVAC_IN_PATH="yes"
-echo "$as_me:2693: found $ac_dir/$ac_word" >&5
+echo "$as_me:2797: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2719,7 +2823,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_HAVE_JIKES_IN_PATH="yes"
-echo "$as_me:2722: found $ac_dir/$ac_word" >&5
+echo "$as_me:2826: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2747,7 +2851,7 @@ EOF
         rm -f conftest.java conftest.class
         exit $error
        ); then
-      HAVE_GCJ=1
+      HAVE_GCJ_C=1
       ac_result="gcj -C"
     else
       if test -n "$HAVE_JAVAC_IN_PATH" \
@@ -2781,12 +2885,12 @@ EOF
       fi
     fi
   fi
-  echo "$as_me:2784: result: $ac_result" >&5
+  echo "$as_me:2888: result: $ac_result" >&5
 echo "${ECHO_T}$ac_result" >&6
 
 # Extract the first word of "jar", so it can be a program name with args.
 set dummy jar; ac_word=$2
-echo "$as_me:2789: checking for $ac_word" >&5
+echo "$as_me:2893: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_JAR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2801,7 +2905,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_JAR="jar"
-echo "$as_me:2804: found $ac_dir/$ac_word" >&5
+echo "$as_me:2908: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2809,10 +2913,10 @@ fi
 fi
 JAR=$ac_cv_prog_JAR
 if test -n "$JAR"; then
-  echo "$as_me:2812: result: $JAR" >&5
+  echo "$as_me:2916: result: $JAR" >&5
 echo "${ECHO_T}$JAR" >&6
 else
-  echo "$as_me:2815: result: no" >&5
+  echo "$as_me:2919: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2822,10 +2926,10 @@ else
   BUILDJAVA=no
 fi
 
-  echo "$as_me:2825: checking for Java virtual machine" >&5
+  echo "$as_me:2929: checking for Java virtual machine" >&5
 echo $ECHO_N "checking for Java virtual machine... $ECHO_C" >&6
   cat >conftest.$ac_ext <<_ACEOF
-#line 2828 "configure"
+#line 2932 "configure"
 #include "confdefs.h"
 
 #if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
@@ -2861,7 +2965,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_HAVE_GIJ_IN_PATH="yes"
-echo "$as_me:2864: found $ac_dir/$ac_word" >&5
+echo "$as_me:2968: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2890,7 +2994,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_HAVE_JAVA_IN_PATH="yes"
-echo "$as_me:2893: found $ac_dir/$ac_word" >&5
+echo "$as_me:2997: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2919,7 +3023,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_HAVE_JRE_IN_PATH="yes"
-echo "$as_me:2922: found $ac_dir/$ac_word" >&5
+echo "$as_me:3026: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2948,7 +3052,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_HAVE_JVIEW_IN_PATH="yes"
-echo "$as_me:2951: found $ac_dir/$ac_word" >&5
+echo "$as_me:3055: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2988,7 +3092,7 @@ fi
       fi
     fi
   fi
-  echo "$as_me:2991: result: $ac_result" >&5
+  echo "$as_me:3095: result: $ac_result" >&5
 echo "${ECHO_T}$ac_result" >&6
 
 if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then
@@ -2999,11 +3103,11 @@ fi
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:3002: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:3106: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:3006: checking build system type" >&5
+echo "$as_me:3110: 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
@@ -3012,23 +3116,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:3015: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:3119: 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:3019: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:3123: 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:3024: result: $ac_cv_build" >&5
+echo "$as_me:3128: 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 "$as_me:3031: checking host system type" >&5
+echo "$as_me:3135: 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
@@ -3037,19 +3141,19 @@ 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` ||
-  { { echo "$as_me:3040: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:3144: 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:3045: result: $ac_cv_host" >&5
+echo "$as_me:3149: 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 "$as_me:3052: checking for strerror in -lcposix" >&5
+        echo "$as_me:3156: 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
@@ -3057,7 +3161,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3060 "configure"
+#line 3164 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3076,16 +3180,16 @@ strerror ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3079: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3183: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3082: \$? = $ac_status" >&5
+  echo "$as_me:3186: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3189: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3088: \$? = $ac_status" >&5
+  echo "$as_me:3192: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cposix_strerror=yes
 else
@@ -3096,7 +3200,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3099: result: $ac_cv_lib_cposix_strerror" >&5
+echo "$as_me:3203: 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"
@@ -3189,7 +3293,7 @@ fi;
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:3192: checking for ld used by GCC" >&5
+  echo "$as_me:3296: checking for ld used by GCC" >&5
 echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
   case $host in
   *-*-mingw*)
@@ -3219,10 +3323,10 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:3222: checking for GNU ld" >&5
+  echo "$as_me:3326: checking for GNU ld" >&5
 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
 else
-  echo "$as_me:3225: checking for non-GNU ld" >&5
+  echo "$as_me:3329: checking for non-GNU ld" >&5
 echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
 fi
 if test "${lt_cv_path_LD+set}" = set; then
@@ -3252,16 +3356,16 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  echo "$as_me:3255: result: $LD" >&5
+  echo "$as_me:3359: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:3258: result: no" >&5
+  echo "$as_me:3362: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
-test -z "$LD" && { { echo "$as_me:3261: error: no acceptable ld found in \$PATH" >&5
+test -z "$LD" && { { echo "$as_me:3365: error: no acceptable ld found in \$PATH" >&5
 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-echo "$as_me:3264: checking if the linker ($LD) is GNU ld" >&5
+echo "$as_me:3368: checking if the linker ($LD) is GNU ld" >&5
 echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3273,23 +3377,23 @@ else
   lt_cv_prog_gnu_ld=no
 fi
 fi
-echo "$as_me:3276: result: $lt_cv_prog_gnu_ld" >&5
+echo "$as_me:3380: result: $lt_cv_prog_gnu_ld" >&5
 echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
-echo "$as_me:3280: checking for $LD option to reload object files" >&5
+echo "$as_me:3384: checking for $LD option to reload object files" >&5
 echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
 if test "${lt_cv_ld_reload_flag+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-echo "$as_me:3287: result: $lt_cv_ld_reload_flag" >&5
+echo "$as_me:3391: result: $lt_cv_ld_reload_flag" >&5
 echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
 reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
-echo "$as_me:3292: checking for BSD-compatible nm" >&5
+echo "$as_me:3396: checking for BSD-compatible nm" >&5
 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
 if test "${lt_cv_path_NM+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3325,21 +3429,21 @@ fi
 fi
 
 NM="$lt_cv_path_NM"
-echo "$as_me:3328: result: $NM" >&5
+echo "$as_me:3432: result: $NM" >&5
 echo "${ECHO_T}$NM" >&6
 
-echo "$as_me:3331: checking whether ln -s works" >&5
+echo "$as_me:3435: checking whether ln -s works" >&5
 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  echo "$as_me:3335: result: yes" >&5
+  echo "$as_me:3439: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3338: result: no, using $LN_S" >&5
+  echo "$as_me:3442: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:3342: checking how to recognise dependant libraries" >&5
+echo "$as_me:3446: checking how to recognise dependant libraries" >&5
 echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6
 if test "${lt_cv_deplibs_check_method+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3517,13 +3621,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
 esac
 
 fi
-echo "$as_me:3520: result: $lt_cv_deplibs_check_method" >&5
+echo "$as_me:3624: result: $lt_cv_deplibs_check_method" >&5
 echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-echo "$as_me:3526: checking command to parse $NM output" >&5
+echo "$as_me:3630: checking command to parse $NM output" >&5
 echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6
 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3604,17 +3708,17 @@ void nm_test_func(){}
 int main(){nm_test_var='a';nm_test_func();return(0);}
 EOF
 
-  if { (eval echo "$as_me:3607: \"$ac_compile\"") >&5
+  if { (eval echo "$as_me:3711: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3610: \$? = $ac_status" >&5
+  echo "$as_me:3714: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { (eval echo "$as_me:3614: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+    if { (eval echo "$as_me:3718: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
-  echo "$as_me:3617: \$? = $ac_status" >&5
+  echo "$as_me:3721: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
@@ -3666,10 +3770,10 @@ EOF
 	  save_CFLAGS="$CFLAGS"
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$no_builtin_flag"
-	  if { (eval echo "$as_me:3669: \"$ac_link\"") >&5
+	  if { (eval echo "$as_me:3773: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3672: \$? = $ac_status" >&5
+  echo "$as_me:3776: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest; then
 	    pipe_works=yes
 	  fi
@@ -3710,33 +3814,33 @@ else
 fi
 if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
 then
-  echo "$as_me:3713: result: failed" >&5
+  echo "$as_me:3817: result: failed" >&5
 echo "${ECHO_T}failed" >&6
 else
-  echo "$as_me:3716: result: ok" >&5
+  echo "$as_me:3820: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 fi
 
 for ac_header in dlfcn.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:3723: checking for $ac_header" >&5
+echo "$as_me:3827: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3729 "configure"
+#line 3833 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3733: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3837: \"$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
-  echo "$as_me:3739: \$? = $ac_status" >&5
+  echo "$as_me:3843: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3755,7 +3859,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3758: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:3862: 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
@@ -3769,7 +3873,7 @@ done
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo "$as_me:3772: checking for ${ac_tool_prefix}file" >&5
+    echo "$as_me:3876: checking for ${ac_tool_prefix}file" >&5
 echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3824,16 +3928,16 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  echo "$as_me:3827: result: $MAGIC_CMD" >&5
+  echo "$as_me:3931: result: $MAGIC_CMD" >&5
 echo "${ECHO_T}$MAGIC_CMD" >&6
 else
-  echo "$as_me:3830: result: no" >&5
+  echo "$as_me:3934: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    echo "$as_me:3836: checking for file" >&5
+    echo "$as_me:3940: checking for file" >&5
 echo $ECHO_N "checking for file... $ECHO_C" >&6
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3888,10 +3992,10 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  echo "$as_me:3891: result: $MAGIC_CMD" >&5
+  echo "$as_me:3995: result: $MAGIC_CMD" >&5
 echo "${ECHO_T}$MAGIC_CMD" >&6
 else
-  echo "$as_me:3894: result: no" >&5
+  echo "$as_me:3998: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3907,7 +4011,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
-echo "$as_me:3910: checking for $ac_word" >&5
+echo "$as_me:4014: 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
@@ -3922,7 +4026,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"
-echo "$as_me:3925: found $ac_dir/$ac_word" >&5
+echo "$as_me:4029: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3930,10 +4034,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:3933: result: $RANLIB" >&5
+  echo "$as_me:4037: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:3936: result: no" >&5
+  echo "$as_me:4040: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3942,7 +4046,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
-echo "$as_me:3945: checking for $ac_word" >&5
+echo "$as_me:4049: 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
@@ -3957,7 +4061,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"
-echo "$as_me:3960: found $ac_dir/$ac_word" >&5
+echo "$as_me:4064: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3966,10 +4070,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:3969: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:4073: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:3972: result: no" >&5
+  echo "$as_me:4076: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3981,7 +4085,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:3984: checking for $ac_word" >&5
+echo "$as_me:4088: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3996,7 +4100,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_STRIP="${ac_tool_prefix}strip"
-echo "$as_me:3999: found $ac_dir/$ac_word" >&5
+echo "$as_me:4103: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4004,10 +4108,10 @@ fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  echo "$as_me:4007: result: $STRIP" >&5
+  echo "$as_me:4111: result: $STRIP" >&5
 echo "${ECHO_T}$STRIP" >&6
 else
-  echo "$as_me:4010: result: no" >&5
+  echo "$as_me:4114: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4016,7 +4120,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-echo "$as_me:4019: checking for $ac_word" >&5
+echo "$as_me:4123: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4031,7 +4135,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_STRIP="strip"
-echo "$as_me:4034: found $ac_dir/$ac_word" >&5
+echo "$as_me:4138: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4040,10 +4144,10 @@ fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:4043: result: $ac_ct_STRIP" >&5
+  echo "$as_me:4147: result: $ac_ct_STRIP" >&5
 echo "${ECHO_T}$ac_ct_STRIP" >&6
 else
-  echo "$as_me:4046: result: no" >&5
+  echo "$as_me:4150: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4067,11 +4171,11 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4070 "configure"' > conftest.$ac_ext
-  if { (eval echo "$as_me:4071: \"$ac_compile\"") >&5
+  echo '#line 4174 "configure"' > conftest.$ac_ext
+  if { (eval echo "$as_me:4175: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4074: \$? = $ac_status" >&5
+  echo "$as_me:4178: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
@@ -4092,7 +4196,7 @@ case $host in
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  echo "$as_me:4095: checking whether the C compiler needs -belf" >&5
+  echo "$as_me:4199: checking whether the C compiler needs -belf" >&5
 echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
 if test "${lt_cv_cc_needs_belf+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4105,7 +4209,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
      cat >conftest.$ac_ext <<_ACEOF
-#line 4108 "configure"
+#line 4212 "configure"
 #include "confdefs.h"
 
 int
@@ -4117,16 +4221,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4120: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4123: \$? = $ac_status" >&5
+  echo "$as_me:4227: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4126: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4129: \$? = $ac_status" >&5
+  echo "$as_me:4233: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   lt_cv_cc_needs_belf=yes
 else
@@ -4142,7 +4246,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-echo "$as_me:4145: result: $lt_cv_cc_needs_belf" >&5
+echo "$as_me:4249: result: $lt_cv_cc_needs_belf" >&5
 echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
@@ -4154,7 +4258,7 @@ echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-echo "$as_me:4157: checking for $ac_word" >&5
+echo "$as_me:4261: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_DLLTOOL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4169,7 +4273,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_DLLTOOL="${ac_tool_prefix}dlltool"
-echo "$as_me:4172: found $ac_dir/$ac_word" >&5
+echo "$as_me:4276: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4177,10 +4281,10 @@ fi
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  echo "$as_me:4180: result: $DLLTOOL" >&5
+  echo "$as_me:4284: result: $DLLTOOL" >&5
 echo "${ECHO_T}$DLLTOOL" >&6
 else
-  echo "$as_me:4183: result: no" >&5
+  echo "$as_me:4287: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4189,7 +4293,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-echo "$as_me:4192: checking for $ac_word" >&5
+echo "$as_me:4296: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4204,7 +4308,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_DLLTOOL="dlltool"
-echo "$as_me:4207: found $ac_dir/$ac_word" >&5
+echo "$as_me:4311: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4213,10 +4317,10 @@ fi
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  echo "$as_me:4216: result: $ac_ct_DLLTOOL" >&5
+  echo "$as_me:4320: result: $ac_ct_DLLTOOL" >&5
 echo "${ECHO_T}$ac_ct_DLLTOOL" >&6
 else
-  echo "$as_me:4219: result: no" >&5
+  echo "$as_me:4323: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4228,7 +4332,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
-echo "$as_me:4231: checking for $ac_word" >&5
+echo "$as_me:4335: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4243,7 +4347,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_AS="${ac_tool_prefix}as"
-echo "$as_me:4246: found $ac_dir/$ac_word" >&5
+echo "$as_me:4350: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4251,10 +4355,10 @@ fi
 fi
 AS=$ac_cv_prog_AS
 if test -n "$AS"; then
-  echo "$as_me:4254: result: $AS" >&5
+  echo "$as_me:4358: result: $AS" >&5
 echo "${ECHO_T}$AS" >&6
 else
-  echo "$as_me:4257: result: no" >&5
+  echo "$as_me:4361: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4263,7 +4367,7 @@ if test -z "$ac_cv_prog_AS"; then
   ac_ct_AS=$AS
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
-echo "$as_me:4266: checking for $ac_word" >&5
+echo "$as_me:4370: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4278,7 +4382,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_AS="as"
-echo "$as_me:4281: found $ac_dir/$ac_word" >&5
+echo "$as_me:4385: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4287,10 +4391,10 @@ fi
 fi
 ac_ct_AS=$ac_cv_prog_ac_ct_AS
 if test -n "$ac_ct_AS"; then
-  echo "$as_me:4290: result: $ac_ct_AS" >&5
+  echo "$as_me:4394: result: $ac_ct_AS" >&5
 echo "${ECHO_T}$ac_ct_AS" >&6
 else
-  echo "$as_me:4293: result: no" >&5
+  echo "$as_me:4397: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4302,7 +4406,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-echo "$as_me:4305: checking for $ac_word" >&5
+echo "$as_me:4409: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_OBJDUMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4317,7 +4421,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_OBJDUMP="${ac_tool_prefix}objdump"
-echo "$as_me:4320: found $ac_dir/$ac_word" >&5
+echo "$as_me:4424: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4325,10 +4429,10 @@ fi
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  echo "$as_me:4328: result: $OBJDUMP" >&5
+  echo "$as_me:4432: result: $OBJDUMP" >&5
 echo "${ECHO_T}$OBJDUMP" >&6
 else
-  echo "$as_me:4331: result: no" >&5
+  echo "$as_me:4435: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4337,7 +4441,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-echo "$as_me:4340: checking for $ac_word" >&5
+echo "$as_me:4444: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4352,7 +4456,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_OBJDUMP="objdump"
-echo "$as_me:4355: found $ac_dir/$ac_word" >&5
+echo "$as_me:4459: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4361,10 +4465,10 @@ fi
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  echo "$as_me:4364: result: $ac_ct_OBJDUMP" >&5
+  echo "$as_me:4468: result: $ac_ct_OBJDUMP" >&5
 echo "${ECHO_T}$ac_ct_OBJDUMP" >&6
 else
-  echo "$as_me:4367: result: no" >&5
+  echo "$as_me:4471: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4375,13 +4479,13 @@ fi
 
   # recent cygwin and mingw systems supply a stub DllMain which the user
   # can override, but on older systems we have to supply one
-  echo "$as_me:4378: checking if libtool should supply DllMain function" >&5
+  echo "$as_me:4482: checking if libtool should supply DllMain function" >&5
 echo $ECHO_N "checking if libtool should supply DllMain function... $ECHO_C" >&6
 if test "${lt_cv_need_dllmain+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4384 "configure"
+#line 4488 "configure"
 #include "confdefs.h"
 
 int
@@ -4394,16 +4498,16 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4397: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4501: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4400: \$? = $ac_status" >&5
+  echo "$as_me:4504: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4406: \$? = $ac_status" >&5
+  echo "$as_me:4510: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   lt_cv_need_dllmain=no
 else
@@ -4413,7 +4517,7 @@ lt_cv_need_dllmain=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4416: result: $lt_cv_need_dllmain" >&5
+echo "$as_me:4520: result: $lt_cv_need_dllmain" >&5
 echo "${ECHO_T}$lt_cv_need_dllmain" >&6
 
   case $host/$CC in
@@ -4422,13 +4526,13 @@ echo "${ECHO_T}$lt_cv_need_dllmain" >&6
     # require "-mdll"
     SAVE_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -mdll"
-    echo "$as_me:4425: checking how to link DLLs" >&5
+    echo "$as_me:4529: checking how to link DLLs" >&5
 echo $ECHO_N "checking how to link DLLs... $ECHO_C" >&6
 if test "${lt_cv_cc_dll_switch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4431 "configure"
+#line 4535 "configure"
 #include "confdefs.h"
 
 int
@@ -4440,16 +4544,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4443: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4547: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4446: \$? = $ac_status" >&5
+  echo "$as_me:4550: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4553: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4452: \$? = $ac_status" >&5
+  echo "$as_me:4556: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   lt_cv_cc_dll_switch=-mdll
 else
@@ -4459,7 +4563,7 @@ lt_cv_cc_dll_switch=-dll
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4462: result: $lt_cv_cc_dll_switch" >&5
+echo "$as_me:4566: result: $lt_cv_cc_dll_switch" >&5
 echo "${ECHO_T}$lt_cv_cc_dll_switch" >&6
     CFLAGS="$SAVE_CFLAGS" ;;
   *-*-cygwin* | *-*-pw32*)
@@ -4561,7 +4665,7 @@ fi
 set dummy $CC
 compiler="$2"
 
-echo "$as_me:4564: checking for objdir" >&5
+echo "$as_me:4668: checking for objdir" >&5
 echo $ECHO_N "checking for objdir... $ECHO_C" >&6
 rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
@@ -4572,7 +4676,7 @@ else
   objdir=_libs
 fi
 rmdir .libs 2>/dev/null
-echo "$as_me:4575: result: $objdir" >&5
+echo "$as_me:4679: result: $objdir" >&5
 echo "${ECHO_T}$objdir" >&6
 
 # Check whether --with-pic or --without-pic was given.
@@ -4587,7 +4691,7 @@ test -z "$pic_mode" && pic_mode=default
 # We assume here that the value for lt_cv_prog_cc_pic will not be cached
 # in isolation, and that seeing it set (from the cache) indicates that
 # the associated values are set (in the cache) correctly too.
-echo "$as_me:4590: checking for $compiler option to produce PIC" >&5
+echo "$as_me:4694: checking for $compiler option to produce PIC" >&5
 echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 if test "${lt_cv_prog_cc_pic+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4747,14 +4851,14 @@ else
 fi
 
 if test -z "$lt_cv_prog_cc_pic"; then
-  echo "$as_me:4750: result: none" >&5
+  echo "$as_me:4854: result: none" >&5
 echo "${ECHO_T}none" >&6
 else
-  echo "$as_me:4753: result: $lt_cv_prog_cc_pic" >&5
+  echo "$as_me:4857: result: $lt_cv_prog_cc_pic" >&5
 echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6
 
   # Check to make sure the pic_flag actually works.
-  echo "$as_me:4757: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
+  echo "$as_me:4861: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6
   if test "${lt_cv_prog_cc_pic_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4762,7 +4866,7 @@ else
       save_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
     cat >conftest.$ac_ext <<_ACEOF
-#line 4765 "configure"
+#line 4869 "configure"
 #include "confdefs.h"
 
 int
@@ -4774,16 +4878,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4777: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4881: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4780: \$? = $ac_status" >&5
+  echo "$as_me:4884: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4783: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4786: \$? = $ac_status" >&5
+  echo "$as_me:4890: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
         case $host_os in
       hpux9* | hpux10* | hpux11*)
@@ -4819,23 +4923,23 @@ fi
     lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
   fi
 
-  echo "$as_me:4822: result: $lt_cv_prog_cc_pic_works" >&5
+  echo "$as_me:4926: result: $lt_cv_prog_cc_pic_works" >&5
 echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6
 fi
 
 # Check for any special shared library compilation flags.
 if test -n "$lt_cv_prog_cc_shlib"; then
-  { echo "$as_me:4828: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5
+  { echo "$as_me:4932: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5
 echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;}
   if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]" >/dev/null; then :
   else
-   { echo "$as_me:4832: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
+   { echo "$as_me:4936: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
 echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
     lt_cv_prog_cc_can_build_shared=no
   fi
 fi
 
-echo "$as_me:4838: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
+echo "$as_me:4942: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
 echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6
 if test "${lt_cv_prog_cc_static_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4844,7 +4948,7 @@ else
   save_LDFLAGS="$LDFLAGS"
   LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
   cat >conftest.$ac_ext <<_ACEOF
-#line 4847 "configure"
+#line 4951 "configure"
 #include "confdefs.h"
 
 int
@@ -4856,16 +4960,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4859: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4963: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4862: \$? = $ac_status" >&5
+  echo "$as_me:4966: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4865: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4868: \$? = $ac_status" >&5
+  echo "$as_me:4972: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   lt_cv_prog_cc_static_works=yes
 else
@@ -4879,7 +4983,7 @@ fi
 
 # Belt *and* braces to stop my trousers falling down:
 test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
-echo "$as_me:4882: result: $lt_cv_prog_cc_static_works" >&5
+echo "$as_me:4986: result: $lt_cv_prog_cc_static_works" >&5
 echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6
 
 pic_flag="$lt_cv_prog_cc_pic"
@@ -4890,7 +4994,7 @@ no_builtin_flag="$lt_cv_prog_cc_no_builtin"
 can_build_shared="$lt_cv_prog_cc_can_build_shared"
 
 # Check to see if options -o and -c are simultaneously supported by compiler
-echo "$as_me:4893: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo "$as_me:4997: checking if $compiler supports -c -o file.$ac_objext" >&5
 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 if test "${lt_cv_compiler_c_o+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4910,7 +5014,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:4913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -4934,12 +5038,12 @@ $rm -r conftest 2>/dev/null
 fi
 
 compiler_c_o=$lt_cv_compiler_c_o
-echo "$as_me:4937: result: $compiler_c_o" >&5
+echo "$as_me:5041: result: $compiler_c_o" >&5
 echo "${ECHO_T}$compiler_c_o" >&6
 
 if test x"$compiler_c_o" = x"yes"; then
   # Check to see if we can write to a .lo
-  echo "$as_me:4942: checking if $compiler supports -c -o file.lo" >&5
+  echo "$as_me:5046: checking if $compiler supports -c -o file.lo" >&5
 echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6
   if test "${lt_cv_compiler_o_lo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4951,7 +5055,7 @@ else
   save_objext="$ac_objext"
   ac_objext=lo
   cat >conftest.$ac_ext <<_ACEOF
-#line 4954 "configure"
+#line 5058 "configure"
 #include "confdefs.h"
 
 int
@@ -4963,16 +5067,16 @@ int some_variable = 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4966: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5070: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4969: \$? = $ac_status" >&5
+  echo "$as_me:5073: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4972: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5076: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4975: \$? = $ac_status" >&5
+  echo "$as_me:5079: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
       # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@@ -4993,7 +5097,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
   compiler_o_lo=$lt_cv_compiler_o_lo
-  echo "$as_me:4996: result: $compiler_o_lo" >&5
+  echo "$as_me:5100: result: $compiler_o_lo" >&5
 echo "${ECHO_T}$compiler_o_lo" >&6
 else
   compiler_o_lo=no
@@ -5003,7 +5107,7 @@ fi
 hard_links="nottested"
 if test "$compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:5006: checking if we can lock with hard links" >&5
+  echo "$as_me:5110: checking if we can lock with hard links" >&5
 echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
   hard_links=yes
   $rm conftest*
@@ -5011,10 +5115,10 @@ echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:5014: result: $hard_links" >&5
+  echo "$as_me:5118: result: $hard_links" >&5
 echo "${ECHO_T}$hard_links" >&6
   if test "$hard_links" = no; then
-    { echo "$as_me:5017: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+    { echo "$as_me:5121: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
@@ -5024,14 +5128,14 @@ fi
 
 if test "$GCC" = yes; then
   # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
-  echo "$as_me:5027: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  echo "$as_me:5131: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
   echo "int some_variable = 0;" > conftest.$ac_ext
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
   compiler_rtti_exceptions=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 5034 "configure"
+#line 5138 "configure"
 #include "confdefs.h"
 
 int
@@ -5043,16 +5147,16 @@ int some_variable = 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5046: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5150: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5049: \$? = $ac_status" >&5
+  echo "$as_me:5153: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5055: \$? = $ac_status" >&5
+  echo "$as_me:5159: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
       # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@@ -5068,7 +5172,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   CFLAGS="$save_CFLAGS"
-  echo "$as_me:5071: result: $compiler_rtti_exceptions" >&5
+  echo "$as_me:5175: result: $compiler_rtti_exceptions" >&5
 echo "${ECHO_T}$compiler_rtti_exceptions" >&6
 
   if test "$compiler_rtti_exceptions" = "yes"; then
@@ -5079,7 +5183,7 @@ echo "${ECHO_T}$compiler_rtti_exceptions" >&6
 fi
 
 # See if the linker supports building shared libraries.
-echo "$as_me:5082: checking whether the linker ($LD) supports shared libraries" >&5
+echo "$as_me:5186: checking whether the linker ($LD) supports shared libraries" >&5
 echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6
 
 allow_undefined_flag=
@@ -5759,12 +5863,12 @@ EOF
     ;;
   esac
 fi
-echo "$as_me:5762: result: $ld_shlibs" >&5
+echo "$as_me:5866: result: $ld_shlibs" >&5
 echo "${ECHO_T}$ld_shlibs" >&6
 test "$ld_shlibs" = no && can_build_shared=no
 
 # Check hardcoding attributes.
-echo "$as_me:5767: checking how to hardcode library paths into programs" >&5
+echo "$as_me:5871: checking how to hardcode library paths into programs" >&5
 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
@@ -5788,20 +5892,20 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-echo "$as_me:5791: result: $hardcode_action" >&5
+echo "$as_me:5895: result: $hardcode_action" >&5
 echo "${ECHO_T}$hardcode_action" >&6
 
 striplib=
 old_striplib=
-echo "$as_me:5796: checking whether stripping libraries is possible" >&5
+echo "$as_me:5900: checking whether stripping libraries is possible" >&5
 echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:5801: result: yes" >&5
+  echo "$as_me:5905: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:5804: result: no" >&5
+  echo "$as_me:5908: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5809,7 +5913,7 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs'
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
 
 # PORTME Fill in your ld.so characteristics
-echo "$as_me:5812: checking dynamic linker characteristics" >&5
+echo "$as_me:5916: checking dynamic linker characteristics" >&5
 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 library_names_spec=
 libname_spec='lib$name'
@@ -6214,17 +6318,17 @@ sysv4*MP*)
   dynamic_linker=no
   ;;
 esac
-echo "$as_me:6217: result: $dynamic_linker" >&5
+echo "$as_me:6321: result: $dynamic_linker" >&5
 echo "${ECHO_T}$dynamic_linker" >&6
 test "$dynamic_linker" = no && can_build_shared=no
 
 # Report the final consequences.
-echo "$as_me:6222: checking if libtool supports shared libraries" >&5
+echo "$as_me:6326: checking if libtool supports shared libraries" >&5
 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:6224: result: $can_build_shared" >&5
+echo "$as_me:6328: result: $can_build_shared" >&5
 echo "${ECHO_T}$can_build_shared" >&6
 
-echo "$as_me:6227: checking whether to build shared libraries" >&5
+echo "$as_me:6331: checking whether to build shared libraries" >&5
 echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
 test "$can_build_shared" = "no" && enable_shared=no
 
@@ -6245,14 +6349,14 @@ aix4*)
   fi
   ;;
 esac
-echo "$as_me:6248: result: $enable_shared" >&5
+echo "$as_me:6352: result: $enable_shared" >&5
 echo "${ECHO_T}$enable_shared" >&6
 
-echo "$as_me:6251: checking whether to build static libraries" >&5
+echo "$as_me:6355: checking whether to build static libraries" >&5
 echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-echo "$as_me:6255: result: $enable_static" >&5
+echo "$as_me:6359: result: $enable_static" >&5
 echo "${ECHO_T}$enable_static" >&6
 
 if test "$hardcode_action" = relink; then
@@ -6290,13 +6394,13 @@ else
    ;;
 
   *)
-    echo "$as_me:6293: checking for shl_load" >&5
+    echo "$as_me:6397: checking for shl_load" >&5
 echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
 if test "${ac_cv_func_shl_load+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6299 "configure"
+#line 6403 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shl_load (); below.  */
@@ -6327,16 +6431,16 @@ f = shl_load;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6330: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6434: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6333: \$? = $ac_status" >&5
+  echo "$as_me:6437: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6440: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6339: \$? = $ac_status" >&5
+  echo "$as_me:6443: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shl_load=yes
 else
@@ -6346,12 +6450,12 @@ ac_cv_func_shl_load=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6349: result: $ac_cv_func_shl_load" >&5
+echo "$as_me:6453: result: $ac_cv_func_shl_load" >&5
 echo "${ECHO_T}$ac_cv_func_shl_load" >&6
 if test $ac_cv_func_shl_load = yes; then
   lt_cv_dlopen="shl_load"
 else
-  echo "$as_me:6354: checking for shl_load in -ldld" >&5
+  echo "$as_me:6458: checking for shl_load in -ldld" >&5
 echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
 if test "${ac_cv_lib_dld_shl_load+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6359,7 +6463,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6362 "configure"
+#line 6466 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6378,16 +6482,16 @@ shl_load ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6381: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6485: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6384: \$? = $ac_status" >&5
+  echo "$as_me:6488: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6387: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6491: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6390: \$? = $ac_status" >&5
+  echo "$as_me:6494: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dld_shl_load=yes
 else
@@ -6398,18 +6502,18 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6401: result: $ac_cv_lib_dld_shl_load" >&5
+echo "$as_me:6505: result: $ac_cv_lib_dld_shl_load" >&5
 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
 if test $ac_cv_lib_dld_shl_load = yes; then
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
 else
-  echo "$as_me:6406: checking for dlopen" >&5
+  echo "$as_me:6510: checking for dlopen" >&5
 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
 if test "${ac_cv_func_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6412 "configure"
+#line 6516 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlopen (); below.  */
@@ -6440,16 +6544,16 @@ f = dlopen;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6443: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6547: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6446: \$? = $ac_status" >&5
+  echo "$as_me:6550: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6553: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6452: \$? = $ac_status" >&5
+  echo "$as_me:6556: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_dlopen=yes
 else
@@ -6459,12 +6563,12 @@ ac_cv_func_dlopen=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6462: result: $ac_cv_func_dlopen" >&5
+echo "$as_me:6566: result: $ac_cv_func_dlopen" >&5
 echo "${ECHO_T}$ac_cv_func_dlopen" >&6
 if test $ac_cv_func_dlopen = yes; then
   lt_cv_dlopen="dlopen"
 else
-  echo "$as_me:6467: checking for dlopen in -ldl" >&5
+  echo "$as_me:6571: checking for dlopen in -ldl" >&5
 echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6472,7 +6576,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6475 "configure"
+#line 6579 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6491,16 +6595,16 @@ dlopen ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6494: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6598: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6497: \$? = $ac_status" >&5
+  echo "$as_me:6601: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6503: \$? = $ac_status" >&5
+  echo "$as_me:6607: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dl_dlopen=yes
 else
@@ -6511,12 +6615,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6514: result: $ac_cv_lib_dl_dlopen" >&5
+echo "$as_me:6618: result: $ac_cv_lib_dl_dlopen" >&5
 echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
 if test $ac_cv_lib_dl_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  echo "$as_me:6519: checking for dlopen in -lsvld" >&5
+  echo "$as_me:6623: checking for dlopen in -lsvld" >&5
 echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
 if test "${ac_cv_lib_svld_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6524,7 +6628,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6527 "configure"
+#line 6631 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6543,16 +6647,16 @@ dlopen ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6546: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6650: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6549: \$? = $ac_status" >&5
+  echo "$as_me:6653: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6656: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6555: \$? = $ac_status" >&5
+  echo "$as_me:6659: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_svld_dlopen=yes
 else
@@ -6563,12 +6667,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6566: result: $ac_cv_lib_svld_dlopen" >&5
+echo "$as_me:6670: result: $ac_cv_lib_svld_dlopen" >&5
 echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
 if test $ac_cv_lib_svld_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  echo "$as_me:6571: checking for dld_link in -ldld" >&5
+  echo "$as_me:6675: checking for dld_link in -ldld" >&5
 echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
 if test "${ac_cv_lib_dld_dld_link+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6576,7 +6680,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6579 "configure"
+#line 6683 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6595,16 +6699,16 @@ dld_link ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6598: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6702: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6601: \$? = $ac_status" >&5
+  echo "$as_me:6705: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6604: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6607: \$? = $ac_status" >&5
+  echo "$as_me:6711: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dld_dld_link=yes
 else
@@ -6615,7 +6719,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6618: result: $ac_cv_lib_dld_dld_link" >&5
+echo "$as_me:6722: result: $ac_cv_lib_dld_dld_link" >&5
 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
 if test $ac_cv_lib_dld_dld_link = yes; then
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
@@ -6651,7 +6755,7 @@ fi
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    echo "$as_me:6654: checking whether a program can dlopen itself" >&5
+    echo "$as_me:6758: checking whether a program can dlopen itself" >&5
 echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
 if test "${lt_cv_dlopen_self+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6662,7 +6766,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6665 "configure"
+#line 6769 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6723,10 +6827,10 @@ int main ()
     exit (status);
 }
 EOF
-  if { (eval echo "$as_me:6726: \"$ac_link\"") >&5
+  if { (eval echo "$as_me:6830: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6729: \$? = $ac_status" >&5
+  echo "$as_me:6833: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) 2>/dev/null
     lt_status=$?
@@ -6743,12 +6847,12 @@ fi
 rm -fr conftest*
 
 fi
-echo "$as_me:6746: result: $lt_cv_dlopen_self" >&5
+echo "$as_me:6850: result: $lt_cv_dlopen_self" >&5
 echo "${ECHO_T}$lt_cv_dlopen_self" >&6
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       LDFLAGS="$LDFLAGS $link_static_flag"
-      echo "$as_me:6751: checking whether a statically linked program can dlopen itself" >&5
+      echo "$as_me:6855: checking whether a statically linked program can dlopen itself" >&5
 echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
 if test "${lt_cv_dlopen_self_static+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6759,7 +6863,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6762 "configure"
+#line 6866 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6820,10 +6924,10 @@ int main ()
     exit (status);
 }
 EOF
-  if { (eval echo "$as_me:6823: \"$ac_link\"") >&5
+  if { (eval echo "$as_me:6927: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6826: \$? = $ac_status" >&5
+  echo "$as_me:6930: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) 2>/dev/null
     lt_status=$?
@@ -6840,7 +6944,7 @@ fi
 rm -fr conftest*
 
 fi
-echo "$as_me:6843: result: $lt_cv_dlopen_self_static" >&5
+echo "$as_me:6947: result: $lt_cv_dlopen_self_static" >&5
 echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
     fi
 
@@ -6870,7 +6974,7 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then
     # Test whether the compiler implicitly links with -lc since on some
     # systems, -lgcc has to come before -lc. If gcc already passes -lc
     # to ld, don't add -lc before -lgcc.
-    echo "$as_me:6873: checking whether -lc should be explicitly linked in" >&5
+    echo "$as_me:6977: checking whether -lc should be explicitly linked in" >&5
 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
     if test "${lt_cv_archive_cmds_need_lc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6878,10 +6982,10 @@ else
   $rm conftest*
     echo 'static int dummy;' > conftest.$ac_ext
 
-    if { (eval echo "$as_me:6881: \"$ac_compile\"") >&5
+    if { (eval echo "$as_me:6985: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6884: \$? = $ac_status" >&5
+  echo "$as_me:6988: \$? = $ac_status" >&5
   (exit $ac_status); }; then
       soname=conftest
       lib=conftest
@@ -6895,10 +6999,10 @@ else
       libname=conftest
       save_allow_undefined_flag=$allow_undefined_flag
       allow_undefined_flag=
-      if { (eval echo "$as_me:6898: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+      if { (eval echo "$as_me:7002: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:6901: \$? = $ac_status" >&5
+  echo "$as_me:7005: \$? = $ac_status" >&5
   (exit $ac_status); }
       then
 	lt_cv_archive_cmds_need_lc=no
@@ -6913,7 +7017,7 @@ else
 
 fi
 
-    echo "$as_me:6916: result: $lt_cv_archive_cmds_need_lc" >&5
+    echo "$as_me:7020: result: $lt_cv_archive_cmds_need_lc" >&5
 echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6
     ;;
   esac
@@ -7482,13 +7586,13 @@ cat >>confdefs.h <<\EOF
 #define _GNU_SOURCE 1
 EOF
 
-echo "$as_me:7485: checking for ANSI C header files" >&5
+echo "$as_me:7589: 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
-#line 7491 "configure"
+#line 7595 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -7496,13 +7600,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:7499: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7603: \"$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
-  echo "$as_me:7505: \$? = $ac_status" >&5
+  echo "$as_me:7609: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7524,7 +7628,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
-#line 7527 "configure"
+#line 7631 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -7542,7 +7646,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
-#line 7545 "configure"
+#line 7649 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -7563,7 +7667,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7566 "configure"
+#line 7670 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -7589,15 +7693,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:7592: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7696: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7595: \$? = $ac_status" >&5
+  echo "$as_me:7699: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7597: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7600: \$? = $ac_status" >&5
+  echo "$as_me:7704: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -7610,7 +7714,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:7613: result: $ac_cv_header_stdc" >&5
+echo "$as_me:7717: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -7623,23 +7727,23 @@ fi
 for ac_header in limits.h malloc.h string.h unistd.h values.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7626: checking for $ac_header" >&5
+echo "$as_me:7730: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7632 "configure"
+#line 7736 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7636: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7740: \"$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
-  echo "$as_me:7642: \$? = $ac_status" >&5
+  echo "$as_me:7746: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7658,7 +7762,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7661: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:7765: 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
@@ -7668,14 +7772,14 @@ EOF
 fi
 done
 
-echo "$as_me:7671: checking for stdbool.h" >&5
+echo "$as_me:7775: checking for stdbool.h" >&5
 echo $ECHO_N "checking for stdbool.h... $ECHO_C" >&6
 if test "${gt_cv_header_stdbool_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
   cat >conftest.$ac_ext <<_ACEOF
-#line 7678 "configure"
+#line 7782 "configure"
 #include "confdefs.h"
 #include <stdbool.h>
 #if false
@@ -7697,16 +7801,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7700: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7804: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7703: \$? = $ac_status" >&5
+  echo "$as_me:7807: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7810: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7709: \$? = $ac_status" >&5
+  echo "$as_me:7813: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_header_stdbool_h=yes
 else
@@ -7717,7 +7821,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:7720: result: $gt_cv_header_stdbool_h" >&5
+echo "$as_me:7824: result: $gt_cv_header_stdbool_h" >&5
 echo "${ECHO_T}$gt_cv_header_stdbool_h" >&6
 if test $gt_cv_header_stdbool_h = yes; then
 
@@ -7728,14 +7832,14 @@ EOF
   STDBOOL_H=''
 else
   STDBOOL_H='stdbool.h'
-  echo "$as_me:7731: checking for _Bool type" >&5
+  echo "$as_me:7835: checking for _Bool type" >&5
 echo $ECHO_N "checking for _Bool type... $ECHO_C" >&6
   if test "${gt_cv_type_Bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 7738 "configure"
+#line 7842 "configure"
 #include "confdefs.h"
 _Bool x = sizeof (_Bool);
 int
@@ -7747,16 +7851,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7750: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7854: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7753: \$? = $ac_status" >&5
+  echo "$as_me:7857: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7860: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7759: \$? = $ac_status" >&5
+  echo "$as_me:7863: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_type_Bool=yes
 else
@@ -7767,7 +7871,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-  echo "$as_me:7770: result: $gt_cv_type_Bool" >&5
+  echo "$as_me:7874: result: $gt_cv_type_Bool" >&5
 echo "${ECHO_T}$gt_cv_type_Bool" >&6
   if test $gt_cv_type_Bool = yes; then
     HAVE__BOOL=1
@@ -7777,7 +7881,7 @@ echo "${ECHO_T}$gt_cv_type_Bool" >&6
 
 fi
 
-echo "$as_me:7780: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:7884: 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
@@ -7785,7 +7889,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 7788 "configure"
+#line 7892 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -7834,16 +7938,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
-if { (eval echo "$as_me:7837: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7941: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7840: \$? = $ac_status" >&5
+  echo "$as_me:7944: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7947: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7846: \$? = $ac_status" >&5
+  echo "$as_me:7950: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -7860,21 +7964,21 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:7863: result: none needed" >&5
+    echo "$as_me:7967: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:7866: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:7970: 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 "$as_me:7871: checking for an ANSI C-conforming const" >&5
+echo "$as_me:7975: 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
-#line 7877 "configure"
+#line 7981 "configure"
 #include "confdefs.h"
 
 int
@@ -7932,16 +8036,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7935: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8039: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7938: \$? = $ac_status" >&5
+  echo "$as_me:8042: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8045: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7944: \$? = $ac_status" >&5
+  echo "$as_me:8048: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
@@ -7951,7 +8055,7 @@ ac_cv_c_const=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7954: result: $ac_cv_c_const" >&5
+echo "$as_me:8058: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -7961,7 +8065,7 @@ EOF
 
 fi
 
-echo "$as_me:7964: checking for inline" >&5
+echo "$as_me:8068: 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
@@ -7969,7 +8073,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line 7972 "configure"
+#line 8076 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -7978,16 +8082,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7981: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8085: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7984: \$? = $ac_status" >&5
+  echo "$as_me:8088: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7990: \$? = $ac_status" >&5
+  echo "$as_me:8094: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -7998,7 +8102,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:8001: result: $ac_cv_c_inline" >&5
+echo "$as_me:8105: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -8013,13 +8117,13 @@ EOF
  ;;
 esac
 
-  echo "$as_me:8016: checking for signed" >&5
+  echo "$as_me:8120: checking for signed" >&5
 echo $ECHO_N "checking for signed... $ECHO_C" >&6
 if test "${bh_cv_c_signed+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8022 "configure"
+#line 8126 "configure"
 #include "confdefs.h"
 
 int
@@ -8031,16 +8135,16 @@ signed char x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8034: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8138: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8037: \$? = $ac_status" >&5
+  echo "$as_me:8141: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8043: \$? = $ac_status" >&5
+  echo "$as_me:8147: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   bh_cv_c_signed=yes
 else
@@ -8050,7 +8154,7 @@ bh_cv_c_signed=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8053: result: $bh_cv_c_signed" >&5
+echo "$as_me:8157: result: $bh_cv_c_signed" >&5
 echo "${ECHO_T}$bh_cv_c_signed" >&6
   if test $bh_cv_c_signed = no; then
 
@@ -8060,13 +8164,13 @@ EOF
 
   fi
 
-  echo "$as_me:8063: checking whether backslash-a works in strings" >&5
+  echo "$as_me:8167: 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
-#line 8069 "configure"
+#line 8173 "configure"
 #include "confdefs.h"
 
 int
@@ -8085,16 +8189,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8088: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8192: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8091: \$? = $ac_status" >&5
+  echo "$as_me:8195: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8094: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8097: \$? = $ac_status" >&5
+  echo "$as_me:8201: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_backslash_a=yes
 else
@@ -8104,7 +8208,7 @@ ac_cv_c_backslash_a=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8107: result: $ac_cv_c_backslash_a" >&5
+echo "$as_me:8211: 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
 
@@ -8114,13 +8218,13 @@ EOF
 
   fi
 
-  echo "$as_me:8117: checking for unsigned long long" >&5
+  echo "$as_me:8221: checking for unsigned long long" >&5
 echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6
 if test "${ac_cv_type_unsigned_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8123 "configure"
+#line 8227 "configure"
 #include "confdefs.h"
 unsigned long long ull = 1; int i = 63;
 int
@@ -8133,16 +8237,16 @@ unsigned long long ullmax = (unsigned long long) -1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8136: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8240: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8139: \$? = $ac_status" >&5
+  echo "$as_me:8243: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8145: \$? = $ac_status" >&5
+  echo "$as_me:8249: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_unsigned_long_long=yes
 else
@@ -8152,7 +8256,7 @@ ac_cv_type_unsigned_long_long=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8155: result: $ac_cv_type_unsigned_long_long" >&5
+echo "$as_me:8259: result: $ac_cv_type_unsigned_long_long" >&5
 echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6
   if test $ac_cv_type_unsigned_long_long = yes; then
 
@@ -8168,28 +8272,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8171: checking for $ac_header" >&5
+echo "$as_me:8275: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8177 "configure"
+#line 8281 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8183: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8287: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8186: \$? = $ac_status" >&5
+  echo "$as_me:8290: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8189: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8293: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8192: \$? = $ac_status" >&5
+  echo "$as_me:8296: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -8199,7 +8303,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8202: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8306: 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
@@ -8209,13 +8313,13 @@ EOF
 fi
 done
 
-echo "$as_me:8212: checking for off_t" >&5
+echo "$as_me:8316: 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
-#line 8218 "configure"
+#line 8322 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8230,16 +8334,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8233: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8337: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8236: \$? = $ac_status" >&5
+  echo "$as_me:8340: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8343: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8242: \$? = $ac_status" >&5
+  echo "$as_me:8346: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -8249,7 +8353,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8252: result: $ac_cv_type_off_t" >&5
+echo "$as_me:8356: 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
   :
@@ -8261,13 +8365,13 @@ EOF
 
 fi
 
-echo "$as_me:8264: checking for size_t" >&5
+echo "$as_me:8368: 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
-#line 8270 "configure"
+#line 8374 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8282,16 +8386,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8285: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8389: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8288: \$? = $ac_status" >&5
+  echo "$as_me:8392: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8291: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8395: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8294: \$? = $ac_status" >&5
+  echo "$as_me:8398: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -8301,7 +8405,7 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8304: result: $ac_cv_type_size_t" >&5
+echo "$as_me:8408: 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
   :
@@ -8313,13 +8417,13 @@ EOF
 
 fi
 
-echo "$as_me:8316: checking for ptrdiff_t" >&5
+echo "$as_me:8420: checking for ptrdiff_t" >&5
 echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6
 if test "${ac_cv_type_ptrdiff_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8322 "configure"
+#line 8426 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8334,16 +8438,16 @@ if (sizeof (ptrdiff_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8337: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8441: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8340: \$? = $ac_status" >&5
+  echo "$as_me:8444: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8346: \$? = $ac_status" >&5
+  echo "$as_me:8450: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_ptrdiff_t=yes
 else
@@ -8353,7 +8457,7 @@ ac_cv_type_ptrdiff_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8356: result: $ac_cv_type_ptrdiff_t" >&5
+echo "$as_me:8460: result: $ac_cv_type_ptrdiff_t" >&5
 echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6
 if test $ac_cv_type_ptrdiff_t = yes; then
 
@@ -8363,13 +8467,13 @@ EOF
 
 fi
 
-  echo "$as_me:8366: checking for inttypes.h" >&5
+  echo "$as_me:8470: checking for inttypes.h" >&5
 echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
 if test "${jm_ac_cv_header_inttypes_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8372 "configure"
+#line 8476 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <inttypes.h>
@@ -8382,16 +8486,16 @@ uintmax_t i = (uintmax_t) -1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8385: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8489: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8388: \$? = $ac_status" >&5
+  echo "$as_me:8492: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8394: \$? = $ac_status" >&5
+  echo "$as_me:8498: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_ac_cv_header_inttypes_h=yes
 else
@@ -8401,7 +8505,7 @@ jm_ac_cv_header_inttypes_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8404: result: $jm_ac_cv_header_inttypes_h" >&5
+echo "$as_me:8508: result: $jm_ac_cv_header_inttypes_h" >&5
 echo "${ECHO_T}$jm_ac_cv_header_inttypes_h" >&6
   if test $jm_ac_cv_header_inttypes_h = yes; then
 
@@ -8411,13 +8515,13 @@ EOF
 
   fi
 
-  echo "$as_me:8414: checking for stdint.h" >&5
+  echo "$as_me:8518: checking for stdint.h" >&5
 echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6
 if test "${jm_ac_cv_header_stdint_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8420 "configure"
+#line 8524 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <stdint.h>
@@ -8430,16 +8534,16 @@ uintmax_t i = (uintmax_t) -1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8433: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8537: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8436: \$? = $ac_status" >&5
+  echo "$as_me:8540: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8543: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8442: \$? = $ac_status" >&5
+  echo "$as_me:8546: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_ac_cv_header_stdint_h=yes
 else
@@ -8449,7 +8553,7 @@ jm_ac_cv_header_stdint_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8452: result: $jm_ac_cv_header_stdint_h" >&5
+echo "$as_me:8556: result: $jm_ac_cv_header_stdint_h" >&5
 echo "${ECHO_T}$jm_ac_cv_header_stdint_h" >&6
   if test $jm_ac_cv_header_stdint_h = yes; then
 
@@ -8471,13 +8575,13 @@ EOF
 
   fi
 
-  echo "$as_me:8474: checking for ssize_t" >&5
+  echo "$as_me:8578: checking for ssize_t" >&5
 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
 if test "${gt_cv_ssize_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8480 "configure"
+#line 8584 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -8493,16 +8597,16 @@ int x = sizeof (ssize_t *) + sizeof (ssize_t);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8496: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8600: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8499: \$? = $ac_status" >&5
+  echo "$as_me:8603: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8502: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8606: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8505: \$? = $ac_status" >&5
+  echo "$as_me:8609: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_ssize_t=yes
 else
@@ -8512,7 +8616,7 @@ gt_cv_ssize_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8515: result: $gt_cv_ssize_t" >&5
+echo "$as_me:8619: result: $gt_cv_ssize_t" >&5
 echo "${ECHO_T}$gt_cv_ssize_t" >&6
   if test $gt_cv_ssize_t = no; then
 
@@ -8522,13 +8626,13 @@ EOF
 
   fi
 
-echo "$as_me:8525: checking for pid_t" >&5
+echo "$as_me:8629: checking for pid_t" >&5
 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8531 "configure"
+#line 8635 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8543,16 +8647,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8546: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8650: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8549: \$? = $ac_status" >&5
+  echo "$as_me:8653: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8656: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8555: \$? = $ac_status" >&5
+  echo "$as_me:8659: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -8562,7 +8666,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8565: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:8669: result: $ac_cv_type_pid_t" >&5
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 if test $ac_cv_type_pid_t = yes; then
   :
@@ -8576,13 +8680,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:8579: checking for working alloca.h" >&5
+echo "$as_me:8683: 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
-#line 8585 "configure"
+#line 8689 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -8594,16 +8698,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8597: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8701: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8600: \$? = $ac_status" >&5
+  echo "$as_me:8704: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8603: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8707: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8606: \$? = $ac_status" >&5
+  echo "$as_me:8710: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -8613,7 +8717,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8616: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:8720: 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
 
@@ -8623,13 +8727,13 @@ EOF
 
 fi
 
-echo "$as_me:8626: checking for alloca" >&5
+echo "$as_me:8730: 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
-#line 8632 "configure"
+#line 8736 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -8661,16 +8765,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8664: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8768: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8667: \$? = $ac_status" >&5
+  echo "$as_me:8771: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8673: \$? = $ac_status" >&5
+  echo "$as_me:8777: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -8680,7 +8784,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8683: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:8787: 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
@@ -8701,13 +8805,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:8704: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:8808: 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
-#line 8710 "configure"
+#line 8814 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -8725,18 +8829,18 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:8728: result: $ac_cv_os_cray" >&5
+echo "$as_me:8832: 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
     as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8733: checking for $ac_func" >&5
+echo "$as_me:8837: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8739 "configure"
+#line 8843 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8767,16 +8871,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8770: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8874: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8773: \$? = $ac_status" >&5
+  echo "$as_me:8877: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8779: \$? = $ac_status" >&5
+  echo "$as_me:8883: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8786,7 +8890,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8789: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8893: 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
 
@@ -8800,7 +8904,7 @@ fi
   done
 fi
 
-echo "$as_me:8803: checking stack direction for C alloca" >&5
+echo "$as_me:8907: 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
@@ -8809,7 +8913,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8812 "configure"
+#line 8916 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -8832,15 +8936,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8835: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8939: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8838: \$? = $ac_status" >&5
+  echo "$as_me:8942: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8840: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8944: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8843: \$? = $ac_status" >&5
+  echo "$as_me:8947: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -8852,7 +8956,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:8855: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:8959: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -8864,13 +8968,13 @@ fi
 for ac_func in vprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8867: checking for $ac_func" >&5
+echo "$as_me:8971: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8873 "configure"
+#line 8977 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8901,16 +9005,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8904: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9008: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8907: \$? = $ac_status" >&5
+  echo "$as_me:9011: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8910: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9014: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8913: \$? = $ac_status" >&5
+  echo "$as_me:9017: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8920,20 +9024,20 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8923: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9027: 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 `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
-echo "$as_me:8930: checking for _doprnt" >&5
+echo "$as_me:9034: checking for _doprnt" >&5
 echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
 if test "${ac_cv_func__doprnt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8936 "configure"
+#line 9040 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt (); below.  */
@@ -8964,16 +9068,16 @@ f = _doprnt;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8967: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9071: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8970: \$? = $ac_status" >&5
+  echo "$as_me:9074: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8976: \$? = $ac_status" >&5
+  echo "$as_me:9080: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func__doprnt=yes
 else
@@ -8983,7 +9087,7 @@ ac_cv_func__doprnt=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8986: result: $ac_cv_func__doprnt" >&5
+echo "$as_me:9090: result: $ac_cv_func__doprnt" >&5
 echo "${ECHO_T}$ac_cv_func__doprnt" >&6
 if test $ac_cv_func__doprnt = yes; then
 
@@ -9000,13 +9104,13 @@ for ac_func in getcwd mblen memcpy posix_spawn putc_unlocked raise select \
 strerror strtoul uname utime utimes
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:9003: checking for $ac_func" >&5
+echo "$as_me:9107: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9009 "configure"
+#line 9113 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9037,16 +9141,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9040: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9144: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9043: \$? = $ac_status" >&5
+  echo "$as_me:9147: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9150: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9049: \$? = $ac_status" >&5
+  echo "$as_me:9153: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9056,7 +9160,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9059: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9163: 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
@@ -9070,13 +9174,13 @@ for ac_func in memset stpcpy strcspn \
 strcasecmp strncasecmp strpbrk strstr vasprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:9073: checking for $ac_func" >&5
+echo "$as_me:9177: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9079 "configure"
+#line 9183 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9107,16 +9211,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9110: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9214: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9113: \$? = $ac_status" >&5
+  echo "$as_me:9217: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9119: \$? = $ac_status" >&5
+  echo "$as_me:9223: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9126,7 +9230,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9129: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9233: 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
@@ -9139,13 +9243,13 @@ fi
 done
 
   am_getline_needs_run_time_check=no
-  echo "$as_me:9142: checking for getline" >&5
+  echo "$as_me:9246: checking for getline" >&5
 echo $ECHO_N "checking for getline... $ECHO_C" >&6
 if test "${ac_cv_func_getline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9148 "configure"
+#line 9252 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getline (); below.  */
@@ -9176,16 +9280,16 @@ f = getline;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9179: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9283: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9182: \$? = $ac_status" >&5
+  echo "$as_me:9286: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9185: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9188: \$? = $ac_status" >&5
+  echo "$as_me:9292: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getline=yes
 else
@@ -9195,7 +9299,7 @@ ac_cv_func_getline=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9198: result: $ac_cv_func_getline" >&5
+echo "$as_me:9302: result: $ac_cv_func_getline" >&5
 echo "${ECHO_T}$ac_cv_func_getline" >&6
 if test $ac_cv_func_getline = yes; then
   		am_getline_needs_run_time_check=yes
@@ -9204,7 +9308,7 @@ else
 fi
 
   if test $am_getline_needs_run_time_check = yes; then
-    echo "$as_me:9207: checking for working getline function" >&5
+    echo "$as_me:9311: checking for working getline function" >&5
 echo $ECHO_N "checking for working getline function... $ECHO_C" >&6
 if test "${am_cv_func_working_getline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9214,7 +9318,7 @@ else
   am_cv_func_working_getline=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9217 "configure"
+#line 9321 "configure"
 #include "confdefs.h"
 
 #    include <stdio.h>
@@ -9234,15 +9338,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9237: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9341: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9240: \$? = $ac_status" >&5
+  echo "$as_me:9344: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9346: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9245: \$? = $ac_status" >&5
+  echo "$as_me:9349: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_func_working_getline=yes
 else
@@ -9254,7 +9358,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:9257: result: $am_cv_func_working_getline" >&5
+echo "$as_me:9361: result: $am_cv_func_working_getline" >&5
 echo "${ECHO_T}$am_cv_func_working_getline" >&6
   fi
 
@@ -9273,13 +9377,13 @@ if test $am_cv_func_working_getline != yes; then
 for ac_func in getdelim
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:9276: checking for $ac_func" >&5
+echo "$as_me:9380: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9282 "configure"
+#line 9386 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9310,16 +9414,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9313: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9417: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9316: \$? = $ac_status" >&5
+  echo "$as_me:9420: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9322: \$? = $ac_status" >&5
+  echo "$as_me:9426: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9329,7 +9433,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9332: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9436: 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
@@ -9341,7 +9445,7 @@ done
 
 fi
 
-            echo "$as_me:9344: checking for working fnmatch function" >&5
+            echo "$as_me:9448: checking for working fnmatch function" >&5
 echo $ECHO_N "checking for working fnmatch function... $ECHO_C" >&6
 if test "${gt_cv_func_fnmatch_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9351,7 +9455,7 @@ else
   gt_cv_func_fnmatch_works=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9354 "configure"
+#line 9458 "configure"
 #include "confdefs.h"
 
 #     include <stdlib.h>
@@ -9364,15 +9468,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9367: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9471: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9370: \$? = $ac_status" >&5
+  echo "$as_me:9474: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9372: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9375: \$? = $ac_status" >&5
+  echo "$as_me:9479: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_func_fnmatch_works=yes
 else
@@ -9385,7 +9489,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:9388: result: $gt_cv_func_fnmatch_works" >&5
+echo "$as_me:9492: result: $gt_cv_func_fnmatch_works" >&5
 echo "${ECHO_T}$gt_cv_func_fnmatch_works" >&6
   if test $gt_cv_func_fnmatch_works = yes; then
 
@@ -9412,23 +9516,23 @@ EOF
 for ac_header in limits.h stdlib.h string.h wchar.h wctype.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9415: checking for $ac_header" >&5
+echo "$as_me:9519: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9421 "configure"
+#line 9525 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9425: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9529: \"$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
-  echo "$as_me:9431: \$? = $ac_status" >&5
+  echo "$as_me:9535: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9447,7 +9551,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9450: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9554: 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
@@ -9460,13 +9564,13 @@ done
 for ac_func in isascii iswcntrl iswprint mbsinit wcwidth
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:9463: checking for $ac_func" >&5
+echo "$as_me:9567: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9469 "configure"
+#line 9573 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9497,16 +9601,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9500: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9604: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9503: \$? = $ac_status" >&5
+  echo "$as_me:9607: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9509: \$? = $ac_status" >&5
+  echo "$as_me:9613: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9516,7 +9620,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9519: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9623: 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
@@ -9526,13 +9630,13 @@ EOF
 fi
 done
 
-  echo "$as_me:9529: checking whether mbrtowc and mbstate_t are properly declared" >&5
+  echo "$as_me:9633: checking whether mbrtowc and mbstate_t are properly declared" >&5
 echo $ECHO_N "checking whether mbrtowc and mbstate_t are properly declared... $ECHO_C" >&6
 if test "${jm_cv_func_mbrtowc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9535 "configure"
+#line 9639 "configure"
 #include "confdefs.h"
 #include <wchar.h>
 int
@@ -9544,16 +9648,16 @@ mbstate_t state; return ! (sizeof state && mbrtowc);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9547: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9651: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9550: \$? = $ac_status" >&5
+  echo "$as_me:9654: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9657: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9556: \$? = $ac_status" >&5
+  echo "$as_me:9660: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_func_mbrtowc=yes
 else
@@ -9563,7 +9667,7 @@ jm_cv_func_mbrtowc=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9566: result: $jm_cv_func_mbrtowc" >&5
+echo "$as_me:9670: result: $jm_cv_func_mbrtowc" >&5
 echo "${ECHO_T}$jm_cv_func_mbrtowc" >&6
   if test $jm_cv_func_mbrtowc = yes; then
 
@@ -9573,13 +9677,13 @@ EOF
 
   fi
 
-  echo "$as_me:9576: checking whether wcwidth is declared" >&5
+  echo "$as_me:9680: checking whether wcwidth is declared" >&5
 echo $ECHO_N "checking whether wcwidth is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_wcwidth+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9582 "configure"
+#line 9686 "configure"
 #include "confdefs.h"
 
 /* AIX 3.2.5 declares wcwidth in <string.h>. */
@@ -9603,16 +9707,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9606: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9710: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9609: \$? = $ac_status" >&5
+  echo "$as_me:9713: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9716: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9615: \$? = $ac_status" >&5
+  echo "$as_me:9719: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_wcwidth=yes
 else
@@ -9622,7 +9726,7 @@ ac_cv_have_decl_wcwidth=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9625: result: $ac_cv_have_decl_wcwidth" >&5
+echo "$as_me:9729: result: $ac_cv_have_decl_wcwidth" >&5
 echo "${ECHO_T}$ac_cv_have_decl_wcwidth" >&6
   if test $ac_cv_have_decl_wcwidth = yes; then
     ac_val=1
@@ -9637,23 +9741,23 @@ EOF
 for ac_header in stdlib.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9640: checking for $ac_header" >&5
+echo "$as_me:9744: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9646 "configure"
+#line 9750 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9650: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9754: \"$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
-  echo "$as_me:9656: \$? = $ac_status" >&5
+  echo "$as_me:9760: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9672,7 +9776,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9675: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9779: 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
@@ -9682,13 +9786,13 @@ EOF
 fi
 done
 
-   echo "$as_me:9685: checking for mbstate_t" >&5
+   echo "$as_me:9789: 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
-#line 9691 "configure"
+#line 9795 "configure"
 #include "confdefs.h"
 
 #if HAVE_STDLIB_H
@@ -9704,16 +9808,16 @@ mbstate_t x; return sizeof x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9707: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9811: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9710: \$? = $ac_status" >&5
+  echo "$as_me:9814: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9817: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9716: \$? = $ac_status" >&5
+  echo "$as_me:9820: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mbstate_t=yes
 else
@@ -9723,7 +9827,7 @@ ac_cv_type_mbstate_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9726: result: $ac_cv_type_mbstate_t" >&5
+echo "$as_me:9830: 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
 
@@ -9736,13 +9840,13 @@ EOF
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:9739: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:9843: checking for $ac_hdr that defines DIR" >&5
 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9745 "configure"
+#line 9849 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -9757,16 +9861,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9760: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9864: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9763: \$? = $ac_status" >&5
+  echo "$as_me:9867: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9769: \$? = $ac_status" >&5
+  echo "$as_me:9873: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -9776,7 +9880,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9779: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9883: 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
@@ -9789,7 +9893,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:9792: checking for opendir in -ldir" >&5
+  echo "$as_me:9896: checking for opendir in -ldir" >&5
 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
 if test "${ac_cv_lib_dir_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9797,7 +9901,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9800 "configure"
+#line 9904 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9816,16 +9920,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9819: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9923: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9822: \$? = $ac_status" >&5
+  echo "$as_me:9926: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9825: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9828: \$? = $ac_status" >&5
+  echo "$as_me:9932: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -9836,14 +9940,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9839: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:9943: result: $ac_cv_lib_dir_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
 if test $ac_cv_lib_dir_opendir = yes; then
   LIBS="$LIBS -ldir"
 fi
 
 else
-  echo "$as_me:9846: checking for opendir in -lx" >&5
+  echo "$as_me:9950: checking for opendir in -lx" >&5
 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
 if test "${ac_cv_lib_x_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9851,7 +9955,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9854 "configure"
+#line 9958 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9870,16 +9974,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9873: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9977: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9876: \$? = $ac_status" >&5
+  echo "$as_me:9980: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9879: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9983: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9882: \$? = $ac_status" >&5
+  echo "$as_me:9986: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -9890,7 +9994,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9893: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:9997: result: $ac_cv_lib_x_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 if test $ac_cv_lib_x_opendir = yes; then
   LIBS="$LIBS -lx"
@@ -9898,7 +10002,7 @@ fi
 
 fi
 
-  echo "$as_me:9901: checking whether closedir returns void" >&5
+  echo "$as_me:10005: checking whether closedir returns void" >&5
 echo $ECHO_N "checking whether closedir returns void... $ECHO_C" >&6
 if test "${ac_cv_func_closedir_void+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9907,7 +10011,7 @@ else
   ac_cv_func_closedir_void=yes
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9910 "configure"
+#line 10014 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header_dirent>
@@ -9924,15 +10028,15 @@ exit (closedir (opendir (".")) != 0);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9927: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10031: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9930: \$? = $ac_status" >&5
+  echo "$as_me:10034: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9935: \$? = $ac_status" >&5
+  echo "$as_me:10039: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_closedir_void=no
 else
@@ -9944,7 +10048,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:9947: result: $ac_cv_func_closedir_void" >&5
+echo "$as_me:10051: result: $ac_cv_func_closedir_void" >&5
 echo "${ECHO_T}$ac_cv_func_closedir_void" >&6
 if test $ac_cv_func_closedir_void = yes; then
 
@@ -9957,23 +10061,23 @@ fi
 for ac_header in limits.h string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9960: checking for $ac_header" >&5
+echo "$as_me:10064: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9966 "configure"
+#line 10070 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9970: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10074: \"$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
-  echo "$as_me:9976: \$? = $ac_status" >&5
+  echo "$as_me:10080: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9992,7 +10096,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9995: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:10099: 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
@@ -10002,7 +10106,7 @@ EOF
 fi
 done
 
-    echo "$as_me:10005: checking for long file names" >&5
+    echo "$as_me:10109: checking for long file names" >&5
 echo $ECHO_N "checking for long file names... $ECHO_C" >&6
 if test "${ac_cv_sys_long_file_names+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10041,7 +10145,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
   rm -rf $ac_xdir 2>/dev/null
 done
 fi
-echo "$as_me:10044: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:10148: result: $ac_cv_sys_long_file_names" >&5
 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
 if test $ac_cv_sys_long_file_names = yes; then
 
@@ -10054,13 +10158,13 @@ fi
 for ac_func in pathconf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10057: checking for $ac_func" >&5
+echo "$as_me:10161: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10063 "configure"
+#line 10167 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10091,16 +10195,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10094: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10198: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10097: \$? = $ac_status" >&5
+  echo "$as_me:10201: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10100: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10103: \$? = $ac_status" >&5
+  echo "$as_me:10207: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10110,7 +10214,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10113: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10217: 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
@@ -10123,23 +10227,23 @@ done
 for ac_header in limits.h string.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10126: checking for $ac_header" >&5
+echo "$as_me:10230: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10132 "configure"
+#line 10236 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10136: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10240: \"$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
-  echo "$as_me:10142: \$? = $ac_status" >&5
+  echo "$as_me:10246: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10158,7 +10262,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10161: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:10265: 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
@@ -10171,23 +10275,23 @@ done
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10174: checking for $ac_header" >&5
+echo "$as_me:10278: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10180 "configure"
+#line 10284 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10184: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10288: \"$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
-  echo "$as_me:10190: \$? = $ac_status" >&5
+  echo "$as_me:10294: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10206,7 +10310,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10209: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:10313: 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
@@ -10219,13 +10323,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10222: checking for $ac_func" >&5
+echo "$as_me:10326: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10228 "configure"
+#line 10332 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10256,16 +10360,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10259: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10363: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10262: \$? = $ac_status" >&5
+  echo "$as_me:10366: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10265: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10369: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10268: \$? = $ac_status" >&5
+  echo "$as_me:10372: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10275,7 +10379,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10278: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10382: 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
@@ -10287,7 +10391,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:10290: checking for working fork" >&5
+  echo "$as_me:10394: checking for working fork" >&5
 echo $ECHO_N "checking for working fork... $ECHO_C" >&6
 if test "${ac_cv_func_fork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10310,15 +10414,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10313: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10417: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10316: \$? = $ac_status" >&5
+  echo "$as_me:10420: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10321: \$? = $ac_status" >&5
+  echo "$as_me:10425: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -10330,7 +10434,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:10333: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:10437: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -10344,12 +10448,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:10347: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:10451: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
 fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 if test "x$ac_cv_func_vfork" = xyes; then
-  echo "$as_me:10352: checking for working vfork" >&5
+  echo "$as_me:10456: checking for working vfork" >&5
 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
 if test "${ac_cv_func_vfork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10358,7 +10462,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10361 "configure"
+#line 10465 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -10455,15 +10559,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10458: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10562: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10461: \$? = $ac_status" >&5
+  echo "$as_me:10565: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10463: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10567: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10466: \$? = $ac_status" >&5
+  echo "$as_me:10570: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -10475,13 +10579,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:10478: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:10582: result: $ac_cv_func_vfork_works" >&5
 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
 
 fi;
 if test "x$ac_cv_func_fork_works" = xcross; then
   ac_cv_func_vfork_works=ac_cv_func_vfork
-  { echo "$as_me:10484: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:10588: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
 fi
 
@@ -10509,13 +10613,13 @@ fi
 for ac_func in waitpid
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10512: checking for $ac_func" >&5
+echo "$as_me:10616: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10518 "configure"
+#line 10622 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10546,16 +10650,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10549: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10653: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10552: \$? = $ac_status" >&5
+  echo "$as_me:10656: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10555: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10558: \$? = $ac_status" >&5
+  echo "$as_me:10662: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10565,7 +10669,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10568: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10672: 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
@@ -10575,13 +10679,13 @@ EOF
 fi
 done
 
-echo "$as_me:10578: checking for union wait" >&5
+echo "$as_me:10682: checking for union wait" >&5
 echo $ECHO_N "checking for union wait... $ECHO_C" >&6
 if test "${gt_cv_union_wait+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10584 "configure"
+#line 10688 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -10609,16 +10713,16 @@ pid = waitpid (-1, &status, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10612: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10716: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10615: \$? = $ac_status" >&5
+  echo "$as_me:10719: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10618: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10621: \$? = $ac_status" >&5
+  echo "$as_me:10725: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_union_wait=yes
 else
@@ -10636,16 +10740,16 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi
-echo "$as_me:10639: result: $gt_cv_union_wait" >&5
+echo "$as_me:10743: result: $gt_cv_union_wait" >&5
 echo "${ECHO_T}$gt_cv_union_wait" >&6
 
-  echo "$as_me:10642: checking whether stat file-mode macros are broken" >&5
+  echo "$as_me:10746: checking whether stat file-mode macros are broken" >&5
 echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6
 if test "${ac_cv_header_stat_broken+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10648 "configure"
+#line 10752 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -10684,7 +10788,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:10687: result: $ac_cv_header_stat_broken" >&5
+echo "$as_me:10791: result: $ac_cv_header_stat_broken" >&5
 echo "${ECHO_T}$ac_cv_header_stat_broken" >&6
 if test $ac_cv_header_stat_broken = yes; then
 
@@ -10697,13 +10801,13 @@ fi
 for ac_func in __secure_getenv
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10700: checking for $ac_func" >&5
+echo "$as_me:10804: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10706 "configure"
+#line 10810 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10734,16 +10838,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10737: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10841: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10740: \$? = $ac_status" >&5
+  echo "$as_me:10844: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10746: \$? = $ac_status" >&5
+  echo "$as_me:10850: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10753,7 +10857,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10756: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10860: 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
@@ -10766,13 +10870,13 @@ done
 for ac_func in mkdtemp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10769: checking for $ac_func" >&5
+echo "$as_me:10873: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10775 "configure"
+#line 10879 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10803,16 +10907,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10806: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10910: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10809: \$? = $ac_status" >&5
+  echo "$as_me:10913: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10916: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10815: \$? = $ac_status" >&5
+  echo "$as_me:10919: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10822,7 +10926,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10825: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10929: 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
@@ -10834,13 +10938,13 @@ else
 fi
 done
 
-  echo "$as_me:10837: checking whether stat file-mode macros are broken" >&5
+  echo "$as_me:10941: checking whether stat file-mode macros are broken" >&5
 echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6
 if test "${ac_cv_header_stat_broken+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10843 "configure"
+#line 10947 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -10879,7 +10983,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:10882: result: $ac_cv_header_stat_broken" >&5
+echo "$as_me:10986: result: $ac_cv_header_stat_broken" >&5
 echo "${ECHO_T}$ac_cv_header_stat_broken" >&6
 if test $ac_cv_header_stat_broken = yes; then
 
@@ -10889,13 +10993,13 @@ EOF
 
 fi
 
-  echo "$as_me:10892: checking for inttypes.h" >&5
+  echo "$as_me:10996: checking for inttypes.h" >&5
 echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
 if test "${jm_ac_cv_header_inttypes_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10898 "configure"
+#line 11002 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <inttypes.h>
@@ -10908,16 +11012,16 @@ uintmax_t i = (uintmax_t) -1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10911: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11015: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10914: \$? = $ac_status" >&5
+  echo "$as_me:11018: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10917: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11021: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10920: \$? = $ac_status" >&5
+  echo "$as_me:11024: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_ac_cv_header_inttypes_h=yes
 else
@@ -10927,7 +11031,7 @@ jm_ac_cv_header_inttypes_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10930: result: $jm_ac_cv_header_inttypes_h" >&5
+echo "$as_me:11034: result: $jm_ac_cv_header_inttypes_h" >&5
 echo "${ECHO_T}$jm_ac_cv_header_inttypes_h" >&6
   if test $jm_ac_cv_header_inttypes_h = yes; then
 
@@ -10937,13 +11041,13 @@ EOF
 
   fi
 
-  echo "$as_me:10940: checking for stdint.h" >&5
+  echo "$as_me:11044: checking for stdint.h" >&5
 echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6
 if test "${jm_ac_cv_header_stdint_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10946 "configure"
+#line 11050 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <stdint.h>
@@ -10956,16 +11060,16 @@ uintmax_t i = (uintmax_t) -1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10959: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11063: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10962: \$? = $ac_status" >&5
+  echo "$as_me:11066: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10965: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11069: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10968: \$? = $ac_status" >&5
+  echo "$as_me:11072: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_ac_cv_header_stdint_h=yes
 else
@@ -10975,7 +11079,7 @@ jm_ac_cv_header_stdint_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10978: result: $jm_ac_cv_header_stdint_h" >&5
+echo "$as_me:11082: result: $jm_ac_cv_header_stdint_h" >&5
 echo "${ECHO_T}$jm_ac_cv_header_stdint_h" >&6
   if test $jm_ac_cv_header_stdint_h = yes; then
 
@@ -10988,23 +11092,23 @@ EOF
 for ac_header in fcntl.h sys/time.h time.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10991: checking for $ac_header" >&5
+echo "$as_me:11095: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10997 "configure"
+#line 11101 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11001: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11105: \"$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
-  echo "$as_me:11007: \$? = $ac_status" >&5
+  echo "$as_me:11111: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11023,7 +11127,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11026: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11130: 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
@@ -11036,13 +11140,13 @@ done
 for ac_func in gettimeofday
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11039: checking for $ac_func" >&5
+echo "$as_me:11143: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11045 "configure"
+#line 11149 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11073,16 +11177,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11076: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11079: \$? = $ac_status" >&5
+  echo "$as_me:11183: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11082: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11085: \$? = $ac_status" >&5
+  echo "$as_me:11189: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -11092,7 +11196,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11095: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11199: 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
@@ -11104,7 +11208,7 @@ done
 
   signals_not_posix=
   cat >conftest.$ac_ext <<_ACEOF
-#line 11107 "configure"
+#line 11211 "configure"
 #include "confdefs.h"
 #include <signal.h>
 
@@ -11118,13 +11222,13 @@ fi
 rm -f conftest*
 
   if test -z "$signals_not_posix"; then
-    echo "$as_me:11121: checking for sigprocmask" >&5
+    echo "$as_me:11225: checking for sigprocmask" >&5
 echo $ECHO_N "checking for sigprocmask... $ECHO_C" >&6
 if test "${ac_cv_func_sigprocmask+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11127 "configure"
+#line 11231 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sigprocmask (); below.  */
@@ -11155,16 +11259,16 @@ f = sigprocmask;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11158: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11262: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11161: \$? = $ac_status" >&5
+  echo "$as_me:11265: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11167: \$? = $ac_status" >&5
+  echo "$as_me:11271: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_sigprocmask=yes
 else
@@ -11174,7 +11278,7 @@ ac_cv_func_sigprocmask=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11177: result: $ac_cv_func_sigprocmask" >&5
+echo "$as_me:11281: result: $ac_cv_func_sigprocmask" >&5
 echo "${ECHO_T}$ac_cv_func_sigprocmask" >&6
 if test $ac_cv_func_sigprocmask = yes; then
 
@@ -11186,13 +11290,13 @@ fi
 
   fi
 
-  echo "$as_me:11189: checking for signal handlers with siginfo_t" >&5
+  echo "$as_me:11293: checking for signal handlers with siginfo_t" >&5
 echo $ECHO_N "checking for signal handlers with siginfo_t... $ECHO_C" >&6
 if test "${gt_cv_siginfo_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11195 "configure"
+#line 11299 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -11210,16 +11314,16 @@ action.sa_sigaction = (void *) 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11213: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11317: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11216: \$? = $ac_status" >&5
+  echo "$as_me:11320: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11219: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11323: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11222: \$? = $ac_status" >&5
+  echo "$as_me:11326: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_siginfo_t=yes
 else
@@ -11229,7 +11333,7 @@ gt_cv_siginfo_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11232: result: $gt_cv_siginfo_t" >&5
+echo "$as_me:11336: result: $gt_cv_siginfo_t" >&5
 echo "${ECHO_T}$gt_cv_siginfo_t" >&6
   if test $gt_cv_siginfo_t = yes; then
 
@@ -11242,13 +11346,13 @@ EOF
 for ac_func in setenv unsetenv
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11245: checking for $ac_func" >&5
+echo "$as_me:11349: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11251 "configure"
+#line 11355 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11279,16 +11383,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11282: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11386: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11285: \$? = $ac_status" >&5
+  echo "$as_me:11389: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11288: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11291: \$? = $ac_status" >&5
+  echo "$as_me:11395: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -11298,7 +11402,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11301: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11405: 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
@@ -11313,23 +11417,23 @@ done
 for ac_header in search.h stdlib.h string.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11316: checking for $ac_header" >&5
+echo "$as_me:11420: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11322 "configure"
+#line 11426 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11326: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11430: \"$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
-  echo "$as_me:11332: \$? = $ac_status" >&5
+  echo "$as_me:11436: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11348,7 +11452,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11351: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11455: 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
@@ -11361,13 +11465,13 @@ done
 for ac_func in tsearch
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11364: checking for $ac_func" >&5
+echo "$as_me:11468: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11370 "configure"
+#line 11474 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11398,16 +11502,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11401: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11505: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11404: \$? = $ac_status" >&5
+  echo "$as_me:11508: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11407: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11511: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11410: \$? = $ac_status" >&5
+  echo "$as_me:11514: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -11417,7 +11521,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11420: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11524: 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
@@ -11427,14 +11531,14 @@ EOF
 fi
 done
 
-  echo "$as_me:11430: checking if errno is properly declared" >&5
+  echo "$as_me:11534: checking if errno is properly declared" >&5
 echo $ECHO_N "checking if errno is properly declared... $ECHO_C" >&6
   if test "${gt_cv_var_errno_declaration+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 11437 "configure"
+#line 11541 "configure"
 #include "confdefs.h"
 #include <errno.h>
       extern struct { int foo; } errno;
@@ -11447,16 +11551,16 @@ errno.foo = 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11450: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11554: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11453: \$? = $ac_status" >&5
+  echo "$as_me:11557: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11456: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11560: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11459: \$? = $ac_status" >&5
+  echo "$as_me:11563: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_var_errno_declaration=no
 else
@@ -11467,7 +11571,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-  echo "$as_me:11470: result: $gt_cv_var_errno_declaration" >&5
+  echo "$as_me:11574: result: $gt_cv_var_errno_declaration" >&5
 echo "${ECHO_T}$gt_cv_var_errno_declaration" >&6
   if test $gt_cv_var_errno_declaration = yes; then
 
@@ -11477,14 +11581,14 @@ EOF
 
   fi
 
-  echo "$as_me:11480: checking if environ is properly declared" >&5
+  echo "$as_me:11584: checking if environ is properly declared" >&5
 echo $ECHO_N "checking if environ is properly declared... $ECHO_C" >&6
   if test "${gt_cv_var_environ_declaration+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 11487 "configure"
+#line 11591 "configure"
 #include "confdefs.h"
 #include <unistd.h>
       extern struct { int foo; } environ;
@@ -11497,16 +11601,16 @@ environ.foo = 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11500: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11604: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11503: \$? = $ac_status" >&5
+  echo "$as_me:11607: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11509: \$? = $ac_status" >&5
+  echo "$as_me:11613: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_var_environ_declaration=no
 else
@@ -11517,7 +11621,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-  echo "$as_me:11520: result: $gt_cv_var_environ_declaration" >&5
+  echo "$as_me:11624: result: $gt_cv_var_environ_declaration" >&5
 echo "${ECHO_T}$gt_cv_var_environ_declaration" >&6
   if test $gt_cv_var_environ_declaration = yes; then
 
@@ -11527,13 +11631,13 @@ EOF
 
   fi
 
-  echo "$as_me:11530: checking for error_at_line" >&5
+  echo "$as_me:11634: checking for error_at_line" >&5
 echo $ECHO_N "checking for error_at_line... $ECHO_C" >&6
 if test "${am_cv_lib_error_at_line+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11536 "configure"
+#line 11640 "configure"
 #include "confdefs.h"
 
 int
@@ -11545,16 +11649,16 @@ error_at_line(0, 0, "", 0, "");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11548: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11652: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11551: \$? = $ac_status" >&5
+  echo "$as_me:11655: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11658: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11557: \$? = $ac_status" >&5
+  echo "$as_me:11661: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_lib_error_at_line=yes
 else
@@ -11564,7 +11668,7 @@ am_cv_lib_error_at_line=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11567: result: $am_cv_lib_error_at_line" >&5
+echo "$as_me:11671: result: $am_cv_lib_error_at_line" >&5
 echo "${ECHO_T}$am_cv_lib_error_at_line" >&6
   if test $am_cv_lib_error_at_line = yes; then
 
@@ -11577,23 +11681,23 @@ EOF
 for ac_header in locale.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11580: checking for $ac_header" >&5
+echo "$as_me:11684: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11586 "configure"
+#line 11690 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11590: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11694: \"$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
-  echo "$as_me:11596: \$? = $ac_status" >&5
+  echo "$as_me:11700: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11612,7 +11716,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11615: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11719: 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
@@ -11622,14 +11726,14 @@ EOF
 fi
 done
 
-echo "$as_me:11625: checking for setlocale declaration" >&5
+echo "$as_me:11729: checking for setlocale declaration" >&5
 echo $ECHO_N "checking for setlocale declaration... $ECHO_C" >&6
 if test "${gt_cv_proto_setlocale+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 11632 "configure"
+#line 11736 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -11653,16 +11757,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11656: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11760: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11659: \$? = $ac_status" >&5
+  echo "$as_me:11763: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11766: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11665: \$? = $ac_status" >&5
+  echo "$as_me:11769: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_proto_setlocale_arg1=""
 else
@@ -11675,7 +11779,7 @@ gt_cv_proto_setlocale="extern char *setlocale (int category, $gt_cv_proto_setloc
 fi
 
 gt_cv_proto_setlocale=`echo "$gt_cv_proto_setlocale" | tr -s ' ' | sed -e 's/( /(/'`
-echo "$as_me:11678: result: ${ac_t:-
+echo "$as_me:11782: result: ${ac_t:-
          }$gt_cv_proto_setlocale" >&5
 echo "${ECHO_T}${ac_t:-
          }$gt_cv_proto_setlocale" >&6
@@ -11687,23 +11791,23 @@ EOF
 for ac_header in arpa/inet.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11690: checking for $ac_header" >&5
+echo "$as_me:11794: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11696 "configure"
+#line 11800 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11700: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11804: \"$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
-  echo "$as_me:11706: \$? = $ac_status" >&5
+  echo "$as_me:11810: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11722,7 +11826,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11725: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11829: 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
@@ -11735,13 +11839,13 @@ done
 for ac_func in gethostname gethostbyname inet_ntop
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11738: checking for $ac_func" >&5
+echo "$as_me:11842: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11744 "configure"
+#line 11848 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11772,16 +11876,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11775: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11879: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11778: \$? = $ac_status" >&5
+  echo "$as_me:11882: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11885: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11784: \$? = $ac_status" >&5
+  echo "$as_me:11888: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -11791,7 +11895,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11794: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11898: 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
@@ -11801,14 +11905,14 @@ EOF
 fi
 done
 
-  echo "$as_me:11804: checking for IPv6 sockets" >&5
+  echo "$as_me:11908: checking for IPv6 sockets" >&5
 echo $ECHO_N "checking for IPv6 sockets... $ECHO_C" >&6
   if test "${gt_cv_socket_ipv6+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 11811 "configure"
+#line 11915 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -11823,16 +11927,16 @@ int x = AF_INET6; struct in6_addr y; struct sockaddr_in6 z;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11826: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11930: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11829: \$? = $ac_status" >&5
+  echo "$as_me:11933: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11832: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11835: \$? = $ac_status" >&5
+  echo "$as_me:11939: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_socket_ipv6=yes
 else
@@ -11844,7 +11948,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:11847: result: $gt_cv_socket_ipv6" >&5
+  echo "$as_me:11951: result: $gt_cv_socket_ipv6" >&5
 echo "${ECHO_T}$gt_cv_socket_ipv6" >&6
   if test $gt_cv_socket_ipv6 = yes; then
 
@@ -11864,7 +11968,7 @@ EOF
 
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-echo "$as_me:11867: checking for $ac_word" >&5
+echo "$as_me:11971: 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
@@ -11892,16 +11996,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:11895: result: $MSGFMT" >&5
+  echo "$as_me:11999: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:11898: result: no" >&5
+  echo "$as_me:12002: 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 "$as_me:11904: checking for $ac_word" >&5
+echo "$as_me:12008: 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
@@ -11918,7 +12022,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"
-   echo "$as_me:11921: found $ac_dir/$ac_word" >&5
+   echo "$as_me:12025: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -11930,16 +12034,16 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:11933: result: $GMSGFMT" >&5
+  echo "$as_me:12037: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:11936: result: no" >&5
+  echo "$as_me:12040: 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 "$as_me:11942: checking for $ac_word" >&5
+echo "$as_me:12046: 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
@@ -11967,10 +12071,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:11970: result: $XGETTEXT" >&5
+  echo "$as_me:12074: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:11973: result: no" >&5
+  echo "$as_me:12077: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11978,7 +12082,7 @@ fi
 
     # Extract the first word of "msgmerge", so it can be a program name with args.
 set dummy msgmerge; ac_word=$2
-echo "$as_me:11981: checking for $ac_word" >&5
+echo "$as_me:12085: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGMERGE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12005,10 +12109,10 @@ esac
 fi
 MSGMERGE="$ac_cv_path_MSGMERGE"
 if test "$MSGMERGE" != ":"; then
-  echo "$as_me:12008: result: $MSGMERGE" >&5
+  echo "$as_me:12112: result: $MSGMERGE" >&5
 echo "${ECHO_T}$MSGMERGE" >&6
 else
-  echo "$as_me:12011: result: no" >&5
+  echo "$as_me:12115: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -12018,7 +12122,7 @@ fi
       : ;
     else
       GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      echo "$as_me:12021: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
+      echo "$as_me:12125: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
 echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6
       GMSGFMT=":"
     fi
@@ -12029,7 +12133,7 @@ echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6
        (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
       : ;
     else
-      echo "$as_me:12032: result: found xgettext program is not GNU xgettext; ignore it" >&5
+      echo "$as_me:12136: 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
@@ -12041,7 +12145,7 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
 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:12044: checking for $ac_word" >&5
+echo "$as_me:12148: 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
@@ -12056,7 +12160,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"
-echo "$as_me:12059: found $ac_dir/$ac_word" >&5
+echo "$as_me:12163: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -12064,10 +12168,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:12067: result: $RANLIB" >&5
+  echo "$as_me:12171: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:12070: result: no" >&5
+  echo "$as_me:12174: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -12076,7 +12180,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
-echo "$as_me:12079: checking for $ac_word" >&5
+echo "$as_me:12183: 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
@@ -12091,7 +12195,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"
-echo "$as_me:12094: found $ac_dir/$ac_word" >&5
+echo "$as_me:12198: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -12100,10 +12204,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:12103: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:12207: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:12106: result: no" >&5
+  echo "$as_me:12210: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -12115,23 +12219,23 @@ fi
 for ac_header in stdlib.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12118: checking for $ac_header" >&5
+echo "$as_me:12222: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12124 "configure"
+#line 12228 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12128: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12232: \"$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
-  echo "$as_me:12134: \$? = $ac_status" >&5
+  echo "$as_me:12238: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12150,7 +12254,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:12153: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12257: 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
@@ -12163,13 +12267,13 @@ done
 for ac_func in getpagesize
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12166: checking for $ac_func" >&5
+echo "$as_me:12270: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12172 "configure"
+#line 12276 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12200,16 +12304,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12203: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12307: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12206: \$? = $ac_status" >&5
+  echo "$as_me:12310: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12209: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12212: \$? = $ac_status" >&5
+  echo "$as_me:12316: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12219,7 +12323,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12222: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12326: 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
@@ -12229,7 +12333,7 @@ EOF
 fi
 done
 
-echo "$as_me:12232: checking for working mmap" >&5
+echo "$as_me:12336: 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
@@ -12238,7 +12342,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12241 "configure"
+#line 12345 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -12365,15 +12469,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12368: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12472: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12371: \$? = $ac_status" >&5
+  echo "$as_me:12475: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12373: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12477: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12376: \$? = $ac_status" >&5
+  echo "$as_me:12480: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -12385,7 +12489,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:12388: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:12492: 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
 
@@ -12396,13 +12500,13 @@ EOF
 fi
 rm -f conftest.mmap
 
-    echo "$as_me:12399: checking whether we are using the GNU C Library 2.1 or newer" >&5
+    echo "$as_me:12503: 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
-#line 12405 "configure"
+#line 12509 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -12422,12 +12526,12 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:12425: result: $ac_cv_gnu_library_2_1" >&5
+echo "$as_me:12529: 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 "$as_me:12430: checking whether integer division by zero raises SIGFPE" >&5
+  echo "$as_me:12534: checking whether integer division by zero raises SIGFPE" >&5
 echo $ECHO_N "checking whether integer division by zero raises SIGFPE... $ECHO_C" >&6
 if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12445,7 +12549,7 @@ else
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12448 "configure"
+#line 12552 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -12486,15 +12590,15 @@ int main ()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12593: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12492: \$? = $ac_status" >&5
+  echo "$as_me:12596: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12598: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12497: \$? = $ac_status" >&5
+  echo "$as_me:12601: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_int_divbyzero_sigfpe=yes
 else
@@ -12507,7 +12611,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:12510: result: $gt_cv_int_divbyzero_sigfpe" >&5
+echo "$as_me:12614: result: $gt_cv_int_divbyzero_sigfpe" >&5
 echo "${ECHO_T}$gt_cv_int_divbyzero_sigfpe" >&6
   case "$gt_cv_int_divbyzero_sigfpe" in
     *yes) value=1;;
@@ -12543,7 +12647,7 @@ fi;
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:12546: checking for ld used by GCC" >&5
+  echo "$as_me:12650: checking for ld used by GCC" >&5
 echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
   case $host in
   *-*-mingw*)
@@ -12573,10 +12677,10 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:12576: checking for GNU ld" >&5
+  echo "$as_me:12680: checking for GNU ld" >&5
 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
 else
-  echo "$as_me:12579: checking for non-GNU ld" >&5
+  echo "$as_me:12683: checking for non-GNU ld" >&5
 echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
 fi
 if test "${acl_cv_path_LD+set}" = set; then
@@ -12606,16 +12710,16 @@ fi
 
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  echo "$as_me:12609: result: $LD" >&5
+  echo "$as_me:12713: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:12612: result: no" >&5
+  echo "$as_me:12716: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
-test -z "$LD" && { { echo "$as_me:12615: error: no acceptable ld found in \$PATH" >&5
+test -z "$LD" && { { echo "$as_me:12719: error: no acceptable ld found in \$PATH" >&5
 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-echo "$as_me:12618: checking if the linker ($LD) is GNU ld" >&5
+echo "$as_me:12722: checking if the linker ($LD) is GNU ld" >&5
 echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
 if test "${acl_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12627,11 +12731,11 @@ else
   acl_cv_prog_gnu_ld=no
 fi
 fi
-echo "$as_me:12630: result: $acl_cv_prog_gnu_ld" >&5
+echo "$as_me:12734: result: $acl_cv_prog_gnu_ld" >&5
 echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
-                                                echo "$as_me:12634: checking for shared library run path origin" >&5
+                                                echo "$as_me:12738: checking for shared library run path origin" >&5
 echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
 if test "${acl_cv_rpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12644,7 +12748,7 @@ else
     acl_cv_rpath=done
 
 fi
-echo "$as_me:12647: result: $acl_cv_rpath" >&5
+echo "$as_me:12751: result: $acl_cv_rpath" >&5
 echo "${ECHO_T}$acl_cv_rpath" >&6
   wl="$acl_cv_wl"
   libext="$acl_cv_libext"
@@ -13042,23 +13146,23 @@ 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
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13045: checking for $ac_header" >&5
+echo "$as_me:13149: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13051 "configure"
+#line 13155 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13055: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13159: \"$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
-  echo "$as_me:13061: \$? = $ac_status" >&5
+  echo "$as_me:13165: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13077,7 +13181,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:13080: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13184: 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
@@ -13092,13 +13196,13 @@ geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
 strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:13095: checking for $ac_func" >&5
+echo "$as_me:13199: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13101 "configure"
+#line 13205 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -13129,16 +13233,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13132: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13236: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13135: \$? = $ac_status" >&5
+  echo "$as_me:13239: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13138: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13141: \$? = $ac_status" >&5
+  echo "$as_me:13245: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -13148,7 +13252,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13151: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:13255: 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
@@ -13182,7 +13286,7 @@ done
     fi
   done
 
-  echo "$as_me:13185: checking for iconv" >&5
+  echo "$as_me:13289: 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
@@ -13191,7 +13295,7 @@ else
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 13194 "configure"
+#line 13298 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -13206,16 +13310,16 @@ iconv_t cd = iconv_open("","");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13209: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13313: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13212: \$? = $ac_status" >&5
+  echo "$as_me:13316: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13215: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13319: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13218: \$? = $ac_status" >&5
+  echo "$as_me:13322: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_func_iconv=yes
 else
@@ -13227,7 +13331,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       am_save_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
       cat >conftest.$ac_ext <<_ACEOF
-#line 13230 "configure"
+#line 13334 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -13242,16 +13346,16 @@ iconv_t cd = iconv_open("","");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13245: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13349: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13248: \$? = $ac_status" >&5
+  echo "$as_me:13352: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13355: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13254: \$? = $ac_status" >&5
+  echo "$as_me:13358: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
@@ -13264,7 +13368,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
 
 fi
-echo "$as_me:13267: result: $am_cv_func_iconv" >&5
+echo "$as_me:13371: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
   if test "$am_cv_func_iconv" = yes; then
 
@@ -13274,9 +13378,9 @@ EOF
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    echo "$as_me:13277: checking how to link with libiconv" >&5
+    echo "$as_me:13381: checking how to link with libiconv" >&5
 echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
-    echo "$as_me:13279: result: $LIBICONV" >&5
+    echo "$as_me:13383: result: $LIBICONV" >&5
 echo "${ECHO_T}$LIBICONV" >&6
   else
             CPPFLAGS="$am_save_CPPFLAGS"
@@ -13285,14 +13389,14 @@ echo "${ECHO_T}$LIBICONV" >&6
   fi
 
   if test "$am_cv_func_iconv" = yes; then
-    echo "$as_me:13288: checking for iconv declaration" >&5
+    echo "$as_me:13392: 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
-#line 13295 "configure"
+#line 13399 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13316,16 +13420,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13319: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13423: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13322: \$? = $ac_status" >&5
+  echo "$as_me:13426: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13429: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13328: \$? = $ac_status" >&5
+  echo "$as_me:13432: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_arg1=""
 else
@@ -13338,7 +13442,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
     am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    echo "$as_me:13341: result: ${ac_t:-
+    echo "$as_me:13445: result: ${ac_t:-
          }$am_cv_proto_iconv" >&5
 echo "${ECHO_T}${ac_t:-
          }$am_cv_proto_iconv" >&6
@@ -13349,13 +13453,13 @@ EOF
 
   fi
 
-  echo "$as_me:13352: checking for nl_langinfo and CODESET" >&5
+  echo "$as_me:13456: 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
-#line 13358 "configure"
+#line 13462 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -13367,16 +13471,16 @@ char* cs = nl_langinfo(CODESET);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13370: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13474: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13373: \$? = $ac_status" >&5
+  echo "$as_me:13477: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13376: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13480: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13379: \$? = $ac_status" >&5
+  echo "$as_me:13483: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -13387,7 +13491,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:13390: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:13494: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
   if test $am_cv_langinfo_codeset = yes; then
 
@@ -13399,13 +13503,13 @@ EOF
 
   if test $ac_cv_header_locale_h = yes; then
 
-  echo "$as_me:13402: checking for LC_MESSAGES" >&5
+  echo "$as_me:13506: 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
-#line 13408 "configure"
+#line 13512 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -13417,16 +13521,16 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13420: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13524: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13423: \$? = $ac_status" >&5
+  echo "$as_me:13527: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13426: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13429: \$? = $ac_status" >&5
+  echo "$as_me:13533: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
@@ -13436,7 +13540,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13439: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:13543: 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
 
@@ -13452,7 +13556,7 @@ EOF
 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:13455: checking for $ac_word" >&5
+echo "$as_me:13559: 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
@@ -13467,7 +13571,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"
-echo "$as_me:13470: found $ac_dir/$ac_word" >&5
+echo "$as_me:13574: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -13475,10 +13579,10 @@ fi
 fi
 INTLBISON=$ac_cv_prog_INTLBISON
 if test -n "$INTLBISON"; then
-  echo "$as_me:13478: result: $INTLBISON" >&5
+  echo "$as_me:13582: result: $INTLBISON" >&5
 echo "${ECHO_T}$INTLBISON" >&6
 else
-  echo "$as_me:13481: result: no" >&5
+  echo "$as_me:13585: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13488,7 +13592,7 @@ done
   if test -z "$INTLBISON"; then
     ac_verc_fail=yes
   else
-        echo "$as_me:13491: checking version of bison" >&5
+        echo "$as_me:13595: 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
@@ -13497,14 +13601,14 @@ 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
-    echo "$as_me:13500: result: $ac_prog_version" >&5
+    echo "$as_me:13604: result: $ac_prog_version" >&5
 echo "${ECHO_T}$ac_prog_version" >&6
   fi
   if test $ac_verc_fail = yes; then
     INTLBISON=:
   fi
 
-  echo "$as_me:13507: checking whether NLS is requested" >&5
+  echo "$as_me:13611: 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
@@ -13513,7 +13617,7 @@ if test "${enable_nls+set}" = set; then
 else
   USE_NLS=yes
 fi;
-  echo "$as_me:13516: result: $USE_NLS" >&5
+  echo "$as_me:13620: result: $USE_NLS" >&5
 echo "${ECHO_T}$USE_NLS" >&6
 
     BUILD_INCLUDED_LIBINTL=no
@@ -13526,7 +13630,7 @@ echo "${ECHO_T}$USE_NLS" >&6
     if test "$USE_NLS" = "yes"; then
     gt_use_preinstalled_gnugettext=no
 
-      echo "$as_me:13529: checking whether included gettext is requested" >&5
+      echo "$as_me:13633: 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.
@@ -13536,19 +13640,19 @@ if test "${with_included_gettext+set}" = set; then
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
-      echo "$as_me:13539: result: $nls_cv_force_use_gnu_gettext" >&5
+      echo "$as_me:13643: 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
 
-        echo "$as_me:13545: checking for GNU gettext in libc" >&5
+        echo "$as_me:13649: checking for GNU gettext in libc" >&5
 echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6
 if test "${gt_cv_func_gnugettext2_libc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13551 "configure"
+#line 13655 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -13563,16 +13667,16 @@ return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13566: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13670: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13569: \$? = $ac_status" >&5
+  echo "$as_me:13673: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13572: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13575: \$? = $ac_status" >&5
+  echo "$as_me:13679: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_func_gnugettext2_libc=yes
 else
@@ -13582,7 +13686,7 @@ gt_cv_func_gnugettext2_libc=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13585: result: $gt_cv_func_gnugettext2_libc" >&5
+echo "$as_me:13689: result: $gt_cv_func_gnugettext2_libc" >&5
 echo "${ECHO_T}$gt_cv_func_gnugettext2_libc" >&6
 
         if test "$gt_cv_func_gnugettext2_libc" != "yes"; then
@@ -13962,7 +14066,7 @@ fi;
     done
   fi
 
-          echo "$as_me:13965: checking for GNU gettext in libintl" >&5
+          echo "$as_me:14069: checking for GNU gettext in libintl" >&5
 echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6
 if test "${gt_cv_func_gnugettext2_libintl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13972,7 +14076,7 @@ else
             gt_save_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
                         cat >conftest.$ac_ext <<_ACEOF
-#line 13975 "configure"
+#line 14079 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -13991,16 +14095,16 @@ return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13994: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14098: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13997: \$? = $ac_status" >&5
+  echo "$as_me:14101: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14003: \$? = $ac_status" >&5
+  echo "$as_me:14107: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_func_gnugettext2_libintl=yes
 else
@@ -14012,7 +14116,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                         if test "$gt_cv_func_gnugettext2_libintl" != yes && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
               cat >conftest.$ac_ext <<_ACEOF
-#line 14015 "configure"
+#line 14119 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -14031,16 +14135,16 @@ return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14034: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14138: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14037: \$? = $ac_status" >&5
+  echo "$as_me:14141: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14043: \$? = $ac_status" >&5
+  echo "$as_me:14147: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
@@ -14055,7 +14159,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
             CPPFLAGS="$gt_save_CPPFLAGS"
             LIBS="$gt_save_LIBS"
 fi
-echo "$as_me:14058: result: $gt_cv_func_gnugettext2_libintl" >&5
+echo "$as_me:14162: result: $gt_cv_func_gnugettext2_libintl" >&5
 echo "${ECHO_T}$gt_cv_func_gnugettext2_libintl" >&6
         fi
 
@@ -14104,9 +14208,9 @@ EOF
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if test "$gt_cv_func_gnugettext2_libintl" = "yes"; then
-        echo "$as_me:14107: checking how to link with libintl" >&5
+        echo "$as_me:14211: checking how to link with libintl" >&5
 echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6
-        echo "$as_me:14109: result: $LIBINTL" >&5
+        echo "$as_me:14213: result: $LIBINTL" >&5
 echo "${ECHO_T}$LIBINTL" >&6
 
   for element in $INCINTL; do
@@ -14575,7 +14679,7 @@ fi;
     fi
   done
 
-  echo "$as_me:14578: checking for libexpat" >&5
+  echo "$as_me:14682: checking for libexpat" >&5
 echo $ECHO_N "checking for libexpat... $ECHO_C" >&6
 if test "${ac_cv_libexpat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14584,7 +14688,7 @@ else
     ac_save_LIBS="$LIBS"
     LIBS="$LIBS $LIBEXPAT"
     cat >conftest.$ac_ext <<_ACEOF
-#line 14587 "configure"
+#line 14691 "configure"
 #include "confdefs.h"
 #include <expat.h>
 int
@@ -14596,16 +14700,16 @@ XML_ExpatVersion();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14599: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14703: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14602: \$? = $ac_status" >&5
+  echo "$as_me:14706: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14605: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14608: \$? = $ac_status" >&5
+  echo "$as_me:14712: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_libexpat=yes
 else
@@ -14617,7 +14721,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS="$ac_save_LIBS"
 
 fi
-echo "$as_me:14620: result: $ac_cv_libexpat" >&5
+echo "$as_me:14724: result: $ac_cv_libexpat" >&5
 echo "${ECHO_T}$ac_cv_libexpat" >&6
   if test "$ac_cv_libexpat" = yes; then
     HAVE_LIBEXPAT=yes
@@ -14626,9 +14730,9 @@ cat >>confdefs.h <<\EOF
 #define HAVE_LIBEXPAT 1
 EOF
 
-    echo "$as_me:14629: checking how to link with libexpat" >&5
+    echo "$as_me:14733: checking how to link with libexpat" >&5
 echo $ECHO_N "checking how to link with libexpat... $ECHO_C" >&6
-    echo "$as_me:14631: result: $LIBEXPAT" >&5
+    echo "$as_me:14735: result: $LIBEXPAT" >&5
 echo "${ECHO_T}$LIBEXPAT" >&6
   else
     HAVE_LIBEXPAT=no
@@ -14644,9 +14748,9 @@ esac
 if test "${with_lispdir+set}" = set; then
   withval="$with_lispdir"
    lispdir="$withval"
-    echo "$as_me:14647: checking where .elc files should go" >&5
+    echo "$as_me:14751: checking where .elc files should go" >&5
 echo $ECHO_N "checking where .elc files should go... $ECHO_C" >&6
-    echo "$as_me:14649: result: $lispdir" >&5
+    echo "$as_me:14753: result: $lispdir" >&5
 echo "${ECHO_T}$lispdir" >&6
 else
 
@@ -14657,7 +14761,7 @@ else
 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:14660: checking for $ac_word" >&5
+echo "$as_me:14764: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_EMACS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14672,7 +14776,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_EMACS="$ac_prog"
-echo "$as_me:14675: found $ac_dir/$ac_word" >&5
+echo "$as_me:14779: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -14680,10 +14784,10 @@ fi
 fi
 EMACS=$ac_cv_prog_EMACS
 if test -n "$EMACS"; then
-  echo "$as_me:14683: result: $EMACS" >&5
+  echo "$as_me:14787: result: $EMACS" >&5
 echo "${ECHO_T}$EMACS" >&6
 else
-  echo "$as_me:14686: result: no" >&5
+  echo "$as_me:14790: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -14693,7 +14797,7 @@ test -n "$EMACS" || EMACS="no"
 
   if test $EMACS != "no"; then
     if test x${lispdir+set} != xset; then
-      echo "$as_me:14696: checking where .elc files should go" >&5
+      echo "$as_me:14800: checking where .elc files should go" >&5
 echo $ECHO_N "checking where .elc files should go... $ECHO_C" >&6
 if test "${am_cv_lispdir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14704,7 +14808,7 @@ else
 	fi
 
 fi
-echo "$as_me:14707: result: $am_cv_lispdir" >&5
+echo "$as_me:14811: result: $am_cv_lispdir" >&5
 echo "${ECHO_T}$am_cv_lispdir" >&6
       lispdir="$am_cv_lispdir"
     fi
@@ -14717,7 +14821,7 @@ aclocaldir='${datadir}/aclocal'
 ac_aux_dir_abs=`cd $ac_aux_dir && pwd`
 # Extract the first word of "dvips", so it can be a program name with args.
 set dummy dvips; ac_word=$2
-echo "$as_me:14720: checking for $ac_word" >&5
+echo "$as_me:14824: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_DVIPS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14734,7 +14838,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_DVIPS="$ac_dir/$ac_word"
-   echo "$as_me:14737: found $ac_dir/$ac_word" >&5
+   echo "$as_me:14841: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -14746,16 +14850,16 @@ fi
 DVIPS=$ac_cv_path_DVIPS
 
 if test -n "$DVIPS"; then
-  echo "$as_me:14749: result: $DVIPS" >&5
+  echo "$as_me:14853: result: $DVIPS" >&5
 echo "${ECHO_T}$DVIPS" >&6
 else
-  echo "$as_me:14752: result: no" >&5
+  echo "$as_me:14856: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 # Extract the first word of "texi2pdf", so it can be a program name with args.
 set dummy texi2pdf; ac_word=$2
-echo "$as_me:14758: checking for $ac_word" >&5
+echo "$as_me:14862: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TEXI2PDF+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14772,7 +14876,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_TEXI2PDF="$ac_dir/$ac_word"
-   echo "$as_me:14775: found $ac_dir/$ac_word" >&5
+   echo "$as_me:14879: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -14784,16 +14888,16 @@ fi
 TEXI2PDF=$ac_cv_path_TEXI2PDF
 
 if test -n "$TEXI2PDF"; then
-  echo "$as_me:14787: result: $TEXI2PDF" >&5
+  echo "$as_me:14891: result: $TEXI2PDF" >&5
 echo "${ECHO_T}$TEXI2PDF" >&6
 else
-  echo "$as_me:14790: result: no" >&5
+  echo "$as_me:14894: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
-echo "$as_me:14796: checking for $ac_word" >&5
+echo "$as_me:14900: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PERL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14810,7 +14914,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_PERL="$ac_dir/$ac_word"
-   echo "$as_me:14813: found $ac_dir/$ac_word" >&5
+   echo "$as_me:14917: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -14822,10 +14926,10 @@ fi
 PERL=$ac_cv_path_PERL
 
 if test -n "$PERL"; then
-  echo "$as_me:14825: result: $PERL" >&5
+  echo "$as_me:14929: result: $PERL" >&5
 echo "${ECHO_T}$PERL" >&6
 else
-  echo "$as_me:14828: result: no" >&5
+  echo "$as_me:14932: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -14835,7 +14939,7 @@ for ac_prog in $CCC c++ g++ gpp gcc CC cxx cc++ cl
 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:14838: checking for $ac_word" >&5
+echo "$as_me:14942: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14850,7 +14954,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_CXX="$ac_prog"
-echo "$as_me:14853: found $ac_dir/$ac_word" >&5
+echo "$as_me:14957: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -14858,10 +14962,10 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  echo "$as_me:14861: result: $CXX" >&5
+  echo "$as_me:14965: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:14864: result: no" >&5
+  echo "$as_me:14968: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -14870,7 +14974,7 @@ done
 test -n "$CXX" || CXX=":"
 
 if test "$CXX" != ":"; then
-      echo "$as_me:14873: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+      echo "$as_me:14977: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 echo $ECHO_N "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works... $ECHO_C" >&6
   ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -14879,10 +14983,10 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   echo 'int main () { return 0; }' > conftest.$ac_ext
-  if { (eval echo "$as_me:14882: \"$ac_link\"") >&5
+  if { (eval echo "$as_me:14986: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14885: \$? = $ac_status" >&5
+  echo "$as_me:14989: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest$ac_exeext; then
     ac_cv_prog_cxx_works=yes
     if (./conftest; exit) 2>/dev/null; then
@@ -14900,7 +15004,7 @@ 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:14903: result: $ac_cv_prog_cxx_works" >&5
+  echo "$as_me:15007: result: $ac_cv_prog_cxx_works" >&5
 echo "${ECHO_T}$ac_cv_prog_cxx_works" >&6
   if test $ac_cv_prog_cxx_works = no; then
     CXX=:
@@ -15001,7 +15105,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:15004: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:15108: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -15177,7 +15281,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:15180: error: ambiguous option: $1
+    { { echo "$as_me:15284: 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;}
@@ -15196,7 +15300,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:15199: error: unrecognized option: $1
+  -*) { { echo "$as_me:15303: 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;}
@@ -15270,7 +15374,7 @@ do
   "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-  *) { { echo "$as_me:15273: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:15377: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -15384,6 +15488,10 @@ s,@CCDEPMODE@,$CCDEPMODE,;t t
 s,@YACC@,$YACC,;t t
 s,@LEX@,$LEX,;t t
 s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
+s,@GCJ@,$GCJ,;t t
+s,@GCJFLAGS@,$GCJFLAGS,;t t
+s,@HAVE_GCJ@,$HAVE_GCJ,;t t
+s,@BUILDJAVAEXE@,$BUILDJAVAEXE,;t t
 s,@CPP@,$CPP,;t t
 s,@HAVE_GCJ_IN_PATH@,$HAVE_GCJ_IN_PATH,;t t
 s,@HAVE_JAVAC_IN_PATH@,$HAVE_JAVAC_IN_PATH,;t t
@@ -15391,7 +15499,7 @@ s,@HAVE_JIKES_IN_PATH@,$HAVE_JIKES_IN_PATH,;t t
 s,@JAVAC@,$JAVAC,;t t
 s,@CLASSPATH@,$CLASSPATH,;t t
 s,@CLASSPATH_SEPARATOR@,$CLASSPATH_SEPARATOR,;t t
-s,@HAVE_GCJ@,$HAVE_GCJ,;t t
+s,@HAVE_GCJ_C@,$HAVE_GCJ_C,;t t
 s,@HAVE_JAVAC@,$HAVE_JAVAC,;t t
 s,@HAVE_JIKES@,$HAVE_JIKES,;t t
 s,@JAR@,$JAR,;t t
@@ -15584,7 +15692,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:15587: creating $ac_file" >&5
+    { echo "$as_me:15695: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -15602,7 +15710,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:15605: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:15713: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -15615,7 +15723,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:15618: error: cannot find input file: $f" >&5
+           { { echo "$as_me:15726: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -15676,7 +15784,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:15679: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:15787: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -15687,7 +15795,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:15690: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:15798: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -15700,7 +15808,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:15703: error: cannot find input file: $f" >&5
+           { { echo "$as_me:15811: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -15817,7 +15925,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
-      { echo "$as_me:15820: $ac_file is unchanged" >&5
+      { echo "$as_me:15928: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -15859,7 +15967,7 @@ done; }
   # Run the commands associated with the file.
   case $ac_file in
     config.h ) # update the timestamp
-echo timestamp >"./stamp-h1"
+echo timestamp >"./stamp-h"
  ;;
   esac
 done
diff --git a/djgpp/README b/djgpp/README
index 44045d7ce..ff080b796 100644
--- a/djgpp/README
+++ b/djgpp/README
@@ -1,4 +1,4 @@
-This is a port of GNU Gettext 0.11.1 to MSDOS/DJGPP.
+This is a port of GNU Gettext 0.11.3 to MSDOS/DJGPP.
 
 
         TO USE THE GNU GETTEXT LIBRARY YOU **MUST** MODIFY YOUR C-LIBRARY.
@@ -34,7 +34,7 @@ This is a port of GNU Gettext 0.11.1 to MSDOS/DJGPP.
         file the gettext keyword makes **ALWAYS** reference to the GNU gettext
         function and **NEVER** to the BORLAND-compatibility gettext function.
 
-     2) The binary package gtxt01b.zip contains all needed files to get NLS
+     2) The binary package gtxt03b.zip contains all needed files to get NLS
         support for the following DJGPP ports:
           bison-1.32 (bsn132s.zip)
           enscript-1.6.2 (ens162s.zip)
@@ -53,7 +53,7 @@ This is a port of GNU Gettext 0.11.1 to MSDOS/DJGPP.
         See section #4 for further information about this issue.
         To implement NLS support for one of those packages you will also need
         to download the following packages:
-          gtxt01b.zip (binaries of GNU Gettext 0.11.1)
+          gtxt03b.zip (binaries of GNU Gettext 0.11.3)
           licv17b.zip (binaries of GNU libiconv 1.7)
           fil40b.zip  (binaries of GNU Fileutils 4.0)
           shl20jb.zip (binaries of GNU Sh-utils 2.0j)
@@ -89,14 +89,14 @@ This is a port of GNU Gettext 0.11.1 to MSDOS/DJGPP.
 2.2.:   Copy the binary distribution into the top DJGPP installation directory,
         just unzip it preserving the directory structure running *ONE* of the
         following commands:
-          unzip32 gtxt01b.zip      or
-          djtarx gtxt01b.zip       or
-          pkunzip -d gtxt01b.zip
+          unzip32 gtxt03b.zip      or
+          djtarx gtxt03b.zip       or
+          pkunzip -d gtxt03b.zip
 
 2.3.:   Changing libc.a and conio.h.
         Apart from the ussual directories, the binary package will create the
         following directory:
-          %DJDIR%/gnu/gtxt-011.1/djgpp/djdev-2.03
+          %DJDIR%/gnu/gtxt-011.3/djgpp/djdev-2.03
         where %DJDIR% stands for the root of your DJGPP installation tree.
         Cd into the djdev-2.03 directory. You will find the following files:
           conio.diffs
@@ -109,7 +109,7 @@ This is a port of GNU Gettext 0.11.1 to MSDOS/DJGPP.
         conio.o contained in libc.a.
 
         For all commands that will follow now I will assume that you have
-        cd'ed into the %DJDIR%/gnu/gtxt-011.1/djgpp/djdev-2.03 directory,
+        cd'ed into the %DJDIR%/gnu/gtxt-011.3/djgpp/djdev-2.03 directory,
         where %DJDIR% represents the path to your DJGPP installation. First,
         you should backup your old header and library. For this task, run the
         following command sequence (cp is the copy program from fil40b.zip):
@@ -311,9 +311,9 @@ This is a port of GNU Gettext 0.11.1 to MSDOS/DJGPP.
         directory. If you download the source distribution from one of the
         DJGPP archives, just unzip it preserving the directory structure
         running *ONE* of the following commands:
-          unzip32 gtxt01s.zip      or
-          djtarx gtxt01s.zip       or
-          pkunzip -d gtxt01s.zip
+          unzip32 gtxt03s.zip      or
+          djtarx gtxt03s.zip       or
+          pkunzip -d gtxt03s.zip
 
         Source distributions downloaded from one of the GNU FTP sites need
         some more work to unpack. First, you *MUST* use the `djtar' program
@@ -325,11 +325,11 @@ This is a port of GNU Gettext 0.11.1 to MSDOS/DJGPP.
         to retrieve that file, and then invoke `djtar' to unpack the
         distribution. Here is how:
 
-          djtar -x -p -o gettext-0.11.1/djgpp/fnchange.lst gettext-0.11.1.tar.gz > lst
-          djtar -x -n lst gettext-0.11.1.tar.gz
+          djtar -x -p -o gettext-0.11.3/djgpp/fnchange.lst gettext-0.11.3.tar.gz > lst
+          djtar -x -n lst gettext-0.11.3.tar.gz
 
         (The name of the distribution archive and the top-level directory will
-        be different for versions other than 0.11.1.)
+        be different for versions other than 0.11.3.)
 
         It is always recommended to download the DJGPP packages from some
         Simtel.NET mirror and *NOT* the original GNU distribution because
@@ -354,7 +354,7 @@ This is a port of GNU Gettext 0.11.1 to MSDOS/DJGPP.
           no-NLS
 
         If for some reason you want no NLS support you will have to reconfigure
-        the package. For this purpose cd into the top srcdir (gtxt-011.1)
+        the package. For this purpose cd into the top srcdir (gtxt-011.3)
         and run the following commands:
           make distclean
           djgpp\config no-NLS
@@ -368,14 +368,14 @@ This is a port of GNU Gettext 0.11.1 to MSDOS/DJGPP.
         To build the programs in a directory other than where the sources are,
         you must add a parameter that specifies the source directory,
         e.g:
-          x:\src\gnu\gtxt-011.1\djgpp\config x:/src/gnu/gtxt-011.1 no-NLS
+          x:\src\gnu\gtxt-011.3\djgpp\config x:/src/gnu/gtxt-011.3 no-NLS
 
         Lets assume you want to build the binaries in a directory placed on a 
         different drive (z:\build in this case) from where the sources are,
         then you will run the following commands:
           z:
           cd \build
-          x:\src\gnu\gtxt-011.1\djgpp\config x:/src/gnu/gtxt-011.1 no-NLS
+          x:\src\gnu\gtxt-011.3\djgpp\config x:/src/gnu/gtxt-011.3 no-NLS
 
         If you want NLS support you will omit "no-NLS" or replace it by
         "NLS" in the above examples.
@@ -441,12 +441,12 @@ This is a port of GNU Gettext 0.11.1 to MSDOS/DJGPP.
         be replaced.
 
 4.1.:   To reconfigure and recompile a source package with NLS support you
-        *MUST* install the gtxt01b.zip and licv17b.zip packages
+        *MUST* install the gtxt03b.zip and licv17b.zip packages
         first. NLS support will **NOT** work with any prior version of the above
-        mentioned packages. Before installing gtxt01b.zip and licv17b.zip
+        mentioned packages. Before installing gtxt03b.zip and licv17b.zip
         you *MUST* deinstall the old packages if you ever have installed them.
         For this purpose use the provided manifest files from the old packages.
-        Old packages means previous beta releases of gtxt01b.zip and licv17b.zip
+        Old packages means previous beta releases of gtxt03b.zip and licv17b.zip
         *AND* also previous versions of gettext like gettext 0.10.32, etc.
 
 4.2.:   We will assume that the required sources will be unzipped into
@@ -457,8 +457,8 @@ This is a port of GNU Gettext 0.11.1 to MSDOS/DJGPP.
         This will create the directory:
           /src/gnu/grep-2.4
 
-        The binary package gtxt01b.zip will create the directory:
-          %DJDIR%/gnu/gtxt-011.1/djgpp/NLS_for_djgpp_packages/grep-2.4
+        The binary package gtxt03b.zip will create the directory:
+          %DJDIR%/gnu/gtxt-011.3/djgpp/NLS_for_djgpp_packages/grep-2.4
         This directory contains all needed files.
         The files are:
           grep-2.4/djgpp/config.bat  (new .bat file that replaces the original one.)
@@ -468,7 +468,7 @@ This is a port of GNU Gettext 0.11.1 to MSDOS/DJGPP.
         Now we will xcopy the needed files into the original grep-2.4 directory.
         First we will cd into the grep-2.4 directory and then we will run the
         following command:
-          xcopy %DJDIR%\gnu\gtxt-011.1\djgpp\NLS_for_djgpp_packages\grep-2.4 /v/s/e
+          xcopy %DJDIR%\gnu\gtxt-011.3\djgpp\NLS_for_djgpp_packages\grep-2.4 /v/s/e
 
 4.3.:   Before the package can be reconfigured, the old configuration must be
         cleared. Run the command:
diff --git a/djgpp/fnchange.lst b/djgpp/fnchange.lst
index 2ae12cd66..da904091f 100644
--- a/djgpp/fnchange.lst
+++ b/djgpp/fnchange.lst
@@ -1,220 +1,220 @@
-gettext-0.11.1/config.h.in                                        gettext-0.11.1/config.h-in
-gettext-0.11.1/intl/COPYING.LIB-2.0                               gettext-0.11.1/intl/COPYING_LIB.20
-gettext-0.11.1/intl/COPYING.LIB-2.1                               gettext-0.11.1/intl/COPYING_LIB.21
-gettext-0.11.1/doc/gettext_1.html                                 gettext-0.11.1/doc/gettext.1-html
-gettext-0.11.1/doc/gettext_10.html                                gettext-0.11.1/doc/gettext.10-html
-gettext-0.11.1/doc/gettext_11.html                                gettext-0.11.1/doc/gettext.11-html
-gettext-0.11.1/doc/gettext_12.html                                gettext-0.11.1/doc/gettext.12-html
-gettext-0.11.1/doc/gettext_13.html                                gettext-0.11.1/doc/gettext.13-html
-gettext-0.11.1/doc/gettext_14.html                                gettext-0.11.1/doc/gettext.14-html
-gettext-0.11.1/doc/gettext_15.html                                gettext-0.11.1/doc/gettext.15-html
-gettext-0.11.1/doc/gettext_16.html                                gettext-0.11.1/doc/gettext.16-html
-gettext-0.11.1/doc/gettext_2.html                                 gettext-0.11.1/doc/gettext.2-html
-gettext-0.11.1/doc/gettext_3.html                                 gettext-0.11.1/doc/gettext.3-html
-gettext-0.11.1/doc/gettext_4.html                                 gettext-0.11.1/doc/gettext.4-html
-gettext-0.11.1/doc/gettext_5.html                                 gettext-0.11.1/doc/gettext.5-html
-gettext-0.11.1/doc/gettext_6.html                                 gettext-0.11.1/doc/gettext.6-html
-gettext-0.11.1/doc/gettext_7.html                                 gettext-0.11.1/doc/gettext.7-html
-gettext-0.11.1/doc/gettext_8.html                                 gettext-0.11.1/doc/gettext.8-html
-gettext-0.11.1/doc/gettext_9.html                                 gettext-0.11.1/doc/gettext.9-html
-gettext-0.11.1/doc/gettext_foot.html                              gettext-0.11.1/doc/gettext.foot-html
-gettext-0.11.1/doc/gettext_toc.html                               gettext-0.11.1/doc/gettext.toc-html
-gettext-0.11.1/lib/javacomp.sh.in                                 gettext-0.11.1/lib/javacomp.sh-in
-gettext-0.11.1/lib/javaexec.sh.in                                 gettext-0.11.1/lib/javaexec.sh-in
-gettext-0.11.1/lib/stdbool.h.in                                   gettext-0.11.1/lib/stdbool.h-in
-gettext-0.11.1/man/gettext.1.in                                   gettext-0.11.1/man/gettext.1-in
-gettext-0.11.1/man/ngettext.1.in                                  gettext-0.11.1/man/ngettext.1-in
-gettext-0.11.1/man/gettext.3.in                                   gettext-0.11.1/man/gettext.3-in
-gettext-0.11.1/man/ngettext.3.in                                  gettext-0.11.1/man/ngettext.3-in
-gettext-0.11.1/man/textdomain.3.in                                gettext-0.11.1/man/textdomain.3-in
-gettext-0.11.1/man/bindtextdomain.3.in                            gettext-0.11.1/man/bindtextdomain.3-in
-gettext-0.11.1/man/bind_textdomain_codeset.3.in                   gettext-0.11.1/man/bind_textdomain_codeset.3-in
-gettext-0.11.1/man/gettext.1.html.in                              gettext-0.11.1/man/gettext.1hin
-gettext-0.11.1/man/ngettext.1.html.in                             gettext-0.11.1/man/ngettext.1hin
-gettext-0.11.1/man/msgcmp.1.html                                  gettext-0.11.1/man/msgcmp.1-html
-gettext-0.11.1/man/msgfmt.1.html                                  gettext-0.11.1/man/msgfmt.1-html
-gettext-0.11.1/man/msgmerge.1.html                                gettext-0.11.1/man/msgmerge.1-html
-gettext-0.11.1/man/msgunfmt.1.html                                gettext-0.11.1/man/msgunfmt.1-html
-gettext-0.11.1/man/xgettext.1.html                                gettext-0.11.1/man/xgettext.1-html
-gettext-0.11.1/man/msgattrib.1.html                               gettext-0.11.1/man/msgattrib.1-html
-gettext-0.11.1/man/msgcat.1.html                                  gettext-0.11.1/man/msgcat.1-html
-gettext-0.11.1/man/msgcomm.1.html                                 gettext-0.11.1/man/msgcomm.1-html
-gettext-0.11.1/man/msgconv.1.html                                 gettext-0.11.1/man/msgconv.1-html
-gettext-0.11.1/man/msgen.1.html                                   gettext-0.11.1/man/msgen.1-html
-gettext-0.11.1/man/msgexec.1.html                                 gettext-0.11.1/man/msgexec.1-html
-gettext-0.11.1/man/msgfilter.1.html                               gettext-0.11.1/man/msgfilter.1-html
-gettext-0.11.1/man/msggrep.1.html                                 gettext-0.11.1/man/msggrep.1-html
-gettext-0.11.1/man/msginit.1.html                                 gettext-0.11.1/man/msginit.1-html
-gettext-0.11.1/man/msguniq.1.html                                 gettext-0.11.1/man/msguniq.1-html
-gettext-0.11.1/man/gettext.3.html                                 gettext-0.11.1/man/gettext.3-html
-gettext-0.11.1/man/ngettext.3.html                                gettext-0.11.1/man/ngettext.3-html
-gettext-0.11.1/man/textdomain.3.html                              gettext-0.11.1/man/textdomain.3-html
-gettext-0.11.1/man/bindtextdomain.3.html                          gettext-0.11.1/man/bindtextdomain.3-html
-gettext-0.11.1/man/bind_textdomain_codeset.3.html                 gettext-0.11.1/man/bind_textdomain_codeset.3-html
-gettext-0.11.1/po/Makefile.in.in                                  gettext-0.11.1/po/Makefile.in-in
-gettext-0.11.1/src/format-librep.c                                gettext-0.11.1/src/format_librep.c
-gettext-0.11.1/src/format-pascal.c                                gettext-0.11.1/src/format_pascal.c
-gettext-0.11.1/intl-java/javadoc1/images/blue-ball.gif            gettext-0.11.1/intl-java/javadoc1/images/b-ball.gif
-gettext-0.11.1/intl-java/javadoc1/images/cyan-ball.gif            gettext-0.11.1/intl-java/javadoc1/images/c-ball.gif
-gettext-0.11.1/intl-java/javadoc1/images/green-ball.gif           gettext-0.11.1/intl-java/javadoc1/images/g-ball.gif
-gettext-0.11.1/intl-java/javadoc1/images/magenta-ball.gif         gettext-0.11.1/intl-java/javadoc1/images/m-ball.gif
-gettext-0.11.1/intl-java/javadoc1/images/red-ball.gif             gettext-0.11.1/intl-java/javadoc1/images/r-ball.gif
-gettext-0.11.1/intl-java/javadoc1/images/yellow-ball.gif          gettext-0.11.1/intl-java/javadoc1/images/y-ball.gif
-gettext-0.11.1/intl-java/javadoc1/images/constructors.gif         gettext-0.11.1/intl-java/javadoc1/images/ctors.gif
-gettext-0.11.1/intl-java/javadoc1/images/variables.gif            gettext-0.11.1/intl-java/javadoc1/images/vars.gif
-gettext-0.11.1/intl-java/javadoc2/gnu/gettext/package-frame.html  gettext-0.11.1/intl-java/javadoc2/gnu/gettext/package_frame.html
-gettext-0.11.1/intl-java/javadoc2/gnu/gettext/package-tree.html   gettext-0.11.1/intl-java/javadoc2/gnu/gettext/package_tree.html
-gettext-0.11.1/tests/gettext-1                                    gettext-0.11.1/tests/gettext.1
-gettext-0.11.1/tests/gettext-2                                    gettext-0.11.1/tests/gettext.2
-gettext-0.11.1/tests/msgattrib-1                                  gettext-0.11.1/tests/msgattrib.1
-gettext-0.11.1/tests/msgattrib-2                                  gettext-0.11.1/tests/msgattrib.2
-gettext-0.11.1/tests/msgattrib-3                                  gettext-0.11.1/tests/msgattrib.3
-gettext-0.11.1/tests/msgattrib-4                                  gettext-0.11.1/tests/msgattrib.4
-gettext-0.11.1/tests/msgattrib-5                                  gettext-0.11.1/tests/msgattrib.5
-gettext-0.11.1/tests/msgattrib-6                                  gettext-0.11.1/tests/msgattrib.6
-gettext-0.11.1/tests/msgattrib-7                                  gettext-0.11.1/tests/msgattrib.7
-gettext-0.11.1/tests/msgattrib-8                                  gettext-0.11.1/tests/msgattrib.8
-gettext-0.11.1/tests/msgattrib-9                                  gettext-0.11.1/tests/msgattrib.9
-gettext-0.11.1/tests/msgattrib-10                                 gettext-0.11.1/tests/msgattrib.10
-gettext-0.11.1/tests/msgattrib-11                                 gettext-0.11.1/tests/msgattrib.11
-gettext-0.11.1/tests/msgattrib-12                                 gettext-0.11.1/tests/msgattrib.12
-gettext-0.11.1/tests/msgattrib-13                                 gettext-0.11.1/tests/msgattrib.13
-gettext-0.11.1/tests/msgattrib-14                                 gettext-0.11.1/tests/msgattrib.14
-gettext-0.11.1/tests/msgcat-1                                     gettext-0.11.1/tests/msgcat.1
-gettext-0.11.1/tests/msgcat-2                                     gettext-0.11.1/tests/msgcat.2
-gettext-0.11.1/tests/msgcat-3                                     gettext-0.11.1/tests/msgcat.3
-gettext-0.11.1/tests/msgcat-4                                     gettext-0.11.1/tests/msgcat.4
-gettext-0.11.1/tests/msgcat-5                                     gettext-0.11.1/tests/msgcat.5
-gettext-0.11.1/tests/msgcat-6                                     gettext-0.11.1/tests/msgcat.6
-gettext-0.11.1/tests/msgcat-7                                     gettext-0.11.1/tests/msgcat.7
-gettext-0.11.1/tests/msgcmp-1                                     gettext-0.11.1/tests/msgcmp.1
-gettext-0.11.1/tests/msgcmp-2                                     gettext-0.11.1/tests/msgcmp.2
-gettext-0.11.1/tests/msgcomm-1                                    gettext-0.11.1/tests/msgcomm.1
-gettext-0.11.1/tests/msgcomm-2                                    gettext-0.11.1/tests/msgcomm.2
-gettext-0.11.1/tests/msgcomm-3                                    gettext-0.11.1/tests/msgcomm.3
-gettext-0.11.1/tests/msgcomm-4                                    gettext-0.11.1/tests/msgcomm.4
-gettext-0.11.1/tests/msgcomm-5                                    gettext-0.11.1/tests/msgcomm.5
-gettext-0.11.1/tests/msgcomm-6                                    gettext-0.11.1/tests/msgcomm.6
-gettext-0.11.1/tests/msgcomm-7                                    gettext-0.11.1/tests/msgcomm.7
-gettext-0.11.1/tests/msgcomm-8                                    gettext-0.11.1/tests/msgcomm.8
-gettext-0.11.1/tests/msgcomm-9                                    gettext-0.11.1/tests/msgcomm.9
-gettext-0.11.1/tests/msgcomm-10                                   gettext-0.11.1/tests/msgcomm.10
-gettext-0.11.1/tests/msgcomm-11                                   gettext-0.11.1/tests/msgcomm.11
-gettext-0.11.1/tests/msgcomm-12                                   gettext-0.11.1/tests/msgcomm.12
-gettext-0.11.1/tests/msgcomm-13                                   gettext-0.11.1/tests/msgcomm.13
-gettext-0.11.1/tests/msgcomm-14                                   gettext-0.11.1/tests/msgcomm.14
-gettext-0.11.1/tests/msgcomm-15                                   gettext-0.11.1/tests/msgcomm.15
-gettext-0.11.1/tests/msgcomm-16                                   gettext-0.11.1/tests/msgcomm.16
-gettext-0.11.1/tests/msgcomm-17                                   gettext-0.11.1/tests/msgcomm.17
-gettext-0.11.1/tests/msgcomm-18                                   gettext-0.11.1/tests/msgcomm.18
-gettext-0.11.1/tests/msgcomm-19                                   gettext-0.11.1/tests/msgcomm.19
-gettext-0.11.1/tests/msgcomm-20                                   gettext-0.11.1/tests/msgcomm.20
-gettext-0.11.1/tests/msgcomm-21                                   gettext-0.11.1/tests/msgcomm.21
-gettext-0.11.1/tests/msgcomm-22                                   gettext-0.11.1/tests/msgcomm.22
-gettext-0.11.1/tests/msgcomm-23                                   gettext-0.11.1/tests/msgcomm.23
-gettext-0.11.1/tests/msgconv-1                                    gettext-0.11.1/tests/msgconv.1
-gettext-0.11.1/tests/msgconv-2                                    gettext-0.11.1/tests/msgconv.2
-gettext-0.11.1/tests/msgconv-3                                    gettext-0.11.1/tests/msgconv.3
-gettext-0.11.1/tests/msgen-1                                      gettext-0.11.1/tests/msgen.1
-gettext-0.11.1/tests/msgexec-1                                    gettext-0.11.1/tests/msgexec.1
-gettext-0.11.1/tests/msgexec-2                                    gettext-0.11.1/tests/msgexec.2
-gettext-0.11.1/tests/msgfilter-1                                  gettext-0.11.1/tests/msgfilter.1
-gettext-0.11.1/tests/msgfilter-2                                  gettext-0.11.1/tests/msgfilter.2
-gettext-0.11.1/tests/msgfmt-1                                     gettext-0.11.1/tests/msgfmt.1
-gettext-0.11.1/tests/msgfmt-2                                     gettext-0.11.1/tests/msgfmt.2
-gettext-0.11.1/tests/msgfmt-3                                     gettext-0.11.1/tests/msgfmt.3
-gettext-0.11.1/tests/msgfmt-4                                     gettext-0.11.1/tests/msgfmt.4
-gettext-0.11.1/tests/msgfmt-5                                     gettext-0.11.1/tests/msgfmt.5
-gettext-0.11.1/tests/msgfmt-6                                     gettext-0.11.1/tests/msgfmt.6
-gettext-0.11.1/tests/msgfmt-7                                     gettext-0.11.1/tests/msgfmt.7
-gettext-0.11.1/tests/msgfmt-8                                     gettext-0.11.1/tests/msgfmt.8
-gettext-0.11.1/tests/msgfmt-9                                     gettext-0.11.1/tests/msgfmt.9
-gettext-0.11.1/tests/msgfmt-10                                    gettext-0.11.1/tests/msgfmt.10
-gettext-0.11.1/tests/msggrep-1                                    gettext-0.11.1/tests/msggrep.1
-gettext-0.11.1/tests/msggrep-2                                    gettext-0.11.1/tests/msggrep.2
-gettext-0.11.1/tests/msggrep-3                                    gettext-0.11.1/tests/msggrep.3
-gettext-0.11.1/tests/msggrep-4                                    gettext-0.11.1/tests/msggrep.4
-gettext-0.11.1/tests/msgmerge-1                                   gettext-0.11.1/tests/msgmerge.1
-gettext-0.11.1/tests/msgmerge-2                                   gettext-0.11.1/tests/msgmerge.2
-gettext-0.11.1/tests/msgmerge-3                                   gettext-0.11.1/tests/msgmerge.3
-gettext-0.11.1/tests/msgmerge-4                                   gettext-0.11.1/tests/msgmerge.4
-gettext-0.11.1/tests/msgmerge-5                                   gettext-0.11.1/tests/msgmerge.5
-gettext-0.11.1/tests/msgmerge-6                                   gettext-0.11.1/tests/msgmerge.6
-gettext-0.11.1/tests/msgmerge-7                                   gettext-0.11.1/tests/msgmerge.7
-gettext-0.11.1/tests/msgmerge-8                                   gettext-0.11.1/tests/msgmerge.8
-gettext-0.11.1/tests/msgmerge-9                                   gettext-0.11.1/tests/msgmerge.9
-gettext-0.11.1/tests/msgmerge-10                                  gettext-0.11.1/tests/msgmerge.10
-gettext-0.11.1/tests/msgmerge-11                                  gettext-0.11.1/tests/msgmerge.11
-gettext-0.11.1/tests/msgmerge-12                                  gettext-0.11.1/tests/msgmerge.12
-gettext-0.11.1/tests/msgmerge-13                                  gettext-0.11.1/tests/msgmerge.13
-gettext-0.11.1/tests/msgmerge-14                                  gettext-0.11.1/tests/msgmerge.14
-gettext-0.11.1/tests/msgmerge-15                                  gettext-0.11.1/tests/msgmerge.15
-gettext-0.11.1/tests/msgmerge-16                                  gettext-0.11.1/tests/msgmerge.16
-gettext-0.11.1/tests/msgmerge-17                                  gettext-0.11.1/tests/msgmerge.17
-gettext-0.11.1/tests/msgmerge-18                                  gettext-0.11.1/tests/msgmerge.18
-gettext-0.11.1/tests/msgmerge-19                                  gettext-0.11.1/tests/msgmerge.19
-gettext-0.11.1/tests/msgmerge-20                                  gettext-0.11.1/tests/msgmerge.20
-gettext-0.11.1/tests/msgunfmt-1                                   gettext-0.11.1/tests/msgunfmt.1
-gettext-0.11.1/tests/msguniq-1                                    gettext-0.11.1/tests/msguniq.1
-gettext-0.11.1/tests/msguniq-2                                    gettext-0.11.1/tests/msguniq.2
-gettext-0.11.1/tests/msguniq-3                                    gettext-0.11.1/tests/msguniq.3
-gettext-0.11.1/tests/xgettext-1                                   gettext-0.11.1/tests/xgettext.1
-gettext-0.11.1/tests/xgettext-2                                   gettext-0.11.1/tests/xgettext.2
-gettext-0.11.1/tests/xgettext-3                                   gettext-0.11.1/tests/xgettext.3
-gettext-0.11.1/tests/xgettext-4                                   gettext-0.11.1/tests/xgettext.4
-gettext-0.11.1/tests/xgettext-5                                   gettext-0.11.1/tests/xgettext.5
-gettext-0.11.1/tests/xgettext-6                                   gettext-0.11.1/tests/xgettext.6
-gettext-0.11.1/tests/xgettext-7                                   gettext-0.11.1/tests/xgettext.7
-gettext-0.11.1/tests/xgettext-8                                   gettext-0.11.1/tests/xgettext.8
-gettext-0.11.1/tests/xgettext-9                                   gettext-0.11.1/tests/xgettext.9
-gettext-0.11.1/tests/xgettext-10                                  gettext-0.11.1/tests/xgettext.10
-gettext-0.11.1/tests/xgettext-11                                  gettext-0.11.1/tests/xgettext.11
-gettext-0.11.1/tests/xgettext-12                                  gettext-0.11.1/tests/xgettext.12
-gettext-0.11.1/tests/xgettext-13                                  gettext-0.11.1/tests/xgettext.13
-gettext-0.11.1/tests/xgettext-14                                  gettext-0.11.1/tests/xgettext.14
-gettext-0.11.1/tests/xgettext-15                                  gettext-0.11.1/tests/xgettext.15
-gettext-0.11.1/tests/xgettext-16                                  gettext-0.11.1/tests/xgettext.16
-gettext-0.11.1/tests/xgettext-17                                  gettext-0.11.1/tests/xgettext.17
-gettext-0.11.1/tests/format-c-1                                   gettext-0.11.1/tests/format/c.1
-gettext-0.11.1/tests/format-c-2                                   gettext-0.11.1/tests/format/c.2
-gettext-0.11.1/tests/format-elisp-1                               gettext-0.11.1/tests/format/elisp.1
-gettext-0.11.1/tests/format-elisp-2                               gettext-0.11.1/tests/format/elisp.2
-gettext-0.11.1/tests/format-java-1                                gettext-0.11.1/tests/format/java.1
-gettext-0.11.1/tests/format-java-2                                gettext-0.11.1/tests/format/java.2
-gettext-0.11.1/tests/format-librep-1                              gettext-0.11.1/tests/format/librep.1
-gettext-0.11.1/tests/format-librep-2                              gettext-0.11.1/tests/format/librep.2
-gettext-0.11.1/tests/format-lisp-1                                gettext-0.11.1/tests/format/lisp.1
-gettext-0.11.1/tests/format-lisp-2                                gettext-0.11.1/tests/format/lisp.2
-gettext-0.11.1/tests/format-python-1                              gettext-0.11.1/tests/format/python.1
-gettext-0.11.1/tests/format-python-2                              gettext-0.11.1/tests/format/python.2
-gettext-0.11.1/tests/format-pascal-1                              gettext-0.11.1/tests/format/pascal.1
-gettext-0.11.1/tests/format-pascal-2                              gettext-0.11.1/tests/format/pascal.2
-gettext-0.11.1/tests/format-ycp-1                                 gettext-0.11.1/tests/format/ycp.1
-gettext-0.11.1/tests/format-ycp-2                                 gettext-0.11.1/tests/format/ycp.2
-gettext-0.11.1/tests/plural-1                                     gettext-0.11.1/tests/plural.1
-gettext-0.11.1/tests/plural-2                                     gettext-0.11.1/tests/plural.2
-gettext-0.11.1/tests/lang-c++                                     gettext-0.11.1/tests/lang-cxx
-gettext-0.11.1/tests/rpath-1a                                     gettext-0.11.1/tests/rpath/1a
-gettext-0.11.1/tests/rpath-1b                                     gettext-0.11.1/tests/rpath/1b
-gettext-0.11.1/tests/rpath-2aaa                                   gettext-0.11.1/tests/rpath/2aaa
-gettext-0.11.1/tests/rpath-2aab                                   gettext-0.11.1/tests/rpath/2aab
-gettext-0.11.1/tests/rpath-2aac                                   gettext-0.11.1/tests/rpath/2aac
-gettext-0.11.1/tests/rpath-2aad                                   gettext-0.11.1/tests/rpath/2aad
-gettext-0.11.1/tests/rpath-2aba                                   gettext-0.11.1/tests/rpath/2aba
-gettext-0.11.1/tests/rpath-2abb                                   gettext-0.11.1/tests/rpath/2abb
-gettext-0.11.1/tests/rpath-2abc                                   gettext-0.11.1/tests/rpath/2abc
-gettext-0.11.1/tests/rpath-2abd                                   gettext-0.11.1/tests/rpath/2abd
-gettext-0.11.1/tests/rpath-2baa                                   gettext-0.11.1/tests/rpath/2baa
-gettext-0.11.1/tests/rpath-2bab                                   gettext-0.11.1/tests/rpath/2bab
-gettext-0.11.1/tests/rpath-2bac                                   gettext-0.11.1/tests/rpath/2bac
-gettext-0.11.1/tests/rpath-2bad                                   gettext-0.11.1/tests/rpath/2bad
-gettext-0.11.1/tests/rpath-2bba                                   gettext-0.11.1/tests/rpath/2bba
-gettext-0.11.1/tests/rpath-2bbb                                   gettext-0.11.1/tests/rpath/2bbb
-gettext-0.11.1/tests/rpath-2bbc                                   gettext-0.11.1/tests/rpath/2bbc
-gettext-0.11.1/tests/rpath-2bbd                                   gettext-0.11.1/tests/rpath/2bbd
-gettext-0.11.1/tests/xg-test1.ok.po                               gettext-0.11.1/tests/xg-test1.ok-po
-gettext-0.11.1/tests/rpath-1                                      gettext-0.11.1/tests/rpath/1
-gettext-0.11.1/tests/rpath-2_a                                    gettext-0.11.1/tests/rpath/2_a
-gettext-0.11.1/tests/rpath-2_b                                    gettext-0.11.1/tests/rpath/2_b
-gettext-0.11.1/tests/rpath-2.README                               gettext-0.11.1/tests/rpath/2.README
-gettext-0.11.1/tests/rpathcfg.sh                                  gettext-0.11.1/tests/rpathcfg.sh
+gettext-0.11.3/config.h.in                                        gettext-0.11.3/config.h-in
+gettext-0.11.3/intl/COPYING.LIB-2.0                               gettext-0.11.3/intl/COPYING_LIB.20
+gettext-0.11.3/intl/COPYING.LIB-2.1                               gettext-0.11.3/intl/COPYING_LIB.21
+gettext-0.11.3/doc/gettext_1.html                                 gettext-0.11.3/doc/gettext.1-html
+gettext-0.11.3/doc/gettext_10.html                                gettext-0.11.3/doc/gettext.10-html
+gettext-0.11.3/doc/gettext_11.html                                gettext-0.11.3/doc/gettext.11-html
+gettext-0.11.3/doc/gettext_12.html                                gettext-0.11.3/doc/gettext.12-html
+gettext-0.11.3/doc/gettext_13.html                                gettext-0.11.3/doc/gettext.13-html
+gettext-0.11.3/doc/gettext_14.html                                gettext-0.11.3/doc/gettext.14-html
+gettext-0.11.3/doc/gettext_15.html                                gettext-0.11.3/doc/gettext.15-html
+gettext-0.11.3/doc/gettext_16.html                                gettext-0.11.3/doc/gettext.16-html
+gettext-0.11.3/doc/gettext_2.html                                 gettext-0.11.3/doc/gettext.2-html
+gettext-0.11.3/doc/gettext_3.html                                 gettext-0.11.3/doc/gettext.3-html
+gettext-0.11.3/doc/gettext_4.html                                 gettext-0.11.3/doc/gettext.4-html
+gettext-0.11.3/doc/gettext_5.html                                 gettext-0.11.3/doc/gettext.5-html
+gettext-0.11.3/doc/gettext_6.html                                 gettext-0.11.3/doc/gettext.6-html
+gettext-0.11.3/doc/gettext_7.html                                 gettext-0.11.3/doc/gettext.7-html
+gettext-0.11.3/doc/gettext_8.html                                 gettext-0.11.3/doc/gettext.8-html
+gettext-0.11.3/doc/gettext_9.html                                 gettext-0.11.3/doc/gettext.9-html
+gettext-0.11.3/doc/gettext_foot.html                              gettext-0.11.3/doc/gettext.foot-html
+gettext-0.11.3/doc/gettext_toc.html                               gettext-0.11.3/doc/gettext.toc-html
+gettext-0.11.3/lib/javacomp.sh.in                                 gettext-0.11.3/lib/javacomp.sh-in
+gettext-0.11.3/lib/javaexec.sh.in                                 gettext-0.11.3/lib/javaexec.sh-in
+gettext-0.11.3/lib/stdbool.h.in                                   gettext-0.11.3/lib/stdbool.h-in
+gettext-0.11.3/man/gettext.1.in                                   gettext-0.11.3/man/gettext.1-in
+gettext-0.11.3/man/ngettext.1.in                                  gettext-0.11.3/man/ngettext.1-in
+gettext-0.11.3/man/gettext.3.in                                   gettext-0.11.3/man/gettext.3-in
+gettext-0.11.3/man/ngettext.3.in                                  gettext-0.11.3/man/ngettext.3-in
+gettext-0.11.3/man/textdomain.3.in                                gettext-0.11.3/man/textdomain.3-in
+gettext-0.11.3/man/bindtextdomain.3.in                            gettext-0.11.3/man/bindtextdomain.3-in
+gettext-0.11.3/man/bind_textdomain_codeset.3.in                   gettext-0.11.3/man/bind_textdomain_codeset.3-in
+gettext-0.11.3/man/gettext.1.html.in                              gettext-0.11.3/man/gettext.1hin
+gettext-0.11.3/man/ngettext.1.html.in                             gettext-0.11.3/man/ngettext.1hin
+gettext-0.11.3/man/msgcmp.1.html                                  gettext-0.11.3/man/msgcmp.1-html
+gettext-0.11.3/man/msgfmt.1.html                                  gettext-0.11.3/man/msgfmt.1-html
+gettext-0.11.3/man/msgmerge.1.html                                gettext-0.11.3/man/msgmerge.1-html
+gettext-0.11.3/man/msgunfmt.1.html                                gettext-0.11.3/man/msgunfmt.1-html
+gettext-0.11.3/man/xgettext.1.html                                gettext-0.11.3/man/xgettext.1-html
+gettext-0.11.3/man/msgattrib.1.html                               gettext-0.11.3/man/msgattrib.1-html
+gettext-0.11.3/man/msgcat.1.html                                  gettext-0.11.3/man/msgcat.1-html
+gettext-0.11.3/man/msgcomm.1.html                                 gettext-0.11.3/man/msgcomm.1-html
+gettext-0.11.3/man/msgconv.1.html                                 gettext-0.11.3/man/msgconv.1-html
+gettext-0.11.3/man/msgen.1.html                                   gettext-0.11.3/man/msgen.1-html
+gettext-0.11.3/man/msgexec.1.html                                 gettext-0.11.3/man/msgexec.1-html
+gettext-0.11.3/man/msgfilter.1.html                               gettext-0.11.3/man/msgfilter.1-html
+gettext-0.11.3/man/msggrep.1.html                                 gettext-0.11.3/man/msggrep.1-html
+gettext-0.11.3/man/msginit.1.html                                 gettext-0.11.3/man/msginit.1-html
+gettext-0.11.3/man/msguniq.1.html                                 gettext-0.11.3/man/msguniq.1-html
+gettext-0.11.3/man/gettext.3.html                                 gettext-0.11.3/man/gettext.3-html
+gettext-0.11.3/man/ngettext.3.html                                gettext-0.11.3/man/ngettext.3-html
+gettext-0.11.3/man/textdomain.3.html                              gettext-0.11.3/man/textdomain.3-html
+gettext-0.11.3/man/bindtextdomain.3.html                          gettext-0.11.3/man/bindtextdomain.3-html
+gettext-0.11.3/man/bind_textdomain_codeset.3.html                 gettext-0.11.3/man/bind_textdomain_codeset.3-html
+gettext-0.11.3/po/Makefile.in.in                                  gettext-0.11.3/po/Makefile.in-in
+gettext-0.11.3/src/format-librep.c                                gettext-0.11.3/src/format_librep.c
+gettext-0.11.3/src/format-pascal.c                                gettext-0.11.3/src/format_pascal.c
+gettext-0.11.3/intl-java/javadoc1/images/blue-ball.gif            gettext-0.11.3/intl-java/javadoc1/images/b-ball.gif
+gettext-0.11.3/intl-java/javadoc1/images/cyan-ball.gif            gettext-0.11.3/intl-java/javadoc1/images/c-ball.gif
+gettext-0.11.3/intl-java/javadoc1/images/green-ball.gif           gettext-0.11.3/intl-java/javadoc1/images/g-ball.gif
+gettext-0.11.3/intl-java/javadoc1/images/magenta-ball.gif         gettext-0.11.3/intl-java/javadoc1/images/m-ball.gif
+gettext-0.11.3/intl-java/javadoc1/images/red-ball.gif             gettext-0.11.3/intl-java/javadoc1/images/r-ball.gif
+gettext-0.11.3/intl-java/javadoc1/images/yellow-ball.gif          gettext-0.11.3/intl-java/javadoc1/images/y-ball.gif
+gettext-0.11.3/intl-java/javadoc1/images/constructors.gif         gettext-0.11.3/intl-java/javadoc1/images/ctors.gif
+gettext-0.11.3/intl-java/javadoc1/images/variables.gif            gettext-0.11.3/intl-java/javadoc1/images/vars.gif
+gettext-0.11.3/intl-java/javadoc2/gnu/gettext/package-frame.html  gettext-0.11.3/intl-java/javadoc2/gnu/gettext/package_frame.html
+gettext-0.11.3/intl-java/javadoc2/gnu/gettext/package-tree.html   gettext-0.11.3/intl-java/javadoc2/gnu/gettext/package_tree.html
+gettext-0.11.3/tests/gettext-1                                    gettext-0.11.3/tests/gettext.1
+gettext-0.11.3/tests/gettext-2                                    gettext-0.11.3/tests/gettext.2
+gettext-0.11.3/tests/msgattrib-1                                  gettext-0.11.3/tests/msgattrib.1
+gettext-0.11.3/tests/msgattrib-2                                  gettext-0.11.3/tests/msgattrib.2
+gettext-0.11.3/tests/msgattrib-3                                  gettext-0.11.3/tests/msgattrib.3
+gettext-0.11.3/tests/msgattrib-4                                  gettext-0.11.3/tests/msgattrib.4
+gettext-0.11.3/tests/msgattrib-5                                  gettext-0.11.3/tests/msgattrib.5
+gettext-0.11.3/tests/msgattrib-6                                  gettext-0.11.3/tests/msgattrib.6
+gettext-0.11.3/tests/msgattrib-7                                  gettext-0.11.3/tests/msgattrib.7
+gettext-0.11.3/tests/msgattrib-8                                  gettext-0.11.3/tests/msgattrib.8
+gettext-0.11.3/tests/msgattrib-9                                  gettext-0.11.3/tests/msgattrib.9
+gettext-0.11.3/tests/msgattrib-10                                 gettext-0.11.3/tests/msgattrib.10
+gettext-0.11.3/tests/msgattrib-11                                 gettext-0.11.3/tests/msgattrib.11
+gettext-0.11.3/tests/msgattrib-12                                 gettext-0.11.3/tests/msgattrib.12
+gettext-0.11.3/tests/msgattrib-13                                 gettext-0.11.3/tests/msgattrib.13
+gettext-0.11.3/tests/msgattrib-14                                 gettext-0.11.3/tests/msgattrib.14
+gettext-0.11.3/tests/msgcat-1                                     gettext-0.11.3/tests/msgcat.1
+gettext-0.11.3/tests/msgcat-2                                     gettext-0.11.3/tests/msgcat.2
+gettext-0.11.3/tests/msgcat-3                                     gettext-0.11.3/tests/msgcat.3
+gettext-0.11.3/tests/msgcat-4                                     gettext-0.11.3/tests/msgcat.4
+gettext-0.11.3/tests/msgcat-5                                     gettext-0.11.3/tests/msgcat.5
+gettext-0.11.3/tests/msgcat-6                                     gettext-0.11.3/tests/msgcat.6
+gettext-0.11.3/tests/msgcat-7                                     gettext-0.11.3/tests/msgcat.7
+gettext-0.11.3/tests/msgcmp-1                                     gettext-0.11.3/tests/msgcmp.1
+gettext-0.11.3/tests/msgcmp-2                                     gettext-0.11.3/tests/msgcmp.2
+gettext-0.11.3/tests/msgcomm-1                                    gettext-0.11.3/tests/msgcomm.1
+gettext-0.11.3/tests/msgcomm-2                                    gettext-0.11.3/tests/msgcomm.2
+gettext-0.11.3/tests/msgcomm-3                                    gettext-0.11.3/tests/msgcomm.3
+gettext-0.11.3/tests/msgcomm-4                                    gettext-0.11.3/tests/msgcomm.4
+gettext-0.11.3/tests/msgcomm-5                                    gettext-0.11.3/tests/msgcomm.5
+gettext-0.11.3/tests/msgcomm-6                                    gettext-0.11.3/tests/msgcomm.6
+gettext-0.11.3/tests/msgcomm-7                                    gettext-0.11.3/tests/msgcomm.7
+gettext-0.11.3/tests/msgcomm-8                                    gettext-0.11.3/tests/msgcomm.8
+gettext-0.11.3/tests/msgcomm-9                                    gettext-0.11.3/tests/msgcomm.9
+gettext-0.11.3/tests/msgcomm-10                                   gettext-0.11.3/tests/msgcomm.10
+gettext-0.11.3/tests/msgcomm-11                                   gettext-0.11.3/tests/msgcomm.11
+gettext-0.11.3/tests/msgcomm-12                                   gettext-0.11.3/tests/msgcomm.12
+gettext-0.11.3/tests/msgcomm-13                                   gettext-0.11.3/tests/msgcomm.13
+gettext-0.11.3/tests/msgcomm-14                                   gettext-0.11.3/tests/msgcomm.14
+gettext-0.11.3/tests/msgcomm-15                                   gettext-0.11.3/tests/msgcomm.15
+gettext-0.11.3/tests/msgcomm-16                                   gettext-0.11.3/tests/msgcomm.16
+gettext-0.11.3/tests/msgcomm-17                                   gettext-0.11.3/tests/msgcomm.17
+gettext-0.11.3/tests/msgcomm-18                                   gettext-0.11.3/tests/msgcomm.18
+gettext-0.11.3/tests/msgcomm-19                                   gettext-0.11.3/tests/msgcomm.19
+gettext-0.11.3/tests/msgcomm-20                                   gettext-0.11.3/tests/msgcomm.20
+gettext-0.11.3/tests/msgcomm-21                                   gettext-0.11.3/tests/msgcomm.21
+gettext-0.11.3/tests/msgcomm-22                                   gettext-0.11.3/tests/msgcomm.22
+gettext-0.11.3/tests/msgcomm-23                                   gettext-0.11.3/tests/msgcomm.23
+gettext-0.11.3/tests/msgconv-1                                    gettext-0.11.3/tests/msgconv.1
+gettext-0.11.3/tests/msgconv-2                                    gettext-0.11.3/tests/msgconv.2
+gettext-0.11.3/tests/msgconv-3                                    gettext-0.11.3/tests/msgconv.3
+gettext-0.11.3/tests/msgen-1                                      gettext-0.11.3/tests/msgen.1
+gettext-0.11.3/tests/msgexec-1                                    gettext-0.11.3/tests/msgexec.1
+gettext-0.11.3/tests/msgexec-2                                    gettext-0.11.3/tests/msgexec.2
+gettext-0.11.3/tests/msgfilter-1                                  gettext-0.11.3/tests/msgfilter.1
+gettext-0.11.3/tests/msgfilter-2                                  gettext-0.11.3/tests/msgfilter.2
+gettext-0.11.3/tests/msgfmt-1                                     gettext-0.11.3/tests/msgfmt.1
+gettext-0.11.3/tests/msgfmt-2                                     gettext-0.11.3/tests/msgfmt.2
+gettext-0.11.3/tests/msgfmt-3                                     gettext-0.11.3/tests/msgfmt.3
+gettext-0.11.3/tests/msgfmt-4                                     gettext-0.11.3/tests/msgfmt.4
+gettext-0.11.3/tests/msgfmt-5                                     gettext-0.11.3/tests/msgfmt.5
+gettext-0.11.3/tests/msgfmt-6                                     gettext-0.11.3/tests/msgfmt.6
+gettext-0.11.3/tests/msgfmt-7                                     gettext-0.11.3/tests/msgfmt.7
+gettext-0.11.3/tests/msgfmt-8                                     gettext-0.11.3/tests/msgfmt.8
+gettext-0.11.3/tests/msgfmt-9                                     gettext-0.11.3/tests/msgfmt.9
+gettext-0.11.3/tests/msgfmt-10                                    gettext-0.11.3/tests/msgfmt.10
+gettext-0.11.3/tests/msggrep-1                                    gettext-0.11.3/tests/msggrep.1
+gettext-0.11.3/tests/msggrep-2                                    gettext-0.11.3/tests/msggrep.2
+gettext-0.11.3/tests/msggrep-3                                    gettext-0.11.3/tests/msggrep.3
+gettext-0.11.3/tests/msggrep-4                                    gettext-0.11.3/tests/msggrep.4
+gettext-0.11.3/tests/msgmerge-1                                   gettext-0.11.3/tests/msgmerge.1
+gettext-0.11.3/tests/msgmerge-2                                   gettext-0.11.3/tests/msgmerge.2
+gettext-0.11.3/tests/msgmerge-3                                   gettext-0.11.3/tests/msgmerge.3
+gettext-0.11.3/tests/msgmerge-4                                   gettext-0.11.3/tests/msgmerge.4
+gettext-0.11.3/tests/msgmerge-5                                   gettext-0.11.3/tests/msgmerge.5
+gettext-0.11.3/tests/msgmerge-6                                   gettext-0.11.3/tests/msgmerge.6
+gettext-0.11.3/tests/msgmerge-7                                   gettext-0.11.3/tests/msgmerge.7
+gettext-0.11.3/tests/msgmerge-8                                   gettext-0.11.3/tests/msgmerge.8
+gettext-0.11.3/tests/msgmerge-9                                   gettext-0.11.3/tests/msgmerge.9
+gettext-0.11.3/tests/msgmerge-10                                  gettext-0.11.3/tests/msgmerge.10
+gettext-0.11.3/tests/msgmerge-11                                  gettext-0.11.3/tests/msgmerge.11
+gettext-0.11.3/tests/msgmerge-12                                  gettext-0.11.3/tests/msgmerge.12
+gettext-0.11.3/tests/msgmerge-13                                  gettext-0.11.3/tests/msgmerge.13
+gettext-0.11.3/tests/msgmerge-14                                  gettext-0.11.3/tests/msgmerge.14
+gettext-0.11.3/tests/msgmerge-15                                  gettext-0.11.3/tests/msgmerge.15
+gettext-0.11.3/tests/msgmerge-16                                  gettext-0.11.3/tests/msgmerge.16
+gettext-0.11.3/tests/msgmerge-17                                  gettext-0.11.3/tests/msgmerge.17
+gettext-0.11.3/tests/msgmerge-18                                  gettext-0.11.3/tests/msgmerge.18
+gettext-0.11.3/tests/msgmerge-19                                  gettext-0.11.3/tests/msgmerge.19
+gettext-0.11.3/tests/msgmerge-20                                  gettext-0.11.3/tests/msgmerge.20
+gettext-0.11.3/tests/msgunfmt-1                                   gettext-0.11.3/tests/msgunfmt.1
+gettext-0.11.3/tests/msguniq-1                                    gettext-0.11.3/tests/msguniq.1
+gettext-0.11.3/tests/msguniq-2                                    gettext-0.11.3/tests/msguniq.2
+gettext-0.11.3/tests/msguniq-3                                    gettext-0.11.3/tests/msguniq.3
+gettext-0.11.3/tests/xgettext-1                                   gettext-0.11.3/tests/xgettext.1
+gettext-0.11.3/tests/xgettext-2                                   gettext-0.11.3/tests/xgettext.2
+gettext-0.11.3/tests/xgettext-3                                   gettext-0.11.3/tests/xgettext.3
+gettext-0.11.3/tests/xgettext-4                                   gettext-0.11.3/tests/xgettext.4
+gettext-0.11.3/tests/xgettext-5                                   gettext-0.11.3/tests/xgettext.5
+gettext-0.11.3/tests/xgettext-6                                   gettext-0.11.3/tests/xgettext.6
+gettext-0.11.3/tests/xgettext-7                                   gettext-0.11.3/tests/xgettext.7
+gettext-0.11.3/tests/xgettext-8                                   gettext-0.11.3/tests/xgettext.8
+gettext-0.11.3/tests/xgettext-9                                   gettext-0.11.3/tests/xgettext.9
+gettext-0.11.3/tests/xgettext-10                                  gettext-0.11.3/tests/xgettext.10
+gettext-0.11.3/tests/xgettext-11                                  gettext-0.11.3/tests/xgettext.11
+gettext-0.11.3/tests/xgettext-12                                  gettext-0.11.3/tests/xgettext.12
+gettext-0.11.3/tests/xgettext-13                                  gettext-0.11.3/tests/xgettext.13
+gettext-0.11.3/tests/xgettext-14                                  gettext-0.11.3/tests/xgettext.14
+gettext-0.11.3/tests/xgettext-15                                  gettext-0.11.3/tests/xgettext.15
+gettext-0.11.3/tests/xgettext-16                                  gettext-0.11.3/tests/xgettext.16
+gettext-0.11.3/tests/xgettext-17                                  gettext-0.11.3/tests/xgettext.17
+gettext-0.11.3/tests/format-c-1                                   gettext-0.11.3/tests/format/c.1
+gettext-0.11.3/tests/format-c-2                                   gettext-0.11.3/tests/format/c.2
+gettext-0.11.3/tests/format-elisp-1                               gettext-0.11.3/tests/format/elisp.1
+gettext-0.11.3/tests/format-elisp-2                               gettext-0.11.3/tests/format/elisp.2
+gettext-0.11.3/tests/format-java-1                                gettext-0.11.3/tests/format/java.1
+gettext-0.11.3/tests/format-java-2                                gettext-0.11.3/tests/format/java.2
+gettext-0.11.3/tests/format-librep-1                              gettext-0.11.3/tests/format/librep.1
+gettext-0.11.3/tests/format-librep-2                              gettext-0.11.3/tests/format/librep.2
+gettext-0.11.3/tests/format-lisp-1                                gettext-0.11.3/tests/format/lisp.1
+gettext-0.11.3/tests/format-lisp-2                                gettext-0.11.3/tests/format/lisp.2
+gettext-0.11.3/tests/format-python-1                              gettext-0.11.3/tests/format/python.1
+gettext-0.11.3/tests/format-python-2                              gettext-0.11.3/tests/format/python.2
+gettext-0.11.3/tests/format-pascal-1                              gettext-0.11.3/tests/format/pascal.1
+gettext-0.11.3/tests/format-pascal-2                              gettext-0.11.3/tests/format/pascal.2
+gettext-0.11.3/tests/format-ycp-1                                 gettext-0.11.3/tests/format/ycp.1
+gettext-0.11.3/tests/format-ycp-2                                 gettext-0.11.3/tests/format/ycp.2
+gettext-0.11.3/tests/plural-1                                     gettext-0.11.3/tests/plural.1
+gettext-0.11.3/tests/plural-2                                     gettext-0.11.3/tests/plural.2
+gettext-0.11.3/tests/lang-c++                                     gettext-0.11.3/tests/lang-cxx
+gettext-0.11.3/tests/rpath-1a                                     gettext-0.11.3/tests/rpath/1a
+gettext-0.11.3/tests/rpath-1b                                     gettext-0.11.3/tests/rpath/1b
+gettext-0.11.3/tests/rpath-2aaa                                   gettext-0.11.3/tests/rpath/2aaa
+gettext-0.11.3/tests/rpath-2aab                                   gettext-0.11.3/tests/rpath/2aab
+gettext-0.11.3/tests/rpath-2aac                                   gettext-0.11.3/tests/rpath/2aac
+gettext-0.11.3/tests/rpath-2aad                                   gettext-0.11.3/tests/rpath/2aad
+gettext-0.11.3/tests/rpath-2aba                                   gettext-0.11.3/tests/rpath/2aba
+gettext-0.11.3/tests/rpath-2abb                                   gettext-0.11.3/tests/rpath/2abb
+gettext-0.11.3/tests/rpath-2abc                                   gettext-0.11.3/tests/rpath/2abc
+gettext-0.11.3/tests/rpath-2abd                                   gettext-0.11.3/tests/rpath/2abd
+gettext-0.11.3/tests/rpath-2baa                                   gettext-0.11.3/tests/rpath/2baa
+gettext-0.11.3/tests/rpath-2bab                                   gettext-0.11.3/tests/rpath/2bab
+gettext-0.11.3/tests/rpath-2bac                                   gettext-0.11.3/tests/rpath/2bac
+gettext-0.11.3/tests/rpath-2bad                                   gettext-0.11.3/tests/rpath/2bad
+gettext-0.11.3/tests/rpath-2bba                                   gettext-0.11.3/tests/rpath/2bba
+gettext-0.11.3/tests/rpath-2bbb                                   gettext-0.11.3/tests/rpath/2bbb
+gettext-0.11.3/tests/rpath-2bbc                                   gettext-0.11.3/tests/rpath/2bbc
+gettext-0.11.3/tests/rpath-2bbd                                   gettext-0.11.3/tests/rpath/2bbd
+gettext-0.11.3/tests/xg-test1.ok.po                               gettext-0.11.3/tests/xg-test1.ok-po
+gettext-0.11.3/tests/rpath-1                                      gettext-0.11.3/tests/rpath/1
+gettext-0.11.3/tests/rpath-2_a                                    gettext-0.11.3/tests/rpath/2_a
+gettext-0.11.3/tests/rpath-2_b                                    gettext-0.11.3/tests/rpath/2_b
+gettext-0.11.3/tests/rpath-2.README                               gettext-0.11.3/tests/rpath/2.README
+gettext-0.11.3/tests/rpathcfg.sh                                  gettext-0.11.3/tests/rpathcfg.sh
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 14e46134f..d3bde30ce 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -61,6 +61,7 @@ AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
 BUILDJAVA = @BUILDJAVA@
+BUILDJAVAEXE = @BUILDJAVAEXE@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -75,10 +76,13 @@ ECHO = @ECHO@
 EMACS = @EMACS@
 EXEEXT = @EXEEXT@
 GCC = @GCC@
+GCJ = @GCJ@
+GCJFLAGS = @GCJFLAGS@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 HAVE_GCJ = @HAVE_GCJ@
+HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
 HAVE_GIJ = @HAVE_GIJ@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
@@ -93,6 +97,7 @@ HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
 HAVE_JVIEW = @HAVE_JVIEW@
 HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
 HAVE_LIB = @HAVE_LIB@
+HAVE__BOOL = @HAVE__BOOL@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -166,7 +171,7 @@ gettext_TEXINFOS = \
   xgettext.texi msginit.texi msgmerge.texi msgcat.texi msgconv.texi \
   msggrep.texi msgfilter.texi msguniq.texi msgcomm.texi msgcmp.texi \
   msgattrib.texi msgen.texi msgexec.texi msgfmt.texi msgunfmt.texi \
-  iso-639.texi iso-3166.texi
+  gettextize.texi autopoint.texi iso-639.texi iso-3166.texi
 
 
 EXTRA_DIST = iso-639.sed iso-3166.sed ISO_639 ISO_3166 nls.texi matrix.texi texi2html
diff --git a/doc/gettext.info b/doc/gettext.info
index 20dbbd2b9..73a552f9e 100644
--- a/doc/gettext.info
+++ b/doc/gettext.info
@@ -33,167 +33,186 @@ translation approved by the Foundation.
 
 Indirect:
 gettext.info-1: 1417
-gettext.info-2: 47531
-gettext.info-3: 91847
-gettext.info-4: 138115
-gettext.info-5: 183718
-gettext.info-6: 231593
-gettext.info-7: 278589
-gettext.info-8: 328144
-gettext.info-9: 378100
+gettext.info-2: 49129
+gettext.info-3: 93832
+gettext.info-4: 140348
+gettext.info-5: 185958
+gettext.info-6: 233833
+gettext.info-7: 280883
+gettext.info-8: 330568
+gettext.info-9: 369962
+gettext.info-10: 407152
 
 Tag Table:
 (Indirect)
 Node: Top1417
-Node: Introduction10565
-Node: Why12423
-Ref: Why-Footnote-115530
-Node: Concepts15686
-Node: Aspects19099
-Node: Files24937
-Node: Overview26838
-Node: Basics37632
-Node: Installation38462
-Node: PO Files40404
-Ref: PO Files-Footnote-147404
-Node: Main PO Commands47531
-Node: Entry Positioning52601
-Node: Normalizing58055
-Node: Sources62508
-Node: Triggering63841
-Node: Preparing Strings66872
-Node: Mark Keywords73594
-Node: Marking77149
-Node: c-format84865
-Node: Special cases88767
-Node: Template91495
-Node: xgettext Invocation91847
-Node: Creating98439
-Node: msginit Invocation99330
-Node: Header Entry101196
-Node: Updating107353
-Node: msgmerge Invocation108108
-Node: Translated Entries112206
-Node: Fuzzy Entries113560
-Node: Untranslated Entries116730
-Node: Obsolete Entries118650
-Node: Modifying Translations121863
-Node: Modifying Comments129820
-Node: Subedit134233
-Node: C Sources Context138115
-Node: Auxiliary143218
-Node: Compendium146443
-Node: Creating Compendia147053
-Node: Using Compendia149492
-Node: Manipulating150380
-Node: msgcat Invocation153860
-Node: msgconv Invocation157335
-Node: msggrep Invocation159741
-Node: msgfilter Invocation163668
-Node: msguniq Invocation167762
-Node: msgcomm Invocation170878
-Node: msgcmp Invocation174148
-Node: msgattrib Invocation175378
-Node: msgen Invocation178739
-Node: msgexec Invocation181335
-Node: Binaries183386
-Node: msgfmt Invocation183718
-Node: msgunfmt Invocation189450
-Node: MO Files192377
-Node: Users200468
-Node: Matrix201951
-Node: Installers203155
-Node: End Users204325
-Node: Programmers204974
-Node: catgets206147
-Node: Interface to catgets207550
-Node: Problems with catgets209554
-Node: gettext210455
-Node: Interface to gettext211913
-Node: Ambiguities214252
-Node: Locating Catalogs216945
-Ref: Locating Catalogs-Footnote-1218092
-Ref: Locating Catalogs-Footnote-2218317
-Node: Charset conversion218466
-Node: Plural forms220908
-Ref: Plural forms-Footnote-1231501
-Node: GUI program problems231593
-Node: Optimized gettext236697
-Node: Comparison238030
-Node: Using libintl.a242300
-Node: gettext grok242733
-Node: Temp Programmers245278
-Node: Temp Implementations245718
-Node: Temp catgets247084
-Node: Temp WSI248771
-Node: Temp Notes250759
-Node: Translators251248
-Node: Trans Intro 0251627
-Node: Trans Intro 1254276
-Node: Discussions256140
-Node: Organization259642
-Node: Central Coordination261623
-Node: National Teams262751
-Node: Sub-Cultures265263
-Node: Organizational Ideas266182
-Node: Mailing Lists267185
-Node: Information Flow268988
-Node: Maintainers271121
-Node: Flat and Non-Flat272965
-Node: Prerequisites274448
-Node: gettextize Invocation278589
-Node: Adjusting Files283037
-Node: po/POTFILES.in284641
-Node: po/LINGUAS285886
-Node: po/Makevars286668
-Node: configure.in288254
-Node: config.guess290344
-Node: aclocal291454
-Node: acconfig292979
-Node: Makefile293462
-Node: src/Makefile296040
-Node: lib/gettext.h299023
-Node: autoconf macros301248
-Node: AM_GNU_GETTEXT301728
-Node: AM_ICONV305030
-Node: Programming Languages307216
-Node: Language Implementors308037
-Node: Programmers for other Languages312858
-Node: Translators for other Languages313424
-Node: Maintainers for other Languages313861
-Node: List of Programming Languages315088
-Node: C316211
-Node: sh317192
-Node: bash317818
-Node: Python318503
-Node: Common Lisp319565
-Node: clisp C320279
-Node: Emacs Lisp321001
-Node: librep321707
-Node: Smalltalk322358
-Node: Java323431
-Node: gawk326101
-Node: Pascal326928
-Node: wxWindows328144
-Node: YCP328878
-Node: Tcl329537
-Node: Perl330840
-Node: PHP331458
-Node: Pike332161
-Node: List of Data Formats332787
-Node: POT333246
-Node: RST333490
-Node: Glade333702
-Node: Conclusion333980
-Node: History334480
-Node: References338582
-Node: Language Codes340137
-Node: Country Codes344076
-Node: Program Index349796
-Node: Option Index351097
-Node: Variable Index376998
-Node: PO Mode Index378100
-Node: Autoconf Macro Index387458
-Node: Index387716
+Node: Introduction11759
+Node: Why13617
+Ref: Why-Footnote-116724
+Node: Concepts16880
+Node: Aspects20293
+Node: Files26131
+Node: Overview28032
+Node: Basics38824
+Node: Installation39654
+Node: PO Files41596
+Ref: PO Files-Footnote-149002
+Node: Main PO Commands49129
+Node: Entry Positioning54199
+Node: Normalizing59653
+Node: Sources64106
+Node: Triggering65439
+Node: Preparing Strings68469
+Node: Mark Keywords75191
+Node: Marking78746
+Node: c-format Flag86467
+Node: Special cases90378
+Node: Template93111
+Node: xgettext Invocation93832
+Node: Creating100424
+Node: msginit Invocation101315
+Node: Header Entry103181
+Node: Updating109587
+Node: msgmerge Invocation110342
+Node: Translated Entries114440
+Node: Fuzzy Entries115794
+Node: Untranslated Entries118963
+Node: Obsolete Entries120883
+Node: Modifying Translations124096
+Node: Modifying Comments132053
+Node: Subedit136466
+Node: C Sources Context140348
+Node: Auxiliary145458
+Node: Compendium148683
+Node: Creating Compendia149293
+Node: Using Compendia151732
+Node: Manipulating152620
+Node: msgcat Invocation156100
+Node: msgconv Invocation159575
+Node: msggrep Invocation161981
+Node: msgfilter Invocation165908
+Node: msguniq Invocation170002
+Node: msgcomm Invocation173118
+Node: msgcmp Invocation176388
+Node: msgattrib Invocation177618
+Node: msgen Invocation180979
+Node: msgexec Invocation183575
+Node: Binaries185626
+Node: msgfmt Invocation185958
+Node: msgunfmt Invocation191690
+Node: MO Files194617
+Node: Users202708
+Node: Matrix204191
+Node: Installers205395
+Node: End Users206565
+Node: Programmers207214
+Node: catgets208387
+Node: Interface to catgets209790
+Node: Problems with catgets211794
+Node: gettext212695
+Node: Interface to gettext214153
+Node: Ambiguities216492
+Node: Locating Catalogs219185
+Ref: Locating Catalogs-Footnote-1220332
+Ref: Locating Catalogs-Footnote-2220557
+Node: Charset conversion220706
+Node: Plural forms223148
+Ref: Plural forms-Footnote-1233741
+Node: GUI program problems233833
+Node: Optimized gettext238937
+Node: Comparison240270
+Node: Using libintl.a244540
+Node: gettext grok244973
+Node: Temp Programmers247522
+Node: Temp Implementations247962
+Node: Temp catgets249328
+Node: Temp WSI251015
+Node: Temp Notes253003
+Node: Translators253492
+Node: Trans Intro 0253871
+Node: Trans Intro 1256520
+Node: Discussions258384
+Node: Organization261883
+Node: Central Coordination263864
+Node: National Teams264992
+Node: Sub-Cultures267504
+Node: Organizational Ideas268423
+Node: Mailing Lists269426
+Node: Information Flow271229
+Node: Maintainers273362
+Node: Flat and Non-Flat275259
+Node: Prerequisites276742
+Node: gettextize Invocation280883
+Node: Adjusting Files287586
+Node: po/POTFILES.in289310
+Node: po/LINGUAS290555
+Node: po/Makevars291337
+Node: configure.in292923
+Node: config.guess295013
+Node: mkinstalldirs296129
+Node: aclocal296890
+Node: acconfig298416
+Node: config.h.in298902
+Node: Makefile300059
+Node: src/Makefile302640
+Node: lib/gettext.h305655
+Node: autoconf macros307880
+Node: AM_GNU_GETTEXT308450
+Node: AM_GNU_GETTEXT_VERSION311766
+Node: AM_ICONV312196
+Node: CVS Issues314390
+Node: Distributed CVS314944
+Node: Files under CVS316858
+Node: autopoint Invocation319403
+Node: Programming Languages321195
+Node: Language Implementors322016
+Node: Programmers for other Languages326842
+Node: Translators for other Languages327408
+Node: c-format328445
+Node: python-format328956
+Node: lisp-format329382
+Node: elisp-format329697
+Node: librep-format330176
+Node: smalltalk-format330568
+Node: java-format331057
+Node: awk-format331489
+Node: object-pascal-format331799
+Node: ycp-format332015
+Node: tcl-format332401
+Node: Maintainers for other Languages332663
+Node: List of Programming Languages333890
+Node: C335013
+Node: sh335994
+Node: bash336620
+Node: Python337305
+Node: Common Lisp338367
+Node: clisp C339081
+Node: Emacs Lisp339803
+Node: librep340509
+Node: Smalltalk341160
+Node: Java342233
+Node: gawk344903
+Node: Pascal345730
+Node: wxWindows346946
+Node: YCP347680
+Node: Tcl348339
+Node: Perl349642
+Node: PHP350260
+Node: Pike350963
+Node: List of Data Formats351589
+Node: POT352048
+Node: RST352292
+Node: Glade352504
+Node: Conclusion352782
+Node: History353282
+Node: References357384
+Node: Language Codes358939
+Node: Country Codes362878
+Node: Program Index368598
+Node: Option Index369962
+Node: Variable Index396369
+Node: PO Mode Index397471
+Node: Autoconf Macro Index406829
+Node: Index407152
 
 End Tag Table
diff --git a/doc/gettext.info-1 b/doc/gettext.info-1
index 0c5aa094c..f91d9a2bf 100644
--- a/doc/gettext.info-1
+++ b/doc/gettext.info-1
@@ -36,6 +36,9 @@ File: gettext.info,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
 GNU `gettext' utilities
 ***********************
 
+   This manual document the GNU gettext tools and the GNU libintl
+library, version 0.11.3.
+
 * Menu:
 
 * Introduction::                Introduction
@@ -87,7 +90,7 @@ Preparing Program Sources
 * Preparing Strings::           Preparing Translatable Strings
 * Mark Keywords::               How Marks Appear in Sources
 * Marking::                     Marking Translatable Strings
-* c-format::                    Telling something about the following string
+* c-format Flag::               Telling something about the following string
 * Special cases::               Special Cases of Translatable Strings
 
 Making the PO Template File
@@ -200,6 +203,7 @@ The Maintainer's View
 * gettextize Invocation::       Invoking the `gettextize' Program
 * Adjusting Files::             Files You Must Create or Alter
 * autoconf macros::             Autoconf macros for use in `configure.in'
+* CVS Issues::                  Integrating with CVS
 
 Files You Must Create or Alter
 
@@ -208,8 +212,10 @@ Files You Must Create or Alter
 * po/Makevars::                 `Makefile' pieces in `po/'
 * configure.in::                `configure.in' at top level
 * config.guess::                `config.guess', `config.sub' at top level
+* mkinstalldirs::               `mkinstalldirs' at top level
 * aclocal::                     `aclocal.m4' at top level
 * acconfig::                    `acconfig.h' at top level
+* config.h.in::                 `config.h.in' at top level
 * Makefile::                    `Makefile.in' at top level
 * src/Makefile::                `Makefile.in' in `src/'
 * lib/gettext.h::               `gettext.h' in `lib/'
@@ -217,8 +223,15 @@ Files You Must Create or Alter
 Autoconf macros for use in `configure.in'
 
 * AM_GNU_GETTEXT::              AM_GNU_GETTEXT in `gettext.m4'
+* AM_GNU_GETTEXT_VERSION::      AM_GNU_GETTEXT_VERSION in `gettext.m4'
 * AM_ICONV::                    AM_ICONV in `iconv.m4'
 
+Integrating with CVS
+
+* Distributed CVS::             Avoiding version mismatch in distributed development
+* Files under CVS::             Files to put under CVS version control
+* autopoint Invocation::        Invoking the `autopoint' Program
+
 Other Programming Languages
 
 * Language Implementors::       The Language Implementor's View
@@ -228,6 +241,20 @@ Other Programming Languages
 * List of Programming Languages::  Individual Programming Languages
 * List of Data Formats::        Internationalizable Data
 
+The Translator's View
+
+* c-format::                    C Format Strings
+* python-format::               Python Format Strings
+* lisp-format::                 Lisp Format Strings
+* elisp-format::                Emacs Lisp Format Strings
+* librep-format::               librep Format Strings
+* smalltalk-format::            Smalltalk Format Strings
+* java-format::                 Java Format Strings
+* awk-format::                  awk Format Strings
+* object-pascal-format::        Object Pascal Format Strings
+* ycp-format::                  YCP Format Strings
+* tcl-format::                  Tcl Format Strings
+
 Individual Programming Languages
 
 * C::                           C, C++, Objective C
@@ -633,7 +660,7 @@ editing a PO file, PO mode allows for the easy browsing of auxiliary
 and compendium PO files, as well as for following references into the
 set of C program sources from which PO files have been derived.  It has
 a few special features, among which are the interactive marking of
-program strings as translatable, and the validatation of PO files with
+program strings as translatable, and the validation of PO files with
 easy repositioning to PO file lines showing errors.
 
    As a programmer, the first step to bringing GNU `gettext' into your
@@ -875,6 +902,12 @@ language.  One PO file "entry" has the following schematic structure:
 translator.  When using PO mode, very little has to be known about the
 format details, as PO mode takes care of them for her.
 
+   A simple entry can look like this:
+
+     #: lib/error.c:116
+     msgid "Unknown system error"
+     msgstr "Error desconegut del sistema"
+
    Entries begin with some optional white space.  Usually, when
 generated through GNU `gettext' tools, there is exactly one blank line
 between entries.  Then comments follow, on lines all starting with the
@@ -944,6 +977,15 @@ plural forms.
      ...
      msgstr[N] TRANSLATED-STRING-CASE-N
 
+   Such an entry can look like this:
+
+     #: src/msgcmp.c:338 src/po-lex.c:699
+     #, c-format
+     msgid "found %d fatal error"
+     msgid_plural "found %d fatal errors"
+     msgstr[0] "s'ha trobat %d error fatal"
+     msgstr[1] "s'han trobat %d errors fatals"
+
    It happens that some lines, usually whitespace or comments, follow
 the very last entry of a PO file.  Such lines are not part of any entry,
 and PO mode is unable to take action on those lines.  By using the PO
diff --git a/doc/gettext.info-10 b/doc/gettext.info-10
new file mode 100644
index 000000000..6a2631e6c
--- /dev/null
+++ b/doc/gettext.info-10
@@ -0,0 +1,329 @@
+This is gettext.info, produced by makeinfo version 4.0 from
+gettext.texi.
+
+INFO-DIR-SECTION GNU Gettext Utilities
+START-INFO-DIR-ENTRY
+* Gettext: (gettext).                           GNU gettext utilities.
+* gettextize: (gettext)gettextize Invocation.   Prepare a package for gettext.
+* msgfmt: (gettext)msgfmt Invocation.           Make MO files out of PO files.
+* msgmerge: (gettext)msgmerge Invocation.       Update two PO files into one.
+* xgettext: (gettext)xgettext Invocation.       Extract strings into a PO file.
+END-INFO-DIR-ENTRY
+
+   This file provides documentation for GNU `gettext' utilities.  It
+also serves as a reference for the free Translation Project.
+
+   Copyright (C) 1995, 1996, 1997, 1998, 2001, 2002 Free Software
+Foundation, Inc.
+
+   Permission is granted to make and distribute verbatim copies of this
+manual provided the copyright notice and this permission notice are
+preserved on all copies.
+
+   Permission is granted to copy and distribute modified versions of
+this manual under the conditions for verbatim copying, provided that
+the entire resulting derived work is distributed under the terms of a
+permission notice identical to this one.
+
+   Permission is granted to copy and distribute translations of this
+manual into another language, under the above conditions for modified
+versions, except that this permission notice may be stated in a
+translation approved by the Foundation.
+
+
+File: gettext.info,  Node: Index,  Prev: Autoconf Macro Index,  Up: Top
+
+General Index
+*************
+
+* Menu:
+
+* _, a macro to mark strings for translation: Mark Keywords.
+* _nl_msg_cat_cntr:                      gettext grok.
+* ABOUT-NLS file:                        Matrix.
+* acconfig.h file:                       acconfig.
+* accumulating translations:             Creating Compendia.
+* aclocal.m4 file:                       aclocal.
+* adding keywords, xgettext:             xgettext Invocation.
+* ambiguities:                           Preparing Strings.
+* apply a filter to translations:        msgfilter Invocation.
+* apply command to all translations in a catalog: msgexec Invocation.
+* attribute manipulation:                msgattrib Invocation.
+* attribute, fuzzy:                      Fuzzy Entries.
+* attributes of a PO file entry:         Fuzzy Entries.
+* attributes, manipulating:              Manipulating.
+* autoconf macros for gettext:           autoconf macros.
+* autopoint program, usage:              autopoint Invocation.
+* auxiliary PO file:                     Auxiliary.
+* available translations:                Matrix.
+* awk:                                   gawk.
+* backup old file, and msgmerge program: msgmerge Invocation.
+* bash:                                  bash.
+* bibliography:                          References.
+* big picture:                           Overview.
+* bind_textdomain_codeset:               Charset conversion.
+* bug report address:                    Introduction.
+* C and C-like languages:                C.
+* C trigraphs:                           xgettext Invocation.
+* c-format flag:                         PO Files.
+* c-format, and xgettext:                c-format Flag.
+* catalog encoding and msgexec output:   msgexec Invocation.
+* catclose, a catgets function:          Interface to catgets.
+* catgets, a catgets function:           Interface to catgets.
+* catgets, X/Open specification:         catgets.
+* catopen, a catgets function:           Interface to catgets.
+* character encoding:                    Aspects.
+* charset conversion at runtime:         Charset conversion.
+* charset of PO files:                   Header Entry.
+* check format strings:                  msgfmt Invocation.
+* checking of translations:              Manipulating.
+* clisp:                                 Common Lisp.
+* clisp C sources:                       clisp C.
+* codeset:                               Aspects.
+* comments in PO files:                  PO Files.
+* Common Lisp:                           Common Lisp.
+* compare PO files:                      msgcmp Invocation.
+* comparison of interfaces:              Comparison.
+* compatibility with X/Open msgfmt:      msgfmt Invocation.
+* compendium:                            Compendium.
+* compendium, creating:                  Creating Compendia.
+* concatenate PO files:                  msgcat Invocation.
+* concatenating PO files into a compendium: Creating Compendia.
+* concatenation of strings:              Preparing Strings.
+* config.h.in file:                      config.h.in.
+* convert binary message catalog into PO file: msgunfmt Invocation.
+* convert translations to a different encoding: msgconv Invocation.
+* converting a package to use gettext:   Prerequisites.
+* country codes:                         Country Codes.
+* create new PO file:                    msginit Invocation.
+* creating a new PO file:                Creating.
+* creating compendia:                    Creating Compendia.
+* currency symbols:                      Aspects.
+* date format:                           Aspects.
+* dcngettext:                            Plural forms.
+* debugging messages marked as format strings: xgettext Invocation.
+* dialect:                               Manipulating.
+* disabling NLS:                         lib/gettext.h.
+* dngettext:                             Plural forms.
+* domain ambiguities:                    Ambiguities.
+* duplicate elimination:                 Manipulating.
+* duplicate removal:                     msguniq Invocation.
+* editing comments in PO files:          Modifying Comments.
+* editing translations:                  Modifying Translations.
+* Emacs Lisp:                            Emacs Lisp.
+* encoding:                              Aspects.
+* encoding conversion:                   Manipulating.
+* encoding conversion at runtime:        Charset conversion.
+* encoding for your language:            Header Entry.
+* encoding list:                         Header Entry.
+* encoding of PO files:                  Header Entry.
+* evolution of packages:                 Overview.
+* extracting parts of a PO file into a compendium: Creating Compendia.
+* file format, .mo:                      MO Files.
+* file format, .po:                      PO Files.
+* files, .po and .mo:                    Files.
+* files, .pot:                           Overview.
+* filter messages according to attributes: msgattrib Invocation.
+* find common messages:                  msgcomm Invocation.
+* force use of fuzzy entries:            msgfmt Invocation.
+* format strings:                        c-format Flag.
+* Free Pascal:                           Pascal.
+* fuzzy entries:                         Fuzzy Entries.
+* fuzzy flag:                            PO Files.
+* gawk:                                  gawk.
+* generate binary message catalog from PO file: msgfmt Invocation.
+* generate translation catalog in English: msgen Invocation.
+* gettext files:                         Adjusting Files.
+* gettext installation:                  Installation.
+* gettext interface:                     Interface to gettext.
+* gettext vs catgets:                    Comparison.
+* gettext, a programmer's view:          gettext.
+* gettext.h file:                        lib/gettext.h.
+* gettextize program, usage:             gettextize Invocation.
+* GUI programs:                          GUI program problems.
+* hash table, inside MO files:           MO Files.
+* he, she, and they:                     Introduction.
+* header entry of a PO file:             Header Entry.
+* help option:                           Preparing Strings.
+* history of GNU gettext:                History.
+* i18n:                                  Concepts.
+* importing PO files:                    Normalizing.
+* include file libintl.h <1>:            lib/gettext.h.
+* include file libintl.h <2>:            Comparison.
+* include file libintl.h <3>:            Sources.
+* include file libintl.h:                Overview.
+* initialization:                        Triggering.
+* initialize new PO file:                msginit Invocation.
+* initialize translations from a compendium: Using Compendia.
+* installing gettext:                    Installation.
+* interface to catgets:                  Interface to catgets.
+* internationalization:                  Concepts.
+* inttypes.h:                            Preparing Strings.
+* ISO 3166:                              Country Codes.
+* ISO 639:                               Language Codes.
+* Java:                                  Java.
+* Java mode, and msgfmt program:         msgfmt Invocation.
+* Java mode, and msgunfmt program:       msgunfmt Invocation.
+* Java, string concatenation:            Preparing Strings.
+* keyboard accelerator checking:         msgfmt Invocation.
+* l10n:                                  Concepts.
+* language codes:                        Language Codes.
+* language selection:                    End Users.
+* language selection at runtime:         gettext grok.
+* large package:                         Ambiguities.
+* libiconv library:                      AM_ICONV.
+* libintl for Java:                      Java.
+* libintl library:                       AM_GNU_GETTEXT.
+* librep Lisp:                           librep.
+* LINGUAS file:                          po/LINGUAS.
+* link with libintl:                     Overview.
+* Linux <1>:                             Header Entry.
+* Linux <2>:                             Overview.
+* Linux:                                 Aspects.
+* Lisp:                                  Common Lisp.
+* list of translation teams, where to find: Header Entry.
+* locale facet, LC_ALL:                  Triggering.
+* locale facet, LC_COLLATE:              Triggering.
+* locale facet, LC_CTYPE <1>:            Triggering.
+* locale facet, LC_CTYPE:                Aspects.
+* locale facet, LC_MESSAGES <1>:         Triggering.
+* locale facet, LC_MESSAGES:             Aspects.
+* locale facet, LC_MONETARY <1>:         Triggering.
+* locale facet, LC_MONETARY:             Aspects.
+* locale facet, LC_NUMERIC <1>:          Triggering.
+* locale facet, LC_NUMERIC:              Aspects.
+* locale facet, LC_RESPONSES:            Triggering.
+* locale facet, LC_TIME <1>:             Triggering.
+* locale facet, LC_TIME:                 Aspects.
+* locale facets:                         Aspects.
+* locale program:                        Header Entry.
+* localization:                          Concepts.
+* magic signature of MO files:           MO Files.
+* Makevars file:                         po/Makevars.
+* manipulating PO files:                 Manipulating.
+* marking string initializers:           Special cases.
+* marking strings that require translation: Mark Keywords.
+* marking strings, preparations:         Preparing Strings.
+* marking translatable strings:          Overview.
+* menu entries:                          GUI program problems.
+* menu, keyboard accelerator support:    msgfmt Invocation.
+* merge PO files:                        msgcat Invocation.
+* merging two PO files:                  Manipulating.
+* message catalog files location:        Locating Catalogs.
+* messages:                              Aspects.
+* migration from earlier versions of gettext: Prerequisites.
+* mkinstalldirs file:                    mkinstalldirs.
+* mnemonics of menu entries:             msgfmt Invocation.
+* MO file's format:                      MO Files.
+* modify message attrributes:            msgattrib Invocation.
+* msgattrib program, usage:              msgattrib Invocation.
+* msgcat program, usage:                 msgcat Invocation.
+* msgcmp program, usage:                 msgcmp Invocation.
+* msgcomm program, usage:                msgcomm Invocation.
+* msgconv program, usage:                msgconv Invocation.
+* msgen program, usage:                  msgen Invocation.
+* msgexec program, usage:                msgexec Invocation.
+* msgfilter filter and catalog encoding: msgfilter Invocation.
+* msgfilter program, usage:              msgfilter Invocation.
+* msgfmt program, usage:                 msgfmt Invocation.
+* msggrep program, usage:                msggrep Invocation.
+* msgid:                                 PO Files.
+* msgid_plural:                          PO Files.
+* msginit program, usage:                msginit Invocation.
+* msgmerge program, usage:               msgmerge Invocation.
+* msgstr:                                PO Files.
+* msgunfmt program, usage:               msgunfmt Invocation.
+* msguniq program, usage:                msguniq Invocation.
+* multi-line strings:                    Normalizing.
+* N_, a convenience macro:               Comparison.
+* Native Language Support:               Concepts.
+* Natural Language Support:              Concepts.
+* newlines in PO files:                  PO Files.
+* ngettext:                              Plural forms.
+* NLS:                                   Concepts.
+* no-c-format flag:                      PO Files.
+* no-c-format, and xgettext:             c-format Flag.
+* nplurals, in a PO file header:         Plural forms.
+* number format:                         Aspects.
+* Object Pascal:                         Pascal.
+* obsolete entries:                      Obsolete Entries.
+* optimization of gettext functions:     Optimized gettext.
+* orthography:                           Manipulating.
+* output to stdout, xgettext:            xgettext Invocation.
+* overview of gettext:                   Overview.
+* package and version declaration in configure.in: configure.in.
+* package build and installation options: Installers.
+* package maintainer's view of gettext:  Maintainers.
+* paragraphs:                            Preparing Strings.
+* Pascal:                                Pascal.
+* Perl:                                  Perl.
+* PHP:                                   PHP.
+* Pike:                                  Pike.
+* plural form formulas:                  Plural forms.
+* plural forms:                          Plural forms.
+* plural forms, in MO files:             MO Files.
+* plural forms, in PO files:             PO Files.
+* plural, in a PO file header:           Plural forms.
+* PO files' format:                      PO Files.
+* PO mode (Emacs) commands:              Main PO Commands.
+* PO template file:                      Template.
+* portability problems with sed:         msgfilter Invocation.
+* POTFILES.in file:                      po/POTFILES.in.
+* preparing programs for translation:    Sources.
+* problems with catgets interface:       Problems with catgets.
+* programming languages:                 Language Implementors.
+* Python:                                Python.
+* quotation marks <1>:                   po/Makevars.
+* quotation marks:                       Header Entry.
+* quote characters, use in PO files:     Header Entry.
+* related reading:                       References.
+* RST:                                   RST.
+* scripting languages:                   Language Implementors.
+* search messages in a catalog:          msggrep Invocation.
+* selecting message language:            End Users.
+* sentences:                             Preparing Strings.
+* setting up gettext at build time:      Installers.
+* setting up gettext at run time:        End Users.
+* several domains:                       Ambiguities.
+* sex:                                   Introduction.
+* sgettext:                              GUI program problems.
+* she, he, and they:                     Introduction.
+* shell scripts:                         sh.
+* Smalltalk:                             Smalltalk.
+* sorting msgcat output:                 msgcat Invocation.
+* sorting msgmerge output:               msgmerge Invocation.
+* sorting msgunfmt output:               msgunfmt Invocation.
+* sorting output of xgettext:            xgettext Invocation.
+* specifying plural form in a PO file:   Plural forms.
+* standard output, and msgcat:           msgcat Invocation.
+* standard output, and msgmerge program: msgmerge Invocation.
+* string concatenation:                  Preparing Strings.
+* string normalization in entries:       Normalizing.
+* style:                                 Preparing Strings.
+* supported languages, xgettext:         xgettext Invocation.
+* Tcl:                                   Tcl.
+* Tcl mode, and msgfmt program:          msgfmt Invocation.
+* Tcl mode, and msgunfmt program:        msgunfmt Invocation.
+* template PO file:                      Overview.
+* testing .po files for equivalence:     xgettext Invocation.
+* Tk's scripting language:               Tcl.
+* translated entries:                    Translated Entries.
+* translating menu entries:              GUI program problems.
+* translation aspects:                   Aspects.
+* Translation Matrix:                    Matrix.
+* Translation Project:                   Why.
+* turning off NLS support:               lib/gettext.h.
+* tutorial of gettext usage:             Overview.
+* unify duplicate translations:          msguniq Invocation.
+* untranslated entries:                  Untranslated Entries.
+* update translations from a compendium: Using Compendia.
+* upgrading to new versions of gettext:  Prerequisites.
+* version control for backup files, msgmerge: msgmerge Invocation.
+* wxWindows library:                     wxWindows.
+* xargs, and output from msgexec:        msgexec Invocation.
+* xgettext program, usage:               xgettext Invocation.
+* xmodmap program, and typing quotation marks: Header Entry.
+* YaST2 scripting language:              YCP.
+* YCP:                                   YCP.
+
+
diff --git a/doc/gettext.info-2 b/doc/gettext.info-2
index 1c4c89379..a914d469e 100644
--- a/doc/gettext.info-2
+++ b/doc/gettext.info-2
@@ -377,7 +377,7 @@ sections of this chapter.
 * Preparing Strings::           Preparing Translatable Strings
 * Mark Keywords::               How Marks Appear in Sources
 * Marking::                     Marking Translatable Strings
-* c-format::                    Telling something about the following string
+* c-format Flag::               Telling something about the following string
 * Special cases::               Special Cases of Translatable Strings
 
 
@@ -421,7 +421,7 @@ the `"C"' locale format.  In some situation, it might also be a problem
 with the notation itself which makes it impossible to recognize whether
 the number is in the `"C"' locale or the local format.  This can happen
 if thousands separator characters are used.  Some locales define this
-character accordfing to the national conventions to `'.'' which is the
+character according to the national conventions to `'.'' which is the
 same character used in the `"C"' locale to denote the decimal point.
 
    So it is sometimes necessary to replace the `LC_ALL' line in the
@@ -688,7 +688,7 @@ think it should be translated.  `"%s: %d"' is an example of string
 _not_ requiring translation!
 
 
-File: gettext.info,  Node: Marking,  Next: c-format,  Prev: Mark Keywords,  Up: Sources
+File: gettext.info,  Node: Marking,  Next: c-format Flag,  Prev: Mark Keywords,  Up: Sources
 
 Marking Translatable Strings
 ============================
@@ -832,7 +832,7 @@ the `M-.' command.  In fact, this is not useful to prefer `_', as this
 one is already built in the `M-,' command.
 
 
-File: gettext.info,  Node: c-format,  Next: Special cases,  Prev: Marking,  Up: Sources
+File: gettext.info,  Node: c-format Flag,  Next: Special cases,  Prev: Marking,  Up: Sources
 
 Special Comments preceding Keywords
 ===================================
@@ -881,14 +881,14 @@ only a heuristic.  In the `.po' file the entry is marked using the
 
    The careful reader now might say that this again can cause problems.
 The heuristic might guess it wrong.  This is true and therefore
-`xgettext' knows about special kind of comment which lets the
-programmer take over the decision.  If in the same line or the
-immediately preceding line of the `gettext' keyword the `xgettext'
-program find a comment containing the words `xgettext:c-format' it will
-mark the string in any case with the `c-format' flag.  This kind of
-comment should be used when `xgettext' does not recognize the string as
-a format string but is really is one and it should be tested.  Please
-note that when the comment is in the same line of the `gettext'
+`xgettext' knows about a special kind of comment which lets the
+programmer take over the decision.  If in the same line as or the
+immediately preceding line to the `gettext' keyword the `xgettext'
+program finds a comment containing the words `xgettext:c-format', it
+will mark the string in any case with the `c-format' flag.  This kind
+of comment should be used when `xgettext' does not recognize the string
+as a format string but it really is one and it should be tested.
+Please note that when the comment is in the same line as the `gettext'
 keyword, it must be before the string to be translated.
 
    This situation happens quite often.  The `printf' function is often
@@ -896,8 +896,8 @@ called with strings which do not contain a format specifier.  Of course
 one would normally use `fputs' but it does happen.  In this case
 `xgettext' does not recognize this as a format string but what happens
 if the translation introduces a valid format specifier?  The `printf'
-function will try to access one of the parameter but none exists
-because the original code does not refer to any parameter.
+function will try to access one of the parameters but none exists
+because the original code does not pass any parameters.
 
    `xgettext' of course could make a wrong decision the other way
 round, i.e. a string marked as a format string actually is not a format
@@ -912,7 +912,7 @@ xgettext Invocation:: to see how the `--debug' option can be used for
 solving this problem.
 
 
-File: gettext.info,  Node: Special cases,  Prev: c-format,  Up: Sources
+File: gettext.info,  Node: Special cases,  Prev: c-format Flag,  Up: Sources
 
 Special Cases of Translatable Strings
 =====================================
@@ -1003,6 +1003,13 @@ Making the PO Template File
    After preparing the sources, the programmer creates a PO template
 file.  This section explains how to use `xgettext' for this purpose.
 
+   `xgettext' creates a file named `DOMAINNAME.po'.  You should then
+rename it to `DOMAINNAME.pot'.  (Why doesn't `xgettext' create it under
+the name `DOMAINNAME.pot' right away?  The answer is: for historical
+reasons.  When `xgettext' was specified, the distinction between a PO
+file and PO file template was fuzzy, and the suffix `.pot' wasn't in
+use at that time.)
+
 * Menu:
 
 * xgettext Invocation::         Invoking the `xgettext' Program
diff --git a/doc/gettext.info-3 b/doc/gettext.info-3
index 52c95e8b2..1f76e5249 100644
--- a/doc/gettext.info-3
+++ b/doc/gettext.info-3
@@ -409,23 +409,24 @@ Content-Type
      GNU `libc' and GNU `libiconv'. These are: `ASCII', `ISO-8859-1',
      `ISO-8859-2', `ISO-8859-3', `ISO-8859-4', `ISO-8859-5',
      `ISO-8859-6', `ISO-8859-7', `ISO-8859-8', `ISO-8859-9',
-     `ISO-8859-13', `ISO-8859-15', `KOI8-R', `KOI8-U', `CP850',
-     `CP866', `CP874', `CP932', `CP949', `CP950', `CP1250', `CP1251',
-     `CP1252', `CP1253', `CP1254', `CP1255', `CP1256', `CP1257',
-     `GB2312', `EUC-JP', `EUC-KR', `EUC-TW', `BIG5', `BIG5-HKSCS',
-     `GBK', `GB18030', `SHIFT_JIS', `JOHAB', `TIS-620', `VISCII',
-     `UTF-8'.
+     `ISO-8859-13', `ISO-8859-14', `ISO-8859-15', `KOI8-R', `KOI8-U',
+     `KOI8-T', `CP850', `CP866', `CP874', `CP932', `CP949', `CP950',
+     `CP1250', `CP1251', `CP1252', `CP1253', `CP1254', `CP1255',
+     `CP1256', `CP1257', `GB2312', `EUC-JP', `EUC-KR', `EUC-TW',
+     `BIG5', `BIG5-HKSCS', `GBK', `GB18030', `SHIFT_JIS', `JOHAB',
+     `TIS-620', `VISCII', `GEORGIAN-PS', `UTF-8'.
 
      In the GNU system, the following encodings are frequently used for
      the corresponding languages.
 
-        * `ISO-8859-1' for  Afrikaans, Albanian, Basque, Catalan,
-          Dutch, English, Estonian, Faroese,  Finnish, French,
-          Galician, German, Greenlandic, Icelandic, Indonesian,  Irish,
-          Italian, Malay, Norwegian, Portuguese, Spanish, Swedish,
+        * `ISO-8859-1' for  Afrikaans, Albanian, Basque, Breton,
+          Catalan, Cornish, Danish, Dutch,  English, Estonian, Faroese,
+          Finnish, French, Galician, German,  Greenlandic, Icelandic,
+          Indonesian, Irish, Italian, Malay, Manx,  Norwegian, Occitan,
+          Portuguese, Spanish, Swedish, Tagalog, Uzbek,  Walloon,
 
-        * `ISO-8859-2' for  Croatian, Czech, Hungarian, Polish,
-          Romanian, Serbian, Slovak, Slovenian,
+        * `ISO-8859-2' for  Bosnian, Croatian, Czech, Hungarian,
+          Polish, Romanian, Serbian, Slovak,  Slovenian,
 
         * `ISO-8859-3' for Maltese,
 
@@ -439,16 +440,20 @@ Content-Type
 
         * `ISO-8859-9' for Turkish,
 
-        * `ISO-8859-13' for Latvian, Lithuanian,
+        * `ISO-8859-13' for Latvian, Lithuanian, Maori,
+
+        * `ISO-8859-14' for Welsh,
 
         * `ISO-8859-15' for  Basque, Catalan, Dutch, English, Finnish,
           French, Galician, German, Irish,  Italian, Portuguese,
-          Spanish, Swedish,
+          Spanish, Swedish, Walloon,
 
         * `KOI8-R' for Russian,
 
         * `KOI8-U' for Ukrainian,
 
+        * `KOI8-T' for Tajik,
+
         * `CP1251' for Bulgarian, Byelorussian,
 
         * `GB2312', `GBK', `GB18030'  for simplified writing of Chinese,
@@ -461,6 +466,8 @@ Content-Type
 
         * `TIS-620' for Thai,
 
+        * `GEORGIAN-PS' for Georgian,
+
         * `UTF-8' for any language, including those listed above.
 
      When single quote characters or double quote characters are used in
@@ -719,7 +726,7 @@ Fuzzy Entries
 =============
 
    Each PO file entry may have a set of "attributes", which are
-qualities given a name and explicitely associated with the translation,
+qualities given a name and explicitly associated with the translation,
 using a special system comment.  One of these attributes has the name
 `fuzzy', and entries having this attribute are said to have a fuzzy
 translation.  They are called fuzzy entries, for short.
diff --git a/doc/gettext.info-4 b/doc/gettext.info-4
index 220bcc6b5..2aa52d8a2 100644
--- a/doc/gettext.info-4
+++ b/doc/gettext.info-4
@@ -36,7 +36,7 @@ File: gettext.info,  Node: C Sources Context,  Next: Auxiliary,  Prev: Subedit,
 C Sources Context
 =================
 
-   PO mode is particularily powerful when used with PO files created
+   PO mode is particularly powerful when used with PO files created
 through GNU `gettext' utilities, as those utilities insert special
 comments in the PO files they generate.  Some of these special comments
 relate the PO file entry to exactly where the untranslated string
@@ -45,9 +45,9 @@ appears in the program sources.
    When the translator gets to an untranslated entry, she is fairly
 often faced with an original string which is not as informative as it
 normally should be, being succinct, cryptic, or otherwise ambiguous.
-Before chosing how to translate the string, she needs to understand
+Before choosing how to translate the string, she needs to understand
 better what the string really means and how tight the translation has
-to be.  Most of times, when problems arise, the only way left to make
+to be.  Most of the time, when problems arise, the only way left to make
 her judgment is looking at the true program sources from where this
 string originated, searching for surrounding comments the programmer
 might have put in there, and looking around for helping clues of _any_
@@ -60,8 +60,8 @@ should not be shy at taking a look, once in a while.  It is most
 probable that she will still be able to find some of the hints she
 needs.  She will learn quickly to not feel uncomfortable in program
 code, paying more attention to programmer's comments, variable and
-function names (if he dared chosing them well), and overall
-organization, than to programmation itself.
+function names (if he dared choosing them well), and overall
+organization, than to the program code itself.
 
    The following commands are meant to help the translator at getting
 program source context for a PO file entry.
diff --git a/doc/gettext.info-6 b/doc/gettext.info-6
index 946f79b3d..73dfa7a5a 100644
--- a/doc/gettext.info-6
+++ b/doc/gettext.info-6
@@ -328,11 +328,11 @@ is a list comments:
      Afterwards the path is constructed using the found value and the
      translation file is loaded if available.
 
-     What is now when the value for, say, `LANGUAGE' changes.  According
-     to the process explained above the new value of this variable is
-     found as soon as the `dcgettext' function is called.  But this
-     also means the (perhaps) different message catalog file is loaded.
-     In other words: the used language is changed.
+     What happens now when the value for, say, `LANGUAGE' changes?
+     According to the process explained above the new value of this
+     variable is found as soon as the `dcgettext' function is called.
+     But this also means the (perhaps) different message catalog file
+     is loaded.  In other words: the used language is changed.
 
      But there is one little hook.  The code for gcc-2.7.0 and up
      provides some optimization.  This optimization normally prevents
@@ -615,7 +615,7 @@ concerns.  Some of these doubts are presented and discussed, here.
      be very motivated at providing to themselves the pleasure of
      having their beloved free software speaking their mother tongue.
      They do themselves a personal favor, and do not pay that much
-     attention to the number of people beneficiating of their work.
+     attention to the number of people benefiting of their work.
 
    * Misinterpretation
 
@@ -956,6 +956,7 @@ ideally revise this chapter in subsequent releases, looking for changes.
 * gettextize Invocation::       Invoking the `gettextize' Program
 * Adjusting Files::             Files You Must Create or Alter
 * autoconf macros::             Autoconf macros for use in `configure.in'
+* CVS Issues::                  Integrating with CVS
 
 
 File: gettext.info,  Node: Flat and Non-Flat,  Next: Prerequisites,  Prev: Maintainers,  Up: Maintainers
diff --git a/doc/gettext.info-7 b/doc/gettext.info-7
index 38e7987f8..60103d8c9 100644
--- a/doc/gettext.info-7
+++ b/doc/gettext.info-7
@@ -36,10 +36,33 @@ File: gettext.info,  Node: gettextize Invocation,  Next: Adjusting Files,  Prev:
 Invoking the `gettextize' Program
 =================================
 
-   Some files are consistently and identically needed in every package
-internationalized through GNU `gettext'.  As a matter of convenience,
-the `gettextize' program puts all these files right in your package.
-This program has the following synopsis:
+   The `gettextize' program is an interactive tool that helps the
+maintainer of a package internationalized through GNU `gettext'.  It is
+used for two purposes:
+
+   * As a wizard, when a package is modified to use GNU `gettext' for
+     the first time.
+
+   * As a migration tool, for upgrading the GNU `gettext' support in a
+     package from a previous to a newer version of GNU `gettext'.
+
+   This program performs the following tasks:
+
+   * It copies into the package some files that are consistently and
+     identically needed in every package internationalized through GNU
+     `gettext'.
+
+   * It performs as many of the tasks mentioned in the next section
+     *Note Adjusting Files:: as can be performed automatically.
+
+   * It removes obsolete files and idioms used for previous GNU
+     `gettext' versions to the form recommended for the current GNU
+     `gettext' version.
+
+   * It prints a summary of the tasks that ought to be done manually
+     and could not be done automatically by `gettextize'.
+
+   It can be invoked as follows:
 
      gettextize [ OPTION... ] [ DIRECTORY ]
 
@@ -67,9 +90,15 @@ and accepts the following options:
 
 `--no-changelog'
      Don't update or create ChangeLog files.  By default, `gettextize'
-     logs all changes (file additions, modifications ans removals) in a
+     logs all changes (file additions, modifications and removals) in a
      file called `ChangeLog' in each affected directory.
 
+`-n'
+`--dry-run'
+     Print modifications but don't perform them.  All actions that
+     `gettextize' would normally execute are inhibited and instead only
+     listed on standard output.
+
 `--help'
      Display this help and exit.
 
@@ -95,7 +124,7 @@ specified.
 
   2. A `po/' directory is created for eventually holding all
      translation files, but initially only containing the file
-     `po/Makefile.in.in' from the GNU `gettext' distribution.  (beware
+     `po/Makefile.in.in' from the GNU `gettext' distribution (beware
      the double `.in' in the file name) and a few auxiliary files. If
      the `po/' directory already exists, it will be preserved along
      with the files it contains, and only `Makefile.in.in' and the
@@ -107,10 +136,13 @@ specified.
      option `--force' (`-f') is given, the `intl/' directory is emptied
      first.
 
-  4. The `config.rpath' file is copied into the directory containing
-     configuration support files. It is needed by the `AM_GNU_GETTEXT'
-     autoconf macro.
+  4. The files `config.rpath' and `mkinstalldirs' are copied into the
+     directory containing configuration support files. It is needed by
+     the `AM_GNU_GETTEXT' autoconf macro.
 
+  5. Only if the project is using GNU `automake': A set of `autoconf'
+     macro files is copied into the package's `autoconf' macro
+     repository, usually in a directory called `m4/'.
 
    If your site support symbolic links, `gettextize' will not actually
 copy the files into your package, but establish symbolic links instead.
@@ -120,14 +152,35 @@ distribution will resolve each link by an actual copy in the
 distribution archive.  So, to insist, you really should use `-h' option
 with `tar' within your `dist' goal of your main `Makefile.in'.
 
+   Furthermore, `gettextize' will update all `Makefile.am' files in
+each affected directory, as well as the top level `configure.in' or
+`configure.ac' file.
+
    It is interesting to understand that most new files for supporting
-GNU `gettext' facilities in one package go in `intl/' and `po/'
-subdirectories.  One distinction between these two directories is that
-`intl/' is meant to be completely identical in all packages using GNU
-`gettext', while all newly created files, which have to be different,
-go into `po/'.  There is a common `Makefile.in.in' in `po/', because
-the `po/' directory needs its own `Makefile', and it has been designed
-so it can be identical in all packages.
+GNU `gettext' facilities in one package go in `intl/', `po/' and `m4/'
+subdirectories.  One distinction between `intl/' and the two other
+directories is that `intl/' is meant to be completely identical in all
+packages using GNU `gettext', while the other directories will mostly
+contain package dependent files.
+
+   The `gettextize' program makes backup files for all files it
+replaces or changes, and also write ChangeLog entries about these
+changes.  This way, the careful maintainer can check after running
+`gettextize' whether its changes are acceptable to him, and possibly
+adjust them.  An exception to this rule is the `intl/' directory, which
+is added or replaced or removed as a whole.
+
+   It is important to understand that `gettextize' can not do the
+entire job of adapting a package for using GNU `gettext'.  The amount
+of remaining work depends on whether the package uses GNU `automake' or
+not.  But in any case, the maintainer should still read the section
+*Note Adjusting Files:: after invoking `gettextize'.
+
+   It is also important to understand that `gettextize' is not part of
+the GNU build system, in the sense that it should not be invoked
+automatically, and not be invoked by someone who doesn't assume the
+responsibilities of a package maintainer.  For the latter purpose, a
+separate tool is provided, see *Note autopoint Invocation::.
 
 
 File: gettext.info,  Node: Adjusting Files,  Next: autoconf macros,  Prev: gettextize Invocation,  Up: Maintainers
@@ -144,7 +197,7 @@ each.
 
    So, here comes a list of files, each one followed by a description of
 all alterations it needs.  Many examples are taken out from the GNU
-`gettext' 0.11.2 distribution itself, or from the GNU `hello'
+`gettext' 0.11.3 distribution itself, or from the GNU `hello'
 distribution (`http://www.franken.de/users/gnu/ke/hello' or
 `http://www.gnu.franken.de/ke/hello/')  You may indeed refer to the
 source code of the GNU `gettext' and GNU `hello' packages, as they are
@@ -157,8 +210,10 @@ intended to be good examples for using GNU gettext functionality.
 * po/Makevars::                 `Makefile' pieces in `po/'
 * configure.in::                `configure.in' at top level
 * config.guess::                `config.guess', `config.sub' at top level
+* mkinstalldirs::               `mkinstalldirs' at top level
 * aclocal::                     `aclocal.m4' at top level
 * acconfig::                    `acconfig.h' at top level
+* config.h.in::                 `config.h.in' at top level
 * Makefile::                    `Makefile.in' at top level
 * src/Makefile::                `Makefile.in' in `src/'
 * lib/gettext.h::               `gettext.h' in `lib/'
@@ -262,7 +317,7 @@ File: gettext.info,  Node: configure.in,  Next: config.guess,  Prev: po/Makevars
      This is done by a set of lines like these:
 
           PACKAGE=gettext
-          VERSION=0.11.2
+          VERSION=0.11.3
           AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
           AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
           AC_SUBST(PACKAGE)
@@ -270,12 +325,12 @@ File: gettext.info,  Node: configure.in,  Next: config.guess,  Prev: po/Makevars
 
      or, if you are using GNU `automake', by a line like this:
 
-          AM_INIT_AUTOMAKE(gettext, 0.11.2)
+          AM_INIT_AUTOMAKE(gettext, 0.11.3)
 
      Of course, you replace `gettext' with the name of your package,
-     and `0.11.2' by its version numbers, exactly as they should appear
+     and `0.11.3' by its version numbers, exactly as they should appear
      in the packaged `tar' file name of your distribution
-     (`gettext-0.11.2.tar.gz', here).
+     (`gettext-0.11.3.tar.gz', here).
 
   2. Check for internationalization support.
 
@@ -311,7 +366,7 @@ File: gettext.info,  Node: configure.in,  Next: config.guess,  Prev: po/Makevars
 
 
 
-File: gettext.info,  Node: config.guess,  Next: aclocal,  Prev: configure.in,  Up: Adjusting Files
+File: gettext.info,  Node: config.guess,  Next: mkinstalldirs,  Prev: configure.in,  Up: Adjusting Files
 
 `config.guess', `config.sub' at top level
 -----------------------------------------
@@ -336,7 +391,26 @@ following line to your `configure.in'.
      AC_CONFIG_AUX_DIR([SUBDIR])
 
 
-File: gettext.info,  Node: aclocal,  Next: acconfig,  Prev: config.guess,  Up: Adjusting Files
+File: gettext.info,  Node: mkinstalldirs,  Next: aclocal,  Prev: config.guess,  Up: Adjusting Files
+
+`mkinstalldirs' at top level
+----------------------------
+
+   If `gettextize' has not already done it, you need to add the GNU
+`mkinstalldirs' script to your distribution.  It is needed because
+`mkdir -p' is not portable enough.  You find this script in the GNU
+`automake' distribution.
+
+   Normally, `mkinstalldirs' is put at the top level of a distribution.
+But it is also possible to put it in a subdirectory, altogether with
+other configuration support files like `install-sh', `ltconfig',
+`ltmain.sh' or `missing'.  All you need to do, other than moving the
+files, is to add the following line to your `configure.in'.
+
+     AC_CONFIG_AUX_DIR([SUBDIR])
+
+
+File: gettext.info,  Node: aclocal,  Next: acconfig,  Prev: mkinstalldirs,  Up: Adjusting Files
 
 `aclocal.m4' at top level
 -------------------------
@@ -370,7 +444,7 @@ might be integrated in the standard Autoconf set, because this piece of
 `m4' code will be the same for all projects using GNU `gettext'.
 
 
-File: gettext.info,  Node: acconfig,  Next: Makefile,  Prev: aclocal,  Up: Adjusting Files
+File: gettext.info,  Node: acconfig,  Next: config.h.in,  Prev: aclocal,  Up: Adjusting Files
 
 `acconfig.h' at top level
 -------------------------
@@ -382,7 +456,36 @@ any more; you can remove them from your `acconfig.h' file unless your
 package uses them independently from the `intl/' directory.
 
 
-File: gettext.info,  Node: Makefile,  Next: src/Makefile,  Prev: acconfig,  Up: Adjusting Files
+File: gettext.info,  Node: config.h.in,  Next: Makefile,  Prev: acconfig,  Up: Adjusting Files
+
+`config.h.in' at top level
+--------------------------
+
+   The include file template that holds the C macros to be defined by
+`configure' is usually called `config.h.in' and may be maintained
+either manually or automatically.
+
+   If it is maintained automatically, by use of the `autoheader'
+program, you need to do nothing about it.  This is the case in
+particular if you are using GNU `automake'.
+
+   If it is maintained manually, and if `gettextize' has created an
+`intl/' directory, you should switch to using `autoheader'.  The list
+of C macros to be added for the sake of the `intl/' directory is just
+too long to be maintained manually; it also changes between different
+versions of GNU `gettext'.
+
+   If it is maintained manually, and if on the other hand you have
+suppressed the `intl/' directory by calling `gettextize' without
+`--intl' option, then you can get away by adding the following lines to
+`config.h.in':
+
+     /* Define to 1 if translation of program messages to the user's
+        native language is requested. */
+     #undef ENABLE_NLS
+
+
+File: gettext.info,  Node: Makefile,  Next: src/Makefile,  Prev: config.h.in,  Up: Adjusting Files
 
 `Makefile.in' at top level
 --------------------------
@@ -400,7 +503,7 @@ File: gettext.info,  Node: Makefile,  Next: src/Makefile,  Prev: acconfig,  Up:
      gets distributed.
 
   3. Wherever you process subdirectories in your `Makefile.in', be sure
-     you also process dir subdirectories `intl' and `po'.  Special
+     you also process the subdirectories `intl' and `po'.  Special
      rules in the `Makefiles' take care for the case where no
      internationalization is wanted.
 
@@ -480,6 +583,7 @@ modifications needed in `src/Makefile.in':
      `bindtextdomain' (see *note Triggering::), like this:
 
           bindtextdomain (PACKAGE, LOCALEDIR);
+          textdomain (PACKAGE);
 
      To make LOCALEDIR known to the program, add the following lines to
      Makefile.in:
@@ -577,7 +681,7 @@ packages, it can go into the `src' directory.
 package that needs it should contain a copy of it on its own.
 
 
-File: gettext.info,  Node: autoconf macros,  Prev: Adjusting Files,  Up: Maintainers
+File: gettext.info,  Node: autoconf macros,  Next: CVS Issues,  Prev: Adjusting Files,  Up: Maintainers
 
 Autoconf macros for use in `configure.in'
 =========================================
@@ -589,10 +693,11 @@ macro is, of course, `AM_GNU_GETTEXT'.
 * Menu:
 
 * AM_GNU_GETTEXT::              AM_GNU_GETTEXT in `gettext.m4'
+* AM_GNU_GETTEXT_VERSION::      AM_GNU_GETTEXT_VERSION in `gettext.m4'
 * AM_ICONV::                    AM_ICONV in `iconv.m4'
 
 
-File: gettext.info,  Node: AM_GNU_GETTEXT,  Next: AM_ICONV,  Prev: autoconf macros,  Up: autoconf macros
+File: gettext.info,  Node: AM_GNU_GETTEXT,  Next: AM_GNU_GETTEXT_VERSION,  Prev: autoconf macros,  Up: autoconf macros
 
 AM_GNU_GETTEXT in `gettext.m4'
 ------------------------------
@@ -661,7 +766,19 @@ empty and doesn't change `CPPFLAGS'.
      `LTLIBINTL' variables.
 
 
-File: gettext.info,  Node: AM_ICONV,  Prev: AM_GNU_GETTEXT,  Up: autoconf macros
+File: gettext.info,  Node: AM_GNU_GETTEXT_VERSION,  Next: AM_ICONV,  Prev: AM_GNU_GETTEXT,  Up: autoconf macros
+
+AM_GNU_GETTEXT_VERSION in `gettext.m4'
+--------------------------------------
+
+   The `AM_GNU_GETTEXT_VERSION' macro declares the version number of
+the GNU gettext infrastructure that is used by the package.
+
+   The use of this macro is optional; only the `autopoint' program makes
+use of it (*note CVS Issues::).
+
+
+File: gettext.info,  Node: AM_ICONV,  Prev: AM_GNU_GETTEXT_VERSION,  Up: autoconf macros
 
 AM_ICONV in `iconv.m4'
 ----------------------
@@ -705,6 +822,170 @@ for use without libtool, `LTLIBICONV' for use with libtool); it adds an
    `iconv.m4' is distributed with the GNU gettext package because
 `gettext.m4' relies on it.
 
+
+File: gettext.info,  Node: CVS Issues,  Prev: autoconf macros,  Up: Maintainers
+
+Integrating with CVS
+====================
+
+   Many projects use CVS for distributed development, version control
+and source backup.  This section gives some advice how to manage the
+uses of `cvs', `gettextize', `autopoint' and `autoconf'.
+
+* Menu:
+
+* Distributed CVS::             Avoiding version mismatch in distributed development
+* Files under CVS::             Files to put under CVS version control
+* autopoint Invocation::        Invoking the `autopoint' Program
+
+
+File: gettext.info,  Node: Distributed CVS,  Next: Files under CVS,  Prev: CVS Issues,  Up: CVS Issues
+
+Avoiding version mismatch in distributed development
+----------------------------------------------------
+
+   In a project development with multiple developers, using CVS, there
+should be a single developer who occasionally - when there is desire to
+upgrade to a new `gettext' version - runs `gettextize' and performs the
+changes listed in *Note Adjusting Files::, and then commits his changes
+to the CVS.
+
+   It is highly recommended that all developers on a project use the
+same version of GNU `gettext' in the package.  In other words, if a
+developer runs `gettextize', he should go the whole way, make the
+necessary remaining changes and commit his changes to the CVS.
+Otherwise the following damages will likely occur:
+
+   * Apparent version mismatch between developers.  Since some `gettext'
+     specific portions in `configure.in', `configure.ac' and
+     `Makefile.am', `Makefile.in' files depend on the `gettext'
+     version, the use of infrastructure files belonging to different
+     `gettext' versions can easily lead to build errors.
+
+   * Hidden version mismatch.  Such version mismatch can also lead to
+     malfunctioning of the package, that may be undiscovered by the
+     developers.  The worst case of hidden version mismatch is that
+     internationalization of the package doesn't work at all.
+
+   * Release risks.  All developers implicitly perform constant testing
+     on a package.  This is important in the days and weeks before a
+     release.  If the guy who makes the release tar files uses a
+     different version of GNU `gettext' than the other developers, the
+     distribution will be less well tested than if all had been using
+     the same `gettext' version.  For example, it is possible that a
+     platform specific bug goes undiscovered due to this constellation.
+
+
+File: gettext.info,  Node: Files under CVS,  Next: autopoint Invocation,  Prev: Distributed CVS,  Up: CVS Issues
+
+Files to put under CVS version control
+--------------------------------------
+
+   There are basically three ways to deal with generated files in the
+context of a CVS repository, such as `configure' generated from
+`configure.in', `PARSER.c' generated from `PARSER.y', or
+`po/Makefile.in.in' autoinstalled by `gettextize' or `autopoint'.
+
+  1. All generated files are always committed into the repository.
+
+  2. All generated files are committed into the repository occasionally,
+     for example each time a release is made.
+
+  3. Generated files are never committed into the repository.
+
+   Each of these three approaches has different advantages and
+drawbacks.
+
+  1. The advantage is that anyone can check out the CVS at any moment
+     and gets a working build.  The drawbacks are:  1a. It requires
+     some frequent "cvs commit" actions by the maintainers.  1b. The
+     reposity grows in size quite fast.
+
+  2. The advantage is that anyone can check out the CVS, and the usual
+     "./configure; make" will work.  The drawbacks are:  2a. The one who
+     checks out the repository needs tools like GNU `automake', GNU
+     `autoconf', GNU `m4' installed in his PATH; sometimes he even
+     needs particular versions of them.  2b. When a release is made and
+     a commit is made on the generated files, the other developers get
+     conflicts on the generated files after doing "cvs update".
+     Although these conflicts are easy to resolve, they are annoying.
+
+  3. The advantage is less work for the maintainers.  The drawback is
+     that anyone who checks out the CVS not only needs tools like GNU
+     `automake', GNU `autoconf', GNU `m4' installed in his PATH, but
+     also that he needs to perform a package specific pre-build step
+     before being able to "./configure; make".
+
+   For the first and second approach, all files modified or brought in
+by the occasional `gettextize' invocation and update should be
+committed into the CVS.
+
+   For the third approach, the maintainer can omit from the CVS
+repository all the files that `gettextize' mentions as "copy".
+Instead, he adds to the `configure.in' or `configure.ac' a line of the
+form
+
+     GETTEXT_VERSION=0.11.3
+
+and adds to the package's pre-build script an invocation of
+`autopoint'.  For everyone who checks out the CVS, this `autopoint'
+invocation will copy into the right place the `gettext' infrastructure
+files that have been omitted from the CVS.
+
+
+File: gettext.info,  Node: autopoint Invocation,  Prev: Files under CVS,  Up: CVS Issues
+
+Invoking the `autopoint' Program
+--------------------------------
+
+     autopoint [OPTION]...
+
+   The `autopoint' program copies standard gettext infrastructure files
+into a source package.  It extracts from a macro call of the form
+`AM_GNU_GETTEXT_VERSION(VERSION)', found in the package's
+`configure.in' or `configure.ac' file, the gettext version used by the
+package, and copies the infrastructure files belonging to this version
+into the package.
+
+Options
+.......
+
+`-f'
+`--force'
+     Force overwriting of files that already exist.
+
+`-n'
+`--dry-run'
+     Print modifications but don't perform them.  All file copying
+     actions that `autopoint' would normally execute are inhibited and
+     instead only listed on standard output.
+
+Informative output
+..................
+
+`--help'
+     Display this help and exit.
+
+`--version'
+     Output version information and exit.
+
+   `autopoint' supports the GNU `gettext' versions from 0.10.35 to the
+current one, 0.11.3.  In order to apply `autopoint' to a package using
+a `gettext' version newer than 0.11.3, you need to install this same
+version of GNU `gettext' at least.
+
+   In packages using GNU `automake', an invocation of `autopoint'
+should be followed by invocations of `aclocal' and then `autoconf' and
+`autoheader'.  The reason is that `autopoint' installs some autoconf
+macro files, which are used by `aclocal' to create `aclocal.m4', and
+the latter is used by `autoconf' to create the package's `configure'
+script and by `autoheader' to create the package's `config.h.in'
+include file template.
+
+   The name `autopoint' is an abbreviation of `auto-po-intl-m4'; the
+tool copies or updates mostly files in the `po', `intl', `m4'
+directories.
+
 
 File: gettext.info,  Node: Programming Languages,  Next: Conclusion,  Prev: Maintainers,  Up: Top
 
@@ -782,7 +1063,7 @@ means the following:
      number or a name.  This is needed because for some languages and
      some messages with more than one substitutable argument, the
      translation will need to output the substituted arguments in
-     different order.  *Note c-format::.
+     different order.  *Note c-format Flag::.
 
   8. If the language has more than one implementation, and not all of
      the implementations use `gettext', but the programs should be
@@ -842,703 +1123,74 @@ difference is that when translating format strings, she has to be aware
 of the language's particular syntax for positional arguments in format
 strings.
 
-
-File: gettext.info,  Node: Maintainers for other Languages,  Next: List of Programming Languages,  Prev: Translators for other Languages,  Up: Programming Languages
-
-The Maintainer's View
-=====================
-
-   For the maintainer, the general procedure differs from the C language
-case in two ways.
-
-   * For those languages that don't use GNU gettext, the `intl/'
-     directory is not needed and can be omitted.  This means that the
-     maintainer calls the `gettextize' program without the `--intl'
-     option, and that he invokes the `AM_GNU_GETTEXT' autoconf macro via
-     `AM_GNU_GETTEXT([external])'.
-
-   * If only a single programming language is used, the
-     `XGETTEXT_OPTIONS' variable in `po/Makevars' (*note po/Makevars::)
-     should be adjusted to match the `xgettext' options for that
-     particular programming language.  If the package uses more than
-     one programming language with `gettext' support, it becomes
-     necessary to change the POT file construction rule in
-     `po/Makefile.in.in'. It is recommended to make one `xgettext'
-     invocation per programming language, each with the options
-     appropriate for that language, and to combine the resulting files
-     using `msgcat'.
-
-
-File: gettext.info,  Node: List of Programming Languages,  Next: List of Data Formats,  Prev: Maintainers for other Languages,  Up: Programming Languages
-
-Individual Programming Languages
-================================
-
 * Menu:
 
-* C::                           C, C++, Objective C
-* sh::                          sh - Shell Script
-* bash::                        bash - Bourne-Again Shell Script
-* Python::                      Python
-* Common Lisp::                 GNU clisp - Common Lisp
-* clisp C::                     GNU clisp C sources
-* Emacs Lisp::                  Emacs Lisp
-* librep::                      librep
-* Smalltalk::                   GNU Smalltalk
-* Java::                        Java
-* gawk::                        GNU awk
-* Pascal::                      Pascal - Free Pascal Compiler
-* wxWindows::                   wxWindows library
-* YCP::                         YCP - YaST2 scripting language
-* Tcl::                         Tcl - Tk's scripting language
-* Perl::                        Perl
-* PHP::                         PHP Hypertext Preprocessor
-* Pike::                        Pike
-
-
-File: gettext.info,  Node: C,  Next: sh,  Prev: List of Programming Languages,  Up: List of Programming Languages
-
-C, C++, Objective C
--------------------
-
-RPMs
-     gcc, gpp, gobjc, glibc, gettext
-
-File extension
-     For C: `c', `h'.
-     For C++: `C', `c++', `cc', `cxx', `cpp', `hpp'.
-     For Objective C: `m'.
-
-String syntax
-     `"abc"'
-
-gettext shorthand
-     `_("abc")'
-
-gettext/ngettext functions
-     `gettext', `dgettext', `dcgettext', `ngettext', `dngettext',
-     `dcngettext'
-
-textdomain
-     `textdomain' function
-
-bindtextdomain
-     `bindtextdomain' function
-
-setlocale
-     Programmer must call `setlocale (LC_ALL, "")'
-
-Prerequisite
-     `#include <libintl.h>'
-     `#include <locale.h>'
-     `#define _(string) gettext (string)'
-
-Use or emulate GNU gettext
-     Use
-
-Extractor
-     `xgettext -k_'
-
-Formatting with positions
-     `fprintf "%2$d %1$d"' (POSIX but not C 99)
-
-Portability
-     autoconf (gettext.m4) and #if ENABLE_NLS
-
-po-mode marking
-     yes
+* c-format::                    C Format Strings
+* python-format::               Python Format Strings
+* lisp-format::                 Lisp Format Strings
+* elisp-format::                Emacs Lisp Format Strings
+* librep-format::               librep Format Strings
+* smalltalk-format::            Smalltalk Format Strings
+* java-format::                 Java Format Strings
+* awk-format::                  awk Format Strings
+* object-pascal-format::        Object Pascal Format Strings
+* ycp-format::                  YCP Format Strings
+* tcl-format::                  Tcl Format Strings
 
 
-File: gettext.info,  Node: sh,  Next: bash,  Prev: C,  Up: List of Programming Languages
-
-sh - Shell Script
------------------
-
-RPMs
-     bash, gettext
-
-File extension
-     `sh'
-
-String syntax
-     `"abc"', `'abc'', `abc'
-
-gettext shorthand
-     `"`gettext "abc"`"'
-
-gettext/ngettext functions
-     `gettext', `ngettext' programs
-
-textdomain
-     environment variable `TEXTDOMAIN'
-
-bindtextdomain
-     environment variable `TEXTDOMAINDIR'
-
-setlocale
-     automatic
-
-Prerequisite
-     --
-
-Use or emulate GNU gettext
-     use
-
-Extractor
-     --
-
-Formatting with positions
-     --
-
-Portability
-     --
-
-po-mode marking
-     --
-
-
-File: gettext.info,  Node: bash,  Next: Python,  Prev: sh,  Up: List of Programming Languages
-
-bash - Bourne-Again Shell Script
---------------------------------
-
-RPMs
-     bash 2.0 or newer, gettext
-
-File extension
-     `sh'
-
-String syntax
-     `"abc"', `'abc'', `abc'
-
-gettext shorthand
-     `$"abc"'
-
-gettext/ngettext functions
-     `gettext', `ngettext' programs
-
-textdomain
-     environment variable `TEXTDOMAIN'
-
-bindtextdomain
-     environment variable `TEXTDOMAINDIR'
-
-setlocale
-     automatic
-
-Prerequisite
-     --
-
-Use or emulate GNU gettext
-     use
-
-Extractor
-     `bash --dump-po-strings'
-
-Formatting with positions
-     --
-
-Portability
-     --
-
-po-mode marking
-     --
-
-
-File: gettext.info,  Node: Python,  Next: Common Lisp,  Prev: bash,  Up: List of Programming Languages
-
-Python
-------
-
-RPMs
-     python
-
-File extension
-     `py'
-
-String syntax
-     `'abc'', `u'abc'', `r'abc'', `ur'abc'',
-     `"abc"', `u"abc"', `r"abc"', `ur"abc"',
-     `'''abc'''', `u'''abc'''', `r'''abc'''', `ur'''abc'''',
-     `"""abc"""', `u"""abc"""', `r"""abc"""', `ur"""abc"""'
-
-gettext shorthand
-     `_('abc')' etc.
-
-gettext/ngettext functions
-     `gettext.gettext', `gettext.dgettext', also `ugettext'
+File: gettext.info,  Node: c-format,  Next: python-format,  Prev: Translators for other Languages,  Up: Translators for other Languages
 
-textdomain
-     `gettext.textdomain' function, or `gettext.install(DOMAIN)'
-     function
+C Format Strings
+----------------
 
-bindtextdomain
-     `gettext.bindtextdomain' function, or
-     `gettext.install(DOMAIN,LOCALEDIR)' function
-
-setlocale
-     not used by the gettext emulation
-
-Prerequisite
-     `import gettext'
-
-Use or emulate GNU gettext
-     emulate. Bug: uses only the first found .mo file, not all of them
-
-Extractor
-     `xgettext'
-
-Formatting with positions
-     `'...%(ident)d...' % { 'ident': value }'
-
-Portability
-     fully portable
-
-po-mode marking
-     --
+   C format strings are described in POSIX (IEEE P1003.1 2001), section
+XSH 3 fprintf(),
+`http://www.opengroup.org/onlinepubs/007904975/functions/fprintf.html'.
+See also the fprintf(3) manual page,
+`http://www.linuxvalley.it/encyclopedia/ldp/manpage/man3/printf.3.php',
+`http://informatik.fh-wuerzburg.de/student/i510/man/printf.html'.
 
 
-File: gettext.info,  Node: Common Lisp,  Next: clisp C,  Prev: Python,  Up: List of Programming Languages
-
-GNU clisp - Common Lisp
------------------------
-
-RPMs
-     clisp 2.28 or newer
-
-File extension
-     `lisp'
-
-String syntax
-     `"abc"'
-
-gettext shorthand
-     `(_ "abc")', `(ENGLISH "abc")'
-
-gettext/ngettext functions
-     `i18n:gettext', `i18n:ngettext'
-
-textdomain
-     `i18n:textdomain'
-
-bindtextdomain
-     `i18n:textdomaindir'
-
-setlocale
-     automatic
-
-Prerequisite
-     --
+File: gettext.info,  Node: python-format,  Next: lisp-format,  Prev: c-format,  Up: Translators for other Languages
 
-Use or emulate GNU gettext
-     use
-
-Extractor
-     `xgettext -k_ -kENGLISH'
-
-Formatting with positions
-     `format "~1@*~D ~0@*~D"'
-
-Portability
-     On platforms without gettext, no translation.
+Python Format Strings
+---------------------
 
-po-mode marking
-     --
+   Python format strings are described in Python Library reference /
+2. Built-in Types, Exceptions and Functions / 2.2. Built-in Types /
+2.2.6. Sequence Types / 2.2.6.2. String Formatting Operations.
+`http://www.python.org/doc/2.2.1/lib/typesseq-strings.html'.
 
 
-File: gettext.info,  Node: clisp C,  Next: Emacs Lisp,  Prev: Common Lisp,  Up: List of Programming Languages
+File: gettext.info,  Node: lisp-format,  Next: elisp-format,  Prev: python-format,  Up: Translators for other Languages
 
-GNU clisp C sources
+Lisp Format Strings
 -------------------
 
-RPMs
-     clisp
-
-File extension
-     `d'
-
-String syntax
-     `"abc"'
-
-gettext shorthand
-     `ENGLISH ? "abc" : ""'
-     `GETTEXT("abc")'
-     `GETTEXTL("abc")'
-
-gettext/ngettext functions
-     `clgettext', `clgettextl'
-
-textdomain
-     --
-
-bindtextdomain
-     --
-
-setlocale
-     automatic
-
-Prerequisite
-     `#include "lispbibl.c"'
-
-Use or emulate GNU gettext
-     use
-
-Extractor
-     `clisp-xgettext'
-
-Formatting with positions
-     `fprintf "%2$d %1$d"' (POSIX but not C 99)
-
-Portability
-     On platforms without gettext, no translation.
-
-po-mode marking
-     --
-
-
-File: gettext.info,  Node: Emacs Lisp,  Next: librep,  Prev: clisp C,  Up: List of Programming Languages
-
-Emacs Lisp
-----------
-
-RPMs
-     emacs, xemacs
-
-File extension
-     `el'
-
-String syntax
-     `"abc"'
-
-gettext shorthand
-     `(_"abc")'
-
-gettext/ngettext functions
-     `gettext', `dgettext' (xemacs only)
-
-textdomain
-     `domain' special form (xemacs only)
-
-bindtextdomain
-     `bind-text-domain' function (xemacs only)
-
-setlocale
-     automatic
-
-Prerequisite
-     --
-
-Use or emulate GNU gettext
-     use
-
-Extractor
-     `xgettext'
-
-Formatting with positions
-     `format "%2$d %1$d"'
-
-Portability
-     Only XEmacs. Without `I18N3' defined at build time, no translation.
-
-po-mode marking
-     --
-
-
-File: gettext.info,  Node: librep,  Next: Smalltalk,  Prev: Emacs Lisp,  Up: List of Programming Languages
-
-librep
-------
-
-RPMs
-     librep 0.15.3 or newer
-
-File extension
-     `jl'
-
-String syntax
-     `"abc"'
-
-gettext shorthand
-     `(_"abc")'
-
-gettext/ngettext functions
-     `gettext'
-
-textdomain
-     `textdomain' function
-
-bindtextdomain
-     `bindtextdomain' function
-
-setlocale
-     --
-
-Prerequisite
-     `(require 'rep.i18n.gettext)'
-
-Use or emulate GNU gettext
-     use
-
-Extractor
-     `xgettext'
-
-Formatting with positions
-     `format "%2$d %1$d"'
-
-Portability
-     On platforms without gettext, no translation.
-
-po-mode marking
-     --
+   Lisp format strings are described in the Common Lisp HyperSpec,
+chapter 22.3 Formatted Output,
+`http://www.lisp.org/HyperSpec/Body/sec_22-3.html'.
 
 
-File: gettext.info,  Node: Smalltalk,  Next: Java,  Prev: librep,  Up: List of Programming Languages
-
-GNU Smalltalk
--------------
-
-RPMs
-     smalltalk
-
-File extension
-     `st'
+File: gettext.info,  Node: elisp-format,  Next: librep-format,  Prev: lisp-format,  Up: Translators for other Languages
 
-String syntax
-     `''abc'''
-
-gettext shorthand
-     `NLS? ''abc'''
-     `self? ''abc'''
-
-gettext/ngettext functions
-     `LcMessagesDomain>>#at:', `LcMessagesDomain>>#at:plural:with:'
-
-textdomain
-     `LcMessages>>#?' (returns a `LcMessagesDomain' object).
-     Example: `Locale default messages ? 'gettext''
-
-bindtextdomain
-     `LcMessages>>#domain:directory:' (returns a `LcMessagesDomain'
-     object)
-
-setlocale
-     You can obtain any `Locale' object from `Locale' class methods
-     such as `#fromString:' or `#default'.
-     Example: `Locale default messages' gives the `LcMessages' object
-     for the default locale.
-
-Prerequisite
-     The gettext code is contained in the `I18N' package.
-
-Use or emulate GNU gettext
-     emulate
-
-Extractor
-     --
-
-Formatting with positions
-     `'%1 %2' bindWith: 'Hello' with: 'world''
-
-Portability
-     fully portable
-
-po-mode marking
-     --
-
-
-File: gettext.info,  Node: Java,  Next: gawk,  Prev: Smalltalk,  Up: List of Programming Languages
-
-Java
-----
-
-RPMs
-     java, java2
-
-File extension
-     `java'
-
-String syntax
-     "abc"
-
-gettext shorthand
-     _("abc")
-
-gettext/ngettext functions
-     `GettextResource.gettext', `GettextResource.ngettext'
-
-textdomain
-     --, use `ResourceBundle.getResource' instead
-
-bindtextdomain
-     --, use CLASSPATH instead
-
-setlocale
-     automatic
-
-Prerequisite
-     --
-
-Use or emulate GNU gettext
-     --, uses a Java specific message catalog format
-
-Extractor
-     `xgettext -k_'
-
-Formatting with positions
-     `MessageFormat.format "{1,number} {0,number}"'
-
-Portability
-     fully portable
-
-po-mode marking
-     --
-
-   Before marking strings as internationalizable, uses of the string
-concatenation operator need to be converted to `MessageFormat'
-applications. For example, `"file "+filename+" not found"' becomes
-`MessageFormat.format("file {0} not found", new Object[] { filename })'.
-Only after this is done, can the strings be marked and extracted.
-
-   GNU gettext uses the native Java internationalization mechanism,
-namely `ResourceBundle's. To convert a PO file to a ResourceBundle, the
-`msgfmt' program can be used with the option `--java' or `--java2'. To
-convert a ResourceBundle back to a PO file, the `msgunfmt' program can
-be used with the option `--java'.
-
-   Two different programmatic APIs can be used to access
-ResourceBundles.  Note that both APIs work with all kinds of
-ResourceBundles, whether GNU gettext generated classes, or other
-`.class' or `.properties' files.
-
-  1. The `java.util.ResourceBundle' API.
-
-     In particular, its `getString' function returns a string
-     translation.  Note that a missing translation yields a
-     `MissingResourceException'.
-
-     This has the advantage of being the standard API. And it does not
-     require any additional libraries, only the `msgfmt' generated
-     `.class' files. But it cannot do plural handling, even if the
-     resource was generated from a PO file with plural handling.
-
-  2. The `gnu.gettext.GettextResource' API.
-
-     Reference documentation in Javadoc 1.1 style format is in the
-     javadoc1 directory (javadoc1/tree.html) and in Javadoc 2 style
-     format in the javadoc2 directory (javadoc2/index.html).
-
-     Its `gettext' function returns a string translation. Note that when
-     a translation is missing, the MSGID argument is returned unchanged.
-
-     This has the advantage of having the `ngettext' function for plural
-     handling.
-
-     To use this API, one needs the `libintl.jar' file which is part of
-     the GNU gettext package and distributed under the LGPL.
-
-
-File: gettext.info,  Node: gawk,  Next: Pascal,  Prev: Java,  Up: List of Programming Languages
-
-GNU awk
--------
-
-RPMs
-     gawk 3.1 or newer
-
-File extension
-     `awk'
-
-String syntax
-     `"abc"'
-
-gettext shorthand
-     `_"abc"'
-
-gettext/ngettext functions
-     `dcgettext', missing `dcngettext' in gawk-3.1.0
-
-textdomain
-     `TEXTDOMAIN' variable
-
-bindtextdomain
-     `bindtextdomain' function
-
-setlocale
-     automatic, but missing `setlocale (LC_MESSAGES, "")' in gawk-3.1.0
-
-Prerequisite
-     --
-
-Use or emulate GNU gettext
-     use
-
-Extractor
-     `xgettext'
-
-Formatting with positions
-     `printf "%2$d %1$d"' (GNU awk only)
-
-Portability
-     On platforms without gettext, no translation.  On non-GNU awks,
-     you must define `dcgettext', `dcngettext' and `bindtextdomain'
-     yourself.
+Emacs Lisp Format Strings
+-------------------------
 
-po-mode marking
-     --
+   Emacs Lisp format strings are documented in the Emacs Lisp reference,
+section Formatting Strings,
+`http://www.gnu.org/manual/elisp-manual-21-2.8/html_chapter/elisp_4.html#SEC75'.
+Note that as of version 21, XEmacs supports numbered argument
+specifications in format strings while FSF Emacs doesn't.
 
 
-File: gettext.info,  Node: Pascal,  Next: wxWindows,  Prev: gawk,  Up: List of Programming Languages
-
-Pascal - Free Pascal Compiler
------------------------------
-
-RPMs
-     fpk
-
-File extension
-     `pp', `pas'
-
-String syntax
-     `'abc''
-
-gettext shorthand
-     automatic
-
-gettext/ngettext functions
-     --, use `ResourceString' data type instead
-
-textdomain
-     --, use `TranslateResourceStrings' function instead
+File: gettext.info,  Node: librep-format,  Next: smalltalk-format,  Prev: elisp-format,  Up: Translators for other Languages
 
-bindtextdomain
-     --, use `TranslateResourceStrings' function instead
-
-setlocale
-     automatic, but uses only LANG, not LC_MESSAGES or LC_ALL
-
-Prerequisite
-     `{$mode delphi}' or `{$mode objfpc}'
-     `uses gettext;'
-
-Use or emulate GNU gettext
-     emulate partially
-
-Extractor
-     `ppc386' followed by `xgettext' or `rstconv'
-
-Formatting with positions
-     `uses sysutils;'
-     `format "%1:d %0:d"'
-
-Portability
-     ?
-
-po-mode marking
-     --
+librep Format Strings
+---------------------
 
-   The Pascal compiler has special support for the `ResourceString' data
-type. It generates a `.rst' file. This is then converted to a `.pot'
-file by use of `xgettext' or `rstconv'. At runtime, a `.mo' file
-corresponding to translations of this `.pot' file can be loaded using
-the `TranslateResourceStrings' function in the `gettext' unit.
+   librep format strings are documented in the librep manual, section
+Formatted Output,
+<http://librep.sourceforge.net/librep-manual.html#Formatted%20Output>,
+<http://www.gwinnup.org/research/docs/librep.html#SEC122>.
 
diff --git a/doc/gettext.info-8 b/doc/gettext.info-8
index e0b551bdb..aeda405ca 100644
--- a/doc/gettext.info-8
+++ b/doc/gettext.info-8
@@ -30,6 +30,768 @@ manual into another language, under the above conditions for modified
 versions, except that this permission notice may be stated in a
 translation approved by the Foundation.
 
+
+File: gettext.info,  Node: smalltalk-format,  Next: java-format,  Prev: librep-format,  Up: Translators for other Languages
+
+Smalltalk Format Strings
+------------------------
+
+   Smalltalk format strings are described in the GNU Smalltalk
+documentation, class `CharArray', methods `bindWith:' and
+`bindWithArguments:'.
+`http://www.gnu.org/software/smalltalk/gst-manual/gst_68.html#SEC238'.
+In summary, a directive starts with `%' and is followed by `%' or a
+nonzero digit (`1' to `9').
+
+
+File: gettext.info,  Node: java-format,  Next: awk-format,  Prev: smalltalk-format,  Up: Translators for other Languages
+
+Java Format Strings
+-------------------
+
+   Java format strings are described in the JDK documentation for class
+`java.text.MessageFormat',
+`http://java.sun.com/j2se/1.4/docs/api/java/text/MessageFormat.html'.
+See also the ICU documentation
+`http://oss.software.ibm.com/icu/apiref/classMessageFormat.html'.
+
+
+File: gettext.info,  Node: awk-format,  Next: object-pascal-format,  Prev: java-format,  Up: Translators for other Languages
+
+awk Format Strings
+------------------
+
+   awk format strings are described in the gawk documentation, section
+Printf, `http://www.gnu.org/manual/gawk/html_node/Printf.html#Printf'.
+
+
+File: gettext.info,  Node: object-pascal-format,  Next: ycp-format,  Prev: awk-format,  Up: Translators for other Languages
+
+Object Pascal Format Strings
+----------------------------
+
+   Where is this documented?
+
+
+File: gettext.info,  Node: ycp-format,  Next: tcl-format,  Prev: object-pascal-format,  Up: Translators for other Languages
+
+YCP Format Strings
+------------------
+
+   YCP sformat strings are described in the libycp documentation
+`file:/usr/share/doc/packages/libycp/YCP-builtins.html'.  In summary, a
+directive starts with `%' and is followed by `%' or a nonzero digit
+(`1' to `9').
+
+
+File: gettext.info,  Node: tcl-format,  Prev: ycp-format,  Up: Translators for other Languages
+
+Tcl Format Strings
+------------------
+
+   Tcl format strings are described in the `format.n' manual page,
+`http://www.scriptics.com/man/tcl8.3/TclCmd/format.htm'.
+
+
+File: gettext.info,  Node: Maintainers for other Languages,  Next: List of Programming Languages,  Prev: Translators for other Languages,  Up: Programming Languages
+
+The Maintainer's View
+=====================
+
+   For the maintainer, the general procedure differs from the C language
+case in two ways.
+
+   * For those languages that don't use GNU gettext, the `intl/'
+     directory is not needed and can be omitted.  This means that the
+     maintainer calls the `gettextize' program without the `--intl'
+     option, and that he invokes the `AM_GNU_GETTEXT' autoconf macro via
+     `AM_GNU_GETTEXT([external])'.
+
+   * If only a single programming language is used, the
+     `XGETTEXT_OPTIONS' variable in `po/Makevars' (*note po/Makevars::)
+     should be adjusted to match the `xgettext' options for that
+     particular programming language.  If the package uses more than
+     one programming language with `gettext' support, it becomes
+     necessary to change the POT file construction rule in
+     `po/Makefile.in.in'. It is recommended to make one `xgettext'
+     invocation per programming language, each with the options
+     appropriate for that language, and to combine the resulting files
+     using `msgcat'.
+
+
+File: gettext.info,  Node: List of Programming Languages,  Next: List of Data Formats,  Prev: Maintainers for other Languages,  Up: Programming Languages
+
+Individual Programming Languages
+================================
+
+* Menu:
+
+* C::                           C, C++, Objective C
+* sh::                          sh - Shell Script
+* bash::                        bash - Bourne-Again Shell Script
+* Python::                      Python
+* Common Lisp::                 GNU clisp - Common Lisp
+* clisp C::                     GNU clisp C sources
+* Emacs Lisp::                  Emacs Lisp
+* librep::                      librep
+* Smalltalk::                   GNU Smalltalk
+* Java::                        Java
+* gawk::                        GNU awk
+* Pascal::                      Pascal - Free Pascal Compiler
+* wxWindows::                   wxWindows library
+* YCP::                         YCP - YaST2 scripting language
+* Tcl::                         Tcl - Tk's scripting language
+* Perl::                        Perl
+* PHP::                         PHP Hypertext Preprocessor
+* Pike::                        Pike
+
+
+File: gettext.info,  Node: C,  Next: sh,  Prev: List of Programming Languages,  Up: List of Programming Languages
+
+C, C++, Objective C
+-------------------
+
+RPMs
+     gcc, gpp, gobjc, glibc, gettext
+
+File extension
+     For C: `c', `h'.
+     For C++: `C', `c++', `cc', `cxx', `cpp', `hpp'.
+     For Objective C: `m'.
+
+String syntax
+     `"abc"'
+
+gettext shorthand
+     `_("abc")'
+
+gettext/ngettext functions
+     `gettext', `dgettext', `dcgettext', `ngettext', `dngettext',
+     `dcngettext'
+
+textdomain
+     `textdomain' function
+
+bindtextdomain
+     `bindtextdomain' function
+
+setlocale
+     Programmer must call `setlocale (LC_ALL, "")'
+
+Prerequisite
+     `#include <libintl.h>'
+     `#include <locale.h>'
+     `#define _(string) gettext (string)'
+
+Use or emulate GNU gettext
+     Use
+
+Extractor
+     `xgettext -k_'
+
+Formatting with positions
+     `fprintf "%2$d %1$d"' (POSIX but not C 99)
+
+Portability
+     autoconf (gettext.m4) and #if ENABLE_NLS
+
+po-mode marking
+     yes
+
+
+File: gettext.info,  Node: sh,  Next: bash,  Prev: C,  Up: List of Programming Languages
+
+sh - Shell Script
+-----------------
+
+RPMs
+     bash, gettext
+
+File extension
+     `sh'
+
+String syntax
+     `"abc"', `'abc'', `abc'
+
+gettext shorthand
+     `"`gettext "abc"`"'
+
+gettext/ngettext functions
+     `gettext', `ngettext' programs
+
+textdomain
+     environment variable `TEXTDOMAIN'
+
+bindtextdomain
+     environment variable `TEXTDOMAINDIR'
+
+setlocale
+     automatic
+
+Prerequisite
+     --
+
+Use or emulate GNU gettext
+     use
+
+Extractor
+     --
+
+Formatting with positions
+     --
+
+Portability
+     --
+
+po-mode marking
+     --
+
+
+File: gettext.info,  Node: bash,  Next: Python,  Prev: sh,  Up: List of Programming Languages
+
+bash - Bourne-Again Shell Script
+--------------------------------
+
+RPMs
+     bash 2.0 or newer, gettext
+
+File extension
+     `sh'
+
+String syntax
+     `"abc"', `'abc'', `abc'
+
+gettext shorthand
+     `$"abc"'
+
+gettext/ngettext functions
+     `gettext', `ngettext' programs
+
+textdomain
+     environment variable `TEXTDOMAIN'
+
+bindtextdomain
+     environment variable `TEXTDOMAINDIR'
+
+setlocale
+     automatic
+
+Prerequisite
+     --
+
+Use or emulate GNU gettext
+     use
+
+Extractor
+     `bash --dump-po-strings'
+
+Formatting with positions
+     --
+
+Portability
+     --
+
+po-mode marking
+     --
+
+
+File: gettext.info,  Node: Python,  Next: Common Lisp,  Prev: bash,  Up: List of Programming Languages
+
+Python
+------
+
+RPMs
+     python
+
+File extension
+     `py'
+
+String syntax
+     `'abc'', `u'abc'', `r'abc'', `ur'abc'',
+     `"abc"', `u"abc"', `r"abc"', `ur"abc"',
+     `'''abc'''', `u'''abc'''', `r'''abc'''', `ur'''abc'''',
+     `"""abc"""', `u"""abc"""', `r"""abc"""', `ur"""abc"""'
+
+gettext shorthand
+     `_('abc')' etc.
+
+gettext/ngettext functions
+     `gettext.gettext', `gettext.dgettext', also `ugettext'
+
+textdomain
+     `gettext.textdomain' function, or `gettext.install(DOMAIN)'
+     function
+
+bindtextdomain
+     `gettext.bindtextdomain' function, or
+     `gettext.install(DOMAIN,LOCALEDIR)' function
+
+setlocale
+     not used by the gettext emulation
+
+Prerequisite
+     `import gettext'
+
+Use or emulate GNU gettext
+     emulate. Bug: uses only the first found .mo file, not all of them
+
+Extractor
+     `xgettext'
+
+Formatting with positions
+     `'...%(ident)d...' % { 'ident': value }'
+
+Portability
+     fully portable
+
+po-mode marking
+     --
+
+
+File: gettext.info,  Node: Common Lisp,  Next: clisp C,  Prev: Python,  Up: List of Programming Languages
+
+GNU clisp - Common Lisp
+-----------------------
+
+RPMs
+     clisp 2.28 or newer
+
+File extension
+     `lisp'
+
+String syntax
+     `"abc"'
+
+gettext shorthand
+     `(_ "abc")', `(ENGLISH "abc")'
+
+gettext/ngettext functions
+     `i18n:gettext', `i18n:ngettext'
+
+textdomain
+     `i18n:textdomain'
+
+bindtextdomain
+     `i18n:textdomaindir'
+
+setlocale
+     automatic
+
+Prerequisite
+     --
+
+Use or emulate GNU gettext
+     use
+
+Extractor
+     `xgettext -k_ -kENGLISH'
+
+Formatting with positions
+     `format "~1@*~D ~0@*~D"'
+
+Portability
+     On platforms without gettext, no translation.
+
+po-mode marking
+     --
+
+
+File: gettext.info,  Node: clisp C,  Next: Emacs Lisp,  Prev: Common Lisp,  Up: List of Programming Languages
+
+GNU clisp C sources
+-------------------
+
+RPMs
+     clisp
+
+File extension
+     `d'
+
+String syntax
+     `"abc"'
+
+gettext shorthand
+     `ENGLISH ? "abc" : ""'
+     `GETTEXT("abc")'
+     `GETTEXTL("abc")'
+
+gettext/ngettext functions
+     `clgettext', `clgettextl'
+
+textdomain
+     --
+
+bindtextdomain
+     --
+
+setlocale
+     automatic
+
+Prerequisite
+     `#include "lispbibl.c"'
+
+Use or emulate GNU gettext
+     use
+
+Extractor
+     `clisp-xgettext'
+
+Formatting with positions
+     `fprintf "%2$d %1$d"' (POSIX but not C 99)
+
+Portability
+     On platforms without gettext, no translation.
+
+po-mode marking
+     --
+
+
+File: gettext.info,  Node: Emacs Lisp,  Next: librep,  Prev: clisp C,  Up: List of Programming Languages
+
+Emacs Lisp
+----------
+
+RPMs
+     emacs, xemacs
+
+File extension
+     `el'
+
+String syntax
+     `"abc"'
+
+gettext shorthand
+     `(_"abc")'
+
+gettext/ngettext functions
+     `gettext', `dgettext' (xemacs only)
+
+textdomain
+     `domain' special form (xemacs only)
+
+bindtextdomain
+     `bind-text-domain' function (xemacs only)
+
+setlocale
+     automatic
+
+Prerequisite
+     --
+
+Use or emulate GNU gettext
+     use
+
+Extractor
+     `xgettext'
+
+Formatting with positions
+     `format "%2$d %1$d"'
+
+Portability
+     Only XEmacs. Without `I18N3' defined at build time, no translation.
+
+po-mode marking
+     --
+
+
+File: gettext.info,  Node: librep,  Next: Smalltalk,  Prev: Emacs Lisp,  Up: List of Programming Languages
+
+librep
+------
+
+RPMs
+     librep 0.15.3 or newer
+
+File extension
+     `jl'
+
+String syntax
+     `"abc"'
+
+gettext shorthand
+     `(_"abc")'
+
+gettext/ngettext functions
+     `gettext'
+
+textdomain
+     `textdomain' function
+
+bindtextdomain
+     `bindtextdomain' function
+
+setlocale
+     --
+
+Prerequisite
+     `(require 'rep.i18n.gettext)'
+
+Use or emulate GNU gettext
+     use
+
+Extractor
+     `xgettext'
+
+Formatting with positions
+     `format "%2$d %1$d"'
+
+Portability
+     On platforms without gettext, no translation.
+
+po-mode marking
+     --
+
+
+File: gettext.info,  Node: Smalltalk,  Next: Java,  Prev: librep,  Up: List of Programming Languages
+
+GNU Smalltalk
+-------------
+
+RPMs
+     smalltalk
+
+File extension
+     `st'
+
+String syntax
+     `''abc'''
+
+gettext shorthand
+     `NLS? ''abc'''
+     `self? ''abc'''
+
+gettext/ngettext functions
+     `LcMessagesDomain>>#at:', `LcMessagesDomain>>#at:plural:with:'
+
+textdomain
+     `LcMessages>>#?' (returns a `LcMessagesDomain' object).
+     Example: `Locale default messages ? 'gettext''
+
+bindtextdomain
+     `LcMessages>>#domain:directory:' (returns a `LcMessagesDomain'
+     object)
+
+setlocale
+     You can obtain any `Locale' object from `Locale' class methods
+     such as `#fromString:' or `#default'.
+     Example: `Locale default messages' gives the `LcMessages' object
+     for the default locale.
+
+Prerequisite
+     The gettext code is contained in the `I18N' package.
+
+Use or emulate GNU gettext
+     emulate
+
+Extractor
+     --
+
+Formatting with positions
+     `'%1 %2' bindWith: 'Hello' with: 'world''
+
+Portability
+     fully portable
+
+po-mode marking
+     --
+
+
+File: gettext.info,  Node: Java,  Next: gawk,  Prev: Smalltalk,  Up: List of Programming Languages
+
+Java
+----
+
+RPMs
+     java, java2
+
+File extension
+     `java'
+
+String syntax
+     "abc"
+
+gettext shorthand
+     _("abc")
+
+gettext/ngettext functions
+     `GettextResource.gettext', `GettextResource.ngettext'
+
+textdomain
+     --, use `ResourceBundle.getResource' instead
+
+bindtextdomain
+     --, use CLASSPATH instead
+
+setlocale
+     automatic
+
+Prerequisite
+     --
+
+Use or emulate GNU gettext
+     --, uses a Java specific message catalog format
+
+Extractor
+     `xgettext -k_'
+
+Formatting with positions
+     `MessageFormat.format "{1,number} {0,number}"'
+
+Portability
+     fully portable
+
+po-mode marking
+     --
+
+   Before marking strings as internationalizable, uses of the string
+concatenation operator need to be converted to `MessageFormat'
+applications. For example, `"file "+filename+" not found"' becomes
+`MessageFormat.format("file {0} not found", new Object[] { filename })'.
+Only after this is done, can the strings be marked and extracted.
+
+   GNU gettext uses the native Java internationalization mechanism,
+namely `ResourceBundle's. To convert a PO file to a ResourceBundle, the
+`msgfmt' program can be used with the option `--java' or `--java2'. To
+convert a ResourceBundle back to a PO file, the `msgunfmt' program can
+be used with the option `--java'.
+
+   Two different programmatic APIs can be used to access
+ResourceBundles.  Note that both APIs work with all kinds of
+ResourceBundles, whether GNU gettext generated classes, or other
+`.class' or `.properties' files.
+
+  1. The `java.util.ResourceBundle' API.
+
+     In particular, its `getString' function returns a string
+     translation.  Note that a missing translation yields a
+     `MissingResourceException'.
+
+     This has the advantage of being the standard API. And it does not
+     require any additional libraries, only the `msgfmt' generated
+     `.class' files. But it cannot do plural handling, even if the
+     resource was generated from a PO file with plural handling.
+
+  2. The `gnu.gettext.GettextResource' API.
+
+     Reference documentation in Javadoc 1.1 style format is in the
+     javadoc1 directory (javadoc1/tree.html) and in Javadoc 2 style
+     format in the javadoc2 directory (javadoc2/index.html).
+
+     Its `gettext' function returns a string translation. Note that when
+     a translation is missing, the MSGID argument is returned unchanged.
+
+     This has the advantage of having the `ngettext' function for plural
+     handling.
+
+     To use this API, one needs the `libintl.jar' file which is part of
+     the GNU gettext package and distributed under the LGPL.
+
+
+File: gettext.info,  Node: gawk,  Next: Pascal,  Prev: Java,  Up: List of Programming Languages
+
+GNU awk
+-------
+
+RPMs
+     gawk 3.1 or newer
+
+File extension
+     `awk'
+
+String syntax
+     `"abc"'
+
+gettext shorthand
+     `_"abc"'
+
+gettext/ngettext functions
+     `dcgettext', missing `dcngettext' in gawk-3.1.0
+
+textdomain
+     `TEXTDOMAIN' variable
+
+bindtextdomain
+     `bindtextdomain' function
+
+setlocale
+     automatic, but missing `setlocale (LC_MESSAGES, "")' in gawk-3.1.0
+
+Prerequisite
+     --
+
+Use or emulate GNU gettext
+     use
+
+Extractor
+     `xgettext'
+
+Formatting with positions
+     `printf "%2$d %1$d"' (GNU awk only)
+
+Portability
+     On platforms without gettext, no translation.  On non-GNU awks,
+     you must define `dcgettext', `dcngettext' and `bindtextdomain'
+     yourself.
+
+po-mode marking
+     --
+
+
+File: gettext.info,  Node: Pascal,  Next: wxWindows,  Prev: gawk,  Up: List of Programming Languages
+
+Pascal - Free Pascal Compiler
+-----------------------------
+
+RPMs
+     fpk
+
+File extension
+     `pp', `pas'
+
+String syntax
+     `'abc''
+
+gettext shorthand
+     automatic
+
+gettext/ngettext functions
+     --, use `ResourceString' data type instead
+
+textdomain
+     --, use `TranslateResourceStrings' function instead
+
+bindtextdomain
+     --, use `TranslateResourceStrings' function instead
+
+setlocale
+     automatic, but uses only LANG, not LC_MESSAGES or LC_ALL
+
+Prerequisite
+     `{$mode delphi}' or `{$mode objfpc}'
+     `uses gettext;'
+
+Use or emulate GNU gettext
+     emulate partially
+
+Extractor
+     `ppc386' followed by `xgettext' or `rstconv'
+
+Formatting with positions
+     `uses sysutils;'
+     `format "%1:d %0:d"'
+
+Portability
+     ?
+
+po-mode marking
+     --
+
+   The Pascal compiler has special support for the `ResourceString' data
+type. It generates a `.rst' file. This is then converted to a `.pot'
+file by use of `xgettext' or `rstconv'. At runtime, a `.mo' file
+corresponding to translations of this `.pot' file can be loaded using
+the `TranslateResourceStrings' function in the `gettext' unit.
+
 
 File: gettext.info,  Node: wxWindows,  Next: YCP,  Prev: Pascal,  Up: List of Programming Languages
 
@@ -1765,6 +2527,7 @@ Program Index
 
 * Menu:
 
+* autopoint:                             autopoint Invocation.
 * gettext <1>:                           bash.
 * gettext:                               sh.
 * gettextize:                            gettextize Invocation.
@@ -1786,459 +2549,3 @@ Program Index
 * ngettext:                              sh.
 * xgettext:                              xgettext Invocation.
 
-
-File: gettext.info,  Node: Option Index,  Next: Variable Index,  Prev: Program Index,  Up: Top
-
-Option Index
-************
-
-* Menu:
-
-* --add-comments, xgettext option:       xgettext Invocation.
-* --add-location, msgattrib option:      msgattrib Invocation.
-* --add-location, msgcat option:         msgcat Invocation.
-* --add-location, msgcomm option:        msgcomm Invocation.
-* --add-location, msgconv option:        msgconv Invocation.
-* --add-location, msgen option:          msgen Invocation.
-* --add-location, msgfilter option:      msgfilter Invocation.
-* --add-location, msggrep option:        msggrep Invocation.
-* --add-location, msgmerge option:       msgmerge Invocation.
-* --add-location, msguniq option:        msguniq Invocation.
-* --add-location, xgettext option:       xgettext Invocation.
-* --alignment, msgfmt option:            msgfmt Invocation.
-* --backup, msgmerge option:             msgmerge Invocation.
-* --c++, xgettext option:                xgettext Invocation.
-* --check, msgfmt option:                msgfmt Invocation.
-* --check-accelerators, msgfmt option:   msgfmt Invocation.
-* --check-compatibility, msgfmt option:  msgfmt Invocation.
-* --check-domain, msgfmt option:         msgfmt Invocation.
-* --check-format, msgfmt option:         msgfmt Invocation.
-* --check-header, msgfmt option:         msgfmt Invocation.
-* --clear-fuzzy, msgattrib option:       msgattrib Invocation.
-* --clear-obsolete, msgattrib option:    msgattrib Invocation.
-* --compendium, msgmerge option:         msgmerge Invocation.
-* --copy, gettextize option:             gettextize Invocation.
-* --copyright-holder, xgettext option:   xgettext Invocation.
-* --debug, xgettext option:              xgettext Invocation.
-* --default-domain, xgettext option:     xgettext Invocation.
-* --directory, msgattrib option:         msgattrib Invocation.
-* --directory, msgcat option:            msgcat Invocation.
-* --directory, msgcmp option:            msgcmp Invocation.
-* --directory, msgcomm option:           msgcomm Invocation.
-* --directory, msgconv option:           msgconv Invocation.
-* --directory, msgen option:             msgen Invocation.
-* --directory, msgexec option:           msgexec Invocation.
-* --directory, msgfilter option:         msgfilter Invocation.
-* --directory, msgfmt option:            msgfmt Invocation.
-* --directory, msggrep option:           msggrep Invocation.
-* --directory, msgmerge option:          msgmerge Invocation.
-* --directory, msguniq option:           msguniq Invocation.
-* --directory, xgettext option:          xgettext Invocation.
-* --domain, msggrep option:              msggrep Invocation.
-* --exclude-file, xgettext option:       xgettext Invocation.
-* --expression, msgfilter option:        msgfilter Invocation.
-* --extended-regexp, msggrep option:     msggrep Invocation.
-* --extract-all, xgettext option:        xgettext Invocation.
-* --file, msgfilter option:              msgfilter Invocation.
-* --file, msggrep option:                msggrep Invocation.
-* --files-from, msgcat option:           msgcat Invocation.
-* --files-from, msgcomm option:          msgcomm Invocation.
-* --files-from, xgettext option:         xgettext Invocation.
-* --fixed-strings, msggrep option:       msggrep Invocation.
-* --force, gettextize option:            gettextize Invocation.
-* --force-po, msgattrib option:          msgattrib Invocation.
-* --force-po, msgcat option:             msgcat Invocation.
-* --force-po, msgcomm option:            msgcomm Invocation.
-* --force-po, msgconv option:            msgconv Invocation.
-* --force-po, msgen option:              msgen Invocation.
-* --force-po, msgfilter option:          msgfilter Invocation.
-* --force-po, msggrep option:            msggrep Invocation.
-* --force-po, msgmerge option:           msgmerge Invocation.
-* --force-po, msgunfmt option:           msgunfmt Invocation.
-* --force-po, msguniq option:            msguniq Invocation.
-* --force-po, xgettext option:           xgettext Invocation.
-* --foreign-user, xgettext option:       xgettext Invocation.
-* --fuzzy, msgattrib option:             msgattrib Invocation.
-* --help, gettextize option:             gettextize Invocation.
-* --help, msgattrib option:              msgattrib Invocation.
-* --help, msgcat option:                 msgcat Invocation.
-* --help, msgcmp option:                 msgcmp Invocation.
-* --help, msgcomm option:                msgcomm Invocation.
-* --help, msgconv option:                msgconv Invocation.
-* --help, msgen option:                  msgen Invocation.
-* --help, msgexec option:                msgexec Invocation.
-* --help, msgfilter option:              msgfilter Invocation.
-* --help, msgfmt option:                 msgfmt Invocation.
-* --help, msggrep option:                msggrep Invocation.
-* --help, msginit option:                msginit Invocation.
-* --help, msgmerge option:               msgmerge Invocation.
-* --help, msgunfmt option:               msgunfmt Invocation.
-* --help, msguniq option:                msguniq Invocation.
-* --help, xgettext option:               xgettext Invocation.
-* --ignore-case, msggrep option:         msggrep Invocation.
-* --indent, msgattrib option:            msgattrib Invocation.
-* --indent, msgcat option:               msgcat Invocation.
-* --indent, msgcomm option:              msgcomm Invocation.
-* --indent, msgconv option:              msgconv Invocation.
-* --indent, msgen option:                msgen Invocation.
-* --indent, msgfilter option:            msgfilter Invocation.
-* --indent, msggrep option:              msggrep Invocation.
-* --indent, msgmerge option:             msgmerge Invocation.
-* --indent, msgunfmt option:             msgunfmt Invocation.
-* --indent, msguniq option:              msguniq Invocation.
-* --indent, xgettext option:             xgettext Invocation.
-* --input, msgexec option:               msgexec Invocation.
-* --input, msgfilter option:             msgfilter Invocation.
-* --input, msginit option:               msginit Invocation.
-* --intl, gettextize option:             gettextize Invocation.
-* --java, msgfmt option:                 msgfmt Invocation.
-* --java, msgunfmt option:               msgunfmt Invocation.
-* --java2, msgfmt option:                msgfmt Invocation.
-* --join-existing, xgettext option:      xgettext Invocation.
-* --keep-header, msgfilter option:       msgfilter Invocation.
-* --keyword, xgettext option:            xgettext Invocation.
-* --language, xgettext option:           xgettext Invocation.
-* --less-than, msgcat option:            msgcat Invocation.
-* --less-than, msgcomm option:           msgcomm Invocation.
-* --locale, msgfmt option:               msgfmt Invocation.
-* --locale, msginit option:              msginit Invocation.
-* --locale, msgunfmt option:             msgunfmt Invocation.
-* --location, msggrep option:            msggrep Invocation.
-* --more-than, msgcat option:            msgcat Invocation.
-* --more-than, msgcomm option:           msgcomm Invocation.
-* --msgid, msggrep option:               msggrep Invocation.
-* --msgstr, msggrep option:              msggrep Invocation.
-* --msgstr-prefix, xgettext option:      xgettext Invocation.
-* --msgstr-suffix, xgettext option:      xgettext Invocation.
-* --multi-domain, msgcmp option:         msgcmp Invocation.
-* --multi-domain, msgmerge option:       msgmerge Invocation.
-* --no-changelog, gettextize option:     gettextize Invocation.
-* --no-fuzzy, msgattrib option:          msgattrib Invocation.
-* --no-hash, msgfmt option:              msgfmt Invocation.
-* --no-location, msgattrib option:       msgattrib Invocation.
-* --no-location, msgcat option:          msgcat Invocation.
-* --no-location, msgcomm option:         msgcomm Invocation.
-* --no-location, msgconv option:         msgconv Invocation.
-* --no-location, msgen option:           msgen Invocation.
-* --no-location, msgfilter option:       msgfilter Invocation.
-* --no-location, msggrep option:         msggrep Invocation.
-* --no-location, msgmerge option:        msgmerge Invocation.
-* --no-location, msguniq option:         msguniq Invocation.
-* --no-location, xgettext option:        xgettext Invocation.
-* --no-obsolete, msgattrib option:       msgattrib Invocation.
-* --no-translator, msginit option:       msginit Invocation.
-* --no-wrap, msgattrib option:           msgattrib Invocation.
-* --no-wrap, msgcat option:              msgcat Invocation.
-* --no-wrap, msgcomm option:             msgcomm Invocation.
-* --no-wrap, msgconv option:             msgconv Invocation.
-* --no-wrap, msgen option:               msgen Invocation.
-* --no-wrap, msgfilter option:           msgfilter Invocation.
-* --no-wrap, msggrep option:             msggrep Invocation.
-* --no-wrap, msginit option:             msginit Invocation.
-* --no-wrap, msgmerge option:            msgmerge Invocation.
-* --no-wrap, msgunfmt option:            msgunfmt Invocation.
-* --no-wrap, msguniq option:             msguniq Invocation.
-* --no-wrap, xgettext option:            xgettext Invocation.
-* --obsolete, msgattrib option:          msgattrib Invocation.
-* --omit-header, msgcomm option:         msgcomm Invocation.
-* --omit-header, xgettext option:        xgettext Invocation.
-* --only-fuzzy, msgattrib option:        msgattrib Invocation.
-* --only-obsolete, msgattrib option:     msgattrib Invocation.
-* --output, xgettext option:             xgettext Invocation.
-* --output-dir, xgettext option:         xgettext Invocation.
-* --output-file, msgattrib option:       msgattrib Invocation.
-* --output-file, msgcat option:          msgcat Invocation.
-* --output-file, msgcomm option:         msgcomm Invocation.
-* --output-file, msgconv option:         msgconv Invocation.
-* --output-file, msgen option:           msgen Invocation.
-* --output-file, msgfilter option:       msgfilter Invocation.
-* --output-file, msgfmt option:          msgfmt Invocation.
-* --output-file, msggrep option:         msggrep Invocation.
-* --output-file, msginit option:         msginit Invocation.
-* --output-file, msgmerge option:        msgmerge Invocation.
-* --output-file, msgunfmt option:        msgunfmt Invocation.
-* --output-file, msguniq option:         msguniq Invocation.
-* --quiet, msgfilter option:             msgfilter Invocation.
-* --quiet, msgmerge option:              msgmerge Invocation.
-* --regexp=, msggrep option:             msggrep Invocation.
-* --repeated, msguniq option:            msguniq Invocation.
-* --resource, msgfmt option:             msgfmt Invocation.
-* --resource, msgunfmt option:           msgunfmt Invocation.
-* --set-fuzzy, msgattrib option:         msgattrib Invocation.
-* --set-obsolete, msgattrib option:      msgattrib Invocation.
-* --silent, msgfilter option:            msgfilter Invocation.
-* --silent, msgmerge option:             msgmerge Invocation.
-* --sort-by-file, msgattrib option:      msgattrib Invocation.
-* --sort-by-file, msgcat option:         msgcat Invocation.
-* --sort-by-file, msgcomm option:        msgcomm Invocation.
-* --sort-by-file, msgconv option:        msgconv Invocation.
-* --sort-by-file, msgen option:          msgen Invocation.
-* --sort-by-file, msgfilter option:      msgfilter Invocation.
-* --sort-by-file, msggrep option:        msggrep Invocation.
-* --sort-by-file, msgmerge option:       msgmerge Invocation.
-* --sort-by-file, msguniq option:        msguniq Invocation.
-* --sort-by-file, xgettext option:       xgettext Invocation.
-* --sort-output, msgattrib option:       msgattrib Invocation.
-* --sort-output, msgcat option:          msgcat Invocation.
-* --sort-output, msgcomm option:         msgcomm Invocation.
-* --sort-output, msgconv option:         msgconv Invocation.
-* --sort-output, msgen option:           msgen Invocation.
-* --sort-output, msgfilter option:       msgfilter Invocation.
-* --sort-output, msggrep option:         msggrep Invocation.
-* --sort-output, msgmerge option:        msgmerge Invocation.
-* --sort-output, msgunfmt option:        msgunfmt Invocation.
-* --sort-output, msguniq option:         msguniq Invocation.
-* --sort-output, xgettext option:        xgettext Invocation.
-* --statistics, msgfmt option:           msgfmt Invocation.
-* --strict, msgattrib option:            msgattrib Invocation.
-* --strict, msgcat option:               msgcat Invocation.
-* --strict, msgcomm option:              msgcomm Invocation.
-* --strict, msgconv option:              msgconv Invocation.
-* --strict, msgen option:                msgen Invocation.
-* --strict, msgfilter option:            msgfilter Invocation.
-* --strict, msgfmt option:               msgfmt Invocation.
-* --strict, msggrep option:              msggrep Invocation.
-* --strict, msgmerge option:             msgmerge Invocation.
-* --strict, msgunfmt option:             msgunfmt Invocation.
-* --strict, msguniq option:              msguniq Invocation.
-* --strict, xgettext option:             xgettext Invocation.
-* --suffix, msgmerge option:             msgmerge Invocation.
-* --tcl, msgfmt option:                  msgfmt Invocation.
-* --tcl, msgunfmt option:                msgunfmt Invocation.
-* --to-code, msgcat option:              msgcat Invocation.
-* --to-code, msgconv option:             msgconv Invocation.
-* --to-code, msguniq option:             msguniq Invocation.
-* --translated, msgattrib option:        msgattrib Invocation.
-* --trigraphs, xgettext option:          xgettext Invocation.
-* --unique, msgcat option:               msgcat Invocation.
-* --unique, msgcomm option:              msgcomm Invocation.
-* --unique, msguniq option:              msguniq Invocation.
-* --untranslated, msgattrib option:      msgattrib Invocation.
-* --update, msgmerge option:             msgmerge Invocation.
-* --use-first, msgcat option:            msgcat Invocation.
-* --use-first, msguniq option:           msguniq Invocation.
-* --use-fuzzy, msgfmt option:            msgfmt Invocation.
-* --verbose, msgfmt option:              msgfmt Invocation.
-* --verbose, msgmerge option:            msgmerge Invocation.
-* --verbose, msgunfmt option:            msgunfmt Invocation.
-* --version, gettextize option:          gettextize Invocation.
-* --version, msgattrib option:           msgattrib Invocation.
-* --version, msgcat option:              msgcat Invocation.
-* --version, msgcmp option:              msgcmp Invocation.
-* --version, msgcomm option:             msgcomm Invocation.
-* --version, msgconv option:             msgconv Invocation.
-* --version, msgen option:               msgen Invocation.
-* --version, msgexec option:             msgexec Invocation.
-* --version, msgfilter option:           msgfilter Invocation.
-* --version, msgfmt option:              msgfmt Invocation.
-* --version, msggrep option:             msggrep Invocation.
-* --version, msginit option:             msginit Invocation.
-* --version, msgmerge option:            msgmerge Invocation.
-* --version, msgunfmt option:            msgunfmt Invocation.
-* --version, msguniq option:             msguniq Invocation.
-* --version, xgettext option:            xgettext Invocation.
-* --width, msgattrib option:             msgattrib Invocation.
-* --width, msgcat option:                msgcat Invocation.
-* --width, msgcomm option:               msgcomm Invocation.
-* --width, msgconv option:               msgconv Invocation.
-* --width, msgen option:                 msgen Invocation.
-* --width, msgfilter option:             msgfilter Invocation.
-* --width, msggrep option:               msggrep Invocation.
-* --width, msginit option:               msginit Invocation.
-* --width, msgmerge option:              msgmerge Invocation.
-* --width, msgunfmt option:              msgunfmt Invocation.
-* --width, msguniq option:               msguniq Invocation.
-* --width, xgettext option:              xgettext Invocation.
-* -<, msgcat option:                     msgcat Invocation.
-* -<, msgcomm option:                    msgcomm Invocation.
-* ->, msgcat option:                     msgcat Invocation.
-* ->, msgcomm option:                    msgcomm Invocation.
-* -a, msgfmt option:                     msgfmt Invocation.
-* -a, xgettext option:                   xgettext Invocation.
-* -c, gettextize option:                 gettextize Invocation.
-* -C, msgfmt option:                     msgfmt Invocation.
-* -c, msgfmt option:                     msgfmt Invocation.
-* -C, msgmerge option:                   msgmerge Invocation.
-* -c, xgettext option:                   xgettext Invocation.
-* -C, xgettext option:                   xgettext Invocation.
-* -D, msgattrib option:                  msgattrib Invocation.
-* -D, msgcat option:                     msgcat Invocation.
-* -D, msgcmp option:                     msgcmp Invocation.
-* -D, msgcomm option:                    msgcomm Invocation.
-* -D, msgconv option:                    msgconv Invocation.
-* -D, msgen option:                      msgen Invocation.
-* -D, msgexec option:                    msgexec Invocation.
-* -D, msgfilter option:                  msgfilter Invocation.
-* -d, msgfmt option:                     msgfmt Invocation.
-* -D, msgfmt option:                     msgfmt Invocation.
-* -D, msggrep option:                    msggrep Invocation.
-* -D, msgmerge option:                   msgmerge Invocation.
-* -d, msgunfmt option:                   msgunfmt Invocation.
-* -d, msguniq option:                    msguniq Invocation.
-* -D, msguniq option:                    msguniq Invocation.
-* -d, xgettext option:                   xgettext Invocation.
-* -D, xgettext option:                   xgettext Invocation.
-* -e, msgfilter option:                  msgfilter Invocation.
-* -e, msggrep option:                    msggrep Invocation.
-* -E, msggrep option:                    msggrep Invocation.
-* -f, gettextize option:                 gettextize Invocation.
-* -F, msgattrib option:                  msgattrib Invocation.
-* -F, msgcat option:                     msgcat Invocation.
-* -f, msgcat option:                     msgcat Invocation.
-* -F, msgcomm option:                    msgcomm Invocation.
-* -f, msgcomm option:                    msgcomm Invocation.
-* -F, msgconv option:                    msgconv Invocation.
-* -F, msgen option:                      msgen Invocation.
-* -F, msgfilter option:                  msgfilter Invocation.
-* -f, msgfilter option:                  msgfilter Invocation.
-* -f, msgfmt option:                     msgfmt Invocation.
-* -f, msggrep option:                    msggrep Invocation.
-* -F, msggrep option:                    msggrep Invocation.
-* -F, msgmerge option:                   msgmerge Invocation.
-* -F, msguniq option:                    msguniq Invocation.
-* -F, xgettext option:                   xgettext Invocation.
-* -f, xgettext option:                   xgettext Invocation.
-* -h, msgattrib option:                  msgattrib Invocation.
-* -h, msgcat option:                     msgcat Invocation.
-* -h, msgcmp option:                     msgcmp Invocation.
-* -h, msgcomm option:                    msgcomm Invocation.
-* -h, msgconv option:                    msgconv Invocation.
-* -h, msgen option:                      msgen Invocation.
-* -h, msgexec option:                    msgexec Invocation.
-* -h, msgfilter option:                  msgfilter Invocation.
-* -h, msgfmt option:                     msgfmt Invocation.
-* -h, msggrep option:                    msggrep Invocation.
-* -h, msginit option:                    msginit Invocation.
-* -h, msgmerge option:                   msgmerge Invocation.
-* -h, msgunfmt option:                   msgunfmt Invocation.
-* -h, msguniq option:                    msguniq Invocation.
-* -h, xgettext option:                   xgettext Invocation.
-* -i, msgattrib option:                  msgattrib Invocation.
-* -i, msgcat option:                     msgcat Invocation.
-* -i, msgcomm option:                    msgcomm Invocation.
-* -i, msgconv option:                    msgconv Invocation.
-* -i, msgen option:                      msgen Invocation.
-* -i, msgexec option:                    msgexec Invocation.
-* -i, msgfilter option:                  msgfilter Invocation.
-* -i, msggrep option:                    msggrep Invocation.
-* -i, msginit option:                    msginit Invocation.
-* -i, msgmerge option:                   msgmerge Invocation.
-* -i, msgunfmt option:                   msgunfmt Invocation.
-* -i, msguniq option:                    msguniq Invocation.
-* -i, xgettext option:                   xgettext Invocation.
-* -j, msgfmt option:                     msgfmt Invocation.
-* -j, msgunfmt option:                   msgunfmt Invocation.
-* -j, xgettext option:                   xgettext Invocation.
-* -K, msggrep option:                    msggrep Invocation.
-* -k, xgettext option:                   xgettext Invocation.
-* -l, msgfmt option:                     msgfmt Invocation.
-* -l, msginit option:                    msginit Invocation.
-* -l, msgunfmt option:                   msgunfmt Invocation.
-* -L, xgettext option:                   xgettext Invocation.
-* -m, msgcmp option:                     msgcmp Invocation.
-* -M, msggrep option:                    msggrep Invocation.
-* -m, msgmerge option:                   msgmerge Invocation.
-* -M, xgettext option:                   xgettext Invocation.
-* -m, xgettext option:                   xgettext Invocation.
-* -n, msgattrib option:                  msgattrib Invocation.
-* -n, msgcat option:                     msgcat Invocation.
-* -n, msgcomm option:                    msgcomm Invocation.
-* -n, msgfilter option:                  msgfilter Invocation.
-* -N, msggrep option:                    msggrep Invocation.
-* -n, msguniq option:                    msguniq Invocation.
-* -n, xgettext option:                   xgettext Invocation.
-* -o, msgattrib option:                  msgattrib Invocation.
-* -o, msgcat option:                     msgcat Invocation.
-* -o, msgcomm option:                    msgcomm Invocation.
-* -o, msgconv option:                    msgconv Invocation.
-* -o, msgen option:                      msgen Invocation.
-* -o, msgfilter option:                  msgfilter Invocation.
-* -o, msgfmt option:                     msgfmt Invocation.
-* -o, msggrep option:                    msggrep Invocation.
-* -o, msginit option:                    msginit Invocation.
-* -o, msgmerge option:                   msgmerge Invocation.
-* -o, msgunfmt option:                   msgunfmt Invocation.
-* -o, msguniq option:                    msguniq Invocation.
-* -o, xgettext option:                   xgettext Invocation.
-* -p, xgettext option:                   xgettext Invocation.
-* -q, msgmerge option:                   msgmerge Invocation.
-* -r, msgfmt option:                     msgfmt Invocation.
-* -r, msgunfmt option:                   msgunfmt Invocation.
-* -s, msgattrib option:                  msgattrib Invocation.
-* -s, msgcat option:                     msgcat Invocation.
-* -s, msgcomm option:                    msgcomm Invocation.
-* -s, msgconv option:                    msgconv Invocation.
-* -s, msgen option:                      msgen Invocation.
-* -s, msgfilter option:                  msgfilter Invocation.
-* -s, msgmerge option:                   msgmerge Invocation.
-* -s, msgunfmt option:                   msgunfmt Invocation.
-* -s, msguniq option:                    msguniq Invocation.
-* -s, xgettext option:                   xgettext Invocation.
-* -t, msgcat option:                     msgcat Invocation.
-* -t, msgconv option:                    msgconv Invocation.
-* -T, msggrep option:                    msggrep Invocation.
-* -t, msguniq option:                    msguniq Invocation.
-* -T, xgettext option:                   xgettext Invocation.
-* -u, msgcat option:                     msgcat Invocation.
-* -u, msgcomm option:                    msgcomm Invocation.
-* -U, msgmerge option:                   msgmerge Invocation.
-* -u, msguniq option:                    msguniq Invocation.
-* -V, msgattrib option:                  msgattrib Invocation.
-* -V, msgcat option:                     msgcat Invocation.
-* -V, msgcmp option:                     msgcmp Invocation.
-* -V, msgcomm option:                    msgcomm Invocation.
-* -V, msgconv option:                    msgconv Invocation.
-* -V, msgen option:                      msgen Invocation.
-* -V, msgexec option:                    msgexec Invocation.
-* -V, msgfilter option:                  msgfilter Invocation.
-* -v, msgfmt option:                     msgfmt Invocation.
-* -V, msgfmt option:                     msgfmt Invocation.
-* -V, msggrep option:                    msggrep Invocation.
-* -V, msginit option:                    msginit Invocation.
-* -v, msgmerge option:                   msgmerge Invocation.
-* -V, msgmerge option:                   msgmerge Invocation.
-* -v, msgunfmt option:                   msgunfmt Invocation.
-* -V, msgunfmt option:                   msgunfmt Invocation.
-* -V, msguniq option:                    msguniq Invocation.
-* -V, xgettext option:                   xgettext Invocation.
-* -w, msgattrib option:                  msgattrib Invocation.
-* -w, msgcat option:                     msgcat Invocation.
-* -w, msgcomm option:                    msgcomm Invocation.
-* -w, msgconv option:                    msgconv Invocation.
-* -w, msgen option:                      msgen Invocation.
-* -w, msgfilter option:                  msgfilter Invocation.
-* -w, msggrep option:                    msggrep Invocation.
-* -w, msginit option:                    msginit Invocation.
-* -w, msgmerge option:                   msgmerge Invocation.
-* -w, msgunfmt option:                   msgunfmt Invocation.
-* -w, msguniq option:                    msguniq Invocation.
-* -w, xgettext option:                   xgettext Invocation.
-* -x, xgettext option:                   xgettext Invocation.
-
-
-File: gettext.info,  Node: Variable Index,  Next: PO Mode Index,  Prev: Option Index,  Up: Top
-
-Variable Index
-**************
-
-* Menu:
-
-* LANG, environment variable <1>:        gettext grok.
-* LANG, environment variable:            End Users.
-* LANGUAGE, environment variable <1>:    po/Makevars.
-* LANGUAGE, environment variable:        gettext grok.
-* LC_ALL, environment variable:          gettext grok.
-* LC_COLLATE, environment variable:      gettext grok.
-* LC_CTYPE, environment variable:        gettext grok.
-* LC_MESSAGES, environment variable:     gettext grok.
-* LC_MONETARY, environment variable:     gettext grok.
-* LC_NUMERIC, environment variable:      gettext grok.
-* LC_TIME, environment variable:         gettext grok.
-* LINGUAS, environment variable:         Installers.
-* MSGEXEC_LOCATION, environment variable: msgexec Invocation.
-* MSGEXEC_MSGID, environment variable:   msgexec Invocation.
-* TEXTDOMAIN, environment variable <1>:  bash.
-* TEXTDOMAIN, environment variable:      sh.
-* TEXTDOMAINDIR, environment variable <1>: bash.
-* TEXTDOMAINDIR, environment variable:   sh.
-
diff --git a/doc/gettext.info-9 b/doc/gettext.info-9
index c1b4e01d9..a38ee84c3 100644
--- a/doc/gettext.info-9
+++ b/doc/gettext.info-9
@@ -30,6 +30,470 @@ manual into another language, under the above conditions for modified
 versions, except that this permission notice may be stated in a
 translation approved by the Foundation.
 
+
+File: gettext.info,  Node: Option Index,  Next: Variable Index,  Prev: Program Index,  Up: Top
+
+Option Index
+************
+
+* Menu:
+
+* --add-comments, xgettext option:       xgettext Invocation.
+* --add-location, msgattrib option:      msgattrib Invocation.
+* --add-location, msgcat option:         msgcat Invocation.
+* --add-location, msgcomm option:        msgcomm Invocation.
+* --add-location, msgconv option:        msgconv Invocation.
+* --add-location, msgen option:          msgen Invocation.
+* --add-location, msgfilter option:      msgfilter Invocation.
+* --add-location, msggrep option:        msggrep Invocation.
+* --add-location, msgmerge option:       msgmerge Invocation.
+* --add-location, msguniq option:        msguniq Invocation.
+* --add-location, xgettext option:       xgettext Invocation.
+* --alignment, msgfmt option:            msgfmt Invocation.
+* --backup, msgmerge option:             msgmerge Invocation.
+* --c++, xgettext option:                xgettext Invocation.
+* --check, msgfmt option:                msgfmt Invocation.
+* --check-accelerators, msgfmt option:   msgfmt Invocation.
+* --check-compatibility, msgfmt option:  msgfmt Invocation.
+* --check-domain, msgfmt option:         msgfmt Invocation.
+* --check-format, msgfmt option:         msgfmt Invocation.
+* --check-header, msgfmt option:         msgfmt Invocation.
+* --clear-fuzzy, msgattrib option:       msgattrib Invocation.
+* --clear-obsolete, msgattrib option:    msgattrib Invocation.
+* --compendium, msgmerge option:         msgmerge Invocation.
+* --copy, gettextize option:             gettextize Invocation.
+* --copyright-holder, xgettext option:   xgettext Invocation.
+* --debug, xgettext option:              xgettext Invocation.
+* --default-domain, xgettext option:     xgettext Invocation.
+* --directory, msgattrib option:         msgattrib Invocation.
+* --directory, msgcat option:            msgcat Invocation.
+* --directory, msgcmp option:            msgcmp Invocation.
+* --directory, msgcomm option:           msgcomm Invocation.
+* --directory, msgconv option:           msgconv Invocation.
+* --directory, msgen option:             msgen Invocation.
+* --directory, msgexec option:           msgexec Invocation.
+* --directory, msgfilter option:         msgfilter Invocation.
+* --directory, msgfmt option:            msgfmt Invocation.
+* --directory, msggrep option:           msggrep Invocation.
+* --directory, msgmerge option:          msgmerge Invocation.
+* --directory, msguniq option:           msguniq Invocation.
+* --directory, xgettext option:          xgettext Invocation.
+* --domain, msggrep option:              msggrep Invocation.
+* --dry-run, autopoint option:           autopoint Invocation.
+* --dry-run, gettextize option:          gettextize Invocation.
+* --exclude-file, xgettext option:       xgettext Invocation.
+* --expression, msgfilter option:        msgfilter Invocation.
+* --extended-regexp, msggrep option:     msggrep Invocation.
+* --extract-all, xgettext option:        xgettext Invocation.
+* --file, msgfilter option:              msgfilter Invocation.
+* --file, msggrep option:                msggrep Invocation.
+* --files-from, msgcat option:           msgcat Invocation.
+* --files-from, msgcomm option:          msgcomm Invocation.
+* --files-from, xgettext option:         xgettext Invocation.
+* --fixed-strings, msggrep option:       msggrep Invocation.
+* --force, autopoint option:             autopoint Invocation.
+* --force, gettextize option:            gettextize Invocation.
+* --force-po, msgattrib option:          msgattrib Invocation.
+* --force-po, msgcat option:             msgcat Invocation.
+* --force-po, msgcomm option:            msgcomm Invocation.
+* --force-po, msgconv option:            msgconv Invocation.
+* --force-po, msgen option:              msgen Invocation.
+* --force-po, msgfilter option:          msgfilter Invocation.
+* --force-po, msggrep option:            msggrep Invocation.
+* --force-po, msgmerge option:           msgmerge Invocation.
+* --force-po, msgunfmt option:           msgunfmt Invocation.
+* --force-po, msguniq option:            msguniq Invocation.
+* --force-po, xgettext option:           xgettext Invocation.
+* --foreign-user, xgettext option:       xgettext Invocation.
+* --fuzzy, msgattrib option:             msgattrib Invocation.
+* --help, autopoint option:              autopoint Invocation.
+* --help, gettextize option:             gettextize Invocation.
+* --help, msgattrib option:              msgattrib Invocation.
+* --help, msgcat option:                 msgcat Invocation.
+* --help, msgcmp option:                 msgcmp Invocation.
+* --help, msgcomm option:                msgcomm Invocation.
+* --help, msgconv option:                msgconv Invocation.
+* --help, msgen option:                  msgen Invocation.
+* --help, msgexec option:                msgexec Invocation.
+* --help, msgfilter option:              msgfilter Invocation.
+* --help, msgfmt option:                 msgfmt Invocation.
+* --help, msggrep option:                msggrep Invocation.
+* --help, msginit option:                msginit Invocation.
+* --help, msgmerge option:               msgmerge Invocation.
+* --help, msgunfmt option:               msgunfmt Invocation.
+* --help, msguniq option:                msguniq Invocation.
+* --help, xgettext option:               xgettext Invocation.
+* --ignore-case, msggrep option:         msggrep Invocation.
+* --indent, msgattrib option:            msgattrib Invocation.
+* --indent, msgcat option:               msgcat Invocation.
+* --indent, msgcomm option:              msgcomm Invocation.
+* --indent, msgconv option:              msgconv Invocation.
+* --indent, msgen option:                msgen Invocation.
+* --indent, msgfilter option:            msgfilter Invocation.
+* --indent, msggrep option:              msggrep Invocation.
+* --indent, msgmerge option:             msgmerge Invocation.
+* --indent, msgunfmt option:             msgunfmt Invocation.
+* --indent, msguniq option:              msguniq Invocation.
+* --indent, xgettext option:             xgettext Invocation.
+* --input, msgexec option:               msgexec Invocation.
+* --input, msgfilter option:             msgfilter Invocation.
+* --input, msginit option:               msginit Invocation.
+* --intl, gettextize option:             gettextize Invocation.
+* --java, msgfmt option:                 msgfmt Invocation.
+* --java, msgunfmt option:               msgunfmt Invocation.
+* --java2, msgfmt option:                msgfmt Invocation.
+* --join-existing, xgettext option:      xgettext Invocation.
+* --keep-header, msgfilter option:       msgfilter Invocation.
+* --keyword, xgettext option:            xgettext Invocation.
+* --language, xgettext option:           xgettext Invocation.
+* --less-than, msgcat option:            msgcat Invocation.
+* --less-than, msgcomm option:           msgcomm Invocation.
+* --locale, msgfmt option:               msgfmt Invocation.
+* --locale, msginit option:              msginit Invocation.
+* --locale, msgunfmt option:             msgunfmt Invocation.
+* --location, msggrep option:            msggrep Invocation.
+* --more-than, msgcat option:            msgcat Invocation.
+* --more-than, msgcomm option:           msgcomm Invocation.
+* --msgid, msggrep option:               msggrep Invocation.
+* --msgstr, msggrep option:              msggrep Invocation.
+* --msgstr-prefix, xgettext option:      xgettext Invocation.
+* --msgstr-suffix, xgettext option:      xgettext Invocation.
+* --multi-domain, msgcmp option:         msgcmp Invocation.
+* --multi-domain, msgmerge option:       msgmerge Invocation.
+* --no-changelog, gettextize option:     gettextize Invocation.
+* --no-fuzzy, msgattrib option:          msgattrib Invocation.
+* --no-hash, msgfmt option:              msgfmt Invocation.
+* --no-location, msgattrib option:       msgattrib Invocation.
+* --no-location, msgcat option:          msgcat Invocation.
+* --no-location, msgcomm option:         msgcomm Invocation.
+* --no-location, msgconv option:         msgconv Invocation.
+* --no-location, msgen option:           msgen Invocation.
+* --no-location, msgfilter option:       msgfilter Invocation.
+* --no-location, msggrep option:         msggrep Invocation.
+* --no-location, msgmerge option:        msgmerge Invocation.
+* --no-location, msguniq option:         msguniq Invocation.
+* --no-location, xgettext option:        xgettext Invocation.
+* --no-obsolete, msgattrib option:       msgattrib Invocation.
+* --no-translator, msginit option:       msginit Invocation.
+* --no-wrap, msgattrib option:           msgattrib Invocation.
+* --no-wrap, msgcat option:              msgcat Invocation.
+* --no-wrap, msgcomm option:             msgcomm Invocation.
+* --no-wrap, msgconv option:             msgconv Invocation.
+* --no-wrap, msgen option:               msgen Invocation.
+* --no-wrap, msgfilter option:           msgfilter Invocation.
+* --no-wrap, msggrep option:             msggrep Invocation.
+* --no-wrap, msginit option:             msginit Invocation.
+* --no-wrap, msgmerge option:            msgmerge Invocation.
+* --no-wrap, msgunfmt option:            msgunfmt Invocation.
+* --no-wrap, msguniq option:             msguniq Invocation.
+* --no-wrap, xgettext option:            xgettext Invocation.
+* --obsolete, msgattrib option:          msgattrib Invocation.
+* --omit-header, msgcomm option:         msgcomm Invocation.
+* --omit-header, xgettext option:        xgettext Invocation.
+* --only-fuzzy, msgattrib option:        msgattrib Invocation.
+* --only-obsolete, msgattrib option:     msgattrib Invocation.
+* --output, xgettext option:             xgettext Invocation.
+* --output-dir, xgettext option:         xgettext Invocation.
+* --output-file, msgattrib option:       msgattrib Invocation.
+* --output-file, msgcat option:          msgcat Invocation.
+* --output-file, msgcomm option:         msgcomm Invocation.
+* --output-file, msgconv option:         msgconv Invocation.
+* --output-file, msgen option:           msgen Invocation.
+* --output-file, msgfilter option:       msgfilter Invocation.
+* --output-file, msgfmt option:          msgfmt Invocation.
+* --output-file, msggrep option:         msggrep Invocation.
+* --output-file, msginit option:         msginit Invocation.
+* --output-file, msgmerge option:        msgmerge Invocation.
+* --output-file, msgunfmt option:        msgunfmt Invocation.
+* --output-file, msguniq option:         msguniq Invocation.
+* --quiet, msgfilter option:             msgfilter Invocation.
+* --quiet, msgmerge option:              msgmerge Invocation.
+* --regexp=, msggrep option:             msggrep Invocation.
+* --repeated, msguniq option:            msguniq Invocation.
+* --resource, msgfmt option:             msgfmt Invocation.
+* --resource, msgunfmt option:           msgunfmt Invocation.
+* --set-fuzzy, msgattrib option:         msgattrib Invocation.
+* --set-obsolete, msgattrib option:      msgattrib Invocation.
+* --silent, msgfilter option:            msgfilter Invocation.
+* --silent, msgmerge option:             msgmerge Invocation.
+* --sort-by-file, msgattrib option:      msgattrib Invocation.
+* --sort-by-file, msgcat option:         msgcat Invocation.
+* --sort-by-file, msgcomm option:        msgcomm Invocation.
+* --sort-by-file, msgconv option:        msgconv Invocation.
+* --sort-by-file, msgen option:          msgen Invocation.
+* --sort-by-file, msgfilter option:      msgfilter Invocation.
+* --sort-by-file, msggrep option:        msggrep Invocation.
+* --sort-by-file, msgmerge option:       msgmerge Invocation.
+* --sort-by-file, msguniq option:        msguniq Invocation.
+* --sort-by-file, xgettext option:       xgettext Invocation.
+* --sort-output, msgattrib option:       msgattrib Invocation.
+* --sort-output, msgcat option:          msgcat Invocation.
+* --sort-output, msgcomm option:         msgcomm Invocation.
+* --sort-output, msgconv option:         msgconv Invocation.
+* --sort-output, msgen option:           msgen Invocation.
+* --sort-output, msgfilter option:       msgfilter Invocation.
+* --sort-output, msggrep option:         msggrep Invocation.
+* --sort-output, msgmerge option:        msgmerge Invocation.
+* --sort-output, msgunfmt option:        msgunfmt Invocation.
+* --sort-output, msguniq option:         msguniq Invocation.
+* --sort-output, xgettext option:        xgettext Invocation.
+* --statistics, msgfmt option:           msgfmt Invocation.
+* --strict, msgattrib option:            msgattrib Invocation.
+* --strict, msgcat option:               msgcat Invocation.
+* --strict, msgcomm option:              msgcomm Invocation.
+* --strict, msgconv option:              msgconv Invocation.
+* --strict, msgen option:                msgen Invocation.
+* --strict, msgfilter option:            msgfilter Invocation.
+* --strict, msgfmt option:               msgfmt Invocation.
+* --strict, msggrep option:              msggrep Invocation.
+* --strict, msgmerge option:             msgmerge Invocation.
+* --strict, msgunfmt option:             msgunfmt Invocation.
+* --strict, msguniq option:              msguniq Invocation.
+* --strict, xgettext option:             xgettext Invocation.
+* --suffix, msgmerge option:             msgmerge Invocation.
+* --tcl, msgfmt option:                  msgfmt Invocation.
+* --tcl, msgunfmt option:                msgunfmt Invocation.
+* --to-code, msgcat option:              msgcat Invocation.
+* --to-code, msgconv option:             msgconv Invocation.
+* --to-code, msguniq option:             msguniq Invocation.
+* --translated, msgattrib option:        msgattrib Invocation.
+* --trigraphs, xgettext option:          xgettext Invocation.
+* --unique, msgcat option:               msgcat Invocation.
+* --unique, msgcomm option:              msgcomm Invocation.
+* --unique, msguniq option:              msguniq Invocation.
+* --untranslated, msgattrib option:      msgattrib Invocation.
+* --update, msgmerge option:             msgmerge Invocation.
+* --use-first, msgcat option:            msgcat Invocation.
+* --use-first, msguniq option:           msguniq Invocation.
+* --use-fuzzy, msgfmt option:            msgfmt Invocation.
+* --verbose, msgfmt option:              msgfmt Invocation.
+* --verbose, msgmerge option:            msgmerge Invocation.
+* --verbose, msgunfmt option:            msgunfmt Invocation.
+* --version, autopoint option:           autopoint Invocation.
+* --version, gettextize option:          gettextize Invocation.
+* --version, msgattrib option:           msgattrib Invocation.
+* --version, msgcat option:              msgcat Invocation.
+* --version, msgcmp option:              msgcmp Invocation.
+* --version, msgcomm option:             msgcomm Invocation.
+* --version, msgconv option:             msgconv Invocation.
+* --version, msgen option:               msgen Invocation.
+* --version, msgexec option:             msgexec Invocation.
+* --version, msgfilter option:           msgfilter Invocation.
+* --version, msgfmt option:              msgfmt Invocation.
+* --version, msggrep option:             msggrep Invocation.
+* --version, msginit option:             msginit Invocation.
+* --version, msgmerge option:            msgmerge Invocation.
+* --version, msgunfmt option:            msgunfmt Invocation.
+* --version, msguniq option:             msguniq Invocation.
+* --version, xgettext option:            xgettext Invocation.
+* --width, msgattrib option:             msgattrib Invocation.
+* --width, msgcat option:                msgcat Invocation.
+* --width, msgcomm option:               msgcomm Invocation.
+* --width, msgconv option:               msgconv Invocation.
+* --width, msgen option:                 msgen Invocation.
+* --width, msgfilter option:             msgfilter Invocation.
+* --width, msggrep option:               msggrep Invocation.
+* --width, msginit option:               msginit Invocation.
+* --width, msgmerge option:              msgmerge Invocation.
+* --width, msgunfmt option:              msgunfmt Invocation.
+* --width, msguniq option:               msguniq Invocation.
+* --width, xgettext option:              xgettext Invocation.
+* -<, msgcat option:                     msgcat Invocation.
+* -<, msgcomm option:                    msgcomm Invocation.
+* ->, msgcat option:                     msgcat Invocation.
+* ->, msgcomm option:                    msgcomm Invocation.
+* -a, msgfmt option:                     msgfmt Invocation.
+* -a, xgettext option:                   xgettext Invocation.
+* -c, gettextize option:                 gettextize Invocation.
+* -C, msgfmt option:                     msgfmt Invocation.
+* -c, msgfmt option:                     msgfmt Invocation.
+* -C, msgmerge option:                   msgmerge Invocation.
+* -c, xgettext option:                   xgettext Invocation.
+* -C, xgettext option:                   xgettext Invocation.
+* -d, autopoint option:                  autopoint Invocation.
+* -d, gettextize option:                 gettextize Invocation.
+* -D, msgattrib option:                  msgattrib Invocation.
+* -D, msgcat option:                     msgcat Invocation.
+* -D, msgcmp option:                     msgcmp Invocation.
+* -D, msgcomm option:                    msgcomm Invocation.
+* -D, msgconv option:                    msgconv Invocation.
+* -D, msgen option:                      msgen Invocation.
+* -D, msgexec option:                    msgexec Invocation.
+* -D, msgfilter option:                  msgfilter Invocation.
+* -d, msgfmt option:                     msgfmt Invocation.
+* -D, msgfmt option:                     msgfmt Invocation.
+* -D, msggrep option:                    msggrep Invocation.
+* -D, msgmerge option:                   msgmerge Invocation.
+* -d, msgunfmt option:                   msgunfmt Invocation.
+* -d, msguniq option:                    msguniq Invocation.
+* -D, msguniq option:                    msguniq Invocation.
+* -d, xgettext option:                   xgettext Invocation.
+* -D, xgettext option:                   xgettext Invocation.
+* -e, msgfilter option:                  msgfilter Invocation.
+* -e, msggrep option:                    msggrep Invocation.
+* -E, msggrep option:                    msggrep Invocation.
+* -f, autopoint option:                  autopoint Invocation.
+* -f, gettextize option:                 gettextize Invocation.
+* -F, msgattrib option:                  msgattrib Invocation.
+* -F, msgcat option:                     msgcat Invocation.
+* -f, msgcat option:                     msgcat Invocation.
+* -F, msgcomm option:                    msgcomm Invocation.
+* -f, msgcomm option:                    msgcomm Invocation.
+* -F, msgconv option:                    msgconv Invocation.
+* -F, msgen option:                      msgen Invocation.
+* -F, msgfilter option:                  msgfilter Invocation.
+* -f, msgfilter option:                  msgfilter Invocation.
+* -f, msgfmt option:                     msgfmt Invocation.
+* -f, msggrep option:                    msggrep Invocation.
+* -F, msggrep option:                    msggrep Invocation.
+* -F, msgmerge option:                   msgmerge Invocation.
+* -F, msguniq option:                    msguniq Invocation.
+* -F, xgettext option:                   xgettext Invocation.
+* -f, xgettext option:                   xgettext Invocation.
+* -h, msgattrib option:                  msgattrib Invocation.
+* -h, msgcat option:                     msgcat Invocation.
+* -h, msgcmp option:                     msgcmp Invocation.
+* -h, msgcomm option:                    msgcomm Invocation.
+* -h, msgconv option:                    msgconv Invocation.
+* -h, msgen option:                      msgen Invocation.
+* -h, msgexec option:                    msgexec Invocation.
+* -h, msgfilter option:                  msgfilter Invocation.
+* -h, msgfmt option:                     msgfmt Invocation.
+* -h, msggrep option:                    msggrep Invocation.
+* -h, msginit option:                    msginit Invocation.
+* -h, msgmerge option:                   msgmerge Invocation.
+* -h, msgunfmt option:                   msgunfmt Invocation.
+* -h, msguniq option:                    msguniq Invocation.
+* -h, xgettext option:                   xgettext Invocation.
+* -i, msgattrib option:                  msgattrib Invocation.
+* -i, msgcat option:                     msgcat Invocation.
+* -i, msgcomm option:                    msgcomm Invocation.
+* -i, msgconv option:                    msgconv Invocation.
+* -i, msgen option:                      msgen Invocation.
+* -i, msgexec option:                    msgexec Invocation.
+* -i, msgfilter option:                  msgfilter Invocation.
+* -i, msggrep option:                    msggrep Invocation.
+* -i, msginit option:                    msginit Invocation.
+* -i, msgmerge option:                   msgmerge Invocation.
+* -i, msgunfmt option:                   msgunfmt Invocation.
+* -i, msguniq option:                    msguniq Invocation.
+* -i, xgettext option:                   xgettext Invocation.
+* -j, msgfmt option:                     msgfmt Invocation.
+* -j, msgunfmt option:                   msgunfmt Invocation.
+* -j, xgettext option:                   xgettext Invocation.
+* -K, msggrep option:                    msggrep Invocation.
+* -k, xgettext option:                   xgettext Invocation.
+* -l, msgfmt option:                     msgfmt Invocation.
+* -l, msginit option:                    msginit Invocation.
+* -l, msgunfmt option:                   msgunfmt Invocation.
+* -L, xgettext option:                   xgettext Invocation.
+* -m, msgcmp option:                     msgcmp Invocation.
+* -M, msggrep option:                    msggrep Invocation.
+* -m, msgmerge option:                   msgmerge Invocation.
+* -M, xgettext option:                   xgettext Invocation.
+* -m, xgettext option:                   xgettext Invocation.
+* -n, msgattrib option:                  msgattrib Invocation.
+* -n, msgcat option:                     msgcat Invocation.
+* -n, msgcomm option:                    msgcomm Invocation.
+* -n, msgfilter option:                  msgfilter Invocation.
+* -N, msggrep option:                    msggrep Invocation.
+* -n, msguniq option:                    msguniq Invocation.
+* -n, xgettext option:                   xgettext Invocation.
+* -o, msgattrib option:                  msgattrib Invocation.
+* -o, msgcat option:                     msgcat Invocation.
+* -o, msgcomm option:                    msgcomm Invocation.
+* -o, msgconv option:                    msgconv Invocation.
+* -o, msgen option:                      msgen Invocation.
+* -o, msgfilter option:                  msgfilter Invocation.
+* -o, msgfmt option:                     msgfmt Invocation.
+* -o, msggrep option:                    msggrep Invocation.
+* -o, msginit option:                    msginit Invocation.
+* -o, msgmerge option:                   msgmerge Invocation.
+* -o, msgunfmt option:                   msgunfmt Invocation.
+* -o, msguniq option:                    msguniq Invocation.
+* -o, xgettext option:                   xgettext Invocation.
+* -p, xgettext option:                   xgettext Invocation.
+* -q, msgmerge option:                   msgmerge Invocation.
+* -r, msgfmt option:                     msgfmt Invocation.
+* -r, msgunfmt option:                   msgunfmt Invocation.
+* -s, msgattrib option:                  msgattrib Invocation.
+* -s, msgcat option:                     msgcat Invocation.
+* -s, msgcomm option:                    msgcomm Invocation.
+* -s, msgconv option:                    msgconv Invocation.
+* -s, msgen option:                      msgen Invocation.
+* -s, msgfilter option:                  msgfilter Invocation.
+* -s, msgmerge option:                   msgmerge Invocation.
+* -s, msgunfmt option:                   msgunfmt Invocation.
+* -s, msguniq option:                    msguniq Invocation.
+* -s, xgettext option:                   xgettext Invocation.
+* -t, msgcat option:                     msgcat Invocation.
+* -t, msgconv option:                    msgconv Invocation.
+* -T, msggrep option:                    msggrep Invocation.
+* -t, msguniq option:                    msguniq Invocation.
+* -T, xgettext option:                   xgettext Invocation.
+* -u, msgcat option:                     msgcat Invocation.
+* -u, msgcomm option:                    msgcomm Invocation.
+* -U, msgmerge option:                   msgmerge Invocation.
+* -u, msguniq option:                    msguniq Invocation.
+* -V, msgattrib option:                  msgattrib Invocation.
+* -V, msgcat option:                     msgcat Invocation.
+* -V, msgcmp option:                     msgcmp Invocation.
+* -V, msgcomm option:                    msgcomm Invocation.
+* -V, msgconv option:                    msgconv Invocation.
+* -V, msgen option:                      msgen Invocation.
+* -V, msgexec option:                    msgexec Invocation.
+* -V, msgfilter option:                  msgfilter Invocation.
+* -v, msgfmt option:                     msgfmt Invocation.
+* -V, msgfmt option:                     msgfmt Invocation.
+* -V, msggrep option:                    msggrep Invocation.
+* -V, msginit option:                    msginit Invocation.
+* -v, msgmerge option:                   msgmerge Invocation.
+* -V, msgmerge option:                   msgmerge Invocation.
+* -v, msgunfmt option:                   msgunfmt Invocation.
+* -V, msgunfmt option:                   msgunfmt Invocation.
+* -V, msguniq option:                    msguniq Invocation.
+* -V, xgettext option:                   xgettext Invocation.
+* -w, msgattrib option:                  msgattrib Invocation.
+* -w, msgcat option:                     msgcat Invocation.
+* -w, msgcomm option:                    msgcomm Invocation.
+* -w, msgconv option:                    msgconv Invocation.
+* -w, msgen option:                      msgen Invocation.
+* -w, msgfilter option:                  msgfilter Invocation.
+* -w, msggrep option:                    msggrep Invocation.
+* -w, msginit option:                    msginit Invocation.
+* -w, msgmerge option:                   msgmerge Invocation.
+* -w, msgunfmt option:                   msgunfmt Invocation.
+* -w, msguniq option:                    msguniq Invocation.
+* -w, xgettext option:                   xgettext Invocation.
+* -x, xgettext option:                   xgettext Invocation.
+
+
+File: gettext.info,  Node: Variable Index,  Next: PO Mode Index,  Prev: Option Index,  Up: Top
+
+Variable Index
+**************
+
+* Menu:
+
+* LANG, environment variable <1>:        gettext grok.
+* LANG, environment variable:            End Users.
+* LANGUAGE, environment variable <1>:    po/Makevars.
+* LANGUAGE, environment variable:        gettext grok.
+* LC_ALL, environment variable:          gettext grok.
+* LC_COLLATE, environment variable:      gettext grok.
+* LC_CTYPE, environment variable:        gettext grok.
+* LC_MESSAGES, environment variable:     gettext grok.
+* LC_MONETARY, environment variable:     gettext grok.
+* LC_NUMERIC, environment variable:      gettext grok.
+* LC_TIME, environment variable:         gettext grok.
+* LINGUAS, environment variable:         Installers.
+* MSGEXEC_LOCATION, environment variable: msgexec Invocation.
+* MSGEXEC_MSGID, environment variable:   msgexec Invocation.
+* TEXTDOMAIN, environment variable <1>:  bash.
+* TEXTDOMAIN, environment variable:      sh.
+* TEXTDOMAINDIR, environment variable <1>: bash.
+* TEXTDOMAINDIR, environment variable:   sh.
+
 
 File: gettext.info,  Node: PO Mode Index,  Next: Autoconf Macro Index,  Prev: Variable Index,  Up: Top
 
@@ -204,298 +668,6 @@ Autoconf Macro Index
 * Menu:
 
 * AM_GNU_GETTEXT:                        AM_GNU_GETTEXT.
+* AM_GNU_GETTEXT_VERSION:                AM_GNU_GETTEXT_VERSION.
 * AM_ICONV:                              AM_ICONV.
 
-
-File: gettext.info,  Node: Index,  Prev: Autoconf Macro Index,  Up: Top
-
-General Index
-*************
-
-* Menu:
-
-* _, a macro to mark strings for translation: Mark Keywords.
-* _nl_msg_cat_cntr:                      gettext grok.
-* ABOUT-NLS file:                        Matrix.
-* acconfig.h file:                       acconfig.
-* accumulating translations:             Creating Compendia.
-* aclocal.m4 file:                       aclocal.
-* adding keywords, xgettext:             xgettext Invocation.
-* ambiguities:                           Preparing Strings.
-* apply a filter to translations:        msgfilter Invocation.
-* apply command to all translations in a catalog: msgexec Invocation.
-* attribute manipulation:                msgattrib Invocation.
-* attribute, fuzzy:                      Fuzzy Entries.
-* attributes of a PO file entry:         Fuzzy Entries.
-* attributes, manipulating:              Manipulating.
-* autoconf macros for gettext:           autoconf macros.
-* auxiliary PO file:                     Auxiliary.
-* available translations:                Matrix.
-* awk:                                   gawk.
-* backup old file, and msgmerge program: msgmerge Invocation.
-* bash:                                  bash.
-* bibliography:                          References.
-* big picture:                           Overview.
-* bind_textdomain_codeset:               Charset conversion.
-* bug report address:                    Introduction.
-* C and C-like languages:                C.
-* C trigraphs:                           xgettext Invocation.
-* c-format flag:                         PO Files.
-* c-format, and xgettext:                c-format.
-* catalog encoding and msgexec output:   msgexec Invocation.
-* catclose, a catgets function:          Interface to catgets.
-* catgets, a catgets function:           Interface to catgets.
-* catgets, X/Open specification:         catgets.
-* catopen, a catgets function:           Interface to catgets.
-* character encoding:                    Aspects.
-* charset conversion at runtime:         Charset conversion.
-* charset of PO files:                   Header Entry.
-* check format strings:                  msgfmt Invocation.
-* checking of translations:              Manipulating.
-* clisp:                                 Common Lisp.
-* clisp C sources:                       clisp C.
-* codeset:                               Aspects.
-* comments in PO files:                  PO Files.
-* Common Lisp:                           Common Lisp.
-* compare PO files:                      msgcmp Invocation.
-* comparison of interfaces:              Comparison.
-* compatibility with X/Open msgfmt:      msgfmt Invocation.
-* compendium:                            Compendium.
-* compendium, creating:                  Creating Compendia.
-* concatenate PO files:                  msgcat Invocation.
-* concatenating PO files into a compendium: Creating Compendia.
-* concatenation of strings:              Preparing Strings.
-* convert binary message catalog into PO file: msgunfmt Invocation.
-* convert translations to a different encoding: msgconv Invocation.
-* converting a package to use gettext:   Prerequisites.
-* country codes:                         Country Codes.
-* create new PO file:                    msginit Invocation.
-* creating a new PO file:                Creating.
-* creating compendia:                    Creating Compendia.
-* currency symbols:                      Aspects.
-* date format:                           Aspects.
-* dcngettext:                            Plural forms.
-* debugging messages marked as format strings: xgettext Invocation.
-* dialect:                               Manipulating.
-* disabling NLS:                         lib/gettext.h.
-* dngettext:                             Plural forms.
-* domain ambiguities:                    Ambiguities.
-* duplicate elimination:                 Manipulating.
-* duplicate removal:                     msguniq Invocation.
-* editing comments in PO files:          Modifying Comments.
-* editing translations:                  Modifying Translations.
-* Emacs Lisp:                            Emacs Lisp.
-* encoding:                              Aspects.
-* encoding conversion:                   Manipulating.
-* encoding conversion at runtime:        Charset conversion.
-* encoding for your language:            Header Entry.
-* encoding list:                         Header Entry.
-* encoding of PO files:                  Header Entry.
-* evolution of packages:                 Overview.
-* extracting parts of a PO file into a compendium: Creating Compendia.
-* file format, .mo:                      MO Files.
-* file format, .po:                      PO Files.
-* files, .po and .mo:                    Files.
-* files, .pot:                           Overview.
-* filter messages according to attributes: msgattrib Invocation.
-* find common messages:                  msgcomm Invocation.
-* force use of fuzzy entries:            msgfmt Invocation.
-* format strings:                        c-format.
-* Free Pascal:                           Pascal.
-* fuzzy entries:                         Fuzzy Entries.
-* fuzzy flag:                            PO Files.
-* gawk:                                  gawk.
-* generate binary message catalog from PO file: msgfmt Invocation.
-* generate translation catalog in English: msgen Invocation.
-* gettext files:                         Adjusting Files.
-* gettext installation:                  Installation.
-* gettext interface:                     Interface to gettext.
-* gettext vs catgets:                    Comparison.
-* gettext, a programmer's view:          gettext.
-* gettext.h file:                        lib/gettext.h.
-* gettextize program, usage:             gettextize Invocation.
-* GUI programs:                          GUI program problems.
-* hash table, inside MO files:           MO Files.
-* he, she, and they:                     Introduction.
-* header entry of a PO file:             Header Entry.
-* help option:                           Preparing Strings.
-* history of GNU gettext:                History.
-* i18n:                                  Concepts.
-* importing PO files:                    Normalizing.
-* include file libintl.h <1>:            lib/gettext.h.
-* include file libintl.h <2>:            Comparison.
-* include file libintl.h <3>:            Sources.
-* include file libintl.h:                Overview.
-* initialization:                        Triggering.
-* initialize new PO file:                msginit Invocation.
-* initialize translations from a compendium: Using Compendia.
-* installing gettext:                    Installation.
-* interface to catgets:                  Interface to catgets.
-* internationalization:                  Concepts.
-* inttypes.h:                            Preparing Strings.
-* ISO 3166:                              Country Codes.
-* ISO 639:                               Language Codes.
-* Java:                                  Java.
-* Java mode, and msgfmt program:         msgfmt Invocation.
-* Java mode, and msgunfmt program:       msgunfmt Invocation.
-* Java, string concatenation:            Preparing Strings.
-* keyboard accelerator checking:         msgfmt Invocation.
-* l10n:                                  Concepts.
-* language codes:                        Language Codes.
-* language selection:                    End Users.
-* language selection at runtime:         gettext grok.
-* large package:                         Ambiguities.
-* libiconv library:                      AM_ICONV.
-* libintl for Java:                      Java.
-* libintl library:                       AM_GNU_GETTEXT.
-* librep Lisp:                           librep.
-* LINGUAS file:                          po/LINGUAS.
-* link with libintl:                     Overview.
-* Linux <1>:                             Header Entry.
-* Linux <2>:                             Overview.
-* Linux:                                 Aspects.
-* Lisp:                                  Common Lisp.
-* list of translation teams, where to find: Header Entry.
-* locale facet, LC_ALL:                  Triggering.
-* locale facet, LC_COLLATE:              Triggering.
-* locale facet, LC_CTYPE <1>:            Triggering.
-* locale facet, LC_CTYPE:                Aspects.
-* locale facet, LC_MESSAGES <1>:         Triggering.
-* locale facet, LC_MESSAGES:             Aspects.
-* locale facet, LC_MONETARY <1>:         Triggering.
-* locale facet, LC_MONETARY:             Aspects.
-* locale facet, LC_NUMERIC <1>:          Triggering.
-* locale facet, LC_NUMERIC:              Aspects.
-* locale facet, LC_RESPONSES:            Triggering.
-* locale facet, LC_TIME <1>:             Triggering.
-* locale facet, LC_TIME:                 Aspects.
-* locale facets:                         Aspects.
-* locale program:                        Header Entry.
-* localization:                          Concepts.
-* magic signature of MO files:           MO Files.
-* Makevars file:                         po/Makevars.
-* manipulating PO files:                 Manipulating.
-* marking string initializers:           Special cases.
-* marking strings that require translation: Mark Keywords.
-* marking strings, preparations:         Preparing Strings.
-* marking translatable strings:          Overview.
-* menu entries:                          GUI program problems.
-* menu, keyboard accelerator support:    msgfmt Invocation.
-* merge PO files:                        msgcat Invocation.
-* merging two PO files:                  Manipulating.
-* message catalog files location:        Locating Catalogs.
-* messages:                              Aspects.
-* migration from earlier versions of gettext: Prerequisites.
-* mnemonics of menu entries:             msgfmt Invocation.
-* MO file's format:                      MO Files.
-* modify message attrributes:            msgattrib Invocation.
-* msgattrib program, usage:              msgattrib Invocation.
-* msgcat program, usage:                 msgcat Invocation.
-* msgcmp program, usage:                 msgcmp Invocation.
-* msgcomm program, usage:                msgcomm Invocation.
-* msgconv program, usage:                msgconv Invocation.
-* msgen program, usage:                  msgen Invocation.
-* msgexec program, usage:                msgexec Invocation.
-* msgfilter filter and catalog encoding: msgfilter Invocation.
-* msgfilter program, usage:              msgfilter Invocation.
-* msgfmt program, usage:                 msgfmt Invocation.
-* msggrep program, usage:                msggrep Invocation.
-* msgid:                                 PO Files.
-* msgid_plural:                          PO Files.
-* msginit program, usage:                msginit Invocation.
-* msgmerge program, usage:               msgmerge Invocation.
-* msgstr:                                PO Files.
-* msgunfmt program, usage:               msgunfmt Invocation.
-* msguniq program, usage:                msguniq Invocation.
-* multi-line strings:                    Normalizing.
-* N_, a convenience macro:               Comparison.
-* Native Language Support:               Concepts.
-* Natural Language Support:              Concepts.
-* newlines in PO files:                  PO Files.
-* ngettext:                              Plural forms.
-* NLS:                                   Concepts.
-* no-c-format flag:                      PO Files.
-* no-c-format, and xgettext:             c-format.
-* nplurals, in a PO file header:         Plural forms.
-* number format:                         Aspects.
-* Object Pascal:                         Pascal.
-* obsolete entries:                      Obsolete Entries.
-* optimization of gettext functions:     Optimized gettext.
-* orthography:                           Manipulating.
-* output to stdout, xgettext:            xgettext Invocation.
-* overview of gettext:                   Overview.
-* package and version declaration in configure.in: configure.in.
-* package build and installation options: Installers.
-* package maintainer's view of gettext:  Maintainers.
-* paragraphs:                            Preparing Strings.
-* Pascal:                                Pascal.
-* Perl:                                  Perl.
-* PHP:                                   PHP.
-* Pike:                                  Pike.
-* plural form formulas:                  Plural forms.
-* plural forms:                          Plural forms.
-* plural forms, in MO files:             MO Files.
-* plural, in a PO file header:           Plural forms.
-* PO files' format:                      PO Files.
-* PO mode (Emacs) commands:              Main PO Commands.
-* PO template file:                      Template.
-* portability problems with sed:         msgfilter Invocation.
-* POTFILES.in file:                      po/POTFILES.in.
-* preparing programs for translation:    Sources.
-* problems with catgets interface:       Problems with catgets.
-* programming languages:                 Language Implementors.
-* Python:                                Python.
-* quotation marks <1>:                   po/Makevars.
-* quotation marks:                       Header Entry.
-* quote characters, use in PO files:     Header Entry.
-* related reading:                       References.
-* RST:                                   RST.
-* scripting languages:                   Language Implementors.
-* search messages in a catalog:          msggrep Invocation.
-* selecting message language:            End Users.
-* sentences:                             Preparing Strings.
-* setting up gettext at build time:      Installers.
-* setting up gettext at run time:        End Users.
-* several domains:                       Ambiguities.
-* sex:                                   Introduction.
-* sgettext:                              GUI program problems.
-* she, he, and they:                     Introduction.
-* shell scripts:                         sh.
-* Smalltalk:                             Smalltalk.
-* sorting msgcat output:                 msgcat Invocation.
-* sorting msgmerge output:               msgmerge Invocation.
-* sorting msgunfmt output:               msgunfmt Invocation.
-* sorting output of xgettext:            xgettext Invocation.
-* specifying plural form in a PO file:   Plural forms.
-* standard output, and msgcat:           msgcat Invocation.
-* standard output, and msgmerge program: msgmerge Invocation.
-* string concatenation:                  Preparing Strings.
-* string normalization in entries:       Normalizing.
-* style:                                 Preparing Strings.
-* supported languages, xgettext:         xgettext Invocation.
-* Tcl:                                   Tcl.
-* Tcl mode, and msgfmt program:          msgfmt Invocation.
-* Tcl mode, and msgunfmt program:        msgunfmt Invocation.
-* template PO file:                      Overview.
-* testing .po files for equivalence:     xgettext Invocation.
-* Tk's scripting language:               Tcl.
-* translated entries:                    Translated Entries.
-* translating menu entries:              GUI program problems.
-* translation aspects:                   Aspects.
-* Translation Matrix:                    Matrix.
-* Translation Project:                   Why.
-* turning off NLS support:               lib/gettext.h.
-* tutorial of gettext usage:             Overview.
-* unify duplicate translations:          msguniq Invocation.
-* untranslated entries:                  Untranslated Entries.
-* update translations from a compendium: Using Compendia.
-* upgrading to new versions of gettext:  Prerequisites.
-* version control for backup files, msgmerge: msgmerge Invocation.
-* wxWindows library:                     wxWindows.
-* xargs, and output from msgexec:        msgexec Invocation.
-* xgettext program, usage:               xgettext Invocation.
-* xmodmap program, and typing quotation marks: Header Entry.
-* YaST2 scripting language:              YCP.
-* YCP:                                   YCP.
-
-
diff --git a/doc/gettext_1.html b/doc/gettext_1.html
index 3fa9b03e0..e71e8c20b 100644
--- a/doc/gettext_1.html
+++ b/doc/gettext_1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - 1  Introduction</TITLE>
 </HEAD>
@@ -491,7 +491,7 @@ While editing a PO file, PO mode allows for the easy browsing of
 auxiliary and compendium PO files, as well as for following references into
 the set of C program sources from which PO files have been derived.
 It has a few special features, among which are the interactive marking
-of program strings as translatable, and the validatation of PO files
+of program strings as translatable, and the validation of PO files
 with easy repositioning to PO file lines showing errors.
 
 </P>
diff --git a/doc/gettext_10.html b/doc/gettext_10.html
index 09949bbfc..f0b8d92fb 100644
--- a/doc/gettext_10.html
+++ b/doc/gettext_10.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - 10  The Programmer's View</TITLE>
 </HEAD>
@@ -30,7 +30,7 @@ later explain our solution of this dilemma.
 
 <H2><A NAME="SEC142" HREF="gettext_toc.html#TOC142">10.1  About <CODE>catgets</CODE></A></H2>
 <P>
-<A NAME="IDX820"></A>
+<A NAME="IDX821"></A>
 
 </P>
 <P>
@@ -65,7 +65,7 @@ therefore part of all Unix implementation (implementations, which are
 
 <H3><A NAME="SEC143" HREF="gettext_toc.html#TOC143">10.1.1  The Interface</A></H3>
 <P>
-<A NAME="IDX821"></A>
+<A NAME="IDX822"></A>
 
 </P>
 <P>
@@ -78,7 +78,7 @@ for the functions and the needed definitions are in the
 
 </P>
 <P>
-<A NAME="IDX822"></A>
+<A NAME="IDX823"></A>
 <CODE>catopen</CODE> is used like in this:
 
 </P>
@@ -97,7 +97,7 @@ message catalog, equivalent to handles to file returned by <CODE>open</CODE>.
 
 </P>
 <P>
-<A NAME="IDX823"></A>
+<A NAME="IDX824"></A>
 This handle is of course used in the <CODE>catgets</CODE> function which can
 be used like this:
 
@@ -129,7 +129,7 @@ should better be <CODE>const char *</CODE>, but the standard is published in
 
 </P>
 <P>
-<A NAME="IDX824"></A>
+<A NAME="IDX825"></A>
 The last of these function functions is used and behaves as expected:
 
 </P>
@@ -146,7 +146,7 @@ After this no <CODE>catgets</CODE> call using the descriptor is legal anymore.
 
 <H3><A NAME="SEC144" HREF="gettext_toc.html#TOC144">10.1.2  Problems with the <CODE>catgets</CODE> Interface?!</A></H3>
 <P>
-<A NAME="IDX825"></A>
+<A NAME="IDX826"></A>
 
 </P>
 <P>
@@ -167,7 +167,7 @@ more easy to manage.
 
 <H2><A NAME="SEC145" HREF="gettext_toc.html#TOC145">10.2  About <CODE>gettext</CODE></A></H2>
 <P>
-<A NAME="IDX826"></A>
+<A NAME="IDX827"></A>
 
 </P>
 <P>
@@ -198,7 +198,7 @@ in using this library will be interested in this description.
 
 <H3><A NAME="SEC146" HREF="gettext_toc.html#TOC146">10.2.1  The Interface</A></H3>
 <P>
-<A NAME="IDX827"></A>
+<A NAME="IDX828"></A>
 
 </P>
 <P>
@@ -269,9 +269,9 @@ your language.
 
 <H3><A NAME="SEC147" HREF="gettext_toc.html#TOC147">10.2.2  Solving Ambiguities</A></H3>
 <P>
-<A NAME="IDX828"></A>
 <A NAME="IDX829"></A>
 <A NAME="IDX830"></A>
+<A NAME="IDX831"></A>
 
 </P>
 <P>
@@ -347,7 +347,7 @@ unreliabilities.
 
 <H3><A NAME="SEC148" HREF="gettext_toc.html#TOC148">10.2.3  Locating Message Catalog Files</A></H3>
 <P>
-<A NAME="IDX831"></A>
+<A NAME="IDX832"></A>
 
 </P>
 <P>
@@ -387,8 +387,8 @@ The value of the locale is determined through
 
 <H3><A NAME="SEC149" HREF="gettext_toc.html#TOC149">10.2.4  How to specify the output character set <CODE>gettext</CODE> uses</A></H3>
 <P>
-<A NAME="IDX832"></A>
 <A NAME="IDX833"></A>
+<A NAME="IDX834"></A>
 
 </P>
 <P>
@@ -420,7 +420,7 @@ recommended that all <VAR>msgid</VAR>s be US-ASCII strings.
 <P>
 <DL>
 <DT><U>Function:</U> char * <B>bind_textdomain_codeset</B> <I>(const char *<VAR>domainname</VAR>, const char *<VAR>codeset</VAR>)</I>
-<DD><A NAME="IDX834"></A>
+<DD><A NAME="IDX835"></A>
 The <CODE>bind_textdomain_codeset</CODE> function can be used to specify the
 output character set for message catalogs for domain <VAR>domainname</VAR>.
 The <VAR>codeset</VAR> argument must be a valid codeset name which can be used
@@ -454,7 +454,7 @@ global variable <VAR>errno</VAR> is set accordingly.
 
 <H3><A NAME="SEC150" HREF="gettext_toc.html#TOC150">10.2.5  Additional functions for plural forms</A></H3>
 <P>
-<A NAME="IDX835"></A>
+<A NAME="IDX836"></A>
 
 </P>
 <P>
@@ -574,7 +574,7 @@ purpose.
 <P>
 <DL>
 <DT><U>Function:</U> char * <B>ngettext</B> <I>(const char *<VAR>msgid1</VAR>, const char *<VAR>msgid2</VAR>, unsigned long int <VAR>n</VAR>)</I>
-<DD><A NAME="IDX836"></A>
+<DD><A NAME="IDX837"></A>
 The <CODE>ngettext</CODE> function is similar to the <CODE>gettext</CODE> function
 as it finds the message catalogs in the same way.  But it takes two
 extra arguments.  The <VAR>msgid1</VAR> parameter must contain the singular
@@ -604,7 +604,7 @@ Please note that the numeric value <VAR>n</VAR> has to be passed to the
 <P>
 <DL>
 <DT><U>Function:</U> char * <B>dngettext</B> <I>(const char *<VAR>domain</VAR>, const char *<VAR>msgid1</VAR>, const char *<VAR>msgid2</VAR>, unsigned long int <VAR>n</VAR>)</I>
-<DD><A NAME="IDX837"></A>
+<DD><A NAME="IDX838"></A>
 The <CODE>dngettext</CODE> is similar to the <CODE>dgettext</CODE> function in the
 way the message catalog is selected.  The difference is that it takes
 two extra parameter to provide the correct plural form.  These two
@@ -615,7 +615,7 @@ parameters are handled in the same way <CODE>ngettext</CODE> handles them.
 <P>
 <DL>
 <DT><U>Function:</U> char * <B>dcngettext</B> <I>(const char *<VAR>domain</VAR>, const char *<VAR>msgid1</VAR>, const char *<VAR>msgid2</VAR>, unsigned long int <VAR>n</VAR>, int <VAR>category</VAR>)</I>
-<DD><A NAME="IDX838"></A>
+<DD><A NAME="IDX839"></A>
 The <CODE>dcngettext</CODE> is similar to the <CODE>dcgettext</CODE> function in the
 way the message catalog is selected.  The difference is that it takes
 two extra parameter to provide the correct plural form.  These two
@@ -640,9 +640,9 @@ possibility of extensions to not prevent the use of new languages).
 
 </P>
 <P>
-<A NAME="IDX839"></A>
 <A NAME="IDX840"></A>
 <A NAME="IDX841"></A>
+<A NAME="IDX842"></A>
 The information about the plural form selection has to be stored in the
 header entry of the PO file (the one with the empty <CODE>msgid</CODE> string).
 The plural form information looks like this:
@@ -668,7 +668,7 @@ value of <CODE>nplurals</CODE>.
 
 </P>
 <P>
-<A NAME="IDX842"></A>
+<A NAME="IDX843"></A>
 The following rules are known at this point.  The language with families
 are listed.  But this does not necessarily mean the information can be
 generalized for the whole family (as can be easily seen in the table
@@ -878,9 +878,9 @@ Slovenian
 
 <H3><A NAME="SEC151" HREF="gettext_toc.html#TOC151">10.2.6  How to use <CODE>gettext</CODE> in GUI programs</A></H3>
 <P>
-<A NAME="IDX843"></A>
 <A NAME="IDX844"></A>
 <A NAME="IDX845"></A>
+<A NAME="IDX846"></A>
 
 </P>
 <P>
@@ -957,7 +957,7 @@ fine:
 
 </P>
 <P>
-<A NAME="IDX846"></A>
+<A NAME="IDX847"></A>
 
 <PRE>
   char *
@@ -1034,7 +1034,7 @@ quite some memory and disk space by doing this.
 
 <H3><A NAME="SEC152" HREF="gettext_toc.html#TOC152">10.2.7  Optimization of the *gettext functions</A></H3>
 <P>
-<A NAME="IDX847"></A>
+<A NAME="IDX848"></A>
 
 </P>
 <P>
@@ -1089,8 +1089,8 @@ find the result through a single cache lookup.
 
 <H2><A NAME="SEC153" HREF="gettext_toc.html#TOC153">10.3  Comparing the Two Interfaces</A></H2>
 <P>
-<A NAME="IDX848"></A>
 <A NAME="IDX849"></A>
+<A NAME="IDX850"></A>
 
 </P>
 
@@ -1140,7 +1140,7 @@ by
 
 </P>
 <P>
-<A NAME="IDX850"></A>
+<A NAME="IDX851"></A>
 
 <PRE>
 #include &#60;libintl.h&#62;
@@ -1155,7 +1155,7 @@ can use any that becomes available.
 
 </P>
 <P>
-<A NAME="IDX851"></A>
+<A NAME="IDX852"></A>
 The same procedure can be done for the <CODE>gettext_noop</CODE> invocations
 (see section <A HREF="gettext_3.html#SEC19">3.6  Special Cases of Translatable Strings</A>).  One usually defines <CODE>gettext_noop</CODE> as a
 no-op macro.  So you should consider the following code for your project:
@@ -1263,7 +1263,7 @@ is a list comments:
 <UL>
 <LI>Changing the language at runtime
 
-<A NAME="IDX852"></A>
+<A NAME="IDX853"></A>
 
 For interactive programs it might be useful to offer a selection of the
 used language at runtime.  To understand how to do this one need to know
@@ -1280,20 +1280,20 @@ priority:
 <OL>
 <LI><CODE>LANGUAGE</CODE>
 
-<A NAME="IDX853"></A>
- 
 <A NAME="IDX854"></A>
+ 
+<A NAME="IDX855"></A>
 <LI><CODE>LC_ALL</CODE>
 
-<A NAME="IDX855"></A>
 <A NAME="IDX856"></A>
 <A NAME="IDX857"></A>
 <A NAME="IDX858"></A>
 <A NAME="IDX859"></A>
 <A NAME="IDX860"></A>
+<A NAME="IDX861"></A>
 <LI><CODE>LC_xxx</CODE>, according to selected locale
 
-<A NAME="IDX861"></A>
+<A NAME="IDX862"></A>
 <LI><CODE>LANG</CODE>
 
 </OL>
@@ -1301,7 +1301,7 @@ priority:
 Afterwards the path is constructed using the found value and the
 translation file is loaded if available.
 
-What is now when the value for, say, <CODE>LANGUAGE</CODE> changes.  According
+What happens now when the value for, say, <CODE>LANGUAGE</CODE> changes?  According
 to the process explained above the new value of this variable is found
 as soon as the <CODE>dcgettext</CODE> function is called.  But this also means
 the (perhaps) different message catalog file is loaded.  In other
@@ -1327,7 +1327,7 @@ language switching function.
   }
 </PRE>
 
-<A NAME="IDX862"></A>
+<A NAME="IDX863"></A>
 The variable <CODE>_nl_msg_cat_cntr</CODE> is defined in <TT>`loadmsgcat.c&acute;</TT>.
 You don't need to know what this is for. But it can be used to detect
 whether a <CODE>gettext</CODE> implementation is GNU gettext and not non-GNU
diff --git a/doc/gettext_11.html b/doc/gettext_11.html
index 66baaee52..f895575aa 100644
--- a/doc/gettext_11.html
+++ b/doc/gettext_11.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - 11  The Translator's View</TITLE>
 </HEAD>
@@ -163,7 +163,7 @@ On the other end, people might enjoy their own language a lot, and be
 very motivated at providing to themselves the pleasure of having their
 beloved free software speaking their mother tongue.  They do themselves
 a personal favor, and do not pay that much attention to the number of
-people beneficiating of their work.
+people benefiting of their work.
 
 <LI>Misinterpretation
 
diff --git a/doc/gettext_12.html b/doc/gettext_12.html
index b29f5ec26..b1e04b5b1 100644
--- a/doc/gettext_12.html
+++ b/doc/gettext_12.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - 12  The Maintainer's View</TITLE>
 </HEAD>
@@ -12,7 +12,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_11.html">previous
 
 <H1><A NAME="SEC172" HREF="gettext_toc.html#TOC172">12  The Maintainer's View</A></H1>
 <P>
-<A NAME="IDX863"></A>
+<A NAME="IDX864"></A>
 
 </P>
 <P>
@@ -87,9 +87,9 @@ use this as an opportunity to unflatten their package structure.
 
 <H2><A NAME="SEC174" HREF="gettext_toc.html#TOC174">12.2  Prerequisite Works</A></H2>
 <P>
-<A NAME="IDX864"></A>
 <A NAME="IDX865"></A>
 <A NAME="IDX866"></A>
+<A NAME="IDX867"></A>
 
 </P>
 <P>
@@ -189,15 +189,57 @@ never try to <EM>solve</EM> a team's problem on your own.
 <H2><A NAME="SEC175" HREF="gettext_toc.html#TOC175">12.3  Invoking the <CODE>gettextize</CODE> Program</A></H2>
 
 <P>
-Some files are consistently and identically needed in every package
-internationalized through GNU <CODE>gettext</CODE>.  As a matter of
-convenience, the <CODE>gettextize</CODE> program puts all these files right
-in your package.  This program has the following synopsis:
+The <CODE>gettextize</CODE> program is an interactive tool that helps the
+maintainer of a package internationalized through GNU <CODE>gettext</CODE>.
+It is used for two purposes:
+
+</P>
+
+<UL>
+<LI>
+
+As a wizard, when a package is modified to use GNU <CODE>gettext</CODE> for
+the first time.
+
+<LI>
+
+As a migration tool, for upgrading the GNU <CODE>gettext</CODE> support in
+a package from a previous to a newer version of GNU <CODE>gettext</CODE>.
+</UL>
+
+<P>
+This program performs the following tasks:
+
+</P>
+
+<UL>
+<LI>
+
+It copies into the package some files that are consistently and
+identically needed in every package internationalized through
+GNU <CODE>gettext</CODE>.
+
+<LI>It performs as many of the tasks mentioned in the next section
+
+section <A HREF="gettext_12.html#SEC176">12.4  Files You Must Create or Alter</A> as can be performed automatically.
+
+<LI>It removes obsolete files and idioms used for previous GNU
+
+<CODE>gettext</CODE> versions to the form recommended for the current GNU
+<CODE>gettext</CODE> version.
+
+<LI>It prints a summary of the tasks that ought to be done manually
+
+and could not be done automatically by <CODE>gettextize</CODE>.
+</UL>
+
+<P>
+It can be invoked as follows:
 
 </P>
 <P>
-<A NAME="IDX867"></A>
 <A NAME="IDX868"></A>
+<A NAME="IDX869"></A>
 
 <PRE>
 gettextize [ <VAR>option</VAR>... ] [ <VAR>directory</VAR> ]
@@ -213,8 +255,8 @@ and accepts the following options:
 <DD>
 <DT><SAMP>`--copy&acute;</SAMP>
 <DD>
-<A NAME="IDX869"></A>
 <A NAME="IDX870"></A>
+<A NAME="IDX871"></A>
 Copy the needed files instead of making symbolic links.  Using links
 would allow the package to always use the latest <CODE>gettext</CODE> code
 available on the system, but it might disturb some mechanism the
@@ -225,13 +267,13 @@ maintainer is used to apply to the sources.  Because running
 <DD>
 <DT><SAMP>`--force&acute;</SAMP>
 <DD>
-<A NAME="IDX871"></A>
 <A NAME="IDX872"></A>
+<A NAME="IDX873"></A>
 Force replacement of files which already exist.
 
 <DT><SAMP>`--intl&acute;</SAMP>
 <DD>
-<A NAME="IDX873"></A>
+<A NAME="IDX874"></A>
 Install the libintl sources in a subdirectory named <TT>`intl/&acute;</TT>.
 This libintl will be used to provide internationalization on systems
 that don't have GNU libintl installed. If this option is omitted,
@@ -241,19 +283,29 @@ be enabled on systems lacking GNU gettext.
 
 <DT><SAMP>`--no-changelog&acute;</SAMP>
 <DD>
-<A NAME="IDX874"></A>
+<A NAME="IDX875"></A>
 Don't update or create ChangeLog files.  By default, <CODE>gettextize</CODE>
-logs all changes (file additions, modifications ans removals) in a
+logs all changes (file additions, modifications and removals) in a
 file called <SAMP>`ChangeLog&acute;</SAMP> in each affected directory.
 
+<DT><SAMP>`-n&acute;</SAMP>
+<DD>
+<DT><SAMP>`--dry-run&acute;</SAMP>
+<DD>
+<A NAME="IDX876"></A>
+<A NAME="IDX877"></A>
+Print modifications but don't perform them.  All actions that
+<CODE>gettextize</CODE> would normally execute are inhibited and instead only
+listed on standard output.
+
 <DT><SAMP>`--help&acute;</SAMP>
 <DD>
-<A NAME="IDX875"></A>
+<A NAME="IDX878"></A>
 Display this help and exit.
 
 <DT><SAMP>`--version&acute;</SAMP>
 <DD>
-<A NAME="IDX876"></A>
+<A NAME="IDX879"></A>
 Output version information and exit.
 
 </DL>
@@ -288,7 +340,7 @@ archive sites.
 
 A <TT>`po/&acute;</TT> directory is created for eventually holding
 all translation files, but initially only containing the file
-<TT>`po/Makefile.in.in&acute;</TT> from the GNU <CODE>gettext</CODE> distribution.
+<TT>`po/Makefile.in.in&acute;</TT> from the GNU <CODE>gettext</CODE> distribution
 (beware the double <SAMP>`.in&acute;</SAMP> in the file name) and a few auxiliary
 files. If the <TT>`po/&acute;</TT> directory already exists, it will be preserved
 along with the files it contains, and only <TT>`Makefile.in.in&acute;</TT> and
@@ -304,10 +356,15 @@ the <TT>`intl/&acute;</TT> directory is emptied first.
 
 <LI>
 
-The <TT>`config.rpath&acute;</TT> file is copied into the directory containing
-configuration support files. It is needed by the <CODE>AM_GNU_GETTEXT</CODE>
-autoconf macro.
+The files <TT>`config.rpath&acute;</TT> and <TT>`mkinstalldirs&acute;</TT> are copied into
+the directory containing configuration support files. It is needed by
+the <CODE>AM_GNU_GETTEXT</CODE> autoconf macro.
+
+<LI>
 
+Only if the project is using GNU <CODE>automake</CODE>:
+A set of <CODE>autoconf</CODE> macro files is copied into the package's
+<CODE>autoconf</CODE> macro repository, usually in a directory called <TT>`m4/&acute;</TT>.
 </OL>
 
 <P>
@@ -320,24 +377,53 @@ actual copy in the distribution archive.  So, to insist, you really
 should use <SAMP>`-h&acute;</SAMP> option with <CODE>tar</CODE> within your <CODE>dist</CODE>
 goal of your main <TT>`Makefile.in&acute;</TT>.
 
+</P>
+<P>
+Furthermore, <CODE>gettextize</CODE> will update all <TT>`Makefile.am&acute;</TT> files
+in each affected directory, as well as the top level <TT>`configure.in&acute;</TT>
+or <TT>`configure.ac&acute;</TT> file.
+
 </P>
 <P>
 It is interesting to understand that most new files for supporting
-GNU <CODE>gettext</CODE> facilities in one package go in <TT>`intl/&acute;</TT>
-and <TT>`po/&acute;</TT> subdirectories.  One distinction between these two
-directories is that <TT>`intl/&acute;</TT> is meant to be completely identical
-in all packages using GNU <CODE>gettext</CODE>, while all newly created
-files, which have to be different, go into <TT>`po/&acute;</TT>.  There is a
-common <TT>`Makefile.in.in&acute;</TT> in <TT>`po/&acute;</TT>, because the <TT>`po/&acute;</TT>
-directory needs its own <TT>`Makefile&acute;</TT>, and it has been designed so
-it can be identical in all packages.
+GNU <CODE>gettext</CODE> facilities in one package go in <TT>`intl/&acute;</TT>,
+<TT>`po/&acute;</TT> and <TT>`m4/&acute;</TT> subdirectories.  One distinction between
+<TT>`intl/&acute;</TT> and the two other directories is that <TT>`intl/&acute;</TT> is
+meant to be completely identical in all packages using GNU <CODE>gettext</CODE>,
+while the other directories will mostly contain package dependent
+files.
+
+</P>
+<P>
+The <CODE>gettextize</CODE> program makes backup files for all files it
+replaces or changes, and also write ChangeLog entries about these
+changes.  This way, the careful maintainer can check after running
+<CODE>gettextize</CODE> whether its changes are acceptable to him, and
+possibly adjust them.  An exception to this rule is the <TT>`intl/&acute;</TT>
+directory, which is added or replaced or removed as a whole.
+
+</P>
+<P>
+It is important to understand that <CODE>gettextize</CODE> can not do the
+entire job of adapting a package for using GNU <CODE>gettext</CODE>.  The
+amount of remaining work depends on whether the package uses GNU
+<CODE>automake</CODE> or not.  But in any case, the maintainer should still
+read the section section <A HREF="gettext_12.html#SEC176">12.4  Files You Must Create or Alter</A> after invoking <CODE>gettextize</CODE>.
+
+</P>
+<P>
+It is also important to understand that <CODE>gettextize</CODE> is not part
+of the GNU build system, in the sense that it should not be invoked
+automatically, and not be invoked by someone who doesn't assume the
+responsibilities of a package maintainer.  For the latter purpose, a
+separate tool is provided, see section <A HREF="gettext_12.html#SEC196">12.6.3  Invoking the <CODE>autopoint</CODE> Program</A>.
 
 </P>
 
 
 <H2><A NAME="SEC176" HREF="gettext_toc.html#TOC176">12.4  Files You Must Create or Alter</A></H2>
 <P>
-<A NAME="IDX877"></A>
+<A NAME="IDX880"></A>
 
 </P>
 <P>
@@ -352,7 +438,7 @@ changes needed in each.
 <P>
 So, here comes a list of files, each one followed by a description of
 all alterations it needs.  Many examples are taken out from the GNU
-<CODE>gettext</CODE> 0.11.2 distribution itself, or from the GNU
+<CODE>gettext</CODE> 0.11.3 distribution itself, or from the GNU
 <CODE>hello</CODE> distribution (<A HREF="http://www.franken.de/users/gnu/ke/hello">http://www.franken.de/users/gnu/ke/hello</A>
 or <A HREF="http://www.gnu.franken.de/ke/hello/">http://www.gnu.franken.de/ke/hello/</A>)  You may indeed
 refer to the source code of the GNU <CODE>gettext</CODE> and GNU <CODE>hello</CODE>
@@ -365,7 +451,7 @@ gettext functionality.
 
 <H3><A NAME="SEC177" HREF="gettext_toc.html#TOC177">12.4.1  <TT>`POTFILES.in&acute;</TT> in <TT>`po/&acute;</TT></A></H3>
 <P>
-<A NAME="IDX878"></A>
+<A NAME="IDX881"></A>
 
 </P>
 <P>
@@ -411,7 +497,7 @@ case of <CODE>bison</CODE>), not the generated C file.
 
 <H3><A NAME="SEC178" HREF="gettext_toc.html#TOC178">12.4.2  <TT>`LINGUAS&acute;</TT> in <TT>`po/&acute;</TT></A></H3>
 <P>
-<A NAME="IDX879"></A>
+<A NAME="IDX882"></A>
 
 </P>
 <P>
@@ -440,7 +526,7 @@ but rather by using the <CODE>LINGUAS</CODE> environment variable
 
 <H3><A NAME="SEC179" HREF="gettext_toc.html#TOC179">12.4.3  <TT>`Makefile&acute;</TT> pieces in <TT>`po/&acute;</TT></A></H3>
 <P>
-<A NAME="IDX880"></A>
+<A NAME="IDX883"></A>
 
 </P>
 <P>
@@ -460,8 +546,8 @@ needing to mess with <TT>`po/Makefile.in.in&acute;</TT>.
 
 </P>
 <P>
-<A NAME="IDX881"></A>
-<A NAME="IDX882"></A>
+<A NAME="IDX884"></A>
+<A NAME="IDX885"></A>
 GNU gettext comes with a <TT>`Rules-quot&acute;</TT> file, containing rules for
 building catalogs <TT>`en@quot.po&acute;</TT> and <TT>`en@boldquot.po&acute;</TT>. The
 effect of <TT>`en@quot.po&acute;</TT> is that people who set their <CODE>LANGUAGE</CODE>
@@ -490,14 +576,14 @@ GUI programs. To enable it, similarly add <CODE>en@boldquot</CODE> to the
 <OL>
 <LI>Declare the package and version.
 
-<A NAME="IDX883"></A>
+<A NAME="IDX886"></A>
 
 This is done by a set of lines like these:
 
 
 <PRE>
 PACKAGE=gettext
-VERSION=0.11.2
+VERSION=0.11.3
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)
@@ -508,13 +594,13 @@ or, if you are using GNU <CODE>automake</CODE>, by a line like this:
 
 
 <PRE>
-AM_INIT_AUTOMAKE(gettext, 0.11.2)
+AM_INIT_AUTOMAKE(gettext, 0.11.3)
 </PRE>
 
 Of course, you replace <SAMP>`gettext&acute;</SAMP> with the name of your package,
-and <SAMP>`0.11.2&acute;</SAMP> by its version numbers, exactly as they
+and <SAMP>`0.11.3&acute;</SAMP> by its version numbers, exactly as they
 should appear in the packaged <CODE>tar</CODE> file name of your distribution
-(<TT>`gettext-0.11.2.tar.gz&acute;</TT>, here).
+(<TT>`gettext-0.11.3.tar.gz&acute;</TT>, here).
 
 <LI>Check for internationalization support.
 
@@ -595,9 +681,36 @@ AC_CONFIG_AUX_DIR([<VAR>subdir</VAR>])
 
 
 
-<H3><A NAME="SEC182" HREF="gettext_toc.html#TOC182">12.4.6  <TT>`aclocal.m4&acute;</TT> at top level</A></H3>
+<H3><A NAME="SEC182" HREF="gettext_toc.html#TOC182">12.4.6  <TT>`mkinstalldirs&acute;</TT> at top level</A></H3>
 <P>
-<A NAME="IDX884"></A>
+<A NAME="IDX887"></A>
+
+</P>
+<P>
+If <CODE>gettextize</CODE> has not already done it, you need to add the GNU
+<TT>`mkinstalldirs&acute;</TT> script to your distribution.  It is needed because
+<SAMP>`mkdir -p&acute;</SAMP> is not portable enough.  You find this script in the
+GNU <CODE>automake</CODE> distribution.
+
+</P>
+<P>
+Normally, <TT>`mkinstalldirs&acute;</TT> is put at the top level of a distribution.
+But it is also possible to put it in a subdirectory, altogether with other
+configuration support files like <TT>`install-sh&acute;</TT>, <TT>`ltconfig&acute;</TT>,
+<TT>`ltmain.sh&acute;</TT> or <TT>`missing&acute;</TT>.  All you need to do, other than
+moving the files, is to add the following line to your <TT>`configure.in&acute;</TT>.
+
+</P>
+
+<PRE>
+AC_CONFIG_AUX_DIR([<VAR>subdir</VAR>])
+</PRE>
+
+
+
+<H3><A NAME="SEC183" HREF="gettext_toc.html#TOC183">12.4.7  <TT>`aclocal.m4&acute;</TT> at top level</A></H3>
+<P>
+<A NAME="IDX888"></A>
 
 </P>
 <P>
@@ -647,9 +760,9 @@ piece of <CODE>m4</CODE> code will be the same for all projects using GNU
 </P>
 
 
-<H3><A NAME="SEC183" HREF="gettext_toc.html#TOC183">12.4.7  <TT>`acconfig.h&acute;</TT> at top level</A></H3>
+<H3><A NAME="SEC184" HREF="gettext_toc.html#TOC184">12.4.8  <TT>`acconfig.h&acute;</TT> at top level</A></H3>
 <P>
-<A NAME="IDX885"></A>
+<A NAME="IDX889"></A>
 
 </P>
 <P>
@@ -663,7 +776,48 @@ independently from the <TT>`intl/&acute;</TT> directory.
 </P>
 
 
-<H3><A NAME="SEC184" HREF="gettext_toc.html#TOC184">12.4.8  <TT>`Makefile.in&acute;</TT> at top level</A></H3>
+<H3><A NAME="SEC185" HREF="gettext_toc.html#TOC185">12.4.9  <TT>`config.h.in&acute;</TT> at top level</A></H3>
+<P>
+<A NAME="IDX890"></A>
+
+</P>
+<P>
+The include file template that holds the C macros to be defined by
+<CODE>configure</CODE> is usually called <TT>`config.h.in&acute;</TT> and may be
+maintained either manually or automatically.
+
+</P>
+<P>
+If it is maintained automatically, by use of the <SAMP>`autoheader&acute;</SAMP>
+program, you need to do nothing about it.  This is the case in particular
+if you are using GNU <CODE>automake</CODE>.
+
+</P>
+<P>
+If it is maintained manually, and if <CODE>gettextize</CODE> has created an
+<TT>`intl/&acute;</TT> directory, you should switch to using <SAMP>`autoheader&acute;</SAMP>.
+The list of C macros to be added for the sake of the <TT>`intl/&acute;</TT>
+directory is just too long to be maintained manually; it also changes
+between different versions of GNU <CODE>gettext</CODE>.
+
+</P>
+<P>
+If it is maintained manually, and if on the other hand you have
+suppressed the <TT>`intl/&acute;</TT> directory by calling <CODE>gettextize</CODE>
+without <SAMP>`--intl&acute;</SAMP> option, then you can get away by adding the
+following lines to <TT>`config.h.in&acute;</TT>:
+
+</P>
+
+<PRE>
+/* Define to 1 if translation of program messages to the user's
+   native language is requested. */
+#undef ENABLE_NLS
+</PRE>
+
+
+
+<H3><A NAME="SEC186" HREF="gettext_toc.html#TOC186">12.4.10  <TT>`Makefile.in&acute;</TT> at top level</A></H3>
 
 <P>
 Here are a few modifications you need to make to your main, top-level
@@ -691,7 +845,7 @@ distributed.
 <LI>
 
 Wherever you process subdirectories in your <TT>`Makefile.in&acute;</TT>, be sure
-you also process dir subdirectories <SAMP>`intl&acute;</SAMP> and <SAMP>`po&acute;</SAMP>.  Special
+you also process the subdirectories <SAMP>`intl&acute;</SAMP> and <SAMP>`po&acute;</SAMP>.  Special
 rules in the <TT>`Makefiles&acute;</TT> take care for the case where no
 internationalization is wanted.
 
@@ -750,7 +904,7 @@ to <TT>`Makefile.am&acute;</TT> are already made by running <SAMP>`gettextize&ac
 </P>
 
 
-<H3><A NAME="SEC185" HREF="gettext_toc.html#TOC185">12.4.9  <TT>`Makefile.in&acute;</TT> in <TT>`src/&acute;</TT></A></H3>
+<H3><A NAME="SEC187" HREF="gettext_toc.html#TOC187">12.4.11  <TT>`Makefile.in&acute;</TT> in <TT>`src/&acute;</TT></A></H3>
 
 <P>
 Some of the modifications made in the main <TT>`Makefile.in&acute;</TT> will
@@ -803,6 +957,7 @@ The <CODE>main</CODE> function of your program will normally call
 
 <PRE>
 bindtextdomain (<VAR>PACKAGE</VAR>, LOCALEDIR);
+textdomain (<VAR>PACKAGE</VAR>);
 </PRE>
 
 To make LOCALEDIR known to the program, add the following lines to
@@ -870,11 +1025,11 @@ dist: Makefile $(DISTFILES)
 
 
 
-<H3><A NAME="SEC186" HREF="gettext_toc.html#TOC186">12.4.10  <TT>`gettext.h&acute;</TT> in <TT>`lib/&acute;</TT></A></H3>
+<H3><A NAME="SEC188" HREF="gettext_toc.html#TOC188">12.4.12  <TT>`gettext.h&acute;</TT> in <TT>`lib/&acute;</TT></A></H3>
 <P>
-<A NAME="IDX886"></A>
-<A NAME="IDX887"></A>
-<A NAME="IDX888"></A>
+<A NAME="IDX891"></A>
+<A NAME="IDX892"></A>
+<A NAME="IDX893"></A>
 
 </P>
 <P>
@@ -911,7 +1066,7 @@ to 0 in C preprocessor expressions.
 
 </P>
 <P>
-<A NAME="IDX889"></A>
+<A NAME="IDX894"></A>
 <TT>`gettext.h&acute;</TT> is a convenience header file for conditional use of
 <TT>`&#60;libintl.h&#62;&acute;</TT>, depending on the <CODE>ENABLE_NLS</CODE> macro. If
 <CODE>ENABLE_NLS</CODE> is set, it includes <TT>`&#60;libintl.h&#62;&acute;</TT>; otherwise it
@@ -950,9 +1105,9 @@ package that needs it should contain a copy of it on its own.
 </P>
 
 
-<H2><A NAME="SEC187" HREF="gettext_toc.html#TOC187">12.5  Autoconf macros for use in <TT>`configure.in&acute;</TT></A></H2>
+<H2><A NAME="SEC189" HREF="gettext_toc.html#TOC189">12.5  Autoconf macros for use in <TT>`configure.in&acute;</TT></A></H2>
 <P>
-<A NAME="IDX890"></A>
+<A NAME="IDX895"></A>
 
 </P>
 <P>
@@ -965,10 +1120,10 @@ The primary macro is, of course, <CODE>AM_GNU_GETTEXT</CODE>.
 
 
 
-<H3><A NAME="SEC188" HREF="gettext_toc.html#TOC188">12.5.1  AM_GNU_GETTEXT in <TT>`gettext.m4&acute;</TT></A></H3>
+<H3><A NAME="SEC190" HREF="gettext_toc.html#TOC190">12.5.1  AM_GNU_GETTEXT in <TT>`gettext.m4&acute;</TT></A></H3>
 
 <P>
-<A NAME="IDX891"></A>
+<A NAME="IDX896"></A>
 The <CODE>AM_GNU_GETTEXT</CODE> macro tests for the presence of the GNU gettext
 function family in either the C library or a separate <CODE>libintl</CODE>
 library (shared or static libraries are both supported) or in the package's
@@ -1031,7 +1186,7 @@ The complexities that <CODE>AM_GNU_GETTEXT</CODE> deals with are the following:
 <UL>
 <LI>
 
-<A NAME="IDX892"></A>
+<A NAME="IDX897"></A>
 Some operating systems have <CODE>gettext</CODE> in the C library, for example
 glibc. Some have it in a separate library <CODE>libintl</CODE>. GNU <CODE>libintl</CODE>
 might have been installed as part of the GNU <CODE>gettext</CODE> package.
@@ -1067,10 +1222,25 @@ and <CODE>LTLIBINTL</CODE> variables.
 
 
 
-<H3><A NAME="SEC189" HREF="gettext_toc.html#TOC189">12.5.2  AM_ICONV in <TT>`iconv.m4&acute;</TT></A></H3>
+<H3><A NAME="SEC191" HREF="gettext_toc.html#TOC191">12.5.2  AM_GNU_GETTEXT_VERSION in <TT>`gettext.m4&acute;</TT></A></H3>
 
 <P>
-<A NAME="IDX893"></A>
+<A NAME="IDX898"></A>
+The <CODE>AM_GNU_GETTEXT_VERSION</CODE> macro declares the version number of
+the GNU gettext infrastructure that is used by the package.
+
+</P>
+<P>
+The use of this macro is optional; only the <CODE>autopoint</CODE> program makes
+use of it (see section <A HREF="gettext_12.html#SEC193">12.6  Integrating with CVS</A>).
+
+</P>
+
+
+<H3><A NAME="SEC192" HREF="gettext_toc.html#TOC192">12.5.3  AM_ICONV in <TT>`iconv.m4&acute;</TT></A></H3>
+
+<P>
+<A NAME="IDX899"></A>
 The <CODE>AM_ICONV</CODE> macro tests for the presence of the POSIX
 <CODE>iconv</CODE> function family in either the C library or a separate
 <CODE>libiconv</CODE> library. If found, it sets the <CODE>am_cv_func_iconv</CODE>
@@ -1094,7 +1264,7 @@ The complexities that <CODE>AM_ICONV</CODE> deals with are the following:
 <UL>
 <LI>
 
-<A NAME="IDX894"></A>
+<A NAME="IDX900"></A>
 Some operating systems have <CODE>iconv</CODE> in the C library, for example
 glibc. Some have it in a separate library <CODE>libiconv</CODE>, for example
 OSF/1 or FreeBSD. Regardless of the operating system, GNU <CODE>libiconv</CODE>
@@ -1128,6 +1298,239 @@ library support, like SCO.
 <TT>`iconv.m4&acute;</TT> is distributed with the GNU gettext package because
 <TT>`gettext.m4&acute;</TT> relies on it.
 
+</P>
+
+
+<H2><A NAME="SEC193" HREF="gettext_toc.html#TOC193">12.6  Integrating with CVS</A></H2>
+
+<P>
+Many projects use CVS for distributed development, version control and
+source backup.  This section gives some advice how to manage the uses
+of <CODE>cvs</CODE>, <CODE>gettextize</CODE>, <CODE>autopoint</CODE> and <CODE>autoconf</CODE>.
+
+</P>
+
+
+
+<H3><A NAME="SEC194" HREF="gettext_toc.html#TOC194">12.6.1  Avoiding version mismatch in distributed development</A></H3>
+
+<P>
+In a project development with multiple developers, using CVS, there
+should be a single developer who occasionally - when there is desire to
+upgrade to a new <CODE>gettext</CODE> version - runs <CODE>gettextize</CODE> and
+performs the changes listed in section <A HREF="gettext_12.html#SEC176">12.4  Files You Must Create or Alter</A>, and then commits
+his changes to the CVS.
+
+</P>
+<P>
+It is highly recommended that all developers on a project use the same
+version of GNU <CODE>gettext</CODE> in the package.  In other words, if a
+developer runs <CODE>gettextize</CODE>, he should go the whole way, make the
+necessary remaining changes and commit his changes to the CVS.
+Otherwise the following damages will likely occur:
+
+</P>
+
+<UL>
+<LI>
+
+Apparent version mismatch between developers.  Since some <CODE>gettext</CODE>
+specific portions in <TT>`configure.in&acute;</TT>, <TT>`configure.ac&acute;</TT> and
+<CODE>Makefile.am</CODE>, <CODE>Makefile.in</CODE> files depend on the <CODE>gettext</CODE>
+version, the use of infrastructure files belonging to different
+<CODE>gettext</CODE> versions can easily lead to build errors.
+
+<LI>
+
+Hidden version mismatch.  Such version mismatch can also lead to
+malfunctioning of the package, that may be undiscovered by the developers.
+The worst case of hidden version mismatch is that internationalization
+of the package doesn't work at all.
+
+<LI>
+
+Release risks.  All developers implicitly perform constant testing on
+a package.  This is important in the days and weeks before a release.
+If the guy who makes the release tar files uses a different version
+of GNU <CODE>gettext</CODE> than the other developers, the distribution will
+be less well tested than if all had been using the same <CODE>gettext</CODE>
+version.  For example, it is possible that a platform specific bug goes
+undiscovered due to this constellation.
+</UL>
+
+
+
+<H3><A NAME="SEC195" HREF="gettext_toc.html#TOC195">12.6.2  Files to put under CVS version control</A></H3>
+
+<P>
+There are basically three ways to deal with generated files in the
+context of a CVS repository, such as <TT>`configure&acute;</TT> generated from
+<TT>`configure.in&acute;</TT>, <CODE><VAR>parser</VAR>.c</CODE> generated from
+<CODE><VAR>parser</VAR>.y</CODE>, or <CODE>po/Makefile.in.in</CODE> autoinstalled by
+<CODE>gettextize</CODE> or <CODE>autopoint</CODE>.
+
+</P>
+
+<OL>
+<LI>
+
+All generated files are always committed into the repository.
+
+<LI>
+
+All generated files are committed into the repository occasionally,
+for example each time a release is made.
+
+<LI>
+
+Generated files are never committed into the repository.
+</OL>
+
+<P>
+Each of these three approaches has different advantages and drawbacks.
+
+</P>
+
+<OL>
+<LI>
+
+The advantage is that anyone can check out the CVS at any moment and
+gets a working build.  The drawbacks are:  1a. It requires some frequent
+"cvs commit" actions by the maintainers.  1b. The reposity grows in size
+quite fast.
+
+<LI>
+
+The advantage is that anyone can check out the CVS, and the usual
+"./configure; make" will work.  The drawbacks are:  2a. The one who
+checks out the repository needs tools like GNU <CODE>automake</CODE>,
+GNU <CODE>autoconf</CODE>, GNU <CODE>m4</CODE> installed in his PATH; sometimes
+he even needs particular versions of them.  2b. When a release is made
+and a commit is made on the generated files, the other developers get
+conflicts on the generated files after doing "cvs update".  Although
+these conflicts are easy to resolve, they are annoying.
+
+<LI>
+
+The advantage is less work for the maintainers.  The drawback is that
+anyone who checks out the CVS not only needs tools like GNU <CODE>automake</CODE>,
+GNU <CODE>autoconf</CODE>, GNU <CODE>m4</CODE> installed in his PATH, but also that
+he needs to perform a package specific pre-build step before being able
+to "./configure; make".
+</OL>
+
+<P>
+For the first and second approach, all files modified or brought in
+by the occasional <CODE>gettextize</CODE> invocation and update should be
+committed into the CVS.
+
+</P>
+<P>
+For the third approach, the maintainer can omit from the CVS repository
+all the files that <CODE>gettextize</CODE> mentions as "copy".  Instead, he
+adds to the <TT>`configure.in&acute;</TT> or <TT>`configure.ac&acute;</TT> a line of the
+form
+
+</P>
+
+<PRE>
+GETTEXT_VERSION=0.11.3
+</PRE>
+
+<P>
+and adds to the package's pre-build script an invocation of
+<SAMP>`autopoint&acute;</SAMP>.  For everyone who checks out the CVS, this
+<CODE>autopoint</CODE> invocation will copy into the right place the
+<CODE>gettext</CODE> infrastructure files that have been omitted from the CVS.
+
+</P>
+
+
+<H3><A NAME="SEC196" HREF="gettext_toc.html#TOC196">12.6.3  Invoking the <CODE>autopoint</CODE> Program</A></H3>
+
+<P>
+<A NAME="IDX901"></A>
+<A NAME="IDX902"></A>
+
+<PRE>
+autopoint [<VAR>option</VAR>]...
+</PRE>
+
+<P>
+The <CODE>autopoint</CODE> program copies standard gettext infrastructure files
+into a source package.  It extracts from a macro call of the form
+<CODE>AM_GNU_GETTEXT_VERSION(<VAR>version</VAR>)</CODE>, found in the package's
+<TT>`configure.in&acute;</TT> or <TT>`configure.ac&acute;</TT> file, the gettext version
+used by the package, and copies the infrastructure files belonging to
+this version into the package.
+
+</P>
+
+
+<H4><A NAME="SEC197" HREF="gettext_toc.html#TOC197">12.6.3.1  Options</A></H4>
+
+<DL COMPACT>
+
+<DT><SAMP>`-f&acute;</SAMP>
+<DD>
+<DT><SAMP>`--force&acute;</SAMP>
+<DD>
+<A NAME="IDX903"></A>
+<A NAME="IDX904"></A>
+Force overwriting of files that already exist.
+
+<DT><SAMP>`-n&acute;</SAMP>
+<DD>
+<DT><SAMP>`--dry-run&acute;</SAMP>
+<DD>
+<A NAME="IDX905"></A>
+<A NAME="IDX906"></A>
+Print modifications but don't perform them.  All file copying actions that
+<CODE>autopoint</CODE> would normally execute are inhibited and instead only
+listed on standard output.
+
+</DL>
+
+
+
+<H4><A NAME="SEC198" HREF="gettext_toc.html#TOC198">12.6.3.2  Informative output</A></H4>
+
+<DL COMPACT>
+
+<DT><SAMP>`--help&acute;</SAMP>
+<DD>
+<A NAME="IDX907"></A>
+Display this help and exit.
+
+<DT><SAMP>`--version&acute;</SAMP>
+<DD>
+<A NAME="IDX908"></A>
+Output version information and exit.
+
+</DL>
+
+<P>
+<CODE>autopoint</CODE> supports the GNU <CODE>gettext</CODE> versions from 0.10.35 to
+the current one, 0.11.3.  In order to apply <CODE>autopoint</CODE> to
+a package using a <CODE>gettext</CODE> version newer than 0.11.3, you
+need to install this same version of GNU <CODE>gettext</CODE> at least.
+
+</P>
+<P>
+In packages using GNU <CODE>automake</CODE>, an invocation of <CODE>autopoint</CODE>
+should be followed by invocations of <CODE>aclocal</CODE> and then <CODE>autoconf</CODE>
+and <CODE>autoheader</CODE>.  The reason is that <CODE>autopoint</CODE> installs some
+autoconf macro files, which are used by <CODE>aclocal</CODE> to create
+<TT>`aclocal.m4&acute;</TT>, and the latter is used by <CODE>autoconf</CODE> to create the
+package's <TT>`configure&acute;</TT> script and by <CODE>autoheader</CODE> to create the
+package's <TT>`config.h.in&acute;</TT> include file template.
+
+</P>
+<P>
+The name <SAMP>`autopoint&acute;</SAMP> is an abbreviation of <SAMP>`auto-po-intl-m4&acute;</SAMP>;
+the tool copies or updates mostly files in the <TT>`po&acute;</TT>, <TT>`intl&acute;</TT>,
+<TT>`m4&acute;</TT> directories.
+
 </P>
 <P><HR><P>
 Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_11.html">previous</A>, <A HREF="gettext_13.html">next</A>, <A HREF="gettext_22.html">last</A> section, <A HREF="gettext_toc.html">table of contents</A>.
diff --git a/doc/gettext_13.html b/doc/gettext_13.html
index ac72cf2f7..fbf743370 100644
--- a/doc/gettext_13.html
+++ b/doc/gettext_13.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - 13  Other Programming Languages</TITLE>
 </HEAD>
@@ -10,7 +10,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_12.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC190" HREF="gettext_toc.html#TOC190">13  Other Programming Languages</A></H1>
+<H1><A NAME="SEC199" HREF="gettext_toc.html#TOC199">13  Other Programming Languages</A></H1>
 
 <P>
 While the presentation of <CODE>gettext</CODE> focuses mostly on C and
@@ -23,10 +23,10 @@ approach.
 
 
 
-<H2><A NAME="SEC191" HREF="gettext_toc.html#TOC191">13.1  The Language Implementor's View</A></H2>
+<H2><A NAME="SEC200" HREF="gettext_toc.html#TOC200">13.1  The Language Implementor's View</A></H2>
 <P>
-<A NAME="IDX895"></A>
-<A NAME="IDX896"></A>
+<A NAME="IDX909"></A>
+<A NAME="IDX910"></A>
 
 </P>
 <P>
@@ -150,7 +150,7 @@ and plural handling).
 
 
 
-<H2><A NAME="SEC192" HREF="gettext_toc.html#TOC192">13.2  The Programmer's View</A></H2>
+<H2><A NAME="SEC201" HREF="gettext_toc.html#TOC201">13.2  The Programmer's View</A></H2>
 
 <P>
 For the programmer, the general procedure is the same as for the C
@@ -163,7 +163,7 @@ underlying language runtime.
 </P>
 
 
-<H2><A NAME="SEC193" HREF="gettext_toc.html#TOC193">13.3  The Translator's View</A></H2>
+<H2><A NAME="SEC202" HREF="gettext_toc.html#TOC202">13.3  The Translator's View</A></H2>
 
 <P>
 The translator works exactly as in the C language case.  The only
@@ -174,7 +174,131 @@ strings.
 </P>
 
 
-<H2><A NAME="SEC194" HREF="gettext_toc.html#TOC194">13.4  The Maintainer's View</A></H2>
+
+<H3><A NAME="SEC203" HREF="gettext_toc.html#TOC203">13.3.1  C Format Strings</A></H3>
+
+<P>
+C format strings are described in POSIX (IEEE P1003.1 2001), section
+XSH 3 fprintf(),
+<A HREF="http://www.opengroup.org/onlinepubs/007904975/functions/fprintf.html">http://www.opengroup.org/onlinepubs/007904975/functions/fprintf.html</A>.
+See also the fprintf(3) manual page,
+<A HREF="http://www.linuxvalley.it/encyclopedia/ldp/manpage/man3/printf.3.php">http://www.linuxvalley.it/encyclopedia/ldp/manpage/man3/printf.3.php</A>,
+<A HREF="http://informatik.fh-wuerzburg.de/student/i510/man/printf.html">http://informatik.fh-wuerzburg.de/student/i510/man/printf.html</A>.
+
+</P>
+
+
+<H3><A NAME="SEC204" HREF="gettext_toc.html#TOC204">13.3.2  Python Format Strings</A></H3>
+
+<P>
+Python format strings are described in
+Python Library reference /
+2. Built-in Types, Exceptions and Functions /
+2.2. Built-in Types /
+2.2.6. Sequence Types /
+2.2.6.2. String Formatting Operations.
+<A HREF="http://www.python.org/doc/2.2.1/lib/typesseq-strings.html">http://www.python.org/doc/2.2.1/lib/typesseq-strings.html</A>.
+
+</P>
+
+
+<H3><A NAME="SEC205" HREF="gettext_toc.html#TOC205">13.3.3  Lisp Format Strings</A></H3>
+
+<P>
+Lisp format strings are described in the Common Lisp HyperSpec,
+chapter 22.3 Formatted Output,
+<A HREF="http://www.lisp.org/HyperSpec/Body/sec_22-3.html">http://www.lisp.org/HyperSpec/Body/sec_22-3.html</A>.
+
+</P>
+
+
+<H3><A NAME="SEC206" HREF="gettext_toc.html#TOC206">13.3.4  Emacs Lisp Format Strings</A></H3>
+
+<P>
+Emacs Lisp format strings are documented in the Emacs Lisp reference,
+section Formatting Strings,
+<A HREF="http://www.gnu.org/manual/elisp-manual-21-2.8/html_chapter/elisp_4.html#SEC75">http://www.gnu.org/manual/elisp-manual-21-2.8/html_chapter/elisp_4.html#SEC75</A>.
+Note that as of version 21, XEmacs supports numbered argument specifications
+in format strings while FSF Emacs doesn't.
+
+</P>
+
+
+<H3><A NAME="SEC207" HREF="gettext_toc.html#TOC207">13.3.5  librep Format Strings</A></H3>
+
+<P>
+librep format strings are documented in the librep manual, section
+Formatted Output,
+<A HREF="http://librep.sourceforge.net/librep-manual.html#Formatted%20Output">http://librep.sourceforge.net/librep-manual.html#Formatted%20Output</A>,
+<A HREF="http://www.gwinnup.org/research/docs/librep.html#SEC122">http://www.gwinnup.org/research/docs/librep.html#SEC122</A>.
+
+</P>
+
+
+<H3><A NAME="SEC208" HREF="gettext_toc.html#TOC208">13.3.6  Smalltalk Format Strings</A></H3>
+
+<P>
+Smalltalk format strings are described in the GNU Smalltalk documentation,
+class <CODE>CharArray</CODE>, methods <SAMP>`bindWith:&acute;</SAMP> and
+<SAMP>`bindWithArguments:&acute;</SAMP>.
+<A HREF="http://www.gnu.org/software/smalltalk/gst-manual/gst_68.html#SEC238">http://www.gnu.org/software/smalltalk/gst-manual/gst_68.html#SEC238</A>.
+In summary, a directive starts with <SAMP>`%&acute;</SAMP> and is followed by <SAMP>`%&acute;</SAMP>
+or a nonzero digit (<SAMP>`1&acute;</SAMP> to <SAMP>`9&acute;</SAMP>).
+
+</P>
+
+
+<H3><A NAME="SEC209" HREF="gettext_toc.html#TOC209">13.3.7  Java Format Strings</A></H3>
+
+<P>
+Java format strings are described in the JDK documentation for class
+<CODE>java.text.MessageFormat</CODE>,
+<A HREF="http://java.sun.com/j2se/1.4/docs/api/java/text/MessageFormat.html">http://java.sun.com/j2se/1.4/docs/api/java/text/MessageFormat.html</A>.
+See also the ICU documentation
+<A HREF="http://oss.software.ibm.com/icu/apiref/classMessageFormat.html">http://oss.software.ibm.com/icu/apiref/classMessageFormat.html</A>.
+
+</P>
+
+
+<H3><A NAME="SEC210" HREF="gettext_toc.html#TOC210">13.3.8  awk Format Strings</A></H3>
+
+<P>
+awk format strings are described in the gawk documentation, section
+Printf,
+<A HREF="http://www.gnu.org/manual/gawk/html_node/Printf.html#Printf">http://www.gnu.org/manual/gawk/html_node/Printf.html#Printf</A>.
+
+</P>
+
+
+<H3><A NAME="SEC211" HREF="gettext_toc.html#TOC211">13.3.9  Object Pascal Format Strings</A></H3>
+
+<P>
+Where is this documented?
+
+</P>
+
+
+<H3><A NAME="SEC212" HREF="gettext_toc.html#TOC212">13.3.10  YCP Format Strings</A></H3>
+
+<P>
+YCP sformat strings are described in the libycp documentation
+<A HREF="file:/usr/share/doc/packages/libycp/YCP-builtins.html">file:/usr/share/doc/packages/libycp/YCP-builtins.html</A>.
+In summary, a directive starts with <SAMP>`%&acute;</SAMP> and is followed by <SAMP>`%&acute;</SAMP>
+or a nonzero digit (<SAMP>`1&acute;</SAMP> to <SAMP>`9&acute;</SAMP>).
+
+</P>
+
+
+<H3><A NAME="SEC213" HREF="gettext_toc.html#TOC213">13.3.11  Tcl Format Strings</A></H3>
+
+<P>
+Tcl format strings are described in the <TT>`format.n&acute;</TT> manual page,
+<A HREF="http://www.scriptics.com/man/tcl8.3/TclCmd/format.htm">http://www.scriptics.com/man/tcl8.3/TclCmd/format.htm</A>.
+
+</P>
+
+
+<H2><A NAME="SEC214" HREF="gettext_toc.html#TOC214">13.4  The Maintainer's View</A></H2>
 
 <P>
 For the maintainer, the general procedure differs from the C language
@@ -205,13 +329,13 @@ that language, and to combine the resulting files using <CODE>msgcat</CODE>.
 
 
 
-<H2><A NAME="SEC195" HREF="gettext_toc.html#TOC195">13.5  Individual Programming Languages</A></H2>
+<H2><A NAME="SEC215" HREF="gettext_toc.html#TOC215">13.5  Individual Programming Languages</A></H2>
 
 
 
-<H3><A NAME="SEC196" HREF="gettext_toc.html#TOC196">13.5.1  C, C++, Objective C</A></H3>
+<H3><A NAME="SEC216" HREF="gettext_toc.html#TOC216">13.5.1  C, C++, Objective C</A></H3>
 <P>
-<A NAME="IDX897"></A>
+<A NAME="IDX911"></A>
 
 </P>
 <DL COMPACT>
@@ -280,9 +404,9 @@ yes
 
 
 
-<H3><A NAME="SEC197" HREF="gettext_toc.html#TOC197">13.5.2  sh - Shell Script</A></H3>
+<H3><A NAME="SEC217" HREF="gettext_toc.html#TOC217">13.5.2  sh - Shell Script</A></H3>
 <P>
-<A NAME="IDX898"></A>
+<A NAME="IDX912"></A>
 
 </P>
 <DL COMPACT>
@@ -305,18 +429,18 @@ bash, gettext
 
 <DT>gettext/ngettext functions
 <DD>
-<A NAME="IDX899"></A>
-<A NAME="IDX900"></A>
+<A NAME="IDX913"></A>
+<A NAME="IDX914"></A>
 <CODE>gettext</CODE>, <CODE>ngettext</CODE> programs
 
 <DT>textdomain
 <DD>
-<A NAME="IDX901"></A>
+<A NAME="IDX915"></A>
 environment variable <CODE>TEXTDOMAIN</CODE>
 
 <DT>bindtextdomain
 <DD>
-<A NAME="IDX902"></A>
+<A NAME="IDX916"></A>
 environment variable <CODE>TEXTDOMAINDIR</CODE>
 
 <DT>setlocale
@@ -350,9 +474,9 @@ use
 
 
 
-<H3><A NAME="SEC198" HREF="gettext_toc.html#TOC198">13.5.3  bash - Bourne-Again Shell Script</A></H3>
+<H3><A NAME="SEC218" HREF="gettext_toc.html#TOC218">13.5.3  bash - Bourne-Again Shell Script</A></H3>
 <P>
-<A NAME="IDX903"></A>
+<A NAME="IDX917"></A>
 
 </P>
 <DL COMPACT>
@@ -375,18 +499,18 @@ bash 2.0 or newer, gettext
 
 <DT>gettext/ngettext functions
 <DD>
-<A NAME="IDX904"></A>
-<A NAME="IDX905"></A>
+<A NAME="IDX918"></A>
+<A NAME="IDX919"></A>
 <CODE>gettext</CODE>, <CODE>ngettext</CODE> programs
 
 <DT>textdomain
 <DD>
-<A NAME="IDX906"></A>
+<A NAME="IDX920"></A>
 environment variable <CODE>TEXTDOMAIN</CODE>
 
 <DT>bindtextdomain
 <DD>
-<A NAME="IDX907"></A>
+<A NAME="IDX921"></A>
 environment variable <CODE>TEXTDOMAINDIR</CODE>
 
 <DT>setlocale
@@ -420,9 +544,9 @@ use
 
 
 
-<H3><A NAME="SEC199" HREF="gettext_toc.html#TOC199">13.5.4  Python</A></H3>
+<H3><A NAME="SEC219" HREF="gettext_toc.html#TOC219">13.5.4  Python</A></H3>
 <P>
-<A NAME="IDX908"></A>
+<A NAME="IDX922"></A>
 
 </P>
 <DL COMPACT>
@@ -491,11 +615,11 @@ fully portable
 
 
 
-<H3><A NAME="SEC200" HREF="gettext_toc.html#TOC200">13.5.5  GNU clisp - Common Lisp</A></H3>
+<H3><A NAME="SEC220" HREF="gettext_toc.html#TOC220">13.5.5  GNU clisp - Common Lisp</A></H3>
 <P>
-<A NAME="IDX909"></A>
-<A NAME="IDX910"></A>
-<A NAME="IDX911"></A>
+<A NAME="IDX923"></A>
+<A NAME="IDX924"></A>
+<A NAME="IDX925"></A>
 
 </P>
 <DL COMPACT>
@@ -559,9 +683,9 @@ On platforms without gettext, no translation.
 
 
 
-<H3><A NAME="SEC201" HREF="gettext_toc.html#TOC201">13.5.6  GNU clisp C sources</A></H3>
+<H3><A NAME="SEC221" HREF="gettext_toc.html#TOC221">13.5.6  GNU clisp C sources</A></H3>
 <P>
-<A NAME="IDX912"></A>
+<A NAME="IDX926"></A>
 
 </P>
 <DL COMPACT>
@@ -627,9 +751,9 @@ On platforms without gettext, no translation.
 
 
 
-<H3><A NAME="SEC202" HREF="gettext_toc.html#TOC202">13.5.7  Emacs Lisp</A></H3>
+<H3><A NAME="SEC222" HREF="gettext_toc.html#TOC222">13.5.7  Emacs Lisp</A></H3>
 <P>
-<A NAME="IDX913"></A>
+<A NAME="IDX927"></A>
 
 </P>
 <DL COMPACT>
@@ -693,9 +817,9 @@ Only XEmacs. Without <CODE>I18N3</CODE> defined at build time, no translation.
 
 
 
-<H3><A NAME="SEC203" HREF="gettext_toc.html#TOC203">13.5.8  librep</A></H3>
+<H3><A NAME="SEC223" HREF="gettext_toc.html#TOC223">13.5.8  librep</A></H3>
 <P>
-<A NAME="IDX914"></A>
+<A NAME="IDX928"></A>
 
 </P>
 <DL COMPACT>
@@ -759,9 +883,9 @@ On platforms without gettext, no translation.
 
 
 
-<H3><A NAME="SEC204" HREF="gettext_toc.html#TOC204">13.5.9  GNU Smalltalk</A></H3>
+<H3><A NAME="SEC224" HREF="gettext_toc.html#TOC224">13.5.9  GNU Smalltalk</A></H3>
 <P>
-<A NAME="IDX915"></A>
+<A NAME="IDX929"></A>
 
 </P>
 <DL COMPACT>
@@ -831,9 +955,9 @@ fully portable
 
 
 
-<H3><A NAME="SEC205" HREF="gettext_toc.html#TOC205">13.5.10  Java</A></H3>
+<H3><A NAME="SEC225" HREF="gettext_toc.html#TOC225">13.5.10  Java</A></H3>
 <P>
-<A NAME="IDX916"></A>
+<A NAME="IDX930"></A>
 
 </P>
 <DL COMPACT>
@@ -947,17 +1071,17 @@ a translation is missing, the <VAR>msgid</VAR> argument is returned unchanged.
 This has the advantage of having the <CODE>ngettext</CODE> function for plural
 handling.
 
-<A NAME="IDX917"></A>
+<A NAME="IDX931"></A>
 To use this API, one needs the <CODE>libintl.jar</CODE> file which is part of
 the GNU gettext package and distributed under the LGPL.
 </OL>
 
 
 
-<H3><A NAME="SEC206" HREF="gettext_toc.html#TOC206">13.5.11  GNU awk</A></H3>
+<H3><A NAME="SEC226" HREF="gettext_toc.html#TOC226">13.5.11  GNU awk</A></H3>
 <P>
-<A NAME="IDX918"></A>
-<A NAME="IDX919"></A>
+<A NAME="IDX932"></A>
+<A NAME="IDX933"></A>
 
 </P>
 <DL COMPACT>
@@ -1023,11 +1147,11 @@ yourself.
 
 
 
-<H3><A NAME="SEC207" HREF="gettext_toc.html#TOC207">13.5.12  Pascal - Free Pascal Compiler</A></H3>
+<H3><A NAME="SEC227" HREF="gettext_toc.html#TOC227">13.5.12  Pascal - Free Pascal Compiler</A></H3>
 <P>
-<A NAME="IDX920"></A>
-<A NAME="IDX921"></A>
-<A NAME="IDX922"></A>
+<A NAME="IDX934"></A>
+<A NAME="IDX935"></A>
+<A NAME="IDX936"></A>
 
 </P>
 <DL COMPACT>
@@ -1099,9 +1223,9 @@ using the <CODE>TranslateResourceStrings</CODE> function in the <CODE>gettext</C
 </P>
 
 
-<H3><A NAME="SEC208" HREF="gettext_toc.html#TOC208">13.5.13  wxWindows library</A></H3>
+<H3><A NAME="SEC228" HREF="gettext_toc.html#TOC228">13.5.13  wxWindows library</A></H3>
 <P>
-<A NAME="IDX923"></A>
+<A NAME="IDX937"></A>
 
 </P>
 <DL COMPACT>
@@ -1165,10 +1289,10 @@ yes
 
 
 
-<H3><A NAME="SEC209" HREF="gettext_toc.html#TOC209">13.5.14  YCP - YaST2 scripting language</A></H3>
+<H3><A NAME="SEC229" HREF="gettext_toc.html#TOC229">13.5.14  YCP - YaST2 scripting language</A></H3>
 <P>
-<A NAME="IDX924"></A>
-<A NAME="IDX925"></A>
+<A NAME="IDX938"></A>
+<A NAME="IDX939"></A>
 
 </P>
 <DL COMPACT>
@@ -1232,10 +1356,10 @@ fully portable
 
 
 
-<H3><A NAME="SEC210" HREF="gettext_toc.html#TOC210">13.5.15  Tcl - Tk's scripting language</A></H3>
+<H3><A NAME="SEC230" HREF="gettext_toc.html#TOC230">13.5.15  Tcl - Tk's scripting language</A></H3>
 <P>
-<A NAME="IDX926"></A>
-<A NAME="IDX927"></A>
+<A NAME="IDX940"></A>
+<A NAME="IDX941"></A>
 
 </P>
 <DL COMPACT>
@@ -1313,9 +1437,9 @@ argument is given.
 </P>
 
 
-<H3><A NAME="SEC211" HREF="gettext_toc.html#TOC211">13.5.16  Perl</A></H3>
+<H3><A NAME="SEC231" HREF="gettext_toc.html#TOC231">13.5.16  Perl</A></H3>
 <P>
-<A NAME="IDX928"></A>
+<A NAME="IDX942"></A>
 
 </P>
 <DL COMPACT>
@@ -1380,9 +1504,9 @@ use
 
 
 
-<H3><A NAME="SEC212" HREF="gettext_toc.html#TOC212">13.5.17  PHP Hypertext Preprocessor</A></H3>
+<H3><A NAME="SEC232" HREF="gettext_toc.html#TOC232">13.5.17  PHP Hypertext Preprocessor</A></H3>
 <P>
-<A NAME="IDX929"></A>
+<A NAME="IDX943"></A>
 
 </P>
 <DL COMPACT>
@@ -1446,9 +1570,9 @@ On platforms without gettext, the functions are not available.
 
 
 
-<H3><A NAME="SEC213" HREF="gettext_toc.html#TOC213">13.5.18  Pike</A></H3>
+<H3><A NAME="SEC233" HREF="gettext_toc.html#TOC233">13.5.18  Pike</A></H3>
 <P>
-<A NAME="IDX930"></A>
+<A NAME="IDX944"></A>
 
 </P>
 <DL COMPACT>
@@ -1512,7 +1636,7 @@ On platforms without gettext, the functions are not available.
 
 
 
-<H2><A NAME="SEC214" HREF="gettext_toc.html#TOC214">13.6  Internationalizable Data</A></H2>
+<H2><A NAME="SEC234" HREF="gettext_toc.html#TOC234">13.6  Internationalizable Data</A></H2>
 
 <P>
 Here is a list of other data formats which can be internationalized
@@ -1522,7 +1646,7 @@ using GNU gettext.
 
 
 
-<H3><A NAME="SEC215" HREF="gettext_toc.html#TOC215">13.6.1  POT - Portable Object Template</A></H3>
+<H3><A NAME="SEC235" HREF="gettext_toc.html#TOC235">13.6.1  POT - Portable Object Template</A></H3>
 
 <DL COMPACT>
 
@@ -1541,9 +1665,9 @@ gettext
 
 
 
-<H3><A NAME="SEC216" HREF="gettext_toc.html#TOC216">13.6.2  Resource String Table</A></H3>
+<H3><A NAME="SEC236" HREF="gettext_toc.html#TOC236">13.6.2  Resource String Table</A></H3>
 <P>
-<A NAME="IDX931"></A>
+<A NAME="IDX945"></A>
 
 </P>
 <DL COMPACT>
@@ -1563,7 +1687,7 @@ fpk
 
 
 
-<H3><A NAME="SEC217" HREF="gettext_toc.html#TOC217">13.6.3  Glade - GNOME user interface description</A></H3>
+<H3><A NAME="SEC237" HREF="gettext_toc.html#TOC237">13.6.3  Glade - GNOME user interface description</A></H3>
 
 <DL COMPACT>
 
diff --git a/doc/gettext_14.html b/doc/gettext_14.html
index e31698ee9..ea6d5cd4a 100644
--- a/doc/gettext_14.html
+++ b/doc/gettext_14.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - 14  Concluding Remarks</TITLE>
 </HEAD>
@@ -10,7 +10,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_13.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC218" HREF="gettext_toc.html#TOC218">14  Concluding Remarks</A></H1>
+<H1><A NAME="SEC238" HREF="gettext_toc.html#TOC238">14  Concluding Remarks</A></H1>
 
 <P>
 We would like to conclude this GNU <CODE>gettext</CODE> manual by presenting
@@ -22,9 +22,9 @@ about Native Language Support matters.
 
 
 
-<H2><A NAME="SEC219" HREF="gettext_toc.html#TOC219">14.1  History of GNU <CODE>gettext</CODE></A></H2>
+<H2><A NAME="SEC239" HREF="gettext_toc.html#TOC239">14.1  History of GNU <CODE>gettext</CODE></A></H2>
 <P>
-<A NAME="IDX932"></A>
+<A NAME="IDX946"></A>
 
 </P>
 <P>
@@ -121,10 +121,10 @@ manipulating PO files.
 </P>
 
 
-<H2><A NAME="SEC220" HREF="gettext_toc.html#TOC220">14.2  Related Readings</A></H2>
+<H2><A NAME="SEC240" HREF="gettext_toc.html#TOC240">14.2  Related Readings</A></H2>
 <P>
-<A NAME="IDX933"></A>
-<A NAME="IDX934"></A>
+<A NAME="IDX947"></A>
+<A NAME="IDX948"></A>
 
 </P>
 <P>
diff --git a/doc/gettext_15.html b/doc/gettext_15.html
index d3e3bbd07..465c8c43c 100644
--- a/doc/gettext_15.html
+++ b/doc/gettext_15.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - A  Language Codes</TITLE>
 </HEAD>
@@ -10,10 +10,10 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_14.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC221" HREF="gettext_toc.html#TOC221">A  Language Codes</A></H1>
+<H1><A NAME="SEC241" HREF="gettext_toc.html#TOC241">A  Language Codes</A></H1>
 <P>
-<A NAME="IDX935"></A>
-<A NAME="IDX936"></A>
+<A NAME="IDX949"></A>
+<A NAME="IDX950"></A>
 
 </P>
 <P>
diff --git a/doc/gettext_16.html b/doc/gettext_16.html
index 98288dcd0..c4663a522 100644
--- a/doc/gettext_16.html
+++ b/doc/gettext_16.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - B  Country Codes</TITLE>
 </HEAD>
@@ -10,10 +10,10 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_15.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC222" HREF="gettext_toc.html#TOC222">B  Country Codes</A></H1>
+<H1><A NAME="SEC242" HREF="gettext_toc.html#TOC242">B  Country Codes</A></H1>
 <P>
-<A NAME="IDX937"></A>
-<A NAME="IDX938"></A>
+<A NAME="IDX951"></A>
+<A NAME="IDX952"></A>
 
 </P>
 <P>
diff --git a/doc/gettext_17.html b/doc/gettext_17.html
index dd06ecb50..dd3e89be7 100644
--- a/doc/gettext_17.html
+++ b/doc/gettext_17.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - Program Index</TITLE>
 </HEAD>
@@ -10,10 +10,12 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_16.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC223" HREF="gettext_toc.html#TOC223">Program Index</A></H1>
+<H1><A NAME="SEC243" HREF="gettext_toc.html#TOC243">Program Index</A></H1>
 
 <P>
 Jump to:
+<A HREF="#pindex_a">a</A>
+-
 <A HREF="#pindex_g">g</A>
 -
 <A HREF="#pindex_m">m</A>
@@ -22,35 +24,39 @@ Jump to:
 -
 <A HREF="#pindex_x">x</A>
 <P>
+<H2><A NAME="pindex_a">a</A></H2>
+<DIR>
+<LI><A HREF="gettext_12.html#IDX901">autopoint</A>
+</DIR>
 <H2><A NAME="pindex_g">g</A></H2>
 <DIR>
-<LI><A HREF="gettext_13.html#IDX899">gettext</A>, <A HREF="gettext_13.html#IDX904">gettext</A>
-<LI><A HREF="gettext_12.html#IDX867">gettextize</A>
+<LI><A HREF="gettext_13.html#IDX913">gettext</A>, <A HREF="gettext_13.html#IDX918">gettext</A>
+<LI><A HREF="gettext_12.html#IDX868">gettextize</A>
 </DIR>
 <H2><A NAME="pindex_m">m</A></H2>
 <DIR>
-<LI><A HREF="gettext_7.html#IDX646">msgattrib</A>
-<LI><A HREF="gettext_7.html#IDX429">msgcat</A>
-<LI><A HREF="gettext_7.html#IDX635">msgcmp</A>
-<LI><A HREF="gettext_7.html#IDX601">msgcomm</A>
-<LI><A HREF="gettext_7.html#IDX468">msgconv</A>
-<LI><A HREF="gettext_7.html#IDX685">msgen</A>
-<LI><A HREF="gettext_7.html#IDX709">msgexec</A>
-<LI><A HREF="gettext_7.html#IDX533">msgfilter</A>
-<LI><A HREF="gettext_8.html#IDX724">msgfmt</A>
-<LI><A HREF="gettext_7.html#IDX494">msggrep</A>
-<LI><A HREF="gettext_5.html#IDX211">msginit</A>
-<LI><A HREF="gettext_6.html#IDX240">msgmerge</A>
-<LI><A HREF="gettext_8.html#IDX772">msgunfmt</A>
-<LI><A HREF="gettext_7.html#IDX568">msguniq</A>
+<LI><A HREF="gettext_7.html#IDX647">msgattrib</A>
+<LI><A HREF="gettext_7.html#IDX430">msgcat</A>
+<LI><A HREF="gettext_7.html#IDX636">msgcmp</A>
+<LI><A HREF="gettext_7.html#IDX602">msgcomm</A>
+<LI><A HREF="gettext_7.html#IDX469">msgconv</A>
+<LI><A HREF="gettext_7.html#IDX686">msgen</A>
+<LI><A HREF="gettext_7.html#IDX710">msgexec</A>
+<LI><A HREF="gettext_7.html#IDX534">msgfilter</A>
+<LI><A HREF="gettext_8.html#IDX725">msgfmt</A>
+<LI><A HREF="gettext_7.html#IDX495">msggrep</A>
+<LI><A HREF="gettext_5.html#IDX212">msginit</A>
+<LI><A HREF="gettext_6.html#IDX241">msgmerge</A>
+<LI><A HREF="gettext_8.html#IDX773">msgunfmt</A>
+<LI><A HREF="gettext_7.html#IDX569">msguniq</A>
 </DIR>
 <H2><A NAME="pindex_n">n</A></H2>
 <DIR>
-<LI><A HREF="gettext_13.html#IDX900">ngettext</A>, <A HREF="gettext_13.html#IDX905">ngettext</A>
+<LI><A HREF="gettext_13.html#IDX914">ngettext</A>, <A HREF="gettext_13.html#IDX919">ngettext</A>
 </DIR>
 <H2><A NAME="pindex_x">x</A></H2>
 <DIR>
-<LI><A HREF="gettext_4.html#IDX149">xgettext</A>
+<LI><A HREF="gettext_4.html#IDX150">xgettext</A>
 </DIR>
 
 </P>
diff --git a/doc/gettext_18.html b/doc/gettext_18.html
index 7a6773e6c..f9a101e87 100644
--- a/doc/gettext_18.html
+++ b/doc/gettext_18.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - Option Index</TITLE>
 </HEAD>
@@ -10,7 +10,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_17.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC224" HREF="gettext_toc.html#TOC224">Option Index</A></H1>
+<H1><A NAME="SEC244" HREF="gettext_toc.html#TOC244">Option Index</A></H1>
 
 <P>
 Jump to:
@@ -18,426 +18,434 @@ Jump to:
 <P>
 <H2><A NAME="opindex_-">-</A></H2>
 <DIR>
-<LI><A HREF="gettext_4.html#IDX172">--add-comments, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX672">--add-location, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX454">--add-location, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX621">--add-location, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX481">--add-location, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX696">--add-location, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX555">--add-location, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX522">--add-location, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX261">--add-location, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX588">--add-location, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX188">--add-location, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX763">--alignment, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX251">--backup, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX166">--c++, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX747">--check, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX755">--check-accelerators, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX753">--check-compatibility, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX751">--check-domain, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX748">--check-format, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX750">--check-header, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX662">--clear-fuzzy, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX664">--clear-obsolete, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX245">--compendium, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_12.html#IDX870">--copy, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX200">--copyright-holder, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX181">--debug, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX156">--default-domain, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX651">--directory, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX436">--directory, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX639">--directory, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX607">--directory, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX472">--directory, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX689">--directory, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX719">--directory, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX539">--directory, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX728">--directory, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX498">--directory, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX243">--directory, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX573">--directory, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX154">--directory, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX504">--domain, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX170">--exclude-file, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX545">--expression, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX510">--extended-regexp, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX174">--extract-all, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX547">--file, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX516">--file, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX434">--files-from, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX605">--files-from, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX152">--files-from, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX512">--fixed-strings, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_12.html#IDX872">--force, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX667">--force-po, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX449">--force-po, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX616">--force-po, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX477">--force-po, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX692">--force-po, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX551">--force-po, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX519">--force-po, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX257">--force-po, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX789">--force-po, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX583">--force-po, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX183">--force-po, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX201">--foreign-user, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX665">--fuzzy, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_12.html#IDX875">--help, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX682">--help, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX465">--help, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX643">--help, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX632">--help, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX491">--help, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX706">--help, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX721">--help, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX565">--help, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX766">--help, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX530">--help, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX226">--help, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX272">--help, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX800">--help, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX598">--help, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX207">--help, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX518">--ignore-case, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX669">--indent, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX451">--indent, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX618">--indent, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX479">--indent, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX694">--indent, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX552">--indent, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX520">--indent, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX259">--indent, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX791">--indent, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX585">--indent, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX185">--indent, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX717">--input, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX537">--input, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX216">--input, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_12.html#IDX873">--intl, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX730">--java, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX776">--java, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX732">--java2, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX168">--join-existing, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX553">--keep-header, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX176">--keyword, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX163">--language, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX441">--less-than, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX611">--less-than, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX741">--locale, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_8.html#IDX744">--locale, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX220">--locale, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX783">--locale, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_8.html#IDX785">--locale, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX502">--location, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX443">--more-than, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX613">--more-than, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX506">--msgid, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX508">--msgstr, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX203">--msgstr-prefix, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX205">--msgstr-suffix, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX641">--multi-domain, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX256">--multi-domain, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_12.html#IDX874">--no-changelog, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX656">--no-fuzzy, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX764">--no-hash, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX670">--no-location, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX452">--no-location, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX619">--no-location, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX480">--no-location, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX695">--no-location, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX554">--no-location, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX521">--no-location, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX260">--no-location, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX586">--no-location, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX186">--no-location, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX658">--no-obsolete, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX221">--no-translator, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX676">--no-wrap, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX458">--no-wrap, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX625">--no-wrap, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX485">--no-wrap, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX700">--no-wrap, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX559">--no-wrap, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX526">--no-wrap, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX224">--no-wrap, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX265">--no-wrap, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX795">--no-wrap, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX592">--no-wrap, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX192">--no-wrap, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX666">--obsolete, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX630">--omit-header, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX198">--omit-header, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX657">--only-fuzzy, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX659">--only-obsolete, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX158">--output, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX160">--output-dir, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX653">--output-file, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX438">--output-file, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX609">--output-file, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX474">--output-file, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX691">--output-file, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX541">--output-file, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX736">--output-file, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX500">--output-file, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX218">--output-file, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX249">--output-file, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX788">--output-file, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX575">--output-file, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX549">--quiet, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX278">--quiet, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX514">--regexp=, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX577">--repeated, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX739">--resource, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX781">--resource, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX661">--set-fuzzy, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX663">--set-obsolete, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX550">--silent, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX279">--silent, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX680">--sort-by-file, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX463">--sort-by-file, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX629">--sort-by-file, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX489">--sort-by-file, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX704">--sort-by-file, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX563">--sort-by-file, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX528">--sort-by-file, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX270">--sort-by-file, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX596">--sort-by-file, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX197">--sort-by-file, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX678">--sort-output, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX460">--sort-output, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX627">--sort-output, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX487">--sort-output, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX702">--sort-output, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX561">--sort-output, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX527">--sort-output, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX267">--sort-output, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX797">--sort-output, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX594">--sort-output, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX194">--sort-output, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX769">--statistics, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX673">--strict, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX455">--strict, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX622">--strict, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX482">--strict, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX697">--strict, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX556">--strict, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX737">--strict, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX523">--strict, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX262">--strict, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX792">--strict, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX589">--strict, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX189">--strict, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX253">--suffix, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX733">--tcl, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX778">--tcl, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX447">--to-code, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX476">--to-code, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX581">--to-code, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX654">--translated, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX179">--trigraphs, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX445">--unique, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX615">--unique, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX579">--unique, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX655">--untranslated, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX247">--update, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX448">--use-first, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX582">--use-first, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX760">--use-fuzzy, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX771">--verbose, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX276">--verbose, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX804">--verbose, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_12.html#IDX876">--version, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX684">--version, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX467">--version, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX645">--version, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX634">--version, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX493">--version, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX708">--version, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX723">--version, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX567">--version, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX768">--version, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX532">--version, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX228">--version, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX274">--version, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX802">--version, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX600">--version, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX209">--version, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX675">--width, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX457">--width, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX624">--width, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX484">--width, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX699">--width, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX558">--width, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX525">--width, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX223">--width, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX264">--width, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX794">--width, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX591">--width, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX191">--width, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX440">-&#60;, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX610">-&#60;, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX442">-&#62;, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX612">-&#62;, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX762">-a, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX173">-a, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_12.html#IDX869">-c, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX746">-c, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX752">-C, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX244">-C, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX165">-C, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX171">-c, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX650">-D, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX435">-D, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX638">-D, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX606">-D, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX471">-D, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX688">-D, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX718">-D, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX538">-D, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX742">-d, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_8.html#IDX745">-d, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX727">-D, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX497">-D, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX242">-D, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX786">-d, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX576">-d, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX572">-D, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX153">-D, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX155">-d, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX544">-e, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX509">-E, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX513">-e, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_12.html#IDX871">-f, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX679">-F, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX462">-F, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX433">-f, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX628">-F, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX604">-f, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX488">-F, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX703">-F, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX562">-F, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX546">-f, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX759">-f, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX515">-f, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX511">-F, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX269">-F, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX595">-F, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX151">-f, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX196">-F, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX681">-h, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX464">-h, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX642">-h, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX631">-h, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX490">-h, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX705">-h, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX720">-h, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX564">-h, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX765">-h, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX529">-h, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX225">-h, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX271">-h, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX799">-h, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX597">-h, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX206">-h, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX668">-i, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX450">-i, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX617">-i, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX478">-i, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX693">-i, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX716">-i, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX536">-i, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX517">-i, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX215">-i, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX258">-i, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX790">-i, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX584">-i, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX184">-i, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX729">-j, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX775">-j, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX167">-j, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX505">-K, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX175">-k, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX740">-l, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_8.html#IDX743">-l, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX219">-l, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX782">-l, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_8.html#IDX784">-l, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX162">-L, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX640">-m, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX503">-M, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX255">-m, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX202">-m, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX204">-M, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX671">-n, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX453">-n, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX620">-n, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX548">-n, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX501">-N, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX587">-n, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX187">-n, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX652">-o, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX437">-o, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX608">-o, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX473">-o, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX690">-o, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX540">-o, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX735">-o, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX499">-o, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX217">-o, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX248">-o, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX787">-o, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX574">-o, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX157">-o, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX159">-p, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX277">-q, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX738">-r, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX780">-r, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX677">-s, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX459">-s, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX626">-s, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX486">-s, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX701">-s, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX560">-s, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX266">-s, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX796">-s, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX593">-s, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX193">-s, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX446">-t, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX475">-t, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX507">-T, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX580">-t, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX178">-T, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX444">-u, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX614">-u, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX246">-U, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX578">-u, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX683">-V, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX466">-V, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX644">-V, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX633">-V, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX492">-V, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX707">-V, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX722">-V, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX566">-V, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX770">-v, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX767">-V, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX531">-V, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX227">-V, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX275">-v, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX273">-V, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX803">-v, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX801">-V, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX599">-V, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX208">-V, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX674">-w, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX456">-w, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX623">-w, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX483">-w, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX698">-w, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX557">-w, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX524">-w, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX222">-w, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX263">-w, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_8.html#IDX793">-w, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX590">-w, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX190">-w, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_4.html#IDX169">-x, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX173">--add-comments, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX673">--add-location, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX455">--add-location, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX622">--add-location, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX482">--add-location, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX697">--add-location, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX556">--add-location, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX523">--add-location, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX262">--add-location, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX589">--add-location, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX189">--add-location, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX764">--alignment, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX252">--backup, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX167">--c++, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX748">--check, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX756">--check-accelerators, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX754">--check-compatibility, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX752">--check-domain, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX749">--check-format, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX751">--check-header, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX663">--clear-fuzzy, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX665">--clear-obsolete, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX246">--compendium, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_12.html#IDX871">--copy, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX201">--copyright-holder, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX182">--debug, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX157">--default-domain, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX652">--directory, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX437">--directory, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX640">--directory, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX608">--directory, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX473">--directory, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX690">--directory, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX720">--directory, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX540">--directory, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX729">--directory, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX499">--directory, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX244">--directory, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX574">--directory, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX155">--directory, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX505">--domain, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_12.html#IDX906">--dry-run, <CODE>autopoint</CODE> option</A>
+<LI><A HREF="gettext_12.html#IDX877">--dry-run, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX171">--exclude-file, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX546">--expression, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX511">--extended-regexp, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX175">--extract-all, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX548">--file, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX517">--file, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX435">--files-from, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX606">--files-from, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX153">--files-from, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX513">--fixed-strings, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_12.html#IDX904">--force, <CODE>autopoint</CODE> option</A>
+<LI><A HREF="gettext_12.html#IDX873">--force, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX668">--force-po, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX450">--force-po, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX617">--force-po, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX478">--force-po, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX693">--force-po, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX552">--force-po, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX520">--force-po, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX258">--force-po, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX790">--force-po, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX584">--force-po, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX184">--force-po, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX202">--foreign-user, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX666">--fuzzy, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_12.html#IDX907">--help, <CODE>autopoint</CODE> option</A>
+<LI><A HREF="gettext_12.html#IDX878">--help, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX683">--help, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX466">--help, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX644">--help, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX633">--help, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX492">--help, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX707">--help, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX722">--help, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX566">--help, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX767">--help, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX531">--help, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX227">--help, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX273">--help, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX801">--help, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX599">--help, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX208">--help, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX519">--ignore-case, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX670">--indent, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX452">--indent, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX619">--indent, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX480">--indent, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX695">--indent, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX553">--indent, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX521">--indent, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX260">--indent, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX792">--indent, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX586">--indent, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX186">--indent, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX718">--input, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX538">--input, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX217">--input, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_12.html#IDX874">--intl, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX731">--java, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX777">--java, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX733">--java2, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX169">--join-existing, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX554">--keep-header, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX177">--keyword, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX164">--language, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX442">--less-than, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX612">--less-than, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX742">--locale, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_8.html#IDX745">--locale, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX221">--locale, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX784">--locale, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_8.html#IDX786">--locale, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX503">--location, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX444">--more-than, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX614">--more-than, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX507">--msgid, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX509">--msgstr, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX204">--msgstr-prefix, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX206">--msgstr-suffix, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX642">--multi-domain, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX257">--multi-domain, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_12.html#IDX875">--no-changelog, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX657">--no-fuzzy, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX765">--no-hash, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX671">--no-location, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX453">--no-location, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX620">--no-location, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX481">--no-location, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX696">--no-location, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX555">--no-location, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX522">--no-location, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX261">--no-location, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX587">--no-location, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX187">--no-location, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX659">--no-obsolete, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX222">--no-translator, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX677">--no-wrap, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX459">--no-wrap, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX626">--no-wrap, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX486">--no-wrap, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX701">--no-wrap, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX560">--no-wrap, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX527">--no-wrap, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX225">--no-wrap, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX266">--no-wrap, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX796">--no-wrap, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX593">--no-wrap, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX193">--no-wrap, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX667">--obsolete, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX631">--omit-header, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX199">--omit-header, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX658">--only-fuzzy, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX660">--only-obsolete, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX159">--output, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX161">--output-dir, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX654">--output-file, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX439">--output-file, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX610">--output-file, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX475">--output-file, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX692">--output-file, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX542">--output-file, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX737">--output-file, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX501">--output-file, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX219">--output-file, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX250">--output-file, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX789">--output-file, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX576">--output-file, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX550">--quiet, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX279">--quiet, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX515">--regexp=, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX578">--repeated, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX740">--resource, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX782">--resource, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX662">--set-fuzzy, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX664">--set-obsolete, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX551">--silent, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX280">--silent, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX681">--sort-by-file, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX464">--sort-by-file, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX630">--sort-by-file, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX490">--sort-by-file, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX705">--sort-by-file, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX564">--sort-by-file, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX529">--sort-by-file, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX271">--sort-by-file, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX597">--sort-by-file, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX198">--sort-by-file, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX679">--sort-output, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX461">--sort-output, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX628">--sort-output, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX488">--sort-output, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX703">--sort-output, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX562">--sort-output, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX528">--sort-output, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX268">--sort-output, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX798">--sort-output, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX595">--sort-output, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX195">--sort-output, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX770">--statistics, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX674">--strict, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX456">--strict, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX623">--strict, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX483">--strict, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX698">--strict, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX557">--strict, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX738">--strict, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX524">--strict, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX263">--strict, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX793">--strict, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX590">--strict, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX190">--strict, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX254">--suffix, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX734">--tcl, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX779">--tcl, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX448">--to-code, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX477">--to-code, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX582">--to-code, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX655">--translated, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX180">--trigraphs, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX446">--unique, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX616">--unique, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX580">--unique, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX656">--untranslated, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX248">--update, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX449">--use-first, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX583">--use-first, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX761">--use-fuzzy, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX772">--verbose, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX277">--verbose, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX805">--verbose, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_12.html#IDX908">--version, <CODE>autopoint</CODE> option</A>
+<LI><A HREF="gettext_12.html#IDX879">--version, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX685">--version, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX468">--version, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX646">--version, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX635">--version, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX494">--version, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX709">--version, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX724">--version, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX568">--version, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX769">--version, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX533">--version, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX229">--version, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX275">--version, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX803">--version, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX601">--version, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX210">--version, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX676">--width, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX458">--width, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX625">--width, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX485">--width, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX700">--width, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX559">--width, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX526">--width, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX224">--width, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX265">--width, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX795">--width, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX592">--width, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX192">--width, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX441">-&#60;, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX611">-&#60;, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX443">-&#62;, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX613">-&#62;, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX763">-a, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX174">-a, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_12.html#IDX870">-c, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX753">-C, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX747">-c, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX245">-C, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX172">-c, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX166">-C, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_12.html#IDX905">-d, <CODE>autopoint</CODE> option</A>
+<LI><A HREF="gettext_12.html#IDX876">-d, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX651">-D, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX436">-D, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX639">-D, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX607">-D, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX472">-D, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX689">-D, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX719">-D, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX539">-D, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX728">-D, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX743">-d, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_8.html#IDX746">-d, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX498">-D, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX243">-D, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX787">-d, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX577">-d, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX573">-D, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX154">-D, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX156">-d, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX545">-e, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX514">-e, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX510">-E, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_12.html#IDX903">-f, <CODE>autopoint</CODE> option</A>
+<LI><A HREF="gettext_12.html#IDX872">-f, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX680">-F, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX463">-F, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX434">-f, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX629">-F, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX605">-f, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX489">-F, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX704">-F, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX547">-f, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX563">-F, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX760">-f, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX512">-F, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX516">-f, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX270">-F, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX596">-F, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX197">-F, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX152">-f, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX682">-h, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX465">-h, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX643">-h, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX632">-h, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX491">-h, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX706">-h, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX721">-h, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX565">-h, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX766">-h, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX530">-h, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX226">-h, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX272">-h, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX800">-h, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX598">-h, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX207">-h, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX669">-i, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX451">-i, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX618">-i, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX479">-i, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX694">-i, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX717">-i, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX537">-i, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX518">-i, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX216">-i, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX259">-i, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX791">-i, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX585">-i, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX185">-i, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX730">-j, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX776">-j, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX168">-j, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX506">-K, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX176">-k, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX741">-l, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_8.html#IDX744">-l, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX220">-l, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX783">-l, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_8.html#IDX785">-l, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX163">-L, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX641">-m, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX504">-M, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX256">-m, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX203">-m, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX205">-M, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX672">-n, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX454">-n, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX621">-n, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX549">-n, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX502">-N, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX588">-n, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX188">-n, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX653">-o, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX438">-o, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX609">-o, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX474">-o, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX691">-o, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX541">-o, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX736">-o, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX500">-o, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX218">-o, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX249">-o, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX788">-o, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX575">-o, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX158">-o, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX160">-p, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX278">-q, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX739">-r, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX781">-r, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX678">-s, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX460">-s, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX627">-s, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX487">-s, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX702">-s, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX561">-s, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX267">-s, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX797">-s, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX594">-s, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX194">-s, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX447">-t, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX476">-t, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX508">-T, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX581">-t, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX179">-T, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX445">-u, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX615">-u, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX247">-U, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX579">-u, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX684">-V, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX467">-V, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX645">-V, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX634">-V, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX493">-V, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX708">-V, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX723">-V, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX567">-V, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX768">-V, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX771">-v, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX532">-V, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX228">-V, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX276">-v, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX274">-V, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX802">-V, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX804">-v, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX600">-V, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX209">-V, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX675">-w, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX457">-w, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX624">-w, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX484">-w, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX699">-w, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX558">-w, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX525">-w, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX223">-w, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX264">-w, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_8.html#IDX794">-w, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX591">-w, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX191">-w, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_4.html#IDX170">-x, <CODE>xgettext</CODE> option</A>
 </DIR>
 
 </P>
diff --git a/doc/gettext_19.html b/doc/gettext_19.html
index f1b5e54f0..59246cad2 100644
--- a/doc/gettext_19.html
+++ b/doc/gettext_19.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - Variable Index</TITLE>
 </HEAD>
@@ -10,7 +10,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_18.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC225" HREF="gettext_toc.html#TOC225">Variable Index</A></H1>
+<H1><A NAME="SEC245" HREF="gettext_toc.html#TOC245">Variable Index</A></H1>
 
 <P>
 Jump to:
@@ -22,26 +22,26 @@ Jump to:
 <P>
 <H2><A NAME="vindex_l">l</A></H2>
 <DIR>
-<LI><A HREF="gettext_9.html#IDX819">LANG, environment variable</A>, <A HREF="gettext_10.html#IDX861">LANG, environment variable</A>
-<LI><A HREF="gettext_10.html#IDX853">LANGUAGE, environment variable</A>, <A HREF="gettext_12.html#IDX882">LANGUAGE, environment variable</A>
-<LI><A HREF="gettext_10.html#IDX854">LC_ALL, environment variable</A>
-<LI><A HREF="gettext_10.html#IDX858">LC_COLLATE, environment variable</A>
-<LI><A HREF="gettext_10.html#IDX855">LC_CTYPE, environment variable</A>
-<LI><A HREF="gettext_10.html#IDX860">LC_MESSAGES, environment variable</A>
-<LI><A HREF="gettext_10.html#IDX859">LC_MONETARY, environment variable</A>
-<LI><A HREF="gettext_10.html#IDX856">LC_NUMERIC, environment variable</A>
-<LI><A HREF="gettext_10.html#IDX857">LC_TIME, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX815">LINGUAS, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX820">LANG, environment variable</A>, <A HREF="gettext_10.html#IDX862">LANG, environment variable</A>
+<LI><A HREF="gettext_10.html#IDX854">LANGUAGE, environment variable</A>, <A HREF="gettext_12.html#IDX885">LANGUAGE, environment variable</A>
+<LI><A HREF="gettext_10.html#IDX855">LC_ALL, environment variable</A>
+<LI><A HREF="gettext_10.html#IDX859">LC_COLLATE, environment variable</A>
+<LI><A HREF="gettext_10.html#IDX856">LC_CTYPE, environment variable</A>
+<LI><A HREF="gettext_10.html#IDX861">LC_MESSAGES, environment variable</A>
+<LI><A HREF="gettext_10.html#IDX860">LC_MONETARY, environment variable</A>
+<LI><A HREF="gettext_10.html#IDX857">LC_NUMERIC, environment variable</A>
+<LI><A HREF="gettext_10.html#IDX858">LC_TIME, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX816">LINGUAS, environment variable</A>
 </DIR>
 <H2><A NAME="vindex_m">m</A></H2>
 <DIR>
-<LI><A HREF="gettext_7.html#IDX714">MSGEXEC_LOCATION, environment variable</A>
-<LI><A HREF="gettext_7.html#IDX713">MSGEXEC_MSGID, environment variable</A>
+<LI><A HREF="gettext_7.html#IDX715">MSGEXEC_LOCATION, environment variable</A>
+<LI><A HREF="gettext_7.html#IDX714">MSGEXEC_MSGID, environment variable</A>
 </DIR>
 <H2><A NAME="vindex_t">t</A></H2>
 <DIR>
-<LI><A HREF="gettext_13.html#IDX901">TEXTDOMAIN, environment variable</A>, <A HREF="gettext_13.html#IDX906">TEXTDOMAIN, environment variable</A>
-<LI><A HREF="gettext_13.html#IDX902">TEXTDOMAINDIR, environment variable</A>, <A HREF="gettext_13.html#IDX907">TEXTDOMAINDIR, environment variable</A>
+<LI><A HREF="gettext_13.html#IDX915">TEXTDOMAIN, environment variable</A>, <A HREF="gettext_13.html#IDX920">TEXTDOMAIN, environment variable</A>
+<LI><A HREF="gettext_13.html#IDX916">TEXTDOMAINDIR, environment variable</A>, <A HREF="gettext_13.html#IDX921">TEXTDOMAINDIR, environment variable</A>
 </DIR>
 
 </P>
diff --git a/doc/gettext_2.html b/doc/gettext_2.html
index d793b2213..07e3730b0 100644
--- a/doc/gettext_2.html
+++ b/doc/gettext_2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - 2  PO Files and PO Mode Basics</TITLE>
 </HEAD>
@@ -118,6 +118,17 @@ the translator.  When using PO mode, very little has to be known
 about the format details, as PO mode takes care of them for her.
 
 </P>
+<P>
+A simple entry can look like this:
+
+</P>
+
+<PRE>
+#: lib/error.c:116
+msgid "Unknown system error"
+msgstr "Error desconegut del sistema"
+</PRE>
+
 <P>
 Entries begin with some optional white space.  Usually, when generated
 through GNU <CODE>gettext</CODE> tools, there is exactly one blank line
@@ -195,6 +206,7 @@ See section <A HREF="gettext_8.html#SEC119">8.1  Invoking the <CODE>msgfmt</CODE
 
 <P>
 <A NAME="IDX50"></A>
+<A NAME="IDX51"></A>
 A different kind of entries is used for translations which involve
 plural forms.
 
@@ -214,7 +226,21 @@ msgstr[N] <VAR>translated-string-case-n</VAR>
 </PRE>
 
 <P>
-<A NAME="IDX51"></A>
+Such an entry can look like this:
+
+</P>
+
+<PRE>
+#: src/msgcmp.c:338 src/po-lex.c:699
+#, c-format
+msgid "found %d fatal error"
+msgid_plural "found %d fatal errors"
+msgstr[0] "s'ha trobat %d error fatal"
+msgstr[1] "s'han trobat %d errors fatals"
+</PRE>
+
+<P>
+<A NAME="IDX52"></A>
 It happens that some lines, usually whitespace or comments, follow the
 very last entry of a PO file.  Such lines are not part of any entry,
 and PO mode is unable to take action on those lines.  By using the
@@ -264,7 +290,7 @@ other character, we just did it this way because it is neater.
 
 </P>
 <P>
-<A NAME="IDX52"></A>
+<A NAME="IDX53"></A>
 One should carefully distinguish between end of lines marked as
 <SAMP>`\n&acute;</SAMP> <EM>inside</EM> quotes, which are part of the represented
 string, and end of lines in the PO file itself, outside string quotes,
@@ -272,7 +298,7 @@ which have no incidence on the represented string.
 
 </P>
 <P>
-<A NAME="IDX53"></A>
+<A NAME="IDX54"></A>
 Outside strings, white lines and comments may be used freely.
 Comments start at the beginning of a line with <SAMP>`#&acute;</SAMP> and extend
 until the end of the PO file line.  Comments written by translators
@@ -288,8 +314,8 @@ file is given to <CODE>msgmerge</CODE>.
 <H2><A NAME="SEC10" HREF="gettext_toc.html#TOC10">2.3  Main PO mode Commands</A></H2>
 
 <P>
-<A NAME="IDX54"></A>
 <A NAME="IDX55"></A>
+<A NAME="IDX56"></A>
 After setting up Emacs with something similar to the lines in
 section <A HREF="gettext_2.html#SEC8">2.1  Completing GNU <CODE>gettext</CODE> Installation</A>, PO mode is activated for a window when Emacs finds a
 PO file in that window.  This puts the window read-only and establishes a
@@ -321,47 +347,47 @@ in special ways.
 
 <DT><KBD>_</KBD>
 <DD>
-<A NAME="IDX56"></A>
+<A NAME="IDX57"></A>
 Undo last modification to the PO file (<CODE>po-undo</CODE>).
 
 <DT><KBD>Q</KBD>
 <DD>
-<A NAME="IDX57"></A>
+<A NAME="IDX58"></A>
 Quit processing and save the PO file (<CODE>po-quit</CODE>).
 
 <DT><KBD>q</KBD>
 <DD>
-<A NAME="IDX58"></A>
+<A NAME="IDX59"></A>
 Quit processing, possibly after confirmation (<CODE>po-confirm-and-quit</CODE>).
 
 <DT><KBD>0</KBD>
 <DD>
-<A NAME="IDX59"></A>
+<A NAME="IDX60"></A>
 Temporary leave the PO file window (<CODE>po-other-window</CODE>).
 
 <DT><KBD>?</KBD>
 <DD>
 <DT><KBD>h</KBD>
 <DD>
-<A NAME="IDX60"></A>
 <A NAME="IDX61"></A>
+<A NAME="IDX62"></A>
 Show help about PO mode (<CODE>po-help</CODE>).
 
 <DT><KBD>=</KBD>
 <DD>
-<A NAME="IDX62"></A>
+<A NAME="IDX63"></A>
 Give some PO file statistics (<CODE>po-statistics</CODE>).
 
 <DT><KBD>V</KBD>
 <DD>
-<A NAME="IDX63"></A>
+<A NAME="IDX64"></A>
 Batch validate the format of the whole PO file (<CODE>po-validate</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX64"></A>
 <A NAME="IDX65"></A>
+<A NAME="IDX66"></A>
 The command <KBD>_</KBD> (<CODE>po-undo</CODE>) interfaces to the Emacs
 <EM>undo</EM> facility.  See section `Undoing Changes' in <CITE>The Emacs Editor</CITE>.  Each time <KBD>U</KBD> is typed, modifications which the translator
 did to the PO file are undone a little more.  For the purpose of
@@ -373,10 +399,10 @@ can undo the edition work quite parsimoniously.
 
 </P>
 <P>
-<A NAME="IDX66"></A>
 <A NAME="IDX67"></A>
 <A NAME="IDX68"></A>
 <A NAME="IDX69"></A>
+<A NAME="IDX70"></A>
 The commands <KBD>Q</KBD> (<CODE>po-quit</CODE>) and <KBD>q</KBD>
 (<CODE>po-confirm-and-quit</CODE>) are used when the translator is done with the
 PO file.  The former is a bit less verbose than the latter.  If the file
@@ -389,8 +415,8 @@ of an Emacs PO file buffer.  Merely killing it through the usual command
 
 </P>
 <P>
-<A NAME="IDX70"></A>
 <A NAME="IDX71"></A>
+<A NAME="IDX72"></A>
 The command <KBD>0</KBD> (<CODE>po-other-window</CODE>) is another, softer way,
 to leave PO mode, temporarily.  It just moves the cursor to some other
 Emacs window, and pops one if necessary.  For example, if the translator
@@ -404,9 +430,9 @@ PO mode is then recovered.
 
 </P>
 <P>
-<A NAME="IDX72"></A>
 <A NAME="IDX73"></A>
 <A NAME="IDX74"></A>
+<A NAME="IDX75"></A>
 The command <KBD>h</KBD> (<CODE>po-help</CODE>) displays a summary of all available PO
 mode commands.  The translator should then type any character to resume
 normal PO mode operations.  The command <KBD>?</KBD> has the same effect
@@ -414,8 +440,8 @@ as <KBD>h</KBD>.
 
 </P>
 <P>
-<A NAME="IDX75"></A>
 <A NAME="IDX76"></A>
+<A NAME="IDX77"></A>
 The command <KBD>=</KBD> (<CODE>po-statistics</CODE>) computes the total number of
 entries in the PO file, the ordinal of the current entry (counted from
 1), the number of untranslated entries, the number of obsolete entries,
@@ -423,8 +449,8 @@ and displays all these numbers.
 
 </P>
 <P>
-<A NAME="IDX77"></A>
 <A NAME="IDX78"></A>
+<A NAME="IDX79"></A>
 The command <KBD>V</KBD> (<CODE>po-validate</CODE>) launches <CODE>msgfmt</CODE> in
 checking and verbose
 mode over the current PO file.  This command first offers to save the
@@ -435,7 +461,7 @@ as well as all individual entries.
 
 </P>
 <P>
-<A NAME="IDX79"></A>
+<A NAME="IDX80"></A>
 The program <CODE>msgfmt</CODE> runs asynchronously with Emacs, so the
 translator regains control immediately while her PO file is being studied.
 Error output is collected in the Emacs <SAMP>`*compilation*&acute;</SAMP> buffer,
@@ -451,7 +477,7 @@ any PO mode action which would help correcting the error.
 <H2><A NAME="SEC11" HREF="gettext_toc.html#TOC11">2.4  Entry Positioning</A></H2>
 
 <P>
-<A NAME="IDX80"></A>
+<A NAME="IDX81"></A>
 The cursor in a PO file window is almost always part of
 an entry.  The only exceptions are the special case when the cursor
 is after the last entry in the file, or when the PO file is
@@ -462,7 +488,7 @@ the PO file, this also selects on which entry commands operate.
 
 </P>
 <P>
-<A NAME="IDX81"></A>
+<A NAME="IDX82"></A>
 Some PO mode commands alter the position of the cursor in a specialized
 way.  A few of those special purpose positioning are described here,
 the others are described in following sections (for a complete list try
@@ -473,51 +499,51 @@ the others are described in following sections (for a complete list try
 
 <DT><KBD>.</KBD>
 <DD>
-<A NAME="IDX82"></A>
+<A NAME="IDX83"></A>
 Redisplay the current entry (<CODE>po-current-entry</CODE>).
 
 <DT><KBD>n</KBD>
 <DD>
-<A NAME="IDX83"></A>
+<A NAME="IDX84"></A>
 Select the entry after the current one (<CODE>po-next-entry</CODE>).
 
 <DT><KBD>p</KBD>
 <DD>
-<A NAME="IDX84"></A>
+<A NAME="IDX85"></A>
 Select the entry before the current one (<CODE>po-previous-entry</CODE>).
 
 <DT><KBD>&#60;</KBD>
 <DD>
-<A NAME="IDX85"></A>
+<A NAME="IDX86"></A>
 Select the first entry in the PO file (<CODE>po-first-entry</CODE>).
 
 <DT><KBD>&#62;</KBD>
 <DD>
-<A NAME="IDX86"></A>
+<A NAME="IDX87"></A>
 Select the last entry in the PO file (<CODE>po-last-entry</CODE>).
 
 <DT><KBD>m</KBD>
 <DD>
-<A NAME="IDX87"></A>
+<A NAME="IDX88"></A>
 Record the location of the current entry for later use
 (<CODE>po-push-location</CODE>).
 
 <DT><KBD>r</KBD>
 <DD>
-<A NAME="IDX88"></A>
+<A NAME="IDX89"></A>
 Return to a previously saved entry location (<CODE>po-pop-location</CODE>).
 
 <DT><KBD>x</KBD>
 <DD>
-<A NAME="IDX89"></A>
+<A NAME="IDX90"></A>
 Exchange the current entry location with the previously saved one
 (<CODE>po-exchange-location</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX90"></A>
 <A NAME="IDX91"></A>
+<A NAME="IDX92"></A>
 Any Emacs command able to reposition the cursor may be used
 to select the current entry in PO mode, including commands which
 move by characters, lines, paragraphs, screens or pages, and search
@@ -546,10 +572,10 @@ how <EM>others</EM> should do translation.
 
 </P>
 <P>
-<A NAME="IDX92"></A>
 <A NAME="IDX93"></A>
 <A NAME="IDX94"></A>
 <A NAME="IDX95"></A>
+<A NAME="IDX96"></A>
 The commands <KBD>n</KBD> (<CODE>po-next-entry</CODE>) and <KBD>p</KBD>
 (<CODE>po-previous-entry</CODE>) move the cursor the entry following,
 or preceding, the current one.  If <KBD>n</KBD> is given while the
@@ -558,10 +584,10 @@ is given while the cursor is on the first entry, no move is done.
 
 </P>
 <P>
-<A NAME="IDX96"></A>
 <A NAME="IDX97"></A>
 <A NAME="IDX98"></A>
 <A NAME="IDX99"></A>
+<A NAME="IDX100"></A>
 The commands <KBD>&#60;</KBD> (<CODE>po-first-entry</CODE>) and <KBD>&#62;</KBD>
 (<CODE>po-last-entry</CODE>) move the cursor to the first entry, or last
 entry, of the PO file.  When the cursor is located past the last
@@ -584,10 +610,10 @@ register for getting back, or else, use the location ring.
 
 </P>
 <P>
-<A NAME="IDX100"></A>
 <A NAME="IDX101"></A>
 <A NAME="IDX102"></A>
 <A NAME="IDX103"></A>
+<A NAME="IDX104"></A>
 PO mode offers another approach, by which cursor locations may be saved
 onto a special stack.  The command <KBD>m</KBD> (<CODE>po-push-location</CODE>)
 merely adds the location of current entry to the stack, pushing
@@ -607,8 +633,8 @@ ought to use <KBD>m</KBD> immediately after <KBD>r</KBD>.
 
 </P>
 <P>
-<A NAME="IDX104"></A>
 <A NAME="IDX105"></A>
+<A NAME="IDX106"></A>
 The command <KBD>x</KBD> (<CODE>po-exchange-location</CODE>) simultaneously
 repositions the cursor to the entry associated with the top element of
 the stack of saved locations, and replaces that top element with the
@@ -623,7 +649,7 @@ merely use <KBD>x</KBD> for making the switch.
 
 <H2><A NAME="SEC12" HREF="gettext_toc.html#TOC12">2.5  Normalizing Strings in Entries</A></H2>
 <P>
-<A NAME="IDX106"></A>
+<A NAME="IDX107"></A>
 
 </P>
 <P>
@@ -657,12 +683,12 @@ command is available:
 
 </P>
 <P>
-<A NAME="IDX107"></A>
+<A NAME="IDX108"></A>
 <DL COMPACT>
 
 <DT><KBD>M-x po-normalize</KBD>
 <DD>
-<A NAME="IDX108"></A>
+<A NAME="IDX109"></A>
 Tidy the whole PO file by making entries more uniform.
 
 </DL>
@@ -694,7 +720,7 @@ for continued lines.
 
 </P>
 <P>
-<A NAME="IDX109"></A>
+<A NAME="IDX110"></A>
 Having such an explicit normalizing command allows for importing PO
 files from other sources, but also eases the evolution of the current
 convention, evolution driven mostly by aesthetic concerns, as of now.
@@ -707,7 +733,7 @@ their PO files in nice ways.
 
 </P>
 <P>
-<A NAME="IDX110"></A>
+<A NAME="IDX111"></A>
 Right now, in PO mode, strings are single line or multi-line.  A string
 goes multi-line if and only if it has <EM>embedded</EM> newlines, that
 is, if it matches <SAMP>`[^\n]\n+[^\n]&acute;</SAMP>.  So, we would have:
diff --git a/doc/gettext_20.html b/doc/gettext_20.html
index 37fb3c388..27c5536ad 100644
--- a/doc/gettext_20.html
+++ b/doc/gettext_20.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - PO Mode Index</TITLE>
 </HEAD>
@@ -10,7 +10,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_19.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC226" HREF="gettext_toc.html#TOC226">PO Mode Index</A></H1>
+<H1><A NAME="SEC246" HREF="gettext_toc.html#TOC246">PO Mode Index</A></H1>
 
 <P>
 Jump to:
@@ -46,28 +46,28 @@ Jump to:
 </DIR>
 <H2><A NAME="emindex_a">a</A></H2>
 <DIR>
-<LI><A HREF="gettext_6.html#IDX398">auxiliary PO file</A>
+<LI><A HREF="gettext_6.html#IDX399">auxiliary PO file</A>
 </DIR>
 <H2><A NAME="emindex_c">c</A></H2>
 <DIR>
-<LI><A HREF="gettext_2.html#IDX55">commands</A>
-<LI><A HREF="gettext_6.html#IDX328">comment out PO file entry</A>
-<LI><A HREF="gettext_6.html#IDX380">consulting program sources</A>
-<LI><A HREF="gettext_6.html#IDX396">consulting translations to other languages</A>
-<LI><A HREF="gettext_2.html#IDX80">current entry of a PO file</A>
-<LI><A HREF="gettext_6.html#IDX344">cut and paste for translated strings</A>
+<LI><A HREF="gettext_2.html#IDX56">commands</A>
+<LI><A HREF="gettext_6.html#IDX329">comment out PO file entry</A>
+<LI><A HREF="gettext_6.html#IDX381">consulting program sources</A>
+<LI><A HREF="gettext_6.html#IDX397">consulting translations to other languages</A>
+<LI><A HREF="gettext_2.html#IDX81">current entry of a PO file</A>
+<LI><A HREF="gettext_6.html#IDX345">cut and paste for translated strings</A>
 </DIR>
 <H2><A NAME="emindex_e">e</A></H2>
 <DIR>
-<LI><A HREF="gettext_6.html#IDX353">editing comments</A>
-<LI><A HREF="gettext_6.html#IDX378">editing multiple entries</A>
-<LI><A HREF="gettext_6.html#IDX330">editing translations</A>
-<LI><A HREF="gettext_3.html#IDX136"><CODE>etags</CODE>, using for marking strings</A>
-<LI><A HREF="gettext_6.html#IDX371">exiting PO subedit</A>
+<LI><A HREF="gettext_6.html#IDX354">editing comments</A>
+<LI><A HREF="gettext_6.html#IDX379">editing multiple entries</A>
+<LI><A HREF="gettext_6.html#IDX331">editing translations</A>
+<LI><A HREF="gettext_3.html#IDX137"><CODE>etags</CODE>, using for marking strings</A>
+<LI><A HREF="gettext_6.html#IDX372">exiting PO subedit</A>
 </DIR>
 <H2><A NAME="emindex_f">f</A></H2>
 <DIR>
-<LI><A HREF="gettext_6.html#IDX383">find source fragment for a PO file entry</A>
+<LI><A HREF="gettext_6.html#IDX384">find source fragment for a PO file entry</A>
 </DIR>
 <H2><A NAME="emindex_i">i</A></H2>
 <DIR>
@@ -75,40 +75,40 @@ Jump to:
 </DIR>
 <H2><A NAME="emindex_l">l</A></H2>
 <DIR>
-<LI><A HREF="gettext_6.html#IDX381">looking at the source to aid translation</A>
+<LI><A HREF="gettext_6.html#IDX382">looking at the source to aid translation</A>
 </DIR>
 <H2><A NAME="emindex_m">m</A></H2>
 <DIR>
-<LI><A HREF="gettext_3.html#IDX135">marking strings for translation</A>
-<LI><A HREF="gettext_6.html#IDX292">moving by fuzzy entries</A>
-<LI><A HREF="gettext_6.html#IDX317">moving by obsolete entries</A>
-<LI><A HREF="gettext_6.html#IDX281">moving by translated entries</A>
-<LI><A HREF="gettext_6.html#IDX306">moving by untranslated entries</A>
-<LI><A HREF="gettext_2.html#IDX81">moving through a PO file</A>
+<LI><A HREF="gettext_3.html#IDX136">marking strings for translation</A>
+<LI><A HREF="gettext_6.html#IDX293">moving by fuzzy entries</A>
+<LI><A HREF="gettext_6.html#IDX318">moving by obsolete entries</A>
+<LI><A HREF="gettext_6.html#IDX282">moving by translated entries</A>
+<LI><A HREF="gettext_6.html#IDX307">moving by untranslated entries</A>
+<LI><A HREF="gettext_2.html#IDX82">moving through a PO file</A>
 </DIR>
 <H2><A NAME="emindex_o">o</A></H2>
 <DIR>
-<LI><A HREF="gettext_6.html#IDX327">obsolete active entry</A>
+<LI><A HREF="gettext_6.html#IDX328">obsolete active entry</A>
 </DIR>
 <H2><A NAME="emindex_p">p</A></H2>
 <DIR>
-<LI><A HREF="gettext_6.html#IDX379">pending subedits</A>
+<LI><A HREF="gettext_6.html#IDX380">pending subedits</A>
 </DIR>
 <H2><A NAME="emindex_s">s</A></H2>
 <DIR>
-<LI><A HREF="gettext_6.html#IDX343">starting a string translation</A>
-<LI><A HREF="gettext_2.html#IDX107">string normalization in entries</A>
-<LI><A HREF="gettext_6.html#IDX367">subedit minor mode</A>
+<LI><A HREF="gettext_6.html#IDX344">starting a string translation</A>
+<LI><A HREF="gettext_2.html#IDX108">string normalization in entries</A>
+<LI><A HREF="gettext_6.html#IDX368">subedit minor mode</A>
 </DIR>
 <H2><A NAME="emindex_t">t</A></H2>
 <DIR>
-<LI><A HREF="gettext_3.html#IDX137"><TT>`TAGS&acute;</TT>, and marking translatable strings</A>
+<LI><A HREF="gettext_3.html#IDX138"><TT>`TAGS&acute;</TT>, and marking translatable strings</A>
 </DIR>
 <H2><A NAME="emindex_u">u</A></H2>
 <DIR>
-<LI><A HREF="gettext_6.html#IDX382">use the source, Luke</A>
-<LI><A HREF="gettext_6.html#IDX351">using obsolete translations to make new entries</A>
-<LI><A HREF="gettext_6.html#IDX412">using translation compendia</A>
+<LI><A HREF="gettext_6.html#IDX383">use the source, Luke</A>
+<LI><A HREF="gettext_6.html#IDX352">using obsolete translations to make new entries</A>
+<LI><A HREF="gettext_6.html#IDX413">using translation compendia</A>
 </DIR>
 
 </P>
diff --git a/doc/gettext_21.html b/doc/gettext_21.html
index 549af4875..7133d5e75 100644
--- a/doc/gettext_21.html
+++ b/doc/gettext_21.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - Autoconf Macro Index</TITLE>
 </HEAD>
@@ -10,7 +10,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_20.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC227" HREF="gettext_toc.html#TOC227">Autoconf Macro Index</A></H1>
+<H1><A NAME="SEC247" HREF="gettext_toc.html#TOC247">Autoconf Macro Index</A></H1>
 
 <P>
 Jump to:
@@ -18,8 +18,9 @@ Jump to:
 <P>
 <H2><A NAME="amindex_a">a</A></H2>
 <DIR>
-<LI><A HREF="gettext_12.html#IDX891">AM_GNU_GETTEXT</A>
-<LI><A HREF="gettext_12.html#IDX893">AM_ICONV</A>
+<LI><A HREF="gettext_12.html#IDX896">AM_GNU_GETTEXT</A>
+<LI><A HREF="gettext_12.html#IDX898">AM_GNU_GETTEXT_VERSION</A>
+<LI><A HREF="gettext_12.html#IDX899">AM_ICONV</A>
 </DIR>
 
 </P>
diff --git a/doc/gettext_22.html b/doc/gettext_22.html
index 23d31e0c1..4b315db50 100644
--- a/doc/gettext_22.html
+++ b/doc/gettext_22.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - General Index</TITLE>
 </HEAD>
@@ -10,7 +10,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_21.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC228" HREF="gettext_toc.html#TOC228">General Index</A></H1>
+<H1><A NAME="SEC248" HREF="gettext_toc.html#TOC248">General Index</A></H1>
 
 <P>
 Jump to:
@@ -68,343 +68,347 @@ Jump to:
 <P>
 <H2><A NAME="cindex__">_</A></H2>
 <DIR>
-<LI><A HREF="gettext_3.html#IDX134"><CODE>_</CODE>, a macro to mark strings for translation</A>
-<LI><A HREF="gettext_10.html#IDX862"><CODE>_nl_msg_cat_cntr</CODE></A>
+<LI><A HREF="gettext_3.html#IDX135"><CODE>_</CODE>, a macro to mark strings for translation</A>
+<LI><A HREF="gettext_10.html#IDX863"><CODE>_nl_msg_cat_cntr</CODE></A>
 </DIR>
 <H2><A NAME="cindex_a">a</A></H2>
 <DIR>
-<LI><A HREF="gettext_9.html#IDX812"><TT>`ABOUT-NLS&acute;</TT> file</A>
-<LI><A HREF="gettext_12.html#IDX885"><TT>`acconfig.h&acute;</TT> file</A>
-<LI><A HREF="gettext_6.html#IDX417">accumulating translations</A>
-<LI><A HREF="gettext_12.html#IDX884"><TT>`aclocal.m4&acute;</TT> file</A>
-<LI><A HREF="gettext_4.html#IDX177">adding keywords, <CODE>xgettext</CODE></A>
-<LI><A HREF="gettext_3.html#IDX125">ambiguities</A>
-<LI><A HREF="gettext_7.html#IDX535">apply a filter to translations</A>
-<LI><A HREF="gettext_7.html#IDX711">apply command to all translations in a catalog</A>
-<LI><A HREF="gettext_7.html#IDX649">attribute manipulation</A>
-<LI><A HREF="gettext_6.html#IDX291">attribute, fuzzy</A>
-<LI><A HREF="gettext_6.html#IDX290">attributes of a PO file entry</A>
-<LI><A HREF="gettext_7.html#IDX428">attributes, manipulating</A>
-<LI><A HREF="gettext_12.html#IDX890">autoconf macros for <CODE>gettext</CODE></A>
-<LI><A HREF="gettext_6.html#IDX397">auxiliary PO file</A>
-<LI><A HREF="gettext_9.html#IDX811">available translations</A>
-<LI><A HREF="gettext_13.html#IDX918">awk</A>
+<LI><A HREF="gettext_9.html#IDX813"><TT>`ABOUT-NLS&acute;</TT> file</A>
+<LI><A HREF="gettext_12.html#IDX889"><TT>`acconfig.h&acute;</TT> file</A>
+<LI><A HREF="gettext_6.html#IDX418">accumulating translations</A>
+<LI><A HREF="gettext_12.html#IDX888"><TT>`aclocal.m4&acute;</TT> file</A>
+<LI><A HREF="gettext_4.html#IDX178">adding keywords, <CODE>xgettext</CODE></A>
+<LI><A HREF="gettext_3.html#IDX126">ambiguities</A>
+<LI><A HREF="gettext_7.html#IDX536">apply a filter to translations</A>
+<LI><A HREF="gettext_7.html#IDX712">apply command to all translations in a catalog</A>
+<LI><A HREF="gettext_7.html#IDX650">attribute manipulation</A>
+<LI><A HREF="gettext_6.html#IDX292">attribute, fuzzy</A>
+<LI><A HREF="gettext_6.html#IDX291">attributes of a PO file entry</A>
+<LI><A HREF="gettext_7.html#IDX429">attributes, manipulating</A>
+<LI><A HREF="gettext_12.html#IDX895">autoconf macros for <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_12.html#IDX902"><CODE>autopoint</CODE> program, usage</A>
+<LI><A HREF="gettext_6.html#IDX398">auxiliary PO file</A>
+<LI><A HREF="gettext_9.html#IDX812">available translations</A>
+<LI><A HREF="gettext_13.html#IDX932">awk</A>
 </DIR>
 <H2><A NAME="cindex_b">b</A></H2>
 <DIR>
-<LI><A HREF="gettext_6.html#IDX252">backup old file, and <CODE>msgmerge</CODE> program</A>
-<LI><A HREF="gettext_13.html#IDX903">bash</A>
-<LI><A HREF="gettext_14.html#IDX934">bibliography</A>
+<LI><A HREF="gettext_6.html#IDX253">backup old file, and <CODE>msgmerge</CODE> program</A>
+<LI><A HREF="gettext_13.html#IDX917">bash</A>
+<LI><A HREF="gettext_14.html#IDX948">bibliography</A>
 <LI><A HREF="gettext_1.html#IDX30">big picture</A>
-<LI><A HREF="gettext_10.html#IDX834">bind_textdomain_codeset</A>
+<LI><A HREF="gettext_10.html#IDX835">bind_textdomain_codeset</A>
 <LI><A HREF="gettext_1.html#IDX4">bug report address</A>
 </DIR>
 <H2><A NAME="cindex_c">c</A></H2>
 <DIR>
-<LI><A HREF="gettext_13.html#IDX897">C and C-like languages</A>
-<LI><A HREF="gettext_4.html#IDX180">C trigraphs</A>
-<LI><A HREF="gettext_7.html#IDX715">catalog encoding and <CODE>msgexec</CODE> output</A>
-<LI><A HREF="gettext_10.html#IDX824"><CODE>catclose</CODE>, a <CODE>catgets</CODE> function</A>
-<LI><A HREF="gettext_10.html#IDX820"><CODE>catgets</CODE>, X/Open specification</A>
-<LI><A HREF="gettext_10.html#IDX823"><CODE>catgets</CODE>, a <CODE>catgets</CODE> function</A>
-<LI><A HREF="gettext_10.html#IDX822"><CODE>catopen</CODE>, a <CODE>catgets</CODE> function</A>
+<LI><A HREF="gettext_13.html#IDX911">C and C-like languages</A>
+<LI><A HREF="gettext_4.html#IDX181">C trigraphs</A>
+<LI><A HREF="gettext_7.html#IDX716">catalog encoding and <CODE>msgexec</CODE> output</A>
+<LI><A HREF="gettext_10.html#IDX825"><CODE>catclose</CODE>, a <CODE>catgets</CODE> function</A>
+<LI><A HREF="gettext_10.html#IDX821"><CODE>catgets</CODE>, X/Open specification</A>
+<LI><A HREF="gettext_10.html#IDX824"><CODE>catgets</CODE>, a <CODE>catgets</CODE> function</A>
+<LI><A HREF="gettext_10.html#IDX823"><CODE>catopen</CODE>, a <CODE>catgets</CODE> function</A>
 <LI><A HREF="gettext_1.html#IDX17">character encoding</A>
-<LI><A HREF="gettext_10.html#IDX832">charset conversion at runtime</A>
-<LI><A HREF="gettext_5.html#IDX232">charset of PO files</A>
-<LI><A HREF="gettext_8.html#IDX749">check format strings</A>
-<LI><A HREF="gettext_7.html#IDX426">checking of translations</A>
-<LI><A HREF="gettext_13.html#IDX911">clisp</A>
-<LI><A HREF="gettext_13.html#IDX912">clisp C sources</A>
+<LI><A HREF="gettext_10.html#IDX833">charset conversion at runtime</A>
+<LI><A HREF="gettext_5.html#IDX233">charset of PO files</A>
+<LI><A HREF="gettext_8.html#IDX750">check format strings</A>
+<LI><A HREF="gettext_7.html#IDX427">checking of translations</A>
+<LI><A HREF="gettext_13.html#IDX925">clisp</A>
+<LI><A HREF="gettext_13.html#IDX926">clisp C sources</A>
 <LI><A HREF="gettext_1.html#IDX15">codeset</A>
-<LI><A HREF="gettext_2.html#IDX53">comments in PO files</A>
-<LI><A HREF="gettext_13.html#IDX909">Common Lisp</A>
-<LI><A HREF="gettext_7.html#IDX637">compare PO files</A>
-<LI><A HREF="gettext_10.html#IDX849">comparison of interfaces</A>
-<LI><A HREF="gettext_8.html#IDX754">compatibility with X/Open <CODE>msgfmt</CODE></A>
-<LI><A HREF="gettext_6.html#IDX413">compendium</A>
-<LI><A HREF="gettext_6.html#IDX415">compendium, creating</A>
-<LI><A HREF="gettext_7.html#IDX431">concatenate PO files</A>
-<LI><A HREF="gettext_6.html#IDX416">concatenating PO files into a compendium</A>
-<LI><A HREF="gettext_3.html#IDX130">concatenation of strings</A>
-<LI><A HREF="gettext_8.html#IDX774">convert binary message catalog into PO file</A>
-<LI><A HREF="gettext_7.html#IDX470">convert translations to a different encoding</A>
-<LI><A HREF="gettext_12.html#IDX864">converting a package to use <CODE>gettext</CODE></A>
-<LI><A HREF="gettext_16.html#IDX937">country codes</A>
-<LI><A HREF="gettext_5.html#IDX213">create new PO file</A>
-<LI><A HREF="gettext_5.html#IDX210">creating a new PO file</A>
-<LI><A HREF="gettext_6.html#IDX414">creating compendia</A>
+<LI><A HREF="gettext_2.html#IDX54">comments in PO files</A>
+<LI><A HREF="gettext_13.html#IDX923">Common Lisp</A>
+<LI><A HREF="gettext_7.html#IDX638">compare PO files</A>
+<LI><A HREF="gettext_10.html#IDX850">comparison of interfaces</A>
+<LI><A HREF="gettext_8.html#IDX755">compatibility with X/Open <CODE>msgfmt</CODE></A>
+<LI><A HREF="gettext_6.html#IDX414">compendium</A>
+<LI><A HREF="gettext_6.html#IDX416">compendium, creating</A>
+<LI><A HREF="gettext_7.html#IDX432">concatenate PO files</A>
+<LI><A HREF="gettext_6.html#IDX417">concatenating PO files into a compendium</A>
+<LI><A HREF="gettext_3.html#IDX131">concatenation of strings</A>
+<LI><A HREF="gettext_12.html#IDX890"><TT>`config.h.in&acute;</TT> file</A>
+<LI><A HREF="gettext_8.html#IDX775">convert binary message catalog into PO file</A>
+<LI><A HREF="gettext_7.html#IDX471">convert translations to a different encoding</A>
+<LI><A HREF="gettext_12.html#IDX865">converting a package to use <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_16.html#IDX951">country codes</A>
+<LI><A HREF="gettext_5.html#IDX214">create new PO file</A>
+<LI><A HREF="gettext_5.html#IDX211">creating a new PO file</A>
+<LI><A HREF="gettext_6.html#IDX415">creating compendia</A>
 <LI><A HREF="gettext_1.html#IDX19">currency symbols</A>
 </DIR>
 <H2><A NAME="cindex_d">d</A></H2>
 <DIR>
 <LI><A HREF="gettext_1.html#IDX21">date format</A>
-<LI><A HREF="gettext_10.html#IDX838">dcngettext</A>
-<LI><A HREF="gettext_4.html#IDX182">debugging messages marked as format strings</A>
-<LI><A HREF="gettext_7.html#IDX424">dialect</A>
-<LI><A HREF="gettext_12.html#IDX888">disabling NLS</A>
-<LI><A HREF="gettext_10.html#IDX837">dngettext</A>
-<LI><A HREF="gettext_10.html#IDX829">domain ambiguities</A>
-<LI><A HREF="gettext_7.html#IDX427">duplicate elimination</A>
-<LI><A HREF="gettext_7.html#IDX571">duplicate removal</A>
+<LI><A HREF="gettext_10.html#IDX839">dcngettext</A>
+<LI><A HREF="gettext_4.html#IDX183">debugging messages marked as format strings</A>
+<LI><A HREF="gettext_7.html#IDX425">dialect</A>
+<LI><A HREF="gettext_12.html#IDX893">disabling NLS</A>
+<LI><A HREF="gettext_10.html#IDX838">dngettext</A>
+<LI><A HREF="gettext_10.html#IDX830">domain ambiguities</A>
+<LI><A HREF="gettext_7.html#IDX428">duplicate elimination</A>
+<LI><A HREF="gettext_7.html#IDX572">duplicate removal</A>
 </DIR>
 <H2><A NAME="cindex_e">e</A></H2>
 <DIR>
-<LI><A HREF="gettext_6.html#IDX352">editing comments in PO files</A>
-<LI><A HREF="gettext_6.html#IDX329">editing translations</A>
-<LI><A HREF="gettext_13.html#IDX913">Emacs Lisp</A>
+<LI><A HREF="gettext_6.html#IDX353">editing comments in PO files</A>
+<LI><A HREF="gettext_6.html#IDX330">editing translations</A>
+<LI><A HREF="gettext_13.html#IDX927">Emacs Lisp</A>
 <LI><A HREF="gettext_1.html#IDX16">encoding</A>
-<LI><A HREF="gettext_7.html#IDX423">encoding conversion</A>
-<LI><A HREF="gettext_10.html#IDX833">encoding conversion at runtime</A>
-<LI><A HREF="gettext_5.html#IDX236">encoding for your language</A>
-<LI><A HREF="gettext_5.html#IDX234">encoding list</A>
-<LI><A HREF="gettext_5.html#IDX231">encoding of PO files</A>
+<LI><A HREF="gettext_7.html#IDX424">encoding conversion</A>
+<LI><A HREF="gettext_10.html#IDX834">encoding conversion at runtime</A>
+<LI><A HREF="gettext_5.html#IDX237">encoding for your language</A>
+<LI><A HREF="gettext_5.html#IDX235">encoding list</A>
+<LI><A HREF="gettext_5.html#IDX232">encoding of PO files</A>
 <LI><A HREF="gettext_1.html#IDX38">evolution of packages</A>
-<LI><A HREF="gettext_6.html#IDX418">extracting parts of a PO file into a compendium</A>
+<LI><A HREF="gettext_6.html#IDX419">extracting parts of a PO file into a compendium</A>
 </DIR>
 <H2><A NAME="cindex_f">f</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX806">file format, <TT>`.mo&acute;</TT></A>
+<LI><A HREF="gettext_8.html#IDX807">file format, <TT>`.mo&acute;</TT></A>
 <LI><A HREF="gettext_2.html#IDX44">file format, <TT>`.po&acute;</TT></A>
 <LI><A HREF="gettext_1.html#IDX28">files, <TT>`.po&acute;</TT> and <TT>`.mo&acute;</TT></A>
 <LI><A HREF="gettext_1.html#IDX37">files, <TT>`.pot&acute;</TT></A>
-<LI><A HREF="gettext_7.html#IDX648">filter messages according to attributes</A>
-<LI><A HREF="gettext_7.html#IDX603">find common messages</A>
-<LI><A HREF="gettext_8.html#IDX761">force use of fuzzy entries</A>
-<LI><A HREF="gettext_3.html#IDX144">format strings</A>
-<LI><A HREF="gettext_13.html#IDX921">Free Pascal</A>
-<LI><A HREF="gettext_6.html#IDX289">fuzzy entries</A>
+<LI><A HREF="gettext_7.html#IDX649">filter messages according to attributes</A>
+<LI><A HREF="gettext_7.html#IDX604">find common messages</A>
+<LI><A HREF="gettext_8.html#IDX762">force use of fuzzy entries</A>
+<LI><A HREF="gettext_3.html#IDX145">format strings</A>
+<LI><A HREF="gettext_13.html#IDX935">Free Pascal</A>
+<LI><A HREF="gettext_6.html#IDX290">fuzzy entries</A>
 </DIR>
 <H2><A NAME="cindex_g">g</A></H2>
 <DIR>
-<LI><A HREF="gettext_13.html#IDX919">gawk</A>
-<LI><A HREF="gettext_8.html#IDX726">generate binary message catalog from PO file</A>
-<LI><A HREF="gettext_7.html#IDX687">generate translation catalog in English</A>
-<LI><A HREF="gettext_12.html#IDX877"><CODE>gettext</CODE> files</A>
+<LI><A HREF="gettext_13.html#IDX933">gawk</A>
+<LI><A HREF="gettext_8.html#IDX727">generate binary message catalog from PO file</A>
+<LI><A HREF="gettext_7.html#IDX688">generate translation catalog in English</A>
+<LI><A HREF="gettext_12.html#IDX880"><CODE>gettext</CODE> files</A>
 <LI><A HREF="gettext_2.html#IDX40"><CODE>gettext</CODE> installation</A>
-<LI><A HREF="gettext_10.html#IDX827"><CODE>gettext</CODE> interface</A>
-<LI><A HREF="gettext_10.html#IDX826"><CODE>gettext</CODE>, a programmer's view</A>
-<LI><A HREF="gettext_12.html#IDX886"><TT>`gettext.h&acute;</TT> file</A>
-<LI><A HREF="gettext_10.html#IDX848"><CODE>gettext</CODE> vs <CODE>catgets</CODE></A>
-<LI><A HREF="gettext_12.html#IDX868"><CODE>gettextize</CODE> program, usage</A>
-<LI><A HREF="gettext_10.html#IDX843">GUI programs</A>
+<LI><A HREF="gettext_10.html#IDX828"><CODE>gettext</CODE> interface</A>
+<LI><A HREF="gettext_10.html#IDX827"><CODE>gettext</CODE>, a programmer's view</A>
+<LI><A HREF="gettext_12.html#IDX891"><TT>`gettext.h&acute;</TT> file</A>
+<LI><A HREF="gettext_10.html#IDX849"><CODE>gettext</CODE> vs <CODE>catgets</CODE></A>
+<LI><A HREF="gettext_12.html#IDX869"><CODE>gettextize</CODE> program, usage</A>
+<LI><A HREF="gettext_10.html#IDX844">GUI programs</A>
 </DIR>
 <H2><A NAME="cindex_h">h</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX808">hash table, inside MO files</A>
+<LI><A HREF="gettext_8.html#IDX809">hash table, inside MO files</A>
 <LI><A HREF="gettext_1.html#IDX2">he, she, and they</A>
-<LI><A HREF="gettext_5.html#IDX229">header entry of a PO file</A>
-<LI><A HREF="gettext_3.html#IDX128">help option</A>
-<LI><A HREF="gettext_14.html#IDX932">history of GNU <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_5.html#IDX230">header entry of a PO file</A>
+<LI><A HREF="gettext_3.html#IDX129">help option</A>
+<LI><A HREF="gettext_14.html#IDX946">history of GNU <CODE>gettext</CODE></A>
 </DIR>
 <H2><A NAME="cindex_i">i</A></H2>
 <DIR>
 <LI><A HREF="gettext_1.html#IDX6">i18n</A>
-<LI><A HREF="gettext_2.html#IDX109">importing PO files</A>
-<LI><A HREF="gettext_1.html#IDX33">include file <TT>`libintl.h&acute;</TT></A>, <A HREF="gettext_3.html#IDX112">include file <TT>`libintl.h&acute;</TT></A>, <A HREF="gettext_10.html#IDX850">include file <TT>`libintl.h&acute;</TT></A>, <A HREF="gettext_12.html#IDX889">include file <TT>`libintl.h&acute;</TT></A>
-<LI><A HREF="gettext_3.html#IDX113">initialization</A>
-<LI><A HREF="gettext_5.html#IDX214">initialize new PO file</A>
-<LI><A HREF="gettext_6.html#IDX419">initialize translations from a compendium</A>
+<LI><A HREF="gettext_2.html#IDX110">importing PO files</A>
+<LI><A HREF="gettext_1.html#IDX33">include file <TT>`libintl.h&acute;</TT></A>, <A HREF="gettext_3.html#IDX113">include file <TT>`libintl.h&acute;</TT></A>, <A HREF="gettext_10.html#IDX851">include file <TT>`libintl.h&acute;</TT></A>, <A HREF="gettext_12.html#IDX894">include file <TT>`libintl.h&acute;</TT></A>
+<LI><A HREF="gettext_3.html#IDX114">initialization</A>
+<LI><A HREF="gettext_5.html#IDX215">initialize new PO file</A>
+<LI><A HREF="gettext_6.html#IDX420">initialize translations from a compendium</A>
 <LI><A HREF="gettext_2.html#IDX39">installing <CODE>gettext</CODE></A>
-<LI><A HREF="gettext_10.html#IDX821">interface to <CODE>catgets</CODE></A>
+<LI><A HREF="gettext_10.html#IDX822">interface to <CODE>catgets</CODE></A>
 <LI><A HREF="gettext_1.html#IDX8">internationalization</A>
-<LI><A HREF="gettext_3.html#IDX131"><CODE>inttypes.h</CODE></A>
-<LI><A HREF="gettext_16.html#IDX938">ISO 3166</A>
-<LI><A HREF="gettext_15.html#IDX936">ISO 639</A>
+<LI><A HREF="gettext_3.html#IDX132"><CODE>inttypes.h</CODE></A>
+<LI><A HREF="gettext_16.html#IDX952">ISO 3166</A>
+<LI><A HREF="gettext_15.html#IDX950">ISO 639</A>
 </DIR>
 <H2><A NAME="cindex_j">j</A></H2>
 <DIR>
-<LI><A HREF="gettext_13.html#IDX916">Java</A>
-<LI><A HREF="gettext_8.html#IDX731">Java mode, and <CODE>msgfmt</CODE> program</A>
-<LI><A HREF="gettext_8.html#IDX777">Java mode, and <CODE>msgunfmt</CODE> program</A>
-<LI><A HREF="gettext_3.html#IDX132">Java, string concatenation</A>
+<LI><A HREF="gettext_13.html#IDX930">Java</A>
+<LI><A HREF="gettext_8.html#IDX732">Java mode, and <CODE>msgfmt</CODE> program</A>
+<LI><A HREF="gettext_8.html#IDX778">Java mode, and <CODE>msgunfmt</CODE> program</A>
+<LI><A HREF="gettext_3.html#IDX133">Java, string concatenation</A>
 </DIR>
 <H2><A NAME="cindex_k">k</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX756">keyboard accelerator checking</A>
+<LI><A HREF="gettext_8.html#IDX757">keyboard accelerator checking</A>
 </DIR>
 <H2><A NAME="cindex_l">l</A></H2>
 <DIR>
 <LI><A HREF="gettext_1.html#IDX7">l10n</A>
-<LI><A HREF="gettext_15.html#IDX935">language codes</A>
-<LI><A HREF="gettext_9.html#IDX818">language selection</A>
-<LI><A HREF="gettext_10.html#IDX852">language selection at runtime</A>
-<LI><A HREF="gettext_10.html#IDX830">large package</A>
-<LI><A HREF="gettext_12.html#IDX894"><CODE>libiconv</CODE> library</A>
-<LI><A HREF="gettext_13.html#IDX917"><CODE>libintl</CODE> for Java</A>
-<LI><A HREF="gettext_12.html#IDX892"><CODE>libintl</CODE> library</A>
-<LI><A HREF="gettext_13.html#IDX914"><CODE>librep</CODE> Lisp</A>
-<LI><A HREF="gettext_12.html#IDX879"><TT>`LINGUAS&acute;</TT> file</A>
+<LI><A HREF="gettext_15.html#IDX949">language codes</A>
+<LI><A HREF="gettext_9.html#IDX819">language selection</A>
+<LI><A HREF="gettext_10.html#IDX853">language selection at runtime</A>
+<LI><A HREF="gettext_10.html#IDX831">large package</A>
+<LI><A HREF="gettext_12.html#IDX900"><CODE>libiconv</CODE> library</A>
+<LI><A HREF="gettext_13.html#IDX931"><CODE>libintl</CODE> for Java</A>
+<LI><A HREF="gettext_12.html#IDX897"><CODE>libintl</CODE> library</A>
+<LI><A HREF="gettext_13.html#IDX928"><CODE>librep</CODE> Lisp</A>
+<LI><A HREF="gettext_12.html#IDX882"><TT>`LINGUAS&acute;</TT> file</A>
 <LI><A HREF="gettext_1.html#IDX34">link with <TT>`libintl&acute;</TT></A>
-<LI><A HREF="gettext_1.html#IDX27">Linux</A>, <A HREF="gettext_1.html#IDX35">Linux</A>, <A HREF="gettext_5.html#IDX235">Linux</A>
-<LI><A HREF="gettext_13.html#IDX910">Lisp</A>
-<LI><A HREF="gettext_5.html#IDX230">list of translation teams, where to find</A>
-<LI><A HREF="gettext_3.html#IDX114">locale facet, LC_ALL</A>
-<LI><A HREF="gettext_3.html#IDX117">locale facet, LC_COLLATE</A>
-<LI><A HREF="gettext_1.html#IDX18">locale facet, LC_CTYPE</A>, <A HREF="gettext_3.html#IDX115">locale facet, LC_CTYPE</A>, <A HREF="gettext_3.html#IDX116">locale facet, LC_CTYPE</A>
-<LI><A HREF="gettext_1.html#IDX26">locale facet, LC_MESSAGES</A>, <A HREF="gettext_3.html#IDX121">locale facet, LC_MESSAGES</A>
-<LI><A HREF="gettext_1.html#IDX20">locale facet, LC_MONETARY</A>, <A HREF="gettext_3.html#IDX118">locale facet, LC_MONETARY</A>
-<LI><A HREF="gettext_1.html#IDX24">locale facet, LC_NUMERIC</A>, <A HREF="gettext_3.html#IDX119">locale facet, LC_NUMERIC</A>
-<LI><A HREF="gettext_3.html#IDX122">locale facet, LC_RESPONSES</A>
-<LI><A HREF="gettext_1.html#IDX22">locale facet, LC_TIME</A>, <A HREF="gettext_3.html#IDX120">locale facet, LC_TIME</A>
+<LI><A HREF="gettext_1.html#IDX27">Linux</A>, <A HREF="gettext_1.html#IDX35">Linux</A>, <A HREF="gettext_5.html#IDX236">Linux</A>
+<LI><A HREF="gettext_13.html#IDX924">Lisp</A>
+<LI><A HREF="gettext_5.html#IDX231">list of translation teams, where to find</A>
+<LI><A HREF="gettext_3.html#IDX115">locale facet, LC_ALL</A>
+<LI><A HREF="gettext_3.html#IDX118">locale facet, LC_COLLATE</A>
+<LI><A HREF="gettext_1.html#IDX18">locale facet, LC_CTYPE</A>, <A HREF="gettext_3.html#IDX116">locale facet, LC_CTYPE</A>, <A HREF="gettext_3.html#IDX117">locale facet, LC_CTYPE</A>
+<LI><A HREF="gettext_1.html#IDX26">locale facet, LC_MESSAGES</A>, <A HREF="gettext_3.html#IDX122">locale facet, LC_MESSAGES</A>
+<LI><A HREF="gettext_1.html#IDX20">locale facet, LC_MONETARY</A>, <A HREF="gettext_3.html#IDX119">locale facet, LC_MONETARY</A>
+<LI><A HREF="gettext_1.html#IDX24">locale facet, LC_NUMERIC</A>, <A HREF="gettext_3.html#IDX120">locale facet, LC_NUMERIC</A>
+<LI><A HREF="gettext_3.html#IDX123">locale facet, LC_RESPONSES</A>
+<LI><A HREF="gettext_1.html#IDX22">locale facet, LC_TIME</A>, <A HREF="gettext_3.html#IDX121">locale facet, LC_TIME</A>
 <LI><A HREF="gettext_1.html#IDX14">locale facets</A>
-<LI><A HREF="gettext_5.html#IDX233"><CODE>locale</CODE> program</A>
+<LI><A HREF="gettext_5.html#IDX234"><CODE>locale</CODE> program</A>
 <LI><A HREF="gettext_1.html#IDX9">localization</A>
 </DIR>
 <H2><A NAME="cindex_m">m</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX807">magic signature of MO files</A>
-<LI><A HREF="gettext_12.html#IDX880"><TT>`Makevars&acute;</TT> file</A>
-<LI><A HREF="gettext_7.html#IDX421">manipulating PO files</A>
-<LI><A HREF="gettext_3.html#IDX147">marking string initializers</A>
-<LI><A HREF="gettext_3.html#IDX133">marking strings that require translation</A>
-<LI><A HREF="gettext_3.html#IDX123">marking strings, preparations</A>
+<LI><A HREF="gettext_8.html#IDX808">magic signature of MO files</A>
+<LI><A HREF="gettext_12.html#IDX883"><TT>`Makevars&acute;</TT> file</A>
+<LI><A HREF="gettext_7.html#IDX422">manipulating PO files</A>
+<LI><A HREF="gettext_3.html#IDX148">marking string initializers</A>
+<LI><A HREF="gettext_3.html#IDX134">marking strings that require translation</A>
+<LI><A HREF="gettext_3.html#IDX124">marking strings, preparations</A>
 <LI><A HREF="gettext_1.html#IDX32">marking translatable strings</A>
-<LI><A HREF="gettext_10.html#IDX845">menu entries</A>
-<LI><A HREF="gettext_8.html#IDX757">menu, keyboard accelerator support</A>
-<LI><A HREF="gettext_7.html#IDX432">merge PO files</A>
-<LI><A HREF="gettext_7.html#IDX422">merging two PO files</A>
-<LI><A HREF="gettext_10.html#IDX831">message catalog files location</A>
+<LI><A HREF="gettext_10.html#IDX846">menu entries</A>
+<LI><A HREF="gettext_8.html#IDX758">menu, keyboard accelerator support</A>
+<LI><A HREF="gettext_7.html#IDX433">merge PO files</A>
+<LI><A HREF="gettext_7.html#IDX423">merging two PO files</A>
+<LI><A HREF="gettext_10.html#IDX832">message catalog files location</A>
 <LI><A HREF="gettext_1.html#IDX25">messages</A>
-<LI><A HREF="gettext_12.html#IDX865">migration from earlier versions of <CODE>gettext</CODE></A>
-<LI><A HREF="gettext_8.html#IDX758">mnemonics of menu entries</A>
-<LI><A HREF="gettext_8.html#IDX805">MO file's format</A>
-<LI><A HREF="gettext_7.html#IDX660">modify message attrributes</A>
-<LI><A HREF="gettext_7.html#IDX647"><CODE>msgattrib</CODE> program, usage</A>
-<LI><A HREF="gettext_7.html#IDX430"><CODE>msgcat</CODE> program, usage</A>
-<LI><A HREF="gettext_7.html#IDX636"><CODE>msgcmp</CODE> program, usage</A>
-<LI><A HREF="gettext_7.html#IDX602"><CODE>msgcomm</CODE> program, usage</A>
-<LI><A HREF="gettext_7.html#IDX469"><CODE>msgconv</CODE> program, usage</A>
-<LI><A HREF="gettext_7.html#IDX686"><CODE>msgen</CODE> program, usage</A>
-<LI><A HREF="gettext_7.html#IDX710"><CODE>msgexec</CODE> program, usage</A>
-<LI><A HREF="gettext_7.html#IDX542"><CODE>msgfilter</CODE> filter and catalog encoding</A>
-<LI><A HREF="gettext_7.html#IDX534"><CODE>msgfilter</CODE> program, usage</A>
-<LI><A HREF="gettext_8.html#IDX725"><CODE>msgfmt</CODE> program, usage</A>
-<LI><A HREF="gettext_7.html#IDX495"><CODE>msggrep</CODE> program, usage</A>
-<LI><A HREF="gettext_5.html#IDX212"><CODE>msginit</CODE> program, usage</A>
-<LI><A HREF="gettext_6.html#IDX241"><CODE>msgmerge</CODE> program, usage</A>
-<LI><A HREF="gettext_8.html#IDX773"><CODE>msgunfmt</CODE> program, usage</A>
-<LI><A HREF="gettext_7.html#IDX569"><CODE>msguniq</CODE> program, usage</A>
-<LI><A HREF="gettext_2.html#IDX110">multi-line strings</A>
+<LI><A HREF="gettext_12.html#IDX866">migration from earlier versions of <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_12.html#IDX887"><TT>`mkinstalldirs&acute;</TT> file</A>
+<LI><A HREF="gettext_8.html#IDX759">mnemonics of menu entries</A>
+<LI><A HREF="gettext_8.html#IDX806">MO file's format</A>
+<LI><A HREF="gettext_7.html#IDX661">modify message attrributes</A>
+<LI><A HREF="gettext_7.html#IDX648"><CODE>msgattrib</CODE> program, usage</A>
+<LI><A HREF="gettext_7.html#IDX431"><CODE>msgcat</CODE> program, usage</A>
+<LI><A HREF="gettext_7.html#IDX637"><CODE>msgcmp</CODE> program, usage</A>
+<LI><A HREF="gettext_7.html#IDX603"><CODE>msgcomm</CODE> program, usage</A>
+<LI><A HREF="gettext_7.html#IDX470"><CODE>msgconv</CODE> program, usage</A>
+<LI><A HREF="gettext_7.html#IDX687"><CODE>msgen</CODE> program, usage</A>
+<LI><A HREF="gettext_7.html#IDX711"><CODE>msgexec</CODE> program, usage</A>
+<LI><A HREF="gettext_7.html#IDX543"><CODE>msgfilter</CODE> filter and catalog encoding</A>
+<LI><A HREF="gettext_7.html#IDX535"><CODE>msgfilter</CODE> program, usage</A>
+<LI><A HREF="gettext_8.html#IDX726"><CODE>msgfmt</CODE> program, usage</A>
+<LI><A HREF="gettext_7.html#IDX496"><CODE>msggrep</CODE> program, usage</A>
+<LI><A HREF="gettext_5.html#IDX213"><CODE>msginit</CODE> program, usage</A>
+<LI><A HREF="gettext_6.html#IDX242"><CODE>msgmerge</CODE> program, usage</A>
+<LI><A HREF="gettext_8.html#IDX774"><CODE>msgunfmt</CODE> program, usage</A>
+<LI><A HREF="gettext_7.html#IDX570"><CODE>msguniq</CODE> program, usage</A>
+<LI><A HREF="gettext_2.html#IDX111">multi-line strings</A>
 </DIR>
 <H2><A NAME="cindex_n">n</A></H2>
 <DIR>
-<LI><A HREF="gettext_10.html#IDX851"><CODE>N_</CODE>, a convenience macro</A>
+<LI><A HREF="gettext_10.html#IDX852"><CODE>N_</CODE>, a convenience macro</A>
 <LI><A HREF="gettext_1.html#IDX11">Native Language Support</A>
 <LI><A HREF="gettext_1.html#IDX12">Natural Language Support</A>
-<LI><A HREF="gettext_2.html#IDX52">newlines in PO files</A>
-<LI><A HREF="gettext_10.html#IDX836">ngettext</A>
+<LI><A HREF="gettext_2.html#IDX53">newlines in PO files</A>
+<LI><A HREF="gettext_10.html#IDX837">ngettext</A>
 <LI><A HREF="gettext_1.html#IDX10">NLS</A>
 <LI><A HREF="gettext_1.html#IDX23">number format</A>
 </DIR>
 <H2><A NAME="cindex_o">o</A></H2>
 <DIR>
-<LI><A HREF="gettext_13.html#IDX922">Object Pascal</A>
-<LI><A HREF="gettext_6.html#IDX316">obsolete entries</A>
-<LI><A HREF="gettext_10.html#IDX847">optimization of <CODE>gettext</CODE> functions</A>
-<LI><A HREF="gettext_7.html#IDX425">orthography</A>
-<LI><A HREF="gettext_4.html#IDX161">output to stdout, <CODE>xgettext</CODE></A>
+<LI><A HREF="gettext_13.html#IDX936">Object Pascal</A>
+<LI><A HREF="gettext_6.html#IDX317">obsolete entries</A>
+<LI><A HREF="gettext_10.html#IDX848">optimization of <CODE>gettext</CODE> functions</A>
+<LI><A HREF="gettext_7.html#IDX426">orthography</A>
+<LI><A HREF="gettext_4.html#IDX162">output to stdout, <CODE>xgettext</CODE></A>
 <LI><A HREF="gettext_1.html#IDX29">overview of <CODE>gettext</CODE></A>
 </DIR>
 <H2><A NAME="cindex_p">p</A></H2>
 <DIR>
-<LI><A HREF="gettext_12.html#IDX883">package and version declaration in <TT>`configure.in&acute;</TT></A>
-<LI><A HREF="gettext_9.html#IDX813">package build and installation options</A>
-<LI><A HREF="gettext_12.html#IDX863">package maintainer's view of <CODE>gettext</CODE></A>
-<LI><A HREF="gettext_3.html#IDX127">paragraphs</A>
-<LI><A HREF="gettext_13.html#IDX920">Pascal</A>
-<LI><A HREF="gettext_13.html#IDX928">Perl</A>
-<LI><A HREF="gettext_13.html#IDX929">PHP</A>
-<LI><A HREF="gettext_13.html#IDX930">Pike</A>
-<LI><A HREF="gettext_10.html#IDX842">plural form formulas</A>
-<LI><A HREF="gettext_10.html#IDX835">plural forms</A>
-<LI><A HREF="gettext_8.html#IDX809">plural forms, in MO files</A>
+<LI><A HREF="gettext_12.html#IDX886">package and version declaration in <TT>`configure.in&acute;</TT></A>
+<LI><A HREF="gettext_9.html#IDX814">package build and installation options</A>
+<LI><A HREF="gettext_12.html#IDX864">package maintainer's view of <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_3.html#IDX128">paragraphs</A>
+<LI><A HREF="gettext_13.html#IDX934">Pascal</A>
+<LI><A HREF="gettext_13.html#IDX942">Perl</A>
+<LI><A HREF="gettext_13.html#IDX943">PHP</A>
+<LI><A HREF="gettext_13.html#IDX944">Pike</A>
+<LI><A HREF="gettext_10.html#IDX843">plural form formulas</A>
+<LI><A HREF="gettext_10.html#IDX836">plural forms</A>
+<LI><A HREF="gettext_8.html#IDX810">plural forms, in MO files</A>
+<LI><A HREF="gettext_2.html#IDX51">plural forms, in PO files</A>
 <LI><A HREF="gettext_2.html#IDX43">PO files' format</A>
-<LI><A HREF="gettext_2.html#IDX54">PO mode (Emacs) commands</A>
-<LI><A HREF="gettext_4.html#IDX148">PO template file</A>
-<LI><A HREF="gettext_7.html#IDX543">portability problems with <CODE>sed</CODE></A>
-<LI><A HREF="gettext_12.html#IDX878"><TT>`POTFILES.in&acute;</TT> file</A>
-<LI><A HREF="gettext_3.html#IDX111">preparing programs for translation</A>
-<LI><A HREF="gettext_10.html#IDX825">problems with <CODE>catgets</CODE> interface</A>
-<LI><A HREF="gettext_13.html#IDX895">programming languages</A>
-<LI><A HREF="gettext_13.html#IDX908">Python</A>
+<LI><A HREF="gettext_2.html#IDX55">PO mode (Emacs) commands</A>
+<LI><A HREF="gettext_4.html#IDX149">PO template file</A>
+<LI><A HREF="gettext_7.html#IDX544">portability problems with <CODE>sed</CODE></A>
+<LI><A HREF="gettext_12.html#IDX881"><TT>`POTFILES.in&acute;</TT> file</A>
+<LI><A HREF="gettext_3.html#IDX112">preparing programs for translation</A>
+<LI><A HREF="gettext_10.html#IDX826">problems with <CODE>catgets</CODE> interface</A>
+<LI><A HREF="gettext_13.html#IDX909">programming languages</A>
+<LI><A HREF="gettext_13.html#IDX922">Python</A>
 </DIR>
 <H2><A NAME="cindex_q">q</A></H2>
 <DIR>
-<LI><A HREF="gettext_5.html#IDX238">quotation marks</A>, <A HREF="gettext_12.html#IDX881">quotation marks</A>
-<LI><A HREF="gettext_5.html#IDX237">quote characters, use in PO files</A>
+<LI><A HREF="gettext_5.html#IDX239">quotation marks</A>, <A HREF="gettext_12.html#IDX884">quotation marks</A>
+<LI><A HREF="gettext_5.html#IDX238">quote characters, use in PO files</A>
 </DIR>
 <H2><A NAME="cindex_r">r</A></H2>
 <DIR>
-<LI><A HREF="gettext_14.html#IDX933">related reading</A>
-<LI><A HREF="gettext_13.html#IDX931">RST</A>
+<LI><A HREF="gettext_14.html#IDX947">related reading</A>
+<LI><A HREF="gettext_13.html#IDX945">RST</A>
 </DIR>
 <H2><A NAME="cindex_s">s</A></H2>
 <DIR>
-<LI><A HREF="gettext_13.html#IDX896">scripting languages</A>
-<LI><A HREF="gettext_7.html#IDX496">search messages in a catalog</A>
-<LI><A HREF="gettext_9.html#IDX817">selecting message language</A>
-<LI><A HREF="gettext_3.html#IDX126">sentences</A>
-<LI><A HREF="gettext_9.html#IDX814">setting up <CODE>gettext</CODE> at build time</A>
-<LI><A HREF="gettext_9.html#IDX816">setting up <CODE>gettext</CODE> at run time</A>
-<LI><A HREF="gettext_10.html#IDX828">several domains</A>
+<LI><A HREF="gettext_13.html#IDX910">scripting languages</A>
+<LI><A HREF="gettext_7.html#IDX497">search messages in a catalog</A>
+<LI><A HREF="gettext_9.html#IDX818">selecting message language</A>
+<LI><A HREF="gettext_3.html#IDX127">sentences</A>
+<LI><A HREF="gettext_9.html#IDX815">setting up <CODE>gettext</CODE> at build time</A>
+<LI><A HREF="gettext_9.html#IDX817">setting up <CODE>gettext</CODE> at run time</A>
+<LI><A HREF="gettext_10.html#IDX829">several domains</A>
 <LI><A HREF="gettext_1.html#IDX1">sex</A>
-<LI><A HREF="gettext_10.html#IDX846">sgettext</A>
+<LI><A HREF="gettext_10.html#IDX847">sgettext</A>
 <LI><A HREF="gettext_1.html#IDX3">she, he, and they</A>
-<LI><A HREF="gettext_13.html#IDX898">shell scripts</A>
-<LI><A HREF="gettext_13.html#IDX915">Smalltalk</A>
-<LI><A HREF="gettext_7.html#IDX461">sorting <CODE>msgcat</CODE> output</A>
-<LI><A HREF="gettext_6.html#IDX268">sorting <CODE>msgmerge</CODE> output</A>
-<LI><A HREF="gettext_8.html#IDX798">sorting <CODE>msgunfmt</CODE> output</A>
-<LI><A HREF="gettext_4.html#IDX195">sorting output of <CODE>xgettext</CODE></A>
-<LI><A HREF="gettext_10.html#IDX839">specifying plural form in a PO file</A>
-<LI><A HREF="gettext_7.html#IDX439">standard output, and <CODE>msgcat</CODE></A>
-<LI><A HREF="gettext_6.html#IDX250">standard output, and <CODE>msgmerge</CODE> program</A>
-<LI><A HREF="gettext_3.html#IDX129">string concatenation</A>
-<LI><A HREF="gettext_2.html#IDX106">string normalization in entries</A>
-<LI><A HREF="gettext_3.html#IDX124">style</A>
-<LI><A HREF="gettext_4.html#IDX164">supported languages, <CODE>xgettext</CODE></A>
+<LI><A HREF="gettext_13.html#IDX912">shell scripts</A>
+<LI><A HREF="gettext_13.html#IDX929">Smalltalk</A>
+<LI><A HREF="gettext_7.html#IDX462">sorting <CODE>msgcat</CODE> output</A>
+<LI><A HREF="gettext_6.html#IDX269">sorting <CODE>msgmerge</CODE> output</A>
+<LI><A HREF="gettext_8.html#IDX799">sorting <CODE>msgunfmt</CODE> output</A>
+<LI><A HREF="gettext_4.html#IDX196">sorting output of <CODE>xgettext</CODE></A>
+<LI><A HREF="gettext_10.html#IDX840">specifying plural form in a PO file</A>
+<LI><A HREF="gettext_7.html#IDX440">standard output, and <CODE>msgcat</CODE></A>
+<LI><A HREF="gettext_6.html#IDX251">standard output, and <CODE>msgmerge</CODE> program</A>
+<LI><A HREF="gettext_3.html#IDX130">string concatenation</A>
+<LI><A HREF="gettext_2.html#IDX107">string normalization in entries</A>
+<LI><A HREF="gettext_3.html#IDX125">style</A>
+<LI><A HREF="gettext_4.html#IDX165">supported languages, <CODE>xgettext</CODE></A>
 </DIR>
 <H2><A NAME="cindex_t">t</A></H2>
 <DIR>
-<LI><A HREF="gettext_13.html#IDX926">Tcl</A>
-<LI><A HREF="gettext_8.html#IDX734">Tcl mode, and <CODE>msgfmt</CODE> program</A>
-<LI><A HREF="gettext_8.html#IDX779">Tcl mode, and <CODE>msgunfmt</CODE> program</A>
+<LI><A HREF="gettext_13.html#IDX940">Tcl</A>
+<LI><A HREF="gettext_8.html#IDX735">Tcl mode, and <CODE>msgfmt</CODE> program</A>
+<LI><A HREF="gettext_8.html#IDX780">Tcl mode, and <CODE>msgunfmt</CODE> program</A>
 <LI><A HREF="gettext_1.html#IDX36">template PO file</A>
-<LI><A HREF="gettext_4.html#IDX199">testing <TT>`.po&acute;</TT> files for equivalence</A>
-<LI><A HREF="gettext_13.html#IDX927">Tk's scripting language</A>
-<LI><A HREF="gettext_6.html#IDX280">translated entries</A>
-<LI><A HREF="gettext_10.html#IDX844">translating menu entries</A>
+<LI><A HREF="gettext_4.html#IDX200">testing <TT>`.po&acute;</TT> files for equivalence</A>
+<LI><A HREF="gettext_13.html#IDX941">Tk's scripting language</A>
+<LI><A HREF="gettext_6.html#IDX281">translated entries</A>
+<LI><A HREF="gettext_10.html#IDX845">translating menu entries</A>
 <LI><A HREF="gettext_1.html#IDX13">translation aspects</A>
-<LI><A HREF="gettext_9.html#IDX810">Translation Matrix</A>
+<LI><A HREF="gettext_9.html#IDX811">Translation Matrix</A>
 <LI><A HREF="gettext_1.html#IDX5">Translation Project</A>
-<LI><A HREF="gettext_12.html#IDX887">turning off NLS support</A>
+<LI><A HREF="gettext_12.html#IDX892">turning off NLS support</A>
 <LI><A HREF="gettext_1.html#IDX31">tutorial of <CODE>gettext</CODE> usage</A>
 </DIR>
 <H2><A NAME="cindex_u">u</A></H2>
 <DIR>
-<LI><A HREF="gettext_7.html#IDX570">unify duplicate translations</A>
-<LI><A HREF="gettext_6.html#IDX305">untranslated entries</A>
-<LI><A HREF="gettext_6.html#IDX420">update translations from a compendium</A>
-<LI><A HREF="gettext_12.html#IDX866">upgrading to new versions of <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_7.html#IDX571">unify duplicate translations</A>
+<LI><A HREF="gettext_6.html#IDX306">untranslated entries</A>
+<LI><A HREF="gettext_6.html#IDX421">update translations from a compendium</A>
+<LI><A HREF="gettext_12.html#IDX867">upgrading to new versions of <CODE>gettext</CODE></A>
 </DIR>
 <H2><A NAME="cindex_v">v</A></H2>
 <DIR>
-<LI><A HREF="gettext_6.html#IDX254">version control for backup files, <CODE>msgmerge</CODE></A>
+<LI><A HREF="gettext_6.html#IDX255">version control for backup files, <CODE>msgmerge</CODE></A>
 </DIR>
 <H2><A NAME="cindex_w">w</A></H2>
 <DIR>
-<LI><A HREF="gettext_13.html#IDX923"><CODE>wxWindows</CODE> library</A>
+<LI><A HREF="gettext_13.html#IDX937"><CODE>wxWindows</CODE> library</A>
 </DIR>
 <H2><A NAME="cindex_x">x</A></H2>
 <DIR>
-<LI><A HREF="gettext_7.html#IDX712"><CODE>xargs</CODE>, and output from <CODE>msgexec</CODE></A>
-<LI><A HREF="gettext_4.html#IDX150"><CODE>xgettext</CODE> program, usage</A>
-<LI><A HREF="gettext_5.html#IDX239"><CODE>xmodmap</CODE> program, and typing quotation marks</A>
+<LI><A HREF="gettext_7.html#IDX713"><CODE>xargs</CODE>, and output from <CODE>msgexec</CODE></A>
+<LI><A HREF="gettext_4.html#IDX151"><CODE>xgettext</CODE> program, usage</A>
+<LI><A HREF="gettext_5.html#IDX240"><CODE>xmodmap</CODE> program, and typing quotation marks</A>
 </DIR>
 <H2><A NAME="cindex_y">y</A></H2>
 <DIR>
-<LI><A HREF="gettext_13.html#IDX925">YaST2 scripting language</A>
-<LI><A HREF="gettext_13.html#IDX924">YCP</A>
+<LI><A HREF="gettext_13.html#IDX939">YaST2 scripting language</A>
+<LI><A HREF="gettext_13.html#IDX938">YCP</A>
 </DIR>
 
 </P>
diff --git a/doc/gettext_3.html b/doc/gettext_3.html
index 25b415d56..61164fbe4 100644
--- a/doc/gettext_3.html
+++ b/doc/gettext_3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - 3  Preparing Program Sources</TITLE>
 </HEAD>
@@ -12,7 +12,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_2.html">previous<
 
 <H1><A NAME="SEC13" HREF="gettext_toc.html#TOC13">3  Preparing Program Sources</A></H1>
 <P>
-<A NAME="IDX111"></A>
+<A NAME="IDX112"></A>
 
 </P>
 
@@ -34,7 +34,7 @@ having translated C strings should contain the line:
 
 </P>
 <P>
-<A NAME="IDX112"></A>
+<A NAME="IDX113"></A>
 
 <PRE>
 #include &#60;libintl.h&#62;
@@ -51,7 +51,7 @@ sections of this chapter.
 <H2><A NAME="SEC14" HREF="gettext_toc.html#TOC14">3.1  Triggering <CODE>gettext</CODE> Operations</A></H2>
 
 <P>
-<A NAME="IDX113"></A>
+<A NAME="IDX114"></A>
 The initialization of locale data should be done with more or less
 the same code in every program, as demonstrated below:
 
@@ -78,8 +78,8 @@ or <CODE>hello</CODE> sources for more information.
 
 </P>
 <P>
-<A NAME="IDX114"></A>
 <A NAME="IDX115"></A>
+<A NAME="IDX116"></A>
 The use of <CODE>LC_ALL</CODE> might not be appropriate for you.
 <CODE>LC_ALL</CODE> includes all locale categories and especially
 <CODE>LC_CTYPE</CODE>.  This later category is responsible for determining
@@ -99,7 +99,7 @@ numbers in the <CODE>"C"</CODE> locale format.  In some situation, it might
 also be a problem with the notation itself which makes it impossible to
 recognize whether the number is in the <CODE>"C"</CODE> locale or the local
 format.  This can happen if thousands separator characters are used.
-Some locales define this character accordfing to the national
+Some locales define this character according to the national
 conventions to <CODE>'.'</CODE> which is the same character used in the
 <CODE>"C"</CODE> locale to denote the decimal point.
 
@@ -120,13 +120,13 @@ code above by a sequence of <CODE>setlocale</CODE> lines
 </PRE>
 
 <P>
-<A NAME="IDX116"></A>
 <A NAME="IDX117"></A>
 <A NAME="IDX118"></A>
 <A NAME="IDX119"></A>
 <A NAME="IDX120"></A>
 <A NAME="IDX121"></A>
 <A NAME="IDX122"></A>
+<A NAME="IDX123"></A>
 On all POSIX conformant systems the locale categories <CODE>LC_CTYPE</CODE>,
 <CODE>LC_COLLATE</CODE>, <CODE>LC_MONETARY</CODE>, <CODE>LC_NUMERIC</CODE>, and
 <CODE>LC_TIME</CODE> are available.  On some modern systems there is also a
@@ -157,7 +157,7 @@ is not multithread-safe.
 <H2><A NAME="SEC15" HREF="gettext_toc.html#TOC15">3.2  Preparing Translatable Strings</A></H2>
 
 <P>
-<A NAME="IDX123"></A>
+<A NAME="IDX124"></A>
 Before strings can be marked for translations, they sometimes need to
 be adjusted. Usually preparing a string for translation is done right
 before marking it, during the marking phase which is described in the
@@ -189,7 +189,7 @@ Let's look at some examples of these guidelines.
 
 </P>
 <P>
-<A NAME="IDX124"></A>
+<A NAME="IDX125"></A>
 Translatable strings should be in good English style. If slang language
 with abbreviations and shortcuts is used, often translators will not
 understand the message and will produce very inappropriate translations.
@@ -218,13 +218,13 @@ of the objects"?
 
 </P>
 <P>
-<A NAME="IDX125"></A>
+<A NAME="IDX126"></A>
 In both cases, adding more words to the message will help both the
 translator and the English speaking user.
 
 </P>
 <P>
-<A NAME="IDX126"></A>
+<A NAME="IDX127"></A>
 Translatable strings should be entire sentences. It is often not possible
 to translate single verbs or adjectives in a substitutable way.
 
@@ -299,7 +299,7 @@ combined by xgettext, so the translator has to handle them once only.)
 
 </P>
 <P>
-<A NAME="IDX127"></A>
+<A NAME="IDX128"></A>
 Translatable strings should be limited to one paragraph; don't let a
 single message be longer than ten lines. The reason is that when the
 translatable string changes, the translator is faced with the task of
@@ -310,7 +310,7 @@ the entire message.
 
 </P>
 <P>
-<A NAME="IDX128"></A>
+<A NAME="IDX129"></A>
 Many GNU programs have a <SAMP>`--help&acute;</SAMP> output that extends over several
 screen pages. It is a courtesy towards the translators to split such a
 message into several ones of five to ten lines each. While doing that,
@@ -321,8 +321,8 @@ looking for.
 
 </P>
 <P>
-<A NAME="IDX129"></A>
 <A NAME="IDX130"></A>
+<A NAME="IDX131"></A>
 Hardcoded string concatenation is sometimes used to construct English
 strings:
 
@@ -349,7 +349,7 @@ sprintf (s, "Replace %s with %s?", object1, object2);
 </PRE>
 
 <P>
-<A NAME="IDX131"></A>
+<A NAME="IDX132"></A>
 A similar case is compile time concatenation of strings. The ISO C 99
 include file <CODE>&#60;inttypes.h&#62;</CODE> contains a macro <CODE>PRId64</CODE> that
 can be used as a formatting directive for outputting an <SAMP>`int64_t&acute;</SAMP>
@@ -408,7 +408,7 @@ regardless whether in decimal, octal or hexadecimal.
 
 </P>
 <P>
-<A NAME="IDX132"></A>
+<A NAME="IDX133"></A>
 All this applies to other programming languages as well. For example, in
 Java, string contenation is very frequently used, because it is a compiler
 built-in operator. Like in C, in Java, you would change
@@ -434,7 +434,7 @@ System.out.println(
 
 <H2><A NAME="SEC16" HREF="gettext_toc.html#TOC16">3.3  How Marks Appear in Sources</A></H2>
 <P>
-<A NAME="IDX133"></A>
+<A NAME="IDX134"></A>
 
 </P>
 <P>
@@ -485,7 +485,7 @@ sources for those trying to keep them within 79 or 80 columns.
 
 </P>
 <P>
-<A NAME="IDX134"></A>
+<A NAME="IDX135"></A>
 Many packages use <SAMP>`_&acute;</SAMP> (a simple underline) as a keyword,
 and write <SAMP>`_("Translatable string")&acute;</SAMP> instead of <SAMP>`gettext
 ("Translatable string")&acute;</SAMP>.  Further, the coding rule, from GNU standards,
@@ -521,7 +521,7 @@ an example of string <EM>not</EM> requiring translation!
 
 <H2><A NAME="SEC17" HREF="gettext_toc.html#TOC17">3.4  Marking Translatable Strings</A></H2>
 <P>
-<A NAME="IDX135"></A>
+<A NAME="IDX136"></A>
 
 </P>
 <P>
@@ -538,7 +538,7 @@ translation in some language, for the package being internationalized.
 
 </P>
 <P>
-<A NAME="IDX136"></A>
+<A NAME="IDX137"></A>
 The set of program sources, targetted by the PO mode commands describe
 here, should have an Emacs tags table constructed for your project,
 prior to using these PO file commands.  This is easy to do.  In any
@@ -560,7 +560,7 @@ format Emacs can understand.
 
 </P>
 <P>
-<A NAME="IDX137"></A>
+<A NAME="IDX138"></A>
 For packages following the GNU coding standards, there is
 a make goal <CODE>tags</CODE> or <CODE>TAGS</CODE> which constructs the tag files in
 all directories and for all files containing source code.
@@ -580,18 +580,18 @@ fill in while you mark strings as translatable in your program sources.
 
 <DT><KBD>,</KBD>
 <DD>
-<A NAME="IDX138"></A>
+<A NAME="IDX139"></A>
 Search through program sources for a string which looks like a
 candidate for translation (<CODE>po-tags-search</CODE>).
 
 <DT><KBD>M-,</KBD>
 <DD>
-<A NAME="IDX139"></A>
+<A NAME="IDX140"></A>
 Mark the last string found with <SAMP>`_()&acute;</SAMP> (<CODE>po-mark-translatable</CODE>).
 
 <DT><KBD>M-.</KBD>
 <DD>
-<A NAME="IDX140"></A>
+<A NAME="IDX141"></A>
 Mark the last string found with a keyword taken from a set of possible
 keywords.  This command with a prefix allows some management of these
 keywords (<CODE>po-select-mark-and-mark</CODE>).
@@ -599,7 +599,7 @@ keywords (<CODE>po-select-mark-and-mark</CODE>).
 </DL>
 
 <P>
-<A NAME="IDX141"></A>
+<A NAME="IDX142"></A>
 The <KBD>,</KBD> (<CODE>po-tags-search</CODE>) command searches for the next
 occurrence of a string which looks like a possible candidate for
 translation, and displays the program source in another Emacs window,
@@ -651,8 +651,8 @@ first tags file, this reinitialization might be considered spurious.
 
 </P>
 <P>
-<A NAME="IDX142"></A>
 <A NAME="IDX143"></A>
+<A NAME="IDX144"></A>
 The <KBD>M-,</KBD> (<CODE>po-mark-translatable</CODE>) command will mark the
 recently found string with the <SAMP>`_&acute;</SAMP> keyword.  The <KBD>M-.</KBD>
 (<CODE>po-select-mark-and-mark</CODE>) command will request that you type
@@ -713,7 +713,7 @@ prefer <SAMP>`_&acute;</SAMP>, as this one is already built in the <KBD>M-,</KBD
 <H2><A NAME="SEC18" HREF="gettext_toc.html#TOC18">3.5  Special Comments preceding Keywords</A></H2>
 
 <P>
-<A NAME="IDX144"></A>
+<A NAME="IDX145"></A>
 In C programs strings are often used within calls of functions from the
 <CODE>printf</CODE> family.  The special thing about these format strings is
 that they can contain format specifiers introduced with <KBD>%</KBD>.  Assume
@@ -781,19 +781,19 @@ only a heuristic.  In the <TT>`.po&acute;</TT> file the entry is marked using th
 
 </P>
 <P>
-<A NAME="IDX145"></A>
 <A NAME="IDX146"></A>
+<A NAME="IDX147"></A>
 The careful reader now might say that this again can cause problems.
 The heuristic might guess it wrong.  This is true and therefore
-<CODE>xgettext</CODE> knows about special kind of comment which lets
-the programmer take over the decision.  If in the same line or
-the immediately preceding line of the <CODE>gettext</CODE> keyword
-the <CODE>xgettext</CODE> program find a comment containing the words
-<KBD>xgettext:c-format</KBD> it will mark the string in any case with
+<CODE>xgettext</CODE> knows about a special kind of comment which lets
+the programmer take over the decision.  If in the same line as or
+the immediately preceding line to the <CODE>gettext</CODE> keyword
+the <CODE>xgettext</CODE> program finds a comment containing the words
+<KBD>xgettext:c-format</KBD>, it will mark the string in any case with
 the <KBD>c-format</KBD> flag.  This kind of comment should be used when
 <CODE>xgettext</CODE> does not recognize the string as a format string but
-is really is one and it should be tested.  Please note that when the
-comment is in the same line of the <CODE>gettext</CODE> keyword, it must be
+it really is one and it should be tested.  Please note that when the
+comment is in the same line as the <CODE>gettext</CODE> keyword, it must be
 before the string to be translated.
 
 </P>
@@ -803,8 +803,8 @@ called with strings which do not contain a format specifier.  Of course
 one would normally use <CODE>fputs</CODE> but it does happen.  In this case
 <CODE>xgettext</CODE> does not recognize this as a format string but what
 happens if the translation introduces a valid format specifier?  The
-<CODE>printf</CODE> function will try to access one of the parameter but none
-exists because the original code does not refer to any parameter.
+<CODE>printf</CODE> function will try to access one of the parameters but none
+exists because the original code does not pass any parameters.
 
 </P>
 <P>
@@ -828,7 +828,7 @@ used for solving this problem.
 <H2><A NAME="SEC19" HREF="gettext_toc.html#TOC19">3.6  Special Cases of Translatable Strings</A></H2>
 
 <P>
-<A NAME="IDX147"></A>
+<A NAME="IDX148"></A>
 The attentive reader might now point out that it is not always possible
 to mark translatable string with <CODE>gettext</CODE> or something like this.
 Consider the following case:
diff --git a/doc/gettext_4.html b/doc/gettext_4.html
index 925de8ec9..ddfa693b7 100644
--- a/doc/gettext_4.html
+++ b/doc/gettext_4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - 4  Making the PO Template File</TITLE>
 </HEAD>
@@ -12,7 +12,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_3.html">previous<
 
 <H1><A NAME="SEC20" HREF="gettext_toc.html#TOC20">4  Making the PO Template File</A></H1>
 <P>
-<A NAME="IDX148"></A>
+<A NAME="IDX149"></A>
 
 </P>
 <P>
@@ -20,14 +20,23 @@ After preparing the sources, the programmer creates a PO template file.
 This section explains how to use <CODE>xgettext</CODE> for this purpose.
 
 </P>
+<P>
+<CODE>xgettext</CODE> creates a file named <TT>`<VAR>domainname</VAR>.po&acute;</TT>.  You
+should then rename it to <TT>`<VAR>domainname</VAR>.pot&acute;</TT>.  (Why doesn't
+<CODE>xgettext</CODE> create it under the name <TT>`<VAR>domainname</VAR>.pot&acute;</TT>
+right away?  The answer is: for historical reasons.  When <CODE>xgettext</CODE>
+was specified, the distinction between a PO file and PO file template
+was fuzzy, and the suffix <SAMP>`.pot&acute;</SAMP> wasn't in use at that time.)
+
+</P>
 
 
 
 <H2><A NAME="SEC21" HREF="gettext_toc.html#TOC21">4.1  Invoking the <CODE>xgettext</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX149"></A>
 <A NAME="IDX150"></A>
+<A NAME="IDX151"></A>
 
 <PRE>
 xgettext [<VAR>option</VAR>] [<VAR>inputfile</VAR>] ...
@@ -52,8 +61,8 @@ Input files.
 <DD>
 <DT><SAMP>`--files-from=<VAR>file</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX151"></A>
 <A NAME="IDX152"></A>
+<A NAME="IDX153"></A>
 Read the names of the input files from <VAR>file</VAR> instead of getting
 them from the command line.
 
@@ -61,8 +70,8 @@ them from the command line.
 <DD>
 <DT><SAMP>`--directory=<VAR>directory</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX153"></A>
 <A NAME="IDX154"></A>
+<A NAME="IDX155"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>`.po&acute;</TT>
 file will be written relative to the current directory, though.
@@ -83,16 +92,16 @@ If <VAR>inputfile</VAR> is <SAMP>`-&acute;</SAMP>, standard input is read.
 <DD>
 <DT><SAMP>`--default-domain=<VAR>name</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX155"></A>
 <A NAME="IDX156"></A>
+<A NAME="IDX157"></A>
 Use <TT>`<VAR>name</VAR>.po&acute;</TT> for output (instead of <TT>`messages.po&acute;</TT>).
 
 <DT><SAMP>`-o <VAR>file</VAR>&acute;</SAMP>
 <DD>
 <DT><SAMP>`--output=<VAR>file</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX157"></A>
 <A NAME="IDX158"></A>
+<A NAME="IDX159"></A>
 Write output to specified file (instead of <TT>`<VAR>name</VAR>.po&acute;</TT> or
 <TT>`messages.po&acute;</TT>).
 
@@ -100,14 +109,14 @@ Write output to specified file (instead of <TT>`<VAR>name</VAR>.po&acute;</TT> o
 <DD>
 <DT><SAMP>`--output-dir=<VAR>dir</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX159"></A>
 <A NAME="IDX160"></A>
+<A NAME="IDX161"></A>
 Output files will be placed in directory <VAR>dir</VAR>.
 
 </DL>
 
 <P>
-<A NAME="IDX161"></A>
+<A NAME="IDX162"></A>
 If the output <VAR>file</VAR> is <SAMP>`-&acute;</SAMP> or <SAMP>`/dev/stdout&acute;</SAMP>, the output
 is written to standard output.
 
@@ -122,9 +131,9 @@ is written to standard output.
 <DD>
 <DT><SAMP>`--language=<VAR>name</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX162"></A>
 <A NAME="IDX163"></A>
 <A NAME="IDX164"></A>
+<A NAME="IDX165"></A>
 Specifies the language of the input files.  The supported languages
 are <CODE>C</CODE>, <CODE>C++</CODE>, <CODE>ObjectiveC</CODE>, <CODE>PO</CODE>, <CODE>Python</CODE>,
 <CODE>Lisp</CODE>, <CODE>EmacsLisp</CODE>, <CODE>librep</CODE>, <CODE>Java</CODE>, <CODE>awk</CODE>,
@@ -134,8 +143,8 @@ are <CODE>C</CODE>, <CODE>C++</CODE>, <CODE>ObjectiveC</CODE>, <CODE>PO</CODE>,
 <DD>
 <DT><SAMP>`--c++&acute;</SAMP>
 <DD>
-<A NAME="IDX165"></A>
 <A NAME="IDX166"></A>
+<A NAME="IDX167"></A>
 This is a shorthand for <CODE>--language=C++</CODE>.
 
 </DL>
@@ -155,16 +164,16 @@ extension.
 <DD>
 <DT><SAMP>`--join-existing&acute;</SAMP>
 <DD>
-<A NAME="IDX167"></A>
 <A NAME="IDX168"></A>
+<A NAME="IDX169"></A>
 Join messages with existing file.
 
 <DT><SAMP>`-x <VAR>file</VAR>&acute;</SAMP>
 <DD>
 <DT><SAMP>`--exclude-file=<VAR>file</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX169"></A>
 <A NAME="IDX170"></A>
+<A NAME="IDX171"></A>
 Entries from <VAR>file</VAR> are not extracted.  <VAR>file</VAR> should be a PO or
 POT file.
 
@@ -172,8 +181,8 @@ POT file.
 <DD>
 <DT><SAMP>`--add-comments[=<VAR>tag</VAR>]&acute;</SAMP>
 <DD>
-<A NAME="IDX171"></A>
 <A NAME="IDX172"></A>
+<A NAME="IDX173"></A>
 Place comment block with <VAR>tag</VAR> (or those preceding keyword lines)
 in output file.
 
@@ -189,20 +198,20 @@ in output file.
 <DD>
 <DT><SAMP>`--extract-all&acute;</SAMP>
 <DD>
-<A NAME="IDX173"></A>
 <A NAME="IDX174"></A>
+<A NAME="IDX175"></A>
 Extract all strings.
 
 <DT><SAMP>`-k <VAR>keywordspec</VAR>&acute;</SAMP>
 <DD>
 <DT><SAMP>`--keyword[=<VAR>keywordspec</VAR>]&acute;</SAMP>
 <DD>
-<A NAME="IDX175"></A>
 <A NAME="IDX176"></A>
+<A NAME="IDX177"></A>
 Additional keyword to be looked for (without <VAR>keywordspec</VAR> means not to
 use default keywords).
 
-<A NAME="IDX177"></A>
+<A NAME="IDX178"></A>
 If <VAR>keywordspec</VAR> is a C identifer <VAR>id</VAR>, <CODE>xgettext</CODE> looks
 for strings in the first argument of each call to the function or macro
 <VAR>id</VAR>.  If <VAR>keywordspec</VAR> is of the form
@@ -222,15 +231,15 @@ explicitly disabled, are <CODE>gettext</CODE>, <CODE>dgettext:2</CODE>,
 <DD>
 <DT><SAMP>`--trigraphs&acute;</SAMP>
 <DD>
-<A NAME="IDX178"></A>
 <A NAME="IDX179"></A>
 <A NAME="IDX180"></A>
+<A NAME="IDX181"></A>
 Understand ANSI C trigraphs for input.
 
 <DT><SAMP>`--debug&acute;</SAMP>
 <DD>
-<A NAME="IDX181"></A>
 <A NAME="IDX182"></A>
+<A NAME="IDX183"></A>
 Use the flags <KBD>c-format</KBD> and <KBD>possible-c-format</KBD> to show who was
 responsible for marking a message as a format string.  The latter form is
 used if the <CODE>xgettext</CODE> program decided, the format form is used if
@@ -255,33 +264,33 @@ adjacent strings, and escaped end of lines for continued strings.
 
 <DT><SAMP>`--force-po&acute;</SAMP>
 <DD>
-<A NAME="IDX183"></A>
+<A NAME="IDX184"></A>
 Always write an output file even if no message is defined.
 
 <DT><SAMP>`-i&acute;</SAMP>
 <DD>
 <DT><SAMP>`--indent&acute;</SAMP>
 <DD>
-<A NAME="IDX184"></A>
 <A NAME="IDX185"></A>
+<A NAME="IDX186"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>`--no-location&acute;</SAMP>
 <DD>
-<A NAME="IDX186"></A>
+<A NAME="IDX187"></A>
 Do not write <SAMP>`#: <VAR>filename</VAR>:<VAR>line</VAR>&acute;</SAMP> lines.
 
 <DT><SAMP>`-n&acute;</SAMP>
 <DD>
 <DT><SAMP>`--add-location&acute;</SAMP>
 <DD>
-<A NAME="IDX187"></A>
 <A NAME="IDX188"></A>
+<A NAME="IDX189"></A>
 Generate <SAMP>`#: <VAR>filename</VAR>:<VAR>line</VAR>&acute;</SAMP> lines (default).
 
 <DT><SAMP>`--strict&acute;</SAMP>
 <DD>
-<A NAME="IDX189"></A>
+<A NAME="IDX190"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -290,15 +299,15 @@ GNU extensions.
 <DD>
 <DT><SAMP>`--width=<VAR>number</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX190"></A>
 <A NAME="IDX191"></A>
+<A NAME="IDX192"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>`--no-wrap&acute;</SAMP>
 <DD>
-<A NAME="IDX192"></A>
+<A NAME="IDX193"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -307,9 +316,9 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>`--sort-output&acute;</SAMP>
 <DD>
-<A NAME="IDX193"></A>
 <A NAME="IDX194"></A>
 <A NAME="IDX195"></A>
+<A NAME="IDX196"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -317,16 +326,16 @@ for the translator to understand each message's context.
 <DD>
 <DT><SAMP>`--sort-by-file&acute;</SAMP>
 <DD>
-<A NAME="IDX196"></A>
 <A NAME="IDX197"></A>
+<A NAME="IDX198"></A>
 Sort output by file location.
 
 <DT><SAMP>`--omit-header&acute;</SAMP>
 <DD>
-<A NAME="IDX198"></A>
+<A NAME="IDX199"></A>
 Don't write header with <SAMP>`msgid ""&acute;</SAMP> entry.
 
-<A NAME="IDX199"></A>
+<A NAME="IDX200"></A>
 This is useful for testing purposes because it eliminates a source
 of variance for generated <CODE>.gmo</CODE> files.  With <CODE>--omit-header</CODE>,
 two invocations of <CODE>xgettext</CODE> on the same files with the same
@@ -334,7 +343,7 @@ options at different times are guaranteed to produce the same results.
 
 <DT><SAMP>`--copyright-holder=<VAR>string</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX200"></A>
+<A NAME="IDX201"></A>
 Set the copyright holder in the output.  <VAR>string</VAR> should be the
 copyright holder of the surrounding package.  (Note that the msgstr
 strings, extracted from the package's sources, belong to the copyright
@@ -350,7 +359,7 @@ simply because <CODE>xgettext</CODE> was first used in the GNU project.
 
 <DT><SAMP>`--foreign-user&acute;</SAMP>
 <DD>
-<A NAME="IDX201"></A>
+<A NAME="IDX202"></A>
 Omit FSF copyright in output.  This option is equivalent to
 <SAMP>`--copyright-holder="&acute;</SAMP>.  It can be useful for packages outside the GNU
 project that want their translations to be in the public domain.
@@ -359,16 +368,16 @@ project that want their translations to be in the public domain.
 <DD>
 <DT><SAMP>`--msgstr-prefix[=<VAR>string</VAR>]&acute;</SAMP>
 <DD>
-<A NAME="IDX202"></A>
 <A NAME="IDX203"></A>
+<A NAME="IDX204"></A>
 Use <VAR>string</VAR> (or "" if not specified) as prefix for msgstr entries.
 
 <DT><SAMP>`-M [<VAR>string</VAR>]&acute;</SAMP>
 <DD>
 <DT><SAMP>`--msgstr-suffix[=<VAR>string</VAR>]&acute;</SAMP>
 <DD>
-<A NAME="IDX204"></A>
 <A NAME="IDX205"></A>
+<A NAME="IDX206"></A>
 Use <VAR>string</VAR> (or "" if not specified) as suffix for msgstr entries.
 
 </DL>
@@ -383,16 +392,16 @@ Use <VAR>string</VAR> (or "" if not specified) as suffix for msgstr entries.
 <DD>
 <DT><SAMP>`--help&acute;</SAMP>
 <DD>
-<A NAME="IDX206"></A>
 <A NAME="IDX207"></A>
+<A NAME="IDX208"></A>
 Display this help and exit.
 
 <DT><SAMP>`-V&acute;</SAMP>
 <DD>
 <DT><SAMP>`--version&acute;</SAMP>
 <DD>
-<A NAME="IDX208"></A>
 <A NAME="IDX209"></A>
+<A NAME="IDX210"></A>
 Output version information and exit.
 
 </DL>
diff --git a/doc/gettext_5.html b/doc/gettext_5.html
index f614030be..ffa0a3de7 100644
--- a/doc/gettext_5.html
+++ b/doc/gettext_5.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - 5  Creating a New PO File</TITLE>
 </HEAD>
@@ -12,7 +12,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_4.html">previous<
 
 <H1><A NAME="SEC29" HREF="gettext_toc.html#TOC29">5  Creating a New PO File</A></H1>
 <P>
-<A NAME="IDX210"></A>
+<A NAME="IDX211"></A>
 
 </P>
 <P>
@@ -47,16 +47,16 @@ the header entry of this file.
 <H2><A NAME="SEC30" HREF="gettext_toc.html#TOC30">5.1  Invoking the <CODE>msginit</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX211"></A>
 <A NAME="IDX212"></A>
+<A NAME="IDX213"></A>
 
 <PRE>
 msginit [<VAR>option</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX213"></A>
 <A NAME="IDX214"></A>
+<A NAME="IDX215"></A>
 The <CODE>msginit</CODE> program creates a new PO file, initializing the meta
 information with values from the user's environment.
 
@@ -71,8 +71,8 @@ information with values from the user's environment.
 <DD>
 <DT><SAMP>`--input=<VAR>inputfile</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX215"></A>
 <A NAME="IDX216"></A>
+<A NAME="IDX217"></A>
 Input POT file.
 
 </DL>
@@ -92,8 +92,8 @@ POT file.  If it is <SAMP>`-&acute;</SAMP>, standard input is read.
 <DD>
 <DT><SAMP>`--output-file=<VAR>file</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX217"></A>
 <A NAME="IDX218"></A>
+<A NAME="IDX219"></A>
 Write output to specified PO file.
 
 </DL>
@@ -114,15 +114,15 @@ standard output.
 <DD>
 <DT><SAMP>`--locale=<VAR>ll_CC</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX219"></A>
 <A NAME="IDX220"></A>
+<A NAME="IDX221"></A>
 Set target locale.  <VAR>ll</VAR> should be a language code, and <VAR>CC</VAR> should
 be a country code.  The command <SAMP>`locale -a&acute;</SAMP> can be used to output a list
 of all installed locales.  The default is the user's locale setting.
 
 <DT><SAMP>`--no-translator&acute;</SAMP>
 <DD>
-<A NAME="IDX221"></A>
+<A NAME="IDX222"></A>
 Declares that the PO file will not have a human translator and is instead
 automatically generated.
 
@@ -130,15 +130,15 @@ automatically generated.
 <DD>
 <DT><SAMP>`--width=<VAR>number</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX222"></A>
 <A NAME="IDX223"></A>
+<A NAME="IDX224"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>`--no-wrap&acute;</SAMP>
 <DD>
-<A NAME="IDX224"></A>
+<A NAME="IDX225"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -155,16 +155,16 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>`--help&acute;</SAMP>
 <DD>
-<A NAME="IDX225"></A>
 <A NAME="IDX226"></A>
+<A NAME="IDX227"></A>
 Display this help and exit.
 
 <DT><SAMP>`-V&acute;</SAMP>
 <DD>
 <DT><SAMP>`--version&acute;</SAMP>
 <DD>
-<A NAME="IDX227"></A>
 <A NAME="IDX228"></A>
+<A NAME="IDX229"></A>
 Output version information and exit.
 
 </DL>
@@ -173,7 +173,7 @@ Output version information and exit.
 
 <H2><A NAME="SEC35" HREF="gettext_toc.html#TOC35">5.2  Filling in the Header Entry</A></H2>
 <P>
-<A NAME="IDX229"></A>
+<A NAME="IDX230"></A>
 
 </P>
 <P>
@@ -218,7 +218,7 @@ Before starting a translation, it is a good idea to get in touch with
 your translation team, not only to make sure you don't do duplicated work,
 but also to coordinate difficult linguistic issues.
 
-<A NAME="IDX230"></A>
+<A NAME="IDX231"></A>
 In the Free Translation Project, each translation team has its own mailing
 list.  The up-to-date list of teams can be found at the Free Translation
 Project's homepage, <A HREF="http://www.iro.umontreal.ca/contrib/po/HTML/">http://www.iro.umontreal.ca/contrib/po/HTML/</A>,
@@ -226,14 +226,14 @@ in the "National teams" area.
 
 <DT>Content-Type
 <DD>
-<A NAME="IDX231"></A>
 <A NAME="IDX232"></A>
+<A NAME="IDX233"></A>
 Replace <SAMP>`CHARSET&acute;</SAMP> with the character encoding used for your language,
 in your locale, or UTF-8.  This field is needed for correct operation of the
 <CODE>msgmerge</CODE> and <CODE>msgfmt</CODE> programs, as well as for users whose
 locale's character encoding differs from yours (see section <A HREF="gettext_10.html#SEC149">10.2.4  How to specify the output character set <CODE>gettext</CODE> uses</A>).
 
-<A NAME="IDX233"></A>
+<A NAME="IDX234"></A>
 You get the character encoding of your locale by running the shell command
 <SAMP>`locale charmap&acute;</SAMP>.  If the result is <SAMP>`C&acute;</SAMP> or <SAMP>`ANSI_X3.4-1968&acute;</SAMP>,
 which is equivalent to <SAMP>`ASCII&acute;</SAMP> (= <SAMP>`US-ASCII&acute;</SAMP>), it means that your
@@ -241,36 +241,41 @@ locale is not correctly configured.  In this case, ask your translation
 team which charset to use.  <SAMP>`ASCII&acute;</SAMP> is not usable for any language
 except Latin.
 
-<A NAME="IDX234"></A>
+<A NAME="IDX235"></A>
 Because the PO files must be portable to operating systems with less advanced
 internationalization facilities, the character encodings that can be used
 are limited to those supported by both GNU <CODE>libc</CODE> and GNU
 <CODE>libiconv</CODE>. These are:
 <CODE>ASCII</CODE>, <CODE>ISO-8859-1</CODE>, <CODE>ISO-8859-2</CODE>, <CODE>ISO-8859-3</CODE>,
 <CODE>ISO-8859-4</CODE>, <CODE>ISO-8859-5</CODE>, <CODE>ISO-8859-6</CODE>, <CODE>ISO-8859-7</CODE>,
-<CODE>ISO-8859-8</CODE>, <CODE>ISO-8859-9</CODE>, <CODE>ISO-8859-13</CODE>, <CODE>ISO-8859-15</CODE>,
-<CODE>KOI8-R</CODE>, <CODE>KOI8-U</CODE>, <CODE>CP850</CODE>, <CODE>CP866</CODE>, <CODE>CP874</CODE>,
+<CODE>ISO-8859-8</CODE>, <CODE>ISO-8859-9</CODE>, <CODE>ISO-8859-13</CODE>, <CODE>ISO-8859-14</CODE>,
+<CODE>ISO-8859-15</CODE>,
+<CODE>KOI8-R</CODE>, <CODE>KOI8-U</CODE>, <CODE>KOI8-T</CODE>,
+<CODE>CP850</CODE>, <CODE>CP866</CODE>, <CODE>CP874</CODE>,
 <CODE>CP932</CODE>, <CODE>CP949</CODE>, <CODE>CP950</CODE>, <CODE>CP1250</CODE>, <CODE>CP1251</CODE>,
 <CODE>CP1252</CODE>, <CODE>CP1253</CODE>, <CODE>CP1254</CODE>, <CODE>CP1255</CODE>, <CODE>CP1256</CODE>,
 <CODE>CP1257</CODE>, <CODE>GB2312</CODE>, <CODE>EUC-JP</CODE>, <CODE>EUC-KR</CODE>, <CODE>EUC-TW</CODE>,
 <CODE>BIG5</CODE>, <CODE>BIG5-HKSCS</CODE>, <CODE>GBK</CODE>, <CODE>GB18030</CODE>, <CODE>SHIFT_JIS</CODE>,
-<CODE>JOHAB</CODE>, <CODE>TIS-620</CODE>, <CODE>VISCII</CODE>, <CODE>UTF-8</CODE>.
+<CODE>JOHAB</CODE>, <CODE>TIS-620</CODE>, <CODE>VISCII</CODE>, <CODE>GEORGIAN-PS</CODE>, <CODE>UTF-8</CODE>.
 
-<A NAME="IDX235"></A>
+<A NAME="IDX236"></A>
 In the GNU system, the following encodings are frequently used for the
 corresponding languages.
 
-<A NAME="IDX236"></A>
+<A NAME="IDX237"></A>
 
 <UL>
 <LI><CODE>ISO-8859-1</CODE> for
 
- Afrikaans, Albanian, Basque, Catalan, Dutch, English, Estonian, Faroese,
- Finnish, French, Galician, German, Greenlandic, Icelandic, Indonesian,
- Irish, Italian, Malay, Norwegian, Portuguese, Spanish, Swedish,
+ Afrikaans, Albanian, Basque, Breton, Catalan, Cornish, Danish, Dutch,
+ English, Estonian, Faroese, Finnish, French, Galician, German,
+ Greenlandic, Icelandic, Indonesian, Irish, Italian, Malay, Manx,
+ Norwegian, Occitan, Portuguese, Spanish, Swedish, Tagalog, Uzbek,
+ Walloon,
 <LI><CODE>ISO-8859-2</CODE> for
 
- Croatian, Czech, Hungarian, Polish, Romanian, Serbian, Slovak, Slovenian,
+ Bosnian, Croatian, Czech, Hungarian, Polish, Romanian, Serbian, Slovak,
+ Slovenian,
 <LI><CODE>ISO-8859-3</CODE> for Maltese,
 
 <LI><CODE>ISO-8859-5</CODE> for Macedonian, Serbian,
@@ -283,16 +288,20 @@ corresponding languages.
 
 <LI><CODE>ISO-8859-9</CODE> for Turkish,
 
-<LI><CODE>ISO-8859-13</CODE> for Latvian, Lithuanian,
+<LI><CODE>ISO-8859-13</CODE> for Latvian, Lithuanian, Maori,
+
+<LI><CODE>ISO-8859-14</CODE> for Welsh,
 
 <LI><CODE>ISO-8859-15</CODE> for
 
  Basque, Catalan, Dutch, English, Finnish, French, Galician, German, Irish,
- Italian, Portuguese, Spanish, Swedish,
+ Italian, Portuguese, Spanish, Swedish, Walloon,
 <LI><CODE>KOI8-R</CODE> for Russian,
 
 <LI><CODE>KOI8-U</CODE> for Ukrainian,
 
+<LI><CODE>KOI8-T</CODE> for Tajik,
+
 <LI><CODE>CP1251</CODE> for Bulgarian, Byelorussian,
 
 <LI><CODE>GB2312</CODE>, <CODE>GBK</CODE>, <CODE>GB18030</CODE>
@@ -307,12 +316,14 @@ corresponding languages.
 
 <LI><CODE>TIS-620</CODE> for Thai,
 
+<LI><CODE>GEORGIAN-PS</CODE> for Georgian,
+
 <LI><CODE>UTF-8</CODE> for any language, including those listed above.
 
 </UL>
 
-<A NAME="IDX237"></A>
 <A NAME="IDX238"></A>
+<A NAME="IDX239"></A>
 When single quote characters or double quote characters are used in
 translations for your language, and your locale's encoding is one of the
 ISO-8859-* charsets, it is best if you create your PO files in UTF-8
@@ -324,7 +335,7 @@ real quote characters, whereas users in ISO-8859-* locales will see the
 vertical apostrophe and the vertical double quote instead (because that's
 what the character set conversion will transliterate them to).
 
-<A NAME="IDX239"></A>
+<A NAME="IDX240"></A>
 To enter such quote characters under X11, you can change your keyboard
 mapping using the <CODE>xmodmap</CODE> program.  The X11 names of the quote
 characters are "leftsinglequotemark", "rightsinglequotemark",
diff --git a/doc/gettext_6.html b/doc/gettext_6.html
index 2c1a7b003..109b5014f 100644
--- a/doc/gettext_6.html
+++ b/doc/gettext_6.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - 6  Updating Existing PO Files</TITLE>
 </HEAD>
@@ -17,8 +17,8 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_5.html">previous<
 <H2><A NAME="SEC37" HREF="gettext_toc.html#TOC37">6.1  Invoking the <CODE>msgmerge</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX240"></A>
 <A NAME="IDX241"></A>
+<A NAME="IDX242"></A>
 
 <PRE>
 msgmerge [<VAR>option</VAR>] <VAR>def</VAR>.po <VAR>ref</VAR>.pot
@@ -55,8 +55,8 @@ References to the new sources.
 <DD>
 <DT><SAMP>`--directory=<VAR>directory</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX242"></A>
 <A NAME="IDX243"></A>
+<A NAME="IDX244"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>`.po&acute;</TT>
 file will be written relative to the current directory, though.
@@ -65,8 +65,8 @@ file will be written relative to the current directory, though.
 <DD>
 <DT><SAMP>`--compendium=<VAR>file</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX244"></A>
 <A NAME="IDX245"></A>
+<A NAME="IDX246"></A>
 Specify an additional library of message translations.  See section <A HREF="gettext_6.html#SEC54">6.11  Using Translation Compendia</A>.
 This option may be specified more than once.
 
@@ -82,8 +82,8 @@ This option may be specified more than once.
 <DD>
 <DT><SAMP>`--update&acute;</SAMP>
 <DD>
-<A NAME="IDX246"></A>
 <A NAME="IDX247"></A>
+<A NAME="IDX248"></A>
 Update <VAR>def</VAR>.po.  Do nothing if <VAR>def</VAR>.po is already up to date.
 
 </DL>
@@ -98,14 +98,14 @@ Update <VAR>def</VAR>.po.  Do nothing if <VAR>def</VAR>.po is already up to date
 <DD>
 <DT><SAMP>`--output-file=<VAR>file</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX248"></A>
 <A NAME="IDX249"></A>
+<A NAME="IDX250"></A>
 Write output to specified file.
 
 </DL>
 
 <P>
-<A NAME="IDX250"></A>
+<A NAME="IDX251"></A>
 The results are written to standard output if no output file is specified
 or if it is <SAMP>`-&acute;</SAMP>.
 
@@ -122,19 +122,19 @@ The result is written back to <VAR>def</VAR>.po.
 
 <DT><SAMP>`--backup=<VAR>control</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX251"></A>
 <A NAME="IDX252"></A>
+<A NAME="IDX253"></A>
 Make a backup of <VAR>def</VAR>.po
 
 <DT><SAMP>`--suffix=<VAR>suffix</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX253"></A>
+<A NAME="IDX254"></A>
 Override the usual backup suffix.
 
 </DL>
 
 <P>
-<A NAME="IDX254"></A>
+<A NAME="IDX255"></A>
 The version control method may be selected via the <CODE>--backup</CODE> option
 or through the <CODE>VERSION_CONTROL</CODE> environment variable.  Here are the
 values:
@@ -184,8 +184,8 @@ The backup suffix is <SAMP>`~&acute;</SAMP>, unless set with <CODE>--suffix</COD
 <DD>
 <DT><SAMP>`--multi-domain&acute;</SAMP>
 <DD>
-<A NAME="IDX255"></A>
 <A NAME="IDX256"></A>
+<A NAME="IDX257"></A>
 Apply <VAR>ref</VAR>.pot to each of the domains in <VAR>def</VAR>.po.
 
 </DL>
@@ -198,30 +198,30 @@ Apply <VAR>ref</VAR>.pot to each of the domains in <VAR>def</VAR>.po.
 
 <DT><SAMP>`--force-po&acute;</SAMP>
 <DD>
-<A NAME="IDX257"></A>
+<A NAME="IDX258"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>`-i&acute;</SAMP>
 <DD>
 <DT><SAMP>`--indent&acute;</SAMP>
 <DD>
-<A NAME="IDX258"></A>
 <A NAME="IDX259"></A>
+<A NAME="IDX260"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>`--no-location&acute;</SAMP>
 <DD>
-<A NAME="IDX260"></A>
+<A NAME="IDX261"></A>
 Do not write <SAMP>`#: <VAR>filename</VAR>:<VAR>line</VAR>&acute;</SAMP> lines.
 
 <DT><SAMP>`--add-location&acute;</SAMP>
 <DD>
-<A NAME="IDX261"></A>
+<A NAME="IDX262"></A>
 Generate <SAMP>`#: <VAR>filename</VAR>:<VAR>line</VAR>&acute;</SAMP> lines (default).
 
 <DT><SAMP>`--strict&acute;</SAMP>
 <DD>
-<A NAME="IDX262"></A>
+<A NAME="IDX263"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -230,15 +230,15 @@ GNU extensions.
 <DD>
 <DT><SAMP>`--width=<VAR>number</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX263"></A>
 <A NAME="IDX264"></A>
+<A NAME="IDX265"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>`--no-wrap&acute;</SAMP>
 <DD>
-<A NAME="IDX265"></A>
+<A NAME="IDX266"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -247,9 +247,9 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>`--sort-output&acute;</SAMP>
 <DD>
-<A NAME="IDX266"></A>
 <A NAME="IDX267"></A>
 <A NAME="IDX268"></A>
+<A NAME="IDX269"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -257,8 +257,8 @@ for the translator to understand each message's context.
 <DD>
 <DT><SAMP>`--sort-by-file&acute;</SAMP>
 <DD>
-<A NAME="IDX269"></A>
 <A NAME="IDX270"></A>
+<A NAME="IDX271"></A>
 Sort output by file location.
 
 </DL>
@@ -273,24 +273,24 @@ Sort output by file location.
 <DD>
 <DT><SAMP>`--help&acute;</SAMP>
 <DD>
-<A NAME="IDX271"></A>
 <A NAME="IDX272"></A>
+<A NAME="IDX273"></A>
 Display this help and exit.
 
 <DT><SAMP>`-V&acute;</SAMP>
 <DD>
 <DT><SAMP>`--version&acute;</SAMP>
 <DD>
-<A NAME="IDX273"></A>
 <A NAME="IDX274"></A>
+<A NAME="IDX275"></A>
 Output version information and exit.
 
 <DT><SAMP>`-v&acute;</SAMP>
 <DD>
 <DT><SAMP>`--verbose&acute;</SAMP>
 <DD>
-<A NAME="IDX275"></A>
 <A NAME="IDX276"></A>
+<A NAME="IDX277"></A>
 Increase verbosity level.
 
 <DT><SAMP>`-q&acute;</SAMP>
@@ -299,9 +299,9 @@ Increase verbosity level.
 <DD>
 <DT><SAMP>`--silent&acute;</SAMP>
 <DD>
-<A NAME="IDX277"></A>
 <A NAME="IDX278"></A>
 <A NAME="IDX279"></A>
+<A NAME="IDX280"></A>
 Suppress progress indicators.
 
 </DL>
@@ -310,7 +310,7 @@ Suppress progress indicators.
 
 <H2><A NAME="SEC45" HREF="gettext_toc.html#TOC45">6.2  Translated Entries</A></H2>
 <P>
-<A NAME="IDX280"></A>
+<A NAME="IDX281"></A>
 
 </P>
 <P>
@@ -322,7 +322,7 @@ Other entry types will be excluded; translation will not occur for them.
 
 </P>
 <P>
-<A NAME="IDX281"></A>
+<A NAME="IDX282"></A>
 Some commands are more specifically related to translated entry processing.
 
 </P>
@@ -330,21 +330,21 @@ Some commands are more specifically related to translated entry processing.
 
 <DT><KBD>t</KBD>
 <DD>
-<A NAME="IDX282"></A>
+<A NAME="IDX283"></A>
 Find the next translated entry (<CODE>po-next-translated-entry</CODE>).
 
 <DT><KBD>T</KBD>
 <DD>
-<A NAME="IDX283"></A>
+<A NAME="IDX284"></A>
 Find the previous translated entry (<CODE>po-previous-translated-entry</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX284"></A>
 <A NAME="IDX285"></A>
 <A NAME="IDX286"></A>
 <A NAME="IDX287"></A>
+<A NAME="IDX288"></A>
 The commands <KBD>t</KBD> (<CODE>po-next-translated-entry</CODE>) and <KBD>T</KBD>
 (<CODE>po-previous-translated-entry</CODE>) move forwards or backwards, chasing
 for an translated entry.  If none is found, the search is extended and
@@ -352,7 +352,7 @@ wraps around in the PO file buffer.
 
 </P>
 <P>
-<A NAME="IDX288"></A>
+<A NAME="IDX289"></A>
 Translated entries usually result from the translator having edited in
 a translation for them, section <A HREF="gettext_6.html#SEC49">6.6  Modifying Translations</A>.  However, if the
 variable <CODE>po-auto-fuzzy-on-edit</CODE> is not <CODE>nil</CODE>, the entry having
@@ -365,14 +365,14 @@ See section <A HREF="gettext_6.html#SEC46">6.3  Fuzzy Entries</A>.
 
 <H2><A NAME="SEC46" HREF="gettext_toc.html#TOC46">6.3  Fuzzy Entries</A></H2>
 <P>
-<A NAME="IDX289"></A>
+<A NAME="IDX290"></A>
 
 </P>
 <P>
-<A NAME="IDX290"></A>
 <A NAME="IDX291"></A>
+<A NAME="IDX292"></A>
 Each PO file entry may have a set of <EM>attributes</EM>, which are
-qualities given a name and explicitely associated with the translation,
+qualities given a name and explicitly associated with the translation,
 using a special system comment.  One of these attributes
 has the name <CODE>fuzzy</CODE>, and entries having this attribute are said
 to have a fuzzy translation.  They are called fuzzy entries, for short.
@@ -393,7 +393,7 @@ might mark some entries as being fuzzy.
 
 </P>
 <P>
-<A NAME="IDX292"></A>
+<A NAME="IDX293"></A>
 Also, the translator may decide herself to mark an entry as fuzzy
 for her own convenience, when she wants to remember that the entry
 has to be later revisited.  So, some commands are more specifically
@@ -404,26 +404,26 @@ related to fuzzy entry processing.
 
 <DT><KBD>z</KBD>
 <DD>
-<A NAME="IDX293"></A>
+<A NAME="IDX294"></A>
 Find the next fuzzy entry (<CODE>po-next-fuzzy-entry</CODE>).
 
 <DT><KBD>Z</KBD>
 <DD>
-<A NAME="IDX294"></A>
+<A NAME="IDX295"></A>
 Find the previous fuzzy entry (<CODE>po-previous-fuzzy-entry</CODE>).
 
 <DT><KBD><KBD>TAB</KBD></KBD>
 <DD>
-<A NAME="IDX295"></A>
+<A NAME="IDX296"></A>
 Remove the fuzzy attribute of the current entry (<CODE>po-unfuzzy</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX296"></A>
 <A NAME="IDX297"></A>
 <A NAME="IDX298"></A>
 <A NAME="IDX299"></A>
+<A NAME="IDX300"></A>
 The commands <KBD>z</KBD> (<CODE>po-next-fuzzy-entry</CODE>) and <KBD>Z</KBD>
 (<CODE>po-previous-fuzzy-entry</CODE>) move forwards or backwards, chasing for
 a fuzzy entry.  If none is found, the search is extended and wraps
@@ -431,9 +431,9 @@ around in the PO file buffer.
 
 </P>
 <P>
-<A NAME="IDX300"></A>
 <A NAME="IDX301"></A>
 <A NAME="IDX302"></A>
+<A NAME="IDX303"></A>
 The command <KBD><KBD>TAB</KBD></KBD> (<CODE>po-unfuzzy</CODE>) removes the fuzzy
 attribute associated with an entry, usually leaving it translated.
 Further, if the variable <CODE>po-auto-select-on-unfuzzy</CODE> has not
@@ -455,8 +455,8 @@ to chase another entry, leaving the entry fuzzy.
 
 </P>
 <P>
-<A NAME="IDX303"></A>
 <A NAME="IDX304"></A>
+<A NAME="IDX305"></A>
 The translator may also use the <KBD><KBD>DEL</KBD></KBD> command
 (<CODE>po-fade-out-entry</CODE>) over any translated entry to mark it as being
 fuzzy, when she wants to easily leave a trace she wants to later return
@@ -473,7 +473,7 @@ still exists.
 
 <H2><A NAME="SEC47" HREF="gettext_toc.html#TOC47">6.4  Untranslated Entries</A></H2>
 <P>
-<A NAME="IDX305"></A>
+<A NAME="IDX306"></A>
 
 </P>
 <P>
@@ -493,7 +493,7 @@ are easily recognizable by the fact they end with <SAMP>`msgstr ""&acute;</SAMP>
 
 </P>
 <P>
-<A NAME="IDX306"></A>
+<A NAME="IDX307"></A>
 The work of the translator might be (quite naively) seen as the process
 of seeking for an untranslated entry, editing a translation for
 it, and repeating these actions until no untranslated entries remain.
@@ -505,26 +505,26 @@ processing.
 
 <DT><KBD>u</KBD>
 <DD>
-<A NAME="IDX307"></A>
+<A NAME="IDX308"></A>
 Find the next untranslated entry (<CODE>po-next-untranslated-entry</CODE>).
 
 <DT><KBD>U</KBD>
 <DD>
-<A NAME="IDX308"></A>
+<A NAME="IDX309"></A>
 Find the previous untranslated entry (<CODE>po-previous-untransted-entry</CODE>).
 
 <DT><KBD>k</KBD>
 <DD>
-<A NAME="IDX309"></A>
+<A NAME="IDX310"></A>
 Turn the current entry into an untranslated one (<CODE>po-kill-msgstr</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX310"></A>
 <A NAME="IDX311"></A>
 <A NAME="IDX312"></A>
 <A NAME="IDX313"></A>
+<A NAME="IDX314"></A>
 The commands <KBD>u</KBD> (<CODE>po-next-untranslated-entry</CODE>) and <KBD>U</KBD>
 (<CODE>po-previous-untransted-entry</CODE>) move forwards or backwards,
 chasing for an untranslated entry.  If none is found, the search is
@@ -532,8 +532,8 @@ extended and wraps around in the PO file buffer.
 
 </P>
 <P>
-<A NAME="IDX314"></A>
 <A NAME="IDX315"></A>
+<A NAME="IDX316"></A>
 An entry can be turned back into an untranslated entry by
 merely emptying its translation, using the command <KBD>k</KBD>
 (<CODE>po-kill-msgstr</CODE>).  See section <A HREF="gettext_6.html#SEC49">6.6  Modifying Translations</A>.
@@ -549,7 +549,7 @@ if some untranslated string still exists.
 
 <H2><A NAME="SEC48" HREF="gettext_toc.html#TOC48">6.5  Obsolete Entries</A></H2>
 <P>
-<A NAME="IDX316"></A>
+<A NAME="IDX317"></A>
 
 </P>
 <P>
@@ -575,7 +575,7 @@ after the fact.
 
 </P>
 <P>
-<A NAME="IDX317"></A>
+<A NAME="IDX318"></A>
 Moreover, some commands are more specifically related to obsolete
 entry processing.
 
@@ -584,27 +584,27 @@ entry processing.
 
 <DT><KBD>o</KBD>
 <DD>
-<A NAME="IDX318"></A>
+<A NAME="IDX319"></A>
 Find the next obsolete entry (<CODE>po-next-obsolete-entry</CODE>).
 
 <DT><KBD>O</KBD>
 <DD>
-<A NAME="IDX319"></A>
+<A NAME="IDX320"></A>
 Find the previous obsolete entry (<CODE>po-previous-obsolete-entry</CODE>).
 
 <DT><KBD><KBD>DEL</KBD></KBD>
 <DD>
-<A NAME="IDX320"></A>
+<A NAME="IDX321"></A>
 Make an active entry obsolete, or zap out an obsolete entry
 (<CODE>po-fade-out-entry</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX321"></A>
 <A NAME="IDX322"></A>
 <A NAME="IDX323"></A>
 <A NAME="IDX324"></A>
+<A NAME="IDX325"></A>
 The commands <KBD>o</KBD> (<CODE>po-next-obsolete-entry</CODE>) and <KBD>O</KBD>
 (<CODE>po-previous-obsolete-entry</CODE>) move forwards or backwards,
 chasing for an obsolete entry.  If none is found, the search is
@@ -620,10 +620,10 @@ introducing useless <CODE>msgid</CODE> values.
 
 </P>
 <P>
-<A NAME="IDX325"></A>
 <A NAME="IDX326"></A>
 <A NAME="IDX327"></A>
 <A NAME="IDX328"></A>
+<A NAME="IDX329"></A>
 However, it is possible to comment out an active entry, so making
 it obsolete.  GNU <CODE>gettext</CODE> utilities will later react to the
 disappearance of a translation by using the untranslated string.
@@ -653,8 +653,8 @@ merely tries to provide handy tools for helping her to do so.
 
 <H2><A NAME="SEC49" HREF="gettext_toc.html#TOC49">6.6  Modifying Translations</A></H2>
 <P>
-<A NAME="IDX329"></A>
 <A NAME="IDX330"></A>
+<A NAME="IDX331"></A>
 
 </P>
 <P>
@@ -680,40 +680,40 @@ using the following commands for modifying the translations.
 
 <DT><KBD><KBD>RET</KBD></KBD>
 <DD>
-<A NAME="IDX331"></A>
+<A NAME="IDX332"></A>
 Interactively edit the translation (<CODE>po-edit-msgstr</CODE>).
 
 <DT><KBD><KBD>LFD</KBD></KBD>
 <DD>
 <DT><KBD>C-j</KBD>
 <DD>
-<A NAME="IDX332"></A>
 <A NAME="IDX333"></A>
+<A NAME="IDX334"></A>
 Reinitialize the translation with the original, untranslated string
 (<CODE>po-msgid-to-msgstr</CODE>).
 
 <DT><KBD>k</KBD>
 <DD>
-<A NAME="IDX334"></A>
+<A NAME="IDX335"></A>
 Save the translation on the kill ring, and delete it (<CODE>po-kill-msgstr</CODE>).
 
 <DT><KBD>w</KBD>
 <DD>
-<A NAME="IDX335"></A>
+<A NAME="IDX336"></A>
 Save the translation on the kill ring, without deleting it
 (<CODE>po-kill-ring-save-msgstr</CODE>).
 
 <DT><KBD>y</KBD>
 <DD>
-<A NAME="IDX336"></A>
+<A NAME="IDX337"></A>
 Replace the translation, taking the new from the kill ring
 (<CODE>po-yank-msgstr</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX337"></A>
 <A NAME="IDX338"></A>
+<A NAME="IDX339"></A>
 The command <KBD><KBD>RET</KBD></KBD> (<CODE>po-edit-msgstr</CODE>) opens a new Emacs
 window meant to edit in a new translation, or to modify an already existing
 translation.  The new window contains a copy of the translation taken from
@@ -726,9 +726,9 @@ for more information.
 
 </P>
 <P>
-<A NAME="IDX339"></A>
 <A NAME="IDX340"></A>
 <A NAME="IDX341"></A>
+<A NAME="IDX342"></A>
 The command <KBD><KBD>LFD</KBD></KBD> (<CODE>po-msgid-to-msgstr</CODE>) initializes, or
 reinitializes the translation with the original string.  This command is
 normally used when the translator wants to redo a fresh translation of
@@ -736,7 +736,7 @@ the original string, disregarding any previous work.
 
 </P>
 <P>
-<A NAME="IDX342"></A>
+<A NAME="IDX343"></A>
 It is possible to arrange so, whenever editing an untranslated
 entry, the <KBD><KBD>LFD</KBD></KBD> command be automatically executed.  If you set
 <CODE>po-auto-edit-with-msgid</CODE> to <CODE>t</CODE>, the translation gets
@@ -745,7 +745,7 @@ The default value for <CODE>po-auto-edit-with-msgid</CODE> is <CODE>nil</CODE>.
 
 </P>
 <P>
-<A NAME="IDX343"></A>
+<A NAME="IDX344"></A>
 In fact, whether it is best to start a translation with an empty
 string, or rather with a copy of the original string, is a matter of
 taste or habit.  Sometimes, the source language and the
@@ -759,11 +759,11 @@ if this requires some extra editing work to get rid of the original.
 
 </P>
 <P>
-<A NAME="IDX344"></A>
 <A NAME="IDX345"></A>
 <A NAME="IDX346"></A>
 <A NAME="IDX347"></A>
 <A NAME="IDX348"></A>
+<A NAME="IDX349"></A>
 The command <KBD>k</KBD> (<CODE>po-kill-msgstr</CODE>) merely empties the
 translation string, so turning the entry into an untranslated
 one.  But while doing so, its previous contents is put apart in
@@ -795,8 +795,8 @@ entries, the translation is also uncommented prior to saving.
 
 </P>
 <P>
-<A NAME="IDX349"></A>
 <A NAME="IDX350"></A>
+<A NAME="IDX351"></A>
 The command <KBD>y</KBD> (<CODE>po-yank-msgstr</CODE>) completely replaces the
 translation of the current entry by a string taken from the kill ring.
 Following Emacs terminology, we then say that the replacement
@@ -830,7 +830,7 @@ yanking commands themselves.
 
 </P>
 <P>
-<A NAME="IDX351"></A>
+<A NAME="IDX352"></A>
 To better illustrate the operation of killing and yanking, let's
 use an actual example, taken from a common situation.  When the
 programmer slightly modifies some string right in the program, his
@@ -870,8 +870,8 @@ See section `Keyboard Macros' in <CITE>The Emacs Editor</CITE>.
 
 <H2><A NAME="SEC50" HREF="gettext_toc.html#TOC50">6.7  Modifying Comments</A></H2>
 <P>
-<A NAME="IDX352"></A>
 <A NAME="IDX353"></A>
+<A NAME="IDX354"></A>
 
 </P>
 <P>
@@ -900,24 +900,24 @@ so the general indications given for those apply here.  See section <A HREF="get
 
 <DT><KBD>#</KBD>
 <DD>
-<A NAME="IDX354"></A>
+<A NAME="IDX355"></A>
 Interactively edit the translator comments (<CODE>po-edit-comment</CODE>).
 
 <DT><KBD>K</KBD>
 <DD>
-<A NAME="IDX355"></A>
+<A NAME="IDX356"></A>
 Save the translator comments on the kill ring, and delete it
 (<CODE>po-kill-comment</CODE>).
 
 <DT><KBD>W</KBD>
 <DD>
-<A NAME="IDX356"></A>
+<A NAME="IDX357"></A>
 Save the translator comments on the kill ring, without deleting it
 (<CODE>po-kill-ring-save-comment</CODE>).
 
 <DT><KBD>Y</KBD>
 <DD>
-<A NAME="IDX357"></A>
+<A NAME="IDX358"></A>
 Replace the translator comments, taking the new from the kill ring
 (<CODE>po-yank-comment</CODE>).
 
@@ -933,8 +933,8 @@ See section <A HREF="gettext_6.html#SEC49">6.6  Modifying Translations</A>.
 
 </P>
 <P>
-<A NAME="IDX358"></A>
 <A NAME="IDX359"></A>
+<A NAME="IDX360"></A>
 The command <KBD>#</KBD> (<CODE>po-edit-comment</CODE>) opens a new Emacs window
 containing a copy of the translator comments on the current PO file entry.
 If there are no such comments, PO mode understands that the translator wants
@@ -948,18 +948,18 @@ See section <A HREF="gettext_6.html#SEC51">6.8  Details of Sub Edition</A>, for
 
 </P>
 <P>
-<A NAME="IDX360"></A>
+<A NAME="IDX361"></A>
 Functions found on <CODE>po-subedit-mode-hook</CODE>, if any, are executed after
 the string has been inserted in the edit buffer.
 
 </P>
 <P>
-<A NAME="IDX361"></A>
 <A NAME="IDX362"></A>
 <A NAME="IDX363"></A>
 <A NAME="IDX364"></A>
 <A NAME="IDX365"></A>
 <A NAME="IDX366"></A>
+<A NAME="IDX367"></A>
 The command <KBD>K</KBD> (<CODE>po-kill-comment</CODE>) gets rid of all
 translator comments, while saving those comments on the kill ring.
 The command <KBD>W</KBD> (<CODE>po-kill-ring-save-comment</CODE>) takes
@@ -1000,7 +1000,7 @@ regular Emacs commands <KBD>C-y</KBD> (<CODE>yank</CODE>) and <KBD>M-y</KBD>
 
 <H2><A NAME="SEC51" HREF="gettext_toc.html#TOC51">6.8  Details of Sub Edition</A></H2>
 <P>
-<A NAME="IDX367"></A>
+<A NAME="IDX368"></A>
 
 </P>
 <P>
@@ -1013,25 +1013,25 @@ of Emacs, which are described below.
 
 <DT><KBD>C-c C-c</KBD>
 <DD>
-<A NAME="IDX368"></A>
+<A NAME="IDX369"></A>
 Complete edition (<CODE>po-subedit-exit</CODE>).
 
 <DT><KBD>C-c C-k</KBD>
 <DD>
-<A NAME="IDX369"></A>
+<A NAME="IDX370"></A>
 Abort edition (<CODE>po-subedit-abort</CODE>).
 
 <DT><KBD>C-c C-a</KBD>
 <DD>
-<A NAME="IDX370"></A>
+<A NAME="IDX371"></A>
 Consult auxiliary PO files (<CODE>po-subedit-cycle-auxiliary</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX371"></A>
 <A NAME="IDX372"></A>
 <A NAME="IDX373"></A>
+<A NAME="IDX374"></A>
 The window's contents represents a translation for a given message,
 or a translator comment.  The translator may modify this window to
 her heart's content.  Once this is done, the command <KBD>C-c C-c</KBD>
@@ -1041,8 +1041,8 @@ sight or if buffers were switched.
 
 </P>
 <P>
-<A NAME="IDX374"></A>
 <A NAME="IDX375"></A>
+<A NAME="IDX376"></A>
 If the translator becomes unsatisfied with her translation or comment,
 to the extent she prefers keeping what was existent prior to the
 <KBD><KBD>RET</KBD></KBD> or <KBD>#</KBD> command, she may use the command <KBD>C-c C-k</KBD>
@@ -1053,8 +1053,8 @@ whole effect of last edition.
 
 </P>
 <P>
-<A NAME="IDX376"></A>
 <A NAME="IDX377"></A>
+<A NAME="IDX378"></A>
 The command <KBD>C-c C-a</KBD> (<CODE>po-subedit-cycle-auxiliary</CODE>)
 allows for glancing through translations
 already achieved in other languages, directly while editing the current
@@ -1088,7 +1088,7 @@ in the editing window, as ending with two <KBD>&#60;</KBD> in a row.
 
 </P>
 <P>
-<A NAME="IDX378"></A>
+<A NAME="IDX379"></A>
 When a translation (or a comment) is being edited, the translator may move
 the cursor back into the PO file buffer and freely move to other entries,
 browsing at will.  If, with an edition pending, the translator wanders in the
@@ -1101,7 +1101,7 @@ the translator should better be comfortable at handling many Emacs windows!
 
 </P>
 <P>
-<A NAME="IDX379"></A>
+<A NAME="IDX380"></A>
 Pending subedits may be completed or aborted in any order, regardless
 of how or when they were started.  When many subedits are pending and the
 translator asks for quitting the PO file (with the <KBD>q</KBD> command), subedits
@@ -1112,13 +1112,13 @@ are automatically resumed one at a time, so she may decide for each of them.
 
 <H2><A NAME="SEC52" HREF="gettext_toc.html#TOC52">6.9  C Sources Context</A></H2>
 <P>
-<A NAME="IDX380"></A>
 <A NAME="IDX381"></A>
 <A NAME="IDX382"></A>
+<A NAME="IDX383"></A>
 
 </P>
 <P>
-PO mode is particularily powerful when used with PO files
+PO mode is particularly powerful when used with PO files
 created through GNU <CODE>gettext</CODE> utilities, as those utilities
 insert special comments in the PO files they generate.
 Some of these special comments relate the PO file entry to
@@ -1129,9 +1129,9 @@ exactly where the untranslated string appears in the program sources.
 When the translator gets to an untranslated entry, she is fairly
 often faced with an original string which is not as informative as
 it normally should be, being succinct, cryptic, or otherwise ambiguous.
-Before chosing how to translate the string, she needs to understand
+Before choosing how to translate the string, she needs to understand
 better what the string really means and how tight the translation has
-to be.  Most of times, when problems arise, the only way left to make
+to be.  Most of the time, when problems arise, the only way left to make
 her judgment is looking at the true program sources from where this
 string originated, searching for surrounding comments the programmer
 might have put in there, and looking around for helping clues of
@@ -1146,12 +1146,12 @@ translator should not be shy at taking a look, once in a while.
 It is most probable that she will still be able to find some of the
 hints she needs.  She will learn quickly to not feel uncomfortable
 in program code, paying more attention to programmer's comments,
-variable and function names (if he dared chosing them well), and
-overall organization, than to programmation itself.
+variable and function names (if he dared choosing them well), and
+overall organization, than to the program code itself.
 
 </P>
 <P>
-<A NAME="IDX383"></A>
+<A NAME="IDX384"></A>
 The following commands are meant to help the translator at getting
 program source context for a PO file entry.
 
@@ -1160,35 +1160,35 @@ program source context for a PO file entry.
 
 <DT><KBD>s</KBD>
 <DD>
-<A NAME="IDX384"></A>
+<A NAME="IDX385"></A>
 Resume the display of a program source context, or cycle through them
 (<CODE>po-cycle-source-reference</CODE>).
 
 <DT><KBD>M-s</KBD>
 <DD>
-<A NAME="IDX385"></A>
+<A NAME="IDX386"></A>
 Display of a program source context selected by menu
 (<CODE>po-select-source-reference</CODE>).
 
 <DT><KBD>S</KBD>
 <DD>
-<A NAME="IDX386"></A>
+<A NAME="IDX387"></A>
 Add a directory to the search path for source files
 (<CODE>po-consider-source-path</CODE>).
 
 <DT><KBD>M-S</KBD>
 <DD>
-<A NAME="IDX387"></A>
+<A NAME="IDX388"></A>
 Delete a directory from the search path for source files
 (<CODE>po-ignore-source-path</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX388"></A>
 <A NAME="IDX389"></A>
 <A NAME="IDX390"></A>
 <A NAME="IDX391"></A>
+<A NAME="IDX392"></A>
 The commands <KBD>s</KBD> (<CODE>po-cycle-source-reference</CODE>) and <KBD>M-s</KBD>
 (<CODE>po-select-source-reference</CODE>) both open another window displaying
 some source program file, and already positioned in such a way that
@@ -1233,10 +1233,10 @@ available for a single string to translate.
 
 </P>
 <P>
-<A NAME="IDX392"></A>
 <A NAME="IDX393"></A>
 <A NAME="IDX394"></A>
 <A NAME="IDX395"></A>
+<A NAME="IDX396"></A>
 Program source files are usually found relative to where the PO
 file stands.  As a special provision, when this fails, the file is
 also looked for, but relative to the directory immediately above it.
@@ -1256,7 +1256,7 @@ one of the directories she does not want anymore on the search path.
 
 <H2><A NAME="SEC53" HREF="gettext_toc.html#TOC53">6.10  Consulting Auxiliary PO Files</A></H2>
 <P>
-<A NAME="IDX396"></A>
+<A NAME="IDX397"></A>
 
 </P>
 <P>
@@ -1269,8 +1269,8 @@ at once, for translators preferring to work in this way.
 
 </P>
 <P>
-<A NAME="IDX397"></A>
 <A NAME="IDX398"></A>
+<A NAME="IDX399"></A>
 An <EM>auxiliary</EM> PO file is an existing PO file meant for the same
 package the translator is working on, but targeted to a different mother
 tongue language.  Commands exist for declaring and handling auxiliary
@@ -1285,41 +1285,41 @@ Here are the auxiliary file commands available in PO mode.
 
 <DT><KBD>a</KBD>
 <DD>
-<A NAME="IDX399"></A>
+<A NAME="IDX400"></A>
 Seek auxiliary files for another translation for the same entry
 (<CODE>po-cycle-auxiliary</CODE>).
 
 <DT><KBD>C-c C-a</KBD>
 <DD>
-<A NAME="IDX400"></A>
+<A NAME="IDX401"></A>
 Switch to a particular auxiliary file (<CODE>po-select-auxiliary</CODE>).
 
 <DT><KBD>A</KBD>
 <DD>
-<A NAME="IDX401"></A>
+<A NAME="IDX402"></A>
 Declare this PO file as an auxiliary file (<CODE>po-consider-as-auxiliary</CODE>).
 
 <DT><KBD>M-A</KBD>
 <DD>
-<A NAME="IDX402"></A>
+<A NAME="IDX403"></A>
 Remove this PO file from the list of auxiliary files
 (<CODE>po-ignore-as-auxiliary</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX403"></A>
 <A NAME="IDX404"></A>
 <A NAME="IDX405"></A>
 <A NAME="IDX406"></A>
+<A NAME="IDX407"></A>
 Command <KBD>A</KBD> (<CODE>po-consider-as-auxiliary</CODE>) adds the current
 PO file to the list of auxiliary files, while command <KBD>M-A</KBD>
 (<CODE>po-ignore-as-auxiliary</CODE> just removes it.
 
 </P>
 <P>
-<A NAME="IDX407"></A>
 <A NAME="IDX408"></A>
+<A NAME="IDX409"></A>
 The command <KBD>a</KBD> (<CODE>po-cycle-auxiliary</CODE>) seeks all auxiliary PO
 files, round-robin, searching for a translated entry in some other language
 having an <CODE>msgid</CODE> field identical as the one for the current entry.
@@ -1331,8 +1331,8 @@ so repeating <KBD>a</KBD> will eventually yield back the original PO file.
 
 </P>
 <P>
-<A NAME="IDX409"></A>
 <A NAME="IDX410"></A>
+<A NAME="IDX411"></A>
 The command <KBD>C-c C-a</KBD> (<CODE>po-select-auxiliary</CODE>) asks the translator
 for her choice of a particular auxiliary file, with completion, and
 then switches to that selected PO file.  The command also checks if
@@ -1352,7 +1352,7 @@ their <CODE>msgid</CODE> entries written by the same GNU <CODE>gettext</CODE> to
 
 </P>
 <P>
-<A NAME="IDX411"></A>
+<A NAME="IDX412"></A>
 However, PO files initially created by PO mode itself, while marking
 strings in source files, are normalised differently.  So are PO
 files resulting of the the <SAMP>`M-x normalize&acute;</SAMP> command.  Until these
@@ -1364,11 +1364,11 @@ fully resolved, the translator should stay aware of normalisation issues.
 
 <H2><A NAME="SEC54" HREF="gettext_toc.html#TOC54">6.11  Using Translation Compendia</A></H2>
 <P>
-<A NAME="IDX412"></A>
+<A NAME="IDX413"></A>
 
 </P>
 <P>
-<A NAME="IDX413"></A>
+<A NAME="IDX414"></A>
 A <EM>compendium</EM> is a special PO file containing a set of
 translations recurring in many different packages.  The translator can
 use gettext tools to build a new compendium, to add entries to her
@@ -1381,8 +1381,8 @@ already translated entries, from translations kept in the compendium.
 
 <H3><A NAME="SEC55" HREF="gettext_toc.html#TOC55">6.11.1  Creating Compendia</A></H3>
 <P>
-<A NAME="IDX414"></A>
 <A NAME="IDX415"></A>
+<A NAME="IDX416"></A>
 
 </P>
 <P>
@@ -1397,8 +1397,8 @@ files</CITE> and <CITE>extracting a message subset from a PO file</CITE>.
 <H4><A NAME="SEC56" HREF="gettext_toc.html#TOC56">6.11.1.1  Concatenate PO Files</A></H4>
 
 <P>
-<A NAME="IDX416"></A>
 <A NAME="IDX417"></A>
+<A NAME="IDX418"></A>
 To concatenate several valid PO files into one compendium file you can
 use <SAMP>`msgcomm&acute;</SAMP> or <SAMP>`msgcat&acute;</SAMP> (the latter preferred):
 
@@ -1479,7 +1479,7 @@ files or postprocess the result using <SAMP>`msgattrib --translated --no-fuzzy&a
 
 <H4><A NAME="SEC57" HREF="gettext_toc.html#TOC57">6.11.1.2  Extract a Message Subset from a PO File</A></H4>
 <P>
-<A NAME="IDX418"></A>
+<A NAME="IDX419"></A>
 
 </P>
 <P>
@@ -1510,7 +1510,7 @@ or to update an already existing translation.
 
 <H4><A NAME="SEC59" HREF="gettext_toc.html#TOC59">6.11.2.1  Initialize a New Translation File</A></H4>
 <P>
-<A NAME="IDX419"></A>
+<A NAME="IDX420"></A>
 
 </P>
 <P>
@@ -1527,7 +1527,7 @@ msgmerge --compendium compendium.po -o file.po /dev/null file.pot
 
 <H4><A NAME="SEC60" HREF="gettext_toc.html#TOC60">6.11.2.2  Update an Existing Translation File</A></H4>
 <P>
-<A NAME="IDX420"></A>
+<A NAME="IDX421"></A>
 
 </P>
 <P>
diff --git a/doc/gettext_7.html b/doc/gettext_7.html
index 20cae6e8a..74956c09b 100644
--- a/doc/gettext_7.html
+++ b/doc/gettext_7.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - 7  Manipulating PO Files</TITLE>
 </HEAD>
@@ -12,7 +12,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_6.html">previous<
 
 <H1><A NAME="SEC61" HREF="gettext_toc.html#TOC61">7  Manipulating PO Files</A></H1>
 <P>
-<A NAME="IDX421"></A>
+<A NAME="IDX422"></A>
 
 </P>
 <P>
@@ -22,7 +22,7 @@ complete set of tools for this purpose.
 
 </P>
 <P>
-<A NAME="IDX422"></A>
+<A NAME="IDX423"></A>
 When merging two packages into a single package, the resulting POT file
 will be the concatenation of the two packages' POT files.  Thus the
 maintainer must concatenate the two existing package translations into
@@ -32,7 +32,7 @@ possible conflicts that arose during the merge.
 
 </P>
 <P>
-<A NAME="IDX423"></A>
+<A NAME="IDX424"></A>
 When a translator takes over the translation job from another translator,
 but she uses a different character encoding in her locale, she will
 convert the catalog to her character encoding.  This is best done through
@@ -48,8 +48,8 @@ that source file and use <SAMP>`msgmerge&acute;</SAMP>.
 
 </P>
 <P>
-<A NAME="IDX424"></A>
 <A NAME="IDX425"></A>
+<A NAME="IDX426"></A>
 When a translator wants to adjust some translation catalog for a special
 dialect or orthography -- for example, German as written in Switzerland
 versus German as written in Germany -- she needs to apply some text
@@ -66,14 +66,14 @@ that's why it's better to use the original POT file if available.
 
 </P>
 <P>
-<A NAME="IDX426"></A>
+<A NAME="IDX427"></A>
 When a translator wants to check her translations, for example according
 to orthography rules or using a non-interactive spell checker, she can do
 so using the <SAMP>`msgexec&acute;</SAMP> program.
 
 </P>
 <P>
-<A NAME="IDX427"></A>
+<A NAME="IDX428"></A>
 When third party tools create PO or POT files, sometimes duplicates cannot
 be avoided.  But the GNU <CODE>gettext</CODE> tools give an error when they
 encounter duplicate msgids in the same file and in the same domain.
@@ -91,7 +91,7 @@ completely translated.
 
 </P>
 <P>
-<A NAME="IDX428"></A>
+<A NAME="IDX429"></A>
 <SAMP>`msgattrib&acute;</SAMP> can be used to select and extract only the fuzzy
 or untranslated messages of a translation catalog.
 
@@ -107,16 +107,16 @@ catalogs.  It copies each message's msgid to its msgstr.
 <H2><A NAME="SEC62" HREF="gettext_toc.html#TOC62">7.1  Invoking the <CODE>msgcat</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX429"></A>
 <A NAME="IDX430"></A>
+<A NAME="IDX431"></A>
 
 <PRE>
 msgcat [<VAR>option</VAR>] [<VAR>inputfile</VAR>]...
 </PRE>
 
 <P>
-<A NAME="IDX431"></A>
 <A NAME="IDX432"></A>
+<A NAME="IDX433"></A>
 The <CODE>msgcat</CODE> program concatenates and merges the specified PO files.
 It finds messages which are common to two or more of the specified PO files.
 By using the <CODE>--more-than</CODE> option, greater commonality may be requested
@@ -142,8 +142,8 @@ Input files.
 <DD>
 <DT><SAMP>`--files-from=<VAR>file</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX433"></A>
 <A NAME="IDX434"></A>
+<A NAME="IDX435"></A>
 Read the names of the input files from <VAR>file</VAR> instead of getting
 them from the command line.
 
@@ -151,8 +151,8 @@ them from the command line.
 <DD>
 <DT><SAMP>`--directory=<VAR>directory</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX435"></A>
 <A NAME="IDX436"></A>
+<A NAME="IDX437"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>`.po&acute;</TT>
 file will be written relative to the current directory, though.
@@ -173,14 +173,14 @@ If <VAR>inputfile</VAR> is <SAMP>`-&acute;</SAMP>, standard input is read.
 <DD>
 <DT><SAMP>`--output-file=<VAR>file</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX437"></A>
 <A NAME="IDX438"></A>
+<A NAME="IDX439"></A>
 Write output to specified file.
 
 </DL>
 
 <P>
-<A NAME="IDX439"></A>
+<A NAME="IDX440"></A>
 The results are written to standard output if no output file is specified
 or if it is <SAMP>`-&acute;</SAMP>.
 
@@ -195,8 +195,8 @@ or if it is <SAMP>`-&acute;</SAMP>.
 <DD>
 <DT><SAMP>`--less-than=<VAR>number</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX440"></A>
 <A NAME="IDX441"></A>
+<A NAME="IDX442"></A>
 Print messages with less than <VAR>number</VAR> definitions, defaults to infinite
 if not set.
 
@@ -204,8 +204,8 @@ if not set.
 <DD>
 <DT><SAMP>`--more-than=<VAR>number</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX442"></A>
 <A NAME="IDX443"></A>
+<A NAME="IDX444"></A>
 Print messages with more than <VAR>number</VAR> definitions, defaults to 0 if not
 set.
 
@@ -213,8 +213,8 @@ set.
 <DD>
 <DT><SAMP>`--unique&acute;</SAMP>
 <DD>
-<A NAME="IDX444"></A>
 <A NAME="IDX445"></A>
+<A NAME="IDX446"></A>
 Shorthand for <SAMP>`--less-than=2&acute;</SAMP>.  Requests that only unique messages be
 printed.
 
@@ -230,45 +230,45 @@ printed.
 <DD>
 <DT><SAMP>`--to-code=<VAR>name</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX446"></A>
 <A NAME="IDX447"></A>
+<A NAME="IDX448"></A>
 Specify encoding for output.
 
 <DT><SAMP>`--use-first&acute;</SAMP>
 <DD>
-<A NAME="IDX448"></A>
+<A NAME="IDX449"></A>
 Use first available translation for each message.  Don't merge several
 translations into one.
 
 <DT><SAMP>`--force-po&acute;</SAMP>
 <DD>
-<A NAME="IDX449"></A>
+<A NAME="IDX450"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>`-i&acute;</SAMP>
 <DD>
 <DT><SAMP>`--indent&acute;</SAMP>
 <DD>
-<A NAME="IDX450"></A>
 <A NAME="IDX451"></A>
+<A NAME="IDX452"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>`--no-location&acute;</SAMP>
 <DD>
-<A NAME="IDX452"></A>
+<A NAME="IDX453"></A>
 Do not write <SAMP>`#: <VAR>filename</VAR>:<VAR>line</VAR>&acute;</SAMP> lines.
 
 <DT><SAMP>`-n&acute;</SAMP>
 <DD>
 <DT><SAMP>`--add-location&acute;</SAMP>
 <DD>
-<A NAME="IDX453"></A>
 <A NAME="IDX454"></A>
+<A NAME="IDX455"></A>
 Generate <SAMP>`#: <VAR>filename</VAR>:<VAR>line</VAR>&acute;</SAMP> lines (default).
 
 <DT><SAMP>`--strict&acute;</SAMP>
 <DD>
-<A NAME="IDX455"></A>
+<A NAME="IDX456"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -277,15 +277,15 @@ GNU extensions.
 <DD>
 <DT><SAMP>`--width=<VAR>number</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX456"></A>
 <A NAME="IDX457"></A>
+<A NAME="IDX458"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>`--no-wrap&acute;</SAMP>
 <DD>
-<A NAME="IDX458"></A>
+<A NAME="IDX459"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -294,9 +294,9 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>`--sort-output&acute;</SAMP>
 <DD>
-<A NAME="IDX459"></A>
 <A NAME="IDX460"></A>
 <A NAME="IDX461"></A>
+<A NAME="IDX462"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -304,8 +304,8 @@ for the translator to understand each message's context.
 <DD>
 <DT><SAMP>`--sort-by-file&acute;</SAMP>
 <DD>
-<A NAME="IDX462"></A>
 <A NAME="IDX463"></A>
+<A NAME="IDX464"></A>
 Sort output by file location.
 
 </DL>
@@ -320,16 +320,16 @@ Sort output by file location.
 <DD>
 <DT><SAMP>`--help&acute;</SAMP>
 <DD>
-<A NAME="IDX464"></A>
 <A NAME="IDX465"></A>
+<A NAME="IDX466"></A>
 Display this help and exit.
 
 <DT><SAMP>`-V&acute;</SAMP>
 <DD>
 <DT><SAMP>`--version&acute;</SAMP>
 <DD>
-<A NAME="IDX466"></A>
 <A NAME="IDX467"></A>
+<A NAME="IDX468"></A>
 Output version information and exit.
 
 </DL>
@@ -339,15 +339,15 @@ Output version information and exit.
 <H2><A NAME="SEC68" HREF="gettext_toc.html#TOC68">7.2  Invoking the <CODE>msgconv</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX468"></A>
 <A NAME="IDX469"></A>
+<A NAME="IDX470"></A>
 
 <PRE>
 msgconv [<VAR>option</VAR>] [<VAR>inputfile</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX470"></A>
+<A NAME="IDX471"></A>
 The <CODE>msgconv</CODE> program converts a translation catalog to a different
 character encoding.
 
@@ -366,8 +366,8 @@ Input PO file.
 <DD>
 <DT><SAMP>`--directory=<VAR>directory</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX471"></A>
 <A NAME="IDX472"></A>
+<A NAME="IDX473"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>`.po&acute;</TT>
 file will be written relative to the current directory, though.
@@ -388,8 +388,8 @@ If no <VAR>inputfile</VAR> is given or if it is <SAMP>`-&acute;</SAMP>, standard
 <DD>
 <DT><SAMP>`--output-file=<VAR>file</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX473"></A>
 <A NAME="IDX474"></A>
+<A NAME="IDX475"></A>
 Write output to specified file.
 
 </DL>
@@ -409,8 +409,8 @@ or if it is <SAMP>`-&acute;</SAMP>.
 <DD>
 <DT><SAMP>`--to-code=<VAR>name</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX475"></A>
 <A NAME="IDX476"></A>
+<A NAME="IDX477"></A>
 Specify encoding for output.
 
 </DL>
@@ -427,30 +427,30 @@ The default encoding is the current locale's encoding.
 
 <DT><SAMP>`--force-po&acute;</SAMP>
 <DD>
-<A NAME="IDX477"></A>
+<A NAME="IDX478"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>`-i&acute;</SAMP>
 <DD>
 <DT><SAMP>`--indent&acute;</SAMP>
 <DD>
-<A NAME="IDX478"></A>
 <A NAME="IDX479"></A>
+<A NAME="IDX480"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>`--no-location&acute;</SAMP>
 <DD>
-<A NAME="IDX480"></A>
+<A NAME="IDX481"></A>
 Do not write <SAMP>`#: <VAR>filename</VAR>:<VAR>line</VAR>&acute;</SAMP> lines.
 
 <DT><SAMP>`--add-location&acute;</SAMP>
 <DD>
-<A NAME="IDX481"></A>
+<A NAME="IDX482"></A>
 Generate <SAMP>`#: <VAR>filename</VAR>:<VAR>line</VAR>&acute;</SAMP> lines (default).
 
 <DT><SAMP>`--strict&acute;</SAMP>
 <DD>
-<A NAME="IDX482"></A>
+<A NAME="IDX483"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -459,15 +459,15 @@ GNU extensions.
 <DD>
 <DT><SAMP>`--width=<VAR>number</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX483"></A>
 <A NAME="IDX484"></A>
+<A NAME="IDX485"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>`--no-wrap&acute;</SAMP>
 <DD>
-<A NAME="IDX485"></A>
+<A NAME="IDX486"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -476,8 +476,8 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>`--sort-output&acute;</SAMP>
 <DD>
-<A NAME="IDX486"></A>
 <A NAME="IDX487"></A>
+<A NAME="IDX488"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -485,8 +485,8 @@ for the translator to understand each message's context.
 <DD>
 <DT><SAMP>`--sort-by-file&acute;</SAMP>
 <DD>
-<A NAME="IDX488"></A>
 <A NAME="IDX489"></A>
+<A NAME="IDX490"></A>
 Sort output by file location.
 
 </DL>
@@ -501,16 +501,16 @@ Sort output by file location.
 <DD>
 <DT><SAMP>`--help&acute;</SAMP>
 <DD>
-<A NAME="IDX490"></A>
 <A NAME="IDX491"></A>
+<A NAME="IDX492"></A>
 Display this help and exit.
 
 <DT><SAMP>`-V&acute;</SAMP>
 <DD>
 <DT><SAMP>`--version&acute;</SAMP>
 <DD>
-<A NAME="IDX492"></A>
 <A NAME="IDX493"></A>
+<A NAME="IDX494"></A>
 Output version information and exit.
 
 </DL>
@@ -520,15 +520,15 @@ Output version information and exit.
 <H2><A NAME="SEC74" HREF="gettext_toc.html#TOC74">7.3  Invoking the <CODE>msggrep</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX494"></A>
 <A NAME="IDX495"></A>
+<A NAME="IDX496"></A>
 
 <PRE>
 msggrep [<VAR>option</VAR>] [<VAR>inputfile</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX496"></A>
+<A NAME="IDX497"></A>
 The <CODE>msggrep</CODE> program extracts all messages of a translation catalog
 that match a given pattern or belong to some given source files.
 
@@ -547,8 +547,8 @@ Input PO file.
 <DD>
 <DT><SAMP>`--directory=<VAR>directory</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX497"></A>
 <A NAME="IDX498"></A>
+<A NAME="IDX499"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>`.po&acute;</TT>
 file will be written relative to the current directory, though.
@@ -569,8 +569,8 @@ If no <VAR>inputfile</VAR> is given or if it is <SAMP>`-&acute;</SAMP>, standard
 <DD>
 <DT><SAMP>`--output-file=<VAR>file</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX499"></A>
 <A NAME="IDX500"></A>
+<A NAME="IDX501"></A>
 Write output to specified file.
 
 </DL>
@@ -632,8 +632,8 @@ expressions if -E is given, or fixed strings if -F is given.
 <DD>
 <DT><SAMP>`--location=<VAR>sourcefile</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX501"></A>
 <A NAME="IDX502"></A>
+<A NAME="IDX503"></A>
 Select messages extracted from <VAR>sourcefile</VAR>.  <VAR>sourcefile</VAR> can be
 either a literal file name or a wildcard pattern.
 
@@ -641,64 +641,64 @@ either a literal file name or a wildcard pattern.
 <DD>
 <DT><SAMP>`--domain=<VAR>domainname</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX503"></A>
 <A NAME="IDX504"></A>
+<A NAME="IDX505"></A>
 Select messages belonging to domain <VAR>domainname</VAR>.
 
 <DT><SAMP>`-K&acute;</SAMP>
 <DD>
 <DT><SAMP>`--msgid&acute;</SAMP>
 <DD>
-<A NAME="IDX505"></A>
 <A NAME="IDX506"></A>
+<A NAME="IDX507"></A>
 Start of patterns for the msgid.
 
 <DT><SAMP>`-T&acute;</SAMP>
 <DD>
 <DT><SAMP>`--msgstr&acute;</SAMP>
 <DD>
-<A NAME="IDX507"></A>
 <A NAME="IDX508"></A>
+<A NAME="IDX509"></A>
 Start of patterns for the msgstr.
 
 <DT><SAMP>`-E&acute;</SAMP>
 <DD>
 <DT><SAMP>`--extended-regexp&acute;</SAMP>
 <DD>
-<A NAME="IDX509"></A>
 <A NAME="IDX510"></A>
+<A NAME="IDX511"></A>
 Specify that <VAR>pattern</VAR> is an extended regular expression.
 
 <DT><SAMP>`-F&acute;</SAMP>
 <DD>
 <DT><SAMP>`--fixed-strings&acute;</SAMP>
 <DD>
-<A NAME="IDX511"></A>
 <A NAME="IDX512"></A>
+<A NAME="IDX513"></A>
 Specify that <VAR>pattern</VAR> is a set of newline-separated strings.
 
 <DT><SAMP>`-e <VAR>pattern</VAR>&acute;</SAMP>
 <DD>
 <DT><SAMP>`--regexp=<VAR>pattern</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX513"></A>
 <A NAME="IDX514"></A>
+<A NAME="IDX515"></A>
 Use <VAR>pattern</VAR> as a regular expression.
 
 <DT><SAMP>`-f <VAR>file</VAR>&acute;</SAMP>
 <DD>
 <DT><SAMP>`--file=<VAR>file</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX515"></A>
 <A NAME="IDX516"></A>
+<A NAME="IDX517"></A>
 Obtain <VAR>pattern</VAR> from <VAR>file</VAR>.
 
 <DT><SAMP>`-i&acute;</SAMP>
 <DD>
 <DT><SAMP>`--ignore-case&acute;</SAMP>
 <DD>
-<A NAME="IDX517"></A>
 <A NAME="IDX518"></A>
+<A NAME="IDX519"></A>
 Ignore case distinctions.
 
 </DL>
@@ -711,27 +711,27 @@ Ignore case distinctions.
 
 <DT><SAMP>`--force-po&acute;</SAMP>
 <DD>
-<A NAME="IDX519"></A>
+<A NAME="IDX520"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>`--indent&acute;</SAMP>
 <DD>
-<A NAME="IDX520"></A>
+<A NAME="IDX521"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>`--no-location&acute;</SAMP>
 <DD>
-<A NAME="IDX521"></A>
+<A NAME="IDX522"></A>
 Do not write <SAMP>`#: <VAR>filename</VAR>:<VAR>line</VAR>&acute;</SAMP> lines.
 
 <DT><SAMP>`--add-location&acute;</SAMP>
 <DD>
-<A NAME="IDX522"></A>
+<A NAME="IDX523"></A>
 Generate <SAMP>`#: <VAR>filename</VAR>:<VAR>line</VAR>&acute;</SAMP> lines (default).
 
 <DT><SAMP>`--strict&acute;</SAMP>
 <DD>
-<A NAME="IDX523"></A>
+<A NAME="IDX524"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -740,28 +740,28 @@ GNU extensions.
 <DD>
 <DT><SAMP>`--width=<VAR>number</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX524"></A>
 <A NAME="IDX525"></A>
+<A NAME="IDX526"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>`--no-wrap&acute;</SAMP>
 <DD>
-<A NAME="IDX526"></A>
+<A NAME="IDX527"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
 
 <DT><SAMP>`--sort-output&acute;</SAMP>
 <DD>
-<A NAME="IDX527"></A>
+<A NAME="IDX528"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
 <DT><SAMP>`--sort-by-file&acute;</SAMP>
 <DD>
-<A NAME="IDX528"></A>
+<A NAME="IDX529"></A>
 Sort output by file location.
 
 </DL>
@@ -776,16 +776,16 @@ Sort output by file location.
 <DD>
 <DT><SAMP>`--help&acute;</SAMP>
 <DD>
-<A NAME="IDX529"></A>
 <A NAME="IDX530"></A>
+<A NAME="IDX531"></A>
 Display this help and exit.
 
 <DT><SAMP>`-V&acute;</SAMP>
 <DD>
 <DT><SAMP>`--version&acute;</SAMP>
 <DD>
-<A NAME="IDX531"></A>
 <A NAME="IDX532"></A>
+<A NAME="IDX533"></A>
 Output version information and exit.
 
 </DL>
@@ -795,15 +795,15 @@ Output version information and exit.
 <H2><A NAME="SEC80" HREF="gettext_toc.html#TOC80">7.4  Invoking the <CODE>msgfilter</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX533"></A>
 <A NAME="IDX534"></A>
+<A NAME="IDX535"></A>
 
 <PRE>
 msgfilter [<VAR>option</VAR>] <VAR>filter</VAR> [<VAR>filter-option</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX535"></A>
+<A NAME="IDX536"></A>
 The <CODE>msgfilter</CODE> program applies a filter to all translations of a
 translation catalog.
 
@@ -818,16 +818,16 @@ translation catalog.
 <DD>
 <DT><SAMP>`--input=<VAR>inputfile</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX536"></A>
 <A NAME="IDX537"></A>
+<A NAME="IDX538"></A>
 Input PO file.
 
 <DT><SAMP>`-D <VAR>directory</VAR>&acute;</SAMP>
 <DD>
 <DT><SAMP>`--directory=<VAR>directory</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX538"></A>
 <A NAME="IDX539"></A>
+<A NAME="IDX540"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>`.po&acute;</TT>
 file will be written relative to the current directory, though.
@@ -848,8 +848,8 @@ If no <VAR>inputfile</VAR> is given or if it is <SAMP>`-&acute;</SAMP>, standard
 <DD>
 <DT><SAMP>`--output-file=<VAR>file</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX540"></A>
 <A NAME="IDX541"></A>
+<A NAME="IDX542"></A>
 Write output to specified file.
 
 </DL>
@@ -870,7 +870,7 @@ used filter is <SAMP>`sed&acute;</SAMP>.
 
 </P>
 <P>
-<A NAME="IDX542"></A>
+<A NAME="IDX543"></A>
 Note: It is your responsibility to ensure that the <VAR>filter</VAR> can cope
 with input encoded in the translation catalog's encoding.  If the
 <VAR>filter</VAR> wants input in a particular encoding, you can in a first step
@@ -883,7 +883,7 @@ locale, by using the <CODE>LC_ALL</CODE> environment variable.
 
 </P>
 <P>
-<A NAME="IDX543"></A>
+<A NAME="IDX544"></A>
 Note: Most translations in a translation catalog don't end with a newline
 character. For this reason, it is important that the <VAR>filter</VAR>
 recognizes its last input line even if it ends without a newline, and that
@@ -903,16 +903,16 @@ does not have this limitation.
 <DD>
 <DT><SAMP>`--expression=<VAR>script</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX544"></A>
 <A NAME="IDX545"></A>
+<A NAME="IDX546"></A>
 Add <VAR>script</VAR> to the commands to be executed.
 
 <DT><SAMP>`-f <VAR>scriptfile</VAR>&acute;</SAMP>
 <DD>
 <DT><SAMP>`--file=<VAR>scriptfile</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX546"></A>
 <A NAME="IDX547"></A>
+<A NAME="IDX548"></A>
 Add the contents of <VAR>scriptfile</VAR> to the commands to be executed.
 
 <DT><SAMP>`-n&acute;</SAMP>
@@ -921,9 +921,9 @@ Add the contents of <VAR>scriptfile</VAR> to the commands to be executed.
 <DD>
 <DT><SAMP>`--silent&acute;</SAMP>
 <DD>
-<A NAME="IDX548"></A>
 <A NAME="IDX549"></A>
 <A NAME="IDX550"></A>
+<A NAME="IDX551"></A>
 Suppress automatic printing of pattern space.
 
 </DL>
@@ -936,34 +936,34 @@ Suppress automatic printing of pattern space.
 
 <DT><SAMP>`--force-po&acute;</SAMP>
 <DD>
-<A NAME="IDX551"></A>
+<A NAME="IDX552"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>`--indent&acute;</SAMP>
 <DD>
-<A NAME="IDX552"></A>
+<A NAME="IDX553"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>`--keep-header&acute;</SAMP>
 <DD>
-<A NAME="IDX553"></A>
+<A NAME="IDX554"></A>
 Keep the header entry, i.e. the message with <SAMP>`msgid ""&acute;</SAMP>, unmodified,
 instead of filtering it.  By default, the header entry is subject to
 filtering like any other message.
 
 <DT><SAMP>`--no-location&acute;</SAMP>
 <DD>
-<A NAME="IDX554"></A>
+<A NAME="IDX555"></A>
 Do not write <SAMP>`#: <VAR>filename</VAR>:<VAR>line</VAR>&acute;</SAMP> lines.
 
 <DT><SAMP>`--add-location&acute;</SAMP>
 <DD>
-<A NAME="IDX555"></A>
+<A NAME="IDX556"></A>
 Generate <SAMP>`#: <VAR>filename</VAR>:<VAR>line</VAR>&acute;</SAMP> lines (default).
 
 <DT><SAMP>`--strict&acute;</SAMP>
 <DD>
-<A NAME="IDX556"></A>
+<A NAME="IDX557"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -972,15 +972,15 @@ GNU extensions.
 <DD>
 <DT><SAMP>`--width=<VAR>number</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX557"></A>
 <A NAME="IDX558"></A>
+<A NAME="IDX559"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>`--no-wrap&acute;</SAMP>
 <DD>
-<A NAME="IDX559"></A>
+<A NAME="IDX560"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -989,8 +989,8 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>`--sort-output&acute;</SAMP>
 <DD>
-<A NAME="IDX560"></A>
 <A NAME="IDX561"></A>
+<A NAME="IDX562"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -998,8 +998,8 @@ for the translator to understand each message's context.
 <DD>
 <DT><SAMP>`--sort-by-file&acute;</SAMP>
 <DD>
-<A NAME="IDX562"></A>
 <A NAME="IDX563"></A>
+<A NAME="IDX564"></A>
 Sort output by file location.
 
 </DL>
@@ -1014,16 +1014,16 @@ Sort output by file location.
 <DD>
 <DT><SAMP>`--help&acute;</SAMP>
 <DD>
-<A NAME="IDX564"></A>
 <A NAME="IDX565"></A>
+<A NAME="IDX566"></A>
 Display this help and exit.
 
 <DT><SAMP>`-V&acute;</SAMP>
 <DD>
 <DT><SAMP>`--version&acute;</SAMP>
 <DD>
-<A NAME="IDX566"></A>
 <A NAME="IDX567"></A>
+<A NAME="IDX568"></A>
 Output version information and exit.
 
 </DL>
@@ -1033,16 +1033,16 @@ Output version information and exit.
 <H2><A NAME="SEC87" HREF="gettext_toc.html#TOC87">7.5  Invoking the <CODE>msguniq</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX568"></A>
 <A NAME="IDX569"></A>
+<A NAME="IDX570"></A>
 
 <PRE>
 msguniq [<VAR>option</VAR>] [<VAR>inputfile</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX570"></A>
 <A NAME="IDX571"></A>
+<A NAME="IDX572"></A>
 The <CODE>msguniq</CODE> program unifies duplicate translations in a translation
 catalog.  It finds duplicate translations of the same message ID.  Such
 duplicates are invalid input for other programs like <CODE>msgfmt</CODE>,
@@ -1069,8 +1069,8 @@ Input PO file.
 <DD>
 <DT><SAMP>`--directory=<VAR>directory</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX572"></A>
 <A NAME="IDX573"></A>
+<A NAME="IDX574"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>`.po&acute;</TT>
 file will be written relative to the current directory, though.
@@ -1091,8 +1091,8 @@ If no <VAR>inputfile</VAR> is given or if it is <SAMP>`-&acute;</SAMP>, standard
 <DD>
 <DT><SAMP>`--output-file=<VAR>file</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX574"></A>
 <A NAME="IDX575"></A>
+<A NAME="IDX576"></A>
 Write output to specified file.
 
 </DL>
@@ -1112,16 +1112,16 @@ or if it is <SAMP>`-&acute;</SAMP>.
 <DD>
 <DT><SAMP>`--repeated&acute;</SAMP>
 <DD>
-<A NAME="IDX576"></A>
 <A NAME="IDX577"></A>
+<A NAME="IDX578"></A>
 Print only duplicates.
 
 <DT><SAMP>`-u&acute;</SAMP>
 <DD>
 <DT><SAMP>`--unique&acute;</SAMP>
 <DD>
-<A NAME="IDX578"></A>
 <A NAME="IDX579"></A>
+<A NAME="IDX580"></A>
 Print only unique messages, discard duplicates.
 
 </DL>
@@ -1136,45 +1136,45 @@ Print only unique messages, discard duplicates.
 <DD>
 <DT><SAMP>`--to-code=<VAR>name</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX580"></A>
 <A NAME="IDX581"></A>
+<A NAME="IDX582"></A>
 Specify encoding for output.
 
 <DT><SAMP>`--use-first&acute;</SAMP>
 <DD>
-<A NAME="IDX582"></A>
+<A NAME="IDX583"></A>
 Use first available translation for each message.  Don't merge several
 translations into one.
 
 <DT><SAMP>`--force-po&acute;</SAMP>
 <DD>
-<A NAME="IDX583"></A>
+<A NAME="IDX584"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>`-i&acute;</SAMP>
 <DD>
 <DT><SAMP>`--indent&acute;</SAMP>
 <DD>
-<A NAME="IDX584"></A>
 <A NAME="IDX585"></A>
+<A NAME="IDX586"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>`--no-location&acute;</SAMP>
 <DD>
-<A NAME="IDX586"></A>
+<A NAME="IDX587"></A>
 Do not write <SAMP>`#: <VAR>filename</VAR>:<VAR>line</VAR>&acute;</SAMP> lines.
 
 <DT><SAMP>`-n&acute;</SAMP>
 <DD>
 <DT><SAMP>`--add-location&acute;</SAMP>
 <DD>
-<A NAME="IDX587"></A>
 <A NAME="IDX588"></A>
+<A NAME="IDX589"></A>
 Generate <SAMP>`#: <VAR>filename</VAR>:<VAR>line</VAR>&acute;</SAMP> lines (default).
 
 <DT><SAMP>`--strict&acute;</SAMP>
 <DD>
-<A NAME="IDX589"></A>
+<A NAME="IDX590"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -1183,15 +1183,15 @@ GNU extensions.
 <DD>
 <DT><SAMP>`--width=<VAR>number</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX590"></A>
 <A NAME="IDX591"></A>
+<A NAME="IDX592"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>`--no-wrap&acute;</SAMP>
 <DD>
-<A NAME="IDX592"></A>
+<A NAME="IDX593"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -1200,8 +1200,8 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>`--sort-output&acute;</SAMP>
 <DD>
-<A NAME="IDX593"></A>
 <A NAME="IDX594"></A>
+<A NAME="IDX595"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -1209,8 +1209,8 @@ for the translator to understand each message's context.
 <DD>
 <DT><SAMP>`--sort-by-file&acute;</SAMP>
 <DD>
-<A NAME="IDX595"></A>
 <A NAME="IDX596"></A>
+<A NAME="IDX597"></A>
 Sort output by file location.
 
 </DL>
@@ -1225,16 +1225,16 @@ Sort output by file location.
 <DD>
 <DT><SAMP>`--help&acute;</SAMP>
 <DD>
-<A NAME="IDX597"></A>
 <A NAME="IDX598"></A>
+<A NAME="IDX599"></A>
 Display this help and exit.
 
 <DT><SAMP>`-V&acute;</SAMP>
 <DD>
 <DT><SAMP>`--version&acute;</SAMP>
 <DD>
-<A NAME="IDX599"></A>
 <A NAME="IDX600"></A>
+<A NAME="IDX601"></A>
 Output version information and exit.
 
 </DL>
@@ -1244,15 +1244,15 @@ Output version information and exit.
 <H2><A NAME="SEC93" HREF="gettext_toc.html#TOC93">7.6  Invoking the <CODE>msgcomm</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX601"></A>
 <A NAME="IDX602"></A>
+<A NAME="IDX603"></A>
 
 <PRE>
 msgcomm [<VAR>option</VAR>] [<VAR>inputfile</VAR>]...
 </PRE>
 
 <P>
-<A NAME="IDX603"></A>
+<A NAME="IDX604"></A>
 The <CODE>msgcomm</CODE> program finds messages which are common to two or more
 of the specified PO files.
 By using the <CODE>--more-than</CODE> option, greater commonality may be requested
@@ -1278,8 +1278,8 @@ Input files.
 <DD>
 <DT><SAMP>`--files-from=<VAR>file</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX604"></A>
 <A NAME="IDX605"></A>
+<A NAME="IDX606"></A>
 Read the names of the input files from <VAR>file</VAR> instead of getting
 them from the command line.
 
@@ -1287,8 +1287,8 @@ them from the command line.
 <DD>
 <DT><SAMP>`--directory=<VAR>directory</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX606"></A>
 <A NAME="IDX607"></A>
+<A NAME="IDX608"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>`.po&acute;</TT>
 file will be written relative to the current directory, though.
@@ -1309,8 +1309,8 @@ If <VAR>inputfile</VAR> is <SAMP>`-&acute;</SAMP>, standard input is read.
 <DD>
 <DT><SAMP>`--output-file=<VAR>file</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX608"></A>
 <A NAME="IDX609"></A>
+<A NAME="IDX610"></A>
 Write output to specified file.
 
 </DL>
@@ -1330,8 +1330,8 @@ or if it is <SAMP>`-&acute;</SAMP>.
 <DD>
 <DT><SAMP>`--less-than=<VAR>number</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX610"></A>
 <A NAME="IDX611"></A>
+<A NAME="IDX612"></A>
 Print messages with less than <VAR>number</VAR> definitions, defaults to infinite
 if not set.
 
@@ -1339,8 +1339,8 @@ if not set.
 <DD>
 <DT><SAMP>`--more-than=<VAR>number</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX612"></A>
 <A NAME="IDX613"></A>
+<A NAME="IDX614"></A>
 Print messages with more than <VAR>number</VAR> definitions, defaults to 1 if not
 set.
 
@@ -1348,8 +1348,8 @@ set.
 <DD>
 <DT><SAMP>`--unique&acute;</SAMP>
 <DD>
-<A NAME="IDX614"></A>
 <A NAME="IDX615"></A>
+<A NAME="IDX616"></A>
 Shorthand for <SAMP>`--less-than=2&acute;</SAMP>.  Requests that only unique messages be
 printed.
 
@@ -1363,33 +1363,33 @@ printed.
 
 <DT><SAMP>`--force-po&acute;</SAMP>
 <DD>
-<A NAME="IDX616"></A>
+<A NAME="IDX617"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>`-i&acute;</SAMP>
 <DD>
 <DT><SAMP>`--indent&acute;</SAMP>
 <DD>
-<A NAME="IDX617"></A>
 <A NAME="IDX618"></A>
+<A NAME="IDX619"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>`--no-location&acute;</SAMP>
 <DD>
-<A NAME="IDX619"></A>
+<A NAME="IDX620"></A>
 Do not write <SAMP>`#: <VAR>filename</VAR>:<VAR>line</VAR>&acute;</SAMP> lines.
 
 <DT><SAMP>`-n&acute;</SAMP>
 <DD>
 <DT><SAMP>`--add-location&acute;</SAMP>
 <DD>
-<A NAME="IDX620"></A>
 <A NAME="IDX621"></A>
+<A NAME="IDX622"></A>
 Generate <SAMP>`#: <VAR>filename</VAR>:<VAR>line</VAR>&acute;</SAMP> lines (default).
 
 <DT><SAMP>`--strict&acute;</SAMP>
 <DD>
-<A NAME="IDX622"></A>
+<A NAME="IDX623"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -1398,15 +1398,15 @@ GNU extensions.
 <DD>
 <DT><SAMP>`--width=<VAR>number</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX623"></A>
 <A NAME="IDX624"></A>
+<A NAME="IDX625"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>`--no-wrap&acute;</SAMP>
 <DD>
-<A NAME="IDX625"></A>
+<A NAME="IDX626"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -1415,8 +1415,8 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>`--sort-output&acute;</SAMP>
 <DD>
-<A NAME="IDX626"></A>
 <A NAME="IDX627"></A>
+<A NAME="IDX628"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -1424,13 +1424,13 @@ for the translator to understand each message's context.
 <DD>
 <DT><SAMP>`--sort-by-file&acute;</SAMP>
 <DD>
-<A NAME="IDX628"></A>
 <A NAME="IDX629"></A>
+<A NAME="IDX630"></A>
 Sort output by file location.
 
 <DT><SAMP>`--omit-header&acute;</SAMP>
 <DD>
-<A NAME="IDX630"></A>
+<A NAME="IDX631"></A>
 Don't write header with <SAMP>`msgid ""&acute;</SAMP> entry.
 
 </DL>
@@ -1445,16 +1445,16 @@ Don't write header with <SAMP>`msgid ""&acute;</SAMP> entry.
 <DD>
 <DT><SAMP>`--help&acute;</SAMP>
 <DD>
-<A NAME="IDX631"></A>
 <A NAME="IDX632"></A>
+<A NAME="IDX633"></A>
 Display this help and exit.
 
 <DT><SAMP>`-V&acute;</SAMP>
 <DD>
 <DT><SAMP>`--version&acute;</SAMP>
 <DD>
-<A NAME="IDX633"></A>
 <A NAME="IDX634"></A>
+<A NAME="IDX635"></A>
 Output version information and exit.
 
 </DL>
@@ -1464,15 +1464,15 @@ Output version information and exit.
 <H2><A NAME="SEC99" HREF="gettext_toc.html#TOC99">7.7  Invoking the <CODE>msgcmp</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX635"></A>
 <A NAME="IDX636"></A>
+<A NAME="IDX637"></A>
 
 <PRE>
 msgcmp [<VAR>option</VAR>] <VAR>def</VAR>.po <VAR>ref</VAR>.pot
 </PRE>
 
 <P>
-<A NAME="IDX637"></A>
+<A NAME="IDX638"></A>
 The <CODE>msgcmp</CODE> program compares two Uniforum style .po files to check that
 both contain the same set of msgid strings.  The <VAR>def</VAR>.po file is an
 existing PO file with the translations.  The <VAR>ref</VAR>.pot file is the last
@@ -1500,8 +1500,8 @@ References to the sources.
 <DD>
 <DT><SAMP>`--directory=<VAR>directory</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX638"></A>
 <A NAME="IDX639"></A>
+<A NAME="IDX640"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.
 
@@ -1517,8 +1517,8 @@ searched relative to this list of directories.
 <DD>
 <DT><SAMP>`--multi-domain&acute;</SAMP>
 <DD>
-<A NAME="IDX640"></A>
 <A NAME="IDX641"></A>
+<A NAME="IDX642"></A>
 Apply <VAR>ref</VAR>.pot to each of the domains in <VAR>def</VAR>.po.
 
 </DL>
@@ -1533,16 +1533,16 @@ Apply <VAR>ref</VAR>.pot to each of the domains in <VAR>def</VAR>.po.
 <DD>
 <DT><SAMP>`--help&acute;</SAMP>
 <DD>
-<A NAME="IDX642"></A>
 <A NAME="IDX643"></A>
+<A NAME="IDX644"></A>
 Display this help and exit.
 
 <DT><SAMP>`-V&acute;</SAMP>
 <DD>
 <DT><SAMP>`--version&acute;</SAMP>
 <DD>
-<A NAME="IDX644"></A>
 <A NAME="IDX645"></A>
+<A NAME="IDX646"></A>
 Output version information and exit.
 
 </DL>
@@ -1552,16 +1552,16 @@ Output version information and exit.
 <H2><A NAME="SEC103" HREF="gettext_toc.html#TOC103">7.8  Invoking the <CODE>msgattrib</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX646"></A>
 <A NAME="IDX647"></A>
+<A NAME="IDX648"></A>
 
 <PRE>
 msgattrib [<VAR>option</VAR>] [<VAR>inputfile</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX648"></A>
 <A NAME="IDX649"></A>
+<A NAME="IDX650"></A>
 The <CODE>msgattrib</CODE> program filters the messages of a translation catalog
 according to their attributes, and manipulates the attributes.
 
@@ -1580,8 +1580,8 @@ Input PO file.
 <DD>
 <DT><SAMP>`--directory=<VAR>directory</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX650"></A>
 <A NAME="IDX651"></A>
+<A NAME="IDX652"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>`.po&acute;</TT>
 file will be written relative to the current directory, though.
@@ -1602,8 +1602,8 @@ If no <VAR>inputfile</VAR> is given or if it is <SAMP>`-&acute;</SAMP>, standard
 <DD>
 <DT><SAMP>`--output-file=<VAR>file</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX652"></A>
 <A NAME="IDX653"></A>
+<A NAME="IDX654"></A>
 Write output to specified file.
 
 </DL>
@@ -1621,32 +1621,32 @@ or if it is <SAMP>`-&acute;</SAMP>.
 
 <DT><SAMP>`--translated&acute;</SAMP>
 <DD>
-<A NAME="IDX654"></A>
+<A NAME="IDX655"></A>
 Keep translated messages, remove untranslated messages.
 
 <DT><SAMP>`--untranslated&acute;</SAMP>
 <DD>
-<A NAME="IDX655"></A>
+<A NAME="IDX656"></A>
 Keep untranslated messages, remove translated messages.
 
 <DT><SAMP>`--no-fuzzy&acute;</SAMP>
 <DD>
-<A NAME="IDX656"></A>
+<A NAME="IDX657"></A>
 Remove `fuzzy' marked messages.
 
 <DT><SAMP>`--only-fuzzy&acute;</SAMP>
 <DD>
-<A NAME="IDX657"></A>
+<A NAME="IDX658"></A>
 Keep `fuzzy' marked messages, remove all other messsages.
 
 <DT><SAMP>`--no-obsolete&acute;</SAMP>
 <DD>
-<A NAME="IDX658"></A>
+<A NAME="IDX659"></A>
 Remove obsolete #~ messages.
 
 <DT><SAMP>`--only-obsolete&acute;</SAMP>
 <DD>
-<A NAME="IDX659"></A>
+<A NAME="IDX660"></A>
 Keep obsolete #~ messages, remove all other messages.
 
 </DL>
@@ -1656,7 +1656,7 @@ Keep obsolete #~ messages, remove all other messages.
 <H3><A NAME="SEC107" HREF="gettext_toc.html#TOC107">7.8.4  Attribute manipulation</A></H3>
 
 <P>
-<A NAME="IDX660"></A>
+<A NAME="IDX661"></A>
 Attributes are modified after the message selection/removal has been
 performed.
 
@@ -1665,33 +1665,33 @@ performed.
 
 <DT><SAMP>`--set-fuzzy&acute;</SAMP>
 <DD>
-<A NAME="IDX661"></A>
+<A NAME="IDX662"></A>
 Set all messages `fuzzy'.
 
 <DT><SAMP>`--clear-fuzzy&acute;</SAMP>
 <DD>
-<A NAME="IDX662"></A>
+<A NAME="IDX663"></A>
 Set all messages non-`fuzzy'.
 
 <DT><SAMP>`--set-obsolete&acute;</SAMP>
 <DD>
-<A NAME="IDX663"></A>
+<A NAME="IDX664"></A>
 Set all messages obsolete.
 
 <DT><SAMP>`--clear-obsolete&acute;</SAMP>
 <DD>
-<A NAME="IDX664"></A>
+<A NAME="IDX665"></A>
 Set all messages non-obsolete.
 
 <DT><SAMP>`--fuzzy&acute;</SAMP>
 <DD>
-<A NAME="IDX665"></A>
+<A NAME="IDX666"></A>
 Synonym for <SAMP>`--only-fuzzy --clear-fuzzy&acute;</SAMP>: It keeps only the fuzzy
 messages and removes their `fuzzy' mark.
 
 <DT><SAMP>`--obsolete&acute;</SAMP>
 <DD>
-<A NAME="IDX666"></A>
+<A NAME="IDX667"></A>
 Synonym for <SAMP>`--only-obsolete --clear-obsolete&acute;</SAMP>: It keeps only the
 obsolete messages and makes them non-obsolete.
 
@@ -1705,33 +1705,33 @@ obsolete messages and makes them non-obsolete.
 
 <DT><SAMP>`--force-po&acute;</SAMP>
 <DD>
-<A NAME="IDX667"></A>
+<A NAME="IDX668"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>`-i&acute;</SAMP>
 <DD>
 <DT><SAMP>`--indent&acute;</SAMP>
 <DD>
-<A NAME="IDX668"></A>
 <A NAME="IDX669"></A>
+<A NAME="IDX670"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>`--no-location&acute;</SAMP>
 <DD>
-<A NAME="IDX670"></A>
+<A NAME="IDX671"></A>
 Do not write <SAMP>`#: <VAR>filename</VAR>:<VAR>line</VAR>&acute;</SAMP> lines.
 
 <DT><SAMP>`-n&acute;</SAMP>
 <DD>
 <DT><SAMP>`--add-location&acute;</SAMP>
 <DD>
-<A NAME="IDX671"></A>
 <A NAME="IDX672"></A>
+<A NAME="IDX673"></A>
 Generate <SAMP>`#: <VAR>filename</VAR>:<VAR>line</VAR>&acute;</SAMP> lines (default).
 
 <DT><SAMP>`--strict&acute;</SAMP>
 <DD>
-<A NAME="IDX673"></A>
+<A NAME="IDX674"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -1740,15 +1740,15 @@ GNU extensions.
 <DD>
 <DT><SAMP>`--width=<VAR>number</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX674"></A>
 <A NAME="IDX675"></A>
+<A NAME="IDX676"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>`--no-wrap&acute;</SAMP>
 <DD>
-<A NAME="IDX676"></A>
+<A NAME="IDX677"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -1757,8 +1757,8 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>`--sort-output&acute;</SAMP>
 <DD>
-<A NAME="IDX677"></A>
 <A NAME="IDX678"></A>
+<A NAME="IDX679"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -1766,8 +1766,8 @@ for the translator to understand each message's context.
 <DD>
 <DT><SAMP>`--sort-by-file&acute;</SAMP>
 <DD>
-<A NAME="IDX679"></A>
 <A NAME="IDX680"></A>
+<A NAME="IDX681"></A>
 Sort output by file location.
 
 </DL>
@@ -1782,16 +1782,16 @@ Sort output by file location.
 <DD>
 <DT><SAMP>`--help&acute;</SAMP>
 <DD>
-<A NAME="IDX681"></A>
 <A NAME="IDX682"></A>
+<A NAME="IDX683"></A>
 Display this help and exit.
 
 <DT><SAMP>`-V&acute;</SAMP>
 <DD>
 <DT><SAMP>`--version&acute;</SAMP>
 <DD>
-<A NAME="IDX683"></A>
 <A NAME="IDX684"></A>
+<A NAME="IDX685"></A>
 Output version information and exit.
 
 </DL>
@@ -1801,15 +1801,15 @@ Output version information and exit.
 <H2><A NAME="SEC110" HREF="gettext_toc.html#TOC110">7.9  Invoking the <CODE>msgen</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX685"></A>
 <A NAME="IDX686"></A>
+<A NAME="IDX687"></A>
 
 <PRE>
 msgen [<VAR>option</VAR>] <VAR>inputfile</VAR>
 </PRE>
 
 <P>
-<A NAME="IDX687"></A>
+<A NAME="IDX688"></A>
 The <CODE>msgen</CODE> program creates an English translation catalog.  The
 input file is the last created English PO file, or a PO Template file
 (generally created by xgettext).  Untranslated entries are assigned a
@@ -1836,8 +1836,8 @@ Input PO or POT file.
 <DD>
 <DT><SAMP>`--directory=<VAR>directory</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX688"></A>
 <A NAME="IDX689"></A>
+<A NAME="IDX690"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>`.po&acute;</TT>
 file will be written relative to the current directory, though.
@@ -1858,8 +1858,8 @@ If <VAR>inputfile</VAR> is <SAMP>`-&acute;</SAMP>, standard input is read.
 <DD>
 <DT><SAMP>`--output-file=<VAR>file</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX690"></A>
 <A NAME="IDX691"></A>
+<A NAME="IDX692"></A>
 Write output to specified file.
 
 </DL>
@@ -1877,30 +1877,30 @@ or if it is <SAMP>`-&acute;</SAMP>.
 
 <DT><SAMP>`--force-po&acute;</SAMP>
 <DD>
-<A NAME="IDX692"></A>
+<A NAME="IDX693"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>`-i&acute;</SAMP>
 <DD>
 <DT><SAMP>`--indent&acute;</SAMP>
 <DD>
-<A NAME="IDX693"></A>
 <A NAME="IDX694"></A>
+<A NAME="IDX695"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>`--no-location&acute;</SAMP>
 <DD>
-<A NAME="IDX695"></A>
+<A NAME="IDX696"></A>
 Do not write <SAMP>`#: <VAR>filename</VAR>:<VAR>line</VAR>&acute;</SAMP> lines.
 
 <DT><SAMP>`--add-location&acute;</SAMP>
 <DD>
-<A NAME="IDX696"></A>
+<A NAME="IDX697"></A>
 Generate <SAMP>`#: <VAR>filename</VAR>:<VAR>line</VAR>&acute;</SAMP> lines (default).
 
 <DT><SAMP>`--strict&acute;</SAMP>
 <DD>
-<A NAME="IDX697"></A>
+<A NAME="IDX698"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -1909,15 +1909,15 @@ GNU extensions.
 <DD>
 <DT><SAMP>`--width=<VAR>number</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX698"></A>
 <A NAME="IDX699"></A>
+<A NAME="IDX700"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>`--no-wrap&acute;</SAMP>
 <DD>
-<A NAME="IDX700"></A>
+<A NAME="IDX701"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -1926,8 +1926,8 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>`--sort-output&acute;</SAMP>
 <DD>
-<A NAME="IDX701"></A>
 <A NAME="IDX702"></A>
+<A NAME="IDX703"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -1935,8 +1935,8 @@ for the translator to understand each message's context.
 <DD>
 <DT><SAMP>`--sort-by-file&acute;</SAMP>
 <DD>
-<A NAME="IDX703"></A>
 <A NAME="IDX704"></A>
+<A NAME="IDX705"></A>
 Sort output by file location.
 
 </DL>
@@ -1951,16 +1951,16 @@ Sort output by file location.
 <DD>
 <DT><SAMP>`--help&acute;</SAMP>
 <DD>
-<A NAME="IDX705"></A>
 <A NAME="IDX706"></A>
+<A NAME="IDX707"></A>
 Display this help and exit.
 
 <DT><SAMP>`-V&acute;</SAMP>
 <DD>
 <DT><SAMP>`--version&acute;</SAMP>
 <DD>
-<A NAME="IDX707"></A>
 <A NAME="IDX708"></A>
+<A NAME="IDX709"></A>
 Output version information and exit.
 
 </DL>
@@ -1970,15 +1970,15 @@ Output version information and exit.
 <H2><A NAME="SEC115" HREF="gettext_toc.html#TOC115">7.10  Invoking the <CODE>msgexec</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX709"></A>
 <A NAME="IDX710"></A>
+<A NAME="IDX711"></A>
 
 <PRE>
 msgexec [<VAR>option</VAR>] <VAR>command</VAR> [<VAR>command-option</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX711"></A>
+<A NAME="IDX712"></A>
 The <CODE>msgexec</CODE> program applies a command to all translations of a
 translation catalog.
 The <VAR>command</VAR> can be any program that reads a translation from standard
@@ -1988,15 +1988,15 @@ across all invocations.
 
 </P>
 <P>
-<A NAME="IDX712"></A>
+<A NAME="IDX713"></A>
 A special builtin command called <SAMP>`0&acute;</SAMP> outputs the translation, followed
 by a null byte.  The output of <SAMP>`msgexec 0&acute;</SAMP> is suitable as input for
 <SAMP>`xargs -0&acute;</SAMP>.
 
 </P>
 <P>
-<A NAME="IDX713"></A>
 <A NAME="IDX714"></A>
+<A NAME="IDX715"></A>
 During each <VAR>command</VAR> invocation, the environment variable
 <CODE>MSGEXEC_MSGID</CODE> is bound to the message's msgid, and the environment
 variable <CODE>MSGEXEC_LOCATION</CODE> is bound to the location in the PO file
@@ -2004,7 +2004,7 @@ of the message.
 
 </P>
 <P>
-<A NAME="IDX715"></A>
+<A NAME="IDX716"></A>
 Note: It is your responsibility to ensure that the <VAR>command</VAR> can cope
 with input encoded in the translation catalog's encoding.  If the
 <VAR>command</VAR> wants input in a particular encoding, you can in a first step
@@ -2026,16 +2026,16 @@ locale, by using the <CODE>LC_ALL</CODE> environment variable.
 <DD>
 <DT><SAMP>`--input=<VAR>inputfile</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX716"></A>
 <A NAME="IDX717"></A>
+<A NAME="IDX718"></A>
 Input PO file.
 
 <DT><SAMP>`-D <VAR>directory</VAR>&acute;</SAMP>
 <DD>
 <DT><SAMP>`--directory=<VAR>directory</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX718"></A>
 <A NAME="IDX719"></A>
+<A NAME="IDX720"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>`.po&acute;</TT>
 file will be written relative to the current directory, though.
@@ -2056,16 +2056,16 @@ If no <VAR>inputfile</VAR> is given or if it is <SAMP>`-&acute;</SAMP>, standard
 <DD>
 <DT><SAMP>`--help&acute;</SAMP>
 <DD>
-<A NAME="IDX720"></A>
 <A NAME="IDX721"></A>
+<A NAME="IDX722"></A>
 Display this help and exit.
 
 <DT><SAMP>`-V&acute;</SAMP>
 <DD>
 <DT><SAMP>`--version&acute;</SAMP>
 <DD>
-<A NAME="IDX722"></A>
 <A NAME="IDX723"></A>
+<A NAME="IDX724"></A>
 Output version information and exit.
 
 </DL>
diff --git a/doc/gettext_8.html b/doc/gettext_8.html
index 5e369c4ac..766a69831 100644
--- a/doc/gettext_8.html
+++ b/doc/gettext_8.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - 8  Producing Binary MO Files</TITLE>
 </HEAD>
@@ -17,15 +17,15 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_7.html">previous<
 <H2><A NAME="SEC119" HREF="gettext_toc.html#TOC119">8.1  Invoking the <CODE>msgfmt</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX724"></A>
 <A NAME="IDX725"></A>
+<A NAME="IDX726"></A>
 
 <PRE>
 msgfmt [<VAR>option</VAR>] <VAR>filename</VAR>.po ...
 </PRE>
 
 <P>
-<A NAME="IDX726"></A>
+<A NAME="IDX727"></A>
 The <CODE>msgfmt</CODE> programs generates a binary message catalog from a textual
 translation description.
 
@@ -42,8 +42,8 @@ translation description.
 <DD>
 <DT><SAMP>`--directory=<VAR>directory</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX727"></A>
 <A NAME="IDX728"></A>
+<A NAME="IDX729"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>`.po&acute;</TT>
 file will be written relative to the current directory, though.
@@ -64,20 +64,20 @@ If an input file is <SAMP>`-&acute;</SAMP>, standard input is read.
 <DD>
 <DT><SAMP>`--java&acute;</SAMP>
 <DD>
-<A NAME="IDX729"></A>
 <A NAME="IDX730"></A>
 <A NAME="IDX731"></A>
+<A NAME="IDX732"></A>
 Java mode: generate a Java <CODE>ResourceBundle</CODE> class.
 
 <DT><SAMP>`--java2&acute;</SAMP>
 <DD>
-<A NAME="IDX732"></A>
+<A NAME="IDX733"></A>
 Like --java, and assume Java2 (JDK 1.2 or higher).
 
 <DT><SAMP>`--tcl&acute;</SAMP>
 <DD>
-<A NAME="IDX733"></A>
 <A NAME="IDX734"></A>
+<A NAME="IDX735"></A>
 Tcl mode: generate a tcl/msgcat <TT>`.msg&acute;</TT> file.
 
 </DL>
@@ -92,13 +92,13 @@ Tcl mode: generate a tcl/msgcat <TT>`.msg&acute;</TT> file.
 <DD>
 <DT><SAMP>`--output-file=<VAR>file</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX735"></A>
 <A NAME="IDX736"></A>
+<A NAME="IDX737"></A>
 Write output to specified file.
 
 <DT><SAMP>`--strict&acute;</SAMP>
 <DD>
-<A NAME="IDX737"></A>
+<A NAME="IDX738"></A>
 Direct the program to work strictly following the Uniforum/Sun
 implementation.  Currently this only affects the naming of the output
 file.  If this option is not given the name of the output file is the
@@ -125,22 +125,22 @@ If the output <VAR>file</VAR> is <SAMP>`-&acute;</SAMP>, output is written to st
 <DD>
 <DT><SAMP>`--resource=<VAR>resource</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX738"></A>
 <A NAME="IDX739"></A>
+<A NAME="IDX740"></A>
 Specify the resource name.
 
 <DT><SAMP>`-l <VAR>locale</VAR>&acute;</SAMP>
 <DD>
 <DT><SAMP>`--locale=<VAR>locale</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX740"></A>
 <A NAME="IDX741"></A>
+<A NAME="IDX742"></A>
 Specify the locale name, either a language specification of the form <VAR>ll</VAR>
 or a combined language and country specification of the form <VAR>ll_CC</VAR>.
 
 <DT><SAMP>`-d <VAR>directory</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX742"></A>
+<A NAME="IDX743"></A>
 Specify the base directory of classes directory hierarchy.
 
 </DL>
@@ -161,14 +161,14 @@ is written under the specified directory.
 <DD>
 <DT><SAMP>`--locale=<VAR>locale</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX743"></A>
 <A NAME="IDX744"></A>
+<A NAME="IDX745"></A>
 Specify the locale name, either a language specification of the form <VAR>ll</VAR>
 or a combined language and country specification of the form <VAR>ll_CC</VAR>.
 
 <DT><SAMP>`-d <VAR>directory</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX745"></A>
+<A NAME="IDX746"></A>
 Specify the base directory of <TT>`.msg&acute;</TT> message catalogs.
 
 </DL>
@@ -188,15 +188,15 @@ written in the specified directory.
 <DD>
 <DT><SAMP>`--check&acute;</SAMP>
 <DD>
-<A NAME="IDX746"></A>
 <A NAME="IDX747"></A>
+<A NAME="IDX748"></A>
 Perform all the checks implied by <CODE>--check-format</CODE>, <CODE>--check-header</CODE>,
 <CODE>--check-domain</CODE>.
 
 <DT><SAMP>`--check-format&acute;</SAMP>
 <DD>
-<A NAME="IDX748"></A>
 <A NAME="IDX749"></A>
+<A NAME="IDX750"></A>
 Check language dependent format strings.
 
 If the string represents a format string used in a
@@ -215,19 +215,19 @@ used in a <CODE>printf</CODE>-like function and so <CODE>msgfmt</CODE> might rep
 errors where there are none.
 
 To solve this problem the programmer can dictate the decision to the
-<CODE>xgettext</CODE> program (see section <A HREF="gettext_3.html#SEC18">3.5  Special Comments preceding Keywords</A>).  The translator should not
+<CODE>xgettext</CODE> program (see section <A HREF="gettext_13.html#SEC203">13.3.1  C Format Strings</A>).  The translator should not
 consider removing the flag from the <KBD>#,</KBD> line.  This "fix" would be
 reversed again as soon as <CODE>msgmerge</CODE> is called the next time.
 
 <DT><SAMP>`--check-header&acute;</SAMP>
 <DD>
-<A NAME="IDX750"></A>
+<A NAME="IDX751"></A>
 Verify presence and contents of the header entry.  See section <A HREF="gettext_5.html#SEC35">5.2  Filling in the Header Entry</A>,
 for a description of the various fields in the header entry.
 
 <DT><SAMP>`--check-domain&acute;</SAMP>
 <DD>
-<A NAME="IDX751"></A>
+<A NAME="IDX752"></A>
 Check for conflicts between domain directives and the <CODE>--output-file</CODE>
 option
 
@@ -235,18 +235,18 @@ option
 <DD>
 <DT><SAMP>`--check-compatibility&acute;</SAMP>
 <DD>
-<A NAME="IDX752"></A>
 <A NAME="IDX753"></A>
 <A NAME="IDX754"></A>
+<A NAME="IDX755"></A>
 Check that GNU msgfmt behaves like X/Open msgfmt.  This will give an error
 when attempting to use the GNU extensions.
 
 <DT><SAMP>`--check-accelerators[=<VAR>char</VAR>]&acute;</SAMP>
 <DD>
-<A NAME="IDX755"></A>
 <A NAME="IDX756"></A>
 <A NAME="IDX757"></A>
 <A NAME="IDX758"></A>
+<A NAME="IDX759"></A>
 Check presence of keyboard accelerators for menu items.  This is based on
 the convention used in some GUIs that a keyboard accelerator in a menu
 item string is designated by an immediately preceding <SAMP>`&#38;&acute;</SAMP> character.
@@ -261,9 +261,9 @@ instead of <SAMP>`&#38;&acute;</SAMP>.
 <DD>
 <DT><SAMP>`--use-fuzzy&acute;</SAMP>
 <DD>
-<A NAME="IDX759"></A>
 <A NAME="IDX760"></A>
 <A NAME="IDX761"></A>
+<A NAME="IDX762"></A>
 Use fuzzy entries in output.  Note that using this option is usually wrong,
 because fuzzy messages are exactly those which have not been validated by
 a human translator.
@@ -280,13 +280,13 @@ a human translator.
 <DD>
 <DT><SAMP>`--alignment=<VAR>number</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX762"></A>
 <A NAME="IDX763"></A>
+<A NAME="IDX764"></A>
 Align strings to <VAR>number</VAR> bytes (default: 1).
 
 <DT><SAMP>`--no-hash&acute;</SAMP>
 <DD>
-<A NAME="IDX764"></A>
+<A NAME="IDX765"></A>
 Don't include a hash table in the binary file.  Lookup will be more expensive
 at run time (binary search instead of hash table lookup).
 
@@ -302,29 +302,29 @@ at run time (binary search instead of hash table lookup).
 <DD>
 <DT><SAMP>`--help&acute;</SAMP>
 <DD>
-<A NAME="IDX765"></A>
 <A NAME="IDX766"></A>
+<A NAME="IDX767"></A>
 Display this help and exit.
 
 <DT><SAMP>`-V&acute;</SAMP>
 <DD>
 <DT><SAMP>`--version&acute;</SAMP>
 <DD>
-<A NAME="IDX767"></A>
 <A NAME="IDX768"></A>
+<A NAME="IDX769"></A>
 Output version information and exit.
 
 <DT><SAMP>`--statistics&acute;</SAMP>
 <DD>
-<A NAME="IDX769"></A>
+<A NAME="IDX770"></A>
 Print statistics about translations.
 
 <DT><SAMP>`-v&acute;</SAMP>
 <DD>
 <DT><SAMP>`--verbose&acute;</SAMP>
 <DD>
-<A NAME="IDX770"></A>
 <A NAME="IDX771"></A>
+<A NAME="IDX772"></A>
 Increase verbosity level.
 
 </DL>
@@ -334,15 +334,15 @@ Increase verbosity level.
 <H2><A NAME="SEC128" HREF="gettext_toc.html#TOC128">8.2  Invoking the <CODE>msgunfmt</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX772"></A>
 <A NAME="IDX773"></A>
+<A NAME="IDX774"></A>
 
 <PRE>
 msgunfmt [<VAR>option</VAR>] [<VAR>file</VAR>]...
 </PRE>
 
 <P>
-<A NAME="IDX774"></A>
+<A NAME="IDX775"></A>
 The <CODE>msgunfmt</CODE> program converts a binary message catalog to a
 Uniforum style .po file.
 
@@ -357,15 +357,15 @@ Uniforum style .po file.
 <DD>
 <DT><SAMP>`--java&acute;</SAMP>
 <DD>
-<A NAME="IDX775"></A>
 <A NAME="IDX776"></A>
 <A NAME="IDX777"></A>
+<A NAME="IDX778"></A>
 Java mode: input is a Java <CODE>ResourceBundle</CODE> class.
 
 <DT><SAMP>`--tcl&acute;</SAMP>
 <DD>
-<A NAME="IDX778"></A>
 <A NAME="IDX779"></A>
+<A NAME="IDX780"></A>
 Tcl mode: input is a tcl/msgcat <TT>`.msg&acute;</TT> file.
 
 </DL>
@@ -396,16 +396,16 @@ If no input <VAR>file</VAR> is given or if it is <SAMP>`-&acute;</SAMP>, standar
 <DD>
 <DT><SAMP>`--resource=<VAR>resource</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX780"></A>
 <A NAME="IDX781"></A>
+<A NAME="IDX782"></A>
 Specify the resource name.
 
 <DT><SAMP>`-l <VAR>locale</VAR>&acute;</SAMP>
 <DD>
 <DT><SAMP>`--locale=<VAR>locale</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX782"></A>
 <A NAME="IDX783"></A>
+<A NAME="IDX784"></A>
 Specify the locale name, either a language specification of the form <VAR>ll</VAR>
 or a combined language and country specification of the form <VAR>ll_CC</VAR>.
 
@@ -426,14 +426,14 @@ separated with an underscore.  The class is located using the <CODE>CLASSPATH</C
 <DD>
 <DT><SAMP>`--locale=<VAR>locale</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX784"></A>
 <A NAME="IDX785"></A>
+<A NAME="IDX786"></A>
 Specify the locale name, either a language specification of the form <VAR>ll</VAR>
 or a combined language and country specification of the form <VAR>ll_CC</VAR>.
 
 <DT><SAMP>`-d <VAR>directory</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX786"></A>
+<A NAME="IDX787"></A>
 Specify the base directory of <TT>`.msg&acute;</TT> message catalogs.
 
 </DL>
@@ -453,8 +453,8 @@ located in the specified directory.
 <DD>
 <DT><SAMP>`--output-file=<VAR>file</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX787"></A>
 <A NAME="IDX788"></A>
+<A NAME="IDX789"></A>
 Write output to specified file.
 
 </DL>
@@ -472,20 +472,20 @@ or if it is <SAMP>`-&acute;</SAMP>.
 
 <DT><SAMP>`--force-po&acute;</SAMP>
 <DD>
-<A NAME="IDX789"></A>
+<A NAME="IDX790"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>`-i&acute;</SAMP>
 <DD>
 <DT><SAMP>`--indent&acute;</SAMP>
 <DD>
-<A NAME="IDX790"></A>
 <A NAME="IDX791"></A>
+<A NAME="IDX792"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>`--strict&acute;</SAMP>
 <DD>
-<A NAME="IDX792"></A>
+<A NAME="IDX793"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -494,15 +494,15 @@ GNU extensions.
 <DD>
 <DT><SAMP>`--width=<VAR>number</VAR>&acute;</SAMP>
 <DD>
-<A NAME="IDX793"></A>
 <A NAME="IDX794"></A>
+<A NAME="IDX795"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>`--no-wrap&acute;</SAMP>
 <DD>
-<A NAME="IDX795"></A>
+<A NAME="IDX796"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -511,9 +511,9 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>`--sort-output&acute;</SAMP>
 <DD>
-<A NAME="IDX796"></A>
 <A NAME="IDX797"></A>
 <A NAME="IDX798"></A>
+<A NAME="IDX799"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -529,24 +529,24 @@ for the translator to understand each message's context.
 <DD>
 <DT><SAMP>`--help&acute;</SAMP>
 <DD>
-<A NAME="IDX799"></A>
 <A NAME="IDX800"></A>
+<A NAME="IDX801"></A>
 Display this help and exit.
 
 <DT><SAMP>`-V&acute;</SAMP>
 <DD>
 <DT><SAMP>`--version&acute;</SAMP>
 <DD>
-<A NAME="IDX801"></A>
 <A NAME="IDX802"></A>
+<A NAME="IDX803"></A>
 Output version information and exit.
 
 <DT><SAMP>`-v&acute;</SAMP>
 <DD>
 <DT><SAMP>`--verbose&acute;</SAMP>
 <DD>
-<A NAME="IDX803"></A>
 <A NAME="IDX804"></A>
+<A NAME="IDX805"></A>
 Increase verbosity level.
 
 </DL>
@@ -555,8 +555,8 @@ Increase verbosity level.
 
 <H2><A NAME="SEC136" HREF="gettext_toc.html#TOC136">8.3  The Format of GNU MO Files</A></H2>
 <P>
-<A NAME="IDX805"></A>
 <A NAME="IDX806"></A>
+<A NAME="IDX807"></A>
 
 </P>
 <P>
@@ -565,7 +565,7 @@ which appears below.
 
 </P>
 <P>
-<A NAME="IDX807"></A>
+<A NAME="IDX808"></A>
 The first two words serve the identification of the file.  The magic
 number will always signal GNU MO files.  The number is stored in the
 byte order of the generating machine, so the magic number really is
@@ -613,7 +613,7 @@ translated tables, making the system information very easy to find.
 
 </P>
 <P>
-<A NAME="IDX808"></A>
+<A NAME="IDX809"></A>
 The size <VAR>S</VAR> of the hash table can be zero.  In this case, the
 hash table itself is not contained in the MO file.  Some people might
 prefer this because a precomputed hashing table takes disk space, and
@@ -634,7 +634,7 @@ machines, a correct alignment will speed things up.
 
 </P>
 <P>
-<A NAME="IDX809"></A>
+<A NAME="IDX810"></A>
 Plural forms are stored by letting the plural of the original string
 follow the singular of the original string, separated through a
 <KBD>NUL</KBD> byte.  The length which appears in the string descriptor
diff --git a/doc/gettext_9.html b/doc/gettext_9.html
index 4f084b96c..452fdc9f6 100644
--- a/doc/gettext_9.html
+++ b/doc/gettext_9.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - 9  The User's View</TITLE>
 </HEAD>
@@ -45,9 +45,9 @@ for both installers and end users.
 
 <H2><A NAME="SEC138" HREF="gettext_toc.html#TOC138">9.1  The Current <TT>`ABOUT-NLS&acute;</TT> Matrix</A></H2>
 <P>
-<A NAME="IDX810"></A>
 <A NAME="IDX811"></A>
 <A NAME="IDX812"></A>
+<A NAME="IDX813"></A>
 
 </P>
 <P>
@@ -77,8 +77,8 @@ Translation Project sites, and also on most GNU archive sites.
 
 <H2><A NAME="SEC139" HREF="gettext_toc.html#TOC139">9.2  Magic for Installers</A></H2>
 <P>
-<A NAME="IDX813"></A>
 <A NAME="IDX814"></A>
+<A NAME="IDX815"></A>
 
 </P>
 <P>
@@ -97,7 +97,7 @@ produces programs totally unable to translate messages.
 
 </P>
 <P>
-<A NAME="IDX815"></A>
+<A NAME="IDX816"></A>
 Internationalized packages have usually many <TT>`<VAR>ll</VAR>.po&acute;</TT>
 files.  Unless
 translations are disabled, all those available are installed together
@@ -111,13 +111,13 @@ codes, stating which languages are allowed.
 
 <H2><A NAME="SEC140" HREF="gettext_toc.html#TOC140">9.3  Magic for End Users</A></H2>
 <P>
-<A NAME="IDX816"></A>
 <A NAME="IDX817"></A>
 <A NAME="IDX818"></A>
+<A NAME="IDX819"></A>
 
 </P>
 <P>
-<A NAME="IDX819"></A>
+<A NAME="IDX820"></A>
 We consider here those packages using GNU <CODE>gettext</CODE> internally,
 and for which the installers did not disable translation at
 <EM>configure</EM> time.  Then, users only have to set the <CODE>LANG</CODE>
diff --git a/doc/gettext_foot.html b/doc/gettext_foot.html
index 87ad64aa7..48b01a9fa 100644
--- a/doc/gettext_foot.html
+++ b/doc/gettext_foot.html
@@ -1,14 +1,14 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - Footnotes</TITLE>
 </HEAD>
 <BODY>
-<H1>GNU gettext tools, version 0.11.2</H1>
+<H1>GNU gettext tools, version 0.11.3</H1>
 <H2>Native Language Support Library and Tools</H2>
-<H2>Edition 0.11.2, 22 April 2002</H2>
+<H2>Edition 0.11.3, 14 June 2002</H2>
 <ADDRESS>Ulrich Drepper</ADDRESS>
 <ADDRESS>Jim Meyering</ADDRESS>
 <ADDRESS>Fran&ccedil;ois Pinard</ADDRESS>
@@ -36,7 +36,7 @@ variables.
 <P>Additions are welcome.  Send appropriate information to
 <A HREF="mailto:bug-glibc-manual@gnu.org">bug-glibc-manual@gnu.org</A>.
 <P><HR><P>
-This document was generated on 24 April 2002 using the
+This document was generated on 16 July 2002 using the
 <A HREF="http://wwwinfo.cern.ch/dis/texi2html/">texi2html</A>
 translator version 1.52a.</P>
 </BODY>
diff --git a/doc/gettext_toc.html b/doc/gettext_toc.html
index 803c04e2a..a6ea9e663 100644
--- a/doc/gettext_toc.html
+++ b/doc/gettext_toc.html
@@ -1,14 +1,14 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 24 April 2002 -->
+     from gettext.texi on 16 July 2002 -->
 
 <TITLE>GNU gettext utilities - Table of Contents</TITLE>
 </HEAD>
 <BODY>
-<H1>GNU gettext tools, version 0.11.2</H1>
+<H1>GNU gettext tools, version 0.11.3</H1>
 <H2>Native Language Support Library and Tools</H2>
-<H2>Edition 0.11.2, 22 April 2002</H2>
+<H2>Edition 0.11.3, 14 June 2002</H2>
 <ADDRESS>Ulrich Drepper</ADDRESS>
 <ADDRESS>Jim Meyering</ADDRESS>
 <ADDRESS>Fran&ccedil;ois Pinard</ADDRESS>
@@ -267,68 +267,94 @@
 <LI><A NAME="TOC179" HREF="gettext_12.html#SEC179">12.4.3  <TT>`Makefile&acute;</TT> pieces in <TT>`po/&acute;</TT></A>
 <LI><A NAME="TOC180" HREF="gettext_12.html#SEC180">12.4.4  <TT>`configure.in&acute;</TT> at top level</A>
 <LI><A NAME="TOC181" HREF="gettext_12.html#SEC181">12.4.5  <TT>`config.guess&acute;</TT>, <TT>`config.sub&acute;</TT> at top level</A>
-<LI><A NAME="TOC182" HREF="gettext_12.html#SEC182">12.4.6  <TT>`aclocal.m4&acute;</TT> at top level</A>
-<LI><A NAME="TOC183" HREF="gettext_12.html#SEC183">12.4.7  <TT>`acconfig.h&acute;</TT> at top level</A>
-<LI><A NAME="TOC184" HREF="gettext_12.html#SEC184">12.4.8  <TT>`Makefile.in&acute;</TT> at top level</A>
-<LI><A NAME="TOC185" HREF="gettext_12.html#SEC185">12.4.9  <TT>`Makefile.in&acute;</TT> in <TT>`src/&acute;</TT></A>
-<LI><A NAME="TOC186" HREF="gettext_12.html#SEC186">12.4.10  <TT>`gettext.h&acute;</TT> in <TT>`lib/&acute;</TT></A>
-</UL>
-<LI><A NAME="TOC187" HREF="gettext_12.html#SEC187">12.5  Autoconf macros for use in <TT>`configure.in&acute;</TT></A>
-<UL>
-<LI><A NAME="TOC188" HREF="gettext_12.html#SEC188">12.5.1  AM_GNU_GETTEXT in <TT>`gettext.m4&acute;</TT></A>
-<LI><A NAME="TOC189" HREF="gettext_12.html#SEC189">12.5.2  AM_ICONV in <TT>`iconv.m4&acute;</TT></A>
-</UL>
-</UL>
-<LI><A NAME="TOC190" HREF="gettext_13.html#SEC190">13  Other Programming Languages</A>
-<UL>
-<LI><A NAME="TOC191" HREF="gettext_13.html#SEC191">13.1  The Language Implementor's View</A>
-<LI><A NAME="TOC192" HREF="gettext_13.html#SEC192">13.2  The Programmer's View</A>
-<LI><A NAME="TOC193" HREF="gettext_13.html#SEC193">13.3  The Translator's View</A>
-<LI><A NAME="TOC194" HREF="gettext_13.html#SEC194">13.4  The Maintainer's View</A>
-<LI><A NAME="TOC195" HREF="gettext_13.html#SEC195">13.5  Individual Programming Languages</A>
-<UL>
-<LI><A NAME="TOC196" HREF="gettext_13.html#SEC196">13.5.1  C, C++, Objective C</A>
-<LI><A NAME="TOC197" HREF="gettext_13.html#SEC197">13.5.2  sh - Shell Script</A>
-<LI><A NAME="TOC198" HREF="gettext_13.html#SEC198">13.5.3  bash - Bourne-Again Shell Script</A>
-<LI><A NAME="TOC199" HREF="gettext_13.html#SEC199">13.5.4  Python</A>
-<LI><A NAME="TOC200" HREF="gettext_13.html#SEC200">13.5.5  GNU clisp - Common Lisp</A>
-<LI><A NAME="TOC201" HREF="gettext_13.html#SEC201">13.5.6  GNU clisp C sources</A>
-<LI><A NAME="TOC202" HREF="gettext_13.html#SEC202">13.5.7  Emacs Lisp</A>
-<LI><A NAME="TOC203" HREF="gettext_13.html#SEC203">13.5.8  librep</A>
-<LI><A NAME="TOC204" HREF="gettext_13.html#SEC204">13.5.9  GNU Smalltalk</A>
-<LI><A NAME="TOC205" HREF="gettext_13.html#SEC205">13.5.10  Java</A>
-<LI><A NAME="TOC206" HREF="gettext_13.html#SEC206">13.5.11  GNU awk</A>
-<LI><A NAME="TOC207" HREF="gettext_13.html#SEC207">13.5.12  Pascal - Free Pascal Compiler</A>
-<LI><A NAME="TOC208" HREF="gettext_13.html#SEC208">13.5.13  wxWindows library</A>
-<LI><A NAME="TOC209" HREF="gettext_13.html#SEC209">13.5.14  YCP - YaST2 scripting language</A>
-<LI><A NAME="TOC210" HREF="gettext_13.html#SEC210">13.5.15  Tcl - Tk's scripting language</A>
-<LI><A NAME="TOC211" HREF="gettext_13.html#SEC211">13.5.16  Perl</A>
-<LI><A NAME="TOC212" HREF="gettext_13.html#SEC212">13.5.17  PHP Hypertext Preprocessor</A>
-<LI><A NAME="TOC213" HREF="gettext_13.html#SEC213">13.5.18  Pike</A>
-</UL>
-<LI><A NAME="TOC214" HREF="gettext_13.html#SEC214">13.6  Internationalizable Data</A>
-<UL>
-<LI><A NAME="TOC215" HREF="gettext_13.html#SEC215">13.6.1  POT - Portable Object Template</A>
-<LI><A NAME="TOC216" HREF="gettext_13.html#SEC216">13.6.2  Resource String Table</A>
-<LI><A NAME="TOC217" HREF="gettext_13.html#SEC217">13.6.3  Glade - GNOME user interface description</A>
-</UL>
-</UL>
-<LI><A NAME="TOC218" HREF="gettext_14.html#SEC218">14  Concluding Remarks</A>
-<UL>
-<LI><A NAME="TOC219" HREF="gettext_14.html#SEC219">14.1  History of GNU <CODE>gettext</CODE></A>
-<LI><A NAME="TOC220" HREF="gettext_14.html#SEC220">14.2  Related Readings</A>
-</UL>
-<LI><A NAME="TOC221" HREF="gettext_15.html#SEC221">A  Language Codes</A>
-<LI><A NAME="TOC222" HREF="gettext_16.html#SEC222">B  Country Codes</A>
-<LI><A NAME="TOC223" HREF="gettext_17.html#SEC223">Program Index</A>
-<LI><A NAME="TOC224" HREF="gettext_18.html#SEC224">Option Index</A>
-<LI><A NAME="TOC225" HREF="gettext_19.html#SEC225">Variable Index</A>
-<LI><A NAME="TOC226" HREF="gettext_20.html#SEC226">PO Mode Index</A>
-<LI><A NAME="TOC227" HREF="gettext_21.html#SEC227">Autoconf Macro Index</A>
-<LI><A NAME="TOC228" HREF="gettext_22.html#SEC228">General Index</A>
+<LI><A NAME="TOC182" HREF="gettext_12.html#SEC182">12.4.6  <TT>`mkinstalldirs&acute;</TT> at top level</A>
+<LI><A NAME="TOC183" HREF="gettext_12.html#SEC183">12.4.7  <TT>`aclocal.m4&acute;</TT> at top level</A>
+<LI><A NAME="TOC184" HREF="gettext_12.html#SEC184">12.4.8  <TT>`acconfig.h&acute;</TT> at top level</A>
+<LI><A NAME="TOC185" HREF="gettext_12.html#SEC185">12.4.9  <TT>`config.h.in&acute;</TT> at top level</A>
+<LI><A NAME="TOC186" HREF="gettext_12.html#SEC186">12.4.10  <TT>`Makefile.in&acute;</TT> at top level</A>
+<LI><A NAME="TOC187" HREF="gettext_12.html#SEC187">12.4.11  <TT>`Makefile.in&acute;</TT> in <TT>`src/&acute;</TT></A>
+<LI><A NAME="TOC188" HREF="gettext_12.html#SEC188">12.4.12  <TT>`gettext.h&acute;</TT> in <TT>`lib/&acute;</TT></A>
+</UL>
+<LI><A NAME="TOC189" HREF="gettext_12.html#SEC189">12.5  Autoconf macros for use in <TT>`configure.in&acute;</TT></A>
+<UL>
+<LI><A NAME="TOC190" HREF="gettext_12.html#SEC190">12.5.1  AM_GNU_GETTEXT in <TT>`gettext.m4&acute;</TT></A>
+<LI><A NAME="TOC191" HREF="gettext_12.html#SEC191">12.5.2  AM_GNU_GETTEXT_VERSION in <TT>`gettext.m4&acute;</TT></A>
+<LI><A NAME="TOC192" HREF="gettext_12.html#SEC192">12.5.3  AM_ICONV in <TT>`iconv.m4&acute;</TT></A>
+</UL>
+<LI><A NAME="TOC193" HREF="gettext_12.html#SEC193">12.6  Integrating with CVS</A>
+<UL>
+<LI><A NAME="TOC194" HREF="gettext_12.html#SEC194">12.6.1  Avoiding version mismatch in distributed development</A>
+<LI><A NAME="TOC195" HREF="gettext_12.html#SEC195">12.6.2  Files to put under CVS version control</A>
+<LI><A NAME="TOC196" HREF="gettext_12.html#SEC196">12.6.3  Invoking the <CODE>autopoint</CODE> Program</A>
+<UL>
+<LI><A NAME="TOC197" HREF="gettext_12.html#SEC197">12.6.3.1  Options</A>
+<LI><A NAME="TOC198" HREF="gettext_12.html#SEC198">12.6.3.2  Informative output</A>
+</UL>
+</UL>
+</UL>
+<LI><A NAME="TOC199" HREF="gettext_13.html#SEC199">13  Other Programming Languages</A>
+<UL>
+<LI><A NAME="TOC200" HREF="gettext_13.html#SEC200">13.1  The Language Implementor's View</A>
+<LI><A NAME="TOC201" HREF="gettext_13.html#SEC201">13.2  The Programmer's View</A>
+<LI><A NAME="TOC202" HREF="gettext_13.html#SEC202">13.3  The Translator's View</A>
+<UL>
+<LI><A NAME="TOC203" HREF="gettext_13.html#SEC203">13.3.1  C Format Strings</A>
+<LI><A NAME="TOC204" HREF="gettext_13.html#SEC204">13.3.2  Python Format Strings</A>
+<LI><A NAME="TOC205" HREF="gettext_13.html#SEC205">13.3.3  Lisp Format Strings</A>
+<LI><A NAME="TOC206" HREF="gettext_13.html#SEC206">13.3.4  Emacs Lisp Format Strings</A>
+<LI><A NAME="TOC207" HREF="gettext_13.html#SEC207">13.3.5  librep Format Strings</A>
+<LI><A NAME="TOC208" HREF="gettext_13.html#SEC208">13.3.6  Smalltalk Format Strings</A>
+<LI><A NAME="TOC209" HREF="gettext_13.html#SEC209">13.3.7  Java Format Strings</A>
+<LI><A NAME="TOC210" HREF="gettext_13.html#SEC210">13.3.8  awk Format Strings</A>
+<LI><A NAME="TOC211" HREF="gettext_13.html#SEC211">13.3.9  Object Pascal Format Strings</A>
+<LI><A NAME="TOC212" HREF="gettext_13.html#SEC212">13.3.10  YCP Format Strings</A>
+<LI><A NAME="TOC213" HREF="gettext_13.html#SEC213">13.3.11  Tcl Format Strings</A>
+</UL>
+<LI><A NAME="TOC214" HREF="gettext_13.html#SEC214">13.4  The Maintainer's View</A>
+<LI><A NAME="TOC215" HREF="gettext_13.html#SEC215">13.5  Individual Programming Languages</A>
+<UL>
+<LI><A NAME="TOC216" HREF="gettext_13.html#SEC216">13.5.1  C, C++, Objective C</A>
+<LI><A NAME="TOC217" HREF="gettext_13.html#SEC217">13.5.2  sh - Shell Script</A>
+<LI><A NAME="TOC218" HREF="gettext_13.html#SEC218">13.5.3  bash - Bourne-Again Shell Script</A>
+<LI><A NAME="TOC219" HREF="gettext_13.html#SEC219">13.5.4  Python</A>
+<LI><A NAME="TOC220" HREF="gettext_13.html#SEC220">13.5.5  GNU clisp - Common Lisp</A>
+<LI><A NAME="TOC221" HREF="gettext_13.html#SEC221">13.5.6  GNU clisp C sources</A>
+<LI><A NAME="TOC222" HREF="gettext_13.html#SEC222">13.5.7  Emacs Lisp</A>
+<LI><A NAME="TOC223" HREF="gettext_13.html#SEC223">13.5.8  librep</A>
+<LI><A NAME="TOC224" HREF="gettext_13.html#SEC224">13.5.9  GNU Smalltalk</A>
+<LI><A NAME="TOC225" HREF="gettext_13.html#SEC225">13.5.10  Java</A>
+<LI><A NAME="TOC226" HREF="gettext_13.html#SEC226">13.5.11  GNU awk</A>
+<LI><A NAME="TOC227" HREF="gettext_13.html#SEC227">13.5.12  Pascal - Free Pascal Compiler</A>
+<LI><A NAME="TOC228" HREF="gettext_13.html#SEC228">13.5.13  wxWindows library</A>
+<LI><A NAME="TOC229" HREF="gettext_13.html#SEC229">13.5.14  YCP - YaST2 scripting language</A>
+<LI><A NAME="TOC230" HREF="gettext_13.html#SEC230">13.5.15  Tcl - Tk's scripting language</A>
+<LI><A NAME="TOC231" HREF="gettext_13.html#SEC231">13.5.16  Perl</A>
+<LI><A NAME="TOC232" HREF="gettext_13.html#SEC232">13.5.17  PHP Hypertext Preprocessor</A>
+<LI><A NAME="TOC233" HREF="gettext_13.html#SEC233">13.5.18  Pike</A>
+</UL>
+<LI><A NAME="TOC234" HREF="gettext_13.html#SEC234">13.6  Internationalizable Data</A>
+<UL>
+<LI><A NAME="TOC235" HREF="gettext_13.html#SEC235">13.6.1  POT - Portable Object Template</A>
+<LI><A NAME="TOC236" HREF="gettext_13.html#SEC236">13.6.2  Resource String Table</A>
+<LI><A NAME="TOC237" HREF="gettext_13.html#SEC237">13.6.3  Glade - GNOME user interface description</A>
+</UL>
+</UL>
+<LI><A NAME="TOC238" HREF="gettext_14.html#SEC238">14  Concluding Remarks</A>
+<UL>
+<LI><A NAME="TOC239" HREF="gettext_14.html#SEC239">14.1  History of GNU <CODE>gettext</CODE></A>
+<LI><A NAME="TOC240" HREF="gettext_14.html#SEC240">14.2  Related Readings</A>
+</UL>
+<LI><A NAME="TOC241" HREF="gettext_15.html#SEC241">A  Language Codes</A>
+<LI><A NAME="TOC242" HREF="gettext_16.html#SEC242">B  Country Codes</A>
+<LI><A NAME="TOC243" HREF="gettext_17.html#SEC243">Program Index</A>
+<LI><A NAME="TOC244" HREF="gettext_18.html#SEC244">Option Index</A>
+<LI><A NAME="TOC245" HREF="gettext_19.html#SEC245">Variable Index</A>
+<LI><A NAME="TOC246" HREF="gettext_20.html#SEC246">PO Mode Index</A>
+<LI><A NAME="TOC247" HREF="gettext_21.html#SEC247">Autoconf Macro Index</A>
+<LI><A NAME="TOC248" HREF="gettext_22.html#SEC248">General Index</A>
 </UL>
 <P><HR><P>
-This document was generated on 24 April 2002 using the
+This document was generated on 16 July 2002 using the
 <A HREF="http://wwwinfo.cern.ch/dis/texi2html/">texi2html</A>
 translator version 1.52a.</P>
 </BODY>
diff --git a/doc/version.texi b/doc/version.texi
index bcf990e62..fe2198159 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 22 April 2002
-@set UPDATED-MONTH April 2002
-@set EDITION 0.11.2
-@set VERSION 0.11.2
+@set UPDATED 14 June 2002
+@set UPDATED-MONTH June 2002
+@set EDITION 0.11.3
+@set VERSION 0.11.3
diff --git a/intl-java/Makefile.in b/intl-java/Makefile.in
index f1ab71fb2..d20787cd3 100644
--- a/intl-java/Makefile.in
+++ b/intl-java/Makefile.in
@@ -61,6 +61,7 @@ AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
 BUILDJAVA = @BUILDJAVA@
+BUILDJAVAEXE = @BUILDJAVAEXE@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -76,10 +77,13 @@ ECHO = @ECHO@
 EMACS = @EMACS@
 EXEEXT = @EXEEXT@
 GCC = @GCC@
+GCJ = @GCJ@
+GCJFLAGS = @GCJFLAGS@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 HAVE_GCJ = @HAVE_GCJ@
+HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
 HAVE_GIJ = @HAVE_GIJ@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
@@ -94,6 +98,7 @@ HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
 HAVE_JVIEW = @HAVE_JVIEW@
 HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
 HAVE_LIB = @HAVE_LIB@
+HAVE__BOOL = @HAVE__BOOL@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -144,6 +149,8 @@ JAR = @JAR@
 
 AUTOMAKE_OPTIONS = 1.2 gnits
 
+RM = rm -f
+
 jardir = $(datadir)/gettext
 docdir = $(prefix)/doc/@PACKAGE@
 htmldir = $(docdir)
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 588243fdd..8a0c04e72 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -61,6 +61,7 @@ AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
 BUILDJAVA = @BUILDJAVA@
+BUILDJAVAEXE = @BUILDJAVAEXE@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -76,10 +77,13 @@ ECHO = @ECHO@
 EMACS = @EMACS@
 EXEEXT = @EXEEXT@
 GCC = @GCC@
+GCJ = @GCJ@
+GCJFLAGS = @GCJFLAGS@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 HAVE_GCJ = @HAVE_GCJ@
+HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
 HAVE_GIJ = @HAVE_GIJ@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
@@ -94,6 +98,7 @@ HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
 HAVE_JVIEW = @HAVE_JVIEW@
 HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
 HAVE_LIB = @HAVE_LIB@
+HAVE__BOOL = @HAVE__BOOL@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -143,6 +148,8 @@ with_gnu_ld = @with_gnu_ld@
 
 AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
 
+RM = rm -f
+
 lib_LTLIBRARIES = libgettextlib.la
 
 
@@ -238,7 +245,7 @@ stdbool.h.in \
 gen-lbrkprop.c 3level.h Combining.txt
 
 
-DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
+DEFS = -DLIBDIR=\"$(libdir)\" -DEXEEXT=\"$(EXEEXT)\" @DEFS@
 INCLUDES = -I. -I$(srcdir) -I.. -I../intl -I$(top_srcdir)/intl
 
 DISTCLEANFILES = fnmatch.h
@@ -509,9 +516,14 @@ uninstall-am: uninstall-gettextsrcDATA uninstall-info-am \
 	uninstall-libLTLIBRARIES uninstall-local
 
 
+# No need to install libgettextlib.a.
+install-exec-am: install-exec-clean
+install-exec-clean:
+	$(RM) $(DESTDIR)$(libdir)/libgettextlib.a
+
 all-local c-ctype.lo execute.lo javacomp.lo javaexec.lo pipe-bidi.lo pipe-in.lo pipe-out.lo progname.lo tmpdir.lo wait-process.lo xerror.lo: @STDBOOL_H@
 stdbool.h: stdbool.h.in
-	cp $(srcdir)/stdbool.h.in stdbool.h
+	sed -e 's/@''HAVE__BOOL''@/@HAVE__BOOL@/g' < $(srcdir)/stdbool.h.in > stdbool.h
 
 # The following is needed in order to install a simple file in $(libdir)
 # which is shared with other installed packages. We use a list of referencing
diff --git a/libuniname/Makefile.in b/libuniname/Makefile.in
index bd9d9d7df..319e86cca 100644
--- a/libuniname/Makefile.in
+++ b/libuniname/Makefile.in
@@ -61,6 +61,7 @@ AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
 BUILDJAVA = @BUILDJAVA@
+BUILDJAVAEXE = @BUILDJAVAEXE@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -76,10 +77,13 @@ ECHO = @ECHO@
 EMACS = @EMACS@
 EXEEXT = @EXEEXT@
 GCC = @GCC@
+GCJ = @GCJ@
+GCJFLAGS = @GCJFLAGS@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 HAVE_GCJ = @HAVE_GCJ@
+HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
 HAVE_GIJ = @HAVE_GIJ@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
@@ -94,6 +98,7 @@ HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
 HAVE_JVIEW = @HAVE_JVIEW@
 HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
 HAVE_LIB = @HAVE_LIB@
+HAVE__BOOL = @HAVE__BOOL@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 1e43d54d4..531e65cc3 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -61,6 +61,7 @@ AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
 BUILDJAVA = @BUILDJAVA@
+BUILDJAVAEXE = @BUILDJAVAEXE@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -76,10 +77,13 @@ ECHO = @ECHO@
 EMACS = @EMACS@
 EXEEXT = @EXEEXT@
 GCC = @GCC@
+GCJ = @GCJ@
+GCJFLAGS = @GCJFLAGS@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 HAVE_GCJ = @HAVE_GCJ@
+HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
 HAVE_GIJ = @HAVE_GIJ@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
@@ -94,6 +98,7 @@ HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
 HAVE_JVIEW = @HAVE_JVIEW@
 HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
 HAVE_LIB = @HAVE_LIB@
+HAVE__BOOL = @HAVE__BOOL@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -141,18 +146,19 @@ lispdir = @lispdir@
 with_gnu_ld = @with_gnu_ld@
 
 aclocaldir = @aclocaldir@
-aclocal_DATA = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lcmessage.m4 progtest.m4
+aclocal_DATA = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 isc-posix.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lcmessage.m4 progtest.m4
 
 # Generate this list with
 # find . -type f -name '*.m4' -printf '%f\n'|sort |fmt |tr '\012' @ \
 #   |sed 's/@$/%/;s/@/ \\@/g' |tr @% '\012\012'
 EXTRA_DIST = README \
-backupfile.m4 c-bs-a.m4 codeset.m4 error.m4 flex.m4 fnmatch.m4 getline.m4 \
-gettext.m4 glibc21.m4 hostname.m4 iconv.m4 inttypes_h.m4 isc-posix.m4 \
-javacomp.m4 javaexec.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
-libtool.m4 mbrtowc.m4 mbstate_t.m4 mbswidth.m4 mkdtemp.m4 progtest.m4 \
-setenv.m4 setlocale.m4 siginfo.m4 signalblocking.m4 signed.m4 ssize_t.m4 \
-stdbool.m4 stdint_h.m4 tmpdir.m4 uintmax_t.m4 ulonglong.m4 unionwait.m4
+backupfile.m4 c-bs-a.m4 codeset.m4 error.m4 flex.m4 fnmatch.m4 gcj.m4 \
+getline.m4 gettext.m4 glibc21.m4 hostname.m4 iconv.m4 intdiv0.m4 \
+inttypes_h.m4 isc-posix.m4 javacomp.m4 javaexec.m4 lcmessage.m4 lib-ld.m4 \
+lib-link.m4 lib-prefix.m4 libtool.m4 mbrtowc.m4 mbstate_t.m4 mbswidth.m4 \
+mkdtemp.m4 progtest.m4 setenv.m4 setlocale.m4 siginfo.m4 signalblocking.m4 \
+signed.m4 ssize_t.m4 stdbool.m4 stdint_h.m4 tmpdir.m4 uintmax_t.m4 \
+ulonglong.m4 unionwait.m4
 
 subdir = m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/man/Makefile.in b/man/Makefile.in
index b4e152feb..98d5c4a87 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -60,6 +60,7 @@ AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
 BUILDJAVA = @BUILDJAVA@
+BUILDJAVAEXE = @BUILDJAVAEXE@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -75,10 +76,13 @@ ECHO = @ECHO@
 EMACS = @EMACS@
 EXEEXT = @EXEEXT@
 GCC = @GCC@
+GCJ = @GCJ@
+GCJFLAGS = @GCJFLAGS@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 HAVE_GCJ = @HAVE_GCJ@
+HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
 HAVE_GIJ = @HAVE_GIJ@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
@@ -93,6 +97,7 @@ HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
 HAVE_JVIEW = @HAVE_JVIEW@
 HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
 HAVE_LIB = @HAVE_LIB@
+HAVE__BOOL = @HAVE__BOOL@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -150,10 +155,12 @@ localedir = $(datadir)/locale
 AUTOMAKE_OPTIONS = 1.2 gnits
 
 
-# A manual page for each of the bin_PROGRAMS in src/Makefile.am.
+# A manual page for each of the bin_PROGRAMS in src/Makefile.am
+# and for each of the bin_SCRIPTS in misc/Makefile.am.
 man_aux = gettext.x ngettext.x \
 msgcmp.x msgfmt.x msgmerge.x msgunfmt.x xgettext.x \
-msgattrib.x msgcat.x msgcomm.x msgconv.x msgen.x msgexec.x msgfilter.x msggrep.x msginit.x msguniq.x
+msgattrib.x msgcat.x msgcomm.x msgconv.x msgen.x msgexec.x msgfilter.x msggrep.x msginit.x msguniq.x \
+gettextize.x autopoint.x
 
 
 
@@ -162,7 +169,8 @@ man_MAN1GEN = gettext.1 ngettext.1
 man_MAN1IN = gettext.1.in ngettext.1.in
 man_MAN1OTHER = \
 msgcmp.1 msgfmt.1 msgmerge.1 msgunfmt.1 xgettext.1 \
-msgattrib.1 msgcat.1 msgcomm.1 msgconv.1 msgen.1 msgexec.1 msgfilter.1 msggrep.1 msginit.1 msguniq.1
+msgattrib.1 msgcat.1 msgcomm.1 msgconv.1 msgen.1 msgexec.1 msgfilter.1 msggrep.1 msginit.1 msguniq.1 \
+gettextize.1 autopoint.1
 
 man_MAN1 = $(man_MAN1GEN) $(man_MAN1OTHER)
 man_MAN3 = gettext.3 ngettext.3 \
@@ -179,6 +187,7 @@ man_HTMLIN = gettext.1.html.in ngettext.1.html.in
 man_HTMLOTHER = \
 msgcmp.1.html msgfmt.1.html msgmerge.1.html msgunfmt.1.html xgettext.1.html \
 msgattrib.1.html msgcat.1.html msgcomm.1.html msgconv.1.html msgen.1.html msgexec.1.html msgfilter.1.html msggrep.1.html msginit.1.html msguniq.1.html \
+gettextize.1.html autopoint.1.html \
 gettext.3.html ngettext.3.html \
 textdomain.3.html bindtextdomain.3.html bind_textdomain_codeset.3.html
 
@@ -465,6 +474,11 @@ msginit.1: msginit.x
 msguniq.1: msguniq.x
 	$(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msguniq$(EXEEXT) $(srcdir)/msguniq.x msguniq.1
 
+gettextize.1: gettextize.x
+	$(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../misc/gettextize $(srcdir)/gettextize.x gettextize.1
+autopoint.1: autopoint.x
+	$(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../misc/autopoint $(srcdir)/autopoint.x autopoint.1
+
 # Depend on configure.in to get version number changes.
 $(man_MAN1): help2man $(top_srcdir)/configure.in
 
@@ -547,6 +561,12 @@ msginit.1.html: msginit.1
 msguniq.1.html: msguniq.1
 	$(MAN2HTML) `if test -f msguniq.1; then echo .; else echo $(srcdir); fi`/msguniq.1 | sed -e '/CreationDate:/d' > t-$@
 	mv t-$@ $@
+gettextize.1.html: gettextize.1
+	$(MAN2HTML) `if test -f gettextize.1; then echo .; else echo $(srcdir); fi`/gettextize.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
+autopoint.1.html: autopoint.1
+	$(MAN2HTML) `if test -f autopoint.1; then echo .; else echo $(srcdir); fi`/autopoint.1 | sed -e '/CreationDate:/d' > t-$@
+	mv t-$@ $@
 gettext.3.html: gettext.3.in
 	$(MAN2HTML) $(srcdir)/gettext.3.in | sed -e '/CreationDate:/d' > t-$@
 	mv t-$@ $@
diff --git a/man/bind_textdomain_codeset.3 b/man/bind_textdomain_codeset.3
index 37cf23231..d60d06a74 100644
--- a/man/bind_textdomain_codeset.3
+++ b/man/bind_textdomain_codeset.3
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH BIND_TEXTDOMAIN_CODESET 3 "May 2001" "GNU gettext 0.11.2"
+.TH BIND_TEXTDOMAIN_CODESET 3 "May 2001" "GNU gettext 0.11.3"
 .SH NAME
 bind_textdomain_codeset \- set encoding of message translations
 .SH SYNOPSIS
diff --git a/man/bindtextdomain.3 b/man/bindtextdomain.3
index ad617a983..dcc7a5513 100644
--- a/man/bindtextdomain.3
+++ b/man/bindtextdomain.3
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH BINDTEXTDOMAIN 3 "May 2001" "GNU gettext 0.11.2"
+.TH BINDTEXTDOMAIN 3 "May 2001" "GNU gettext 0.11.3"
 .SH NAME
 bindtextdomain \- set directory containing message catalogs
 .SH SYNOPSIS
diff --git a/man/gettext.3 b/man/gettext.3
index 391bcc4a6..0ee2b61bd 100644
--- a/man/gettext.3
+++ b/man/gettext.3
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH GETTEXT 3 "May 2001" "GNU gettext 0.11.2"
+.TH GETTEXT 3 "May 2001" "GNU gettext 0.11.3"
 .SH NAME
 gettext, dgettext, dcgettext \- translate message
 .SH SYNOPSIS
diff --git a/man/msgattrib.1 b/man/msgattrib.1
index 75d04e449..dae996cf1 100644
--- a/man/msgattrib.1
+++ b/man/msgattrib.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGATTRIB "1" "April 2002" "GNU gettext 0.11.2" GNU
+.TH MSGATTRIB "1" "July 2002" "GNU gettext 0.11.3" GNU
 .SH NAME
 msgattrib \- attribute matching and manipulation on message catalog
 .SH SYNOPSIS
diff --git a/man/msgcat.1 b/man/msgcat.1
index ccdac593b..90ad0a3e6 100644
--- a/man/msgcat.1
+++ b/man/msgcat.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCAT "1" "April 2002" "GNU gettext 0.11.2" GNU
+.TH MSGCAT "1" "July 2002" "GNU gettext 0.11.3" GNU
 .SH NAME
 msgcat \- combines several message catalogs
 .SH SYNOPSIS
diff --git a/man/msgcmp.1 b/man/msgcmp.1
index 14bacd7fe..7bf05c711 100644
--- a/man/msgcmp.1
+++ b/man/msgcmp.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCMP "1" "April 2002" "GNU gettext 0.11.2" GNU
+.TH MSGCMP "1" "July 2002" "GNU gettext 0.11.3" GNU
 .SH NAME
 msgcmp \- compare message catalog and template
 .SH SYNOPSIS
diff --git a/man/msgcomm.1 b/man/msgcomm.1
index f8ff982a9..ab4dbba77 100644
--- a/man/msgcomm.1
+++ b/man/msgcomm.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCOMM "1" "April 2002" "GNU gettext 0.11.2" GNU
+.TH MSGCOMM "1" "July 2002" "GNU gettext 0.11.3" GNU
 .SH NAME
 msgcomm \- match two message catalogs
 .SH SYNOPSIS
diff --git a/man/msgconv.1 b/man/msgconv.1
index 3fa679191..cce2943b4 100644
--- a/man/msgconv.1
+++ b/man/msgconv.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCONV "1" "April 2002" "GNU gettext 0.11.2" GNU
+.TH MSGCONV "1" "July 2002" "GNU gettext 0.11.3" GNU
 .SH NAME
 msgconv \- character set conversion for message catalog
 .SH SYNOPSIS
diff --git a/man/msgen.1 b/man/msgen.1
index a15ee3ff5..eb9c39912 100644
--- a/man/msgen.1
+++ b/man/msgen.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGEN "1" "April 2002" "GNU gettext 0.11.2" GNU
+.TH MSGEN "1" "July 2002" "GNU gettext 0.11.3" GNU
 .SH NAME
 msgen \- create English message catalog
 .SH SYNOPSIS
diff --git a/man/msgexec.1 b/man/msgexec.1
index 75b9a3be3..ab5008af5 100644
--- a/man/msgexec.1
+++ b/man/msgexec.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGEXEC "1" "April 2002" "GNU gettext 0.11.2" GNU
+.TH MSGEXEC "1" "July 2002" "GNU gettext 0.11.3" GNU
 .SH NAME
 msgexec \- process translations of message catalog
 .SH SYNOPSIS
diff --git a/man/msgfilter.1 b/man/msgfilter.1
index d04bd4edb..fe865869c 100644
--- a/man/msgfilter.1
+++ b/man/msgfilter.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGFILTER "1" "April 2002" "GNU gettext 0.11.2" GNU
+.TH MSGFILTER "1" "July 2002" "GNU gettext 0.11.3" GNU
 .SH NAME
 msgfilter \- edit translations of message catalog
 .SH SYNOPSIS
diff --git a/man/msgfmt.1 b/man/msgfmt.1
index 4d6a11ea9..77bd3932c 100644
--- a/man/msgfmt.1
+++ b/man/msgfmt.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGFMT "1" "April 2002" "GNU gettext 0.11.2" GNU
+.TH MSGFMT "1" "July 2002" "GNU gettext 0.11.3" GNU
 .SH NAME
 msgfmt \- compile message catalog to binary format
 .SH SYNOPSIS
diff --git a/man/msggrep.1 b/man/msggrep.1
index 85056778f..c86f4e10b 100644
--- a/man/msggrep.1
+++ b/man/msggrep.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGGREP "1" "April 2002" "GNU gettext 0.11.2" GNU
+.TH MSGGREP "1" "July 2002" "GNU gettext 0.11.3" GNU
 .SH NAME
 msggrep \- pattern matching on message catalog
 .SH SYNOPSIS
diff --git a/man/msginit.1 b/man/msginit.1
index d1b708644..9a9317be3 100644
--- a/man/msginit.1
+++ b/man/msginit.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGINIT "1" "April 2002" "GNU gettext 0.11.2" GNU
+.TH MSGINIT "1" "July 2002" "GNU gettext 0.11.3" GNU
 .SH NAME
 msginit \- initialize a message catalog
 .SH SYNOPSIS
diff --git a/man/msgmerge.1 b/man/msgmerge.1
index 93dace9f2..5746fe928 100644
--- a/man/msgmerge.1
+++ b/man/msgmerge.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGMERGE "1" "April 2002" "GNU gettext 0.11.2" GNU
+.TH MSGMERGE "1" "July 2002" "GNU gettext 0.11.3" GNU
 .SH NAME
 msgmerge \- merge message catalog and template
 .SH SYNOPSIS
diff --git a/man/msgunfmt.1 b/man/msgunfmt.1
index ed83754af..5a5093be2 100644
--- a/man/msgunfmt.1
+++ b/man/msgunfmt.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGUNFMT "1" "April 2002" "GNU gettext 0.11.2" GNU
+.TH MSGUNFMT "1" "July 2002" "GNU gettext 0.11.3" GNU
 .SH NAME
 msgunfmt \- uncompile message catalog from binary format
 .SH SYNOPSIS
diff --git a/man/msguniq.1 b/man/msguniq.1
index cab6ddd0e..0cfdf5f67 100644
--- a/man/msguniq.1
+++ b/man/msguniq.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGUNIQ "1" "April 2002" "GNU gettext 0.11.2" GNU
+.TH MSGUNIQ "1" "July 2002" "GNU gettext 0.11.3" GNU
 .SH NAME
 msguniq \- unify duplicate translations in message catalog
 .SH SYNOPSIS
diff --git a/man/ngettext.3 b/man/ngettext.3
index b0f204422..e8af633ea 100644
--- a/man/ngettext.3
+++ b/man/ngettext.3
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH NGETTEXT 3 "May 2001" "GNU gettext 0.11.2"
+.TH NGETTEXT 3 "May 2001" "GNU gettext 0.11.3"
 .SH NAME
 ngettext, dngettext, dcngettext \- translate message and choose plural form
 .SH SYNOPSIS
diff --git a/man/textdomain.3 b/man/textdomain.3
index 141ca93e3..0102a6848 100644
--- a/man/textdomain.3
+++ b/man/textdomain.3
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH TEXTDOMAIN 3 "May 2001" "GNU gettext 0.11.2"
+.TH TEXTDOMAIN 3 "May 2001" "GNU gettext 0.11.3"
 .SH NAME
 textdomain \- set domain for future gettext() calls
 .SH SYNOPSIS
diff --git a/man/xgettext.1 b/man/xgettext.1
index c518e0167..b1902d2dd 100644
--- a/man/xgettext.1
+++ b/man/xgettext.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH XGETTEXT "1" "April 2002" "GNU gettext 0.11.2" GNU
+.TH XGETTEXT "1" "July 2002" "GNU gettext 0.11.3" GNU
 .SH NAME
 xgettext \- extract gettext strings from source
 .SH SYNOPSIS
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 17d24e248..343863769 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -61,6 +61,7 @@ AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
 BUILDJAVA = @BUILDJAVA@
+BUILDJAVAEXE = @BUILDJAVAEXE@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -76,10 +77,13 @@ ECHO = @ECHO@
 EMACS = @EMACS@
 EXEEXT = @EXEEXT@
 GCC = @GCC@
+GCJ = @GCJ@
+GCJFLAGS = @GCJFLAGS@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 HAVE_GCJ = @HAVE_GCJ@
+HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
 HAVE_GIJ = @HAVE_GIJ@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
@@ -94,6 +98,7 @@ HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
 HAVE_JVIEW = @HAVE_JVIEW@
 HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
 HAVE_LIB = @HAVE_LIB@
+HAVE__BOOL = @HAVE__BOOL@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -143,22 +148,27 @@ with_gnu_ld = @with_gnu_ld@
 
 AUTOMAKE_OPTIONS = 1.2 gnits
 
-EXTRA_DIST = gettext.perl gettext-sh tcl_gettext.c README-Tcl po-mode.el
-DISTCLEANFILES = gettextize
+EXTRA_DIST = gettext.perl gettext-sh tcl_gettext.c README-Tcl add-to-autopoint-files archive.tar.gz $(lisp_LISP)
+DISTCLEANFILES = gettextize autopoint
 lisp_LISP = po-mode.el po-compat.el
 
-bin_SCRIPTS = gettextize
+bin_SCRIPTS = gettextize autopoint
+
+gettextsrcdir = $(datadir)/gettext
+gettextsrc_DATA = archive.tar.gz
 subdir = misc
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = gettextize
+CONFIG_CLEAN_FILES = gettextize autopoint
 SCRIPTS = $(bin_SCRIPTS)
 
 DIST_SOURCES =
 LISP = $(lisp_LISP)
 
 ELCFILES = po-compat.elc po-mode.elc
-DIST_COMMON = ChangeLog Makefile.am Makefile.in elisp-comp \
+DATA = $(gettextsrc_DATA)
+
+DIST_COMMON = ChangeLog Makefile.am Makefile.in autopoint.in elisp-comp \
 	gettextize.in
 all: all-am
 
@@ -182,6 +192,8 @@ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 gettextize: $(top_builddir)/config.status gettextize.in
 	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
+autopoint: $(top_builddir)/config.status autopoint.in
+	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -241,6 +253,23 @@ uninstall-lispLISP:
 
 clean-lisp:
 	-test -z "$(ELCFILES)" || rm -f $(ELCFILES)
+install-gettextsrcDATA: $(gettextsrc_DATA)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(gettextsrcdir)
+	@list='$(gettextsrc_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gettextsrcdir)/$$f"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gettextsrcdir)/$$f; \
+	done
+
+uninstall-gettextsrcDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(gettextsrc_DATA)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f $(DESTDIR)$(gettextsrcdir)/$$f"; \
+	  rm -f $(DESTDIR)$(gettextsrcdir)/$$f; \
+	done
 tags: TAGS
 TAGS:
 
@@ -268,10 +297,10 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(SCRIPTS) $(LISP) $(ELCFILES)
+all-am: Makefile $(SCRIPTS) $(LISP) $(ELCFILES) $(DATA)
 
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(lispdir)
+	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(lispdir) $(DESTDIR)$(gettextsrcdir)
 
 install: install-am
 install-exec: install-exec-am
@@ -313,7 +342,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-lispLISP
+install-data-am: install-gettextsrcDATA install-lispLISP
 
 install-exec-am: install-binSCRIPTS
 
@@ -331,19 +360,23 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
-uninstall-am: uninstall-binSCRIPTS uninstall-info-am uninstall-lispLISP
+uninstall-am: uninstall-binSCRIPTS uninstall-gettextsrcDATA \
+	uninstall-info-am uninstall-lispLISP
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	clean-lisp distclean distclean-generic distclean-libtool \
 	distdir dvi dvi-am info info-am install install-am \
 	install-binSCRIPTS install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-lispLISP \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool uninstall \
-	uninstall-am uninstall-binSCRIPTS uninstall-info-am \
-	uninstall-lispLISP
+	install-exec-am install-gettextsrcDATA install-info \
+	install-info-am install-lispLISP install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool uninstall uninstall-am uninstall-binSCRIPTS \
+	uninstall-gettextsrcDATA uninstall-info-am uninstall-lispLISP
+
 
+archive.tar.gz:
+	(cd autopoint-files && tar cf - --owner=root --group=root `find archive -type f | grep -v /CVS/`) | gzip -c -9 > $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/po/be.po b/po/be.po
index 0eb9c4920..11b3bda15 100644
--- a/po/be.po
+++ b/po/be.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.2\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2002-04-27 14:00+0200\n"
 "Last-Translator: Ales Nyakhaychyk <nyakhaychyk@i18n.linux.by>\n"
 "Language-Team: Belarusian <i18n@tut.by>\n"
@@ -29,8 +29,8 @@ msgstr "неадназначны аргумент \"%s\" для \"%s\""
 msgid "Valid arguments are:"
 msgstr "Рэчаісныя аргументы:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "памылка ў час чытаньня файла \"%s\""
@@ -121,11 +121,11 @@ msgstr "%s: выбар `-W %s' неадназначны\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: выбар `-W %s' не патрабуе аргументаў\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Java кампілятар ня знойдзен, паспрабуйце ўсталяваць gcj ці $JAVAC"
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Віртуальная Java-машына ня знойдзена, паспрабуйце ўсталяваць gij ці $JAVA"
@@ -239,7 +239,7 @@ msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr ""
 
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -255,7 +255,7 @@ msgstr ""
 "пагадненьня аб распаўсюджваньні. Не йснуе НІЯКАЙ гарантыі; нават аб\n"
 "магчымасьці выкарыстньня зь якой небудзь мэтай.\n"
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -264,7 +264,7 @@ msgstr ""
 msgid "Written by %s.\n"
 msgstr "Аўтар %s.\n"
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "вельмі шмат аргументаў"
 
@@ -272,11 +272,11 @@ msgstr "вельмі шмат аргументаў"
 msgid "missing arguments"
 msgstr "прапушчаны аргументы"
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Паспрабуйце \"%s --help\" для больш падрабязных зьвестак.\n"
@@ -330,25 +330,25 @@ msgstr ""
 "паведамленьняў знаходзіць у азначаным каталёгу перакладзеныя.\n"
 "Стандартная дырэкторыя для пошуку: %s\n"
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Паведамляйце аб памылках на адрас <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР]\n"
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr "Друкуе назву вузла.\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -358,7 +358,7 @@ msgid ""
 "  -i, --ip-address      addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -371,7 +371,7 @@ msgstr ""
 "  -h, --help                  адлюстроўвае дапамогу й выходзіць\n"
 "  -V, --version               выводзіць зьвесткі аб версіі й выходзіць\n"
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr "немагчыма атрымаць назву вузла"
 
@@ -391,7 +391,7 @@ msgstr "па большай частцы адзін уваходзячы фай
 msgid "%s and %s are mutually exclusive"
 msgstr "%s і %s узаема выключны"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]\n"
@@ -404,14 +404,14 @@ msgid ""
 msgstr ""
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "Аргументы, абавязковыя для доўгіх выбараў, абавязковы й для кароткіх.\n"
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -425,7 +425,7 @@ msgstr ""
 "                              файлаў\n"
 "Калі ўваходзячы файл не зададзен, ці замест яго -, чытае стандартны ўвод.\n"
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -517,7 +517,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "зададзен немагчымы крытэрый выбару (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]...\n"
@@ -536,7 +536,7 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -610,7 +610,7 @@ msgstr ""
 "  -s, --sort-output           ствараць упарадкаваны вывад\n"
 "  -F, --sort-by-file          упарадкоўваць вывад па месцазнаходжаньню файла\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -678,18 +678,18 @@ msgstr "гэта паведамленьне выкарыстоўваецца, а
 msgid "warning: this message is not used"
 msgstr "увага: гэта паведамленьне не выкарыстоўваецца"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "двайное вызначэньне паведамленьня"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...гэта месцазнаходжаньне першага вызначэньня"
 
@@ -760,12 +760,12 @@ msgstr ""
 "  -s, --sort-output           ствараць упарадкаваны вывад\n"
 "  -F, --sort-by-file          упарадкоўваць вывад па месцазнаходжаньню файла\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Пераўтварае каталёг з перакладамі ў розныя сімвальныя кадзіроўкі.\n"
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -773,7 +773,7 @@ msgid ""
 "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -1112,185 +1112,185 @@ msgid ""
 "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr ""
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 msgid "invalid nplurals value"
 msgstr "нерэчаіснае значэньне nplurals"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr "nplurals = %lu..."
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr ""
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "\"msgid\" і \"msgid_plural\" не пачынаюцца разам з '\\n'"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "\"msgid\" і \"msgstr[%u]\" не пачынаюцца разам з \"\\n\""
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "\"msgid\" і \"msgstr\" не пачынаюцца разам з \"\\n\""
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "\"msgid\" і \"msgid_plural\" не заканчваюцца разам на \"\\n\""
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "\"msgid\" і \"msgstr[%u]\" не заканчваюцца разам на \"\\n\""
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "\"msgid\" і \"msgstr\" не заканчваюцца разам на \"\\n\""
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr ""
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr ""
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr ""
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr ""
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr "увага: загаловак PO-файла прапушчан ці нерэчаісны\n"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr "увага: загаловак PO-файла мае недакладны пераклад\n"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "даменная назва \"%s\" не падыходзіць у якасці назвы файла"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "даменная назва \"%s\" не падыходзіць у якасці назвы файла;\n"
 "будзе выкарыстаны прэфікс"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "дырэктыва \"domain %s\" ігнаруецца"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "парожняе уваходжаньне \"msgstr\" прапушчана"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "недакладнае уваходжаньне \"msgstr\" прапушчана"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: увага: ізыходны файл змяшчае недакладны пераклад"
@@ -1480,46 +1480,46 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Беларускі пераклад для %s"
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr "увага: "
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1571,18 +1571,18 @@ msgstr ""
 msgid "conversion failure"
 msgstr "памылка пераўтварэньня"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "уваходзячы файл не змяшчае загаловачнага запісу аб наборы сімвалаў"
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -1833,13 +1833,13 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<stdin>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: увага: "
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -1848,15 +1848,15 @@ msgstr ""
 "Кадзіроўка \"%s\" не з'яўляецца перанасімай назвай кадзіроўкі.\n"
 "Пераўтварэньне паведамленьняў у кадзіроўку карыстальніка можа не працаваць\n"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr "Працяг выкананьня... чакаюцца памылкі разбору."
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr "Працяг выкананьня..."
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -1865,7 +1865,7 @@ msgstr ""
 "Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv(),\n"
 "але iconv() не падтрымлівае \"%s\".\n"
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -1873,12 +1873,12 @@ msgstr ""
 "Усталяваньне GNU libiconv і пераўсталяваньне GNU gettext\n"
 "павінна выправіць гэту праблему.\n"
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -1887,7 +1887,7 @@ msgstr ""
 "Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv().\n"
 "Гэта версія пабудавана без iconv().\n"
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -1925,43 +1925,43 @@ msgstr "формы множнага ліку маюць дрэнныі індэ
 msgid "too many errors, aborting"
 msgstr "вельмі шмат памылак..."
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "нерэчаісная шматсімвальная паслядоўнасць"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr ""
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr ""
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr "памылка iconv"
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "памылка ў час чытаньня \"%s\""
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "невядомае ключавое слова \"%s\""
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "нерэчаісная кантралюючая паслядоўнасць"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "сімвал канца файла знаходзіцца ўнутры радка"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "сімвал канца радка знаходзіцца ўнутры радка"
 
@@ -2024,7 +2024,7 @@ msgstr "нерэчаісная назва Java-класа: %s"
 msgid "failed to create \"%s\""
 msgstr "немагчыма стварыць \"%s\""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "памылка ў час запісу файла \"%s\""
@@ -2038,14 +2038,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "памылка ў час адкрыцця \"%s\" для запісу"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "перакладзеныя паведамленні не павінны змяшчаць \"\\%c\" ESC-паслядоўнасці"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2054,12 +2054,12 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "немагчыма стварыць файл вываду \"%s\""
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "стандартны вывад"
@@ -2074,7 +2074,7 @@ msgstr "%s:%d: увага: незавершаная сімвальная кан
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "гэты файл можа не змяшчаць дырэктыў дамену"
 
@@ -2101,17 +2101,17 @@ msgstr "--joun-existing не можа быць выкарастаны пры з
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext не можа працаваць без ключавых слоў для пошуку"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "увага: файл \"%s\" суфікс \"%s\" невядомы; паспрабуйце C"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Атрымлівае перакладаемыя радкі з дадзеных уваходзячых файлаў.\n"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -2120,7 +2120,7 @@ msgstr ""
 "Аргументы, абавязковыя для доўгх выбараў, абавязковы так сама\n"
 "і для кароткі.  Тое саме-ж і для выбарачных аргументаў.\n"
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2130,7 +2130,7 @@ msgid ""
 "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2142,7 +2142,7 @@ msgid ""
 "By default the language is guessed depending on the input file name extension.\n"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2152,7 +2152,7 @@ msgid ""
 "                                 preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2163,7 +2163,7 @@ msgid ""
 "      --debug                    more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -2201,11 +2201,11 @@ msgstr ""
 "  -s, --sort-output           ствараць упарадкаваны вывад\n"
 "  -F, --sort-by-file          упарадкоўваць вывад па месцазнаходжаньню файла\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "стандартны ўвод"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -2215,7 +2215,7 @@ msgstr ""
 "gettext(\"\") вяртае загаловак зь\n"
 "метададзенымі, а ня пусты радок.\n"
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "невядомая мова \"%s\""
diff --git a/po/ca.gmo b/po/ca.gmo
index 4a1bae1fa..5407d8fc8 100644
Binary files a/po/ca.gmo and b/po/ca.gmo differ
diff --git a/po/ca.po b/po/ca.po
index 3ce3ec2d4..40a8ebcb3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.2\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2002-04-29 21:17+0200\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -28,8 +28,8 @@ msgstr "l'argument 
 msgid "Valid arguments are:"
 msgstr "Els arguments vàlids són:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "error en obrir «%s» per llegir"
@@ -120,12 +120,12 @@ msgstr "%s: l'opci
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: l'opció «-W %s» no admet arguments\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "no s'ha trobat cap compil·lador de Java, instal·leu «gcj» o establiu «$JAVAC»"
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "no s'ha trobat cap màquina virtual Java, instal·leu «gij» o establiu «$JAVA»"
@@ -252,7 +252,7 @@ msgstr ""
 "les especificacions de format en «msgid» i «%s» de l'argument «%s» no són "
 "les mateixes"
 
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -268,7 +268,7 @@ msgstr ""
 "de còpia.  No hi ha CAP garantia; ni tan sols de COMERCIABILITAT o\n"
 "ADEQUACIÓ A UN PROPÒSIT PARTICULAR.\n"
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -277,7 +277,7 @@ msgstr ""
 msgid "Written by %s.\n"
 msgstr "Escrit per %s.\n"
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "sobren arguments"
 
@@ -285,11 +285,11 @@ msgstr "sobren arguments"
 msgid "missing arguments"
 msgstr "manquen arguments"
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Proveu «%s --help» per obtenir més informació.\n"
@@ -351,25 +351,25 @@ msgstr ""
 "els missatges que troba en el catàleg seleccionat.\n"
 "Directori estàndard de recerca: %s\n"
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Informeu dels errors a <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Forma d'ús: %s [OPCIÓ]\n"
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr "Mostra el nom d'estació de la màquina.\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -384,7 +384,7 @@ msgstr ""
 "                       completament qualificat i els àlies\n"
 "  -i, --ip-address     adreces corresponents al nom d'estació\n"
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -397,7 +397,7 @@ msgstr ""
 "  -h, --help                  mostra aquesta ajuda i ix\n"
 "  -V, --version               mostra informació sobre la versió i ix\n"
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr "no s'ha pogut obtenir el nom d'estació"
 
@@ -417,7 +417,7 @@ msgstr "es permet com a molt un fitxer d'entrada"
 msgid "%s and %s are mutually exclusive"
 msgstr "«%s» i «%s» són mútuament excloents"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Forma d'ús: %s [OPCIÓ] [FITXERENTRADA]\n"
@@ -432,7 +432,7 @@ msgstr ""
 "i manipula aquests atributs.\n"
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
@@ -441,7 +441,7 @@ msgstr ""
 "Els arguments obligatoris per les opcions llargues també ho són\n"
 "per les opcions curtes corresponents.\n"
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -456,7 +456,7 @@ msgstr ""
 "Si no s'especifica cap fitxer d'entrada, o si aquest és «-», es llegirà\n"
 "l'entrada estàndard.\n"
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -550,7 +550,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "s'ha especificat un criteri de selecció impossible (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Forma d'ús: %s [OPCIÓ] [FITXERENTRADA]...\n"
@@ -581,7 +581,7 @@ msgstr ""
 "«--use-first», en el qual cas es treuran del primer fitxer PO que els\n"
 "definesca.  Les posicions de fitxer de tots els fitxers PO s'acumularan.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -672,7 +672,7 @@ msgstr ""
 "  -s, --sort-output              genera una eixida ordenada\n"
 "  -F, --sort-by-file             ordena l'eixida pels noms de fitxer\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -755,18 +755,18 @@ msgstr "aquest missatge s'usa per
 msgid "warning: this message is not used"
 msgstr "avís: aquest missatge no s'usa"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "s'ha trobat %d error fatal"
 msgstr[1] "s'han trobat %d errors fatals"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "la definició del missatge és duplicada"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...aquesta és la ubicació de la primera definició"
 
@@ -856,12 +856,12 @@ msgstr ""
 "      --omit-header              no escriu la capçalera amb l'entrada\n"
 "                                 «msgid \"\"»\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Converteix un catàleg de traduccions a una codificació de caràcters diferent.\n"
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -872,7 +872,7 @@ msgstr ""
 "  -t, --to-code=NOM           codificació de l'eixida\n"
 "La codificació per defecte és la del locale actual.\n"
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -1311,26 +1311,26 @@ msgstr ""
 # ivb (2002/01/03)
 # ivb  En aquestes frases, tant «nplurals» com «plural» es refereixen a
 # ivb  variables del camp «Plural-Forms» de la capçalera.
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr "l'expressió de «plural» pot produir valors negatius"
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "«nplurals» és %lu, però l'expressió de «plural» pot produir valors de fins %"
 "lu"
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr "l'expressió de «plural» pot produir una divisió entre zero"
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr "l'expressió de «plural» pot produir un desbordament enter"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -1338,39 +1338,39 @@ msgstr ""
 "l'expressió de «plural» pot produir excepcions aritmètiques, possiblement "
 "divisions entre zero"
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr "el catàleg de missatges té traduccions amb forma plural..."
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...però l'atribut «plural=EXPRESSIÓ» manca en l'entrada de capçalera"
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...però l'atribut «nplurals=ENTER» manca en l'entrada de capçalera"
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 msgid "invalid nplurals value"
 msgstr "el valor d'«nplurals» no és vàlid"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr "l'expressió de «plural» no és vàlida"
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr "«nplurals» és %lu..."
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "...però alguns missatges només tenen una forma plural"
 msgstr[1] "...però alguns missatges només tenen %lu formes plurals"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
@@ -1380,12 +1380,12 @@ msgstr[1] "...per
 # ivb (2002/03/14)
 # ivb  El «%s» es refereix a un idioma, i tot el missatge recomana usar una
 # ivb  entrada de capçalera «Plural-Forms:».
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr "Proveu d'usar açò, vàlid per a l'idioma %s:\n"
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -1393,114 +1393,114 @@ msgstr ""
 "el catàleg de missatges té traduccions amb forma plural, però hi manca una "
 "entrada de capçalera amb «Plural-Forms: nplurals=ENTER; plural=EXPRESSIÓ;»"
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "ambdues entrades «msgid» i «msgid_plural» no comencen per «\\n»"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "ambdues entrades «msgid» i «msgstr[%u]» no comencen per «\\n»"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "ambdues entrades «msgid» i «msgstr» no comencen per «\\n»"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "ambdues entrades «msgid» i «msgid_plural» no acaben en «\\n»"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "ambdues entrades «msgid» i «msgstr[%u]» no acaben en «\\n»"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "ambdues entrades «msgid» i «msgstr» no acaben en «\\n»"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr "el maneig de plurals és una extensió del «gettext» GNU"
 
 # ivb (2002/12/16)
 # ivb  Ací el segon «%s» és el nom d'un llenguatge de programació.
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr "la de «%s» no és una cadena de format vàlida en %s, la de «msgid» sí"
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "manca la marca d'accelerador de teclat «%c» en «msgstr»"
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "sobren marques d'accelerador de teclat «%c» en «msgstr»"
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "manca el camp de capçalera «%s» en la capçalera\n"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "cal que el camp de capçalera «%s» comence en l'inici de la línia\n"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 "alguns camps de la capçalera encara tenen els valors inicials per defecte\n"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "el camp «%s» encara té el valor inicial per defecte\n"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr "avís: la capçalera del fitxer PO manca o no és vàlida\n"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr "avís: la conversió del joc de caràcters no funcionarà\n"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr "avís: la capçalera del fitxer PO està marcada amb «fuzzy»\n"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "avís: les versions antigues de «msgfmt» ho indicaran com un error\n"
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "el nom de domini «%s» no és adequat com a nom de fitxer"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "el nom de domini «%s» no és adequat com a nom de fitxer: se n'usarà un prefix"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "es descarta la directiva «domain %s»"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "es descarta l'entrada «msgstr» buida"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "es descarta l'entrada «msgstr» difusa"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: avís: el fitxer font conté una traducció difusa"
@@ -1757,17 +1757,17 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Traduccions al català del paquet «%s»"
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "el joc de caràcters actual, «%s», no és un nom portable de codificació"
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "el fitxer d'entrada conté dos jocs de caràcters distints, «%s» i «%s»"
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
@@ -1775,7 +1775,7 @@ msgstr ""
 "el fitxer d'entrada «%s» no conté una entrada de capçalera amb una "
 "especificació de joc de caràcters"
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -1784,20 +1784,20 @@ msgstr ""
 "el domini «%s» del fitxer d'entrada «%s» no conté una entrada de capçalera "
 "amb una especificació de joc de caràcters"
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 "el joc de caràcters destinació, «%s», no és un nom portable de codificació"
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr "avís: "
 
 # ivb (2002/01/07)
 # ivb  Em sembla que açò és «no-wrap».
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
@@ -1808,7 +1808,7 @@ msgstr ""
 
 # ivb (2002/01/07)
 # ivb  Em sembla que açò és «no-wrap».
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1888,13 +1888,13 @@ msgstr ""
 msgid "conversion failure"
 msgstr "la conversió ha fallat"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "el fitxer d'entrada no conté una entrada de capçalera amb una especificació "
 "de joc de caràcters"
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -1903,7 +1903,7 @@ msgstr ""
 "No es pot convertir de «%s» en «%s». «%s» es basa en iconv(), i iconv() no "
 "suporta aquesta conversió."
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2261,8 +2261,8 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<entrada estàndard>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: avís: "
@@ -2270,7 +2270,7 @@ msgstr "%s: av
 # ivb (2002/01/09)
 # ivb  Em sembla que açò és «no-wrap».
 # ivb  Es refereix a tots els missatges -> plural.
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2280,17 +2280,17 @@ msgstr ""
 "És possible que la conversió dels missatges al joc de caràcters de\n"
 "la usuària/l'usuari no funcione.\n"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr "Es continua de totes formes, espereu errors d'interpretació."
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr "Es continua de totes formes."
 
 # ivb (2002/01/09)
 # ivb  Em sembla que açò és «no-wrap».
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2301,7 +2301,7 @@ msgstr ""
 
 # ivb (2002/01/09)
 # ivb  Em sembla que açò és «no-wrap».
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2309,14 +2309,14 @@ msgstr ""
 "Instal·lar «libiconv» GNU i reinstal·lar «gettext» GNU\n"
 "resoldria aquest problema.\n"
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
 # ivb (2002/01/09)
 # ivb  Em sembla que açò és «no-wrap».
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2328,7 +2328,7 @@ msgstr ""
 # ivb (2002/01/09)
 # ivb  Em sembla que açò és «no-wrap».
 # ivb  Es refereix a tots els missatges -> plural.
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2366,43 +2366,43 @@ msgstr "la forma plural t
 msgid "too many errors, aborting"
 msgstr "hi ha massa errors, avortant"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "la seqüència multioctet no és vàlida"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr "hi ha una seqüència multioctet incompleta al final del fitxer"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr "hi ha una seqüència multioctet incompleta al final de la línia"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr "ha fallat iconv()"
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error en llegir «%s»"
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "la paraula clau «%s» no és coneguda"
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "la seqüència de control no és vàlida"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "s'ha trobat el final de fitxer emmig d'una cadena"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "s'ha trobat un final de línia emmig d'una cadena"
 
@@ -2468,7 +2468,7 @@ msgstr "
 msgid "failed to create \"%s\""
 msgstr "no s'ha pogut crear «%s»"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "error en escriure el fitxer «%s»"
@@ -2484,7 +2484,7 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "error en obrir «%s» per escriure"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -2492,7 +2492,7 @@ msgstr ""
 "els missatges internacionalitzats no han de contenir la seqüència d'escapada "
 "«%c»"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2506,12 +2506,12 @@ msgstr ""
 "«msgid» purament ASCII en comptes d'aquest.\n"
 "%s\n"
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "no s'ha pogut crear el fitxer d'eixida «%s»"
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "eixida estàndard"
@@ -2526,7 +2526,7 @@ msgstr "%s:%d: av
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: avís: el literal cadena no és terminat"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "aquest fitxer no ha de contenir directives «domain»"
 
@@ -2553,18 +2553,18 @@ msgstr "no es pot usar 
 msgid "xgettext cannot work without keywords to look for"
 msgstr "«xgettext» no funciona sense paraules clau que cercar"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "avís: l'extensió «%2$s» del fitxer «%1$s» no és coneguda; es provarà amb «C»"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extreu les cadenes traduïbles dels fitxers d'entrada especificats.\n"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -2573,7 +2573,7 @@ msgstr ""
 "Els arguments obligatoris per les opcions llargues també ho són per les\n"
 "opcions curtes corresponents.  El mateix ocorre amb els arguments opcionals.\n"
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2590,7 +2590,7 @@ msgstr ""
 "                                 el DIRECTORI\n"
 "Si el fitxer d'eixida és «-» s'escriurà en l'eixida estàndard.\n"
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2609,7 +2609,7 @@ msgstr ""
 "Per defecte s'endevina el llenguatge fent servir l'extensió del nom\n"
 "del fitxer d'entrada.\n"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2627,7 +2627,7 @@ msgstr ""
 "                                 (o aquells que precedeixen les línies amb\n"
 "                                 una paraula clau) en el fitxer d'eixida\n"
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2646,7 +2646,7 @@ msgstr ""
 "      --debug                    escriu unes marques més detallades\n"
 "                                 de reconeixement de cadenes de format\n"
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -2696,13 +2696,13 @@ msgstr ""
 "  -M, --msgstr-suffix[=CADENA]   usa la CADENA o «» com a sufix de\n"
 "                                 les entrades «msgstr»\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "entrada estàndard"
 
 # ivb (2002/01/09)
 # ivb  Em sembla que açò és «no-wrap».
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -2712,7 +2712,7 @@ msgstr ""
 "«gettext(\"\")» retorna l'entrada de capçalera amb metainformació,\n"
 "no la cadena buida.\n"
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "el llenguatge «%s» no és conegut"
diff --git a/po/cs.gmo b/po/cs.gmo
index c012aedcd..f741c9584 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index 60b8cedd7..98194cb55 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.38\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2001-08-18 15:22+0200\n"
 "Last-Translator: Vladimir Michl <Vladimir.Michl@seznam.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -38,8 +38,8 @@ msgstr ""
 
 # src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:159 src/xget-lex.c:174
 # src/xget-lex.c:191 src/xgettext.c:616
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "chyba pøi otevírání souboru \"%s\" pro ètení"
@@ -146,11 +146,11 @@ msgstr "%s: p
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: pøepínaè ` -W %s' musí být zadán bez argumentu\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
@@ -278,7 +278,7 @@ msgstr "form
 
 # src/gettextp.c:134 src/msgcmp.c:144 src/msgfmt.c:257 src/msgmerge.c:251
 # src/msgunfmt.c:175 src/xgettext.c:394
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -296,7 +296,7 @@ msgstr ""
 
 # src/gettextp.c:139 src/msgcmp.c:149 src/msgfmt.c:262 src/msgmerge.c:256
 # src/msgunfmt.c:180 src/xgettext.c:399
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -306,7 +306,7 @@ msgid "Written by %s.\n"
 msgstr "Autor: %s\n"
 
 # src/gettextp.c:164
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "pøíli¹ mnoho argumentù"
 
@@ -317,11 +317,11 @@ msgstr "chyb
 
 # src/gettextp.c:228 src/msgcmp.c:181 src/msgfmt.c:361 src/msgmerge.c:298
 # src/msgunfmt.c:210 src/xgettext.c:532
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Více informací získáte pøíkazem `%s --help'.\n"
@@ -387,11 +387,11 @@ msgstr ""
 
 # src/gettextp.c:255 src/msgcmp.c:200 src/msgfmt.c:386 src/msgmerge.c:331
 # src/msgunfmt.c:234 src/xgettext.c:582
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
@@ -399,17 +399,17 @@ msgstr ""
 "(pouze\n"
 "anglicky), pøipomínky k pøekladu zasílejte na adresu <cs@li.org> (èesky).\n"
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -419,7 +419,7 @@ msgid ""
 "  -i, --ip-address      addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -429,7 +429,7 @@ msgid ""
 "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr ""
 
@@ -450,7 +450,7 @@ msgstr ""
 msgid "%s and %s are mutually exclusive"
 msgstr "%s a %s se vzájemnì vyluèují"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
@@ -463,14 +463,14 @@ msgid ""
 msgstr ""
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -479,7 +479,7 @@ msgid ""
 "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -558,7 +558,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "zadáno nemo¾né výbìrové kritérium (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -592,7 +592,7 @@ msgstr ""
 "ponechány, ale pouze z prvního .po souboru, který je definuje. Oznaèení pozic\n"
 "v souborech bude ponecháno ze v¹ech .po souborù.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -682,7 +682,7 @@ msgstr ""
 "  -V, --version            vypí¹e oznaèení verze a ukonèí se\n"
 "  -w, --width=ÈÍSLO        nastaví ¹íøku výstupní stránky\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -769,7 +769,7 @@ msgid "warning: this message is not used"
 msgstr "upozornìní: tato zpráva není pou¾ita"
 
 # src/po-lex.c:84
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -778,12 +778,12 @@ msgstr[1] "nalezeny %d z
 msgstr[2] "nalezeno %d záva¾ných chyb"
 
 # src/msgcmp.c:355 src/msgfmt.c:628 src/msgmerge.c:490 src/xgettext.c:1061
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "dvojnásobná definice zprávy"
 
 # src/msgcmp.c:356 src/msgfmt.c:629 src/msgmerge.c:491 src/xgettext.c:1062
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...toto je umístìní první definice"
 
@@ -888,12 +888,12 @@ msgstr ""
 "  -V, --version            vypí¹e oznaèení verze a ukonèí se\n"
 "  -w, --width=ÈÍSLO        nastaví ¹íøku výstupní stránky\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -902,7 +902,7 @@ msgid ""
 msgstr ""
 
 # src/msgmerge.c:303
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -1266,58 +1266,58 @@ msgid ""
 "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr ""
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
 # src/po-lex.c:332
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "neplatná øídící sekvence"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr ""
 
 # src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, fuzzy, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
@@ -1326,7 +1326,7 @@ msgstr[1] "tato zpr
 msgstr[2] "tato zpráva je pou¾ita, ale nikoli definována v %s"
 
 # src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, fuzzy, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
@@ -1334,125 +1334,125 @@ msgstr[0] "tato zpr
 msgstr[1] "tato zpráva je pou¾ita, ale nikoli definována v %s"
 msgstr[2] "tato zpráva je pou¾ita, ale nikoli definována v %s"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr ""
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
 # src/msgfmt.c:870
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgid_plural' nezaèínají '\\n'"
 
 # src/msgfmt.c:870
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgstr[%u]' nezaèínají '\\n'"
 
 # src/msgfmt.c:870
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgstr' nezaèínají '\\n'"
 
 # src/msgfmt.c:878
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgid_plural' nekonèí '\\n'"
 
 # src/msgfmt.c:878
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgstr[%u]' nekonèí '\\n'"
 
 # src/msgfmt.c:878
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgstr' nekonèí '\\n'"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr ""
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
 # src/msgfmt.c:561
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, fuzzy, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "polo¾ka hlavièky `%s' v hlavièce chybí"
 
 # src/msgfmt.c:564
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "polo¾ka hlavièky `%s' by mìla zaèínat na zaèátku øádku"
 
 # src/msgfmt.c:573
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "nìkteré polo¾ky hlavièky mají stále poèáteèní implicitní hodnotu"
 
 # src/msgfmt.c:583
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, fuzzy, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "polo¾ka `%s' má stále poèáteèní implicitní hodnotu"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 #, fuzzy
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: upozornìní: chybí hlavièka PO souboru (neúplná nebo neplatná)\n"
 "%*s  upozornìní: pøevod znakové sady nebude fungovat"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 #, fuzzy
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "V hlavièce chybí definice znakové sady.\n"
 "Konverze zpráv do u¾ivatelovy znakové sady není mo¾ná.\n"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 #, fuzzy
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: upozornìní: chybí hlavièka PO souboru (neúplná nebo neplatná)\n"
 "%*s  upozornìní: pøevod znakové sady nebude fungovat"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
 # src/msgfmt.c:471
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "jméno domény \"%s\" není vhodné jako jméno souboru"
 
 # src/msgfmt.c:476
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
@@ -1460,23 +1460,23 @@ msgstr ""
 "pøedpona"
 
 # src/msgfmt.c:489
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "pøíkaz `domain %s' ignorován"
 
 # src/msgfmt.c:517
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "prázdná polo¾ka `msgstr' ignorována"
 
 # src/msgfmt.c:518
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "neúplná polo¾ka `msgstr' ignorována"
 
 # src/msgfmt.c:668
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: upozornìní: zdrojový soubor obsahuje neúplný pøeklad"
@@ -1673,47 +1673,47 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 #, fuzzy
 msgid "warning: "
 msgstr "%s: upozornìní: "
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1765,11 +1765,11 @@ msgstr ""
 msgid "conversion failure"
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -1778,7 +1778,7 @@ msgstr ""
 "Znaková sada \"%s\" není podporována. %s spoléhá na iconv()\n"
 "a iconv() \"%s\" nepodporuje.\n"
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2070,13 +2070,13 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<standardní vstup>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: upozornìní: "
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2085,15 +2085,15 @@ msgstr ""
 "Oznaèení znakové sady \"%s\" není portabilní název kódování. \n"
 "Pøevod znakù do u¾ivatelské znakové sady nebude fungovat.\n"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr "Pokraèuji, pøedpokládána chyba parsingu."
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr "Pokraèuji."
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2102,7 +2102,7 @@ msgstr ""
 "Znaková sada \"%s\" není podporována. %s spoléhá na iconv()\n"
 "a iconv() \"%s\" nepodporuje.\n"
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2110,12 +2110,12 @@ msgstr ""
 "Instalace GNU libiconv a následná reinstalace GNU gettextu\n"
 "mù¾e napravit tento problém.\n"
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2124,7 +2124,7 @@ msgstr ""
 "Znaková sada \"%s\" není podporována. %s spoléhá na iconv().\n"
 "Tato verze byla kompilována bez iconv().\n"
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2165,26 +2165,26 @@ msgstr "mno
 msgid "too many errors, aborting"
 msgstr "pøíli¹ mnoho chyb, konèím"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "neplatná víceznaková sekvence"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 #, fuzzy
 msgid "incomplete multibyte sequence at end of file"
 msgstr "neplatná víceznaková sekvence"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 #, fuzzy
 msgid "incomplete multibyte sequence at end of line"
 msgstr "neplatná víceznaková sekvence"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr ""
 
 # src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
@@ -2192,23 +2192,23 @@ msgid "error while reading \"%s\""
 msgstr "chyba pøi ètení \"%s\""
 
 # src/po-lex.c:241
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "klíèové slovo \"%s\" není známo"
 
 # src/po-lex.c:332
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "neplatná øídící sekvence"
 
 # src/po-lex.c:420
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "konec souboru uprostøed øetìzce"
 
 # src/po-lex.c:415
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "konec øádku uprostøed øetìzce"
 
@@ -2281,7 +2281,7 @@ msgid "failed to create \"%s\""
 msgstr ""
 
 # src/message.c:1182
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "chyba pøi zápisu do souboru \"%s\""
@@ -2297,13 +2297,13 @@ msgid "error while opening \"%s\" for writing"
 msgstr "chyba pøi otevírání souboru \"%s\" pro zápis"
 
 # src/message.c:784
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "zprávy katalogu nesmí obsahovat escape sekvenci `\\%c'"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2313,13 +2313,13 @@ msgid ""
 msgstr ""
 
 # src/message.c:1115
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "výstupní soubor \"%s\" nelze vytvoøit"
 
 # src/message.c:1122
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "standardní výstup"
@@ -2337,7 +2337,7 @@ msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
 
 # src/xgettext.c:658 src/xgettext.c:968
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "tento soubor nemù¾e obsahovat pøíkazy pro doménu"
 
@@ -2366,24 +2366,24 @@ msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext nemù¾e pracovat bez toho, ani¾ by znal slova, která má hledat"
 
 # src/xgettext.c:501
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "upozornìní: pøípona `%2$s' souboru `%1$s' není známa; zkusím C"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2393,7 +2393,7 @@ msgid ""
 "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2405,7 +2405,7 @@ msgid ""
 "By default the language is guessed depending on the input file name extension.\n"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2415,7 +2415,7 @@ msgid ""
 "                                 preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2427,7 +2427,7 @@ msgid ""
 msgstr ""
 
 # src/msgmerge.c:303
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -2472,11 +2472,11 @@ msgstr ""
 "  -w, --width=ÈÍSLO        nastaví ¹íøku výstupní stránky\n"
 
 # src/xget-lex.c:150
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "standardní vstup"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -2484,7 +2484,7 @@ msgid ""
 msgstr ""
 
 # src/xgettext.c:1342
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "jazyk `%s' není znám"
diff --git a/po/da.gmo b/po/da.gmo
index 8f2a14bac..80e8abc6f 100644
Binary files a/po/da.gmo and b/po/da.gmo differ
diff --git a/po/da.po b/po/da.po
index 87aa8ba36..177647ec4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.2\n"
-"POT-Creation-Date: 2002-05-02 15:48+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2002-07-07 19:32+0200\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -31,8 +31,8 @@ msgstr "flertydigt argument '%s' for '%s'"
 msgid "Valid arguments are:"
 msgstr "Gyldige argumenter er:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "fejl ved læse-åbning af '%s'"
@@ -123,11 +123,11 @@ msgstr "%s: tilvalget '-W %s' er flertydigt\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: tilvalget '-W %s' tillader ikke et argument\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Javakompilator ikke fundet, forsøg at installere gcj eller sæt $JAVAC"
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Virtuel Javamaskine ikke fundet, forsøg at installere gij eller sæt $JAVA"
@@ -281,10 +281,10 @@ msgid "missing arguments"
 msgstr "argumenter mangler"
 
 #: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv '%s --help' for yderligere oplysninger.\n"
@@ -345,10 +345,10 @@ msgstr ""
 "Standard-filkataloget for søgning er: %s\n"
 
 #: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Rapportér fejl på engelsk til <bug-gnu-gettext@gnu.org>.\n"
 
@@ -376,7 +376,7 @@ msgstr ""
 "  -f, --fqdn, --long    langt værtsnavn, indholder hele domænenavnet og alias\n"
 "  -i, --ip-address      adresser for værtsnavnet\n"
 
-#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -409,7 +409,7 @@ msgstr "H
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s udelukker hinanden"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Brug: %s [TILVALG] [INDDATAFIL]\n"
@@ -424,7 +424,7 @@ msgstr ""
 "manipulerer attributterne.\n"
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
@@ -433,7 +433,7 @@ msgstr ""
 "Hvis et langt tilvalg kræver et argument, gælder det også for det tilsvarende\n"
 "korte tilvalg.\n"
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -446,7 +446,7 @@ msgstr ""
 "  -D, --directory=FILKATALOG  gennemsøg også FILKATALOG efter inddatafiler\n"
 "Hvis ingen inddatafil er angivet eller den er -, læses fra standard-inddata.\n"
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -534,7 +534,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Umuligt udvælgelseskriterium angivet (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Brug: %s [TILVALG] [INDDATAFIL]...\n"
@@ -561,7 +561,7 @@ msgstr ""
 "men hvis --use-first er angivet, vil de blive taget fra den første PO-fil,\n"
 "der definerer dem. Filpositioner fra alle PO-filer sammenbringes.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -646,7 +646,7 @@ msgstr ""
 "  -s, --sort-output              generér sorteret uddata\n"
 "  -F, --sort-by-file             sortér uddata efter filplacering\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -728,18 +728,18 @@ msgstr "denne tekst er brugt, men ikke erkl
 msgid "warning: this message is not used"
 msgstr "advarsel: denne tekst bliver ikke brugt"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "fandt %d fatal fejl"
 msgstr[1] "fandt %d fatale fejl"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "tekst erklæret mere end en gang"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "... her er den første erklæring"
 
@@ -820,12 +820,12 @@ msgstr ""
 "  -F, --sort-by-file             sortér uddata efter filplacering\n"
 "      --omit-header              udskriv ikke header med 'msgid \"\"' indgang\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Konverterer et beskedskatalog til en anden tegnkodning.\n"
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -836,7 +836,7 @@ msgstr ""
 "  -t, --to-code=NAVN          Kodning for uddata\n"
 "Standardværdi er nuværende locales kodning.\n"
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -1239,74 +1239,74 @@ msgstr ""
 "      --statistics            udskriv statistik over oversættelser\n"
 "  -v, --verbose               forøg udskreven information\n"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr "flertalsudtryk kan give negative værdier"
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu men flertalsudtryk kan give værdier op til %lu"
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr "flertalsudtryk kan give division med nul"
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr "flertalsudtryk kan give heltalsoverløb"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr "flertalsudtryk kan give aritmetiske fejl, måske division med nul"
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr "tekstkatalog har oversættelser med flertalsform..."
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...men headerindgange mangler attribut af type \"plurals=UDTRYK\""
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...men headerindgange mangler attribut af type \"plurals=HELTAL\""
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 msgid "invalid nplurals value"
 msgstr "ugyldig nplurals-værdi"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr "ugyldigt flertalsudtryk"
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr "nplurals = %lu..."
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "...men nogen tekster har kun én flertalsform"
 msgstr[1] "...men nogen tekster har kun %lu flertalsformer"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "...men nogen tekster har én flertalsform"
 msgstr[1] "...men nogen tekster har %lu flertalsformer"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr "Prøv at bruge det følgende, gældende for %s:\n"
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -1314,110 +1314,110 @@ msgstr ""
 "beskedkatalog har oversættelser med flertalsformer, men mangler en "
 "headerindgang med \"Plural-Forms: nplurals=HELTAL; plural=UDTRYK;\""
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "'msgid' og 'msgid_plural'-teksterne begynder ikke begge med '\\n'"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' og `msgstr[%u]'-teksterne begynder ikke begge med '\\n'"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' og `msgstr' teksterne begynder ikke begge med '\\n'"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' og `msgid_plural'-teksterne slutter ikke begge med '\\n'"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' og `msgstr[%u]'-teksterne slutter ikke begge med '\\n'"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' og `msgstr' teksterne slutter ikke begge med '\\n'"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr "flertalsbehandling er en GNU gettext-udvidelse"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr "'%s' er ikke en gyldig formatstreng i %s, til forskel fra \"msgid\""
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr mangler mærket \"%c\" for tastaturgenvej"
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr har for mange mærker \"%c\" for tastaturgenveje"
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "feltet `%s' mangler i hovedet\n"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "feltet '%s' i hovedet bør starte ved linjens begyndelse\n"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 msgid "some header fields still have the initial default value\n"
 msgstr "nogle felter i hovedet har stadig den oprindelige standardværdi\n"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "feltet `%s' har stadig den oprindelige standardværdi\n"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr "advarsel: PO-filhoved mangler eller ugyldigt\n"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr "advarsel: tegnsætskonvertering vil ikke virke\n"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr "advarsel: PO-filhoved er uafklaret\n"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "advarsel: ældre versioner af msgfmt vil give en fejl for dette\n"
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domænet '%s' kan ikke bruges som filnavn"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domænet '%s' er ikke brugbart som filnavn. Vil bruge præfiks istedet"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "`domain %s'-kommando ignoreres"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "tom `msgstr'-kommando ignoreret"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "\"fuzzy\" `msgstr'-tekst ignoreret"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
@@ -1665,23 +1665,23 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Danske oversættelser for pakke %s"
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "nuværende tegnsæt \"%s\" er ikke et portabelt kodningsnavn"
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "to forskellige tegnsæt \"%s\" og \"%s\" i indfilen"
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "indfilen \"%s\" mangler en indgang i hovedet med angivelse af tegnsæt"
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -1690,17 +1690,17 @@ msgstr ""
 "domæne \"%s\" i indfil \"%s\" mangler en indgang i hovedet med angivelse af "
 "tegnsæt"
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "måltegnsæt \"%s\" er ikke et portabelt kodningsnavn"
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr "advarsel: "
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
@@ -1708,7 +1708,7 @@ msgstr ""
 "Indfiler har beskeder med flere kodninger, deriblandt UTF-8.\n"
 "Konverterer resultatet til UTF-8.\n"
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1777,11 +1777,11 @@ msgstr ""
 msgid "conversion failure"
 msgstr "konverteringsfejl"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "indfilen mangler en indgang i hovedet med angivelse af tegnsæt"
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -1790,7 +1790,7 @@ msgstr ""
 "Kan ikke konvertere fra '%s' til '%s'. %s bygger på iconv(), og iconv() "
 "understøtter ikke denne konvertering."
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2125,13 +2125,13 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<stdind>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: advarsel: "
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2140,15 +2140,15 @@ msgstr ""
 "Tegnsæt '%s' er ikke et flytbart kodningsnavn.\n"
 "Tekstkonvertering til brugers tegnsæt virker muligvis ikke.\n"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr "Fortsætter alligevel, forvent fortolkningsfejl."
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr "Fortsætter alligevel."
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2157,7 +2157,7 @@ msgstr ""
 "Tegnsæt '%s' er ikke understøttet. %s bygger på iconv(),\n"
 "og iconv() understøtter ikke '%s'.\n"
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2165,12 +2165,12 @@ msgstr ""
 "Installering af GNU libiconv og geninstallering af GNU gettext\n"
 "vil løse dette problem.\n"
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2179,7 +2179,7 @@ msgstr ""
 "Tegnsæt '%s' er ikke understøttet. %s bygger på iconv(),\n"
 "Denne version er bygget uden iconv().\n"
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2216,43 +2216,43 @@ msgstr "flertalsform har forkert indeks"
 msgid "too many errors, aborting"
 msgstr "afbryder kørslen på grund af for mange fejl"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "Ugyldig multibytesekvens"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr "Ugyldig multibytesekvens ved slutning på fil"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr "Ugyldig multibytesekvens ved slutning på linje"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr "iconv-fejl"
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fejl ved læsning af '%s'"
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "ukendt nøgleord '%s'"
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "ugyldig kontrolsekvens"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "tekststreng ikke afsluttet da filens slutning blev nået"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "tekststreng var ikke afsluttet ved linjeskift"
 
@@ -2317,7 +2317,7 @@ msgstr "ikke et gyldigt Java-klassenavn: %s"
 msgid "failed to create \"%s\""
 msgstr "kunne ikke oprette '%s'"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "fejl ved skrivning til filen '%s'"
@@ -2333,13 +2333,13 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "fejl opstået ved skrive-åbning af '%s'"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "oversættelige tekster må ikke indeholde `\\%c'-escapesekvensen"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2352,12 +2352,12 @@ msgstr ""
 "som er et andet end dit. Forsøg at bruge en ren ASCII-msgid i stedet.\n"
 "%s\n"
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan ikke oprette uddatafil '%s'"
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "standard-uddata"
@@ -2372,7 +2372,7 @@ msgstr "%s:%d: advarsel:  tegnkonstant ikke afsluttet korrekt"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "denne fil må ikke indeholde 'domain'-kommandoer"
 
@@ -2400,18 +2400,18 @@ msgstr ""
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext kan ikke arbejde uden nogen nøgleord at kigge efter"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "advarsel: ukendt type for fil `%s' med endelse `%s'; C benyttes i stedet"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Udtræk oversættelige strenge fra givne indfiler.\n"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -2421,7 +2421,7 @@ msgstr ""
 "korte tilvalg.\n"
 "Tilvarende gælder for valgfri argumenter.\n"
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2436,7 +2436,7 @@ msgstr ""
 "  -p, --output-dir=FILKATALOG    uddatafiler placeres i FILKATALOG\n"
 "Hvis uddatafilen er -, skrives uddata til standard-ud.\n"
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2454,7 +2454,7 @@ msgstr ""
 "                                   RST, Glade)\n"
 "  -C, --c++                      kort skrivemåde for --language=C++\n"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2468,7 +2468,7 @@ msgstr ""
 "  -c, --add-comments[=MÆRKE]     placér kommentarafsnit for MÆRKE (eller \n"
 "                                 de foregående nøgleordslinjer) i uddata\n"
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2485,7 +2485,7 @@ msgstr ""
 "  -T, --trigraphs                forstå ISO C-trigrafer i inddata\n"
 "      --debug                    mere detaljeret resultat af strenggenkendelse\n"
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -2526,11 +2526,11 @@ msgstr ""
 "  -m, --msgstr-prefix[=STRENG]   brug STRING eller \"\" som forstavelse for msgstr-indgange\n"
 "  -M, --msgstr-suffix[=STRENG]   brug STRING eller \"\" som endelse for msgstr-indgange\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "standard-inddata"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -2540,7 +2540,7 @@ msgstr ""
 "gettext(\"\") returnerer hovedet med metainformation,\n"
 "ikke den tomme streng.\n"
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "ukendt sprog `%s'"
diff --git a/po/de.gmo b/po/de.gmo
index 21ed00512..6c6754b89 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 7f6b9e6bf..3e9d53907 100644
--- a/po/de.po
+++ b/po/de.po
@@ -75,7 +75,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.11.2\n"
-"POT-Creation-Date: 2002-05-02 15:48+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2002-05-14 10:02+0200\n"
 "Last-Translator: Karl Eichwalder <ke@suse.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -98,8 +98,8 @@ msgstr "mehrdeutiges Argument »%s« für »%s«"
 msgid "Valid arguments are:"
 msgstr "Gültige Argumente sind:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "Öffnen der Datei »%s« zum Lesen fehlgeschlagen"
@@ -190,12 +190,12 @@ msgstr "%s: Option »-W %s« ist mehrdeutig\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: Option »-W %s« erwartet kein Argument\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "Java-Compiler nicht gefunden; bitte »gcj« installieren oder $JAVAC setzen"
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Virtuelle Java-Maschine nicht gefunden; bitte »gcj« installieren oder\n"
@@ -347,10 +347,10 @@ msgid "missing arguments"
 msgstr "Argumente fehlen"
 
 #: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "»%s --help« gibt weitere Informationen.\n"
@@ -415,10 +415,10 @@ msgstr ""
 "Standardverzeichnis: %s\n"
 
 #: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Fehler bitte (auf Englisch) an <bug-gnu-gettext@gnu.org> melden.\n"
@@ -450,7 +450,7 @@ msgstr ""
 "                          vollqualifizierten Domainnamen (FQDN) und Aliasse\n"
 "  -i, --ip-address      Adressen für den Rechnernamen\n"
 
-#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -483,7 +483,7 @@ msgstr "höchstens eine Eingabedatei erlaubt"
 msgid "%s and %s are mutually exclusive"
 msgstr "%s und %s schließen sich gegenseitig aus"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Aufruf: %s [OPTION] [EINGABEDATEI]\n"
@@ -498,7 +498,7 @@ msgstr ""
 "die Attribute verändern.\n"
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
@@ -507,7 +507,7 @@ msgstr ""
 "Notwendige Argumente für Optionen in Langform sind auch für die Kurzform\n"
 "notwendig.\n"
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -521,7 +521,7 @@ msgstr ""
 "Wenn keine Eingabedatei oder »-« angegeben ist, wird die Standardeingabe\n"
 "gelesen.\n"
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -612,7 +612,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Auswahlkriterium nicht möglich (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Aufruf: %s [OPTION] [EINGABEDATEI]...\n"
@@ -642,7 +642,7 @@ msgstr ""
 "Stellenangaben der Meldungen in den Quellen werden für alle PO-Dateien\n"
 "kumuliert.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -732,7 +732,7 @@ msgstr ""
 "  -s, --sort-output             sortierte Ausgabe erzeugen\n"
 "  -F, --sort-by-file            Ausgabe gemäß Vorkommen in Dateien erzeugen\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -816,18 +816,18 @@ msgstr "diese Meldung kommt vor, ist aber in %s nicht definiert"
 msgid "warning: this message is not used"
 msgstr "Warnung: diese Meldung kommt nicht vor"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "es ist %d fataler Fehler aufgetreten"
 msgstr[1] "es sind %d fatale Fehler aufgetreten"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "Mehrfachdefinition der Meldung"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...dies ist die Stelle der ersten Definition"
 
@@ -914,14 +914,14 @@ msgstr ""
 "  -F, --sort-by-file            Ausgabe gemäß Vorkommen in Dateien erzeugen\n"
 "      --omit-header             »msgid \"\"«-Eintrag im Kopfteil nicht erzeugen\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 "Einen Katalog mit Übersetzungen in eine andere Zeichensatz-Kodierung\n"
 "konvertieren.\n"
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -932,7 +932,7 @@ msgstr ""
 "  -t, --to-code=NAME          Kodierung für die Ausgabe\n"
 "Die Vorgabe für die Kodierung ist die Kodierung der aktuellen Lokale.\n"
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -1357,24 +1357,24 @@ msgstr ""
 "      --statistics             Statistik zu den Übersetzungen anzeigen\n"
 "  -v, --verbose                mehr Hinweise während der Verarbeitung geben\n"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr "Pluralausdruck kann negative Werte ergeben"
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu, aber Pluralausdruck kann Werte so groß wie %lu ergeben"
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr "Pluralausdruck kann Teilung durch Null ergeben"
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr "Pluralausdruck kann einen Ganzzahl-Überlauf ergeben"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -1383,51 +1383,51 @@ msgstr ""
 "Teilung\n"
 "durch Null"
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr "Katalog mit Meldungen weist Übersetzungen mit Pluralformen auf..."
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...aber dem Kopfeintrag fehlt das Attribut »plural=AUSDRUCK«"
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...aber dem Kopfeintrag fehlt das Attribut »nplurals=GANZZAHL«"
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 msgid "invalid nplurals value"
 msgstr "ungültige Pluralwerte"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr "ungültiger Pluralausdruck"
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr "nplurals = %lu..."
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "... aber einige Meldungen haben nur eine Pluralform"
 msgstr[1] "... aber einige Meldungen haben nur %lu Pluralformen"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "... aber einige Meldungen haben eine Pluralform"
 msgstr[1] "... aber einige Meldungen haben %lu Pluralformen"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr "Bitte das Folgende versuchen; gültig für %s:\n"
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -1436,116 +1436,116 @@ msgstr ""
 "Kopfeintrag fehlt die Zeile:\n"
 "»Plural-Forms: nplurals=GANZZAHL; plural=AUSDRUCK;«"
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "»msgid«- und »msgstr_plural«-Eintrag beginnen nicht jeweils mit »\\n«"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "»msgid«- und »msgstr[%u]«-Eintrag beginnen nicht jeweils mit »\\n«"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "»msgid«- und »msgstr«-Eintrag beginnen nicht jeweils mit »\\n«"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "»msgid«- und »msgstr_plural«-Eintrag enden nicht jeweils mit »\\n«"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "»msgid«- und »msgstr[%u]«-Eintrag enden nicht jeweils mit »\\n«"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "»msgid«- und »msgstr«-Eintrag enden nicht jeweils mit »\\n«"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr "Die Plural-Behandlung ist eine Erweiterung von GNU gettext"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr "»%s« ist ein ungültiges Formatelement %s, im Gegensatz zu »msgid«"
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "bei »msgstr« fehlt die Markierung »%c« für den Tastatur-Accelerator"
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 "»msgstr« weist mehr als eine Markierung »%c« für den Tastatur-Accelerator auf"
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "Im Kopfeintrag fehlt das Feld »%s«\n"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "Feld »%s« im Kopfeintrag sollte am Beginn der Zeile anfangen\n"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 "Einige Felder im Kopfeintrag haben immer noch den anfänglichen Vorgabewert\n"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "Feld »%s« hat immer noch den anfänglichen Vorgabewert\n"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr "Warnung: Kopfteil der PO-Datei fehlt oder ist ungültig\n"
 
 # = Konvertierung der Meldung in Hinblick auf den Zeichensatz
 # 2001-03-11 20:56:03 CET -ke-
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr "Warnung: Konvertierung des Zeichensatzes wird fehlschlagen.\n"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr "Warnung: Kopfteil der PO-Datei ist ungenau (fuzzy)\n"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 "Warnung: ältere Versionen von »msgfmt« werden hierbei einen Fehler melden\n"
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "Bereichsname »%s« ist nicht als Dateiname geeignet"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "Bereichsname »%s« ist nicht als Dateiname geeignet; Präfix wird verwendet."
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "»domain %s«-Anweisung wird ignoriert"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "leerer »msgstr«-Eintrag wird ignoriert"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "ungenauer »msgstr«-Eintrag wird ignoriert"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: Warnung: Quelldatei enthält ungenaue Übersetzungen"
@@ -1811,24 +1811,24 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "German messages for %s"
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "der Zeichensatz »%s« bezeichnet keine portable Kodierung"
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "zwei unterschiedliche Zeichensätze »%s« und »%s« in Eingabedatei"
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 "bei Eingabedatei »%s« fehlt der Kopfeintrag mit der Angabe des Zeichensatzes"
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -1837,17 +1837,17 @@ msgstr ""
 "bei Bereich »%s« der Eingabedatei »%s« fehlt Kopfeintrag mit der Angabe des\n"
 "Zeichensatzes"
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "Zeichensatz »%s« für die Ausgabe bezeichnet keine portable Kodierung"
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr "Warnung: "
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
@@ -1855,7 +1855,7 @@ msgstr ""
 "Eingabedateien enthalten Meldungen in unterschiedlichen Kodierungen (u. a.\n"
 "UTF-8).  Die Ausgabe wird nach UTF-8 konvertiert.\n"
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1926,12 +1926,12 @@ msgstr ""
 msgid "conversion failure"
 msgstr "Fehler bei der Konvertierung"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "bei der Eingabedatei fehlt der Kopfeintrag mit der Angabe des Zeichensatzes"
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -1940,7 +1940,7 @@ msgstr ""
 "Es ist nicht möglich, von »%s« nach »%s« zu konvertieren.\n"
 "%s hängt von iconv() ab, und iconv() unterstützt diese Konvertierung nicht."
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2298,13 +2298,13 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<stdin>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: Warnung: "
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2314,15 +2314,15 @@ msgstr ""
 "Konvertierung der Meldungen in den Zeichensatz des Anwenders\n"
 "könnte fehlschlagen.\n"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr "Gleichwohl Fortsetzung; Parsing-Fehler sind zu erwarten."
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr "Gleichwohl Fortsetzung."
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2331,7 +2331,7 @@ msgstr ""
 "Zeichensatz »%s« wird nicht unterstützt.  %s hängt von iconv() ab,\n"
 "und iconv() unterstützt »%s« nicht.\n"
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2339,12 +2339,12 @@ msgstr ""
 "Dieses Problem lässt sich beheben, wenn Sie GNU libiconv installieren\n"
 "und dann GNU gettext erneut installieren.\n"
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2353,7 +2353,7 @@ msgstr ""
 "Zeichensatz »%s« wird nicht unterstützt.  %s hängt von iconv() ab.\n"
 "Diese Version wurde ohne iconv() erzeugt.\n"
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2391,43 +2391,43 @@ msgstr "Pluralform hat einen falschen Index"
 msgid "too many errors, aborting"
 msgstr "zu viele Fehler: Abbruch"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "ungültige Multibyte-Sequenz"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr "ungültige Multibyte-Sequenz am Ende der Datei"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr "ungültige Multibyte-Sequenz am Ende der Zeile"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr "Fehler von iconv"
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "Fehler beim Lesen von »%s«"
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "Schlüsselwort »%s« ist unbekannt"
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "ungültige Kontrollsequenz"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "Dateiende innerhalb einer Zeichenkette"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "Zeilenende innerhalb einer Zeichenkette"
 
@@ -2497,7 +2497,7 @@ msgstr "kein gültiger Name einer Java-Klasse: %s"
 msgid "failed to create \"%s\""
 msgstr "Fehler beim Anlegen »%s«"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "Fehler beim Schreiben von Datei »%s«"
@@ -2513,14 +2513,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "Fehler beim Öffnen von  »%s« zum Schreiben"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "Zu übersetzende Meldungen sollten nicht die Escape-Sequenz »\\%c« enthalten"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2536,12 +2536,12 @@ msgstr ""
 "msgid mit reinen ASCII-Zeichen aus.\n"
 "%s\n"
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "Ausgabedatei »%s« kann nicht erzeugt werden"
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "Standardausgabe"
@@ -2556,7 +2556,7 @@ msgstr "%s:%d: Warnung: Zeichenkonstante nicht korrekt beendet"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt beendet"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "diese Datei darf keine »domain«-Anweisung enthalten"
 
@@ -2586,18 +2586,18 @@ msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 "ohne Angabe zu berücksichtigender Schlüsselwörter schlägt xgettext fehl"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "Warnung: Typ der Datei »%s« mit Suffix »%s« ist unbekannt; C wird versucht"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Aus den Eingabedateien die zu übersetzenden Meldungen herausschreiben.\n"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -2606,7 +2606,7 @@ msgstr ""
 "Notwendige Argumente für Optionen in Langform sind auch für die Kurzform\n"
 "notwendig.  Dies gilt in gleicher Weise für optionale Argumente.\n"
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2622,7 +2622,7 @@ msgstr ""
 "Ergebnisse werden nach der Standardausgabe geschrieben, wenn keine Datei oder\n"
 "»-« angegeben ist.\n"
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2642,7 +2642,7 @@ msgstr ""
 "Gemäß Vorgabe wird die Sprache anhand des Suffixes des Namens der Eingabedatei\n"
 "geraten.\n"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2657,7 +2657,7 @@ msgstr ""
 "  -c, --add-comments[=KENNUNG]   Kommentare mit KENNUNG (oder die aus Zeilen\n"
 "                                   vor einem Schlüsselwort) herausschreiben\n"
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2677,7 +2677,7 @@ msgstr ""
 "  --debug                    detaillierteres Ergebnis bei Erkennung der\n"
 "                               Formatelemente\n"
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -2723,11 +2723,11 @@ msgstr ""
 "  -m, --msgstr-prefix[=KETTE]   KETTE oder \"\" als Präfix für msgstr nehmen\n"
 "  -M, --msgstr-suffix[=KETTE]   KETTE oder \"\" als Suffix für msgstr nehmen\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "Standardeingabe"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -2737,7 +2737,7 @@ msgstr ""
 "gettext(\"\") gibt den Kopfeintrag mit Meta-Informationen\n"
 "zurück, keine leere Zeichenkette.\n"
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "Programmiersprache »%s« unbekannt"
diff --git a/po/el.gmo b/po/el.gmo
index f1a3a2265..a87719557 100644
Binary files a/po/el.gmo and b/po/el.gmo differ
diff --git a/po/el.po b/po/el.po
index 89bd61fd3..11f47819b 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.34\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 1998-05-17 13:12+0200\n"
 "Last-Translator: Simos KSenitellis <simos@teiath.gr>\n"
 "Language-Team: Greek <simos@teiath.gr>\n"
@@ -29,8 +29,8 @@ msgid "Valid arguments are:"
 msgstr ""
 
 #
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "óöÜëìá óôï Üíïéãìá ôïõ \"%s\" ãéá áíÜãíùóç"
@@ -137,11 +137,11 @@ msgstr "%s: 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ç åðéëïãÞ `-W %s' äåí åðéôñÝðåé ðáñÜìåôñï\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
@@ -273,7 +273,7 @@ msgid ""
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
 #
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -290,7 +290,7 @@ msgstr ""
 "ËÅÉÔÏÕÑÃÉÊÏÔÇÔÁ Þ ÊÁÔÁËËÇËÏÔÇÔÁ ÃÉÁ ÅÍÁ ÓÕÃÊÅÊÑÉÌÅÍÏ ÓÊÏÐÏ.\n"
 
 #
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -300,7 +300,7 @@ msgid "Written by %s.\n"
 msgstr "ÃñáììÝíï áðü ôïí/ôçí %s.\n"
 
 #
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "ðÜñá ðïëëÜ ïñßóìáôá"
 
@@ -310,11 +310,11 @@ msgid "missing arguments"
 msgstr "õðïëåßðïíôáé ïñßóìáôá"
 
 #
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "ÄïêéìÜóôå `%s --help' ãéá ðåñéóóüôåñåò ðëçñïöïñßåò.\n"
@@ -378,26 +378,26 @@ msgstr ""
 "ÊáèéåñùìÝíïò êáôÜëïãïò áíáæÞôçóçò: %s\n"
 
 #
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Óôåßëôå áíáöïñÝò óöáëìÜôùí óôï <bug-gnu-utils@gnu.org>.\n"
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -407,7 +407,7 @@ msgid ""
 "  -i, --ip-address      addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -417,7 +417,7 @@ msgid ""
 "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr ""
 
@@ -438,7 +438,7 @@ msgstr ""
 msgid "%s and %s are mutually exclusive"
 msgstr "ôá %s êáé %s åßíáé áìïéâáßá áðïêëåéþìåíá"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
@@ -451,14 +451,14 @@ msgid ""
 msgstr ""
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -467,7 +467,7 @@ msgid ""
 "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -545,7 +545,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Ý÷åé åðéëå÷èåß áäýíáôï êñéôÞñéï åðéëïãÞò (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -581,7 +581,7 @@ msgstr ""
 "ðñþôï áñ÷åßï PO ðïõ ôá Ý÷åé ïñßóåé. Ïé èÝóåéò áñ÷åßïõ áðü üëá ôá áñ÷åßá PO\n"
 "èá äéáôçñçèïýí.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -671,7 +671,7 @@ msgstr ""
 "  -V, --version               åìöÜíéóç ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n"
 "  -w, --width=ÁÑÉÈÌÏÓ         ïñéóìüò ìåãÝèïõò ðëÜôïõò óåëßäáò åîüäïõ\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -759,19 +759,19 @@ msgid "warning: this message is not used"
 msgstr "ðñïåéäïðïßçóç: áõôü ôï ìÞíõìá äåí ÷ñçóéìïðïåßôáé"
 
 #
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, fuzzy, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "âñÝèçêáí %d óïâáñÜ óöÜëìáôá"
 
 #
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "åðáíáëáìâáíüìåíïò ïñéóìüò ìçíýìáôïò"
 
 #
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...áõôÞ åßíáé ç èÝóç ôïõ ðñþôïõ ïñéóìïý"
 
@@ -879,12 +879,12 @@ msgstr ""
 "  -V, --version               åìöÜíéóç ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n"
 "  -w, --width=ÁÑÉÈÌÏÓ         ïñéóìüò ìåãÝèïõò ðëÜôïõò óåëßäáò åîüäïõ\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -893,7 +893,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -1248,58 +1248,58 @@ msgid ""
 "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr ""
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
 #
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr ""
 
 #
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, fuzzy, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
@@ -1307,134 +1307,134 @@ msgstr[0] "
 msgstr[1] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
 
 #
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, fuzzy, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
 msgstr[1] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr ""
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
 #
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí îåêéíïýí êáé ïé äýï ìå '\\n'"
 
 #
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí îåêéíïýí êáé ïé äýï ìå '\\n'"
 
 #
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí îåêéíïýí êáé ïé äýï ìå '\\n'"
 
 #
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí ôåëåéþíïõí êáé ïé äýï ìå '\\n'"
 
 #
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí ôåëåéþíïõí êáé ïé äýï ìå '\\n'"
 
 #
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí ôåëåéþíïõí êáé ïé äýï ìå '\\n'"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr ""
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
 #
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, fuzzy, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "ôï ðåäßï `%s' Ý÷åé ðáñáëçöèåß áðü ôç êåöáëßäá"
 
 #
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "ôï ðåäßá êåöáëßäáò `%s' èá Ýðñåðå íá îåêéíÜ óôçí áñ÷Þ ôçò ãñáììÞò"
 
 #
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "ìåñéêÜ ðåäßá ôçò êåöáëßäáò Ý÷ïõí áêüìá ôçí áñ÷éêÞ åî ïñéóìïý ôéìÞ"
 
 #
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, fuzzy, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "ôï ðåäßï `%s' Ý÷åé áêüìá ôçí áñ÷éêÞ åî ïñéóìïý ôéìÞ"
 
 #
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 #, fuzzy
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
 #
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 #, fuzzy
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
 #
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 #, fuzzy
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
 #
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "ôï üíïìá ãéá ôç ðåñéï÷Þ \"%s\" äåí åßíáé êáôÜëëçëï ãéá üíïìá áñ÷åßïõ"
 
 #
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
@@ -1442,23 +1442,23 @@ msgstr ""
 "ãßíåé ÷ñÞóç ðñïèÝìáôïò"
 
 #
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "ç ïäçãßá `domain %s' áãíïåßôáé"
 
 #
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "ç êåíÞ åããñáöÞ `msgstr' áãíïåßôáé"
 
 #
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "ç ðñïóåããéóôéêÞ åããñáöÞ `msgstr' áãíïåßôáé"
 
 #
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
@@ -1654,46 +1654,46 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1745,18 +1745,18 @@ msgstr ""
 msgid "conversion failure"
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2041,14 +2041,14 @@ msgstr ""
 msgid "<stdin>"
 msgstr ""
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr ""
 
 #
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, fuzzy, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2056,33 +2056,33 @@ msgid ""
 msgstr ""
 "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr ""
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2090,7 +2090,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 #, fuzzy
 msgid ""
 "Charset missing in header.\n"
@@ -2134,29 +2134,29 @@ msgid "too many errors, aborting"
 msgstr "ðÜñá ðïëëÜ óöÜëìáôá, åãêáôáëåßðù"
 
 #
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 #, fuzzy
 msgid "invalid multibyte sequence"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
 #
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 #, fuzzy
 msgid "incomplete multibyte sequence at end of file"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
 #
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 #, fuzzy
 msgid "incomplete multibyte sequence at end of line"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr ""
 
 #
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
@@ -2164,24 +2164,24 @@ msgid "error while reading \"%s\""
 msgstr "óöÜëìá óôçí áíÜãíùóç ôïõ \"%s\""
 
 #
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "Üãíùóôç åíôïëÞ \"%s\""
 
 #
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 #, fuzzy
 msgid "invalid control sequence"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
 #
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "ôÝëïò áñ÷åßïõ (EOF) óôï áëöáñéèìçôéêü"
 
 #
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "ôÝñìá-ãñáììÞò (eol) óôï áëöáñéèìçôéêü"
 
@@ -2254,7 +2254,7 @@ msgid "failed to create \"%s\""
 msgstr ""
 
 #
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "óöÜëìá óôçí åããñáöÞ ôïõ áñ÷åßïõ \"%s\""
@@ -2270,7 +2270,7 @@ msgid "error while opening \"%s\" for writing"
 msgstr "óöÜëìá êáôÜ ôï Üíïéãìá ôïõ áñ÷åßïõ \"%s\" ãéá åããñáöÞ"
 
 #
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -2278,7 +2278,7 @@ msgstr ""
 "ôá ìçíýìáôá ðñïò ìåôÜöñáóç äåí ðñÝðåé íá ðåñéÝ÷ïõí ôï ÷áñáêôÞñá äéáöõãÞò `\\%"
 "c'"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2288,13 +2288,13 @@ msgid ""
 msgstr ""
 
 #
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "áäõíáìßá äçìéïõñãßáò áñ÷åßïõ åîüäïõ \"%s\""
 
 #
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "êáíïíéêÞ Ýîïäïò"
@@ -2312,7 +2312,7 @@ msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
 
 #
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "áõôü ôï áñ÷åßï äåí ìðïñåß íá ðåñéÝ÷åé ïäçãßåò ãéá ôç ðåñéï÷Þ"
 
@@ -2343,25 +2343,25 @@ msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
 #
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "ðñïåéäïðïßçóç: ôï áñ÷åßï `%s' ìå êáôÜëçîç `%s' åßíáé Üãíùóôï· èá äïêéìáóôåß C"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2371,7 +2371,7 @@ msgid ""
 "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2383,7 +2383,7 @@ msgid ""
 "By default the language is guessed depending on the input file name extension.\n"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2393,7 +2393,7 @@ msgid ""
 "                                 preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2405,7 +2405,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -2448,11 +2448,11 @@ msgstr ""
 "  -w, --width=ÁÑÉÈÌÏÓ         ïñéóìüò ìåãÝèïõò ðëÜôïõò óåëßäáò åîüäïõ\n"
 
 #
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "êáíïíéêÞ åßóïäïò"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -2460,7 +2460,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "ç ãëþóóá `%s' åßíáé Üãíùóôç"
diff --git a/po/en@boldquot.gmo b/po/en@boldquot.gmo
index f2c896100..ff33be630 100644
Binary files a/po/en@boldquot.gmo and b/po/en@boldquot.gmo differ
diff --git a/po/en@boldquot.po b/po/en@boldquot.po
index 847f75f8b..d3cd606da 100644
--- a/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@ -30,9 +30,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext 0.11.1\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
-"PO-Revision-Date: 2002-04-24 19:27+0200\n"
+"Project-Id-Version: GNU gettext 0.11.3\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"PO-Revision-Date: 2002-07-17 13:52+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -54,8 +54,8 @@ msgstr "ambiguous argument ‘%s’ for ‘%s’"
 msgid "Valid arguments are:"
 msgstr "Valid arguments are:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "error while opening “%s” for reading"
@@ -146,11 +146,11 @@ msgstr "%s: option ‘-W %s’ is ambiguous\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: option ‘-W %s’ doesn't allow an argument\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Java compiler not found, try installing gcj or set $JAVAC"
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "Java virtual machine not found, try installing gij or set $JAVA"
 
@@ -281,7 +281,7 @@ msgstr ""
 "format specifications in ‘msgid’ and ‘%s’ for argument ‘%s"
 "[0m’ are not the same"
 
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -296,7 +296,7 @@ msgstr ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -305,7 +305,7 @@ msgstr ""
 msgid "Written by %s.\n"
 msgstr "Written by %s.\n"
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "too many arguments"
 
@@ -313,11 +313,11 @@ msgstr "too many arguments"
 msgid "missing arguments"
 msgstr "missing arguments"
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Try ‘%s --help’ for more information.\n"
@@ -378,25 +378,25 @@ msgstr ""
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Usage: %s [OPTION]\n"
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr "Print the machine's hostname.\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -411,7 +411,7 @@ msgstr ""
 "                          and aliases\n"
 "  -i, --ip-address      addresses for the hostname\n"
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -424,7 +424,7 @@ msgstr ""
 "  -h, --help                  display this help and exit\n"
 "  -V, --version               output version information and exit\n"
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr "could not get host name"
 
@@ -444,7 +444,7 @@ msgstr "at most one input file allowed"
 msgid "%s and %s are mutually exclusive"
 msgstr "%s and %s are mutually exclusive"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Usage: %s [OPTION] [INPUTFILE]\n"
@@ -459,14 +459,14 @@ msgstr ""
 "and manipulates the attributes.\n"
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "Mandatory arguments to long options are mandatory for short options too.\n"
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -479,7 +479,7 @@ msgstr ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 "If no input file is given or if it is -, standard input is read.\n"
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -567,7 +567,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "impossible selection criteria specified (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Usage: %s [OPTION] [INPUTFILE]...\n"
@@ -595,7 +595,7 @@ msgstr ""
 "is specified, they will be taken from the first PO file to define them.\n"
 "File positions from all PO files will be cumulated.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -681,7 +681,7 @@ msgstr ""
 "  -s, --sort-output              generate sorted output\n"
 "  -F, --sort-by-file             sort output by file location\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -761,18 +761,18 @@ msgstr "this message is used but not defined in %s"
 msgid "warning: this message is not used"
 msgstr "warning: this message is not used"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "found %d fatal error"
 msgstr[1] "found %d fatal errors"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "duplicate message definition"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...this is the location of the first definition"
 
@@ -855,12 +855,12 @@ msgstr ""
 "  -F, --sort-by-file             sort output by file location\n"
 "      --omit-header              don't write header with ‘msgid \"\"’ entry\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Converts a translation catalog to a different character encoding.\n"
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -871,7 +871,7 @@ msgstr ""
 "  -t, --to-code=NAME          encoding for output\n"
 "The default encoding is the current locale's encoding.\n"
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -1274,25 +1274,25 @@ msgstr ""
 "      --statistics            print statistics about translations\n"
 "  -v, --verbose               increase verbosity level\n"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr "plural expression can produce negative values"
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu but plural expression can produce values as large as %lu"
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr "plural expression can produce division by zero"
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr "plural expression can produce integer overflow"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -1300,51 +1300,51 @@ msgstr ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr "message catalog has plural form translations..."
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...but header entry lacks a “plural=EXPRESSION” attribute"
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...but header entry lacks a “nplurals=INTEGER” attribute"
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 msgid "invalid nplurals value"
 msgstr "invalid nplurals value"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr "invalid plural expression"
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr "nplurals = %lu..."
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "...but some messages have only one plural form"
 msgstr[1] "...but some messages have only %lu plural forms"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "...but some messages have one plural form"
 msgstr[1] "...but some messages have %lu plural forms"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr "Try using the following, valid for %s:\n"
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -1352,119 +1352,119 @@ msgstr ""
 "message catalog has plural form translations, but lacks a header entry with "
 "“Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;”"
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgid_plural’ entries do not both begin with ‘\\n"
 "[0m’"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgstr[%u]’ entries do not both begin with ‘\\n"
 "[0m’"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgstr’ entries do not both begin with ‘\\n’"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgid_plural’ entries do not both end with ‘\\n"
 "[0m’"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgstr[%u]’ entries do not both end with ‘\\n’"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgstr’ entries do not both end with ‘\\n’"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr "plural handling is a GNU gettext extension"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr "‘%s’ is not a valid %s format string, unlike ‘msgid’"
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr lacks the keyboard accelerator mark ‘%c’"
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr has too many keyboard accelerator marks ‘%c’"
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "headerfield ‘%s’ missing in header\n"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "header field ‘%s’ should start at beginning of line\n"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 msgid "some header fields still have the initial default value\n"
 msgstr "some header fields still have the initial default value\n"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "field ‘%s’ still has initial default value\n"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr "warning: PO file header missing or invalid\n"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr "warning: charset conversion will not work\n"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr "warning: PO file header fuzzy\n"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "warning: older versions of msgfmt will give an error on this\n"
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domain name “%s” not suitable as file name"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domain name “%s” not suitable as file name: will use prefix"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "‘domain %s’ directive ignored"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "empty ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "fuzzy ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: warning: source file contains fuzzy translation"
@@ -1713,17 +1713,17 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "English translations for %s package"
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "present charset “%s” is not a portable encoding name"
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "two different charsets “%s” and “%s” in input file"
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
@@ -1731,7 +1731,7 @@ msgstr ""
 "input file ‘%s’ doesn't contain a header entry with a charset "
 "specification"
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -1740,17 +1740,17 @@ msgstr ""
 "domain “%s” in input file ‘%s’ doesn't contain a header entry "
 "with a charset specification"
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "target charset “%s” is not a portable encoding name."
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr "warning: "
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
@@ -1758,7 +1758,7 @@ msgstr ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1828,11 +1828,11 @@ msgstr ""
 msgid "conversion failure"
 msgstr "conversion failure"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "input file doesn't contain a header entry with a charset specification"
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -1841,7 +1841,7 @@ msgstr ""
 "Cannot convert from “%s” to “%s”. %s relies on iconv(), and iconv"
 "() does not support this conversion."
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2174,13 +2174,13 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<stdin>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: warning: "
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2189,15 +2189,15 @@ msgstr ""
 "Charset “%s” is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr "Continuing anyway, expect parse errors."
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr "Continuing anyway."
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2206,7 +2206,7 @@ msgstr ""
 "Charset “%s” is not supported. %s relies on iconv(),\n"
 "and iconv() does not support “%s”.\n"
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2214,12 +2214,12 @@ msgstr ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2228,7 +2228,7 @@ msgstr ""
 "Charset “%s” is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2265,43 +2265,43 @@ msgstr "plural form has wrong index"
 msgid "too many errors, aborting"
 msgstr "too many errors, aborting"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "invalid multibyte sequence"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr "incomplete multibyte sequence at end of file"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr "incomplete multibyte sequence at end of line"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr "iconv failure"
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error while reading “%s”"
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "keyword “%s” unknown"
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "invalid control sequence"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "end-of-file within string"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "end-of-line within string"
 
@@ -2366,7 +2366,7 @@ msgstr "not a valid Java class name: %s"
 msgid "failed to create \"%s\""
 msgstr "failed to create “%s”"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "error while writing “%s” file"
@@ -2380,7 +2380,7 @@ msgstr "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgid "error while opening \"%s\" for writing"
 msgstr "error while opening “%s” for writing"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -2388,7 +2388,7 @@ msgstr ""
 "internationalized messages should not contain the ‘\\%c’ escape "
 "sequence"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2401,12 +2401,12 @@ msgstr ""
 "different from yours. Consider using a pure ASCII msgid instead.\n"
 "%s\n"
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "cannot create output file “%s”"
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "standard output"
@@ -2421,7 +2421,7 @@ msgstr "%s:%d: warning: unterminated character constant"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: warning: unterminated string literal"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "this file may not contain domain directives"
 
@@ -2448,17 +2448,17 @@ msgstr "--join-existing cannot be used when output is written to stdout"
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext cannot work without keywords to look for"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "warning: file ‘%s’ extension ‘%s’ is unknown; will try C"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extract translatable strings from given input files.\n"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -2467,7 +2467,7 @@ msgstr ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2482,7 +2482,7 @@ msgstr ""
 "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
 "If output file is -, output is written to standard output.\n"
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2501,7 +2501,7 @@ msgstr ""
 "  -C, --c++                      shorthand for --language=C++\n"
 "By default the language is guessed depending on the input file name extension.\n"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2516,7 +2516,7 @@ msgstr ""
 "  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
 "                                 preceding keyword lines) in output file\n"
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2533,7 +2533,7 @@ msgstr ""
 "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
 "      --debug                    more detailed formatstring recognition result\n"
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -2574,11 +2574,11 @@ msgstr ""
 "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
 "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -2588,7 +2588,7 @@ msgstr ""
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "language ‘%s’ unknown"
diff --git a/po/en@quot.gmo b/po/en@quot.gmo
index 176230ecf..0fdb75b77 100644
Binary files a/po/en@quot.gmo and b/po/en@quot.gmo differ
diff --git a/po/en@quot.po b/po/en@quot.po
index 900f5559f..64ab20e26 100644
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -27,9 +27,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext 0.11.1\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
-"PO-Revision-Date: 2002-04-24 19:27+0200\n"
+"Project-Id-Version: GNU gettext 0.11.3\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"PO-Revision-Date: 2002-07-17 13:52+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -51,8 +51,8 @@ msgstr "ambiguous argument ‘%s’ for ‘%s’"
 msgid "Valid arguments are:"
 msgstr "Valid arguments are:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "error while opening “%s” for reading"
@@ -143,11 +143,11 @@ msgstr "%s: option ‘-W %s’ is ambiguous\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: option ‘-W %s’ doesn't allow an argument\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Java compiler not found, try installing gcj or set $JAVAC"
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "Java virtual machine not found, try installing gij or set $JAVA"
 
@@ -268,7 +268,7 @@ msgid ""
 msgstr ""
 "format specifications in ‘msgid’ and ‘%s’ for argument ‘%s’ are not the same"
 
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -283,7 +283,7 @@ msgstr ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -292,7 +292,7 @@ msgstr ""
 msgid "Written by %s.\n"
 msgstr "Written by %s.\n"
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "too many arguments"
 
@@ -300,11 +300,11 @@ msgstr "too many arguments"
 msgid "missing arguments"
 msgstr "missing arguments"
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Try ‘%s --help’ for more information.\n"
@@ -365,25 +365,25 @@ msgstr ""
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Usage: %s [OPTION]\n"
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr "Print the machine's hostname.\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -398,7 +398,7 @@ msgstr ""
 "                          and aliases\n"
 "  -i, --ip-address      addresses for the hostname\n"
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -411,7 +411,7 @@ msgstr ""
 "  -h, --help                  display this help and exit\n"
 "  -V, --version               output version information and exit\n"
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr "could not get host name"
 
@@ -431,7 +431,7 @@ msgstr "at most one input file allowed"
 msgid "%s and %s are mutually exclusive"
 msgstr "%s and %s are mutually exclusive"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Usage: %s [OPTION] [INPUTFILE]\n"
@@ -446,14 +446,14 @@ msgstr ""
 "and manipulates the attributes.\n"
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "Mandatory arguments to long options are mandatory for short options too.\n"
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -466,7 +466,7 @@ msgstr ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 "If no input file is given or if it is -, standard input is read.\n"
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -554,7 +554,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "impossible selection criteria specified (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Usage: %s [OPTION] [INPUTFILE]...\n"
@@ -582,7 +582,7 @@ msgstr ""
 "is specified, they will be taken from the first PO file to define them.\n"
 "File positions from all PO files will be cumulated.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -668,7 +668,7 @@ msgstr ""
 "  -s, --sort-output              generate sorted output\n"
 "  -F, --sort-by-file             sort output by file location\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -748,18 +748,18 @@ msgstr "this message is used but not defined in %s"
 msgid "warning: this message is not used"
 msgstr "warning: this message is not used"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "found %d fatal error"
 msgstr[1] "found %d fatal errors"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "duplicate message definition"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...this is the location of the first definition"
 
@@ -842,12 +842,12 @@ msgstr ""
 "  -F, --sort-by-file             sort output by file location\n"
 "      --omit-header              don't write header with ‘msgid \"\"’ entry\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Converts a translation catalog to a different character encoding.\n"
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -858,7 +858,7 @@ msgstr ""
 "  -t, --to-code=NAME          encoding for output\n"
 "The default encoding is the current locale's encoding.\n"
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -1261,25 +1261,25 @@ msgstr ""
 "      --statistics            print statistics about translations\n"
 "  -v, --verbose               increase verbosity level\n"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr "plural expression can produce negative values"
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu but plural expression can produce values as large as %lu"
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr "plural expression can produce division by zero"
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr "plural expression can produce integer overflow"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -1287,51 +1287,51 @@ msgstr ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr "message catalog has plural form translations..."
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...but header entry lacks a “plural=EXPRESSION” attribute"
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...but header entry lacks a “nplurals=INTEGER” attribute"
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 msgid "invalid nplurals value"
 msgstr "invalid nplurals value"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr "invalid plural expression"
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr "nplurals = %lu..."
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "...but some messages have only one plural form"
 msgstr[1] "...but some messages have only %lu plural forms"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "...but some messages have one plural form"
 msgstr[1] "...but some messages have %lu plural forms"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr "Try using the following, valid for %s:\n"
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -1339,110 +1339,110 @@ msgstr ""
 "message catalog has plural form translations, but lacks a header entry with "
 "“Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;”"
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "‘msgid’ and ‘msgid_plural’ entries do not both begin with ‘\\n’"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "‘msgid’ and ‘msgstr[%u]’ entries do not both begin with ‘\\n’"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "‘msgid’ and ‘msgstr’ entries do not both begin with ‘\\n’"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "‘msgid’ and ‘msgid_plural’ entries do not both end with ‘\\n’"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "‘msgid’ and ‘msgstr[%u]’ entries do not both end with ‘\\n’"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "‘msgid’ and ‘msgstr’ entries do not both end with ‘\\n’"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr "plural handling is a GNU gettext extension"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr "‘%s’ is not a valid %s format string, unlike ‘msgid’"
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr lacks the keyboard accelerator mark ‘%c’"
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr has too many keyboard accelerator marks ‘%c’"
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "headerfield ‘%s’ missing in header\n"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "header field ‘%s’ should start at beginning of line\n"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 msgid "some header fields still have the initial default value\n"
 msgstr "some header fields still have the initial default value\n"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "field ‘%s’ still has initial default value\n"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr "warning: PO file header missing or invalid\n"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr "warning: charset conversion will not work\n"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr "warning: PO file header fuzzy\n"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "warning: older versions of msgfmt will give an error on this\n"
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domain name “%s” not suitable as file name"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domain name “%s” not suitable as file name: will use prefix"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "‘domain %s’ directive ignored"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "empty ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "fuzzy ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: warning: source file contains fuzzy translation"
@@ -1689,24 +1689,24 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "English translations for %s package"
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "present charset “%s” is not a portable encoding name"
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "two different charsets “%s” and “%s” in input file"
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 "input file ‘%s’ doesn't contain a header entry with a charset specification"
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -1715,17 +1715,17 @@ msgstr ""
 "domain “%s” in input file ‘%s’ doesn't contain a header entry with a charset "
 "specification"
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "target charset “%s” is not a portable encoding name."
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr "warning: "
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
@@ -1733,7 +1733,7 @@ msgstr ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1803,11 +1803,11 @@ msgstr ""
 msgid "conversion failure"
 msgstr "conversion failure"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "input file doesn't contain a header entry with a charset specification"
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -1816,7 +1816,7 @@ msgstr ""
 "Cannot convert from “%s” to “%s”. %s relies on iconv(), and iconv() does not "
 "support this conversion."
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2149,13 +2149,13 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<stdin>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: warning: "
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2164,15 +2164,15 @@ msgstr ""
 "Charset “%s” is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr "Continuing anyway, expect parse errors."
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr "Continuing anyway."
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2181,7 +2181,7 @@ msgstr ""
 "Charset “%s” is not supported. %s relies on iconv(),\n"
 "and iconv() does not support “%s”.\n"
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2189,12 +2189,12 @@ msgstr ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2203,7 +2203,7 @@ msgstr ""
 "Charset “%s” is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2240,43 +2240,43 @@ msgstr "plural form has wrong index"
 msgid "too many errors, aborting"
 msgstr "too many errors, aborting"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "invalid multibyte sequence"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr "incomplete multibyte sequence at end of file"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr "incomplete multibyte sequence at end of line"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr "iconv failure"
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error while reading “%s”"
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "keyword “%s” unknown"
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "invalid control sequence"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "end-of-file within string"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "end-of-line within string"
 
@@ -2341,7 +2341,7 @@ msgstr "not a valid Java class name: %s"
 msgid "failed to create \"%s\""
 msgstr "failed to create “%s”"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "error while writing “%s” file"
@@ -2355,14 +2355,14 @@ msgstr "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgid "error while opening \"%s\" for writing"
 msgstr "error while opening “%s” for writing"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internationalized messages should not contain the ‘\\%c’ escape sequence"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2375,12 +2375,12 @@ msgstr ""
 "different from yours. Consider using a pure ASCII msgid instead.\n"
 "%s\n"
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "cannot create output file “%s”"
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "standard output"
@@ -2395,7 +2395,7 @@ msgstr "%s:%d: warning: unterminated character constant"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: warning: unterminated string literal"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "this file may not contain domain directives"
 
@@ -2422,17 +2422,17 @@ msgstr "--join-existing cannot be used when output is written to stdout"
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext cannot work without keywords to look for"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "warning: file ‘%s’ extension ‘%s’ is unknown; will try C"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extract translatable strings from given input files.\n"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -2441,7 +2441,7 @@ msgstr ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2456,7 +2456,7 @@ msgstr ""
 "  -p, --output-dir=DIR           output files will be placed in directory DIR\n"
 "If output file is -, output is written to standard output.\n"
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2475,7 +2475,7 @@ msgstr ""
 "  -C, --c++                      shorthand for --language=C++\n"
 "By default the language is guessed depending on the input file name extension.\n"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2490,7 +2490,7 @@ msgstr ""
 "  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
 "                                 preceding keyword lines) in output file\n"
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2507,7 +2507,7 @@ msgstr ""
 "  -T, --trigraphs                understand ANSI C trigraphs for input\n"
 "      --debug                    more detailed formatstring recognition result\n"
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -2548,11 +2548,11 @@ msgstr ""
 "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
 "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -2562,7 +2562,7 @@ msgstr ""
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "language ‘%s’ unknown"
diff --git a/po/es.gmo b/po/es.gmo
index 69bfd9b60..bf42043d7 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 8df6e8f6b..075bd877e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.11.2\n"
-"POT-Creation-Date: 2002-05-02 15:48+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2002-06-11 18:08-0500\n"
 "Last-Translator: Max de Mendizábal <max@upn.mx>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -28,8 +28,8 @@ msgstr "el argumento `%s' es ambiguo para `%s'"
 msgid "Valid arguments are:"
 msgstr "Los argumentos válidos son:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "error al abrir el fichero \"%s\" para lectura"
@@ -124,12 +124,12 @@ msgstr "%s: la opci
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: la opción `-W %s' no admite ningún argumento\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "No se encuentró al compilador de Java, intente instalar gcj o poner $JAVAC"
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "No se encontró a la máquina virtual de Java, intente instalar gij o poner "
@@ -292,10 +292,10 @@ msgid "missing arguments"
 msgstr "faltan argumentos"
 
 #: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pruebe `%s --help' para más información.\n"
@@ -374,10 +374,10 @@ msgstr ""
 "Directorio de búsqueda estándar: %s\n"
 
 #: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Comunicar los `bugs' a <bug-gnu-gettext@gnu.org>.\n"
 
@@ -406,7 +406,7 @@ msgstr ""
 "                        completo del dominio calificado,\n"
 "   -i, --ip-address     dirección del nombre de la máquina\n"
 
-#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -439,7 +439,7 @@ msgstr "s
 msgid "%s and %s are mutually exclusive"
 msgstr "%s y %s son mutuamente excluyentes"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]\n"
@@ -454,14 +454,14 @@ msgstr ""
 "atributos, y luego manipula los atributos.\n"
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "Los argumentos obligatorios para las opciones largas también son obligatorios para las opciones cortas.\n"
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -475,7 +475,7 @@ msgstr ""
 "                               de ficheros de entrada\n"
 "Si no se da ningún fichero de entrada o si es -, se lee la entrada estándar.\n"
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -565,7 +565,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "se especificó un criterio de selección imposible (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]...\n"
@@ -596,7 +596,7 @@ msgstr ""
 "fichero PO para definirlos. Las posiciones dentro del fichero de todos\n"
 "los ficheros PO se conservarán.  \n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -690,7 +690,7 @@ msgstr ""
 "  -s, --sort-output        escribe la salida ordenada\n"
 "  -F, --sort-by-file       escribe la salida ordenada por fichero\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -855,7 +855,7 @@ msgstr "atenci
 #
 # 07061996mm: Mujer fatal es menos que mortal, menos que peligroso e incita a la
 # aventura. Quizá no sea tan malo como dice Enrique, a menos que...
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -863,11 +863,11 @@ msgstr[0] "se encontr
 msgstr[1] "se encontraron %d errores fatales"
 
 # Nota: es la definición la que está duplicada.
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "definición del mensaje duplicada"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...aquí está la primera definición"
 
@@ -955,12 +955,12 @@ msgstr ""
 "  -F, --sort-by-file       escribe la salida ordenada por fichero\n"
 "      --omit-header        no escribe la línea de encabezado `msgid \"\"'\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Convierte un catálogo de traducción a una codificación de carácteres distinta.\n"
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -974,7 +974,7 @@ msgstr ""
 # Lo mismo en ' informa de la versión...' em
 # Obligatorios.. obligatorios , queda un poco feo. Si lo que se pretende
 # es ser fiel al original, pon 'son tambien obligatorios para...' em+
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -1398,26 +1398,26 @@ msgstr ""
 "       --statistics            muestra las estadísticas sobre las traducciones\n"
 "   -v, --verbose               aumenta el cantidad de mensajes\n"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr "la expresión plural puede producir resultados negativos"
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu pero las expresiones plurales pueden producir valores tan "
 "grades como %lu"
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr "la expresión plural puede producir una división por cero"
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr "la expresión plural puede producir un sobreflujo entero"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -1425,51 +1425,51 @@ msgstr ""
 "la expresión plural puede producir excepciones aritméticas, posiblemente una "
 "división por cero"
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr "el catálogo de mensajes tiene formas plurales en las traducciones..."
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "... pero el encabezado no tiene el atributo \"plural=EXPRESIÓN\""
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "... pero el encabezado no tiene el atributo \"nplurals=ENTERO\""
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 msgid "invalid nplurals value"
 msgstr "valor inválido de nplurals"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr "expresión plural inválida"
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr "nplurals = %lu ..."
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "... pero algunos mensajes sólo tienen solo una forma plural"
 msgstr[1] "... pero algunos mensajes sólo tienen %lu formas plurales"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "... pero algunos mensajes tienen solo una forma plural"
 msgstr[1] "... pero algunos mensajes tienen %lu formas plurales"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr "Pruebe utilizando lo siguiente, válido para %s:\n"
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -1493,7 +1493,7 @@ msgstr ""
 # Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
 # Si no se te ocurre nada mejor, sugerencia:
 # "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "a alguna de las líneas `msgid' y `msgid_plural' les falta el `\\n' inicial"
@@ -1514,7 +1514,7 @@ msgstr ""
 # Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
 # Si no se te ocurre nada mejor, sugerencia:
 # "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
@@ -1536,98 +1536,98 @@ msgstr ""
 # Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
 # Si no se te ocurre nada mejor, sugerencia:
 # "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "a alguna de las líneas `msgid' y `msgstr' les falta el `\\n' inicial"
 
 # Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
 # y la otra no, así de sencillo. sv+
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "a alguna de las líneas `msgid' y `msgid_plural' les falta el `\\n' final"
 
 # Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
 # y la otra no, así de sencillo. sv+
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "a alguna de las líneas `msgid' y `msgstr[%u]' les falta el `\\n' final"
 
 # Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
 # y la otra no, así de sencillo. sv+
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "a alguna de las líneas `msgid' y `msgstr' les falta el `\\n' final"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr "el manejo del plural es una extensión del gettext de GNU"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr "'%s' no es un formato de cadena válido %s, a diferencia de 'msgid'"
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr no tiene la marca del acelerador de teclado '%c'"
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr tiene demasiadas marcas de aceleración de teclado '%c'"
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "no existe el campo `%s' en la cabecera\n"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "el campo de encabezado `%s' debe comenzar al principio de la línea\n"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 msgid "some header fields still have the initial default value\n"
 msgstr "algunos campos de cabecera aún tienen el valor inicial por defecto\n"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "el campo `%s' aún tiene el valor inicial por defecto\n"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr "atención: el encabezado del fichero PO no existe o es inválido\n"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr "atención: la conversión del conjunto de caracteres no funcionará\n"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr "atención: el encabezado del fichero PO está difuso\n"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 "atención: las versiones anteriores de msgfmt producirán un error en esto\n"
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "el nombre de dominio \"%s\" no es válido como nombre de fichero"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "el nombre del dominio \"%s\" no es válido como nombre de fichero:\n"
 "se utilizará un prefijo"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "la instrucción `domain %s' no tiene efecto"
@@ -1636,17 +1636,17 @@ msgstr "la instrucci
 # Ignorar es no saber (not to know). "to ignore" es "no hacer caso".
 # Sugerencia: Descartar. sv
 # Excelente palabreja. Me gusta mucho. mm
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "se descarta la línea vacía `msgstr'"
 
 # Lo mismo. sv
 # Ok. mm
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "se descarta la línea difusa `msgstr'"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: atención: el fichero fuente contiene una traducción difusa"
@@ -1909,21 +1909,21 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Traducciones al español para el paquete %s"
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 "el conjunto de caracteres actual \"%s\" no es un nombre de codificación "
 "portátil"
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 "hay dos distintos conjuntos de caracteres \"%s\" y \"%s\" en el fichero de "
 "entrada"
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
@@ -1931,7 +1931,7 @@ msgstr ""
 "el fichero de entrada `%s' no contiene una línea de encabezado con la "
 "especificación del conjunto de caracteres"
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -1940,19 +1940,19 @@ msgstr ""
 "el dominio \"%s\" en el fichero de entrada `%s' no contiene una línea de\n"
 "encabezado con la especificación del conjunto de caracteres"
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 "el conjunto de caracteres destino \"%s\" no es un nombre de codificación "
 "portátil."
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr "atención: "
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
@@ -1960,7 +1960,7 @@ msgstr ""
 "Los ficheros de entrada contienen mensajes en distintas codificaciones,\n"
 "UTF-8 entre otras. Por ello se convierte la salida a UTF-8.\n"
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2030,13 +2030,13 @@ msgstr ""
 msgid "conversion failure"
 msgstr "falla de conversión"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "El fichero de entrada no contiene una línea de encabezado que especifique el "
 "conjunto de caracteres"
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2045,7 +2045,7 @@ msgstr ""
 "No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv(), e iconv()\n"
 "no soporta este tipo de conversión."
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2405,13 +2405,13 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<stdin>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: atención: "
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2421,15 +2421,15 @@ msgstr ""
 "La conversión de mensajes al conjunto de caracteres del usuario podría no "
 "funcionar.\n"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr "Se continúa de todas formas, aunque habrá errores de parseo."
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr "Se continúa de todas formas."
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2438,7 +2438,7 @@ msgstr ""
 "El conjunto de caracteres \"%s\" no está soportado. %s se basa en iconv(),\n"
 "e iconv() no soporta \"%s\".\n"
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2446,12 +2446,12 @@ msgstr ""
 "Instalando GNU libiconv y luego reinstalando GNU gettext\n"
 "podría arreglar este problema.\n"
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2460,7 +2460,7 @@ msgstr ""
 "El conjunto de caracteres \"%s\" no está soportado. %s se basa en iconv().\n"
 "Esta versión fue construida sin iconv().\n"
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2531,43 +2531,43 @@ msgstr "la primera forma del plural tiene un 
 msgid "too many errors, aborting"
 msgstr "demasiados errores, programa interrumpido"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "sucesión de multibyte inválida"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr "sucesión de multibyte inválida al final del fichero"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr "sucesión de multibyte inválida al final de la línea"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr "fallo en iconv"
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error al leer \"%s\""
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "palabra clave \"%s\" desconocida"
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "secuencia de control ilegal"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "fin de fichero dentro de una cadena"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "fin de línea dentro de una cadena"
 
@@ -2632,7 +2632,7 @@ msgstr "no es un nombre de clase Java v
 msgid "failed to create \"%s\""
 msgstr "fallo al crear \"%s\""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "hubo un error al escribir el fichero \"%s\""
@@ -2647,7 +2647,7 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "error al abrir el fichero \"%s\" para escritura"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -2655,7 +2655,7 @@ msgstr ""
 "Los mensajes internacionalizados no deben contener la secuencia de escape `\\"
 "%c'"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2668,12 +2668,12 @@ msgstr ""
 "caracteres diferente a la suya. Considere la opción de utilizar un msgid\n"
 "en ASCII puro. %s\n"
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "no se puede crear el fichero de salida \"%s\""
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "salida estándar"
@@ -2719,7 +2719,7 @@ msgstr "%s:%d: atenci
 # mente el verbo poder en Castellano es mucho más flexible que en otros
 # idiomas. De todas maneras siempre se puede mirar otras traducciones.  em
 # ok. Acepto en 'no puede' a reserva de encontrar nuevos argumentos. mm
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "este fichero no puede contener instrucciones de dominio"
 
@@ -2748,19 +2748,19 @@ msgstr ""
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext no puede funcionar sin palabras claves que buscar"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "atención: el fichero `%s' con extensión `%s'\n"
 "es desconocido; se intentará tipo C"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extrae las cadenas traducibles a partir de un grupo de ficheros dados.\n"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -2769,7 +2769,7 @@ msgstr ""
 "Los argumentos obligatorios en las opciones largas también lo son para las \n"
 "opciones cortas. De forma similar se comportan los argumentos opcionales.\n"
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2786,7 +2786,7 @@ msgstr ""
 "                                  directorio DIR\n"
 "Si el fichero de salida es -, la salida será escrita a la salida estándar.\n"
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2806,7 +2806,7 @@ msgstr ""
 "Por defecto, el lenguaje se adivina dependiendo de la extensión del fichero\n"
 "de entrada.\n"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2822,7 +2822,7 @@ msgstr ""
 "                                  aquellas líneas que preceden a la palabra\n"
 "                                  clave) en el fichero de salida\n"
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2843,7 +2843,7 @@ msgstr ""
 "       --debug                    muestra con más detalle el reconocimiento\n"
 "                                  de las cadenas de formato\n"
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -2893,11 +2893,11 @@ msgstr ""
 "   -M, --msgstr-suffix[=CADENA]   utiliza la CADENA o \"\" como sufijo para las\n"
 "                                  líneas del msgstr\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "entrada estándar"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -2907,7 +2907,7 @@ msgstr ""
 "gettext(\"\") regresa la línea de encabezado con la\n"
 "metainformación, no una cadena vacía.\n"
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "lenguaje `%s' desconocido"
diff --git a/po/et.gmo b/po/et.gmo
index 2a7d80dbe..bd1092d04 100644
Binary files a/po/et.gmo and b/po/et.gmo differ
diff --git a/po/et.po b/po/et.po
index 3283185cd..105109c63 100644
--- a/po/et.po
+++ b/po/et.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2001-04-30 16:25+0200\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -27,8 +27,8 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "viga faili \"%s\" avamisel (lugemiseks)"
@@ -119,11 +119,11 @@ msgstr "%s: v
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: võtmel `-W %s' ei tohi olla argumente\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
@@ -233,7 +233,7 @@ msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -250,7 +250,7 @@ msgstr ""
 "TEATUD KINDLAKS EESMÄRGIKS. Üksikasjade suhtes vaata GNU Üldist Avalikku\n"
 "Litsentsi.\n"
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -259,7 +259,7 @@ msgstr ""
 msgid "Written by %s.\n"
 msgstr "Selle programmi on kirjutanud %s.\n"
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "liiga palju argumente"
 
@@ -267,11 +267,11 @@ msgstr "liiga palju argumente"
 msgid "missing arguments"
 msgstr "argumendid on puudu"
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Täiendava info saamiseks proovi `%s --help'.\n"
@@ -336,26 +336,26 @@ msgstr ""
 "found in the selected catalog are translated.!!!\n"
 "Standardne otsinukataloog: %s\n"
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Vigadest teata aadressile <bug-gnu-utils@gnu.org>.\n"
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -365,7 +365,7 @@ msgid ""
 "  -i, --ip-address      addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -375,7 +375,7 @@ msgid ""
 "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr ""
 
@@ -395,7 +395,7 @@ msgstr ""
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ja %s on vastastikku välistavad"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
@@ -408,14 +408,14 @@ msgid ""
 msgstr ""
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -424,7 +424,7 @@ msgid ""
 "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -504,7 +504,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "lubamatu valikukriteeriumi kirjeldus (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -537,7 +537,7 @@ msgstr ""
 "comments) jäetakse alles ainult esimesena kirjeldatud PO failist.\n"
 "Positsioonikirjeldused võetakse ja säilitatakse kõikidest PO failidest.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -627,7 +627,7 @@ msgstr ""
 "  -V, --version              väljastab versiooniinfo ja lõpetab programmi töö\n"
 "  -w, --width=NUMBER         määrab väljastatava lehekülje laiuse\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -707,18 +707,18 @@ msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
 msgid "warning: this message is not used"
 msgstr "hoiatus: see teade on kasutamata"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "leitud %d tõsine viga"
 msgstr[1] "leitud %d tõsist viga"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "teade on kirjeldatud kaks korda"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...see on esimese kirjelduse asukoht"
 
@@ -822,12 +822,12 @@ msgstr ""
 "  -V, --version              väljastab versiooniinfo ja lõpetab programmi töö\n"
 "  -w, --width=NUMBER         määrab väljastatava lehekülje laiuse\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -835,7 +835,7 @@ msgid ""
 "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -1192,194 +1192,194 @@ msgid ""
 "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr ""
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "vigane juhtjada"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr ""
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, fuzzy, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "see teade on kasutusel, kuid %s poolt kirjeldamata"
 msgstr[1] "see teade on kasutusel, kuid %s poolt kirjeldamata"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, fuzzy, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "see teade on kasutusel, kuid %s poolt kirjeldamata"
 msgstr[1] "see teade on kasutusel, kuid %s poolt kirjeldamata"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr ""
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' ja `msgst_plural' kirjed ei alga sarnaselt märgiga '\\n'"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' ja `msgstr[%u]' kirjed ei alga sarnaselt märgiga '\\n'"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' ja `msgstr' kirjed ei alga sarnaselt märgiga '\\n'"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' ja `msgst_plural' kirjed ei lõppe sarnaselt märgiga '\\n'"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' ja `msgstr[%u]' kirjed ei lõppe sarnaselt märgiga '\\n'"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' ja `msgstr' kirjed ei lõppe sarnaselt märgiga '\\n'"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr ""
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, fuzzy, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "päise kirjest on puudu väli `%s'"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "päise kirjes peab väli `%s' algama rea algusest"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "mõned päise kirjes olevad väljad sisaldavad ikka veel algseid väärtusi"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, fuzzy, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "väli `%s' sisaldab ikka veel algset väärtust"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 #, fuzzy
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: hoiatus: PO faili päis puudub, on kahtlane või vigane\n"
 "%*s  hoiatus: charset conversion will not work"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 #, fuzzy
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "Kooditabel on päises kirjeldamata.\n"
 "Tõlgete teisendamine kasutaja kooditabelisse ei toimi.\n"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 #, fuzzy
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: hoiatus: PO faili päis puudub, on kahtlane või vigane\n"
 "%*s  hoiatus: charset conversion will not work"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domeeni nimi \"%s\" ei ole kasutatav failinimena"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domeeni nimi \"%s\" ei ole kasutatav failinimena: kasutan eesliidet"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "ignoreerin `domain %s' direktiivi"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "ignoreerin tühja `msgstr' kirjet"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "ignoreerin kahtlast `msgstr' kirjet"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: hoiatus: lähtefail sisaldab kahtlast tõlget"
@@ -1577,47 +1577,47 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 #, fuzzy
 msgid "warning: "
 msgstr "%s: hoiatus: "
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1669,11 +1669,11 @@ msgstr ""
 msgid "conversion failure"
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -1682,7 +1682,7 @@ msgstr ""
 "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
 "iconv() poolt ja iconv() ei toeta \"%s\".\n"
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -1967,13 +1967,13 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<stdin>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: hoiatus: "
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -1982,15 +1982,15 @@ msgstr ""
 "Kooditabel \"%s\" ei ole portaabel kodeerimise nimetus.\n"
 "Teadete tõlkimine kasutaja kooditabeli järgi võib mitte toimida.\n"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr "Jätkan siiski, vaatamate parsimisvigadele."
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr "Jätkan siiski."
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -1999,7 +1999,7 @@ msgstr ""
 "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
 "iconv() poolt ja iconv() ei toeta \"%s\".\n"
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2008,12 +2008,12 @@ msgstr ""
 "GNU libiconv tarkvara ja peale seda teha uus paigaldus tarkvarapakile\n"
 "GNU gettext\n"
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2022,7 +2022,7 @@ msgstr ""
 "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
 "iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n"
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2059,45 +2059,45 @@ msgstr "mitmuse vorm omab vale indeksit"
 msgid "too many errors, aborting"
 msgstr "liiga palju vigu, katkestan töö"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "vigane multibait jada"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 #, fuzzy
 msgid "incomplete multibyte sequence at end of file"
 msgstr "vigane multibait jada"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 #, fuzzy
 msgid "incomplete multibyte sequence at end of line"
 msgstr "vigane multibait jada"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "viga \"%s\" lugemisel"
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "tundmatu võtmesõna: \"%s\""
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "vigane juhtjada"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "Ootamatu faili lõpp (fail lõppeb poole stringi pealt)"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "reavahetus asub stringi sees"
 
@@ -2162,7 +2162,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "viga faili \"%s\" kirjutamisel"
@@ -2176,13 +2176,13 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "viga faili \"%s\" avamisel (kirjutamiseks)"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "tõlgitud teated peaksid mitte sisaldama `\\%c' erimärgijada"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2191,12 +2191,12 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "ei suuda luua väljundfaili \"%s\""
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "standardväljund"
@@ -2211,7 +2211,7 @@ msgstr "%s:%d: l
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: hoiatus: lõpetamata string"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "see fail ei tohi sisaldada domeeni direktiive"
 
@@ -2240,24 +2240,24 @@ msgstr ""
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ei tööta ilma vajalike võtmesõnadeta"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "hoiatus: faili `%s' laiend `%s' on tundmatu; proovin C vormingut"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2267,7 +2267,7 @@ msgid ""
 "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2279,7 +2279,7 @@ msgid ""
 "By default the language is guessed depending on the input file name extension.\n"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2289,7 +2289,7 @@ msgid ""
 "                                 preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2300,7 +2300,7 @@ msgid ""
 "      --debug                    more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -2346,18 +2346,18 @@ msgstr ""
 "  -V, --version              väljastab versiooniinfo ja lõpetab programmi töö\n"
 "  -w, --width=NUMBER         määrab väljastatava lehekülje laiuse\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "standardsisend"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "tundmatu keel `%s'"
diff --git a/po/fi.po b/po/fi.po
index 3eaa39984..dafe1ec73 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.2\n"
-"POT-Creation-Date: 2002-05-02 15:48+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2002-06-05 18:06+0200\n"
 "Last-Translator: Sami J. Laine <sami.laine@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -29,8 +29,8 @@ msgstr "moniselitteinen argumentti `%s' `%s':lle"
 msgid "Valid arguments are:"
 msgstr "Kelvolliset argumentit ovat:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "virhe avattaessa \"%s\" lukemista varten"
@@ -121,11 +121,11 @@ msgstr "%s: valitsin `-W %s' on moniselitteinen\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: valitsin `-W %s' ei salli argumenttia\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Java-kääntäjää ei löytynyt, yritä gcj:n asentamista tai aseta $JAVAC"
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Java virtuaalikonetta ei löytynyt, yritä gij:n asentamista tai aseta $JAVA"
@@ -277,10 +277,10 @@ msgid "missing arguments"
 msgstr "ei riittävästi argumentteja"
 
 #: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Yritä `%s --help' saadaksesi lisää tietoja.\n"
@@ -335,10 +335,10 @@ msgid ""
 msgstr ""
 
 #: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Ilmoita ohjelmiston vioista osoitteeseen <bug-gnu-gettext@gnu.org>.\n"
 
@@ -367,7 +367,7 @@ msgstr ""
 "                        sen mahdolliset lisänimet\n"
 "  -i, --ip-address      osoitteet isäntänimelle\n"
 
-#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -401,7 +401,7 @@ msgstr "enint
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ja %s ovat toisensa poissulkevia"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]\n"
@@ -414,14 +414,14 @@ msgid ""
 msgstr ""
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -430,7 +430,7 @@ msgid ""
 "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -487,7 +487,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -506,7 +506,7 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -559,7 +559,7 @@ msgid ""
 "  -F, --sort-by-file             sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -624,18 +624,18 @@ msgstr ""
 msgid "warning: this message is not used"
 msgstr ""
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr ""
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr ""
 
@@ -688,12 +688,12 @@ msgid ""
 "      --omit-header              don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -701,7 +701,7 @@ msgid ""
 "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -1008,183 +1008,183 @@ msgid ""
 "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr ""
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 msgid "invalid nplurals value"
 msgstr ""
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr ""
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr ""
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr ""
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr ""
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr ""
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr ""
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr ""
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
@@ -1359,46 +1359,46 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1450,18 +1450,18 @@ msgstr ""
 msgid "conversion failure"
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -1695,53 +1695,53 @@ msgstr ""
 msgid "<stdin>"
 msgstr ""
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr ""
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr ""
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -1776,43 +1776,43 @@ msgstr ""
 msgid "too many errors, aborting"
 msgstr ""
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr ""
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr ""
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr ""
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr ""
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr ""
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr ""
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr ""
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr ""
 
@@ -1875,7 +1875,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr ""
@@ -1889,13 +1889,13 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr ""
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -1904,12 +1904,12 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr ""
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr ""
@@ -1924,7 +1924,7 @@ msgstr ""
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr ""
 
@@ -1951,24 +1951,24 @@ msgstr ""
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -1978,7 +1978,7 @@ msgid ""
 "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -1990,7 +1990,7 @@ msgid ""
 "By default the language is guessed depending on the input file name extension.\n"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2000,7 +2000,7 @@ msgid ""
 "                                 preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2011,7 +2011,7 @@ msgid ""
 "      --debug                    more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -2034,18 +2034,18 @@ msgid ""
 "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
 msgstr ""
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr ""
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr ""
diff --git a/po/fr.gmo b/po/fr.gmo
index aa92b5b9a..f86e47e7a 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 838a93013..99f731fc4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.11.2\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2002-04-26 08:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -30,8 +30,8 @@ msgstr "argument ambigu 
 msgid "Valid arguments are:"
 msgstr "Les arguments valides sont:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "erreur lors de l'ouverture de « %s » en lecture"
@@ -122,13 +122,13 @@ msgstr "%s: l'option 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: l'option « -W %s » ne tolère pas d'argument\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "Compilateur Java n'a pas été repéré, essayer d'installer gcj ou défitni "
 "$JAVAC"
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Machine virtuelle Java n'a pas été repérée, essayer d'installer gij ou "
@@ -259,7 +259,7 @@ msgstr ""
 "spécifications de format de « msgid » et de « %s » de l'argument « %s » ne "
 "sont pas les mêmes"
 
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -275,7 +275,7 @@ msgstr ""
 "les permissions de copie.  Il est distribué SANS AUCUNE GARANTIE\n"
 "de QUALITÉ LOYALE ET MARCHANDE ou d'ADÉQUATION POUR UN BUT PARTICULIER.\n"
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -284,7 +284,7 @@ msgstr ""
 msgid "Written by %s.\n"
 msgstr "Écrit par %s.\n"
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "trop d'arguments"
 
@@ -292,11 +292,11 @@ msgstr "trop d'arguments"
 msgid "missing arguments"
 msgstr "arguments manquants"
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pour plus d'information, essayer « %s --help ».\n"
@@ -357,25 +357,25 @@ msgstr ""
 "\n"
 "Répertoire standard de recherche: %s\n"
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Rapportez tout problème fonctionnel à <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Usage: %s [OPTION]\n"
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr "Afficher le nom de la machine hôte.\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -390,7 +390,7 @@ msgstr ""
 "                          et les aliases\n"
 "  -i, --ip-address      addresses IP de la machine hôte\n"
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -403,7 +403,7 @@ msgstr ""
 "  -h, --help                  fournir ce message d'aide, puis terminer\n"
 "  -V, --version               identifier le programme, puis terminer\n"
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr "ne peut obtenir le nom de l'hôte"
 
@@ -423,7 +423,7 @@ msgstr "au plus un fichier d'entr
 msgid "%s and %s are mutually exclusive"
 msgstr "%s et %s s'excluent mutuellement"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Usage: %s [OPTION] [FICHIER-D-ENTRÉE]\n"
@@ -438,7 +438,7 @@ msgstr ""
 "et manipuler leurs attributs.\n"
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
@@ -447,7 +447,7 @@ msgstr ""
 "Les arguments obligatoires pour la forme longue des options sont aussi\n"
 "obligatoires pour les formes courtes qui leur correspondent.\n"
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -460,7 +460,7 @@ msgstr ""
 "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour la recherche des fichiers d'entrée\n"
 "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée standard.\n"
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -546,7 +546,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Critère de sélection irréalisable (%d < N < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Usage: %s [OPTION] [FICHIER-D-ENTRÉE]...\n"
@@ -573,7 +573,7 @@ msgstr ""
 "proviennent du premier fichier PO où elles ont été définies.\n"
 "Les positions de tous les fichiers PO seront cumulées.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -655,7 +655,7 @@ msgstr ""
 "  -s, --sort-output           générer une sortie triée\n"
 "  -F, --sort-by-file          trier la sortie selon la localisation des fichiers\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -736,18 +736,18 @@ msgstr "ce message, utilis
 msgid "warning: this message is not used"
 msgstr "attention: ce message n'est pas utilisé"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d erreur fatale trouvée"
 msgstr[1] "%d erreurs fatales trouvées"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "message doublement défini"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...voici l'endroit de la première définition"
 
@@ -825,12 +825,12 @@ msgstr ""
 "  -F, --sort-by-file          trier la sortie selon la localisation des fichiers\n"
 "      --omit-header           omettre les en-têtes pour « msgid \"\" »\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Convertir un catalogue de traduction selon un encodage de caractères différent.\n"
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -841,7 +841,7 @@ msgstr ""
 "  -t, --to-code=NOM          NOM de l'encodage de sortie\n"
 "L'encodage par défaut se fait selon l'encodage locale.\n"
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -1241,26 +1241,26 @@ msgstr ""
 "      --statistics            afficher les statistiques de traductions\n"
 "  -v, --verbose               diagnostiquer toute anomalie dans chaque FICHIER\n"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr "L'expression au pluriel peut produire des valeurs négatives."
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu mais l'expression au pluriel peut produire des valeurs aussi "
 "grande que %lu"
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr "L'expression au pluriel peut produire une division par zéro."
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr "L'expression au pluriel peut produire un débordement d'entier"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -1268,52 +1268,52 @@ msgstr ""
 "L'expression au pluriel peut produire une exception arithmétique, "
 "possiblement une division par zéro"
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr ""
 "le catalogue de messages contient des formes de traduction au pluriel..."
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...mais l'attribut « plural=EXPRESSION » est absente de l'en-tête"
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...mais l'attribut « nplurals=ENTIER » est absent de l'en-tête"
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 msgid "invalid nplurals value"
 msgstr "valeur nplurals invalide"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr "expression au pluriel invalide"
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr "nplurals = %lu..."
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "...mais quelques messages n'ont seulement qu'une forme au pluriel"
 msgstr[1] "...mais quelques messages n'ont seulement que %lu formes au pluriel"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "...mais quelques messages ont une forme au pluriel"
 msgstr[1] "...mais quelques messages ont %lu formes au pluriel"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr "Essayer d'utiliser ce qui suit, valide pour %s:\n"
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -1321,116 +1321,116 @@ msgstr ""
 "le catalogue de messages contient des formes de traduction au pluriel, mais "
 "l'entrée \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\" est manquante"
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "les chaînes « msgid » et « msgid_plural » ne débutent pas par « \\n »"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "les chaînes « msgid » et « msgstr[%u] » ne débutent pas par « \\n »"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "les chaînes « msgid » et « msgstr » ne débutent pas par « \\n »"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "les chaînes « msgid » et « msgid_plural » ne se terminent pas par « \\n »"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr ""
 "les chaînes « msgid » et « msgstr[%u] » ne se terminent pas par « \\n »"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr ""
 "l'une des chaînes « msgid » ou « msgstr » se termine par « \\n », l'autre pas"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr "le traitement des chaînes au pluriel est une extention de GNU gettext"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr ""
 "« %s » n'a pas une chaîne de format %s valide, contrairement à « msgid »"
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "« msgstr » n'a pas de raccourci clavier pour la marque « %c »"
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "« msgstr » a trop de raccourcis clavier pour la marque « %c »"
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "Le champ en-tête « %s » est absent de l'en-tête\n"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "Le champ en-tête « %s » devrait s'appuyer au début de la ligne\n"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 msgid "some header fields still have the initial default value\n"
 msgstr "Quelques champs en-tête ont toujours leur valeur initiale par défaut\n"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "le champ « %s » a toujours sa valeur initiale par défaut\n"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr "AVERTISSEMENT: l'en-tête du fichier PO est manquante ou invalide\n"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr "AVERTISSEMENT: le conversion du charset ne fonctionnera pas\n"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr "AVERTISSEMENT: l'en-tête du fichier PO est floue\n"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 "AVERTISSEMENT: les vieilles versions de msgfmt donneront une erreur là "
 "dessus\n"
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "« %s » n'est pas approprié comme nom de domaine"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domaine « %s » inadéquat comme nom de fichier: utilisera un préfixe"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "la directive « domain %s » sera ignorée"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "chaîne « msgstr » vide, entrée ignorée"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "chaîne « msgstr » floue, entrée ignorée"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: AVERTISSEMENT: certaines traductions sont approximatives"
@@ -1679,17 +1679,17 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Traduction anglaise du package %s"
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "le présent charset « %s » n'a pas un nom d'encodage portable"
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "deux charsets différents « %s » et « %s » dans le fichier d'entrée"
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
@@ -1697,7 +1697,7 @@ msgstr ""
 "le fichier d'entrée « %s » ne contient pas d'en-tête ayant une spécification "
 "de charset"
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -1706,17 +1706,17 @@ msgstr ""
 "Le domaine « %s » dans le fichier d'entrée « %s » ne contient pas d'en-tête "
 "avec la spécification d'un charset"
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "Le charset cible « %s » n'a pas un nom d'encodage portable."
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr "AVERTISSEMENT: "
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
@@ -1725,7 +1725,7 @@ msgstr ""
 "autres.\n"
 "Conversion de la sortie en UTF-8.\n"
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1796,13 +1796,13 @@ msgstr ""
 msgid "conversion failure"
 msgstr "échec de conversion"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "Le fichier d'entrée ne contient pas d'en-tête avec la spécification d'un "
 "charset"
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -1811,7 +1811,7 @@ msgstr ""
 "Ne peut convertir de « %s » vers « %s ». %s s'appuie sur iconv() qui ne "
 "supporte pas cette conversion."
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2151,13 +2151,13 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<stdin>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: AVERTISSEMENT: "
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2166,15 +2166,15 @@ msgstr ""
 "Le charset « %s » n'a pas un nom d'encodage portable.\n"
 "La conversion de messages vers le charset usager ne fonctionnera pas.\n"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr "Poursuite du traitement, attendez-vous à des erreurs d'analyses."
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr "Poursuite malgré tout."
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2183,7 +2183,7 @@ msgstr ""
 "Charset « %s » n'est pas supporté. %s utilise iconv(),\n"
 "et iconv() ne supporte pas « %s ».\n"
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2191,12 +2191,12 @@ msgstr ""
 "L'installation de GNU libiconv suivi de la réinstallation de GNU gettext\n"
 "devrait corriger ce problème.\n"
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2205,7 +2205,7 @@ msgstr ""
 "Charset « %s » n'est pas supporté. %s utilise iconv(),\n"
 "Cette version a été générée sans iconv().\n"
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2242,43 +2242,43 @@ msgstr "forme plurielle a un index erron
 msgid "too many errors, aborting"
 msgstr "trop d'erreurs, j'abandonne"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "séquence multi-octets invalide"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr "séquence multi-octets incomplète à la fin du fichier"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr "séquence multi-octets incomplète à la fin de la ligne"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr "échec de iconv()"
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erreur lors de la lecture de « %s »"
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "mot-clé « %s » inconnu"
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "séquence de contrôle invalide"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "fin de fichier intempestive"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "fin de ligne intempestive"
 
@@ -2343,7 +2343,7 @@ msgstr "n'est pas un nom de classe Java valide: %s"
 msgid "failed to create \"%s\""
 msgstr "échec de création de « %s »"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "erreur pendant l'écriture du fichier « %s »"
@@ -2358,14 +2358,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "erreur lors de l'ouverture de « %s » en écriture"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "un message à traduire ne doit pas contenir la séquence d'échappement « \\%c »"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2380,12 +2380,12 @@ msgstr ""
 "ASCII à la place.\n"
 "%s\n"
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "incapable de fabriquer le fichier « %s »"
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "sortie standard"
@@ -2400,7 +2400,7 @@ msgstr "%s:%d: attention: constante caract
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: attention: constante chaîne sans terminateur"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "ce fichier ne peut contenir des directives de domaine"
 
@@ -2427,18 +2427,18 @@ msgstr "--join-existing interdit si production sur sortie standard"
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ne peut fonctionner sans mots clés à rechercher"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "attention: « %s » sans classification pour « %s », le langage C sera présumé"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extraire les chaînes traduisibles de fichiers d'entrée donnés.\n"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -2447,7 +2447,7 @@ msgstr ""
 "Les arguments obligatoires pour la forme longue des options sont aussi\n"
 "obligatoires pour les formes courtes qui leur correspondent.\n"
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2462,7 +2462,7 @@ msgstr ""
 "  -p, --output-dir=RÉPERTOIRE    placer les fichiers de sortie dans le RÉPERTOIRE\n"
 "Si la sortie est -, la sortie est écrite sur la sortie standard.\n"
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2481,7 +2481,7 @@ msgstr ""
 "  -C, --c++                      identique à --language=C++\n"
 "Par défaut, le langage est deviné selon l'extension du nom du fichier.\n"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2496,7 +2496,7 @@ msgstr ""
 "  -c, --add-comments[=CLÉ]       sauver le commentaire précédent possédant CLÉ,\n"
 "                                 ou celui qui précède immédiatement le mot-clef\n"
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2514,7 +2514,7 @@ msgstr ""
 "      --debug                    fournir plus de détails sur la reconnaissance\n"
 "                                 des chaînes de format\n"
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -2555,11 +2555,11 @@ msgstr ""
 "  -m, --msgstr-prefix[=CHAÎNE]   préfixer les msgstr's par CHAÎNE, sinon \\\"\\\"\n"
 "  -M, --msgstr-suffix[=CHAÎNE]   suffixer les msgstr's par CHAÎNE, sinon \\« \\ »\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "entrée standard"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -2569,7 +2569,7 @@ msgstr ""
 "GNU gettext: gettext(\"\") retourne l'en-tête\n"
 "avec la méta information, pas une chaîne vide.\n"
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "langage « %s » inconnu"
diff --git a/po/gettext.pot b/po/gettext.pot
index 842ca445a..3f7f457e1 100644
--- a/po/gettext.pot
+++ b/po/gettext.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,8 +30,8 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr ""
@@ -122,11 +122,11 @@ msgstr ""
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
@@ -235,7 +235,7 @@ msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr ""
 
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -247,7 +247,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -256,7 +256,7 @@ msgstr ""
 msgid "Written by %s.\n"
 msgstr ""
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr ""
 
@@ -264,11 +264,11 @@ msgstr ""
 msgid "missing arguments"
 msgstr ""
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
@@ -311,25 +311,25 @@ msgid ""
 "Standard search directory: %s\n"
 msgstr ""
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -339,7 +339,7 @@ msgid ""
 "  -i, --ip-address      addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -349,7 +349,7 @@ msgid ""
 "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr ""
 
@@ -369,7 +369,7 @@ msgstr ""
 msgid "%s and %s are mutually exclusive"
 msgstr ""
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
@@ -382,14 +382,14 @@ msgid ""
 msgstr ""
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -398,7 +398,7 @@ msgid ""
 "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -455,7 +455,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -474,7 +474,7 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -527,7 +527,7 @@ msgid ""
 "  -F, --sort-by-file             sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -592,18 +592,18 @@ msgstr ""
 msgid "warning: this message is not used"
 msgstr ""
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr ""
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr ""
 
@@ -656,12 +656,12 @@ msgid ""
 "      --omit-header              don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -669,7 +669,7 @@ msgid ""
 "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -976,183 +976,183 @@ msgid ""
 "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr ""
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 msgid "invalid nplurals value"
 msgstr ""
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr ""
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr ""
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr ""
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr ""
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr ""
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr ""
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr ""
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
@@ -1327,46 +1327,46 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1418,18 +1418,18 @@ msgstr ""
 msgid "conversion failure"
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -1663,53 +1663,53 @@ msgstr ""
 msgid "<stdin>"
 msgstr ""
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr ""
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr ""
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -1744,43 +1744,43 @@ msgstr ""
 msgid "too many errors, aborting"
 msgstr ""
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr ""
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr ""
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr ""
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr ""
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr ""
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr ""
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr ""
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr ""
 
@@ -1843,7 +1843,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr ""
@@ -1857,13 +1857,13 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr ""
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -1872,12 +1872,12 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr ""
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr ""
@@ -1892,7 +1892,7 @@ msgstr ""
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr ""
 
@@ -1919,24 +1919,24 @@ msgstr ""
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -1946,7 +1946,7 @@ msgid ""
 "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -1958,7 +1958,7 @@ msgid ""
 "By default the language is guessed depending on the input file name extension.\n"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -1968,7 +1968,7 @@ msgid ""
 "                                 preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -1979,7 +1979,7 @@ msgid ""
 "      --debug                    more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -2002,18 +2002,18 @@ msgid ""
 "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
 msgstr ""
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr ""
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr ""
diff --git a/po/gl.gmo b/po/gl.gmo
index eb41ccc65..060022d5b 100644
Binary files a/po/gl.gmo and b/po/gl.gmo differ
diff --git a/po/gl.po b/po/gl.po
index 65f9f1237..ddb479e4d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.10.39\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2001-07-28 17:00+0200\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -33,8 +33,8 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "erro ao abrir \"%s\" para lectura"
@@ -125,11 +125,11 @@ msgstr "%s: a opci
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: a opción `-W %s' non permite ningún argumento\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
@@ -243,7 +243,7 @@ msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "as especificacións de formato do argumento %lu non son as mesmas"
 
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -259,7 +259,7 @@ msgstr ""
 "ningunha garantía; nin sequera de COMERCIABILIDADE ou IDONEIDADE PARA UN\n"
 "FIN DETERMINADO.\n"
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -268,7 +268,7 @@ msgstr ""
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
@@ -276,11 +276,11 @@ msgstr "demasiados argumentos"
 msgid "missing arguments"
 msgstr "faltan argumentos"
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Use `%s --help' para máis información.\n"
@@ -340,26 +340,26 @@ msgstr ""
 "que atopa no catálogo escollido.\n"
 "Directorio estándar de busca: %s\n"
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Comunique os erros a <bug-gnu-utils@gnu.org>.\n"
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -369,7 +369,7 @@ msgid ""
 "  -i, --ip-address      addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -379,7 +379,7 @@ msgid ""
 "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr ""
 
@@ -399,7 +399,7 @@ msgstr ""
 msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s son mutuamente excluíntes"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
@@ -412,14 +412,14 @@ msgid ""
 msgstr ""
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -428,7 +428,7 @@ msgid ""
 "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -506,7 +506,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "o criterio de selección indicado é imposible (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -541,7 +541,7 @@ msgstr ""
 "comentarios e comentarios de extracción mantéñense, pero só do primeiro\n"
 "ficheiro para definilos.  Mantéñense as posicións de tódolos ficheiros PO.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -631,7 +631,7 @@ msgstr ""
 "  -V, --version               amosa-la información da versión e saír\n"
 "  -w, --width=NÚMERO          establece-la anchura da páxina de saída\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -711,18 +711,18 @@ msgstr "esta mensaxe 
 msgid "warning: this message is not used"
 msgstr "aviso: esta mensaxe non se usa"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "atopouse %d erro grave"
 msgstr[1] "atopáronse %d erros graves"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "definición de mensaxe duplicada"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...este é o lugar da primeira definición"
 
@@ -828,12 +828,12 @@ msgstr ""
 "  -V, --version               amosa-la información da versión e saír\n"
 "  -w, --width=NÚMERO          establece-la anchura da páxina de saída\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -841,7 +841,7 @@ msgid ""
 "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -1194,198 +1194,198 @@ msgid ""
 "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr ""
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "secuencia de control ilegal"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr ""
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, fuzzy, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "esta mensaxe úsase mais non está definida en %s"
 msgstr[1] "esta mensaxe úsase mais non está definida en %s"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, fuzzy, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "esta mensaxe úsase mais non está definida en %s"
 msgstr[1] "esta mensaxe úsase mais non está definida en %s"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr ""
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "as entradas `msgid' e `msgid_plural' non comezan ámbalas dúas con '\\n'"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "as entradas `msgid' e `msgstr[%u]' non comezan ámbalas dúas con '\\n'"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "as entradas `msgid' e `msgstr' non comezan ámbalas dúas con '\\n'"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "as entradas `msgid' e `msgid_plural' non rematan ámbalas dúas con '\\n'"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "as entradas `msgid' e `msgstr[%u]' non rematan ámbalas dúas con '\\n'"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "as entradas `msgid' e `msgstr' non rematan ámbalas dúas con '\\n'"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr ""
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, fuzzy, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "falta o campo `%s' na cabeceira"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "o campo `%s' da cabeceira tería que comezar ao principio da liña"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "algúns campos da cabeceira aínda teñen o valor inicial por defecto"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, fuzzy, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "o campo `%s' aínda ten o valor inicial por defecto"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 #, fuzzy
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: aviso: a cabeceira do ficheiro PO non existe, é 'fuzzy' ou é inválida\n"
 "%*s  aviso: a conversión de código de caracteres non vai funcionar"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 #, fuzzy
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "Falta o código de caracteres na cabeceira.\n"
 "A conversión da mensaxe ao código do usuario non vai funcionar.\n"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 #, fuzzy
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: aviso: a cabeceira do ficheiro PO non existe, é 'fuzzy' ou é inválida\n"
 "%*s  aviso: a conversión de código de caracteres non vai funcionar"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "o nome de dominio \"%s\" non é axeitado para nome de ficheiro"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "o nome de dominio \"%s\" non é axeitado como nome de ficheiro:\n"
 "empregarase un prefixo"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "directiva `domain %s' ignorada"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "entrada `msgstr' baleira ignorada"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "entrada `msgstr' difusa ignorada"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: aviso: o ficheiro fonte contén traduccións difusas"
@@ -1581,47 +1581,47 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 #, fuzzy
 msgid "warning: "
 msgstr "%s: aviso: "
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1673,11 +1673,11 @@ msgstr ""
 msgid "conversion failure"
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -1686,7 +1686,7 @@ msgstr ""
 "O código de caracteres \"%s\" non está soportado. %s depende de\n"
 "iconv(), e iconv() non soporta \"%s\".\n"
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -1965,13 +1965,13 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<stdin>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: aviso: "
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -1980,15 +1980,15 @@ msgstr ""
 "O código de caracteres \"%s\" non ten un nome portable.\n"
 "A conversión da mensaxe ao código do usuario podería non funcionar.\n"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr "Continuando de calquera xeito, espere atopar erros de análise."
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr "Continuando de calquera xeito."
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -1997,7 +1997,7 @@ msgstr ""
 "O código de caracteres \"%s\" non está soportado. %s depende de\n"
 "iconv(), e iconv() non soporta \"%s\".\n"
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2005,12 +2005,12 @@ msgstr ""
 "Se instala GNU libiconv e logo reinstala o GNU gettext\n"
 "podería arranxarse o problema.\n"
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2019,7 +2019,7 @@ msgstr ""
 "O código de caracteres \"%s\" non está soportado. %s depende de iconv().\n"
 "Esta versión foi compilada sen iconv().\n"
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2056,45 +2056,45 @@ msgstr "a forma do plural ten un 
 msgid "too many errors, aborting"
 msgstr "demasiados erros, interrompendo"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "secuencia multibyte non válida"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 #, fuzzy
 msgid "incomplete multibyte sequence at end of file"
 msgstr "secuencia multibyte non válida"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 #, fuzzy
 msgid "incomplete multibyte sequence at end of line"
 msgstr "secuencia multibyte non válida"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erro ao ler \"%s\""
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "palabra chave \"%s\" descoñecida"
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "secuencia de control ilegal"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "fin de ficheiro nunha cadea"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "fin de liña nunha cadea"
 
@@ -2159,7 +2159,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "erro ao escribi-lo ficheiro \"%s\""
@@ -2173,14 +2173,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "erro ao abrir \"%s\" para escribir"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "as mensaxes internacionalizadas non deben conte-la secuencia de escape `\\%c'"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2189,12 +2189,12 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "non se pode crea-lo ficheiro de saída \"%s\""
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "saída estándar"
@@ -2209,7 +2209,7 @@ msgstr "%s:%d: aviso: constante de tipo car
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: aviso: literal de cadea non rematada"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "este ficheiro non pode conter directivas de dominio"
 
@@ -2236,24 +2236,24 @@ msgstr "non se pode usar --join-existing cando a sa
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext non funciona sen palabras chave polas que buscar"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "aviso: o ficheiro `%s' coa extensión `%s' é descoñecido; tentaráse C"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2263,7 +2263,7 @@ msgid ""
 "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2275,7 +2275,7 @@ msgid ""
 "By default the language is guessed depending on the input file name extension.\n"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2285,7 +2285,7 @@ msgid ""
 "                                 preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2296,7 +2296,7 @@ msgid ""
 "      --debug                    more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -2340,18 +2340,18 @@ msgstr ""
 "  -V, --version               amosa-la información da versión e saír\n"
 "  -w, --width=NÚMERO          establece-la anchura da páxina de saída\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "entrada estándar"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "linguaxe `%s' descoñecida"
diff --git a/po/id.gmo b/po/id.gmo
index 3f647083c..6611d5fb9 100644
Binary files a/po/id.gmo and b/po/id.gmo differ
diff --git a/po/id.po b/po/id.po
index 40fe2e0c5..1776c6b3a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 1999-09-19 10:24+07:00\n"
 "Last-Translator: Tedi Heriyanto <tedi-h@usa.net>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -27,8 +27,8 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "kesalahan saat membuka \"%s\" untuk dibaca"
@@ -119,11 +119,11 @@ msgstr "%s: pilihan `-W %s' rancu\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: pilihan `-W %s' tidak membolehkan sebuah argumen\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
@@ -235,7 +235,7 @@ msgid ""
 msgstr "spesifikasi format untuk argumen %u tidak sama"
 
 # )
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -250,7 +250,7 @@ msgstr ""
 "Ini adalah free software; lihat source untuk kondisi penyalinan. Tidak ada\n"
 "jaminan; bahkan untuk PENJUALAN atau KESESUAIAN UNTUK TUJUAN TERTENTU.\n"
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -259,7 +259,7 @@ msgstr ""
 msgid "Written by %s.\n"
 msgstr "Ditulis oleh %s.\n"
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "terlalu banyak argumen"
 
@@ -267,11 +267,11 @@ msgstr "terlalu banyak argumen"
 msgid "missing arguments"
 msgstr "Argumen hilang"
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Coba `%s --help' untuk informasi lebih jauh.\n"
@@ -332,26 +332,26 @@ msgstr ""
 "diterjemahkan.\n"
 "Direktori pencarian standar: %s\n"
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Laporkan kesalahan ke <bug-gnu-utils@gnu.org>.\n"
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -361,7 +361,7 @@ msgid ""
 "  -i, --ip-address      addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -371,7 +371,7 @@ msgid ""
 "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr ""
 
@@ -391,7 +391,7 @@ msgstr ""
 msgid "%s and %s are mutually exclusive"
 msgstr "%s dan %s adalah mutually exclusive"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
@@ -404,14 +404,14 @@ msgid ""
 msgstr ""
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -420,7 +420,7 @@ msgid ""
 "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -492,7 +492,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "digunakan kriteria pemilihan yang tidak mungkin (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -525,7 +525,7 @@ msgstr ""
 "komentar ekstraksi akan dijaga, tetapi hanya dari file PO pertama yang\n"
 "mendefinisikan mereka. Posisi file dari seluruh file PO akan dijaga.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -607,7 +607,7 @@ msgstr ""
 "  -V, --version              tampilkan informasi versi dan keluar\n"
 "  -w, --width=NUMBER         set lebar halaman output\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -685,17 +685,17 @@ msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s"
 msgid "warning: this message is not used"
 msgstr "peringatan: pesan ini tidak digunakan"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, fuzzy, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "ditemukan %d kesalahan fatal"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "definisi pesan ganda"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...ini adalah lokasi definisi pertama"
 
@@ -791,12 +791,12 @@ msgstr ""
 "  -V, --version              tampilkan informasi versi dan keluar\n"
 "  -w, --width=NUMBER         set lebar halaman output\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -804,7 +804,7 @@ msgid ""
 "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -1142,188 +1142,188 @@ msgid ""
 "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr ""
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "urutan kendali ilegal"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr ""
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, fuzzy, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "pesan ini digunakan tapi tidak didefinisikan dalam %s"
 msgstr[1] "pesan ini digunakan tapi tidak didefinisikan dalam %s"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, fuzzy, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "pesan ini digunakan tapi tidak didefinisikan dalam %s"
 msgstr[1] "pesan ini digunakan tapi tidak didefinisikan dalam %s"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr ""
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "masukan `msgid' dan `msgstr' tidak dimulai dengan '\\n'"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "masukan `msgid' dan `msgstr' tidak dimulai dengan '\\n'"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "masukan `msgid' dan `msgstr' tidak dimulai dengan '\\n'"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "masukan `msgid' dan `msgstr' tidak diakhiri dengan '\\n'"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "masukan `msgid' dan `msgstr' tidak diakhiri dengan '\\n'"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "masukan `msgid' dan `msgstr' tidak diakhiri dengan '\\n'"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr ""
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, fuzzy, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "headerfield `%s' tidak ada dalam header"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "header field `%s' harus dimulai di awal baris"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "beberapa field header masih memiliki nilai baku awal"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, fuzzy, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "field `%s' masih memiliki nilai baku awal"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nama domain \"%s\" tidak sesuai dengan nama file"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "nama domain \"%s\" tidak sesuai dengan nama file: akan menggunakan prefix"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "direktiv `domain %s' diabaikan"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "masukan `msgstr' kosong diabaikan"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "masukan fuzzy `msgstr' diabaikan"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: peringatan: file source mengandung terjemahan fuzzy"
@@ -1513,46 +1513,46 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1604,18 +1604,18 @@ msgstr ""
 msgid "conversion failure"
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -1891,53 +1891,53 @@ msgstr ""
 msgid "<stdin>"
 msgstr ""
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr ""
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr ""
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -1974,44 +1974,44 @@ msgstr ""
 msgid "too many errors, aborting"
 msgstr "terlalu banyak kesalahan, dibatalkan"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr ""
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr ""
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr ""
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "kesalahan ketika membaca \"%s\""
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "kata kunci \"%s\" tidak dikenal"
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 #, fuzzy
 msgid "invalid control sequence"
 msgstr "urutan kendali ilegal"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "end-of-file dalam string"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "end-of-line dalam string"
 
@@ -2076,7 +2076,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "kesalahan saat menulis file \"%s\""
@@ -2090,13 +2090,13 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "kesalahan ketika membuka \"%s\" untuk ditulis"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "Pesan internasionalisasi tidak boleh mengandung escape sequence `\\%c'"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2105,12 +2105,12 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "tidak dapat membuat file output \"%s\""
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "standard output"
@@ -2125,7 +2125,7 @@ msgstr "%s:%d: peringatan: karakter konstan yang unterminated"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: peringatan: string literal yang unterminated"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "file ini tidak boleh mengandung direktiv domain"
 
@@ -2152,24 +2152,24 @@ msgstr "--join-existing tidak dapat digunakan ketika output ditulis ke stdout"
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "peringatan: file `%s' ekstensi `%s' tidak dikenal; dicoba C"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2179,7 +2179,7 @@ msgid ""
 "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2191,7 +2191,7 @@ msgid ""
 "By default the language is guessed depending on the input file name extension.\n"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2201,7 +2201,7 @@ msgid ""
 "                                 preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2212,7 +2212,7 @@ msgid ""
 "      --debug                    more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -2250,18 +2250,18 @@ msgstr ""
 "  -V, --version              tampilkan informasi versi dan keluar\n"
 "  -w, --width=NUMBER         set lebar halaman output\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "bahasa `%s' tidak dikenal"
diff --git a/po/it.gmo b/po/it.gmo
index 0de595fb4..1b48fee1c 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index 850b9f1e9..1845f0e39 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2000-02-17 15:30+01:00\n"
 "Last-Translator: Giovanni Bortolozzo <borto@pluto.linux.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -28,8 +28,8 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "errore durante l'apertura in lettura di \"%s\""
@@ -120,11 +120,11 @@ msgstr "%s: l'opzione `-W %s' 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: l'opzione `-W %s' non ammette un argomento\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
@@ -239,7 +239,7 @@ msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
 
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -255,7 +255,7 @@ msgstr ""
 "NON c'è nessuna garanzia; neppure di COMMERCIABILITÀ o di IDONEITÀ AD UN\n"
 "PARTICOLARE SCOPO.\n"
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -264,7 +264,7 @@ msgstr ""
 msgid "Written by %s.\n"
 msgstr "Scritto da %s.\n"
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "troppi argomenti"
 
@@ -272,11 +272,11 @@ msgstr "troppi argomenti"
 msgid "missing arguments"
 msgstr "mancano degli argomenti"
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Usare `%s --help' per ulteriori informazioni.\n"
@@ -338,26 +338,26 @@ msgstr ""
 "catalogo selezionato.\n"
 "Directory di ricerca standard: %s\n"
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Segnalare i bug a <bug-gnu-utils@gnu.org>.\n"
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -367,7 +367,7 @@ msgid ""
 "  -i, --ip-address      addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -377,7 +377,7 @@ msgid ""
 "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr ""
 
@@ -397,7 +397,7 @@ msgstr ""
 msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s sono mutuamente esclusive"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
@@ -410,14 +410,14 @@ msgid ""
 msgstr ""
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -426,7 +426,7 @@ msgid ""
 "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -502,7 +502,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "il criterio di selezione specificato è impossibile (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -537,7 +537,7 @@ msgstr ""
 "solamente dal primo file PO che li definisce.  Saranno conservate le posizioni\n"
 "nei file di tutti i file PO.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -625,7 +625,7 @@ msgstr ""
 "  -V, --version               mostra informazioni sulla versione ed esce\n"
 "  -w, --width=NUMERO          imposta la larghezza della pagina d'uscita\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -704,17 +704,17 @@ msgstr "questo messaggio 
 msgid "warning: this message is not used"
 msgstr "attenzione: questo messaggio non è usato"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, fuzzy, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "trovati %d errori fatali"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "definizione del messaggio duplicata"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...questa è la posizione della prima definizione"
 
@@ -818,12 +818,12 @@ msgstr ""
 "  -V, --version               mostra informazioni sulla versione ed esce\n"
 "  -w, --width=NUMERO          imposta la larghezza della pagina d'uscita\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -831,7 +831,7 @@ msgid ""
 "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -1177,191 +1177,191 @@ msgid ""
 "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr ""
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "sequenza di controllo illegale"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr ""
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, fuzzy, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "questo messaggio è usato ma non è definito in %s"
 msgstr[1] "questo messaggio è usato ma non è definito in %s"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, fuzzy, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "questo messaggio è usato ma non è definito in %s"
 msgstr[1] "questo messaggio è usato ma non è definito in %s"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr ""
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "le voci `msgid' e `msgstr' non cominciano entrambe con `\\n'"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "le voci `msgid' e `msgstr' non cominciano entrambe con `\\n'"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "le voci `msgid' e `msgstr' non cominciano entrambe con `\\n'"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "le voci `msgid' e `msgstr' non finiscono entrambe con `\\n'"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "le voci `msgid' e `msgstr' non finiscono entrambe con `\\n'"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "le voci `msgid' e `msgstr' non finiscono entrambe con `\\n'"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr ""
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, fuzzy, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "nell'intestazione manca il campo `%s'"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr ""
 "il campo `%s' dell'intestazione dovrebbe cominciare all'inizio della riga"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 "alcuni campi dell'intestazione sono ancora al valore iniziale predefinito"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, fuzzy, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "il campo `%s' ha ancora il valore iniziale predefinito"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "il nome di dominio \"%s\" non è adatto come nome di file"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "il nome di dominio \"%s\" non è adatto come nome di file: sarà usato\n"
 "un prefisso"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "`domain %s' direttiva ignorata"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "ignorata la voce `msgstr' vuota"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "ignorata la voce `msgstr' approssimativa"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: attenzione: il file sorgente contiene traduzioni approssimative"
@@ -1555,46 +1555,46 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1646,18 +1646,18 @@ msgstr ""
 msgid "conversion failure"
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -1939,53 +1939,53 @@ msgstr ""
 msgid "<stdin>"
 msgstr ""
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr ""
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr ""
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2022,44 +2022,44 @@ msgstr ""
 msgid "too many errors, aborting"
 msgstr "troppi errori, annullato"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr ""
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr ""
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr ""
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "errore durante la lettura di \"%s\""
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "la parola chiave \"%s\" è sconoscita"
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 #, fuzzy
 msgid "invalid control sequence"
 msgstr "sequenza di controllo illegale"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "end-of-file all'interno di una stringa"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "end-of-line all'interno di una stringa"
 
@@ -2124,7 +2124,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "errore durante la scrittura del file \"%s\""
@@ -2138,7 +2138,7 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "errore durante l'apertura in scrittura di \"%s\""
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -2146,7 +2146,7 @@ msgstr ""
 "i messaggi internazionalizzati non devono contenere la sequenza di escape `\\"
 "%c'"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2155,12 +2155,12 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "impossibile creare il file d'uscita \"%s\""
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "standard output"
@@ -2175,7 +2175,7 @@ msgstr "%s:%d: attenzione: costante carattere non terminata"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: attenzione: letterale stringa non terminato"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "questo file potrebbe non contenere direttive di dominio"
 
@@ -2203,24 +2203,24 @@ msgstr ""
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "attenzione: il file `%s' ha estensione `%s' sconosciuta: proverò con C"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2230,7 +2230,7 @@ msgid ""
 "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2242,7 +2242,7 @@ msgid ""
 "By default the language is guessed depending on the input file name extension.\n"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2252,7 +2252,7 @@ msgid ""
 "                                 preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2263,7 +2263,7 @@ msgid ""
 "      --debug                    more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -2305,18 +2305,18 @@ msgstr ""
 "  -V, --version               mostra informazioni sulla versione ed esce\n"
 "  -w, --width=NUMERO          imposta la larghezza della pagina d'uscita\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "linguaggio `%s' sconosciuto"
diff --git a/po/ja.gmo b/po/ja.gmo
index 5fae90eb6..69e8bfefe 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index fc2c75c01..cbbcb20d8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.11.2\n"
-"POT-Creation-Date: 2002-05-02 15:48+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2002-05-08 22:22+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -28,8 +28,8 @@ msgstr "`%2$s' 
 msgid "Valid arguments are:"
 msgstr "Àµ¤·¤¤°ú¿ô:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "\"%s\" ¤òÆɤ߹þ¤â¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
@@ -120,13 +120,13 @@ msgstr "%s: 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤Ë¤Ï°ú¿ô¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "Java ¥³¥ó¥Ñ¥¤¥é¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó. gcj ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤« $JAVAC ¤òÀßÄꤷ¤Æ¤ß"
 "¤Æ¤¯¤À¤µ¤¤"
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Java ²¾ÁÛ¥Þ¥·¥ó¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó. gij ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤« $JAVA ¤òÀßÄꤷ¤Æ¤¯"
@@ -277,10 +277,10 @@ msgid "missing arguments"
 msgstr "°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
 
 #: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "¤è¤ê¿¤¯¤Î¾ðÊó¤òÆÀ¤ë¤¿¤á¤Ë¤Ï `%s --help' ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤.\n"
@@ -342,10 +342,10 @@ msgstr ""
 "ɸ½à¤Î¸¡º÷¥Ç¥£¥ì¥¯¥È¥ê: %s\n"
 
 #: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï <bug-gnu-gettext@gnu.org> ¤Þ¤Ç.\n"
 
@@ -374,7 +374,7 @@ msgstr ""
 "                          ÊÌ̾ (¥¨¥¤¥ê¥¢¥¹) ¤ò´Þ¤à\n"
 "  -i, --ip-address      ¥Û¥¹¥È̾¤ËÂФ¹¤ë¥¢¥É¥ì¥¹\n"
 
-#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -407,7 +407,7 @@ msgstr "
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ¤È %s ¤ÏÇØÈ¿¤Ç¤¹"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] [ÆþÎÏ¥Õ¥¡¥¤¥ë]\n"
@@ -420,14 +420,14 @@ msgid ""
 msgstr "°À­¤Ë½¾¤Ã¤ÆËÝÌõ¥«¥¿¥í¥°¤Î¥á¥Ã¥»¡¼¥¸¤òÁªÊ̤·, °À­¤ò¤¦¤Þ¤¯Áàºî¤·¤Þ¤¹.\n"
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "Ť¤¥ª¥×¥·¥ç¥ó¤Ëɬ¿Ü¤Î°ú¿ô¤Ïû¤¤¥ª¥×¥·¥ç¥ó¤Ë¤âɬ¿Ü¤Ç¤¹.\n"
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -440,7 +440,7 @@ msgstr ""
 "  -D, --directory=DIRECTORY   ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¸¡º÷¥ê¥¹¥È¤Ë DIRECTORY ¤òÄɲÃ\n"
 "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Ê¤¤, ¤â¤·¤¯¤Ï - ¤Î¾ì¹ç¤Ïɸ½àÆþÎϤ¬Æɤ߹þ¤Þ¤ì¤Þ¤¹.\n"
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -525,7 +525,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "»ØÄꤵ¤ì¤¿ÁªÂò´ð½à (%d < n < %d) ¤ÏÉÔ²Äǽ¤Ç¤¹"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] [ÆþÎÏ¥Õ¥¡¥¤¥ë]...\n"
@@ -553,7 +553,7 @@ msgstr ""
 "¤¬ÄêµÁ¤µ¤ì¤¿ºÇ½é¤Î PO ¥Õ¥¡¥¤¥ë¤Î¤â¤Î¤¬¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤Þ¤¹. ¤Þ¤¿¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ\n"
 "¤ÏÁ´¤Æ¤Î PO ¥Õ¥¡¥¤¥ë¤«¤é¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤Þ¤¹.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -637,7 +637,7 @@ msgstr ""
 "  -s, --sort-output              ʤÓÂؤ¨¤¿½ÐÎϤòÀ¸À®\n"
 "  -F, --sort-by-file             ¥Õ¥¡¥¤¥ë¤Î¾ì½ê¤Ç½ÐÎϤòʤÓÂؤ¨¤ë\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -718,18 +718,18 @@ msgstr "
 msgid "warning: this message is not used"
 msgstr "·Ù¹ð: ¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï»È¤ï¤ì¤Þ¤»¤ó"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d ¸Ä¤ÎÃ×̿Ū¥¨¥é¡¼¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿"
 msgstr[1] "%d ¸Ä¤ÎÃ×̿Ū¥¨¥é¡¼¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "¥á¥Ã¥»¡¼¥¸¤¬Æó½Å¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...¤³¤ì¤ÏºÇ½é¤ÎÄêµÁ¤Ë¤¢¤ê¤Þ¤¹"
 
@@ -809,12 +809,12 @@ msgstr ""
 "  -F, --sort-by-file             ¥Õ¥¡¥¤¥ë¤Ç½ÐÎϤò¥½¡¼¥È\n"
 "      --omit-header              `msgid \"\"' ¤ò´Þ¤ó¤À¥Ø¥Ã¥À¤ò½ÐÎϤ·¤Ê¤¤\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "ËÝÌõ¥«¥¿¥í¥°¤ò°Û¤Ê¤Ã¤¿Ê¸»ú¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ËÊÑ´¹.\n"
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -825,7 +825,7 @@ msgstr ""
 "  -t, --to-code=NAME          ½ÐÎϤΥ¨¥ó¥³¡¼¥Ç¥£¥ó¥°\n"
 "ɸ½à¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ï¸½ºß¤Î¥í¡¼¥«¥ë¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ç¤¹.\n"
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -1224,75 +1224,75 @@ msgstr ""
 "      --statistics            ËÝÌõ¤Ë´Ø¤¹¤ëÅý·×¾ðÊó¤òɽ¼¨\n"
 "  -v, --verbose               ¿ÇÃÇ¥ì¥Ù¥ë¤ò¾å¤²¤ë\n"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr "Ê£¿ôɽ¸½¤¬Éé¤ÎÃͤòÀ¸À®¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu ¤Ç¤¹¤¬Ê£¿ôɽ¸½¤¬ %lu ¤ÈƱ¤¸ÄøÅÙ¤ÎÃͤòÀ¸À®¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr "Ê£¿ôɽ¸½¤¬¥¼¥í³ä¤ê¤òµ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr "Ê£¿ôɽ¸½¤¬À°¿ô¤¢¤Õ¤ì¤òµ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr "Ê£¿ôɽ¸½¤¬±é»»Îã³°, ¤ª¤½¤é¤¯¥¼¥í³ä¤ê¤òµ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr "¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤ËÊ£¿ô·Á¤ÎËÝÌõ¤¬¤¢¤ê¤Þ¤¹..."
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...¤·¤«¤·¥Ø¥Ã¥À¥¨¥ó¥È¥ê¤Ë \"plural=EXPRESSION\" °À­¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...¤·¤«¤·¥Ø¥Ã¥À¥¨¥ó¥È¥ê¤Ë \"nplurals=INTEGER\" °À­¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 msgid "invalid nplurals value"
 msgstr "ÉÔÀµ¤Ê nplurals ¤ÎÃÍ"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr "ÉÔÀµ¤ÊÊ£¿ô (plural) ɽ¸½"
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr "nplurals = %lu..."
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "...¤·¤«¤·¤¤¤¯¤Ä¤«¤Î¥á¥Ã¥»¡¼¥¸¤Ë¤Ï 1¤Ä¤À¤±Ê£¿ô·Á¤¬¤¢¤ê¤Þ¤¹"
 msgstr[1] "...¤·¤«¤·¤¤¤¯¤Ä¤«¤Î¥á¥Ã¥»¡¼¥¸¤Ë¤Ï %lu ¸Ä¤À¤±Ê£¿ô·Á¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "...¤·¤«¤·¤¤¤¯¤Ä¤«¤Î¥á¥Ã¥»¡¼¥¸¤Ë¤Ï 1¤Ä¤ÎÊ£¿ô·Á¤¬¤¢¤ê¤Þ¤¹"
 msgstr[1] "...¤·¤«¤·¤¤¤¯¤Ä¤«¤Î¥á¥Ã¥»¡¼¥¸¤Ë¤Ï %lu ¸Ä¤ÎÊ£¿ô·Á¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr "%s ¤Ë¤È¤Ã¤ÆÍ­¸ú¤Ê, ¼¡¤ò»È¤Ã¤Æ¤ß¤Æ¤¯¤À¤µ¤¤:\n"
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -1300,115 +1300,115 @@ msgstr ""
 "¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤Ë¤ÏÊ£¿ô·Á¤ÎËÝÌõ¤¬¤¢¤ê¤Þ¤¹. ¤·¤«¤· \"Plural-Forms: "
 "nplurals=INTEGER; plural=EXPRESSION;\" ¤È¤¤¤¦¥Ø¥Ã¥À¥¨¥ó¥È¥ê¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "`msgid' ¤È `msgid_plural' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' ¤È `msgstr[%u]' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' ¤È `msgstr' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "`msgid' ¤È `msgstr_plural' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' ¤È `msgstr[%u]' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' ¤È `msgstr' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr "Ê£¿ô·Á¤ÎÀ©¸æ¤Ï GNU gettext ¤Î³ÈÄ¥¤Ç¤¹"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr "'%s' ¤Ï 'msgid' ¤È°ã¤Ã¤ÆÀµ¤·¤¤ %s ·Á¼°¤Îʸ»úÎó¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr ¤Ë¤Ï¥­¡¼¥Ü¡¼¥É¥¢¥¯¥»¥ì¥ì¡¼¥¿¤Îµ­¹æ '%c' ¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 "msgstr ¤Ë¤Ï¤¢¤Þ¤ê¤Ë¿¤¯¤Î¥­¡¼¥Ü¡¼¥É¥¢¥¯¥»¥ì¥ì¡¼¥¿¤Îµ­¹æ '%c' ¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "¥Ø¥Ã¥À¾ðÊó `%s' ¤¬¥Ø¥Ã¥À¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó\n"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "¥Ø¥Ã¥À¾ðÊó `%s' ¤Ï¹ÔƬ¤Ë¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó\n"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 msgid "some header fields still have the initial default value\n"
 msgstr "¤¤¤¯¤Ä¤«¤Î¥Ø¥Ã¥À¾ðÊ󤬽é´üɸ½àÃͤΤޤޤǤ¹\n"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "¾ðÊó `%s' ¤¬½é´üɸ½àÃͤΤޤޤǤ¹\n"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr "·Ù¹ð: PO ¥Õ¥¡¥¤¥ë¤Î¥Ø¥Ã¥À¤¬¤Ê¤¤, ¤â¤·¤¯¤ÏÉÔÀµ¤Ç¤¹\n"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr "·Ù¹ð: ʸ»ú¥»¥Ã¥È¤ÎÊÑ´¹¤¬µ¡Ç½¤·¤Þ¤»¤ó\n"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr "·Ù¹ð: PO ¥Õ¥¡¥¤¥ë¥Ø¥Ã¥À¤¬¤¢¤¤¤Þ¤¤¤Ç¤¹\n"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "·Ù¹ð: msgfmt ¤Î°ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¤³¤³¤Ç¥¨¥é¡¼¤Ë¤Ê¤ê¤Þ¤¹\n"
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "¥É¥á¥¤¥ó̾ \"%s\" ¤Ï¥Õ¥¡¥¤¥ë̾¤È¤·¤ÆŬÀڤǤϤ¢¤ê¤Þ¤»¤ó"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "¥É¥á¥¤¥ó̾ \"%s\" ¤Ï¥Õ¥¡¥¤¥ë̾¤È¤·¤ÆŬÀڤǤϤ¢¤ê¤Þ¤»¤ó:\n"
 "ÀÜƬ¼­¤ò»È¤¤¤Þ¤¹"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "`¥É¥á¥¤¥ó %s' Ì¿Îá¤Ï̵»ë¤µ¤ì¤Þ¤¹"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "¶õ¤Î `msgstr' ¥¨¥ó¥È¥ê¤Ï̵»ë¤µ¤ì¤Þ¤¹"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "¤¢¤¤¤Þ¤¤ (fuzzy) ¤Ê `msgstr' ¥¨¥ó¥È¥ê¤Ï̵»ë¤µ¤ì¤Þ¤¹"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: ·Ù¹ð: ¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Ë¤¢¤¤¤Þ¤¤ (fuzzy) ¤ÊËÝÌõ¤¬¤¢¤ê¤Þ¤¹"
@@ -1652,23 +1652,23 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "%s ¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ¹¤ë±ÑÌõ"
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "¸½ºß¤Îʸ»ú¥»¥Ã¥È \"%s\" ¤Ï²ÄÈÂÀ­¤Î¤¢¤ë¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°Ì¾¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "2¤Ä¤Î°Û¤Ê¤Ã¤¿Ê¸»ú¥»¥Ã¥È \"%s\" ¤È \"%s\" ¤¬ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ë¤¢¤ê¤Þ¤¹"
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë `%s' ¤Ëʸ»ú¥»¥Ã¥È¤ò»ØÄꤹ¤ë¥Ø¥Ã¥À¹àÌܤ¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -1677,18 +1677,18 @@ msgstr ""
 "ÆþÎÏ¥Õ¥¡¥¤¥ë `%2$s' Æâ¤Î¥É¥á¥¤¥ó \"%1$s\" ¤Ë¤Ïʸ»ú¥»¥Ã¥È¤ò»ØÄꤹ¤ë¥Ø¥Ã¥À¹àÌÜ"
 "¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 "ÂоݤȤʤëʸ»ú¥»¥Ã¥È \"%s\" ¤Ï²ÄÈÂÀ­¤Î¤¢¤ë¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°Ì¾¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr "·Ù¹ð: "
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
@@ -1696,7 +1696,7 @@ msgstr ""
 "ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ë¤Ï°Û¤Ê¤Ã¤¿¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Î¥á¥Ã¥»¡¼¥¸¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹.\n"
 "½ÐÎϤò UTF-8 ¤ËÊÑ´¹¤·¤Þ¤¹.\n"
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1767,11 +1767,11 @@ msgstr ""
 msgid "conversion failure"
 msgstr "ÊÑ´¹¼ºÇÔ"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ëʸ»ú¥»¥Ã¥È¤ò»ØÄꤹ¤ë¥Ø¥Ã¥À¹àÌܤ¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -1780,7 +1780,7 @@ msgstr ""
 "\"%s\" ¤«¤é \"%s\" ¤ËÊÑ´¹¤Ç¤­¤Þ¤»¤ó. %s ¤Ï iconv() ¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¤¬,iconv"
 "() ¤Ï¤³¤ÎÊÑ´¹¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤»¤ó."
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2107,13 +2107,13 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<ɸ½àÆþÎÏ>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: ·Ù¹ð: "
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2122,15 +2122,15 @@ msgstr ""
 "ʸ»ú¥»¥Ã¥È \"%s\" ¤ÏÈÆÍѤΥ¨¥ó¥³¡¼¥Ç¥£¥°Ì¾¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó.\n"
 "¥æ¡¼¥¶¤Îʸ»ú¥»¥Ã¥È¤Ø¤Î¥á¥Ã¥»¡¼¥¸¤ÎÊÑ´¹¤Ï¤¦¤Þ¤¯Æ¯¤«¤Ê¤¤¤«¤âÃΤì¤Þ¤»¤ó.\n"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr "¤È¤Ë¤«¤¯Â³¤±¤Þ¤¹¤¬, ʸˡ¥¨¥é¡¼¤òµ¯¤³¤¹¤Ç¤·¤ç¤¦."
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr "¤È¤Ë¤«¤¯Â³¤±¤Þ¤¹."
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2139,7 +2139,7 @@ msgstr ""
 "ʸ»ú¥»¥Ã¥È \"%s\" ¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó. %s ¤Ï iconv() ¤Ë°Í¸¤·¤Þ¤¹¤¬,\n"
 "iconv() ¤Ï \"%s\" ¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤»¤ó.\n"
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2147,12 +2147,12 @@ msgstr ""
 "GNU libiconv ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤«¤é GNU gettext ¤òºÆ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ì¤Ð\n"
 "¤³¤ÎÌäÂê¤Ï²ò·è¤¹¤ë¤Ç¤·¤ç¤¦.\n"
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2161,7 +2161,7 @@ msgstr ""
 "ʸ»ú¥»¥Ã¥È \"%s\" ¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó. %s ¤Ï iconv() ¤Ë°Í¸¤·¤Þ¤¹.\n"
 "¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï iconv() ̵¤·¤Çºî¤é¤ì¤Þ¤·¤¿.\n"
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2198,43 +2198,43 @@ msgstr "Ê£
 msgid "too many errors, aborting"
 msgstr "¥¨¥é¡¼¤¬Â¿²á¤®¤ë¤Î¤Ç, ½èÍý¤òÂǤÁÀÚ¤ê¤Þ¤¹"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "ÉÔÀµ¤ÊÊ£¿ô¥Ð¥¤¥È¤Î¥·¡¼¥±¥ó¥¹"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr "¥Õ¥¡¥¤¥ë½ªÃ¼¤ËÉÔ´°Á´¤ÊÊ£¿ô¥Ð¥¤¥È¤Î¥·¡¼¥±¥ó¥¹"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr "¹ÔËö¤ËÉÔ´°Á´¤ÊÊ£¿ô¥Ð¥¤¥È¤Î¥·¡¼¥±¥ó¥¹"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr "iconv ¤Î¼ºÇÔ"
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" ¤òÆɤ߹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "¥­¡¼¥ï¡¼¥É \"%s\" ¤ÏÃΤê¤Þ¤»¤ó"
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "ÉÔÀµ¤ÊÀ©¸æ¥·¡¼¥±¥ó¥¹"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "ʸ»úÎóÃæ¤Î end-of-file"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "ʸ»úÎóÃæ¤Î end-of-line"
 
@@ -2299,7 +2299,7 @@ msgstr "
 msgid "failed to create \"%s\""
 msgstr "\"%s\" ¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "\"%s\" ¥Õ¥¡¥¤¥ë¤ò½ñ¤­¹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
@@ -2314,7 +2314,7 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "\"%s\" ¤Ë½ñ¤­¹þ¤â¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -2322,7 +2322,7 @@ msgstr ""
 "¹ñºÝ²½¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤Ï `\\%c' ¤È¤¤¤¦¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹¤ò´Þ¤ó¤Ç¤Ï¤¤¤±¤Þ¤»"
 "¤ó"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2336,12 +2336,12 @@ msgstr ""
 "¸¡Æ¤¤·¤Æ¤¯¤À¤µ¤¤.\n"
 "%s\n"
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë \"%s\" ¤òºî¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "ɸ½à½ÐÎÏ"
@@ -2356,7 +2356,7 @@ msgstr "%s:%d: 
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: ·Ù¹ð: ʸ»úÎó¤Ë½ªÃ¼¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¥É¥á¥¤¥óÌ¿Îá¤ò´Þ¤ó¤Ç¤¤¤Ê¤¤¤è¤¦¤Ç¤¹"
 
@@ -2383,17 +2383,17 @@ msgstr "--join-existing 
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ¤Ï¸¡º÷¤¹¤ë¥­¡¼¥ï¡¼¥É¤¬¤Ê¤±¤ì¤ÐÆ°¤­¤Þ¤»¤ó"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "·Ù¹ð: ¥Õ¥¡¥¤¥ë `%s' (³ÈÄ¥»Ò `%s') ¤Ï̤ÃΤηÁ¼°¤Ê¤Î¤Ç C ¸À¸ì¤ò»î¤·¤Þ¤¹"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Í¿¤¨¤é¤ì¤¿ÆþÎÏ¥Õ¥¡¥¤¥ë¤«¤éËÝÌõ²Äǽ¤Êʸ»úÎó¤ò¼è¤ê½Ð¤·¤Þ¤¹.\n"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -2402,7 +2402,7 @@ msgstr ""
 "Ť¤¥ª¥×¥·¥ç¥ó¤Ëɬ¿Ü¤Î°ú¿ô¤Ïû¤¤¥ª¥×¥·¥ç¥ó¤Ë¤âɬ¿Ü¤Ç¤¹.\n"
 "ɬ¿Ü¤Ç¤Ê¤¤°ú¿ô¤âƱ¤¸¤Ç¤¹.\n"
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2417,7 +2417,7 @@ msgstr ""
 "  -p, --output-dir=DIR           ¥Ç¥£¥ì¥¯¥È¥ê DIR ¤Ë¥Õ¥¡¥¤¥ë¤ò½ÐÎÏ\n"
 "½ÐÎÏ¥Õ¥¡¥¤¥ë¤¬ - ¤Î¾ì¹ç¤Ïɸ½à½ÐÎϤ˷ë²Ì¤¬½ñ¤­½Ð¤µ¤ì¤Þ¤¹.\n"
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2436,7 +2436,7 @@ msgstr ""
 "  -C, --c++                      --language=C++ ¤Îû½Ì·Á\n"
 "ɸ½à¤Ç¸À¸ì¤ÏÆþÎÏ¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤Ç¼±Ê̤µ¤ì¤Þ¤¹.\n"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2451,7 +2451,7 @@ msgstr ""
 "  -c, --add-comments[=TAG]       TAG (¤Þ¤¿¤Ï¥­¡¼¥ï¡¼¥É¹Ô) ¤òÉÕ¤±¤Æ\n"
 "                                 ¥³¥á¥ó¥ÈÉôʬ¤ò½ÐÎÏ¥Õ¥¡¥¤¥ë¤ËÆþ¤ì¤ë\n"
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2468,7 +2468,7 @@ msgstr ""
 "  -T, --trigraphs                ÆþÎϤµ¤ì¤¿ ANSI C ¥È¥é¥¤¥°¥é¥Õ¤òǧ¼±\n"
 "      --debug                    ¤è¤ê¾ÜºÙ¤Ê¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Îǧ¼±·ë²Ì\n"
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -2509,11 +2509,11 @@ msgstr ""
 "  -m, --msgstr-prefix[=STRING]   msgstr ¹àÌܤÎÀÜƬ¼­¤È¤·¤Æ STRING ¤« \"\" ¤ò»ÈÍÑ\n"
 "  -M, --msgstr-suffix[=STRING]   msgstr ¹àÌܤÎÀÜÈø¼­¤È¤·¤Æ STRING ¤« \"\" ¤ò»ÈÍÑ\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "ɸ½àÆþÎÏ"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -2523,7 +2523,7 @@ msgstr ""
 "gettxt(\"\") ¤Ï¥á¥¿¾ðÊó¤ÎÉÕ¤¤¤¿¥Ø¥Ã¥À¥¨¥ó¥È¥ê¤òÊÖ¤·¤Þ¤¹¤¬\n"
 "¶õ¤Îʸ»úÎó¤ÏÊÖ¤·¤Þ¤»¤ó.\n"
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "¸À¸ì `%s' ¤ÏÃΤê¤Þ¤»¤ó"
diff --git a/po/ko.gmo b/po/ko.gmo
index 38293188c..ee376ad53 100644
Binary files a/po/ko.gmo and b/po/ko.gmo differ
diff --git a/po/ko.po b/po/ko.po
index 69fafb26a..aa3b21183 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.11.2\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2002-04-25 13:56+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
@@ -29,8 +29,8 @@ msgstr "`%2$s'
 msgid "Valid arguments are:"
 msgstr "¿Ã¹Ù¸¥ ÀÎÀÚ´Â ´ÙÀ½°ú °°½À´Ï´Ù:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "Àбâ À§ÇØ \"%s\"À»(¸¦) ¿©´Â µ¿¾È ¿À·ù ¹ß»ý"
@@ -121,12 +121,12 @@ msgstr "%s: `-W %s'
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "ÀÚ¹Ù ÄÄÆÄÀÏ·¯°¡ ¾ø½À´Ï´Ù.  gcj¸¦ ¼³Ä¡Çϰųª $JAVAC ȯ°æº¯¼ö¸¦ ¼¼ÆÃÇϽʽÿÀ"
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "ÀÚ¹Ù °¡»ó±â°è°¡ ¾ø½À´Ï´Ù.  gij¸¦ ¼³Ä¡Çϰųª $JAVAC ȯ°æº¯¼ö¸¦ ¼¼ÆÃÇϽʽÿÀ"
@@ -239,7 +239,7 @@ msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "ÀÎÀÚ '%s'¿¡ ´ëÇÑ 'msgid'¿Í '%s'ÀÇ ¼­½Ä ÁöÁ¤ÀÌ °°Áö ¾Ê½À´Ï´Ù"
 
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -254,7 +254,7 @@ msgstr ""
 "ÀÌ ÇÁ·Î±×·¥Àº ÀÚÀ¯ ¼ÒÇÁÆ®¿þ¾îÀÔ´Ï´Ù.  º¹»ç Á¶°ÇÀº ¼Ò½º¸¦ ÂüÁ¶ÇϽʽÿÀ. »óÇ°¼º\n"
 "À̳ª ƯÁ¤ ¸ñÀû¿¡ ´ëÇÑ ÀûÇÕ¼ºÀ» ºñ·ÔÇÏ¿©, ¾î¶°ÇÑ º¸Áõµµ ÇÏÁö ¾Ê½À´Ï´Ù.\n"
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -263,7 +263,7 @@ msgstr ""
 msgid "Written by %s.\n"
 msgstr "%sÀÌ(°¡) ¸¸µé¾ú½À´Ï´Ù.\n"
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "Àμö°¡ ³Ê¹« ¸¹À½"
 
@@ -271,11 +271,11 @@ msgstr "
 msgid "missing arguments"
 msgstr "Àμö°¡ ºüÁ³À½"
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é `%s --help' ÇϽʽÿÀ\n"
@@ -336,25 +336,25 @@ msgstr ""
 "¸ñ·Ï¿¡¼­ ¹ø¿ªµÇ¾î ÀÖ´Â ¸Þ½ÃÁö¸¸ÀÌ Ãâ·ÂµË´Ï´Ù.\n"
 "±âº» Ž»ö µð·ºÅ丮: %s\n"
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "<bug-gnu-gettext@gnu.org>·Î ¹®Á¦Á¡À» ¾Ë·Á ÁֽʽÿÀ.\n"
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>]\n"
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr "ÀÌ ±â°èÀÇ È£½ºÆ®À̸§À» Ç¥½ÃÇÕ´Ï´Ù.\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -369,7 +369,7 @@ msgstr ""
 "                          Domain Name) ¹× º°¸í(alias)µéÀ» ¸ðµÎ Æ÷ÇÔ\n"
 "  -i, --ip-address      È£½ºÆ®À̸§¿¡ ´ëÇÑ ÁÖ¼Ò\n"
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -382,7 +382,7 @@ msgstr ""
 "  -h, --help                  ÀÌ µµ¿ò¸»À» Ç¥½ÃÇÏ°í ³¡³³´Ï´Ù\n"
 "  -V, --version               ¹öÀü Á¤º¸¸¦ Ç¥½ÃÇÏ°í ³¡³³´Ï´Ù\n"
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr "È£½ºÆ®À̸§À» ¾Ë¾Æ³¾ ¼ö ¾ø½À´Ï´Ù"
 
@@ -402,7 +402,7 @@ msgstr "
 msgid "%s and %s are mutually exclusive"
 msgstr "%s°ú(¿Í) %sÀº(´Â) ¼­·Î ¹èŸÀûÀÔ´Ï´Ù"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "»ç¿ë¹ý: %s [¿É¼Ç] [ÀÔ·ÂÆÄÀÏ]\n"
@@ -417,14 +417,14 @@ msgstr ""
 "\n"
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "±ä ¿É¼Ç¿¡¼­ ²À ÇÊ¿äÇÑ Àμö´Â ªÀº ¿É¼Ç¿¡µµ ²À ÇÊ¿äÇÕ´Ï´Ù.\n"
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -437,7 +437,7 @@ msgstr ""
 "  -D, --directory=<µð·ºÅ丮>     ÀÔ·Â ÆÄÀÏ Å½»ö ¸í´Ü¿¡ <µð·ºÅ丮>¸¦ Ãß°¡ÇÕ´Ï´Ù\n"
 "¸¸¾à ÀÔ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾Ê¾Ò°Å³ª \"-\"ÀÎ °æ¿ì, Ç¥ÁØ ÀÔ·ÂÀ» ÀнÀ´Ï´Ù.\n"
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -525,7 +525,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "ºÒ°¡´ÉÇÑ ¼±Åà Á¶°ÇÀ» ÁöÁ¤ÇÏ¿´½À´Ï´Ù (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>] [<ÀÔ·ÂÆÄÀÏ>]...\n"
@@ -553,7 +553,7 @@ msgstr ""
 "³ªÅ¸³ª´Â °¡Àå ù ¹ø° PO ÆÄÀÏ¿¡ µé¾î ÀÖ´Â  ¸ðµç PO ÆÄÀÏ¿¡¼­ ÆÄÀÏ \n"
 "À§Ä¡´Â ±×´ë·Î À¯ÁöµÉ °ÍÀÔ´Ï´Ù.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -638,7 +638,7 @@ msgstr ""
 "  -s, --sort-output             Á¤·ÄµÈ Ãâ·ÂÀ» ¸¸µì´Ï´Ù\n"
 "  -F, --sort-by-file            ÆÄÀÏÀÇ À§Ä¡¿¡ µû¶ó Ãâ·ÂÀ» Á¤·ÄÇÕ´Ï´Ù\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -719,17 +719,17 @@ msgstr "
 msgid "warning: this message is not used"
 msgstr "°æ°í: ÀÌ ¸Þ½ÃÁö´Â »ç¿ëµÇÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d°³ÀÇ Ä¡¸íÀûÀÎ ¿À·ù¸¦ ã¾Ò½À´Ï´Ù"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "Áߺ¹µÈ ¸Þ½ÃÁö Á¤ÀÇ"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...¿©±â´Â ù¹ø° Á¤ÀÇÀÇ À§Ä¡ÀÔ´Ï´Ù"
 
@@ -812,12 +812,12 @@ msgstr ""
 "  -F, --sort-by-file             ÆÄÀÏÀÇ À§Ä¡¿¡ µû¶ó Ãâ·ÂÀ» Á¤·ÄÇÕ´Ï´Ù\n"
 "      --omit-header              Çì´õ¿¡ `msgid \"\"' Ç׸ñÀ» ¾²Áö ¾Ê½À´Ï´Ù\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "¹ø¿ª ¸ñ·ÏÀ» ´Ù¸¥ ¹®ÀÚ ÀÎÄÚµùÀ¸·Î º¯È¯ÇÕ´Ï´Ù.\n"
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -828,7 +828,7 @@ msgstr ""
 "  -t, --to-code=<À̸§>          Ãâ·ÂÀÇ ÀÎÄÚµù\n"
 "±âº» ÀÎÄÚµùÀº ÇöÀç ·ÎÄÉÀÏÀÇ ÀÎÄÚµùÀÔ´Ï´Ù.\n"
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -1229,24 +1229,24 @@ msgstr ""
 "      --statistics            ¹ø¿ª¿¡ ´ëÇÑ Åë°è¸¦ Ç¥½ÃÇÕ´Ï´Ù\n"
 "  -v, --verbose               ´õ ÀÚ¼¼È÷ Ãâ·ÂÇÕ´Ï´Ù\n"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr "º¹¼ö Ç¥Çö½ÄÀÌ À½¼ö °ªÀ» ¸¸µé ¼öµµ ÀÖ½À´Ï´Ù"
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu ÇÏÁö¸¸ º¹¼ö Ç¥Çö½ÄÀÌ %lu¸¸Å­ Å« °ªÀ» ¸¸µé ¼öµµ ÀÖ½À´Ï´Ù"
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr "º¹¼ö Ç¥Çö½ÄÀÌ 0À¸·Î ³ª´©´Â ¿¬»êÀ» ÇÒ ¼öµµ ÀÖ½À´Ï´Ù"
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr "º¹¼ö Ç¥Çö½ÄÀÌ Á¤¼ö ¿À¹öÇ÷ο츦 ¹ß»ý½Ãų ¼ö ÀÖ½À´Ï´Ù"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -1254,49 +1254,49 @@ msgstr ""
 "º¹¼ö Ç¥Çö½ÄÀÌ ¿¬»ê ¿¹¿Ü¸¦ ¹ß»ý½Ãų ¼ö ÀÖ½À´Ï´Ù.  0À¸·Î ³ª´©´Â ¿¬»êÀ» ÇÒ ¼ö ÀÖ"
 "½À´Ï´Ù"
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr "¸Þ¼¼Áö ¸ñ·ÏÀº º¹¼öÇü ¹ø¿ªÀÌ µé¾î ÀÖ½À´Ï´Ù..."
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...ÇÏÁö¸¸ Çì´õ Ç׸ñ¿¡´Â \"plural=Ç¥Çö½Ä\" ¼Ó¼ºÀÌ µé¾î ÀÖÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...ÇÏÁö¸¸ Çì´õ Ç׸ñ¿¡´Â \"nplurals=Á¤¼ö\" ¼Ó¼ºÀÌ µé¾î ÀÖÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 msgid "invalid nplurals value"
 msgstr "nplurals °ªÀÌ À߸øµÇ¾ú½À´Ï´Ù"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr "À߸øµÈ º¹¼ö Ç¥Çö½Ä"
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr "nplurals = %lu..."
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "...ÇÏÁö¸¸ ¾î¶² ¸Þ¼¼Áö´Â %lu°³ÀÇ º¹¼ö Çü¹Û¿¡ ¾ø½À´Ï´Ù"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "...ÇÏÁö¸¸ ¾î¶² ¸Þ¼¼Áö´Â %lu°³ÀÇ º¹¼ö ÇüÀÌ ÀÖ½À´Ï´Ù"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr "´ÙÀ½À» »ç¿ëÇØ º¸½Ê½Ã¿À.  %s¿¡ ´ëÇؼ­ ¿Ã¹Ù¸§:\n"
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -1304,112 +1304,112 @@ msgstr ""
 "¸Þ¼¼Áö ¸ñ·Ï¿¡ º¹¼öÇü ¹ø¿ªÀÌ µé¾î ÀÖÁö¸¸, Çì´õ Ç׸ñ¿¡ \"Plural-Forms: "
 "nplurals=Á¤¼ö; plural=Ç¥Çö½Ä;\"ÀÌ ¾ø½À´Ï´Ù"
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid'¿Í `msgstr_plural' Ç׸ñÀÌ ¸ðµÎ '\\n'À¸·Î ½ÃÀÛÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid'¿Í `msgstr[%u]' Ç׸ñÀÌ ¸ðµÎ '\\n'À¸·Î ½ÃÀÛÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid'¿Í `msgstr' Ç׸ñÀÌ ¸ðµÎ '\\n'À¸·Î ½ÃÀÛÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid'¿Í `msgid_plural' Ç׸ñÀÌ ¸ðµÎ '\\n'À¸·Î ³¡³ªÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid'¿Í `msgstr[%u]' Ç׸ñÀÌ ¸ðµÎ '\\n'À¸·Î ³¡³ªÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid'¿Í `msgstr' Ç׸ñÀÌ ¸ðµÎ '\\n'À¸·Î ³¡³ªÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr "º¹¼ö 󸮴 GNU gettext È®Àå ±â´ÉÀÔ´Ï´Ù"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr "'msgid'¿Í´Â ´Þ¸®, '%s'Àº(´Â) ¿Ã¹Ù¸¥ %s Çü½Ä ¹®ÀÚ¿­ÀÌ ¾Æ´Õ´Ï´Ù"
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr¿¡ Å°º¸µå ´ÜÃàÅ° '%c'¿¡ ´ëÇÑ Ç¥½Ã°¡ ¾ø½À´Ï´Ù"
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr¿¡ Å°º¸µå ´ÜÃàÅ° '%c' Ç¥½Ã°¡ ³Ê¹« ¸¹½À´Ï´Ù"
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "Çì´õ¿¡ Çì´õ Çʵå `%s'ÀÌ(°¡) ºüÁ³À½\n"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "Çì´õ Çʵå `%s'´Â ÇàÀÇ Ã³À½ºÎÅÍ ½ÃÀÛÇØ¾ß ÇÕ´Ï´Ù\n"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 msgid "some header fields still have the initial default value\n"
 msgstr "¸î¸î Çì´õ Çʵ尡 ¾ÆÁ÷µµ ÃʱâÀÇ ³»Á¤°ªÀ» °¡Áö°í ÀÖ½À´Ï´Ù\n"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "`%s' Çʵ尡 ¾ÆÁ÷µµ ÃʱâÀÇ ³»Á¤°ªÀ» °¡Áö°í ÀÖ½À´Ï´Ù\n"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr "°æ°í: PO ÆÄÀÏ Çì´õ°¡ ºüÁ³°Å³ª À߸øµÇ¾ú½À´Ï´Ù\n"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr "°æ°í: ¹®Àڼ º¯È¯ÀÌ µ¿ÀÛÇÏÁö ¾ÊÀ» °ÍÀÔ´Ï´Ù\n"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr "°æ°í: PO ÆÄÀÏ Çì´õ°¡ ÆÛÁöÀÔ´Ï´Ù\n"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "°æ°í: °ú°Å ¹öÀüÀÇ msgfmtÀº ¿©±â¿¡ ¿À·ù¸¦ ³¾ °ÍÀÔ´Ï´Ù\n"
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "µµ¸ÞÀÎÀ̸§ \"%s\"´Â ÆÄÀÏ À̸§À¸·Î ¾Ë¸ÂÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "µµ¸ÞÀÎÀ̸§ \"%s\"´Â ÆÄÀÏ À̸§À¸·Î ¾Ë¸ÂÁö ¾Ê½À´Ï´Ù. ±×·¯¹Ç·Î Á¢µÎ»ç¸¦\n"
 "»ç¿ëÇÒ °ÍÀÔ´Ï´Ù"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "`domain %s' Áö½ÃÀÚ´Â ¹«½ÃµÊ"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "ºó `msgstr' Ç׸ñÀº ¹«½ÃµÊ"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "ÆÛÁö `msgstr' Ç׸ñÀº ¹«½ÃµÊ"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: °æ°í: ¼Ò½º ÆÄÀÏÀÌ ÆÛÁö ¹ø¿ª¹®À» Æ÷ÇÔÇÏ°í ÀÖ½À´Ï´Ù"
@@ -1655,23 +1655,23 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "%s ÆÐÅ°Áö¿¡ ´ëÇÑ Çѱ¹¾î ¹ø¿ª¹®"
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "ÇöÀç ¹®Àڼ \"%s\"Àº(´Â) ³Î¸® ¾µ ¼ö ÀÖ´Â ÀÎÄÚµù À̸§ÀÌ ¾Æ´Õ´Ï´Ù"
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "ÀÔ·Â ÆÄÀÏ¿¡ µÎ °³ÀÇ ¹®Àڼ \"%s\"°ú(¿Í) \"%s\"ÀÌ(°¡) Á¸ÀçÇÕ´Ï´Ù"
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "ÀÔ·Â ÆÄÀÏ `%s'¿¡´Â ¹®ÀÚ¼ÂÀ» ÁöÁ¤ÇÏ´Â Çì´õ Ç׸ñÀÌ µé¾î ÀÖÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -1680,17 +1680,17 @@ msgstr ""
 "ÀÔ·Â ÆÄÀÏ `%2$s'ÀÇ µµ¸ÞÀÎ \"%1$s\"¿¡´Â ¹®ÀÚ¼ÂÀ» ÁöÁ¤ÇÏ´Â Çì´õ Ç׸ñÀÌ µé¾î ÀÖ"
 "Áö ¾Ê½À´Ï´Ù"
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "¸ñÇ¥ ¹®Àڼ \"%s\"Àº(´Â) ³Î¸® ¾µ ¼ö ÀÖ´Â ÀÎÄÚµù À̸§ÀÌ ¾Æ´Õ´Ï´Ù"
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr "°æ°í: "
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
@@ -1698,7 +1698,7 @@ msgstr ""
 "ÀÔ·Â ÆÄÀÏÀº ¿©·¯ °³ÀÇ ÀÎÄÚµùÀ¸·Î µÈ ¸Þ¼¼Áö°¡ µé¾î ÀÖ°í, ±× ÁßÀÇ Çϳª°¡ \n"
 "UTF-8ÀÔ´Ï´Ù.  Ãâ·ÂÀ» UTF-8À¸·Î º¯È¯ÇÕ´Ï´Ù.\n"
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1767,11 +1767,11 @@ msgstr ""
 msgid "conversion failure"
 msgstr "º¯È¯ ½ÇÆÐ"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "ÀÔ·Â ÆÄÀÏÀº ¹®ÀÚ¼ÂÀ» ÁöÁ¤ÇÏ´Â Çì´õ Ç׸ñÀÌ µé¾î ÀÖÁö ¾Ê½À´Ï´Ù"
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -1780,7 +1780,7 @@ msgstr ""
 "\"%s\"¿¡¼­ \"%s\"·Î(À¸·Î) º¯È¯ÇÒ ¼ö ¾ø½À´Ï´Ù.  %sÀº(´Â) iconv()¿¡ ÀÇÁ¸ÇÏÁö"
 "¸¸, iconv()°¡ ÀÌ°°Àº º¯È¯À» Áö¿øÇÏÁö ¾Ê½À´Ï´Ù."
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2115,13 +2115,13 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<Ç¥ÁØÀÔ·Â>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: °æ°í: "
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2130,15 +2130,15 @@ msgstr ""
 "¹®Àڼ \"%s\"ÀÌ(°¡) °øÅëÀûÀ¸·Î ÀÌ¿ëÇÏ´Â ÀÎÄÚµù À̸§ÀÌ ¾Æ´Õ´Ï´Ù.\n"
 "»ç¿ëÀÚÀÇ ¹®ÀÚ¼ÂÀ¸·ÎÀÇ ¸Þ¼¼Áö º¯È¯Àº ÇÏÁö ¾ÊÀ» °ÍÀÔ´Ï´Ù.\n"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr "¾î·µç °è¼ÓÇÕ´Ï´Ù.  ¹®¹ý ¾Ö·¯°¡ Ÿ³ª³¯ °ÍÀÔ´Ï´Ù."
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr "¾î·µç °è¼ÓÇÕ´Ï´Ù"
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2147,7 +2147,7 @@ msgstr ""
 "¹®Àڼ \"%s\"Àº(´Â) Áö¿øµÇÁö ¾Ê½À´Ï´Ù. %sÀº(´Â) iconv()¿¡ ÀÇÁ¸ÇÏÁö¸¸,\n"
 "iconv()´Â %sÀ»(¸¦) Áö¿øÇÏÁö ¾Ê½À´Ï´Ù.\n"
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2155,12 +2155,12 @@ msgstr ""
 "GNU libiconv¸¦ ¼³Ä¡ÇÏ°í GNU gettext¸¦ ´Ù½Ã ¼³Ä¡Çϸé ÀÌ\n"
 "¹®Á¦°¡ ¾øÀ» °ÍÀÔ´Ï´Ù.\n"
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2169,7 +2169,7 @@ msgstr ""
 "¹®Àڼ \"%s\"Àº(´Â) Áö¿øµÇÁö ¾Ê½À´Ï´Ù. %sÀº(´Â) iconv()¿¡ ÀÇÁ¸ÇÏÁö¸¸,\n"
 "ÀÌ ¹öÀüÀº iconv()¸¦ Áö¿øµÇÁö ¾Ê´Â »óÅ·ΠºôµåµÇ¾ú½À´Ï´Ù.\n"
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2206,43 +2206,43 @@ msgstr "
 msgid "too many errors, aborting"
 msgstr "¿À·ù°¡ ³Ê¹« ¸¹¾Æ¼­ Áß´ÜÇÕ´Ï´Ù"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "À߸øµÈ °¡º¯¹ÙÀÌÆ® ¹®ÀÚ¿­"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr "ÆÄÀÏÀÇ ³¡¿¡¼­ ºÒ¿ÏÀüÇÑ ´ÙÁß¹ÙÀÌÆ® ¹®ÀÚ¿­"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr "ÁÙÀÇ ³¡¿¡¼­ ºÒ¿ÏÀüÇÑ ´ÙÁß¹ÙÀÌÆ® ¹®ÀÚ¿­"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr "iconv ½ÇÆÐ"
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\"À»(¸¦) Àд µ¿¾È ¿À·ù ¹ß»ý"
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "¾Ë ¼ö ¾ø´Â Å°¿öµå \"%s\""
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "À߸øµÈ Á¦¾î ¼ø¼­¿­"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "¹®ÀÚ¿­ ³»ºÎ¿¡¼­ ÆÄÀÏÀÌ ³¡³²"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "¹®ÀÚ¿­ ³»ºÎ¿¡¼­ ÇàÀÌ ³¡³²"
 
@@ -2307,7 +2307,7 @@ msgstr "
 msgid "failed to create \"%s\""
 msgstr "\"%s\"À»(¸¦) ¸¸µå´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "\"%s\" ÆÄÀÏÀ» ¾²´Â µ¿¾È ¿À·ù ¹ß»ý"
@@ -2323,13 +2323,13 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "¾²±â À§ÇØ \"%s\"À»(¸¦) ¿©´Â µ¿¾È ¿À·ù ¹ß»ý"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "±¹Á¦È­µÈ ¸Þ½ÃÁö´Â `\\%c' À̽ºÄÉÀÌÇÁ ¼ø¼­¿­À» Æ÷ÇÔÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2342,12 +2342,12 @@ msgstr ""
 "¹ß»ýÇÒ ¼ö ÀÖ½À´Ï´Ù.  ¼ø¼öÇÑ ASCII msgid¸¸À» »ç¿ëÇϵµ·Ï ÇϽʽÿÀ.\n"
 "%s\n"
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "Ãâ·Â ÆÄÀÏ \"%s\"À»(¸¦) ¸¸µé ¼ö ¾ø½À´Ï´Ù"
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "Ç¥ÁØ Ãâ·Â"
@@ -2362,7 +2362,7 @@ msgstr "%s:%d: 
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: °æ°í: ¿Ï°áµÇÁö ¾ÊÀº ¹®ÀÚ¿­ »ó¼ö"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "ÀÌ ÆÄÀÏÀº µµ¸ÞÀÎ Áö½ÃÀÚ¸¦ Æ÷ÇÔÇÏ°í ÀÖÁö ¾ÊÀ» ¼öµµ ÀÖ½À´Ï´Ù"
 
@@ -2389,17 +2389,17 @@ msgstr "--join-exeisting
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext´Â °Ë»öÇÒ Å°¿öµå ¾øÀÌ´Â µ¿ÀÛÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "°æ°í: `%s' ÆÄÀÏÀÇ È®ÀåÀÚ `%s'¸¦ ¾Ë ¼ö ¾ø½À´Ï´Ù; C Çü½ÄÀ¸·Î °£ÁÖÇÔ"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr "ÁÖ¾îÁø ÀÔ·Â ÆÄÀÏ¿¡¼­ ¹ø¿ª °¡´ÉÇÑ ¹®ÀÚ¿­À» »Ì¾Æ³À´Ï´Ù.\n"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -2408,7 +2408,7 @@ msgstr ""
 "±ä ¿É¼Ç¿¡¼­ ²À ÇÊ¿äÇÑ Àμö´Â ªÀº ¿É¼Ç¿¡µµ ²À ÇÊ¿äÇÕ´Ï´Ù.\n"
 "¾ø¾îµµ µÇ´Â ÀÎÀÚµµ ¸¶Âù°¡ÁöÀÔ´Ï´Ù.\n"
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2423,7 +2423,7 @@ msgstr ""
 "  -p, --output-dir=<µð·ºÅ丮>    Ãâ·Â ÆÄÀÏÀ» <µð·ºÅ丮> µð·ºÅ丮¿¡ ³õ½À´Ï´Ù\n"
 "Ãâ·ÂÆÄÀÏÀÌ \"-\"À̸é, Ç¥ÁØ Ãâ·ÂÀ¸·Î Ãâ·ÂÇÕ´Ï´Ù.\n"
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2443,7 +2443,7 @@ msgstr ""
 "±âº»ÀûÀ¸·Î ÀÔ·Â ÆÄÀÏÀÇ È®ÀåÀÚ¿¡ µû¶ó ¾ð¾î¸¦ ÃßÃøÇÕ´Ï´Ù\n"
 
 # TAG°¡ Á¤È®ÀÌ ¹¹Áö?
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2458,7 +2458,7 @@ msgstr ""
 "  -c, --add-comments[=<ű×>]    ÁÖ¼® ºÎºÐÀ» <ÅÂÅ©>·Î (ȤÀº Å°¿öµå ÁÙ ¾Õ¿¡\n"
 "                                 ÀÖ´Â °ÍÀ¸·Î) ¾¹´Ï´Ù\n"
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2475,7 +2475,7 @@ msgstr ""
 "  -T, --trigraphs                ÀԷ¿¡¼­ ANSI C »ïÁßÀÚ(trigraph)¸¦ ÀνÄÇÕ´Ï´Ù\n"
 "      --debug                    ´õ ÀÚ¼¼ÇÑ Çü½Ä¹®ÀÚ¿­ ÀÎ½Ä °á°ú\n"
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -2516,11 +2516,11 @@ msgstr ""
 "  -m, --msgstr-prefix[=<¹®ÀÚ¿­>] msgstr Ç׸ñ¿¡ <¹®ÀÚ¿­> ȤÀº \"\"À» Á¢µÎ¾î·Î\n"
 "  -M, --msgstr-suffix[=<¹®ÀÚ¿­>] msgstr Ç׸ñ¿¡ <¹®ÀÚ¿­> ȤÀº \"\"À» Á¢¹Ì¾î·Î\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "Ç¥ÁØ ÀÔ·Â"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -2530,7 +2530,7 @@ msgstr ""
 "gettext(\"\")´Â ºó ¹®ÀÚ¿­ÀÌ ¾Æ´Ï¶ó, ¸ÞŸ Á¤º¸°¡ µé¾î ÀÖ´Â \n"
 "Çì´õ Ç׸ñÀ» ¸®ÅÏÇÕ´Ï´Ù.\n"
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "`%s' ¾ð¾î¸¦ ¾Ë ¼ö ¾øÀ½"
diff --git a/po/nl.gmo b/po/nl.gmo
index 433977445..eddeb0a2f 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index ede359d12..822e0981d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.31\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 1997-03-11 22:38 \n"
 "Last-Translator: Erick Branderhorst <Erick.Branderhorst@asml.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -28,8 +28,8 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "fout tijdens openen om te lezen van \"%s\""
@@ -120,11 +120,11 @@ msgstr "%s: optie `-W %s' is dubbelzinnig\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: optie `-W %s' staat geen argument toe\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
@@ -235,7 +235,7 @@ msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
 
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -251,7 +251,7 @@ msgstr ""
 "garantie; zelfs niet voor VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN\n"
 "SPECIFIEK DOEL.\n"
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -260,7 +260,7 @@ msgstr ""
 msgid "Written by %s.\n"
 msgstr "Geschreven door %s.\n"
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "te veel argumenten"
 
@@ -268,11 +268,11 @@ msgstr "te veel argumenten"
 msgid "missing arguments"
 msgstr "ontbrekende argumenten"
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Probeer `%s --help' voor meer informatie.\n"
@@ -333,26 +333,26 @@ msgstr ""
 "worden de in de katalogus gevonden meldingen vertaald.\n"
 "Standaard zoek directory: %s\n"
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Meld fouten via <bug-gnu-utils@gnu.org>.\n"
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -362,7 +362,7 @@ msgid ""
 "  -i, --ip-address      addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -372,7 +372,7 @@ msgid ""
 "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr ""
 msgid "%s and %s are mutually exclusive"
 msgstr "%s en %s zijn mutually exclusive"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
@@ -405,14 +405,14 @@ msgid ""
 msgstr ""
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -421,7 +421,7 @@ msgid ""
 "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -494,7 +494,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -513,7 +513,7 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -582,7 +582,7 @@ msgstr ""
 "  -V, --version               toon versie-informatie en bekindig programma\n"
 "  -W, --width=NUMBER          stel uitvoer pagina breedte in\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -661,17 +661,17 @@ msgstr "deze melding is gebruikt maar niet gedefinieerd in %s"
 msgid "warning: this message is not used"
 msgstr "waarschuwing: deze melding is niet gebruikt"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, fuzzy, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d fatale fouten gevonden"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "dubbele melding definitie"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...dit is de lokatie van de eerste definitie"
 
@@ -740,12 +740,12 @@ msgstr ""
 "  -V, --version               toon versie-informatie en bekindig programma\n"
 "  -W, --width=NUMBER          stel uitvoer pagina breedte in\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -753,7 +753,7 @@ msgid ""
 "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -1092,192 +1092,192 @@ msgid ""
 "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr ""
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "illegale kontrol sequence"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr ""
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, fuzzy, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "deze melding is gebruikt maar niet gedefinieerd in %s"
 msgstr[1] "deze melding is gebruikt maar niet gedefinieerd in %s"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, fuzzy, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "deze melding is gebruikt maar niet gedefinieerd in %s"
 msgstr[1] "deze melding is gebruikt maar niet gedefinieerd in %s"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr ""
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' en `msgstr' ingangen beginnen niet allebei met '\\n'"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' en `msgstr' ingangen beginnen niet allebei met '\\n'"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' en `msgstr' ingangen beginnen niet allebei met '\\n'"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' en `msgstr' ingangen eindigen niet allebei met '\\n'"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' en `msgstr' ingangen eindigen niet allebei met '\\n'"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' en `msgstr' ingangen eindigen niet allebei met '\\n'"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr ""
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, fuzzy, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "header(??)veld `%s' ontbreekt in header(??)"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "header(??)veld `%s' moet starten aan het begin van de regel"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 "sommige header(??)velden hebben nog de oorspronkelijke standaard waarde"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, fuzzy, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "veld `%s' heeft nog de oorspronkelijke standaard waarde"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 #, fuzzy
 msgid "warning: PO file header missing or invalid\n"
 msgstr "%s: let op: broncode bevat vage vertaling"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 #, fuzzy
 msgid "warning: charset conversion will not work\n"
 msgstr "%s: let op: broncode bevat vage vertaling"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 #, fuzzy
 msgid "warning: PO file header fuzzy\n"
 msgstr "%s: let op: broncode bevat vage vertaling"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domeinnaam \"%s\" niet bruikbaar als bestandsnaam"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "domeinnaam \"%s\" niet bruikbaar als bestandsnaam: zal voorvoegsel gebruiken"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "`domein %s' directive genegeerd"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "lege `msgstr' entry genegeerd"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "lege `msgstr' ingang genegeerd"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: let op: broncode bevat vage vertaling"
@@ -1468,46 +1468,46 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1559,18 +1559,18 @@ msgstr ""
 msgid "conversion failure"
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -1850,53 +1850,53 @@ msgstr ""
 msgid "<stdin>"
 msgstr ""
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr ""
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, fuzzy, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr "%s: let op: broncode bevat vage vertaling"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr ""
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 #, fuzzy
 msgid ""
 "Charset missing in header.\n"
@@ -1934,47 +1934,47 @@ msgstr ""
 msgid "too many errors, aborting"
 msgstr "te veel fouten, afgebroken"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 #, fuzzy
 msgid "invalid multibyte sequence"
 msgstr "illegale kontrol sequence"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 #, fuzzy
 msgid "incomplete multibyte sequence at end of file"
 msgstr "illegale kontrol sequence"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 #, fuzzy
 msgid "incomplete multibyte sequence at end of line"
 msgstr "illegale kontrol sequence"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fout tijdens lezen \"%s\""
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "sleutelwoord \"%s\" onbekend"
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 #, fuzzy
 msgid "invalid control sequence"
 msgstr "illegale kontrol sequence"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "einde-bestand-teken in string"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "einde-regel-teken in string"
 
@@ -2039,7 +2039,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "fout bij schrijven bestand \"%s\""
@@ -2053,14 +2053,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "fout bij openen om te schrijven van \"%s\""
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "geonternationaliseerde meldingen mogen geen `\\%c' escape sequences bevatten"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2069,12 +2069,12 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan uitvoerbestand \"%s\" niet aanmaken"
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "standaard uitvoer"
@@ -2089,7 +2089,7 @@ msgstr "%s:%d: let op: niet getermineerde karakter konstante"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: let op: niet getermineerde string literal"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "dit bestand mag geen domein directives bevatten"
 
@@ -2119,24 +2119,24 @@ msgstr ""
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "let op: bestand `%s' extensie `%s' is onbekend; ga C proberen"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2146,7 +2146,7 @@ msgid ""
 "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2158,7 +2158,7 @@ msgid ""
 "By default the language is guessed depending on the input file name extension.\n"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2168,7 +2168,7 @@ msgid ""
 "                                 preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2179,7 +2179,7 @@ msgid ""
 "      --debug                    more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -2218,18 +2218,18 @@ msgstr ""
 "  -V, --version               toon versie-informatie en bekindig programma\n"
 "  -W, --width=NUMBER          stel uitvoer pagina breedte in\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "standaard invoer"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "taal `%s' onbekend"
diff --git a/po/nn.gmo b/po/nn.gmo
index 36c5ee5b1..afae0495f 100644
Binary files a/po/nn.gmo and b/po/nn.gmo differ
diff --git a/po/nn.po b/po/nn.po
index de351e32e..f9c97225c 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.12\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 1996-03-21 08:46 EST\n"
 "Last-Translator: Karl Anders Øygard <karlo@ifi.uio.no>\n"
 "Language-Team: Norwegian-nynorsk <no@li.org>\n"
@@ -28,8 +28,8 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, fuzzy, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "feil under skriving av fila \"%s\""
@@ -120,11 +120,11 @@ msgstr "%s: flagg 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: flagg «--%s» tek ikkje argument\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
@@ -238,7 +238,7 @@ msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "format-spesifiseringane for argument %u er ulike"
 
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -250,7 +250,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -259,7 +259,7 @@ msgstr ""
 msgid "Written by %s.\n"
 msgstr ""
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 #, fuzzy
 msgid "too many arguments"
 msgstr "manglar argument"
@@ -268,11 +268,11 @@ msgstr "manglar argument"
 msgid "missing arguments"
 msgstr "manglar argument"
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, fuzzy, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for meir informasjon\n"
@@ -333,25 +333,25 @@ msgstr ""
 "staden vert meldingar som er funne i den valgte katalogen oversatt.\n"
 "Standard søkekatalog er: %s\n"
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -361,7 +361,7 @@ msgid ""
 "  -i, --ip-address      addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -371,7 +371,7 @@ msgid ""
 "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr ""
 
@@ -391,7 +391,7 @@ msgstr ""
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s utelukker kvarandre"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
@@ -404,14 +404,14 @@ msgid ""
 msgstr ""
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -420,7 +420,7 @@ msgid ""
 "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -486,7 +486,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -505,7 +505,7 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -567,7 +567,7 @@ msgstr ""
 "      --strict             lag strengt Uniforum-konformt utdata\n"
 "  -V, --version            vis programversjon og avslutt\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -644,17 +644,17 @@ msgstr "denne meldinga er brukt, men ikkje definert i %s"
 msgid "warning: this message is not used"
 msgstr "advarsel: denne meldinga er ikkje brukt"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, fuzzy, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "fann %d fatale feil"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr ""
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 #, fuzzy
 msgid "...this is the location of the first definition"
 msgstr "den første definisjonen finst her"
@@ -717,12 +717,12 @@ msgstr ""
 "      --strict             lag strengt Uniforum-konformt utdata\n"
 "  -V, --version            vis programversjon og avslutt\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -730,7 +730,7 @@ msgid ""
 "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -1058,188 +1058,188 @@ msgid ""
 "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr ""
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 msgid "invalid nplurals value"
 msgstr ""
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr ""
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, fuzzy, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "denne meldinga er brukt, men ikkje definert i %s"
 msgstr[1] "denne meldinga er brukt, men ikkje definert i %s"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, fuzzy, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "denne meldinga er brukt, men ikkje definert i %s"
 msgstr[1] "denne meldinga er brukt, men ikkje definert i %s"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr ""
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 #, fuzzy
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 #, fuzzy
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr ""
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, fuzzy, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "filhovud-feltet «%s» manglar i filhovud"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "filhovud-feltet «%s» skulle ha starta på byrjinga av linja"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "nokre filhovud-felt har framleis sin initielle verdi"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, fuzzy, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "feltet «%s» har framleis sin forvalgte verdi"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domenenamnet \"%s\" passar ikkje som filnavn"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domenenamnet \"%s\" passar ikkje som filnavn: brukar prefiks"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, fuzzy, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "ADVARSEL: kildefila har «fuzzy» oversetjingar"
@@ -1423,46 +1423,46 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1514,18 +1514,18 @@ msgstr ""
 msgid "conversion failure"
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -1801,53 +1801,53 @@ msgstr ""
 msgid "<stdin>"
 msgstr ""
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr ""
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr ""
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -1885,43 +1885,43 @@ msgstr ""
 msgid "too many errors, aborting"
 msgstr "for mange feil, avsluttar"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr ""
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr ""
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr ""
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, fuzzy, c-format
 msgid "error while reading \"%s\""
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr ""
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr ""
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr ""
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr ""
 
@@ -1986,7 +1986,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "feil under skriving av fila \"%s\""
@@ -2000,14 +2000,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internasjonaliserte meldingar skal ikkje innehalde escape-sekvensen «\\%c»"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2016,12 +2016,12 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan ikkje opprette utfila \"%s\""
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr ""
@@ -2036,7 +2036,7 @@ msgstr ""
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "denne fila kan ikkje innehalde domene-nøkkelord"
 
@@ -2064,24 +2064,24 @@ msgstr ""
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2091,7 +2091,7 @@ msgid ""
 "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2103,7 +2103,7 @@ msgid ""
 "By default the language is guessed depending on the input file name extension.\n"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2113,7 +2113,7 @@ msgid ""
 "                                 preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2124,7 +2124,7 @@ msgid ""
 "      --debug                    more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -2156,18 +2156,18 @@ msgstr ""
 "      --strict             lag strengt Uniforum-konformt utdata\n"
 "  -V, --version            vis programversjon og avslutt\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr ""
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr ""
diff --git a/po/no.gmo b/po/no.gmo
index 20066348f..be8de142f 100644
Binary files a/po/no.gmo and b/po/no.gmo differ
diff --git a/po/no.po b/po/no.po
index c273d0060..f4d9a43e0 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2001-05-09 02:08+02:00\n"
 "Last-Translator: Trond Endrestøl <endrestol@hotmail.com>\n"
 "Language-Team: Norwegian-bokmål <no@li.org>\n"
@@ -28,8 +28,8 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "feil under åpning av «%s» for lesing"
@@ -120,11 +120,11 @@ msgstr "%s: flagg 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: flagg «-W %s» tillater ikke et argument\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
@@ -236,7 +236,7 @@ msgstr "format-spesifiseringene for argument %lu er ulike"
 
 # Hva skal MERCHANTABILITY og FITNESS FOR PARTICULAR PURPOSE oversettes med?
 # Er denne oversettelsen grei nok?
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -252,7 +252,7 @@ msgstr ""
 "INGEN garanti; ikke engang for SALGBARHET eller SKIKKETHET FOR ET BESTEMT\n"
 "FORMÅL.\n"
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -261,7 +261,7 @@ msgstr ""
 msgid "Written by %s.\n"
 msgstr "Skrevet av %s.\n"
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "for mange argumenter"
 
@@ -269,11 +269,11 @@ msgstr "for mange argumenter"
 msgid "missing arguments"
 msgstr "mangler argumenter"
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for mer informasjon.\n"
@@ -334,26 +334,26 @@ msgstr ""
 "stedet blir funne meldinger i den valgte katalogen oversatt.\n"
 "Standard søkekatalog er: %s\n"
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Rapporter feil til <bug-gnu-utils@gnu.org>.\n"
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -363,7 +363,7 @@ msgid ""
 "  -i, --ip-address      addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -373,7 +373,7 @@ msgid ""
 "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr ""
 
@@ -393,7 +393,7 @@ msgstr ""
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s utelukker hverandre"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
@@ -406,14 +406,14 @@ msgid ""
 msgstr ""
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -422,7 +422,7 @@ msgid ""
 "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -496,7 +496,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "umulig utvalgskriterie angitt (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -531,7 +531,7 @@ msgstr ""
 "PO-filen som definerer dem.  Filposisjonene fra alle PO-filene vil\n"
 "bli bevart.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -617,7 +617,7 @@ msgstr ""
 "  -V, --version               skriv ut programversjon og avslutt\n"
 "  -w, --width=ANTALL          sett sidebredden i utdata\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -694,18 +694,18 @@ msgstr "denne meldingen er brukt, men ikke definert i %s"
 msgid "warning: this message is not used"
 msgstr "advarsel: denne meldingen er ikke brukt"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "fant %d fatale feil"
 msgstr[1] "fant %d fatale feil"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "duplisert definisjon av melding"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "... dette er lokasjonen til den første definisjonen"
 
@@ -807,12 +807,12 @@ msgstr ""
 "  -V, --version               skriv ut programversjon og avslutt\n"
 "  -w, --width=ANTALL          sett sidebredden i utdata\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -820,7 +820,7 @@ msgid ""
 "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -1165,194 +1165,194 @@ msgid ""
 "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr ""
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "ulovlig kontrollsekvens"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr ""
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, fuzzy, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "denne meldingen er brukt, men ikke definert i %s"
 msgstr[1] "denne meldingen er brukt, men ikke definert i %s"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, fuzzy, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "denne meldingen er brukt, men ikke definert i %s"
 msgstr[1] "denne meldingen er brukt, men ikke definert i %s"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr ""
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "«msgid»- og «msgid_plural»-innslagene begynner ikke med `\\n'"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "«msgid»- og «msgstr[%u]»-innslagene begynner ikke med `\\n'"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "«msgid»- og «msgstr»-innslagene begynner ikke med `\\n'"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "«msgid»- og «msgstr[%u]»-innslagene slutter ikke med `\\n'"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "«msgid»- og «msgstr[%u]»-innslagene slutter ikke med `\\n'"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "«msgid»- og «msgstr»-innslagene slutter ikke med `\\n'"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr ""
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, fuzzy, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "filhodefelt «%s» mangler i filhode"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "filhodefelt «%s» skulle ha startet ved begynnelsen av linjen"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "noen filhodefelt har fremdeles sin initielle verdi"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, fuzzy, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "feltet «%s» har fremdeles sin forvalgte verdi"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 #, fuzzy
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: advarsel: PO-filheader mangler, fuzzy, eller ugyldig\n"
 "%*s  advarsel: tegnsettkonvertering vil ikke virke"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 #, fuzzy
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "Tegnsettet mangler i headeren.\n"
 "Meldingskonvertering til brukerens tegnsett kan ikke virke.\n"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 #, fuzzy
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: advarsel: PO-filheader mangler, fuzzy, eller ugyldig\n"
 "%*s  advarsel: tegnsettkonvertering vil ikke virke"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domenenavnet «%s» passer ikke som filnavn"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domenenavnet «%s» passer ikke som filnavn: bruker prefiks"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "nøkkelord «domain %s» ignorert"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "tom «msgstr»-linje ignorert"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "antatt «msgstr»-linje ignorert"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: advarselL: kildefil har antatte oversettelser"
@@ -1544,47 +1544,47 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 #, fuzzy
 msgid "warning: "
 msgstr "%s: advarsel: "
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1636,11 +1636,11 @@ msgstr ""
 msgid "conversion failure"
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -1649,7 +1649,7 @@ msgstr ""
 "Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv(),\n"
 "og iconv() støtter ikke \"%s\".\n"
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -1926,13 +1926,13 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<stdin>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: advarsel: "
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -1941,15 +1941,15 @@ msgstr ""
 "Tegnsettet \"%s\" er ikke et portabelt innkodingsnavn.\n"
 "Meldingskonvertering til brukerens tegnsett kan ikke virke.\n"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr "Fortsetter likevel, forvent parsefeil."
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr "Fortsetter likevel."
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -1958,7 +1958,7 @@ msgstr ""
 "Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv(),\n"
 "og iconv() støtter ikke \"%s\".\n"
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -1966,12 +1966,12 @@ msgstr ""
 "Installasjon av GNU libiconv og deretter reinstallasjon av GNU gettext\n"
 "vil rette dette problemet.\n"
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -1980,7 +1980,7 @@ msgstr ""
 "Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv().\n"
 "Denne versjonen ble blygget uten iconv().\n"
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2017,45 +2017,45 @@ msgstr "flertallsform har feil indeks"
 msgid "too many errors, aborting"
 msgstr "for mange feil, avbryter"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "ulovlig multibytesekvens"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 #, fuzzy
 msgid "incomplete multibyte sequence at end of file"
 msgstr "ulovlig multibytesekvens"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 #, fuzzy
 msgid "incomplete multibyte sequence at end of line"
 msgstr "ulovlig multibytesekvens"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "feil under lesing av «%s»"
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "nøkkelord «%s» ukjent"
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "ulovlig kontrollsekvens"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "slutt-på-fil inne i streng"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "slutt-på-linje inne i streng"
 
@@ -2120,7 +2120,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "feil under skriving av filen «%s»"
@@ -2134,14 +2134,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "feil under åpning av «%s» for skriving"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internasjonaliserte meldinger bør ikke inneholde escape-sekvensen «\\%c»"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2150,12 +2150,12 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan ikke opprette utfilen «%s»"
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "standard ut"
@@ -2170,7 +2170,7 @@ msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "denne filen kan ikke inneholde domene-direktiver"
 
@@ -2198,24 +2198,24 @@ msgstr ""
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext kan ikke arbeide uten å finne nøkkelord"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "advarsel: typen til fil «%s» med utvidelsen «%s» er ukjent, forsøker C"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2225,7 +2225,7 @@ msgid ""
 "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2237,7 +2237,7 @@ msgid ""
 "By default the language is guessed depending on the input file name extension.\n"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2247,7 +2247,7 @@ msgid ""
 "                                 preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2258,7 +2258,7 @@ msgid ""
 "      --debug                    more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -2298,18 +2298,18 @@ msgstr ""
 "  -V, --version               skriv ut programversjon og avslutt\n"
 "  -w, --width=ANTALL          sett sidebredden i utdata\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "standard inn"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "språket «%s» er ukjent"
diff --git a/po/pl.gmo b/po/pl.gmo
index b8989bfda..21907389b 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index adf8c3fe8..013f75937 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.39\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2001-08-01 23:50+0200\n"
 "Last-Translator: Rafa³ Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -30,8 +30,8 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "b³±d w czasie otwierania \"%s\" do czytania"
@@ -122,11 +122,11 @@ msgstr "%s: opcja `-W %s' jest niejednoznaczna\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opcja `-W %s' nie mo¿e mieæ argumentu\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
@@ -236,7 +236,7 @@ msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same"
 
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -252,7 +252,7 @@ msgstr ""
 "Autorzy nie daj± ¯ADNYCH gwarancji, w tym równie¿ gwarancji MO¯LIWO¦CI\n"
 "SPRZEDA¯Y lub PRZYDATNO¦CI DO KONKRETNYCH ZASTOSOWAÑ.\n"
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -261,7 +261,7 @@ msgstr ""
 msgid "Written by %s.\n"
 msgstr "Zapisane przez %s.\n"
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "za du¿o argumentów"
 
@@ -269,11 +269,11 @@ msgstr "za du
 msgid "missing arguments"
 msgstr "brakuj±ce argumenty"
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Spróbuj `%s --help' ¿eby otrzymaæ wiêcej informacji.\n"
@@ -334,26 +334,26 @@ msgstr ""
 "wybranym katalogu.\n"
 "Domy¶lnie przeszukiwany katalog: %s\n"
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Raporty o b³êdach wysy³aj do bug-gnu-utils@gnu.org\n"
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -363,7 +363,7 @@ msgid ""
 "  -i, --ip-address      addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -373,7 +373,7 @@ msgid ""
 "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr ""
 
@@ -393,7 +393,7 @@ msgstr ""
 msgid "%s and %s are mutually exclusive"
 msgstr "%s i %s wzajemnie siê wykluczaj±"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
@@ -406,14 +406,14 @@ msgid ""
 msgstr ""
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -422,7 +422,7 @@ msgid ""
 "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -496,7 +496,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "podane niemo¿liwe kryteria selekcji (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -529,7 +529,7 @@ msgstr ""
 "ale tylko w pierwszym definiuj±cym je pliku PO.  Pozycje w plikach dla\n"
 "wszystkich plików PO te¿ zostan± zachowane.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -613,7 +613,7 @@ msgstr ""
 "  -V, --version               wy¶wietlenie informacji o wersji i zakoñczenie\n"
 "  -w, --width=LICZBA          ustalenie szeroko¶ci strony\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -690,7 +690,7 @@ msgstr "ten komunikat jest u
 msgid "warning: this message is not used"
 msgstr "uwaga: ten komunikat nie jest u¿yty"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -698,11 +698,11 @@ msgstr[0] "znaleziono %d b
 msgstr[1] "znaleziono %d b³êdy krytyczne"
 msgstr[2] "znaleziono %d b³êdów krytycznych"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "podwójna definicja komunikatu"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...to jest po³o¿enie pierwszej definicji"
 
@@ -800,12 +800,12 @@ msgstr ""
 "  -V, --version               wy¶wietlenie informacji o wersji i zakoñczenie\n"
 "  -w, --width=LICZBA          ustalenie szeroko¶ci strony\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -813,7 +813,7 @@ msgid ""
 "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -1161,56 +1161,56 @@ msgid ""
 "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr ""
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "b³êdna sekwencja steruj±ca"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr ""
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, fuzzy, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
@@ -1218,7 +1218,7 @@ msgstr[0] "ten komunikat jest u
 msgstr[1] "ten komunikat jest u¿yty, ale nie zdefiniowany w %s"
 msgstr[2] "ten komunikat jest u¿yty, ale nie zdefiniowany w %s"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, fuzzy, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
@@ -1226,131 +1226,131 @@ msgstr[0] "ten komunikat jest u
 msgstr[1] "ten komunikat jest u¿yty, ale nie zdefiniowany w %s"
 msgstr[2] "ten komunikat jest u¿yty, ale nie zdefiniowany w %s"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr ""
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "linie `msgid' i `msgid_plural' nie zaczynaj± siê obie od '\\n'`"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "linie `msgid' i `msgstr[%u]' nie zaczynaj± siê obie od '\\n'`"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "linie `msgid' i `msgstr' nie zaczynaj± siê obie od '\\n'`"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "linie `msgid' i `msgid_plural' nie koñcz± siê obie na '\\n'"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "linie `msgid' i `msgstr[%u]' nie koñcz± siê obie na '\\n'"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "linie `msgid' i `msgstr' nie koñcz± siê obie na '\\n'"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr ""
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, fuzzy, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "w nag³ówku brakuje pola `%s'"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "pole nag³ówka `%s' powinno siê zaczynaæ na pocz±tku linii"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "niektóre pola nag³ówka nadal zawieraj± pocz±tkowe warto¶ci domy¶lne"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, fuzzy, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "pole `%s' ma nadal pocz±tkow± warto¶æ domy¶ln±"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 #, fuzzy
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: uwaga: nag³ówek pliku PO brakuj±cy, niedok³adny lub b³êdny\n"
 "%*s  uwaga: konwersja kodowania nie bêdzie dzia³aæ"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 #, fuzzy
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "W nag³ówku brakuje nazwy kodowania.\n"
 "Przekodowanie na kodowanie u¿ytkownika nie bêdzie dzia³aæ.\n"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 #, fuzzy
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: uwaga: nag³ówek pliku PO brakuj±cy, niedok³adny lub b³êdny\n"
 "%*s  uwaga: konwersja kodowania nie bêdzie dzia³aæ"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nazwa domeny \"%s\" nie jest odpowiedni± nazwa pliku"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "nazwa domeny \"%s\" nie jest dobra jako nazwa pliku: u¿yjê przedrostka"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "dyrektywa `domena %s' zignorowana"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "zignorowana pusta warto¶æ `msgstr'"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "zignorowana niepewna (fuzzy) warto¶æ `msgstr'"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: uwaga: plik ¼ród³owy zawiera t³umaczenie budz±ce w±tpliwo¶ci"
@@ -1542,47 +1542,47 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 #, fuzzy
 msgid "warning: "
 msgstr "%s: ostrze¿enie: "
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1634,11 +1634,11 @@ msgstr ""
 msgid "conversion failure"
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -1647,7 +1647,7 @@ msgstr ""
 "Kodowanie \"%s\" nie jest obs³ugiwane. %s opiera siê na iconv(),\n"
 "a iconv() nie obs³uguje \"%s\".\n"
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -1924,13 +1924,13 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<stdin>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: ostrze¿enie: "
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -1939,15 +1939,15 @@ msgstr ""
 "Kodowanie \"%s\" nie ma przeno¶nej nazwy.\n"
 "Przekodowanie na zestaw znaków u¿ytkownika mo¿e nie dzia³aæ\n"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr "Kontynuacja mimo wszystko, mo¿na oczekiwaæ b³êdów analizy sk³adni."
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr "Kontynuacja mimo wszystko."
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -1956,7 +1956,7 @@ msgstr ""
 "Kodowanie \"%s\" nie jest obs³ugiwane. %s opiera siê na iconv(),\n"
 "a iconv() nie obs³uguje \"%s\".\n"
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -1964,12 +1964,12 @@ msgstr ""
 "Problem mo¿na rozwi±zaæ instaluj±c libiconv GNU i instaluj±c\n"
 "ponownie gettext GNU.\n"
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -1978,7 +1978,7 @@ msgstr ""
 "Kodowanie \"%s\" nie jest obs³ugiwane. %s opiera sie na iconv().\n"
 "Ta wersja zosta³a skompilowana bez iconv().\n"
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2015,45 +2015,45 @@ msgstr "forma mnoga ma z
 msgid "too many errors, aborting"
 msgstr "%s: za du¿o b³êdów, przerwanie wykonywania"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "b³êdna sekwencja wielobajtowa"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 #, fuzzy
 msgid "incomplete multibyte sequence at end of file"
 msgstr "b³êdna sekwencja wielobajtowa"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 #, fuzzy
 msgid "incomplete multibyte sequence at end of line"
 msgstr "b³êdna sekwencja wielobajtowa"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "b³±d w czasie czytania \"%s\""
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "nieznane s³owo kluczowe \"%s\""
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "b³êdna sekwencja steruj±ca"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "znak koñca pliku wewn±trz ³añcucha"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "znak koñca wiersza wewn±trz ³añcucha"
 
@@ -2119,7 +2119,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "b³±d podczas pisania do pliku \"%s\""
@@ -2133,13 +2133,13 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "b³±d otwarcia \"%s\" do pisania"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "umiêdzynaradawiane komunikaty nie powinny zawieraæ sekwenji `\\%c'"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2148,12 +2148,12 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "nie mogê utworzyæ pliku wyj¶ciowego \"%s\""
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "standardowe wyj¶cie"
@@ -2168,7 +2168,7 @@ msgstr "%s:%d: uwaga: niezako
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: uwaga: niezakoñczona sta³a ³añcuchowa"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "ten plik nie mo¿e zawieraæ dyrektyw domen"
 
@@ -2195,24 +2195,24 @@ msgstr "--join-existing nie mo
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext nie mo¿e dzia³aæ bez podania s³ów kluczowych"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "uwaga: typ pliku `%s' z rozszerzeniem `%s' jest nieznany; spróbujê C"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2222,7 +2222,7 @@ msgid ""
 "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2234,7 +2234,7 @@ msgid ""
 "By default the language is guessed depending on the input file name extension.\n"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2244,7 +2244,7 @@ msgid ""
 "                                 preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2255,7 +2255,7 @@ msgid ""
 "      --debug                    more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -2295,18 +2295,18 @@ msgstr ""
 "  -V, --version               wy¶wietlenie informacji o wersji i zakoñczenie\n"
 "  -w, --width=LICZBA          ustalenie szeroko¶ci strony\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "wej¶cie standardowe"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "nieznany jêzyk `%s'"
diff --git a/po/pt.gmo b/po/pt.gmo
index a3abe74d4..80348dace 100644
Binary files a/po/pt.gmo and b/po/pt.gmo differ
diff --git a/po/pt.po b/po/pt.po
index 6063bcff7..413e74d58 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.23\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 1996-09-18 20:51 WET DST\n"
 "Last-Translator: Nuno Oliveira <nuno@eq.uc.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -27,8 +27,8 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "erro durante a abertura de \"%s\" para leitura"
@@ -119,11 +119,11 @@ msgstr "%s: a op
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: a opção `--%s' não permite um argumento\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
@@ -234,7 +234,7 @@ msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "as especificações do argumento %u são diferentes"
 
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -246,7 +246,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -255,7 +255,7 @@ msgstr ""
 msgid "Written by %s.\n"
 msgstr ""
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
@@ -263,11 +263,11 @@ msgstr "demasiados argumentos"
 msgid "missing arguments"
 msgstr "argumentos insuficientes"
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, fuzzy, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Tente `%s --help' para mais informação\n"
@@ -329,25 +329,25 @@ msgstr ""
 "são traduzidas.\n"
 "Directório standard de pesquisa: %s\n"
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -357,7 +357,7 @@ msgid ""
 "  -i, --ip-address      addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -367,7 +367,7 @@ msgid ""
 "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s são mutuamente exclusivas"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
@@ -400,14 +400,14 @@ msgid ""
 msgstr ""
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -416,7 +416,7 @@ msgid ""
 "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -489,7 +489,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -508,7 +508,7 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -577,7 +577,7 @@ msgstr ""
 "  -V, --version               mostra a informação de versão e sai\n"
 "  -w, --width=NÚMERO          especifica a largura de página na saída\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -658,17 +658,17 @@ msgstr "esta mensagem 
 msgid "warning: this message is not used"
 msgstr "atenção: esta mensagem não é usada"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, fuzzy, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "encontrados %d erros fatais"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "definição de mensagem duplicada"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...este é o local da primeira definição"
 
@@ -737,12 +737,12 @@ msgstr ""
 "  -V, --version               mostra a informação de versão e sai\n"
 "  -w, --width=NÚMERO          especifica a largura de página na saída\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -750,7 +750,7 @@ msgid ""
 "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -1089,195 +1089,195 @@ msgid ""
 "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr ""
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "sequência de controlo ilegal"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr ""
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, fuzzy, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "esta mensagem é usada mas não definida em %s"
 msgstr[1] "esta mensagem é usada mas não definida em %s"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, fuzzy, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "esta mensagem é usada mas não definida em %s"
 msgstr[1] "esta mensagem é usada mas não definida em %s"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr ""
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não começam ambos por '\\n'"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não começam ambos por '\\n'"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 #, fuzzy
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não começam ambos por '\\n'"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não terminam ambos por '\\n'"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não terminam ambos por '\\n'"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 #, fuzzy
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não terminam ambos por '\\n'"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr ""
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, fuzzy, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "o campo `%s' falta no cabeçalho"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "o campo `%s' do cabeçalho deve começar no início da linha"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "alguns campos do cabeçalho ainda têm o valor inicial por defeito"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, fuzzy, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "o campo `%s' ainda tem o valor por defeito inicial"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 #, fuzzy
 msgid "warning: PO file header missing or invalid\n"
 msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 #, fuzzy
 msgid "warning: charset conversion will not work\n"
 msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 #, fuzzy
 msgid "warning: PO file header fuzzy\n"
 msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nome de domínio \"%s\" não apropriado como nome de ficheiro"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "nome de domínio \"%s\" não apropriado como nome de ficheiro:\n"
 "prefixo usado"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "directiva `domínio %s' ignorada"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "elemento `msgstr' vazio ignorada"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 #, fuzzy
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "elemento `msgstr' vazio ignorada"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, fuzzy, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
@@ -1468,46 +1468,46 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1559,18 +1559,18 @@ msgstr ""
 msgid "conversion failure"
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -1854,53 +1854,53 @@ msgstr ""
 msgid "<stdin>"
 msgstr ""
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr ""
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, fuzzy, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr ""
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 #, fuzzy
 msgid ""
 "Charset missing in header.\n"
@@ -1938,47 +1938,47 @@ msgstr ""
 msgid "too many errors, aborting"
 msgstr "demasiados erros, interrompendo"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 #, fuzzy
 msgid "invalid multibyte sequence"
 msgstr "sequência de controlo ilegal"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 #, fuzzy
 msgid "incomplete multibyte sequence at end of file"
 msgstr "sequência de controlo ilegal"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 #, fuzzy
 msgid "incomplete multibyte sequence at end of line"
 msgstr "sequência de controlo ilegal"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erro durante a leitura de \"%s\""
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "palavra chave \"%s\" desconhecida"
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 #, fuzzy
 msgid "invalid control sequence"
 msgstr "sequência de controlo ilegal"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "fim-de-ficheiro dentro da cadeia"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "fim-de-linha dentro da cadeia"
 
@@ -2043,7 +2043,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "erro durante a escrita do ficheiro \"%s\""
@@ -2057,7 +2057,7 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "erro durante a abertura de \"%s\" para escrita"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -2065,7 +2065,7 @@ msgstr ""
 "as mensagens de internacionalização não devem conter\n"
 "a sequência de escape `\\%c'"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2074,12 +2074,12 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "impossível criar o ficheiro de saída \"%s\""
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "canal de saída por defeito (stdout)"
@@ -2094,7 +2094,7 @@ msgstr ""
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "este ficheiro não pode conter directivas de domínio"
 
@@ -2123,26 +2123,26 @@ msgstr ""
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, fuzzy, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "cuidado: o tipo do ficheiro `%s' com a extensão `%s' é desconhecido;\n"
 "será tentado C"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2152,7 +2152,7 @@ msgid ""
 "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2164,7 +2164,7 @@ msgid ""
 "By default the language is guessed depending on the input file name extension.\n"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2174,7 +2174,7 @@ msgid ""
 "                                 preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2185,7 +2185,7 @@ msgid ""
 "      --debug                    more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -2224,18 +2224,18 @@ msgstr ""
 "  -V, --version               mostra a informação de versão e sai\n"
 "  -w, --width=NÚMERO          especifica a largura de página na saída\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "entrada standard"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr ""
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index e133eaafb..e7e0e22c8 100644
Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index de1f6e865..bd7224f93 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.36\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2001-04-03 08:25+02:00\n"
 "Last-Translator: Flávio Bruno Leitner <flavio@conectiva.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -30,8 +30,8 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "erro ao abrir \"%s\" para leitura"
@@ -122,11 +122,11 @@ msgstr "%s: op
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opção `-W %s' não aceita parâmetros\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
@@ -240,7 +240,7 @@ msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "especificações de formato para o argumento %lu são diferentes"
 
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -255,7 +255,7 @@ msgstr ""
 "Este é um sofware livre; veja os fontes para condições de cópia.  Não existe\n"
 "garantia; nem mesmo COMERCIAIS ou de ATENDIMENTO A UMA DETERMINADA FINALIDADE.\n"
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -264,7 +264,7 @@ msgstr ""
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "excesso de parâmetros"
 
@@ -272,11 +272,11 @@ msgstr "excesso de par
 msgid "missing arguments"
 msgstr "parâmetros não informados"
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Tente `%s --help' para maiores informações\n"
@@ -337,26 +337,26 @@ msgstr ""
 "mensagens encontradas no catálogo selecionado\n"
 "Diretório de pesquisa padrão: %s\n"
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Reporte bugs para <bug-gnu-utils@gnu.org>.\n"
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr ""
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -366,7 +366,7 @@ msgid ""
 "  -i, --ip-address      addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -376,7 +376,7 @@ msgid ""
 "  -V, --version               output version information and exit\n"
 msgstr ""
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr ""
 
@@ -396,7 +396,7 @@ msgstr ""
 msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s são mutuamente exclusivos"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
@@ -409,14 +409,14 @@ msgid ""
 msgstr ""
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -425,7 +425,7 @@ msgid ""
 "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -496,7 +496,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "critério de seleção especificado impossível (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -531,7 +531,7 @@ msgstr ""
 "primeiro arquivo PO que os definirem. As posições de arquivo de todos\n"
 "os arquivos PO serão preservados.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -614,7 +614,7 @@ msgstr ""
 "  -S, --strict             habilita o modo Uniforum estrito\n"
 "  -V, --version            apresenta informações de versão e finaliza\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -693,18 +693,18 @@ msgstr "esta mensagem 
 msgid "warning: this message is not used"
 msgstr "atenção: esta mensagem não é utilizada"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "encontrado %d erro fatal"
 msgstr[1] "encontrados %d erros fatais"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "definição duplicada de mensagem"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...esta é a localização da primeira definição"
 
@@ -803,12 +803,12 @@ msgstr ""
 "  -S, --strict             habilita o modo Uniforum estrito\n"
 "  -V, --version            apresenta informações de versão e finaliza\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -816,7 +816,7 @@ msgid ""
 "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -1155,196 +1155,196 @@ msgid ""
 "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr ""
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "seqüência de controle ilegal"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr ""
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, fuzzy, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "esta mensagem é utilizada mas não definida em %s"
 msgstr[1] "esta mensagem é utilizada mas não definida em %s"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, fuzzy, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "esta mensagem é utilizada mas não definida em %s"
 msgstr[1] "esta mensagem é utilizada mas não definida em %s"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr ""
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' e `msgstr' não começam com '\\n'"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' e `msgstr[%u]' não começam com '\\n'"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' e `msgstr' não começam com '\\n'"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' e `msgstr' não terminam com '\\n'"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' e `msgstr[%u]' não terminam com '\\n'"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' e `msgstr' não terminam com '\\n'"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr ""
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, fuzzy, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "campo `%s' faltando no cabeçalho"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "campo `%s' deve iniciar no começo da linha"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "alguns campos do cabeçalho ainda possuem os valores iniciais padrões"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, fuzzy, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "campo `%s' ainda possui o valor inicial"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 #, fuzzy
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: aviso: Cabeçalho do arquivo PO esquecido, aproximado ou inválido\n"
 "%*s aviso: conversão de charset não vai funcionar"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 #, fuzzy
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "%s: aviso: falta o cabeçalho relativo ao charset\n"
 "%*s aviso: conversão de charset não vai funcionar"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 #, fuzzy
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: aviso: Cabeçalho do arquivo PO esquecido, aproximado ou inválido\n"
 "%*s aviso: conversão de charset não vai funcionar"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nome do domínio \"%s\" não é válido como nome de arquivo"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "nome do domínio \"%s\" não é válido como nome de arquivo: será usado um "
 "prefixo"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "`domain %s': diretiva ignorada"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "`msgstr' vazia: mensagem ignorada"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "`msgstr' aproximada (fuzzy): mensagem ignorada"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: aviso: arquivo fonte contém traduções aproximadas"
@@ -1533,46 +1533,46 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, fuzzy, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "%s: aviso: charset \"%s\" não é suportado pelo iconv%s"
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, fuzzy, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "%s: aviso: charset \"%s\" não é suportado pelo iconv%s"
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1624,18 +1624,18 @@ msgstr ""
 msgid "conversion failure"
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -1914,13 +1914,13 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<stdin>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr ""
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, fuzzy, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -1929,40 +1929,40 @@ msgstr ""
 "%s: aviso: charset \"%s\" não é um encoding portável\n"
 "%*s aviso: conversão de charset pode não funcionar"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr ""
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 #, fuzzy
 msgid ""
 "Charset missing in header.\n"
@@ -2000,45 +2000,45 @@ msgstr "forma plural tem o 
 msgid "too many errors, aborting"
 msgstr "excesso de erros - finalizando"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "sequência multibyte inválido"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 #, fuzzy
 msgid "incomplete multibyte sequence at end of file"
 msgstr "sequência multibyte inválido"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 #, fuzzy
 msgid "incomplete multibyte sequence at end of line"
 msgstr "sequência multibyte inválido"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erro ao ler \"%s\""
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "palavra chave \"%s\" desconhecida"
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "seqüência de controle ilegal"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "fim de arquivo sem string"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "fim de linha sem string"
 
@@ -2103,7 +2103,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "erro ao gravar o arquivo \"%s\""
@@ -2117,14 +2117,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "erro ao abrir o arquivo \"%s\" para gravação"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "mensagens internacionalizadas não devem conter o caractere de escape `\\%c'"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2133,12 +2133,12 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "não foi possível criar o arquivo de saída \"%s\""
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "saída padrão"
@@ -2153,7 +2153,7 @@ msgstr "%s:%d: aviso: caractere constante indeterminado"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: aviso: string literal indeterminada"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "este arquivo parece não conter diretivas de domínio"
 
@@ -2181,24 +2181,24 @@ msgstr ""
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext não pode funcionar sem as teclas para procurar"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "aviso: arquivo `%s' extensão `%s' é desconhecida; tentarei C"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2208,7 +2208,7 @@ msgid ""
 "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2220,7 +2220,7 @@ msgid ""
 "By default the language is guessed depending on the input file name extension.\n"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2230,7 +2230,7 @@ msgid ""
 "                                 preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2241,7 +2241,7 @@ msgid ""
 "      --debug                    more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -2278,18 +2278,18 @@ msgstr ""
 "  -S, --strict             habilita o modo Uniforum estrito\n"
 "  -V, --version            apresenta informações de versão e finaliza\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "entrada padrão"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "idioma `%s' desconhecido"
diff --git a/po/ru.gmo b/po/ru.gmo
index c1b10ddea..d9d60f777 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index 860d2f453..194392e1d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.2\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2002-04-25 08:40+0400\n"
 "Last-Translator: Oleg S. Tihonov <tihonov@ffke-campus.mipt.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -29,8 +29,8 @@ msgstr "
 msgid "Valid arguments are:"
 msgstr "äÏÐÕÓÔÉÍÙÅ ÁÒÇÕÍÅÎÔÙ:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ \"%s\" ÄÌÑ ÞÔÅÎÉÑ"
@@ -121,12 +121,12 @@ msgstr "%s: 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "îÅ ÎÁÊÄÅÎ ËÏÍÐÉÌÑÔÏÒ Java, ÐÏÓÔÁ×ØÔÅ gcj ÉÌÉ ÕÓÔÁÎÏ×ÉÔÅ ÐÅÒÅÍÅÎÎÕÀ $JAVAC"
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "îÅ ÎÁÊÄÅÎÁ ×ÉÒÔÕÁÌØÎÁÑ ÍÁÛÉÎÁ Java, ÐÏÓÔÁ×ØÔÅ gij ÉÌÉ ÕÓÔÁÎÏ×ÉÔÅ ÐÅÒÅÍÅÎÎÕÀ "
@@ -239,7 +239,7 @@ msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "× 'msgid' É '%s' ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %s"
 
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -255,7 +255,7 @@ msgstr ""
 "× ÉÓÈÏÄÎÏÍ ÔÅËÓÔÅ.  íÙ îå ÐÒÅÄÏÓÔÁ×ÌÑÅÍ ÇÁÒÁÎÔÉÊ; ÄÁÖÅ ÇÁÒÁÎÔÉÊ\n"
 "ëïííåòþåóëïê ãåîîïóôé ÉÌÉ ðòéçïäîïóôé äìñ ëïîëòåôîïê ãåìé.\n"
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -264,7 +264,7 @@ msgstr ""
 msgid "Written by %s.\n"
 msgstr "á×ÔÏÒ ÐÒÏÇÒÁÍÍÙ -- %s.\n"
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ×"
 
@@ -272,11 +272,11 @@ msgstr "
 msgid "missing arguments"
 msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ÁÒÇÕÍÅÎÔÙ"
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n"
@@ -338,25 +338,25 @@ msgstr ""
 "×Ù×ÏÄÑÔÓÑ ÉÈ ÐÅÒÅ×ÏÄÙ ÉÚ ÕËÁÚÁÎÎÏÇÏ ÄÏÍÅÎÁ.\n"
 "óÔÁÎÄÁÒÔÎÙÊ ËÁÔÁÌÏÇ ÐÏÉÓËÁ: %s\n"
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "ï ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ ÐÏ ÁÄÒÅÓÕ <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]\n"
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr "ðÅÞÁÔÁÅÔ ÉÍÑ ÄÁÎÎÏÊ ÍÁÛÉÎÙ.\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -371,7 +371,7 @@ msgstr ""
 "                          ÄÏÍÅÎÎÏÅ ÉÍÑ É ÐÓÅ×ÄÏÎÉÍÙ\n"
 "  -i, --ip-address      ÁÄÒÅÓÁ ÄÌÑ ÚÁÄÁÎÎÏÇÏ ÉÍÅÎÉ\n"
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -384,7 +384,7 @@ msgstr ""
 "  -h, --help                  ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ\n"
 "  -V, --version               ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n"
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÉÍÑ ÍÁÛÉÎÙ"
 
@@ -404,7 +404,7 @@ msgstr "
 msgid "%s and %s are mutually exclusive"
 msgstr "%s É %s ×ÚÁÉÍÎÏ ÉÓËÌÀÞÁÀÔ ÄÒÕÇ ÄÒÕÇÁ"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] [÷èïäîïê-æáêì]\n"
@@ -419,14 +419,14 @@ msgstr ""
 "É ÍÁÎÉÐÕÌÉÒÕÅÔ ÜÔÉÍÉ ÁÔÒÉÂÕÔÁÍÉ.\n"
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "áÒÇÕÍÅÎÔÙ, ÏÂÑÚÁÔÅÌØÎÙÅ ÄÌÑ ÄÌÉÎÎÙÈ ËÌÀÞÅÊ, ÏÂÑÚÁÔÅÌØÎÙ É ÄÌÑ ËÏÒÏÔËÉÈ.\n"
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -439,7 +439,7 @@ msgstr ""
 "  -D, --directory=ëáôáìïç     ÄÏÂÁ×ÉÔØ ëáôáìïç Ë ÐÕÔÉ ÐÏÉÓËÁ ×ÈÏÄÎÙÈ ÆÁÊÌÏ×\n"
 "åÓÌÉ ×ÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÚÁÄÁÎ ÉÌÉ ÚÁÄÁÎ ËÁË -, ÞÉÔÁÅÔÓÑ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ.\n"
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -529,7 +529,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "ÚÁÄÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ËÒÉÔÅÒÉÊ ×ÙÂÏÒÁ (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] [÷èïäîïê-æáêì]...\n"
@@ -558,7 +558,7 @@ msgstr ""
 "ÂÙÌÉ ÏÐÒÅÄÅÌÅÎÙ.  ëÏÍÍÅÎÔÁÒÉÉ, ÓÏÄÅÒÖÁÝÉÅ ÉÍÑ ÆÁÊÌÁ É ÎÏÍÅÒ ÓÔÒÏËÉ\n"
 "ÓÏÈÒÁÎÑÀÔÓÑ ÄÌÑ ×ÓÅÈ PO-ÆÁÊÌÏ×.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -646,7 +646,7 @@ msgstr ""
 "  -s, --sort-output        ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ\n"
 "  -F, --sort-by-file       ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ ÐÏ ÉÍÅÎÁÍ ÆÁÊÌÏ×\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -727,7 +727,7 @@ msgstr "
 msgid "warning: this message is not used"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -735,11 +735,11 @@ msgstr[0] "
 msgstr[1] "ÎÁÊÄÅÎÏ %d ËÒÉÔÉÞÅÓËÉÅ ÏÛÉÂËÉ"
 msgstr[2] "ÎÁÊÄÅÎÏ %d ËÒÉÔÉÞÅÓËÉÈ ÏÛÉÂÏË"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÏÏÂÝÅÎÉÑ"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...ÍÅÓÔÏ ÐÏÑ×ÌÅÎÉÑ ÐÅÒ×ÏÇÏ ÏÐÒÅÄÅÌÅÎÉÑ"
 
@@ -824,12 +824,12 @@ msgstr ""
 "  -F, --sort-by-file          ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ ÐÏ ÉÍÅÎÁÍ ÆÁÊÌÏ×\n"
 "      --omit-header           ÎÅ ×Ù×ÏÄÉÔØ ÚÁÇÏÌÏ×ÏË Ó ÐÏÌÅÍ `msgid \"\"'\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "ðÒÅÏÂÒÁÚÕÅÔ ËÁÔÁÌÏÇ ÐÅÒÅ×ÏÄÏ× × ÄÒÕÇÕÀ ËÏÄÉÒÏ×ËÕ.\n"
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -840,7 +840,7 @@ msgstr ""
 "  -t, --to-code=éíñ           ×ÙÈÏÄÎÁÑ ËÏÄÉÒÏ×ËÁ\n"
 "ðÏ ÕÍÏÌÞÁÎÉÀ ÉÓÐÏÌØÚÕÅÔÓÑ ËÏÄÉÒÏ×ËÁ ÔÅËÕÝÅÊ ÌÏËÁÌÉ.\n"
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -1251,26 +1251,26 @@ msgstr ""
 "      --statistics            ÎÁÐÅÞÁÔÁÔØ ÓÔÁÔÉÓÔÉËÕ Ï ÐÅÒÅ×ÏÄÁÈ\n"
 "  -v, --verbose               Õ×ÅÌÉÞÉÔØ ÐÏÄÒÏÂÎÏÓÔØ ÄÉÁÇÎÏÓÔÉÞÅÓËÉÈ ÓÏÏÂÝÅÎÉÊ\n"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr "×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ ÍÏÖÅÔ ÄÁ×ÁÔØ ÏÔÒÉÃÁÔÅÌØÎÙÅ ÚÎÁÞÅÎÉÑ"
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu, ÎÏ ×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ ÍÏÖÅÔ ÄÁ×ÁÔØ ÚÎÁÞÅÎÉÑ ÄÏ "
 "%lu"
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr "×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ ÍÏÖÅÔ ÄÁ×ÁÔØ ÄÅÌÅÎÉÅ ÎÁ ÎÏÌØ"
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr "×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ ÍÏÖÅÔ ÄÁÔØ ÐÅÒÅÐÏÌÎÉÅ ÃÅÌÏÇÏ"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -1278,32 +1278,32 @@ msgstr ""
 "×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ ÍÏÖÅÔ ÄÁ×ÁÔØ ÉÓËÌÀÞÉÔÅÌØÎÙÅ ÓÉÔÕÁÃÉÉ × "
 "ÁÒÉÆÍÅÔÉËÅ, ×ÏÚÍÏÖÎÏ, ÄÅÌÅÎÉÅ ÎÁ ÎÏÌØ"
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr "ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÓÏÄÅÒÖÉÔ ÐÅÒÅ×ÏÄÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ..."
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...ÎÏ × ÚÁÇÏÌÏ×ËÅ ÎÅÔ ÁÔÒÉÂÕÔÁ \"plural=÷ùòáöåîéå\""
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...ÎÏ × ÚÁÇÏÌÏ×ËÅ ÎÅÔ ÁÔÒÉÂÕÔÁ \"nplurals=ãåìïå\""
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 msgid "invalid nplurals value"
 msgstr "ÎÅ×ÅÒÎÁÑ ÚÎÁÞÅÎÉÅ nplurals"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr "ÎÅ×ÅÒÎÏÅ ×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr "nplurals = %lu..."
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
@@ -1313,7 +1313,7 @@ msgstr[1] ""
 "...ÎÏ × ÎÅËÏÔÏÒÙÈ ÓÏÏÂÝÅÎÉÑÈ ÔÏÌØËÏ %lu ÆÏÒÍÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 msgstr[2] " ...ÎÏ ÎÅËÏÔÏÒÙÈ ÓÏÏÂÝÅÎÉÑÈ ÔÏÌØËÏ %lu ÆÏÒÍ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
@@ -1321,12 +1321,12 @@ msgstr[0] "...
 msgstr[1] "...ÎÏ × ÎÅËÏÔÏÒÙÈ ÓÏÏÂÝÅÎÉÑÈ ÅÓÔØ %lu ÆÏÒÍÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 msgstr[2] " ...ÎÏ ÎÅËÏÔÏÒÙÈ ÓÏÏÂÝÅÎÉÑÈ ÅÓÔØ %lu ÆÏÒÍ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr "ðÏÐÒÏÂÕÊÔÅ ÓÌÅÄÕÀÝÅÅ, ÐÏÄÈÏÄÉÔ ÄÌÑ %s:\n"
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -1334,124 +1334,124 @@ msgstr ""
 "ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÓÏÄÅÒÖÉÔ ÐÅÒÅ×ÏÄÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ, ÎÏ × ÎÅÍ "
 "ÚÁÇÏÌÏ×ËÁ Ó \"Plural-Forms: nplurals=ãåìïå; plural=÷ùòáöåîéå;\""
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgid_plural' ÎÁÞÉÎÁÅÔÓÑ Ó '\\n', ÔÏÇÄÁ ËÁË "
 "ÄÒÕÇÏÅ -- ÎÅÔ"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
 "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgstr[%u]' ÎÁÞÉÎÁÅÔÓÑ Ó '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ "
 "-- ÎÅÔ"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr ""
 "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgstr' ÎÁÞÉÎÁÅÔÓÑ Ó '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ -- "
 "ÎÅÔ"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgid_plural' ÚÁ×ÅÒÛÁÅÔÓÑ '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ "
 "-- ÎÅÔ"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr ""
 "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgstr[%u]' ÚÁ×ÅÒÛÁÅÔÓÑ '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ "
 "-- ÎÅÔ"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr ""
 "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgstr' ÚÁ×ÅÒÛÁÅÔÓÑ '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ -- ÎÅÔ"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr "ÏÂÒÁÂÏÔËÁ ÆÏÒÍ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ Ñ×ÌÑÅÔÓÑ ÒÁÓÛÉÒÅÎÉÅÍ GNU gettext"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr "'%s' ÎÅ Ñ×ÌÑÅÔÓÑ ÄÏÐÕÓÔÉÍÏÊ ÆÏÒÍÁÔÎÏÊ ÓÔÒÏËÏÊ %s × ÏÔÌÉÞÉÅ ÏÔ 'msgid'"
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "× msgstr ÎÅÄÏÓÔÁÅÔ ÏÔÍÅÔËÉ ËÌÁ×ÉÁÔÕÒÎÏÇÏ ÜË×É×ÁÌÅÎÔÁ '%c'"
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "× msgstr ÓÌÉÛËÏÍ ÍÎÏÇÏ ÏÔÍÅÔÏË ËÌÁ×ÉÁÔÕÒÎÙÈ ÜË×É×ÁÌÅÎÔÏ× '%c'"
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "× ÚÁÇÏÌÏ×ËÅ ÐÒÏÐÕÝÅÎÏ ÐÏÌÅ `%s'\n"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ `%s' ÄÏÌÖÎÏ ÎÁÞÉÎÁÔØÓÑ Ó ÎÏ×ÏÊ ÓÔÒÏËÉ\n"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 "ÎÅËÏÔÏÒÙÅ ÐÏÌÑ ÚÁÇÏÌÏ×ËÁ ×ÓÅ ÅÝÅ ÉÍÅÀÔ ÐÅÒ×ÏÎÁÞÁÌØÎÏÅ ÛÁÂÌÏÎÎÏÅ ÚÎÁÞÅÎÉÅ\n"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ `%s' ×ÓÅ ÅÝÅ ÉÍÅÅÔ ÐÅÒ×ÏÎÁÞÁÌØÎÏÅ ÛÁÂÌÏÎÎÏÅ ÚÎÁÞÅÎÉÅ\n"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÚÁÇÏÌÏ×ÏË PO-ÆÁÊÌÁ ÏÔÓÕÔÓÔ×ÕÅÔ ÉÌÉ ÎÅÐÒÁ×ÉÌÅÎ\n"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ ËÏÄÉÒÏ×ÏË ÎÅ ÂÕÄÅÔ ÒÁÂÏÔÁÔØ\n"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÚÁÇÏÌÏ×ÏË PO-ÆÁÊÌÁ ÐÏÍÅÞÅÎ ËÁË ÎÅÔÏÞÎÙÊ\n"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÂÏÌÅÅ ÓÔÁÒÙÅ ×ÅÒÓÉÉ msgfmt ×ÙÄÁÄÕÔ ÚÄÅÓØ ÏÛÉÂËÕ\n"
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "ÉÍÑ ÄÏÍÅÎÁ \"%s\" ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÏ × ËÁÞÅÓÔ×Å ÉÍÅÎÉ ÆÁÊÌÁ"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "ÉÍÑ ÄÏÍÅÎÁ \"%s\" ÎÅÄÏÐÕÓÔÉÍÏ × ËÁÞÅÓÔ×Å ÉÍÅÎÉ ÆÁÊÌÁ, ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎÏ\n"
 "ÞÁÓÔÉÞÎÏ ÕÓÅÞÅÎÎÏÅ ÉÍÑ ÄÏÍÅÎÁ"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "ÄÉÒÅËÔÉ×Á `domain %s' ÉÇÎÏÒÉÒÏ×ÁÎÁ"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "ÐÕÓÔÏÅ ×ÈÏÖÄÅÎÉÅ `msgstr' ÉÇÎÏÒÉÒÏ×ÁÎÏ"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "ÎÅÔÏÞÎÏÅ ×ÈÏÖÄÅÎÉÅ `msgstr' ÉÇÎÏÒÉÒÏ×ÁÎÏ"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÉÓÈÏÄÎÙÊ ÆÁÊÌ ÓÏÄÅÒÖÉÔ ÎÅÔÏÞÎÙÅ ÐÅÒÅ×ÏÄÙ"
@@ -1704,23 +1704,23 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "áÎÇÌÉÊÓËÉÅ ÐÅÒÅ×ÏÄÙ ÄÌÑ ÐÁËÅÔÁ %s"
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "ÔÅËÕÝÁÑ ËÏÄÉÒÏ×ËÁ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÐÅÒÅÎÏÓÉÍÙÍ ÉÍÅÎÅÍ ËÏÄÉÒÏ×ËÉ"
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "×Ï ×ÈÏÄÎÏÍ ÆÁÊÌÅ Ä×Å ÒÁÚÎÙÅ ËÏÄÉÒÏ×ËÉ \"%s\" É \"%s\""
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "×ÈÏÄÎÏÊ ÆÁÊÌ `%s' ÎÅ ÓÏÄÅÒÖÉÔ ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ Ó ÏÐÉÓÁÎÉÅÍ ËÏÄÉÒÏ×ËÉ"
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -1729,17 +1729,17 @@ msgstr ""
 "ÄÏÍÅÎ \"%s\" ×Ï ×ÈÏÄÎÏÍ ÆÁÊÌÅ `%s' ÎÅ ÓÏÄÅÒÖÉÔ ÐÏÌÑ ÚÁÇÏÌÏ×ËÁ Ó ÏÐÉÓÁÎÉÅÍ "
 "ËÏÄÉÒÏ×ËÉ"
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "ÃÅÌÅ×ÁÑ ËÏÄÉÒÏ×ËÁ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÐÅÒÅÎÏÓÉÍÙÍ ÉÍÅÎÅÍ ËÏÄÉÒÏ×ËÉ."
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
@@ -1747,7 +1747,7 @@ msgstr ""
 "÷ÈÏÄÎÙÅ ÆÁÊÌÙ ÓÏÄÅÒÖÁÔ ÓÏÏÂÝÅÎÉÑ × ÒÁÚÎÙÈ ËÏÄÉÒÏ×ËÁÈ, × ÔÏÍ ÞÉÓÌÅ ×\n"
 "UTF-8.  ÷Ù×ÏÄ ÐÒÅÏÂÒÁÚÕÅÔÓÑ Ë UTF-8.\n"
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1816,11 +1816,11 @@ msgstr ""
 msgid "conversion failure"
 msgstr "ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÎÅÕÓÐÅÛÎÏ"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "×ÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÓÏÄÅÒÖÉÔ ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ Ó ÏÐÉÓÁÎÉÅÍ ËÏÄÉÒÏ×ËÉ"
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -1829,7 +1829,7 @@ msgstr ""
 "îÅ×ÏÚÍÏÖÎÏ ÐÒÅÏÂÒÁÚÏ×ÁÔØ ÉÚ \"%s\" × \"%s\".  %s ÐÏÌÁÇÁÅÔÓÑ ÎÁ iconv(), ÎÏ "
 "iconv() ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÜÔÏ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ."
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2171,13 +2171,13 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2186,15 +2186,15 @@ msgstr ""
 "\"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÐÅÒÅÎÏÓÉÍÙÍ ÎÁÚ×ÁÎÉÅÍ ËÏÄÉÒÏ×ËÉ.\n"
 "ðÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÓÏÏÂÝÅÎÉÊ Ë ËÏÄÉÒÏ×ËÅ ÐÏÌØÚÏ×ÁÔÅÌÑ ÍÏÖÅÔ ÎÅ ÓÒÁÂÏÔÁÔØ.\n"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr "÷ÙÐÏÌÎÅÎÉÅ ÐÒÏÄÏÌÖÁÅÔÓÑ, ÂÕÄÕÔ ÏÛÉÂËÉ ÒÁÚÂÏÒÁ."
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr "÷ÙÐÏÌÎÅÎÉÅ ÐÒÏÄÏÌÖÁÅÔÓÑ."
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2203,7 +2203,7 @@ msgstr ""
 "ëÏÄÉÒÏËÁ \"%s\" ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ.  %s ÐÏÌÁÇÁÅÔÓÑ ÎÁ iconv(), ÎÏ iconv() ÎÅ "
 "ÐÏÄÄÅÒÖÉ×ÁÅÔ \"%s\".\n"
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2211,12 +2211,12 @@ msgstr ""
 "þÔÏÂÙ ÒÅÛÉÔØ ÜÔÕ ÐÒÏÂÌÅÍÕ, ÕÓÔÁÎÏ×ÉÔÅ GNU libiconv É ÐÅÒÅÕÓÔÁÎÏ×ÉÔÅ GNU "
 "gettext.\n"
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2225,7 +2225,7 @@ msgstr ""
 "ëÏÄÉÒÏËÁ \"%s\" ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ.  %s ÐÏÌÁÇÁÅÔÓÑ ÎÁ iconv().\n"
 "üÔÁ ×ÅÒÓÉÑ ÓÏÂÒÁÎÁ ÂÅÚ iconv().\n"
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2262,43 +2262,43 @@ msgstr "
 msgid "too many errors, aborting"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÏÛÉÂÏË, ÚÁ×ÅÒÛÅÎÉÅ"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "ÎÅ×ÅÒÎÁÑ ÍÎÏÇÏÂÁÊÔÏ×ÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr "ÎÅÐÏÌÎÁÑ ÍÎÏÇÏÂÁÊÔÏ×ÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ × ËÏÎÃÅ ÆÁÊÌÁ"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr "ÎÅÐÏÌÎÁÑ ÍÎÏÇÏÂÁÊÔÏ×ÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ × ËÏÎÃÅ ÓÔÒÏËÉ"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr "×ÙÚÏ× iconv ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÓÐÅÈÏÍ"
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ \"%s\""
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "ÎÅÉÚ×ÅÓÔÎÏÅ ËÌÀÞÅ×ÏÅ ÓÌÏ×Ï \"%s\""
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "ÎÅ×ÅÒÎÁÑ ÕÐÒÁ×ÌÑÀÝÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "ÓÉÍ×ÏÌ ËÏÎÃÁ ÆÁÊÌÁ ×ÓÔÒÅÞÅÎ ×ÎÕÔÒÉ ÓÔÒÏËÉ"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "ÓÉÍ×ÏÌ ËÏÎÃÁ ÓÔÒÏËÉ ×ÓÔÒÅÞÅÎ ×ÎÕÔÒÉ ÓÔÒÏËÉ"
 
@@ -2363,7 +2363,7 @@ msgstr "%s 
 msgid "failed to create \"%s\""
 msgstr "ÐÏÐÙÔËÁ ÓÏÚÄÁÎÉÑ \"%s\" ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÓÐÅÈÏÍ"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ÆÁÊÌÁ \"%s\""
@@ -2379,14 +2379,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ \"%s\" ÄÌÑ ÚÁÐÉÓÉ"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "ðÅÒÅ×ÏÄÉÍÙÅ ÓÏÏÂÝÅÎÉÑ ÎÅ ÄÏÌÖÎÙ ÓÏÄÅÒÖÁÔØ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ `\\%c'"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2399,12 +2399,12 @@ msgstr ""
 "ËÏÄÉÒÏ×ËÕ, ÞÔÏ É ×Ù.  ðÏÄÕÍÁÊÔÅ Ï ÉÓÐÏÌØÚÏ×ÁÎÉÉ × msgid ÞÉÓÔÏÊ ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÆÁÊÌ ×Ù×ÏÄÁ \"%s\""
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ"
@@ -2420,7 +2420,7 @@ msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÓÔÒÏËÁ"
 
 # ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÐÏËÁ ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "ÜÔÏÔ ÆÁÊÌ ÎÅ ÍÏÖÅÔ ÓÏÄÅÒÖÁÔØ ÄÉÒÅËÔÉ×Ù ÄÏÍÅÎÁ"
 
@@ -2448,18 +2448,18 @@ msgstr ""
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ÎÅ ÍÏÖÅÔ ÒÁÂÏÔÁÔØ, ÎÅ ÚÎÁÑ ÉÓËÏÍÙÈ ËÌÀÞÅ×ÙÈ ÓÌÏ×"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÆÁÊÌ `%s' ÉÍÅÅÔ ÎÅÉÚ×ÅÓÔÎÏÅ ÒÁÓÛÉÒÅÎÉÅ `%s'; ÔÒÁËÔÕÅÔÓÑ ËÁË C"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr "éÚ×ÌÅËÁÅÔ ÐÅÒÅ×ÏÄÉÍÙÅ ÓÔÒÏËÉ ÉÚ ÕËÁÚÁÎÎÙÈ ×ÈÏÄÎÙÈ ÆÁÊÌÏ×.\n"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -2468,7 +2468,7 @@ msgstr ""
 "áÒÇÕÍÅÎÔÙ, ÏÂÑÚÁÔÅÌØÎÙÅ ÄÌÑ ÄÌÉÎÎÙÈ ËÌÀÞÅÊ, ÏÂÑÚÁÔÅÌØÎÙ É ÄÌÑ ËÏÒÏÔËÉÈ.\n"
 "ôÏ ÖÅ É ÄÌÑ ÎÅÏÂÑÚÁÔÅÌØÎÙÈ ÁÒÇÕÍÅÎÔÏ×.\n"
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2484,7 +2484,7 @@ msgstr ""
 "òÅÚÕÌØÔÁÔÙ ×Ù×ÏÄÑÔÓÑ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ, ÅÓÌÉ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÚÁÄÁÎ\n"
 "ÉÌÉ ÚÁÄÁÎ ËÁË -.\n"
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2502,7 +2502,7 @@ msgstr ""
 "  -C, --c++                  ÓÉÎÏÎÉÍ --language=C++\n"
 "ðÏ ÕÍÏÌÞÁÎÉÀ ÑÚÙË ÏÐÒÅÄÅÌÑÅÔÓÑ ÐÏ ÒÁÓÛÉÒÅÎÉÀ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ.\n"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2518,7 +2518,7 @@ msgstr ""
 "                                 ôåçïí (ÉÌÉ Ó ËÏÍÍÅÎÔÁÒÉÑÍÉ, ÐÒÅÄÛÅÓÔ×ÕÀÝÉÍÉ\n"
 "                                 ËÌÀÞÅ×ÏÊ ÓÔÒÏËÅ)\n"
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2537,7 +2537,7 @@ msgstr ""
 "      --debug                    ÂÏÌÅÅ ÐÏÄÒÏÂÎÙÊ ÒÅÚÕÌØÔÁÔ ÒÁÚÂÏÒÁ ÆÏÒÍÁÔÎÏÊ\n"
 "                                 ÓÔÒÏËÉ\n"
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -2583,11 +2583,11 @@ msgstr ""
 "  -M, --msgstr-suffix[=óôòïëá]\n"
 "                      ÉÓÐÏÌØÚÏ×ÁÔØ óôòïëõ ÉÌÉ \"\" ËÁË ÓÕÆÆÉËÓ Ë ×ÈÏÖÄÅÎÉÑÍ msgstr\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -2597,7 +2597,7 @@ msgstr ""
 "gettext(\"\") ×ÏÚ×ÒÁÝÁÅÔ ÔÅËÓÔ ÚÁÇÏÌÏ×ËÁ Ó ÍÅÔÁÉÎÆÏÒÍÁÃÉÅÊ,\n"
 "Á ÎÅ ÐÕÓÔÕÀ ÓÔÒÏËÕ.\n"
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "ÑÚÙË `%s' ÎÅÉÚ×ÅÓÔÅÎ"
diff --git a/po/sk.gmo b/po/sk.gmo
index bd6b47d55..94d074a04 100644
Binary files a/po/sk.gmo and b/po/sk.gmo differ
diff --git a/po/sk.po b/po/sk.po
index b61db2f38..437813419 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.11.2\n"
-"POT-Creation-Date: 2002-05-02 15:48+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2002-05-30 10:06+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -29,8 +29,8 @@ msgstr "nejednozna
 msgid "Valid arguments are:"
 msgstr "Platné parametre sú:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "chyba pri otváraní súboru \"%s\" na èítanie"
@@ -121,12 +121,12 @@ msgstr "%s: vo
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: voµba `-W %s' nedovoµuje pou¾itie parametra\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "Kompilátor Javy nebol nájdený. Skúste nain¹talova» gcj alebo nastavte $JAVAC"
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Virtuálny stroj Javy nebol nájdený. Skúste nain¹talova» gij alebo nastavte "
@@ -275,10 +275,10 @@ msgid "missing arguments"
 msgstr "chýbajúce parametre"
 
 #: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Skúste `%s --help' a dozviete sa viac informácií.\n"
@@ -340,10 +340,10 @@ msgstr ""
 "©tandardný adresár, v ktorom sa budú hµada» katalógy: %s\n"
 
 #: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Správy o chybách zasielajte na adresu <bug-gnu-gettext@gnu.org> (iba "
@@ -376,7 +376,7 @@ msgstr ""
 "                          doménového mena a prezývok\n"
 "  -i, --ip-address      adresy pre meno hostiteµa\n"
 
-#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -409,7 +409,7 @@ msgstr "povolen
 msgid "%s and %s are mutually exclusive"
 msgstr "%s a %s sa navzájom vyluèujú"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Pou¾itie: %s [VO¥BA] [VSTUPNÝSÚBOR]\n"
@@ -424,14 +424,14 @@ msgstr ""
 "vlastnosti.\n"
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "Povinné parametre pre dlhé voµby sú povinnými aj pre skrátené voµby.\n"
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -445,7 +445,7 @@ msgstr ""
 "                              vstupné súbory\n"
 "Ak nie je zadaný vstupný súbor alebo je -, naèítaný je ¹tandardný vstup.\n"
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -537,7 +537,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "je uvedené nepovolené kritérium výberu (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Pou¾itie: %s [VO¥BA] [VSTUPNÝSÚBOR]...\n"
@@ -565,7 +565,7 @@ msgstr ""
 "zabezpeèí ich zachovanie iba z prvého PO súboru, ktorý ich definuje.\n"
 "Pozície v zdrojových súboroch budú zlúèené zo v¹etkých PO súborov.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -656,7 +656,7 @@ msgstr ""
 "  -s, --sort-output              generova» utriedený výstup\n"
 "  -F, --sort-by-file             utriedi» výstup podµa umiestnenia v súboroch\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -737,7 +737,7 @@ msgstr "t
 msgid "warning: this message is not used"
 msgstr "upozornenie: táto správa nie je pou¾itá"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -745,11 +745,11 @@ msgstr[0] "n
 msgstr[1] "nájdená %d záva¾ná chyba"
 msgstr[2] "nájdené %d záva¾né chyby"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "duplicitná definícia správy"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...toto je miesto prvého definovania"
 
@@ -835,12 +835,12 @@ msgstr ""
 "  -F, --sort-by-file             utriedi» výstup podµa umiestnenia v súboroch\n"
 "      --omit-header              nezapisova» hlavièku s polo¾kou `msgid \"\"'\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Konvertova» prekladový katalóg do iného kódovania znakov.\n"
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -851,7 +851,7 @@ msgstr ""
 "  -t, --to-code=NÁZOV         kódovanie výstupu\n"
 "Predvolené kódovanie je kódovanie aktuálneho národného prostreda.\n"
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -1270,26 +1270,26 @@ msgstr ""
 "      --statistics            zobrazi» ¹tatistiky prekladov\n"
 "  -v, --verbose               zvý¹i» úroveò táravosti\n"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr "výraz pre mno¾né èíslo mô¾e nadobúda» záporné hodnoty"
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu, ale výraz pre mno¾né èíslo mô¾e nadobúda» hodnoty väè¹ie ako "
 "%lu"
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr "výraz pre mno¾né èíslo mô¾e spôsobi» delenie nulou"
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr "výraz pre mno¾né èíslo mô¾e spôsobi» celoèíselné preteèenie"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -1297,32 +1297,32 @@ msgstr ""
 "výraz pre mno¾né èíslo mô¾e spôsobi» aritmetickú výnimku, pravdepodobne "
 "delenie nulou"
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr "katalóg správ má preklady s mno¾nými èíslami..."
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...ale v hlavièke chýba \"plural=VÝRAZ\""
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...ale v hlavièke chýba \"nplurals=ÈÍSLO\""
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 msgid "invalid nplurals value"
 msgstr "neplatná hodnota nplurals"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr "neplatný výraz pre mno¾né èíslo"
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr "nplurals = %lu..."
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
@@ -1330,7 +1330,7 @@ msgstr[0] "...ale niektor
 msgstr[1] "...ale niektoré správy majú len %lu tvar mno¾ného èísla"
 msgstr[2] "...ale niektoré správy majú len %lu tvary mno¾ných èísel"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
@@ -1338,12 +1338,12 @@ msgstr[0] "...ale niektor
 msgstr[1] "...ale niektoré správy majú %lu tvar mno¾ného èísla"
 msgstr[2] "...ale niektoré správy majú %lu tvary mno¾ných èísel"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr "Skúste pou¾i» nasledujúce, platné pre %s:\n"
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -1351,112 +1351,112 @@ msgstr ""
 "katalóg správ má preklady s mno¾nými èíslami, ale v hlavièke chýba \"Plural-"
 "Forms: nplurals=ÈÍSLO; plural=VÝRAZ;\""
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "polo¾ky `msgid' a `msgid_plural' nezaèínajú obe s '\\n'"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "polo¾ky `msgid' a `msgstr[%u]' nezaèínajú obe s '\\n'"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "polo¾ky `msgid' a `msgstr' nezaèínajú obe s '\\n'"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "polo¾ky `msgid' a `msgid_plural' nie sú obe ukonèené s '\\n'"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "polo¾ky `msgid' a `msgstr[%u]' nie sú obe ukonèené s '\\n'"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "polo¾ky `msgid' a `msgstr' nie sú obe ukonèené s '\\n'"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr "spracovanie mno¾ných èísel je roz¹írením GNU"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr "'%s' nie je platný formátovací re»azec %s, na rozdiel od 'msgid'"
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "v msgstr chýba znaèka klávesovej skratky '%c'"
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr obsahuje príli¹ veµa znaèiek klávesových skratiek '%c'"
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "hlavièková polo¾ka `%s' chýba v hlavièke\n"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "hlavièková polo¾ka `%s' má zaèína» na zaèiatku riadku\n"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 "niektoré polo¾ky hlavièky e¹te obsahujú poèiatoèné ¹tandardné hodnoty\n"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "polo¾ka `%s' e¹te obsahuje poèiatoènú ¹tandardnú hodnotu\n"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr "upozornenie: hlavièka súboru PO chýba alebo je neplatná\n"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr "upozornenie: konverzia znakovej sady nebude fungova»\n"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr "upozornenie: hlavièka súboru PO je nepresná\n"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "upozornenie: star¹ie verzie msgfmt vrátia pri tomto chybu\n"
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "meno domény \"%s\" nie je pou¾itelné ako meno súboru"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "meno domény \"%s\" nie je pou¾itelné ako meno súboru: pou¾ije sa predpona"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "direktíva `domain %s' bola ignorovaná"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "prázdna polo¾ka `msgstr' bola ignorovaná"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "nepresná polo¾ka `msgstr' bola ignorovaná"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: upozornenie: zdrojový súbor obsahuje nepresné preklady"
@@ -1710,23 +1710,23 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Slovenské preklady pre balík %s"
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "aktuálna znaková sada \"%s\" nie je prenositeµné meno kódovania"
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "dve rozdielne znakové sady \"%s\" a \"%s\" vo vstupnom súbore"
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "vstupný súbor \"%s\" nemá v hlavièke uvedenú znakovú sadu"
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -1734,17 +1734,17 @@ msgid ""
 msgstr ""
 "doména \"%s\" vo vstupnom súbore \"%s\" nemá v hlavièke uvedenú znakovú sadu"
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "cieµová znaková sada \"%s\" nie je prenositeµné meno kódovania."
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr "upozornenie: "
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
@@ -1753,7 +1753,7 @@ msgstr ""
 "UTF-8.\n"
 "Konvertujem výstup do UTF-8.\n"
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1824,11 +1824,11 @@ msgstr ""
 msgid "conversion failure"
 msgstr "konverzia zlyhala"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "vstupný súbor nemá v hlavièke uvedenú znakovú sadu"
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -1837,7 +1837,7 @@ msgstr ""
 "Nemô¾em konvertova» z \"%s\" do \"%s\". %s spolieha na iconv() a iconv() "
 "nepodporuje takúto konverziu."
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2177,13 +2177,13 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<¹tandardný vstup>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: upozornenie: "
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2192,15 +2192,15 @@ msgstr ""
 "Znaková sada \"%s\" nie je prenositeµné meno kódovania.\n"
 "Konverzia hlásení do znakovej sady pou¾ívateµa nemusí fungova».\n"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr "Pokraèovanie aj napriek tomu. Mo¾no sa vyskytnú chyby pri analýze."
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr "Pokraèovanie aj napriek tomu."
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2209,7 +2209,7 @@ msgstr ""
 "Znaková sada \"%s\" nie je podporovaná. %s spolieha na iconv()\n"
 "a iconv() nepodporuje \"%s\".\n"
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2217,12 +2217,12 @@ msgstr ""
 "In¹talácia GNU balíka libiconv a následná prein¹talácia\n"
 "balíka GNU gettext by mala tento problém odstráni».\n"
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2231,7 +2231,7 @@ msgstr ""
 "Znaková sada \"%s\" nie je podporovaná. %s spolieha na iconv().\n"
 "Táto verzia bola prelo¾ená bez iconv().\n"
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2268,43 +2268,43 @@ msgstr "mno
 msgid "too many errors, aborting"
 msgstr "vyskytlo sa príli¹ veµa chýb, ukonèuje sa program"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "neplatná viacznaková sekvencia"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr "nekompletná viacznaková sekvencia na konci súboru"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr "nekompletná viacznaková sekvencia na konci riadku"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr "iconv zlyhal"
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "chyba pri èítaní súboru \"%s\""
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "neznáme kµúèové slovo \"%s\""
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "neplatná riadiaca sekvencia"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "koniec súboru uprostred re»azca"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "koniec riadku uprostred re»azca"
 
@@ -2369,7 +2369,7 @@ msgstr "nie je platn
 msgid "failed to create \"%s\""
 msgstr "zlyhalo vytvorenie \"%s\""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "chyba poèas zápisu do súboru \"%s\""
@@ -2384,13 +2384,13 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "chyba pri otváraní súboru  \"%s\" na zápis"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "internacionalizované správy nesmú obsahova» riadiacu sekvenciu `\\%c'"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2403,12 +2403,12 @@ msgstr ""
 "ako vy. Zvá¾te namiesto to pou¾itie msgid len s ASCII znakmi.\n"
 "%s\n"
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "nie je mo¾né vytvori» výstupný súbor \"%s\""
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "¹tandardný výstup"
@@ -2423,7 +2423,7 @@ msgstr "%s:%d: upozornenie: neukon
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: upozornenie: neukonèený znakový re»azec"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "tento súbor nesmie obsahova» direktívy pre doménu"
 
@@ -2452,17 +2452,17 @@ msgstr ""
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext nemô¾e pracova» bez kµúèových slov, ktoré má hµada»"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "upozornenie: súbor `%s' s príponou `%s' je neznámy; skúsim C"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extrahova» prelo¾iteµné re»azce zo zadaných vstupných súborov.\n"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -2471,7 +2471,7 @@ msgstr ""
 "Povinné parametre dlhých volieb sú povinné aj pre krátke voµby.\n"
 "Podobne aj pre voliteµné parametre.\n"
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2486,7 +2486,7 @@ msgstr ""
 "  -p, --output-dir=ADRESÁR       výstupné súbory budú umiestnené v adresári ADRESÁR\n"
 "Ak je výstupný súbor -, výstup je zapísaný na ¹tandardný výstup.\n"
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2505,7 +2505,7 @@ msgstr ""
 "  -C, --c++                      skratka pre --language=C++\n"
 "©tandardne je jazyk odhadnutý podµa prípony vstupného súboru.\n"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2521,7 +2521,7 @@ msgstr ""
 "                                 (alebo tie, ktoré predchádzajú kµúèové riadky)\n"
 "                                 do výstupného súboru\n"
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2540,7 +2540,7 @@ msgstr ""
 "      --debug                    detailnej¹ie výsledky rozoznávania formátovacích\n"
 "                                 re»azcov\n"
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -2588,11 +2588,11 @@ msgstr ""
 "  -M, --msgstr-suffix[=RE«AZEC]  pou¾i» RE«AZEC alebo \"\" ako príponu pre\n"
 "                                 polo¾ky msgstr\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "¹tandardný vstup"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -2602,7 +2602,7 @@ msgstr ""
 "gettext(\"\") vráti hlavièku s meta informáciami\n"
 "a nie prázdny re»azec.\n"
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "jazyk `%s' je neznámy"
diff --git a/po/sl.gmo b/po/sl.gmo
index 29e9f8aab..247fef6f7 100644
Binary files a/po/sl.gmo and b/po/sl.gmo differ
diff --git a/po/sl.po b/po/sl.po
index 0ce69e9c7..23bedf268 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.11.2\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2002-04-25 10:43+0200\n"
 "Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -31,8 +31,8 @@ msgstr "dvoumen argument %s za ,%s`"
 msgid "Valid arguments are:"
 msgstr "Veljavni argumenti so:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "datoteke \"%s\" ni moè odpreti za branje"
@@ -123,11 +123,11 @@ msgstr "%s: izbira ,-W %s` je dvoumna\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: izbira ,-W %s` ne dovoljuje argumenta\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Prevajalnika za javo ni najti; namestite gcj ali nastavite $JAVAC"
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Virtualnega javanskega stroja ni najti; namestite gij ali nastavite $JAVA"
@@ -242,7 +242,7 @@ msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "formatni doloèili v ,msgid` in ,%s` za argument ,%s` nista enaki"
 
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -258,7 +258,7 @@ msgstr ""
 "raz¹irjate so navedeni v izvorni kodi. Za program ni NOBENEGA jamstva,\n"
 "niti jamstev USTREZNOSTI ZA PRODAJO ali PRIMERNOSTI ZA RABO.\n"
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -267,7 +267,7 @@ msgstr ""
 msgid "Written by %s.\n"
 msgstr "Avtor %s.\n"
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "preveè argumentov"
 
@@ -275,11 +275,11 @@ msgstr "preve
 msgid "missing arguments"
 msgstr "argumenti manjkajo"
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Poskusite ,%s --help` za izèrpnej¹a navodila\n"
@@ -338,25 +338,25 @@ msgstr ""
 "kataloga sporoèil.\n"
 "Privzet imenik s katalogom sporoèil: %s\n"
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Morebitne napake v programu sporoèite na <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Uporaba: %s [IZBIRA]\n"
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr "Izpis gostiteljskega imena raèunalnika.\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -371,7 +371,7 @@ msgstr ""
 "                          internetim imenom in vzdevki\n"
 "  -i, --ip-address      internetni naslov za gostiteljsko ime\n"
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -384,7 +384,7 @@ msgstr ""
 "  -h, --help                  ta navodila\n"
 "  -V, --version               razlièica programa\n"
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr "gostiteljskega imena ni moè ugotoviti"
 
@@ -404,7 +404,7 @@ msgstr "dovoljena je najve
 msgid "%s and %s are mutually exclusive"
 msgstr "%s in %s se med seboj izkljuèujeta"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Uporaba: %s [IZBIRA] [VHODNA_DATOTEKA]\n"
@@ -419,7 +419,7 @@ msgstr ""
 "in rokovanje z njimi.\n"
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
@@ -428,7 +428,7 @@ msgstr ""
 "Èe je pri dolgi obliki izbire naveden obvezen argument, je ta obvezen\n"
 "tudi za kratko obliko.\n"
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -441,7 +441,7 @@ msgstr ""
 "  -D, --directory=IMENIK      vhodne datoteke i¹èemo tudi v navedenem IMENIKU\n"
 "Èe vhodna datoteka ni podana ali je enaka -, se bere standardni vhod.\n"
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -529,7 +529,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "doloèeni kriteriji izbire niso mogoèi (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Uporaba: %s [IZBIRA] [VHODNA_DATOTEKA]...\n"
@@ -556,7 +556,7 @@ msgstr ""
 "zahtevamo, da se ohranijo samo iz prve datoteke PO, ki jih definira. Mesta\n"
 "v datotekah iz vseh datotek PO se ohranijo.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -640,7 +640,7 @@ msgstr ""
 "  -s, --sort-output        izhod abecedno urejen po sporoèilih\n"
 "  -F, --sort-by-file       izhod abecedno urejen po izvornih datotekah\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -720,7 +720,7 @@ msgstr "to sporo
 msgid "warning: this message is not used"
 msgstr "opozorilo: to sporoèilo ni uporabljeno"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -729,11 +729,11 @@ msgstr[1] "%d kriti
 msgstr[2] "%d kritièni napaki"
 msgstr[3] "%d kritiène napake"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "podvojena definicija sporoèila"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...to je kraj prve definicije"
 
@@ -813,12 +813,12 @@ msgstr ""
 "  -F, --sort-by-file       izhod abecedno urejen po izvornih datotekah\n"
 "      --omit-header        brez glave z vnosom \"msgid\"\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Pretvarjanje kataloga sporoèil v drug kodni nabor.\n"
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -829,7 +829,7 @@ msgstr ""
 "  -t, --to-code=NABOR         nabor znakov izhodne datoteke\n"
 "Privzeta vrednost je kodni nabor izbrane krajevne nastavitve.\n"
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -1236,25 +1236,25 @@ msgstr ""
 "      --statistics            s statistiko glede prevodov\n"
 "  -v, --verbose               z dodatnimi sporoèili med izvajanjem\n"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr "rezultat izraza za izbiro mno¾inske oblike je lahko negativna vrednost"
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu, izraz za izbiro mno¾inske oblike pa lahko da vrednosti do %lu"
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr "izraz za izbiro mno¾inske oblike lahko povzroèi deljenje z niè"
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr "izraz za izbiro mno¾inske oblike lahko povzroèi prekoraèitev obsega"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -1262,27 +1262,27 @@ msgstr ""
 "izraz za izbiro mno¾inske oblike lahko povzroèi aritmetiène napake, morda\n"
 "deljenje z niè"
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr "katalog sporoèil vsebuje mno¾inske oblike prevodov..."
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...v glavi pa manjka doloèilo \"plural=IZRAZ\""
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...v glavi pa manjka doloèilo \"nplurals=©TEVILO\""
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 msgid "invalid nplurals value"
 msgstr "neveljavna vrednost nplurals"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr "neveljaven izraz za mno¾inske oblike"
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr "nplurals = %lu..."
@@ -1292,7 +1292,7 @@ msgstr "nplurals = %lu..."
 # msgstr[1] "...nekatera sporoèila pa imajo samo %lu mno¾insko obliko"
 # msgstr[2] "...nekatera sporoèila pa imajo samo %lu mno¾inski obliki"
 # msgstr[3] "...nekatera sporoèila pa imajo samo %lu mno¾inske oblike"
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
@@ -1306,7 +1306,7 @@ msgstr[3] "...nekatera sporo
 # msgstr[1] "...nekatera sporoèila pa imajo %lu mno¾insko obliko"
 # msgstr[2] "...nekatera sporoèila pa imajo %lu mno¾inski obliki"
 # msgstr[3] "...nekatera sporoèila pa imajo %lu mno¾inske oblike"
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
@@ -1315,12 +1315,12 @@ msgstr[1] "...nekatera sporo
 msgstr[2] "...nekatera sporoèila pa imajo %lu mno¾inski obliki"
 msgstr[3] "...nekatera sporoèila pa imajo %lu mno¾inske oblike"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr "Poskusite uporabiti naslednje, veljavno za %s:\n"
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -1328,110 +1328,110 @@ msgstr ""
 "katalog sporoèil vsebuje mno¾inske oblike, manjka pa glava z doloèili\n"
 "\"Plural-Forms: nplurals=©TEVILO; plural=IZRAZ;\""
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "polji ,msgid` in ,msgid_plural` se ne zaèneta obe z ,\\n`"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "polji ,msgid` in ,msgstr[%u]` se ne zaèneta obe z ,\\n`"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "polji ,msgid` in ,msgstr` se ne zaèneta obe z ,\\n`"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "polji ,msgid` in ,msgid_plural` se ne konèata obe z ,\\n`"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "polji ,msgid` in ,msgstr[%u]` se ne konèata obe z ,\\n`"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "polji ,msgid' in ,msgstr` se ne konèata obe z ,\\n`"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr "rokovanje z mno¾inskimi oblikami je raz¹iritev GNU gettext"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr ",%s` za razliko od ,msgid` ni veljaven formatni niz %s"
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "v msgstr manjka oznaka bli¾njice ,%c`"
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "v msgstr je preveè oznak bli¾njic ,%c`"
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "v glavi manjka polje ,%s`\n"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "polje ,%s` v glavi se mora zaèeti na zaèetku vrstice\n"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 msgid "some header fields still have the initial default value\n"
 msgstr "nekatera polja v glavi imajo ¹e vedno zaèetne privzete vrednosti\n"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "polje ,%s' ima ¹e vedno zaèetno privzeto vrednost\n"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr "opozorilo: glava datoteke PO ni veljavna ali pa manjka\n"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr "opozorilo: pretvorba v navedeni nabor znakov ne bo delovala\n"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr "opozorilo: glava datoteke PO ni razberljiva\n"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "opozorilo: starej¹e izdaje msgfmt bodo pri tem javile napako\n"
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "ime domene \"%s\" ni primerno kot ime datoteke"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "ime domene \"%s\" ni primerno kot ime datoteke: uporabimo predpono"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "direktiva ,domain %s` ni bila upo¹tevana"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "prazno polje ,msgstr` zavr¾eno"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "ohlapni vnos za polje ,msgstr` zavr¾en"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: opozorilo: vhodna datoteka vsebuje ohlapne (fuzzy) prevode"
@@ -1681,23 +1681,23 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Slovenski prevodi paketa %s"
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "trenutno izbrani nabor \"%s\" ni prenosljivo ime kodnega nabora"
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "v vhodni datoteki sta dva razlièna nabora znakov, \"%s\" in \"%s\""
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "vhodna datoteka ,%s` ne vsebuje glave z doloèitvijo nabora znakov"
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -1706,17 +1706,17 @@ msgstr ""
 "domena \"%s\" v vhodni datoteki ,%s` ne vsebuje glave z doloèitvijo nabora "
 "znakov<"
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "ciljni nabor \"%s\" ni prenosljivo ime kodnega nabora."
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr "opozorilo: "
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
@@ -1725,7 +1725,7 @@ msgstr ""
 "UTF8.\n"
 "Izhod je pretvorjen v UTF8.\n"
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1795,11 +1795,11 @@ msgstr ""
 msgid "conversion failure"
 msgstr "pretvorba neuspe¹na"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "v vhodni datoteki manjka glava z doloèilom kodnega nabora"
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -1808,7 +1808,7 @@ msgstr ""
 "Pretvorba iz \"%s\" v \"%s\" ni mogoèa. %s klièe iconv(), ta pa ne podpira "
 "te pretvorbe."
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2142,13 +2142,13 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<st. vhod>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: opozorilo: "
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2157,15 +2157,15 @@ msgstr ""
 "Nabor \"%s\" ni prenosljivo ime kodnega nabora.\n"
 "Pretvorba sporoèil v uporabnikov kodni nabor morda ne bo delovala.\n"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr "Te¾avam navzlic nadaljujemo, prièakujte napake pri razèlembi."
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr "Te¾avam navzlic nadaljujemo."
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2174,7 +2174,7 @@ msgstr ""
 "Nabor \"%s\" ni podprt. %s se naslanja na iconv(),\n"
 "in iconv() ne podpira \"%s\".\n"
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2182,12 +2182,12 @@ msgstr ""
 "Namestitev knji¾nice GNU libiconv in ponovno prevajanje paketa\n"
 "GNU Gettext bi moralo odpraviti to te¾avo.\n"
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2196,7 +2196,7 @@ msgstr ""
 "Nabor \"%s\" ni podprt. %s se naslanja na iconv().\n"
 "Ta izdaja je bila prevedena brez iconv().\n"
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2233,43 +2233,43 @@ msgstr "mno
 msgid "too many errors, aborting"
 msgstr "preveè napak, nadaljevanje ni mo¾no"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "neveljavno veèzlo¾no zaporedje"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr "nepopolno veèzlo¾no zaporedje na koncu datoteke"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr "nepopolno veèzlo¾no zaporedje na koncu vrstice"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr "iconv neuspe¹en"
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "napaka pri branju \"%s\""
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "kljuèna beseda \"%s\" neprepoznana"
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "neveljavno krmilno zaporedje"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "znak za konec datoteke sredi niza"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "znak za konec vrstice sredi niza"
 
@@ -2334,7 +2334,7 @@ msgstr "ni veljavno javansko ime razreda: %s"
 msgid "failed to create \"%s\""
 msgstr "ustvarjanje \"%s\" neuspe¹no"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "napaka pri pisanju na datoteko \"%s\""
@@ -2350,14 +2350,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "napaka pri pisanju na \"%s\""
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internacionalizirana sporoèila ne smejo vsebovati ube¾ne sekvence ,\\%c'"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2372,12 +2372,12 @@ msgstr ""
 "vi. Razmislite o uporabi sporoèil v naboru znakov ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "izhodne datoteke \"%s\" ni mogoèe ustvariti"
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "standardni izhod"
@@ -2392,7 +2392,7 @@ msgstr "%s:%d: opozorilo: nezaklju
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: opozorilo: nezakljuèen niz"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "ta datoteka morda ne vsebuje direktiv domene"
 
@@ -2419,18 +2419,18 @@ msgstr "pri izpisu na standardni izhod ne moremo uporabiti --join-existing"
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ne deluje brez kljuènih besed, ki naj jih i¹èe"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "opozorilo: vrsta datoteka ,%s' s pripono ,%s' ni prepoznana; posku¹amo C"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Iz vhodnih datotek izvleèemo prevedljive nize znakov.\n"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -2439,7 +2439,7 @@ msgstr ""
 "Èe je pri dolgi obliki izbire naveden obvezen argument, je ta obvezen\n"
 "tudi za kratko obliko. Enako za neobvezne argumente.\n"
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2455,7 +2455,7 @@ msgstr ""
 "Èe je kot izhodna datoteka navedeno -, se rezultat izpi¹e na standardni\n"
 "izhod.\n"
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2473,7 +2473,7 @@ msgstr ""
 "  -C, --c++                      okraj¹ava za --language=C++\n"
 "Privzeto se jezik poskusi uganiti iz pripone vhodne datoteke.\n"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2488,7 +2488,7 @@ msgstr ""
 "  -c, --add-comments[=ZNAÈKA]    v vhodno datoteko dodamo komentar z navedeno\n"
 "                                  ZNAÈKO\n"
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2506,7 +2506,7 @@ msgstr ""
 "      --debug                    bolj razèlenjen rezultat razpoznave\n"
 "                                   oblikovnega niza\n"
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -2547,11 +2547,11 @@ msgstr ""
 "  -m, --msgstr-prefix[=NIZ]  NIZ ali \"\" kot predpona za msgstr\n"
 "  -m, --msgstr-suffix[=NIZ]  NIZ ali \"\" kot pripona za msgstr\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "standardni vhod"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -2561,7 +2561,7 @@ msgstr ""
 "gettext(\"\") vrne glavo z metapodatki, ne pa\n"
 "praznega niza.\n"
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "jezik ,%s` ni poznan"
diff --git a/po/sv.gmo b/po/sv.gmo
index 58513495e..9f7e722c7 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index 83c5f01ef..a90c314e6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.2\n"
-"POT-Creation-Date: 2002-05-02 15:48+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2002-06-04 22:20+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -29,8 +29,8 @@ msgstr "tvetydigt argument \"%s\" f
 msgid "Valid arguments are:"
 msgstr "Giltiga argument är:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "fel uppstod när \"%s\" öppnades för läsning"
@@ -121,11 +121,11 @@ msgstr "%s: flaggan \"-W %s\" 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"-W %s\" tar inget argument\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Javakompilator hittades inte, försök installera gcj eller sätt $JAVAC"
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Virtuell Javamaskin hittades inte, försök installera gij eller sätt $JAVA"
@@ -282,10 +282,10 @@ msgid "missing arguments"
 msgstr "argument saknas"
 
 #: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Försök med \"%s --help\" för mer information.\n"
@@ -346,10 +346,10 @@ msgstr ""
 "Normal katalog för meddelandekataloger: %s\n"
 
 #: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Rapportera fel till <bug-gnu-gettext@gnu.org>.\n"
@@ -379,7 +379,7 @@ msgstr ""
 "  -f, --fqdn, --long    långt värdnamn, innehåller hela domännamnet och alias\n"
 "  -i, --ip-address      adresser för värdnamnet\n"
 
-#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -412,7 +412,7 @@ msgstr "h
 msgid "%s and %s are mutually exclusive"
 msgstr "%s och %s är ömsesidigt uteslutande"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Användning: %s [FLAGGA] [INFIL]\n"
@@ -427,14 +427,14 @@ msgstr ""
 "manipulerar attributen.\n"
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "Obligatoriska argument för långa flaggor är obligatoriska även för korta.\n"
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -447,7 +447,7 @@ msgstr ""
 "  -D, --directory=KATALOG     sök infiler även i KATALOG\n"
 "Om ingen infil är given eller om den är - läses standard in.\n"
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -536,7 +536,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "omöjligt urvalskriterium angivet (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Användning: %s [FLAGGA] [INFIL]...\n"
@@ -564,7 +564,7 @@ msgstr ""
 "utom om --use-first ges.  Då tas de endast från den första PO-filen som\n"
 "definierar dem.  Filpositioner från alla filer bevaras.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -650,7 +650,7 @@ msgstr ""
 "  -s, --sort-output              sortera resultatet\n"
 "  -F, --sort-by-file             sortera resultatet efter filposition  \n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -731,18 +731,18 @@ msgstr "detta meddelande anv
 msgid "warning: this message is not used"
 msgstr "varning: detta meddelande används inte"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d allvarligt fel hittat"
 msgstr[1] "%d allvarliga fel hittades"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "meddelandedefinitionen är dubblerad"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...detta är platsen för den första definitionen"
 
@@ -826,12 +826,12 @@ msgstr ""
 "  -F, --sort-by-file             sortera resultatet efter filposition\n"
 "      --omit-header              skriv inte ut huvudet med 'msgid \"\"'\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Konverterar en meddelandekatalog till en annan teckenkodning.\n"
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -842,7 +842,7 @@ msgstr ""
 "  -t, --to-code=NAMN          Kodning för utdata\n"
 "Standardvärde är nuvarande lokals kodning.\n"
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -1251,74 +1251,74 @@ msgstr ""
 "      --statistics            skriv ut statistik om översättningarna\n"
 "  -v, --verbose               öka mängden information i meddelanden\n"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr "pluraluttryck kan producera negativa värden"
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu men pluraluttryck kan ge värden upp till %lu"
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr "pluraluttryck kan ge division med noll"
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr "pluraluttryck kan ge överflöde av heltal"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr "pluraluttryck kan ge aritmetiska fel, möjligen division med noll"
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr "meddelandekatalog har översättningar med pluralform..."
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...men huvudrader saknar attribut av typ \"plurals=UTTRYCK\""
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...men huvudrader saknar attribut av typ \"plurals=HELTAL\""
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 msgid "invalid nplurals value"
 msgstr "ogiltigt värde för nplurals"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr "ogiltigt pluraluttryck"
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr "nplurals = %lu..."
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "...men några meddelanden har bara en pluralform"
 msgstr[1] "...men några meddelanden har bara %lu pluralformer"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "...men några meddelanden har en pluralform"
 msgstr[1] "...men några meddelanden har %lu pluralformer"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr "Försök använda den här, gäller för \"%s\":\n"
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -1326,113 +1326,113 @@ msgstr ""
 "meddelandekatalog har översättningar med pluralformer, men saknar huvudrad "
 "med \"Plural-Forms: nplurals=HELTAL; plural=UTTRYCK;\""
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "\"msgid\"- och \"msgid_plural\"-raderna börjar inte båda med \"\\n\""
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "\"msgid\"- och \"msgstr[%u]\"-raderna börjar inte båda med \"\\n\""
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "\"msgid\"- och \"msgstr\"-raderna börjar inte båda med \"\\n\""
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "\"msgid\"- och \"msgid_plural\"-raderna slutar inte båda med \"\\n\""
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "\"msgid\"- och \"msgstr[%u]\"-raderna slutar inte båda med \"\\n\""
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "\"msgid\"- och \"msgstr\"-raderna slutar inte båda med \"\\n\""
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr "hantering av plural är en utökning i GNU gettext"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr ""
 "\"%s\" är inte en giltig formatsträng i %s, till skillnad från \"msgid\""
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr saknar märket \"%c\" för tangentkortkommandon"
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr har för många märken \"%c\" för tangentkortkommandon"
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "huvudrad \"%s\" saknas i huvudet\n"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "huvudrad \"%s\" bör ligga i början på raden\n"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 msgid "some header fields still have the initial default value\n"
 msgstr "vissa huvudrader har kvar initiala standardvärden\n"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "huvudrad \"%s\" har kvar initialt standardvärde\n"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr "varning: PO-filens huvudrader saknas eller är ogiltiga\n"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "varning: konvertering till användarens teckenuppsättning kommer att "
 "misslyckas.\n"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr "varning: PO-filens huvudrader är luddiga\n"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "varning: äldre versioner av msgfmt ger ett fel för detta\n"
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domännamnet \"%s\" är inte lämpligt som filnamn"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domännamnet \"%s\" är inte lämpligt som filnamn: använder ett prefix"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "direktivet \"domain %s\" ignoreras"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "tom \"msgstr\"-rad ignorerad"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "luddig \"msgstr\"-rad ignorerad"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: varning: källfilen innehåller luddiga översättningar"
@@ -1680,23 +1680,23 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Svenska översättningar för paket %s"
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "nuvarande teckenuppsättning \"%s\" är inte ett portabelt kodningsnamn"
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "två olika teckenuppsättningar \"%s\" och \"%s\" i infilen"
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "infilen \"%s\" saknar en huvudrad som anger teckenuppsättning"
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -1704,17 +1704,17 @@ msgid ""
 msgstr ""
 "domän \"%s\" i infil \"%s\" saknar en huvudrad som anger teckenuppsättning"
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "målteckenuppsättning \"%s\" är inte ett portabelt kodningsnamn"
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr "varning: "
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
@@ -1722,7 +1722,7 @@ msgstr ""
 "Infiler har meddelanden med flera kodningar, däribland UTF-8.\n"
 "Konverterar resultatet till UTF-8.\n"
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1791,11 +1791,11 @@ msgstr ""
 msgid "conversion failure"
 msgstr "konverteringsfel"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "infilen saknar en huvudrad som anger teckenuppsättning"
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -1804,7 +1804,7 @@ msgstr ""
 "Kan inte konvertera från \"%s\" till \"%s\".  %s beror på iconv()\n"
 "och iconv() stöder inte denna konvertering."
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2138,13 +2138,13 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<standard in>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: varning: "
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2153,15 +2153,15 @@ msgstr ""
 "Teckenuppsättning \"%s\" är inte namn på en portabel kodning.\n"
 "Meddelandekonvertering till användarens teckenuppsättning kan misslyckas.\n"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr "Fortsätter ändå, tolkningsfel kan förväntas."
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr "Fortsätter ändå."
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2170,7 +2170,7 @@ msgstr ""
 "Teckenuppsättning \"%s\" stöds ej. %s beror på iconv(),\n"
 "och iconv() stöder inte \"%s\".\n"
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2178,12 +2178,12 @@ msgstr ""
 "Installation av GNU libiconv med efterföljande ominstallation av\n"
 "GNU gettext skulle lösa detta problem.\n"
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2192,7 +2192,7 @@ msgstr ""
 "Teckenuppsättning \"%s\" stöds ej. %s beror på iconv().\n"
 "Denna version byggdes utan iconv().\n"
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2230,43 +2230,43 @@ msgstr "pluralform har fel index"
 msgid "too many errors, aborting"
 msgstr "för många fel, avbryter körningen"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "ogiltig flerbytesekvens"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr "ofullständig flerbytesekvens i slutet på filen"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr "ofullständig flerbytesekvens i slutet på raden"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr "iconv misslyckades"
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fel uppstod då \"%s\" lästes"
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "nyckelordet \"%s\" är okänt"
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "ogiltig kontrollsekvens"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "filslut inne i en sträng"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "radslut inne i en sträng"
 
@@ -2331,7 +2331,7 @@ msgstr "inte ett giltigt Javaklassnamn: %s"
 msgid "failed to create \"%s\""
 msgstr "misslyckades med att skapa \"%s\""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "fel vid skrivning till filen \"%s\""
@@ -2346,14 +2346,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "fel uppstod när \"%s\" öppnades för skrivning"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internationaliserade meddelanden bör inte ha kontrollsekvensen \"\\%c\""
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2366,12 +2366,12 @@ msgstr ""
 "som är en annan än din.  Försök använda en ren ASCII-msgid istället.\n"
 "%s\n"
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan inte skapa utfilen \"%s\""
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "standard ut"
@@ -2386,7 +2386,7 @@ msgstr "%s:%d: varning: oavslutad teckenkonstant"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: varning: oavslutad sträng"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "denna fil kan inte innehålla domändirektiv"
 
@@ -2414,17 +2414,17 @@ msgstr ""
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext måste ha nyckelord att söka efter för att fungera"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "varning: filtyp \"%s\" med suffix \"%s\" är okänd; försöker med C"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extrahera översättbara strängar från givna infiler.\n"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -2433,7 +2433,7 @@ msgstr ""
 "Obligatoriska argument för långa flaggor är obligatoriska även för korta.\n"
 "Motsvarande gäller för frivilliga argument.\n"
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2448,7 +2448,7 @@ msgstr ""
 "  -p, --output-dir=KATALOG       utfiler placeras i katalogen KATALOG\n"
 "Om utfilen är - skrivs resultatet till standard ut.\n"
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2467,7 +2467,7 @@ msgstr ""
 "  -C, --c++                      samma som --language=C++\n"
 "I normalläge gissas språket från filändelsen på infilen.\n"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2482,7 +2482,7 @@ msgstr ""
 "  -c, --add-comments[=MÄRKE]     skriv kommentarsblock med MÄRKE (eller de\n"
 "                                 före nyckelordsrader) till resultatet\n"
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2499,7 +2499,7 @@ msgstr ""
 "  -T, --trigraphs                hantera ANSI C treteckenssekvenser i infiler\n"
 "      --debug                    mer detaljerad igenkänning av formatsträngar\n"
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -2542,11 +2542,11 @@ msgstr ""
 "  -m, --msgstr-prefix[=STRÄNG]   inled översatta strängar med STRÄNG eller \"\"\n"
 "  -M, --msgstr-suffix[=STRÄNG]   avsluta översatta strängar med STRÄNG eller \"\"\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "standard in"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -2556,7 +2556,7 @@ msgstr ""
 "gettext(\"\") returnerar huvudet med metainformation,\n"
 "inte den tomma strängen.\n"
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "språket \"%s\" okänt"
diff --git a/po/tr.gmo b/po/tr.gmo
index 3fbc7545c..fe3ee22b4 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index f38c51d9e..996551247 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.11.2\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2002-04-25 14:27+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@fide.org>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -29,8 +29,8 @@ msgstr "argüman `%s' `%s' için belirsiz"
 msgid "Valid arguments are:"
 msgstr "Geçerli argümanlar:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "\"%s\" okunmak için açılırken hata"
@@ -121,12 +121,12 @@ msgstr "%s: `-W %s' seçeneği belirsiz\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' seçeneği bir argümanla kullanılmaz\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "Java derleyici bulunamadı, ya gcj kurun ya da $JAVAC değişkenini belirleyin"
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Java sanal makinası bulunamadı,\n"
@@ -244,7 +244,7 @@ msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "'%2$s' için biçem belirteci 'msgid' ve '%1$s' içinde aynı değil"
 
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -260,7 +260,7 @@ msgstr ""
 "Hiçbir garantisi yoktur; hatta SATILABİLİRLİĞİ veya ŞAHSİ KULLANIMINIZA\n"
 "UYGUNLUĞU için bile garanti verilmez.\n"
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -269,7 +269,7 @@ msgstr ""
 msgid "Written by %s.\n"
 msgstr "%s tarafından yazıldı.\n"
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "çok fazla argüman"
 
@@ -277,11 +277,11 @@ msgstr "çok fazla argüman"
 msgid "missing arguments"
 msgstr "argümanlar eksik"
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Daha fazla bilgilendirilmek için `%s --help' yazınız.\n"
@@ -339,27 +339,27 @@ msgstr ""
 "Ancak iletiyi standart çıktıya basitçe kopyalamak yerine çevirisini verir.\n"
 "Standart arama dizini: %s\n"
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Yazılım hatalarını <bug-gnu-utils@gnu.org> adresine,\n"
 "Çeviri hatalarını <gnu-tr-u12a@lists.sourceforge.net> adresine bildiriniz.\n"
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Kullanımı: %s [SEÇENEK]\n"
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr "Makina ismini gösterir.\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -374,7 +374,7 @@ msgstr ""
 "                              içerir\n"
 "  -i, --ip-address            makinanın IP adresi\n"
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -387,7 +387,7 @@ msgstr ""
 "  -h, --help                  Bu yardımı gösterir ve çıkar\n"
 "  -V, --version               Sürüm bilgilerini gösterir ve çıkar\n"
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr "makina ismi alınamadı"
 
@@ -407,7 +407,7 @@ msgstr "en fazla bir girdi dosyasına izin var"
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ile %s bağdaşmıyor"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Kullanımı: %s [SEÇENEK] [GİRDİDOSYASI]\n"
@@ -422,14 +422,14 @@ msgstr ""
 "ve özellikleri uygular.\n"
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "Uzun seçeneklerdeki zorunlu argümanlar kısa seçenekler için de zorunludur.\n"
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -442,7 +442,7 @@ msgstr ""
 "  -D, --directory=DİZİN       Girdi dosyalarının arama yoluna DİZİNi ekler\n"
 "Girdi dosyası verilmemişse ya da yerine - verilmişse standart girdi okunur.\n"
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -531,7 +531,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "belirtilen seçim kriteri mümkün değil (%d < n < %d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Kullanımı: %s [SEÇENEK] [GİRDİDOSYASI]...\n"
@@ -560,7 +560,7 @@ msgstr ""
 "korunur, belirtildiğinde bunlar ilk PO dosyasında belirtildiği şekliyle\n"
 "alınır.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -647,7 +647,7 @@ msgstr ""
 "  -s, --sort-output           çıktıyı sıralı üretir\n"
 "  -F, --sort-by-file          çıktıyı dosya konumuna göre sıralar\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -727,18 +727,18 @@ msgstr "bu ileti kullanıldı ama %s'de tanımlı değil"
 msgid "warning: this message is not used"
 msgstr "uyarı: bu ileti kullanılmamış"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d ölümcül hata bulundu"
 msgstr[1] "%d ölümcül hata bulundu"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "ileti iki defa tanımlanmış"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...bu ilk tanımlamanın konumu"
 
@@ -824,12 +824,12 @@ msgstr ""
 "  -F, --sort-by-file          çıktıyı dosya konumuna göre sıralar\n"
 "      --omit-header           `msgid \"\"' şeklindeki başlığı yazmaz\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Bir çeviri kataloğunu başka bir karakter kodlamasına dönüştürür.\n"
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -840,7 +840,7 @@ msgstr ""
 "  -t, --to-code=İSİM          çıktı için kodlama belirtilir\n"
 "Öntanımlı kodlama mevcut yerelin kodlamasıdır.\n"
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -1245,75 +1245,75 @@ msgstr ""
 "      --statistics            çeviri istatistiklerini gösterir\n"
 "  -v, --verbose               sonuçlar daha ayrıntılı verilir\n"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr "çoğul ifadeler negatif değerler üretebilir"
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu ama çoğul ifadeler en çok %lu değer üretebilir"
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr "çoğul ifade sıfırla bölme hatası üretebilir"
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr "çoğul ifade tamsayı taşması üretebilir"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 "çoğul ifade aritmetik hatalar, özellikle de sıfırla bölme hatası üretebilir"
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr "ileti kataloğu çoğul çeviriler içeriyor"
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...ama başlıkta \"plural=İFADE\" gibi bir şey yok"
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...ama başlıkta \"nplurals=TAMSAYI\" gibi bir şey yok"
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 msgid "invalid nplurals value"
 msgstr "nplurals değeri geçersiz"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr "plural= ile verilen ifade geçersiz"
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr "nplurals = %lu..."
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "...ama bazı iletiler tek çoğul biçem içeriyor"
 msgstr[1] "...ama bazı iletiler sadece %lu çoğul biçem içeriyor"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "...ama bazı iletiler tek çoğul biçem içeriyor"
 msgstr[1] "...ama bazı iletiler %lu çoğul biçem içeriyor"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr "Aşağıdakiler %s için geçerli mi bakılacak:\n"
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -1321,111 +1321,111 @@ msgstr ""
 "ileti kataloğu çoğul çeviriler içermesine rağmen başlıkta\n"
 "\"Plural-Forms: nplurals=TAMSAYI; plural=İFADE;\" gibi bir şey yok."
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "`msgid' ve `msgid_plural' girdilerinin her ikisi de '\\n' ile başlamıyor"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' ve `msgstr[%u]' girdilerinin her ikisi de '\\n' ile başlamıyor"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' ve `msgstr' girdilerinin her ikisi de '\\n' ile başlamıyor"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' ve `msgid_plural' girdilerinin her ikisi de '\\n' ile bitmiyor"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' ve `msgstr[%u]' girdilerinin her ikisi de '\\n' ile bitmiyor"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' ve `msgstr' girdilerinin her ikisi de '\\n' ile bitmiyor"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr "çoğul biçemler bir GNU gettext özelliğidir"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr "'%s', 'msgid' gibi geçerli bir %s biçem dizgesi değil"
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "içinde '%c' tuş kısayolu eksik"
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "çok fazla '%c' tuş kısayolu içeriyor"
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "başlıkta `%s' başlık alanı yok\n"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "`%s' başlık alanı satırın başında olmalıydı\n"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 msgid "some header fields still have the initial default value\n"
 msgstr "bazı başlık alanları hala öntanımlı ilk değere sahip\n"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "`%s' başlık alanı hala öntanımlı ilk değere sahip\n"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr "uyarı: PO dosya başlığı ya yok ya da geçersiz\n"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr "uyarı: Kullanıcının karakter kümesinde ileti dönüşümü yapılamayacak.\n"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr "uyarı: PO dosya başlığı fuzzy\n"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "uyarı: msgfmt'ın eski sürümleri bu dosyada hata verecektir.\n"
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "dosya ismi olarak paket ismi \"%s\" uygun değil"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "dosya ismi olarak paket ismi \"%s\" uygun değil: önek kullanılacak"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "`domain %s' yönergesi yoksayıldı"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "boş `msgstr' girdisi yoksayıldı"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "fuzzy `msgstr' girdisi yoksayıldı"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: uyarı: kaynak dosya fuzzy çeviriler içeriyor"
@@ -1671,23 +1671,23 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "%s paketi için Türkçe çeviriler"
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "mevcut karakter kümesi \"%s\" kabul görmüş bir kodlama ismi değil"
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "girdi dosyasında iki farklı karakter kümesi: \"%s\" ve \"%s\""
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "girdi dosyası `%s' başlığında bir karakter kümesi belirtilmemiş."
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -1696,17 +1696,17 @@ msgstr ""
 "\"%s\" paketi girdi dosyası `%s' başlığındaki charset alanında bir karakter\n"
 "kümesi belirtilmemiş"
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "hedef karakter kümesi \"%s\" kabul görmüş bir kodlama ismi değil."
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr "uyarı: "
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
@@ -1714,7 +1714,7 @@ msgstr ""
 "Girdi dosyası UTF-8 ile karışık farklı kodlamalar içeriyor.\n"
 "Çıktı UTF-8'e dönüştürülüyor.\n"
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1783,11 +1783,11 @@ msgstr ""
 msgid "conversion failure"
 msgstr "dönüşüm başarısız"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "girdi dosyasının başlığında bir karakter kümesi belirtilmemiş"
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -1796,7 +1796,7 @@ msgstr ""
 "\"%s\" \"%s\" e dönüştürülemiyor. %s iconv()ye bağlı,\n"
 "ve iconv() bu dönüşümü desteklemiyor."
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2126,13 +2126,13 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<stdÇ>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: uyarı: "
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2141,15 +2141,15 @@ msgstr ""
 "\"%s\" karakter kümesi kabul görmüş bir isim değil.\n"
 "Kullanıcının karakter kümesine dönüşüm yapılamıyabilir.\n"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr "Çözümleme hatalarına rağmen devam ediliyor."
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr "Yine de devam ediliyor."
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2158,7 +2158,7 @@ msgstr ""
 "\"%s\" karakter kümesi desteklenmiyor. %s iconv()ye bağlı.\n"
 "ve iconv() \"%s\" desteği vermiyor.\n"
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2166,12 +2166,12 @@ msgstr ""
 "GNU libiconv paketini kurduktan sonra GNU gettext paketini\n"
 "yeniden kurarak bu sorunun üstesinden gelmelisiniz.\n"
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2180,7 +2180,7 @@ msgstr ""
 "\"%s\" karakter kümesi desteklenmiyor. %s iconv()ye bağlı.\n"
 "Bu sürüm iconv() olmaksızın kurgulanmış.\n"
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2217,43 +2217,43 @@ msgstr "çoğul biçemin indeksi hatalı"
 msgid "too many errors, aborting"
 msgstr "hatalar çok fazla, bunları düzeltince programı tekrar çalıştırın"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "çoklu bayt dizisi geçersiz"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr "dosya sonunda çoklu bayt dizisi tamamlanmadı"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr "satır sonunda çoklu bayt dizisi tamamlanmadı"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr "iconv başarısızlığı"
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" okunurken hata"
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "anahtar-sözcük \"%s\" bilinmiyor"
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "denetim dizisi geçersiz"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "dizge içinde dosya sonu"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "dizge içinde satır sonu"
 
@@ -2318,7 +2318,7 @@ msgstr "Geçerli bir Java sınıfı ismi değil: %s"
 msgid "failed to create \"%s\""
 msgstr "\"%s\" oluşturulamadı"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "\"%s\" dosyasına yazarken hata"
@@ -2334,13 +2334,13 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "\"%s\" yazılmak için açılırken hata"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "i18n iletileri `\\%c' öncelem dizilerini içeremez"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2353,12 +2353,12 @@ msgstr ""
 "olabilir. Salt ASCII msgid kullanmanız önerilir.\n"
 "%s\n"
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "\"%s\" çıktı dosyası oluşturulamıyor"
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "standart çıktı"
@@ -2373,7 +2373,7 @@ msgstr "%s:%d: uyarı: sonlandırılmamış karakter sabiti"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "bu dosya paket yönergelerini içermeyebilir"
 
@@ -2400,17 +2400,17 @@ msgstr "standart çıktıya yazılırken --join-existing kullanılamaz"
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext anahtar sözcükler olmaksızın bulamaz"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "uyarı: `%s' dosyası `%s' uzantısı bilinmiyor; C denenecek"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Belirtilen girdi dosyalarından çevrilebilir dizgeleri çıkartır.\n"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -2419,7 +2419,7 @@ msgstr ""
 "Uzun seçeneklerdeki zorunlu argümanlar kısa seçeneklerde de zorunludur.\n"
 "Benzer durum seçimlik argümanlar içinde geçerlidir.\n"
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2435,7 +2435,7 @@ msgstr ""
 "  -p, --output-dir=DİZİN      çıktı dosyaları DİZİNe konulacaktır.\n"
 "Çıktı dosyası olarak - verilmişse çıktı standart çıktıya yazılır.\n"
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2453,7 +2453,7 @@ msgstr ""
 "  -C, --c++                   --language=C++ için kısaltma\n"
 "Dil öntanımlı olarak girdi dosyasının uzantısına göre seçilir.\n"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2467,7 +2467,7 @@ msgstr ""
 "  -x, --exclude-file=DOSYA.po DOSYA.po dosyasındaki iletiler çıkartılmaz\n"
 "  -c, --add-comments[=ETİTET] ETİKETli yorum bloğunu çıktı dosyasına yazar\n"
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2486,7 +2486,7 @@ msgstr ""
 "      --debug                 biçem dizgesi tanıması ile ilgili daha fazla\n"
 "                              ayrıntı verilir.\n"
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, no-wrap
 msgid ""
 "Output details:\n"
@@ -2531,11 +2531,11 @@ msgstr ""
 "  -M, --msgstr-suffix[=DİZGE] msgstr girdileri için sonek olarak DİZGE ya da\n"
 "                              \"\" kullanılır\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "standart girdi"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -2545,7 +2545,7 @@ msgstr ""
 "gettext(\"\") ile başlık girdilerindeki bilgileri\n"
 "döndürür. Boş dizge değildir.\n"
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "dil `%s' bilinmiyor"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index e9510013d..c86356166 100644
Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ
diff --git a/po/zh_TW.po b/po/zh_TW.po
index dad572ff3..e76558f39 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.1\n"
-"POT-Creation-Date: 2002-04-24 19:27+0200\n"
+"POT-Creation-Date: 2002-07-17 13:52+0200\n"
 "PO-Revision-Date: 2002-04-14 09:16 +0800\n"
 "Last-Translator: Pofeng Lee <pofeng@linux.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -31,8 +31,8 @@ msgid "Valid arguments are:"
 msgstr "¦³®Äªº°Ñ¼Æ¬°¡G"
 
 # lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171 src/urlget.c:204 src/xgettext.c:823 src/xgettext.c:836 src/xgettext.c:846 #, c-format
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "·í¶}±ÒÀɮס§%s¡¨·Ç³ÆŪ¨ú®Éµo¥Í¿ù»~"
@@ -123,11 +123,11 @@ msgstr "%s
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s¡G¿ï¶µ¡¥-W %s¡¦¤£¤¹³\¦³°Ñ¼Æ\n"
 
-#: lib/javacomp.c:440
+#: lib/javacomp.c:462
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "§ä¤£¨ì Java ½sĶ¾¹¡A½Ð¦w¸Ë gcj ©Î¬O³]©w $JAVAC Àô¹ÒÅܼÆ"
 
-#: lib/javaexec.c:379
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "§ä¤£¨ì Java virtual machine¡A½Ð¦w¸Ë gij ©Î¬O³]©w $JAVA Àô¹ÒÅܼÆ"
 
@@ -236,7 +236,7 @@ msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "¡¥msgid¡¦©M¡¥%s¡¦ªº°Ñ¼Æ¡¥%s¡¦ªº®æ¦¡¨Ã¤£¬Û¦P"
 
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234
 #: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
 #: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
 #: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
@@ -251,7 +251,7 @@ msgstr ""
 "³o¬O¦Û¥Ñ³nÅé¡F½Ð°Ñ¦Ò­ì©l½Xªºª©ÅvÁn©ú¡C¥»³nÅ餣´£¨Ñ¥ô¦ó«OÃÒ¡A¬Æ¦Ü¤£·|¥]¬A\n"
 "¥i°â©Ê©M¾A¥Î©ó¥ô¦ó¯S©w¥Øªºªº«OÃÒ¡C\n"
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239
 #: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
 #: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
 #: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
@@ -260,7 +260,7 @@ msgstr ""
 msgid "Written by %s.\n"
 msgstr "¥Ñ %s ½s¼g¡C\n"
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "°Ñ¼Æ¹L¦h"
 
@@ -268,11 +268,11 @@ msgstr "
 msgid "missing arguments"
 msgstr "¯Ê¤Ö¤F°Ñ¼Æ"
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
-#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232
 #: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
 #: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "¸Õ¸Õ¡¥%s --help¡¦¨ÓÀò¨ú§ó¦h¸ê°T¡C\n"
@@ -330,25 +330,25 @@ msgstr ""
 "¦Ó¬O´M§ä°T®§¸ê®ÆÀɸ̽Ķ¹Lªº°T®§¡C\n"
 "¼Ð·Çªº·j´M¥Ø¿ý¬°¡G%s\n"
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
-#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294
 #: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
 #: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "½Ð¦^³ø¿ù»~¦Ü <bug-gnu-gettext@gnu.org>¡C\n"
 
-#: src/hostname.c:206 src/msginit.c:352
+#: src/hostname.c:209 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "¥Îªk¡G%s [¿ï¶µ]\n"
 
-#: src/hostname.c:211
+#: src/hostname.c:214
 #, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr "¦C¦L¥D¾÷ªº¦WºÙ¡C\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:219
 #, no-wrap
 msgid ""
 "Output format:\n"
@@ -362,7 +362,7 @@ msgstr ""
 "  -f, --fqdn, --long    ªøªº¥D¾÷¦WºÙ¡A¥]¬A¥¿¦¡ªººô°ì¦WºÙ¡]FQDN¡^¤Î§O¦W\n"
 "  -i, --ip-address      ¥D¾÷ªº IP ¦a§}\n"
 
-#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308
 #: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
 #: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
@@ -375,7 +375,7 @@ msgstr ""
 "  -h, --help                  Åã¥Ü¦¹¬q»¡©ú¨ÃÂ÷¶}\n"
 "  -V, --version               Åã¥Üª©¥»¸ê°T¨ÃÂ÷¶}\n"
 
-#: src/hostname.c:246 src/hostname.c:253
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr "µLªk¨ú±o¥D¾÷¦WºÙ"
 
@@ -395,7 +395,7 @@ msgstr "
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ©M %s ¨âªÌ¬O¤¬¤£¬Û®eªº"
 
-#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "¥Îªk¡G%s [¿ï¶µ] [¿é¤JÀÉ]\n"
@@ -408,14 +408,14 @@ msgid ""
 msgstr "®Ú¾Ú°T®§ªºÄݩʹLÂo½ĶÀɸ̪ºÂ½Ä¶±ø¥Ø¡A¨Ã³B²z°T®§ªºÄÝ©Ê¡C\n"
 
 #: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
-#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
 #: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
 #: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "ªø¿ï¶µ¥²¶·¥Îªº°Ñ¼Æ¦b¨Ï¥Îµu¿ï¶µ®É¤]¬O¥²¶·ªº¡C\n"
 
-#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
+#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -428,7 +428,7 @@ msgstr ""
 "  -D, --directory=¥Ø¿ý        ¦P®É¦b<¥Ø¿ý>¤¤·j´M¿é¤JÀÉ\n"
 "¦pªG¨S¦³«ü©w¿é¤JÀɩοé¤JÀɬO¡¥-¡¦¡A«hŪ¨ú¼Ð·Ç¿é¤J¡C\n"
 
-#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379
 #: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
@@ -513,7 +513,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "¤£¥i¯à¥X²{ªº¿ï¾Ü±ø¥ó (%d < n <%d)"
 
-#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "¥Îªk¡G%s [¿ï¶µ] [¿é¤JÀÉ]...\n"
@@ -539,7 +539,7 @@ msgstr ""
 "--use-first ¿ï¶µ¡A¨º¼Ë«h·|¥Ñ²Ä¤@­Ó§t¦³¸Ó½Ķ±ø¥ØªºÀɮרú±o¸ê®Æ¡C\n"
 "©Ò¦³ PO Àɤ¤ªºÂ½Ä¶±ø¥ØªºÀɮצì¸m³£·|²Ö¿n¤U¨Ó¡C\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -621,7 +621,7 @@ msgstr ""
 "  -s, --sort-output              ¿é¥X®É¥ý±N¶µ¥Ø±Æ§Ç\n"
 "  -F, --sort-by-file             ®Ú¾ÚÀɮצì¸m¶i¦æ±Æ§Ç\n"
 
-#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -700,17 +700,17 @@ msgstr "
 msgid "warning: this message is not used"
 msgstr "ĵ§i¡G¨S¦³¨Ï¥Î³o­Ó°T®§"
 
-#: src/msgcmp.c:338 src/po-lex.c:699
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "§ä¨ì %d ­ÓÄY­«¿ù»~"
 
-#: src/msgcmp.c:419 src/msgfmt.c:1457 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163
 msgid "duplicate message definition"
 msgstr "­«½Æªº°T®§©w¸q"
 
-#: src/msgcmp.c:420 src/msgfmt.c:1458 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164
 msgid "...this is the location of the first definition"
 msgstr "...³o¬O²Ä¤@¦¸©w¸qªº¦ì¸m"
 
@@ -786,12 +786,12 @@ msgstr ""
 "  -F, --sort-by-file             ®Ú¾ÚÀɮצì¸m¶i¦æ±Æ§Ç\n"
 "      --omit-header              ¤£¼g¤J§t¦³¡¥msgid \"\"¡¦Äæ¦ìªºÀÉÀY\n"
 
-#: src/msgconv.c:257
+#: src/msgconv.c:258
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "±N¤@­Ó½ĶÀɪº½s½XÂà´«¬°¥t¤@ºØ¤å¦r½s½X¡C\n"
 
-#: src/msgconv.c:283
+#: src/msgconv.c:284
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -802,7 +802,7 @@ msgstr ""
 "  -t, --to-code=¦WºÙ          ¿é¥Xªº½s½X\n"
 "¹w³]ªº½s½X¬°¥Ø«e»y¨tªº½s½X¡C\n"
 
-#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -1189,72 +1189,72 @@ msgstr ""
 "      --statistics            ¦C¦L½Ķ±ø¥Øªº²Î­p\n"
 "  -v, --verbose               ¼W¥[¿é¥Xªº¸Ô²Óµ{«×\n"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:766
 msgid "plural expression can produce negative values"
 msgstr "½Æ¼Æªí¥Ü¦¡¥i¯à²£¥Í­t¼Æ"
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:779
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu¡A¦ý½Æ¼Æªí¥Ü¦¡ªº³Ì¤j­È¥i¯àµ¥©ó %lu"
 
-#: src/msgfmt.c:813
+#: src/msgfmt.c:805
 msgid "plural expression can produce division by zero"
 msgstr "½Æ¼Æªí¥Ü¦¡·|¤Þ­P³Q 0 ¾ã°£ªº¿ù»~"
 
-#: src/msgfmt.c:818
+#: src/msgfmt.c:810
 msgid "plural expression can produce integer overflow"
 msgstr "½Æ¼Æªí¥Ü¦¡·|¤Þ­P¾ã¼Æ·¸¦ìªº¿ù»~"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:815
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr "½Æ¼Æªí¥Ü¦¡·|¤Þ­P¹Bºâ¿ù»~¡A¨Ò¦p³Q 0 ¾ã°£"
 
-#: src/msgfmt.c:902 src/msgfmt.c:914
+#: src/msgfmt.c:894 src/msgfmt.c:906
 msgid "message catalog has plural form translations..."
 msgstr "½ĶÀɧt¦³½Æ¼Æ«¬ºAªºÂ½Ä¶..."
 
-#: src/msgfmt.c:905
+#: src/msgfmt.c:897
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...¦ýÀÉÀY¯Ê¤Ö¤F¡§plural=ªí¥Ü¦¡¡¨ªº¶µ¥Ø"
 
-#: src/msgfmt.c:917
+#: src/msgfmt.c:909
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...¦ýÀÉÀY¯Ê¤Ö¤F¡§nplurals=¾ã¼Æ¡¨ªº¶µ¥Ø"
 
-#: src/msgfmt.c:942
+#: src/msgfmt.c:934
 msgid "invalid nplurals value"
 msgstr "µL®Äªº nplurals ­È"
 
-#: src/msgfmt.c:956
+#: src/msgfmt.c:948
 msgid "invalid plural expression"
 msgstr "µL®Äªº½Æ¼Æªí¥Ü¦¡"
 
-#: src/msgfmt.c:975 src/msgfmt.c:990
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
 msgid "nplurals = %lu..."
 msgstr "nplurals = %lu..."
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:970
 #, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "...¦ý¬Y¨Ç°T®§¥u¦³ %lu ºØ½Æ¼Æ«¬ºA"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:985
 #, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "...¦ý¬Y¨Ç°T®§¦³ %lu ºØ½Æ¼Æ«¬ºA"
 
-#: src/msgfmt.c:1023
+#: src/msgfmt.c:1015
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr ""
 
-#: src/msgfmt.c:1036
+#: src/msgfmt.c:1028
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -1262,110 +1262,110 @@ msgstr ""
 "½ĶÀɧt¦³½Æ¼Æ«¬ºAªºÂ½Ä¶¡A¦ý¯Ê¤Ö¤F¥H¤Uªº¼ÐÀYÄæ¦ì¡G\n"
 "¡§Plural-Forms: nplurals=<¾ã¼Æ>; plural=<ªí¥Ü¦¡>;¡¨"
 
-#: src/msgfmt.c:1074
+#: src/msgfmt.c:1066
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' ©M `msgid_plural' Äæ¦ì¨Ã«D¦P®É¥H '\\n' ¶}©l"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1076
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "¡¥msgid¡¦©M¡¥msgstr[%u]¡¦Äæ¦ì¨Ã«D¦P®É¥H¡¥\\n¡¦¶}©l"
 
-#: src/msgfmt.c:1096
+#: src/msgfmt.c:1088
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "¡¥msgid¡¦©M¡¥msgstr¡¦Äæ¦ì¨Ã«D¦P®É¥H¡¥\\n¡¦¶}©l"
 
-#: src/msgfmt.c:1113
+#: src/msgfmt.c:1105
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "¡¥msgid¡¦©M¡¥msgid_plural¡¦Äæ¦ì¨Ã«D¦P®É¥H¡¥\\n¡¦µ²§ô"
 
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1115
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "¡¥msgid¡¦©M¡¥msgstr[%u]¡¦Äæ¦ì¨Ã«D¦P®É¥H¡¥\\n¡¦µ²§ô"
 
-#: src/msgfmt.c:1135
+#: src/msgfmt.c:1127
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "¡¥msgid¡¦©M¡¥msgstr¡¦Äæ¦ì¨Ã«D¦P®É¥H¡¥\\n¡¦µ²§ô"
 
-#: src/msgfmt.c:1147
+#: src/msgfmt.c:1139
 msgid "plural handling is a GNU gettext extension"
 msgstr "½Æ¼Æ³B²z¬O GNU gettext ªºÂX®i¥\¯à"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1204
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr "¤£¹³¡¥msgid¡¦¡A¡¥%s¡¦¤£¬O¦³®Äªº %s ®æ¦¡¦r¦ê"
 
-#: src/msgfmt.c:1250
+#: src/msgfmt.c:1242
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr ¯Ê¤Ö¤F±¶®|Áä¼Ð°O¡¥%c¡¦"
 
-#: src/msgfmt.c:1258
+#: src/msgfmt.c:1250
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr §t¦³¹L¦hªº±¶®|Áä¼Ð°O¡¥%c¡¦"
 
-#: src/msgfmt.c:1293
+#: src/msgfmt.c:1285
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "¯Ê¤Ö¤F¼ÐÀYÄæ¦ì¡¥%s¡¦\n"
 
-#: src/msgfmt.c:1297
+#: src/msgfmt.c:1289
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "¼ÐÀYÄæ¦ì¡¥%s¡¦À³¸Ó¦ì©ó¦æ­º\n"
 
-#: src/msgfmt.c:1308
+#: src/msgfmt.c:1300
 msgid "some header fields still have the initial default value\n"
 msgstr "¬Y¨Ç¼ÐÀYÄæ¦ì¤´µM¬O¹w³]­È\n"
 
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1312
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "¼ÐÀYÄæ¦ì¡¥%s¡¦¤´µM¬O¹w³]­È\n"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr "ĵ§i¡G¯Ê¤Ö¤F PO Àɪº¼ÐÀY©Î¬O®æ¦¡µL®Ä\n"
 
-#: src/msgfmt.c:1365
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr "ĵ§i¡G¦r¤¸¶°Âà´«ªº¥\¯à¤£·|¥Í®Ä\n"
 
-#: src/msgfmt.c:1375
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr "ĵ§i¡GPO Àɪº¼ÐÀY¤´µM¬O¼Ò½kª¬ºA\n"
 
-#: src/msgfmt.c:1377
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "ĵ§i¡G¸ûª©¥»ªº msgfmt ¹J¨ì¦¹Àɮ׮ɷ|¦L¥X¿ù»~°T®§\n"
 
-#: src/msgfmt.c:1402
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "»â°ì¦WºÙ¡§%s¡¨¤£¾A¦X§@¬°ÀɮצWºÙ"
 
-#: src/msgfmt.c:1407
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "»â°ì¦WºÙ¡§%s¡¨¤£¾A¦X§@¬°ÀɮצWºÙ¡G±N¨Ï¥Î¦r­º"
 
-#: src/msgfmt.c:1418
+#: src/msgfmt.c:1410
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "©¿²¤¡¥domain %s¡¦«ü¥O"
 
-#: src/msgfmt.c:1490
+#: src/msgfmt.c:1482
 msgid "empty `msgstr' entry ignored"
 msgstr "©¿²¤ªÅªº¡¥msgstr¡¦Äæ¦ì"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1483
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "©¿²¤¼Ò½kªº¡¥msgstr¡¦Äæ¦ì"
 
-#: src/msgfmt.c:1560
+#: src/msgfmt.c:1552
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s¡Gĵ§i¡G­ì©lÀÉ¥]§t¼Ò½k½Ķ±ø¥Ø"
@@ -1574,47 +1574,47 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "traditional Chinese translation for %s"
 
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
+#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "¥Ø«eªº¦r¤¸¶°½s½X¡§%s¡¨¤£¬O³q¥Îªº½s½X¦WºÙ"
 
-#: src/msgl-cat.c:182 src/msgl-iconv.c:314
+#: src/msgl-cat.c:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "¿é¤JÀɦ³¨âºØ¤£¦Pªº¦r¤¸¶°½s½X¡§%s¡¨©M¡§%s¡¨"
 
-#: src/msgl-cat.c:195
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "¿é¤JÀÉ¡¥%s¡¦¨S¦³«ü©w¦r¤¸¶°ªº¼ÐÀYÄæ¦ì"
 
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:213
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr "¿é¤JÀÉ¡¥%2$s¡¦ªº»â°ì¡§%1$s¡¨¨S¦³«ü©w¦r¤¸¶°ªº¼ÐÀYÄæ¦ì"
 
-#: src/msgl-cat.c:360 src/msgl-iconv.c:390
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "¥Ø¼Ðªº¦r¤¸¶°½s½X¡§%s¡¨¤£¬O³q¥Îªº½s½X¦WºÙ¡C"
 
-#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
+#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876
 msgid "warning: "
 msgstr "ĵ§i¡G"
 
-#: src/msgl-cat.c:411
+#: src/msgl-cat.c:425
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 "¿é¤JÀɧt¦³¤£¦P½s½Xªº°T®§¡A¨ä¤¤¤@ºØ¬O UTF-8¡C·|±N¿é¥Xªº½s½XÂà´«¬° UTF-8¡C\n"
 
-#: src/msgl-cat.c:417
+#: src/msgl-cat.c:431
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -1681,11 +1681,11 @@ msgstr ""
 msgid "conversion failure"
 msgstr "Âà´«¿ù»~"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:351
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "¿é¤JÀɨS¦³«ü©w¦r¤¸¶°ªº¼ÐÀYÄæ¦ì"
 
-#: src/msgl-iconv.c:354
+#: src/msgl-iconv.c:369
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -1694,7 +1694,7 @@ msgstr ""
 "¤£¤ä´©±N¦r¤¸¶°¥Ñ¡§%s¡¨Âà´«¦Ü¡§%s¡¨¡C%s »Ý­n iconv()¡A\n"
 "¦ý iconv() ¤£¤ä´©¦¹ºØÂà´«¤è¦¡¡C"
 
-#: src/msgl-iconv.c:370
+#: src/msgl-iconv.c:385
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2016,13 +2016,13 @@ msgstr ""
 msgid "<stdin>"
 msgstr "<¼Ð·Ç¿é¤J>"
 
-#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
-#: src/po-charset.c:334
+#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311
+#: src/po-charset.c:337
 #, c-format
 msgid "%s: warning: "
 msgstr "%s¡Gĵ§i¡G"
 
-#: src/po-charset.c:223
+#: src/po-charset.c:226
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2031,15 +2031,15 @@ msgstr ""
 "¦r¤¸¶°¡§%s¡¨¤£¬O³q¥Îªº½s½X¦WºÙ¡C\n"
 "Âà´«°T®§¦Ü¨Ï¥ÎªÌ¦r¤¸¶°ªº¥\¯à±N¤£·|¹B§@¡C\n"
 
-#: src/po-charset.c:276 src/po-charset.c:306
+#: src/po-charset.c:279 src/po-charset.c:309
 msgid "Continuing anyway, expect parse errors."
 msgstr "¤´·|Ä~Äò°õ¦æ¡A¦ý¹w­p·|¥X²{¤ÀªR¿ù»~¡C"
 
-#: src/po-charset.c:278
+#: src/po-charset.c:281
 msgid "Continuing anyway."
 msgstr "¤´·|Ä~Äò°õ¦æ¡C"
 
-#: src/po-charset.c:281
+#: src/po-charset.c:284
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2048,18 +2048,18 @@ msgstr ""
 "¤£¤ä´©¦r¤¸¶°¡§%s¡¨¡C%s »Ý­n iconv()¡A\n"
 "¦ý iconv() ¤£¤ä´©¡§%s¡¨¡C\n"
 
-#: src/po-charset.c:290 src/po-charset.c:316
+#: src/po-charset.c:293 src/po-charset.c:319
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr "¥ý¦w¸Ë GNU libiconv¡AµM«á¦A¦w¸Ë GNU gettext¡A±N·|­×¥¿¦¹°ÝÃD¡C\n"
 
-#: src/po-charset.c:295 src/po-charset.c:320
+#: src/po-charset.c:298 src/po-charset.c:323
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: src/po-charset.c:309
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2068,7 +2068,7 @@ msgstr ""
 "¤£¤ä´©¦r¤¸¶°¡§%s¡¨¡C%s »Ý­n iconv()¡A\n"
 "¦ý½sĶ¦¹µ{¦¡®É¨S¦³ iconv() ¤ä´©¡C\n"
 
-#: src/po-charset.c:335
+#: src/po-charset.c:338
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2105,43 +2105,43 @@ msgstr "
 msgid "too many errors, aborting"
 msgstr "¿ù»~¤Ó¦h¡A¥²¶·¤¤Â_§@·~"
 
-#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "µL®Äªº¦h¦r¤¸§Ç¦C"
 
-#: src/po-lex.c:541
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr "ÀÉ®×¥½ºÝ¥X²{¤£§¹¾ãªº¦h¦r¤¸§Ç¦C"
 
-#: src/po-lex.c:551
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr "¦æ¥½¥X²{¤£§¹¾ãªº¦h¦r¤¸§Ç¦C"
 
-#: src/po-lex.c:559
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr "iconv ¥¢±Ñ"
 
-#: src/po-lex.c:757 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
 #: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
 #: src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "Ū¨ú¡§%s¡¨®É¥X²{¿ù»~"
 
-#: src/po-lex.c:823
+#: src/po-lex.c:825
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "¤£©úªºÃöÁä¦r¡§%s¡¨"
 
-#: src/po-lex.c:933
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "µL®Äªº±±¨î§Ç¦C"
 
-#: src/po-lex.c:1041
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "Àɮצb¦r¦ê¤¤¬q¬ðµMµ²§ô"
 
-#: src/po-lex.c:1047
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "¦r¦ê¤¤¶¡¬ðµMÂ_¦æ"
 
@@ -2206,7 +2206,7 @@ msgstr "
 msgid "failed to create \"%s\""
 msgstr "µLªk«Ø¥ß¡§%s¡¨"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "·í¼g¤JÀɮס§%s¡¨®Éµo¥Í¿ù»~"
@@ -2221,13 +2221,13 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "·í¶}±ÒÀɮס§%s¡¨·Ç³Æ¼g¤J®Éµo¥Í¿ù»~"
 
-#: src/write-po.c:402
+#: src/write-po.c:415
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "°ê»Ú¤Æªº°T®§¤£À³§t¦³¡¥\\%c¡¦³o­Ó·¸¥X§Ç¦C¦r¤¸"
 
-#: src/write-po.c:770 src/write-po.c:864
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2240,12 +2240,12 @@ msgstr ""
 "½Ð¦Ò¼{¨Ï¥Î¥u¦³ ASCII ¦r¤¸ªº msgid¡C\n"
 "%s\n"
 
-#: src/write-po.c:931
+#: src/write-po.c:944
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "µLªk«Ø¥ß¿é¥XÀÉ¡§%s¡¨"
 
-#: src/write-po.c:938
+#: src/write-po.c:951
 #, no-c-format
 msgid "standard output"
 msgstr "¼Ð·Ç¿é¥X"
@@ -2260,7 +2260,7 @@ msgstr "%s
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s¡G%d¡Gĵ§i¡G¥¼§¹µ²ªº¦r¦ê"
 
-#: src/x-po.c:106 src/xgettext.c:640
+#: src/x-po.c:106 src/xgettext.c:648
 msgid "this file may not contain domain directives"
 msgstr "¦¹Àɮפ£¯à§t¦³»â°ì«ü¥O"
 
@@ -2287,24 +2287,24 @@ msgstr "
 msgid "xgettext cannot work without keywords to look for"
 msgstr "­YµLÃöÁä¦r¡Axgettext ±NµLªk¹B§@"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:502
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "ĵ§i¡GÀɮס¥%s¡¦ªº°ÆÀɦW¡¥%s¡¦¥¼©ú¡F·|°²³]¬O C ®æ¦¡¨Ó³B²z"
 
-#: src/xgettext.c:539
+#: src/xgettext.c:547
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr "¥Ñ«ü©wªº¿é¤JÀÉ©â¨ú¥i½Ķªº¦r¦ê¡C\n"
 
-#: src/xgettext.c:544
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr "ªø¿ï¶µ¥²­nªº°Ñ¼Æ¦b¨Ï¥Îµu¿ï¶µ®É¤]¬O¥²­nªº¡C¹ï©ó¿ï¾Ü©Êªº°Ñ¼Æ¤]¤@¼Ë¡C\n"
 
-#: src/xgettext.c:559
+#: src/xgettext.c:567
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2318,7 +2318,7 @@ msgstr ""
 "  -o, --output=ÀÉ®×              ±Nµ²ªG¼g¤J¦Ü«ü©wªºÀÉ®×\n"
 "  -p, --output-dir=¥Ø¿ý          ¿é¥XÀÉ·|©ñ¦b«ü©wªº<¥Ø¿ý>\n"
 
-#: src/xgettext.c:568
+#: src/xgettext.c:576
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2337,7 +2337,7 @@ msgstr ""
 "  -C, --c++                      --language=C++ ªºÁY¼g\n"
 "¹w³]ªº»y¨¥¬O¥Ñ¿é¤JÀɪº©µ¦ùÀɦW¨M©wªº¡C\n"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:587
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2347,7 +2347,7 @@ msgid ""
 "                                 preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:588
+#: src/xgettext.c:596
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2364,7 +2364,7 @@ msgstr ""
 "  -T, --trigraphs                ¯d·N¿é¤J¸ê®Æ¤¤ªº ANSI C trigraph\n"
 "      --debug                    ¶i¦æ®æ¦¡¦r¦êÃѧO®ÉÅã¥Ü§ó¸Ô²Óªºµ²ªG\n"
 
-#: src/xgettext.c:598
+#: src/xgettext.c:606
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -2405,11 +2405,11 @@ msgstr ""
 "  -M, --msgstr-suffix[=¦r¦ê]     msgstr ±ø¥Ø¨Ï¥Î<¦r¦ê>§@¬°«á¸m¦r¦ê\n"
 "                                 (¹w³]¬°ªÅ¥Õ¦r¦ê \"\")\n"
 
-#: src/xgettext.c:820
+#: src/xgettext.c:828
 msgid "standard input"
 msgstr "¼Ð·Ç¿é¤J"
 
-#: src/xgettext.c:935
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -2419,7 +2419,7 @@ msgstr ""
 "gettext(\"\") ·|¦^¶ÇÀɮ׶}©l³¡¥÷ªº¸ê°T¡A\n"
 "¨Ã«DªÅ¥Õ¦r¦ê¡C\n"
 
-#: src/xgettext.c:1291
+#: src/xgettext.c:1299
 #, c-format
 msgid "language `%s' unknown"
 msgstr "¤£©úªº»y¨¥¡¥%s¡¦"
diff --git a/projects/Makefile.in b/projects/Makefile.in
index 1ab2c3130..196efe734 100644
--- a/projects/Makefile.in
+++ b/projects/Makefile.in
@@ -61,6 +61,7 @@ AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
 BUILDJAVA = @BUILDJAVA@
+BUILDJAVAEXE = @BUILDJAVAEXE@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -76,10 +77,13 @@ ECHO = @ECHO@
 EMACS = @EMACS@
 EXEEXT = @EXEEXT@
 GCC = @GCC@
+GCJ = @GCJ@
+GCJFLAGS = @GCJFLAGS@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 HAVE_GCJ = @HAVE_GCJ@
+HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
 HAVE_GIJ = @HAVE_GIJ@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
@@ -94,6 +98,7 @@ HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
 HAVE_JVIEW = @HAVE_JVIEW@
 HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
 HAVE_LIB = @HAVE_LIB@
+HAVE__BOOL = @HAVE__BOOL@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -143,6 +148,8 @@ with_gnu_ld = @with_gnu_ld@
 
 AUTOMAKE_OPTIONS = 1.2 gnits
 
+RM = rm -f
+
 projectsdir = $(pkgdatadir)/projects
 
 PROJECTS = TP KDE GNOME
diff --git a/src/Makefile.in b/src/Makefile.in
index 5fa54c4bf..b8c13b42c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -61,6 +61,7 @@ AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
 BUILDJAVA = @BUILDJAVA@
+BUILDJAVAEXE = @BUILDJAVAEXE@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -80,6 +81,7 @@ GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 HAVE_GCJ = @HAVE_GCJ@
+HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
 HAVE_GIJ = @HAVE_GIJ@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
@@ -94,6 +96,7 @@ HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
 HAVE_JVIEW = @HAVE_JVIEW@
 HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
 HAVE_LIB = @HAVE_LIB@
+HAVE__BOOL = @HAVE__BOOL@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -138,11 +141,15 @@ am__quote = @am__quote@
 install_sh = @install_sh@
 lispdir = @lispdir@
 with_gnu_ld = @with_gnu_ld@
+GCJ = @GCJ@
+GCJFLAGS = @GCJFLAGS@
 JAR = @JAR@
 YACC = @YACC@ -d
 
 AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
 
+RM = rm -f
+
 bin_PROGRAMS = gettext ngettext \
 msgcmp msgfmt msgmerge msgunfmt xgettext \
 msgattrib msgcat msgcomm msgconv msgen msgexec msgfilter msggrep msginit msguniq
@@ -172,7 +179,8 @@ projectsdir = $(pkgdatadir)/projects
 INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/libuniname \
 -I../lib -I$(top_srcdir)/lib -I../intl -I$(top_srcdir)/intl
 
-DEFS = -DLOCALEDIR=\"$(localedir)\" -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \
+DEFS = -DLOCALEDIR=\"$(localedir)\" -DUSEJEXE=$(USEJEXE) \
+-DGETTEXTJEXEDIR=\"$(pkglibdir)\" -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \
 -DLIBDIR=\"$(libdir)\" -DGETTEXTDATADIR=\"$(pkgdatadir)\" \
 -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@
 
@@ -271,7 +279,15 @@ BUILT_SOURCES = po-gram-gen.c po-hash-gen.c po-gram-gen.h po-hash-gen.h
 
 DISTCLEANFILES = po-gram-gen2.h user-email
 
-CLEANFILES = gettext.jar gnu/gettext/*.class
+
+# Special rules for Java compilation.
+USEJEXE = $(USEJEXE_@BUILDJAVAEXE@)
+USEJEXE_yes = 1
+USEJEXE_no = 0
+
+CLEANFILES = gnu.gettext.DumpResource$(EXEEXT) gnu.gettext.GetURL$(EXEEXT) \
+             gettext.jar gnu/gettext/*.class
+
 subdir = src
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -714,6 +730,11 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
 	uninstall-libLTLIBRARIES uninstall-local
 
 
+# No need to install libgettextsrc.a.
+install-exec-am: install-exec-clean
+install-exec-clean:
+	$(RM) $(DESTDIR)$(libdir)/libgettextsrc.a
+
 po-lex.o po-lex.lo: po-gram-gen2.h
 po-gram-gen2.h: po-gram-gen.h
 	$(SED) 's/[yY][yY]/po_gram_/g' $(srcdir)/po-gram-gen.h > $@-tmp
@@ -741,11 +762,17 @@ uninstall-local:
 	$(RM) $(DESTDIR)$(libdir)/$(PACKAGE)/user-email
 	$(RM) $(DESTDIR)$(libdir)/$(PACKAGE)/project-id
 
-# Special rules for Java compilation.
+all-local: all-java-@BUILDJAVAEXE@
+all-java-yes: gnu.gettext.DumpResource$(EXEEXT) gnu.gettext.GetURL$(EXEEXT)
+all-java-no: all-java-no-@BUILDJAVA@
+all-java-no-yes: gettext.jar
+all-java-no-no:
+
+gnu.gettext.DumpResource$(EXEEXT): $(srcdir)/gnu/gettext/DumpResource.java
+	$(GCJ) $(GCJFLAGS) $(srcdir)/gnu/gettext/DumpResource.java --main=gnu.gettext.DumpResource -o $@
 
-all-local: all-java-@BUILDJAVA@
-all-java-no:
-all-java-yes: gettext.jar
+gnu.gettext.GetURL$(EXEEXT): $(srcdir)/gnu/gettext/GetURL.java
+	$(GCJ) $(GCJFLAGS) $(srcdir)/gnu/gettext/GetURL.java --main=gnu.gettext.GetURL -o $@
 
 gnu/gettext/DumpResource.class: $(srcdir)/gnu/gettext/DumpResource.java
 	$(JAVACOMP) -d . $(srcdir)/gnu/gettext/DumpResource.java
@@ -756,20 +783,36 @@ gnu/gettext/GetURL.class: $(srcdir)/gnu/gettext/GetURL.java
 gettext.jar: gnu/gettext/DumpResource.class gnu/gettext/GetURL.class
 	$(JAR) cf $@ gnu/gettext/DumpResource*.class gnu/gettext/GetURL*.class
 
-install-data-local: install-java-@BUILDJAVA@
-install-java-no:
-install-java-yes: all-java-yes
+install-exec-local: install-exec-java-@BUILDJAVAEXE@
+install-exec-java-yes: all-java-yes
+	$(mkinstalldirs) $(DESTDIR)$(libdir)/$(PACKAGE)
+	$(INSTALL_PROGRAM) gnu.gettext.DumpResource$(EXEEXT) $(DESTDIR)$(libdir)/$(PACKAGE)/gnu.gettext.DumpResource$(EXEEXT)
+	$(INSTALL_PROGRAM) gnu.gettext.GetURL$(EXEEXT) $(DESTDIR)$(libdir)/$(PACKAGE)/gnu.gettext.GetURL$(EXEEXT)
+install-exec-java-no:
+
+install-data-local: install-data-java-@BUILDJAVAEXE@
+install-data-java-yes:
+install-data-java-no: install-data-java-no-@BUILDJAVA@
+install-data-java-no-yes: all-java-no-yes
 	$(INSTALL_DATA) gettext.jar $(DESTDIR)$(jardir)/gettext.jar
+install-data-java-no-no:
 
-installdirs-local: installdirs-java-@BUILDJAVA@
-installdirs-java-no:
+installdirs-local: installdirs-java-@BUILDJAVAEXE@
 installdirs-java-yes:
+	$(mkinstalldirs) $(DESTDIR)$(libdir)/$(PACKAGE)
+installdirs-java-no: installdirs-java-no-@BUILDJAVA@
+installdirs-java-no-yes:
 	$(mkinstalldirs) $(DESTDIR)$(jardir)
+installdirs-java-no-no:
 
-uninstall-local: uninstall-java-@BUILDJAVA@
-uninstall-java-no:
+uninstall-local: uninstall-java-@BUILDJAVAEXE@
 uninstall-java-yes:
+	$(RM) $(DESTDIR)$(libdir)/$(PACKAGE)/gnu.gettext.DumpResource$(EXEEXT)
+	$(RM) $(DESTDIR)$(libdir)/$(PACKAGE)/gnu.gettext.GetURL$(EXEEXT)
+uninstall-java-no: uninstall-java-no-@BUILDJAVA@
+uninstall-java-no-yes:
 	$(RM) $(DESTDIR)$(jardir)/gettext.jar
+uninstall-java-no-no:
 
 # Special rules for Tcl auxiliary program.
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 3696b6523..ce8cfd6a1 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -61,6 +61,7 @@ AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
 BUILDJAVA = @BUILDJAVA@
+BUILDJAVAEXE = @BUILDJAVAEXE@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -76,10 +77,13 @@ ECHO = @ECHO@
 EMACS = @EMACS@
 EXEEXT = @EXEEXT@
 GCC = @GCC@
+GCJ = @GCJ@
+GCJFLAGS = @GCJFLAGS@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 HAVE_GCJ = @HAVE_GCJ@
+HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
 HAVE_GIJ = @HAVE_GIJ@
 HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
@@ -94,6 +98,7 @@ HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
 HAVE_JVIEW = @HAVE_JVIEW@
 HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
 HAVE_LIB = @HAVE_LIB@
+HAVE__BOOL = @HAVE__BOOL@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -158,7 +163,7 @@ TESTS = gettext-1 gettext-2 \
 	msgexec-1 msgexec-2 \
 	msgfilter-1 msgfilter-2 \
 	msgfmt-1 msgfmt-2 msgfmt-3 msgfmt-4 msgfmt-5 msgfmt-6 msgfmt-7 \
-	msgfmt-8 msgfmt-9 msgfmt-10 \
+	msgfmt-8 msgfmt-9 msgfmt-10 msgfmt-11 \
 	msggrep-1 msggrep-2 msggrep-3 msggrep-4 msggrep-5 \
 	msgmerge-1 msgmerge-2 msgmerge-3 msgmerge-4 msgmerge-5 msgmerge-6 \
 	msgmerge-7 msgmerge-8 msgmerge-9 msgmerge-10 msgmerge-11 msgmerge-12 \
@@ -186,7 +191,15 @@ TESTS = gettext-1 gettext-2 \
 	rpath-2aaa rpath-2aab rpath-2aac rpath-2aad \
 	rpath-2aba rpath-2abb rpath-2abc rpath-2abd \
 	rpath-2baa rpath-2bab rpath-2bac rpath-2bad \
-	rpath-2bba rpath-2bbb rpath-2bbc rpath-2bbd
+	rpath-2bba rpath-2bbb rpath-2bbc rpath-2bbd \
+	rpath-3aaa rpath-3aab rpath-3aac rpath-3aad \
+	           rpath-3aaf            rpath-3aah \
+	rpath-3aba rpath-3abb rpath-3abc rpath-3abd \
+	           rpath-3abf            rpath-3abh \
+	rpath-3baa rpath-3bab rpath-3bac rpath-3bad \
+	rpath-3bae rpath-3baf rpath-3bag rpath-3bah \
+	rpath-3bba rpath-3bbb rpath-3bbc rpath-3bbd \
+	rpath-3bbe rpath-3bbf rpath-3bbg rpath-3bbh
 
 
 EXTRA_DIST = $(TESTS) \
@@ -195,13 +208,21 @@ EXTRA_DIST = $(TESTS) \
 	rpathx/Makefile.am rpathx/Makefile.in rpathx/rpathx.c \
 	rpathy/configure.in rpathy/aclocal.m4 rpathy/configure \
 	rpathy/Makefile.am rpathy/Makefile.in rpathy/rpathy.c \
+	rpathz/configure.in rpathz/aclocal.m4 rpathz/configure \
+	rpathz/Makefile.am rpathz/Makefile.in rpathz/rpathz.c \
 	rpathlx/configure.in rpathlx/aclocal.m4 rpathlx/configure \
 	rpathlx/Makefile.am rpathlx/Makefile.in rpathlx/usex.c \
 	rpathly/configure.in rpathly/aclocal.m4 rpathly/configure \
 	rpathly/Makefile.am rpathly/Makefile.in rpathly/usey.c \
 	rpathlyx/configure.in rpathlyx/aclocal.m4 rpathlyx/configure \
 	rpathlyx/Makefile.am rpathlyx/Makefile.in rpathlyx/usey.c \
-	rpath-1 rpath-2_a rpath-2_b rpath-2.README rpathcfg.sh
+	rpathlz/configure.in rpathlz/aclocal.m4 rpathlz/configure \
+	rpathlz/Makefile.am rpathlz/Makefile.in rpathlz/usez.c \
+	rpathlzyx/configure.in rpathlzyx/aclocal.m4 rpathlzyx/configure \
+	rpathlzyx/Makefile.am rpathlzyx/Makefile.in rpathlzyx/usez.c \
+	rpath-1 rpath-2_a rpath-2_b rpath-3_a rpath-3_b rpath.README \
+	rpath-3aae rpath-3aag rpath-3abe rpath-3abg \
+	rpathcfg.sh
 
 
 XGETTEXT = ../src/xgettext
@@ -427,7 +448,7 @@ top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	$(mkinstalldirs) $(distdir)/rpathlx $(distdir)/rpathly $(distdir)/rpathlyx $(distdir)/rpathx $(distdir)/rpathy
+	$(mkinstalldirs) $(distdir)/rpathlx $(distdir)/rpathly $(distdir)/rpathlyx $(distdir)/rpathlz $(distdir)/rpathlzyx $(distdir)/rpathx $(distdir)/rpathy $(distdir)/rpathz
 	@for file in $(DISTFILES); do \
 	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
diff --git a/tests/rpathlx/Makefile.in b/tests/rpathlx/Makefile.in
index 5ddb0146e..177ac99ad 100644
--- a/tests/rpathlx/Makefile.in
+++ b/tests/rpathlx/Makefile.in
@@ -55,8 +55,24 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+AMTAR = @AMTAR@
+AWK = @AWK@
 CC = @CC@
+DEPDIR = @DEPDIR@
+EXEEXT = @EXEEXT@
+HAVE_LIB = @HAVE_LIB@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIB = @LIB@
+LTLIB = @LTLIB@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+am__include = @am__include@
+am__quote = @am__quote@
 global_top_srcdir = @global_top_srcdir@
+install_sh = @install_sh@
 
 AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies
 mkinstalldirs = $(SHELL) @global_top_srcdir@/mkinstalldirs
@@ -64,6 +80,7 @@ bin_PROGRAMS = usex
 usex_SOURCES = usex.c
 LDADD = @LIBRPATHX@
 subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 CONFIG_CLEAN_FILES =
 bin_PROGRAMS = usex$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
@@ -86,8 +103,9 @@ CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 CFLAGS = @CFLAGS@
 DIST_SOURCES = $(usex_SOURCES)
-DIST_COMMON = ../../install-sh ../../missing ../../mkinstalldirs \
-	Makefile.am Makefile.in configure configure.in
+DIST_COMMON = ../../config.guess ../../config.sub ../../install-sh \
+	../../missing ../../mkinstalldirs Makefile.am Makefile.in \
+	aclocal.m4 configure configure.in
 SOURCES = $(usex_SOURCES)
 
 all: all-am
@@ -106,6 +124,9 @@ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 $(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
+
+$(ACLOCAL_M4):  configure.in 
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
diff --git a/tests/rpathlx/aclocal.m4 b/tests/rpathlx/aclocal.m4
index 0494463ac..297583801 100644
--- a/tests/rpathlx/aclocal.m4
+++ b/tests/rpathlx/aclocal.m4
@@ -491,7 +491,7 @@ else
   $1_FALSE=
 fi])
 
-# lib-link.m4 serial 2 (gettext-0.11.2)
+# lib-link.m4 serial 3 (gettext-0.11.3)
 dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -609,6 +609,10 @@ AC_DEFUN([AC_LIB_RPATH],
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
   sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
   sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE(rpath,
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
 ])
 
 dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
@@ -738,7 +742,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
               dnl Linking with a shared library. We attempt to hardcode its
               dnl directory into the executable's runpath, unless it's the
               dnl standard /usr/lib.
-              if test "X$found_dir" = "X/usr/lib"; then
+              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
                 dnl No hardcoding is needed.
                 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
               else
@@ -929,29 +933,31 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                     ;;
                   -R*)
                     dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $dir"
-                    fi
-                    dnl Potentially add DIR to ltrpathdirs.
-                    dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                    haveit=
-                    for x in $ltrpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      ltrpathdirs="$ltrpathdirs $dir"
                     fi
                     ;;
                   -l*)
diff --git a/tests/rpathlx/configure b/tests/rpathlx/configure
index f8d1a4bc6..09e5dfc03 100755
--- a/tests/rpathlx/configure
+++ b/tests/rpathlx/configure
@@ -1,34 +1,119 @@
 #! /bin/sh
-
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Generated by Autoconf 2.52.
 #
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
-# Defaults:
-ac_help=
+# 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
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+# NLS nuisances.
+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+exec 6>&1
+
+#
+# Initializations.
+#
 ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --disable-dependency-tracking Speeds up one-time builds
-  --enable-dependency-tracking  Do not reject slow dependency extractors"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-ac_help="$ac_help
-  --with-librpathx-prefix[=DIR]  search for librpathx in DIR/include and DIR/lib
-  --without-librpathx-prefix     don't search for librpathx in includedir and libdir"
+cross_compiling=no
+subdirs=
+MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete.  It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
+
+ac_unique_file="configure.in"
 
 # Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
 # The variables have the same names as the options, with
 # dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
+cache_file=/dev/null
 exec_prefix=NONE
-host=NONE
 no_create=
-nonopt=NONE
 no_recursion=
 prefix=NONE
 program_prefix=NONE
@@ -37,10 +122,15 @@ program_transform_name=s,x,x,
 silent=
 site=
 srcdir=
-target=NONE
 verbose=
 x_includes=NONE
 x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
@@ -54,17 +144,16 @@ oldincludedir='/usr/include'
 infodir='${prefix}/info'
 mandir='${prefix}/man'
 
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
+# Identity of this package.
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
 
 ac_prev=
 for ac_option
 do
-
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
     eval "$ac_prev=\$ac_option"
@@ -72,59 +161,59 @@ do
     continue
   fi
 
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case "$ac_option" in
+  case $ac_option in
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
   -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
+    bindir=$ac_optarg ;;
 
   -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
+    ac_prev=build_alias ;;
   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
+    build_alias=$ac_optarg ;;
 
   -cache-file | --cache-file | --cache-fil | --cache-fi \
   | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
     ac_prev=cache_file ;;
   -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
   | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
 
   -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
     ac_prev=datadir ;;
   -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
   | --da=*)
-    datadir="$ac_optarg" ;;
+    datadir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
+    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'`
+    eval "enable_$ac_feature=no" ;;
 
   -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
+    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'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
+    eval "enable_$ac_feature='$ac_optarg'" ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -133,95 +222,47 @@ do
   -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
   | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
   | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
+    exec_prefix=$ac_optarg ;;
 
   -gas | --gas | --ga | --g)
     # Obsolete; use --with-gas.
     with_gas=yes ;;
 
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
 
   -host | --host | --hos | --ho)
-    ac_prev=host ;;
+    ac_prev=host_alias ;;
   -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
+    host_alias=$ac_optarg ;;
 
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
   -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
   | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
+    includedir=$ac_optarg ;;
 
   -infodir | --infodir | --infodi | --infod | --info | --inf)
     ac_prev=infodir ;;
   -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
+    infodir=$ac_optarg ;;
 
   -libdir | --libdir | --libdi | --libd)
     ac_prev=libdir ;;
   -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
+    libdir=$ac_optarg ;;
 
   -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
   | --libexe | --libex | --libe)
     ac_prev=libexecdir ;;
   -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
   | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
+    libexecdir=$ac_optarg ;;
 
   -localstatedir | --localstatedir | --localstatedi | --localstated \
   | --localstate | --localstat | --localsta | --localst \
@@ -230,12 +271,12 @@ EOF
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
   | --localstate=* | --localstat=* | --localsta=* | --localst=* \
   | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
+    localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
     ac_prev=mandir ;;
   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
+    mandir=$ac_optarg ;;
 
   -nfp | --nfp | --nf)
     # Obsolete; use --without-fp.
@@ -256,26 +297,26 @@ EOF
   -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
   | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
   | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
+    oldincludedir=$ac_optarg ;;
 
   -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
     ac_prev=prefix ;;
   -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
+    prefix=$ac_optarg ;;
 
   -program-prefix | --program-prefix | --program-prefi | --program-pref \
   | --program-pre | --program-pr | --program-p)
     ac_prev=program_prefix ;;
   -program-prefix=* | --program-prefix=* | --program-prefi=* \
   | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
+    program_prefix=$ac_optarg ;;
 
   -program-suffix | --program-suffix | --program-suffi | --program-suff \
   | --program-suf | --program-su | --program-s)
     ac_prev=program_suffix ;;
   -program-suffix=* | --program-suffix=* | --program-suffi=* \
   | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
+    program_suffix=$ac_optarg ;;
 
   -program-transform-name | --program-transform-name \
   | --program-transform-nam | --program-transform-na \
@@ -292,7 +333,7 @@ EOF
   | --program-transfo=* | --program-transf=* \
   | --program-trans=* | --program-tran=* \
   | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
+    program_transform_name=$ac_optarg ;;
 
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
@@ -302,7 +343,7 @@ EOF
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
   | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
+    sbindir=$ac_optarg ;;
 
   -sharedstatedir | --sharedstatedir | --sharedstatedi \
   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
@@ -313,58 +354,57 @@ EOF
   | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
   | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
   | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
+    sharedstatedir=$ac_optarg ;;
 
   -site | --site | --sit)
     ac_prev=site ;;
   -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
+    site=$ac_optarg ;;
 
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
+    srcdir=$ac_optarg ;;
 
   -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
   | --syscon | --sysco | --sysc | --sys | --sy)
     ac_prev=sysconfdir ;;
   -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
   | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
+    sysconfdir=$ac_optarg ;;
 
   -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
+    ac_prev=target_alias ;;
   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
+    target_alias=$ac_optarg ;;
 
   -v | -verbose | --verbose | --verbos | --verbo | --verb)
     verbose=yes ;;
 
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
+    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'`
-    case "$ac_option" in
-      *=*) ;;
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
+    eval "with_$ac_package='$ac_optarg'" ;;
 
   -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
+    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'`
+    eval "with_$ac_package=no" ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -375,98 +415,98 @@ EOF
     ac_prev=x_includes ;;
   -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
   | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
+    x_includes=$ac_optarg ;;
 
   -x-libraries | --x-libraries | --x-librarie | --x-librari \
   | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
     ac_prev=x_libraries ;;
   -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
+    x_libraries=$ac_optarg ;;
 
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
     ;;
 
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    eval "$ac_envvar='$ac_optarg'"
+    export $ac_envvar ;;
+
   *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
+    # FIXME: should be removed in autoconf 3.0.
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    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}
     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  { echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
 fi
 
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
+# 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
 
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+              localstatedir libdir includedir oldincludedir infodir mandir
 do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* ) ;;
+    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
   esac
 done
 
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: should be removed in autoconf 3.0.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
 
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
 
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=configure.in
+test "$silent" = yes && exec 6>/dev/null
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then its parent.
   ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+  ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
   test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir
   if test ! -r $srcdir/$ac_unique_file; then
@@ -477,13 +517,313 @@ else
 fi
 if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
+   { (exit 1); exit 1; }; }
   else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources in $srcdir" >&2
+   { (exit 1); exit 1; }; }
   fi
 fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<EOF
+\`configure' configures this package to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+EOF
+
+  cat <<EOF
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
+EOF
+
+  cat <<\EOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       build programs to run on HOST [BUILD]
+EOF
+fi
+
+if test -n "$ac_init_help"; then
+
+  cat <<\EOF
+
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-dependency-tracking Speeds up one-time builds
+  --enable-dependency-tracking  Do not reject slow dependency extractors
+  --disable-rpath         do not hardcode runtime library paths
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-gnu-ld           assume the C compiler uses GNU ld default=no
+  --with-librpathx-prefix=DIR  search for librpathx in DIR/include and DIR/lib
+  --without-librpathx-prefix     don't search for librpathx in includedir and libdir
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+              headers in a nonstandard directory <include dir>
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+EOF
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  ac_popdir=`pwd`
+  for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
+    cd $ac_subdir
+    # A "../" for each directory in /$ac_subdir.
+    ac_dots=`echo $ac_subdir |
+             sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
+
+    case $srcdir in
+    .) # No --srcdir option.  We are building in place.
+      ac_sub_srcdir=$srcdir ;;
+    [\\/]* | ?:[\\/]* ) # Absolute path.
+      ac_sub_srcdir=$srcdir/$ac_subdir ;;
+    *) # Relative path.
+      ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
+    esac
 
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_sub_srcdir/configure.gnu; then
+      echo
+      $SHELL $ac_sub_srcdir/configure.gnu  --help=recursive
+    elif test -f $ac_sub_srcdir/configure; then
+      echo
+      $SHELL $ac_sub_srcdir/configure  --help=recursive
+    elif test -f $ac_sub_srcdir/configure.ac ||
+           test -f $ac_sub_srcdir/configure.in; then
+      echo
+      $ac_configure --help
+    else
+      echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
+    fi
+    cd $ac_popdir
+  done
+fi
+
+test -n "$ac_init_help" && exit 0
+if $ac_init_version; then
+  cat <<\EOF
+
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+EOF
+  exit 0
+fi
+exec 5>config.log
+cat >&5 <<EOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by $as_me, which was
+generated by GNU Autoconf 2.52.  Invocation command line was
+
+  $ $0 $@
+
+EOF
+{
+cat <<_ASUNAME
+## ---------- ##
+## Platform.  ##
+## ---------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+PATH = $PATH
+
+_ASUNAME
+} >&5
+
+cat >&5 <<EOF
+## ------------ ##
+## Core tests.  ##
+## ------------ ##
+
+EOF
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell meta-characters.
+ac_configure_args=
+ac_sep=
+for ac_arg
+do
+  case $ac_arg in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c) ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
+    ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+    ac_sep=" " ;;
+  *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg"
+     ac_sep=" " ;;
+  esac
+  # Get rid of the leading space.
+done
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  echo >&5
+  echo "## ----------------- ##" >&5
+  echo "## Cache variables.  ##" >&5
+  echo "## ----------------- ##" >&5
+  echo >&5
+  # The following way of writing the cache mishandles newlines in values,
+{
+  (set) 2>&1 |
+    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      sed -n \
+        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+      ;;
+    *)
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} >&5
+  sed "/^$/d" confdefs.h >conftest.log
+  if test -s conftest.log; then
+    echo >&5
+    echo "## ------------ ##" >&5
+    echo "## confdefs.h.  ##" >&5
+    echo "## ------------ ##" >&5
+    echo >&5
+    cat conftest.log >&5
+  fi
+  (echo; echo) >&5
+  test "$ac_signal" != 0 &&
+    echo "$as_me: caught signal $ac_signal" >&5
+  echo "$as_me: exit $exit_status" >&5
+  rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files &&
+    exit $exit_status
+     ' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
+
+# Let the site file select an alternate cache file if it wants to.
 # Prefer explicitly selected file to automatically selected ones.
 if test -z "$CONFIG_SITE"; then
   if test "x$prefix" != xNONE; then
@@ -494,40 +834,107 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
+    { echo "$as_me:837: 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"
   fi
 done
 
 if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
+  # 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:848: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . $cache_file;;
+      *)                      . ./$cache_file;;
+    esac
+  fi
 else
-  echo "creating cache $cache_file"
-  > $cache_file
+  { echo "$as_me:856: 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.
+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
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+  eval ac_new_val="\$ac_env_${ac_var}_value"
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { echo "$as_me:872: 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)
+      { echo "$as_me:876: 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
+        { echo "$as_me:882: 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:884:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+        { echo "$as_me:886:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+        ac_cache_corrupted=:
+      fi;;
+  esac
+  # Pass precious variables to config.status.  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
+if $ac_cache_corrupted; then
+  { echo "$as_me:905: 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:907: 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
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
+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
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)      ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+echo "#! $SHELL" >conftest.sh
+echo  "exit 0"   >>conftest.sh
+chmod +x conftest.sh
+if { (echo "$as_me:927: PATH=\".;.\"; conftest.sh") >&5
+  (PATH=".;."; conftest.sh) 2>&5
+  ac_status=$?
+  echo "$as_me:930: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  ac_path_separator=';'
 else
-  ac_n= ac_c='\c' ac_t=
+  ac_path_separator=:
 fi
-
+PATH_SEPARATOR="$ac_path_separator"
+rm -f conftest.sh
 
 ac_aux_dir=
 for ac_dir in $global_top_srcdir ../..; do
@@ -539,18 +946,20 @@ for ac_dir in $global_top_srcdir ../..; do
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
+  elif test -f $ac_dir/shtool; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $global_top_srcdir ../.." 1>&2; exit 1; }
+  { { echo "$as_me:956: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -559,31 +968,39 @@ am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:568: checking for a BSD compatible install" >&5
+echo "$as_me:976: 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 eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${ac_cv_path_install+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+    ac_save_IFS=$IFS; IFS=$ac_path_separator
   for ac_dir in $PATH; do
+    IFS=$ac_save_IFS
     # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    case $ac_dir/ in
+    / | ./ | .// | /cC/* \
+    | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
+    | /usr/ucb/* ) ;;
     *)
       # OSF1 and SCO ODT 3.0 have their own names for install.
       # Don't use installbsd from OSF since it installs stuff as root
       # by default.
       for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
+        if $as_executable_p "$ac_dir/$ac_prog"; then
 	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+            grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
 	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
 	  else
 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
 	    break 2
@@ -593,31 +1010,31 @@ else
       ;;
     esac
   done
-  IFS="$ac_save_IFS"
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
+    INSTALL=$ac_cv_path_install
   else
     # As a last resort, use the slow shell script.  We don't cache a
     # path for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
+    INSTALL=$ac_install_sh
   fi
 fi
-echo "$ac_t""$INSTALL" 1>&6
+echo "$as_me:1025: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:621: checking whether build environment is sane" >&5
+echo "$as_me:1036: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -640,8 +1057,11 @@ 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".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
+      { { echo "$as_me:1060: 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;}
+   { (exit 1); exit 1; }; }
    fi
 
    test "$2" = conftest.file
@@ -650,28 +1070,29 @@ then
    # Ok.
    :
 else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
+   { { echo "$as_me:1073: 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
+echo "$as_me:1079: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 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 &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+  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
 
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
 
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
@@ -680,82 +1101,86 @@ if eval "$MISSING --run true"; then
 else
   am_missing_run=
   am_backtick='`'
-  echo "configure: warning: ${am_backtick}missing' script is too old or missing" 1>&2
+  { echo "$as_me:1104: WARNING: ${am_backtick}missing' script is too old or missing" >&5
+echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;}
 fi
 
 for ac_prog in mawk gawk nawk awk
 do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:692: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1112: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AWK+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AWK="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_AWK="$ac_prog"
+echo "$as_me:1127: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-AWK="$ac_cv_prog_AWK"
+AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$ac_t""$AWK" 1>&6
+  echo "$as_me:1135: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1138: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-test -n "$AWK" && break
+  test -n "$AWK" && break
 done
 
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:722: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1145: 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 "(cached) $ECHO_C" >&6
 else
-  cat > conftestmake <<\EOF
+  cat >conftest.make <<\EOF
 all:
 	@echo 'ac_maketemp="${MAKE}"'
 EOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
 if test -n "$ac_maketemp"; then
   eval ac_cv_prog_make_${ac_make}_set=yes
 else
   eval ac_cv_prog_make_${ac_make}_set=no
 fi
-rm -f conftestmake
+rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+  echo "$as_me:1165: result: yes" >&5
+echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1169: result: no" >&5
+echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 # Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
 if test "${enable_dependency_tracking+set}" = set; then
   enableval="$enable_dependency_tracking"
-  :
-fi
 
+fi;
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
 fi
 
-
 if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
@@ -764,9 +1189,6 @@ else
   AMDEP_FALSE=
 fi
 
-
-
-
 rm -f .deps 2>/dev/null
 mkdir .deps 2>/dev/null
 if test -d .deps; then
@@ -777,25 +1199,26 @@ else
 fi
 rmdir .deps 2>/dev/null
 
-
 # test to see if srcdir already configured
 if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run \"make distclean\" there first" 1>&2; exit 1; }
+  { { echo "$as_me:1205: 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
 
 # Define the identity of the package.
-PACKAGE=gexttext_rpathlx
+PACKAGE=gettext_rpathlx
 VERSION=0
-cat >> confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
 
-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define VERSION "$VERSION"
 EOF
 
-
 # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
 # the ones we care about.
 
@@ -807,24 +1230,18 @@ EOF
 # requests that it be used.  This is a bit dumb.
 : ${OBJEXT=o}
 
-
 # Some tools Automake needs.
 
 ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"}
 
-
 AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
 
-
 AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"}
 
-
 AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
-
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-
 AMTAR=${AMTAR-"${am_missing_run}tar"}
 
 install_sh=${install_sh-"$am_aux_dir/install-sh"}
@@ -834,214 +1251,578 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 
-# Extract the first word of "gcc", so it can be a program name with args.
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+echo "$as_me:1262: 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
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1277: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:1285: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:1288: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:841: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1297: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="gcc"
+echo "$as_me:1312: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1320: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1323: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+echo "$as_me:1336: 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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1351: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1359: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1362: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
+fi
+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
+echo "$as_me:1371: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="cc"
+echo "$as_me:1386: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1394: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1397: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:871: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1410: 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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+  ac_prog_rejected=yes
+  continue
+fi
+ac_cv_prog_CC="cc"
+echo "$as_me:1430: found $ac_dir/$ac_word" >&5
+break
+done
+
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
   set dummy $ac_cv_prog_CC
   shift
-  if test $# -gt 0; then
+  if test $# != 0; then
     # We chose a different compiler from the bogus one.
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
-    set dummy "$ac_dir/$ac_word" "$@"
+    set dummy "$ac_dir/$ac_word" ${1+"$@"}
     shift
     ac_cv_prog_CC="$@"
   fi
 fi
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1452: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1455: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:922: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl
+  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:1466: 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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1481: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1489: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1492: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+
+    test -n "$CC" && break
+  done
 fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl
+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:1505: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1520: found $ac_dir/$ac_word" >&5
+break
+done
 
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:954: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1528: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1531: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
 
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+  test -n "$ac_ct_CC" && break
+done
 
-cat > conftest.$ac_ext << EOF
+  CC=$ac_ct_CC
+fi
+
+fi
 
-#line 965 "configure"
+test -z "$CC" && { { echo "$as_me:1543: error: no acceptable cc found in \$PATH" >&5
+echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+
+# Provide some information about the compiler.
+echo "$as_me:1548:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:1551: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1554: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1556: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1559: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1561: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1564: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 1568 "configure"
 #include "confdefs.h"
 
-main(){return(0);}
-EOF
-if { (eval echo configure:970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_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.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+echo "$as_me:1584: 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[^ ]*//'`
+if { (eval echo "$as_me:1587: \"$ac_link_default\"") >&5
+  (eval $ac_link_default) 2>&5
+  ac_status=$?
+  echo "$as_me:1590: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # 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" : '[^.]*\(\..*\)'`
+          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
+          export ac_cv_exeext
+          break;;
+    * ) break;;
+  esac
+done
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:1613: 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:1619: 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 "$as_me:1624: 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'
+  { (eval echo "$as_me:1630: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1633: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no
   else
-    ac_cv_prog_cc_cross=yes
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { echo "$as_me:1640: 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;}
+   { (exit 1); exit 1; }; }
+    fi
   fi
+fi
+echo "$as_me:1648: 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 "$as_me:1655: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+echo "$as_me:1657: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6
+
+echo "$as_me:1660: checking for executable suffix" >&5
+echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+if { (eval echo "$as_me:1662: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:1665: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
+  case $ac_file in
+    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+          export ac_cv_exeext
+          break;;
+    * ) break;;
+  esac
+done
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
+  { { echo "$as_me:1681: 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 -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:996: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1001: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1010: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
+
+rm -f conftest$ac_cv_exeext
+echo "$as_me:1687: 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 "$as_me:1693: 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
+#line 1699 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (eval echo "$as_me:1711: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1714: \$? = $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
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
 else
-  ac_cv_prog_gcc=no
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:1726: 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:1733: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+echo "$as_me:1737: 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
+#line 1743 "configure"
+#include "confdefs.h"
 
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
 
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1758: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1761: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1764: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1767: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_compiler_gnu=yes
 else
-  GCC=
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_compiler_gnu=no
 fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1029: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+fi
+echo "$as_me:1779: 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 "$as_me:1785: 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
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1791 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1803: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1806: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1809: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1812: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
-  ac_cv_prog_cc_g=no
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_prog_cc_g=no
 fi
-rm -f conftest*
-
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+echo "$as_me:1822: 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"
+  CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
     CFLAGS="-g -O2"
@@ -1055,7 +1836,118 @@ else
     CFLAGS=
   fi
 fi
+# Some people use a C++ compiler to compile C.  Since we use `exit',
+# in C++ we need to declare it.  In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+  choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1849: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1852: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1855: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1858: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1870 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1883: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1886: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1889: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1892: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+continue
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1902 "configure"
+#include "confdefs.h"
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1914: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1917: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1920: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1923: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+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
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_config_commands="$ac_config_commands default-1"
 
 am_make=${MAKE-make}
 cat > confinc << 'END'
@@ -1063,8 +1955,8 @@ doit:
 	@echo done
 END
 # If we don't find an include directive, just comment out the code.
-echo $ac_n "checking for style of include used by $am_make""... $ac_c" 1>&6
-echo "configure:1068: checking for style of include used by $am_make" >&5
+echo "$as_me:1958: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
 am__include='#'
 am__quote=
 _am_result=none
@@ -1090,17 +1982,16 @@ if test "$am__include" = "#"; then
    fi
 fi
 
-
-echo "$ac_t""$_am_result" 1>&6
+echo "$as_me:1985: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6
 rm -f confinc confmf
 
-
 depcc="$CC"   am_compiler_list=
 
-echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6
-echo "configure:1102: checking dependency style of $depcc" >&5
-if eval "test \"`echo '$''{'am_cv_CC_dependencies_compiler_type'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1991: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -1159,37 +2050,76 @@ else
 fi
 
 fi
-
-echo "$ac_t""$am_cv_CC_dependencies_compiler_type" 1>&6
+echo "$as_me:2053: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
 
-
+      if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
 
 # Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1175: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:2074: error: cannot run $ac_config_sub" >&5
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+echo "$as_me:2078: 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
+else
+  ac_cv_build_alias=$build_alias
+test -z "$ac_cv_build_alias" &&
+  ac_cv_build_alias=`$ac_config_guess`
+test -z "$ac_cv_build_alias" &&
+  { { echo "$as_me:2087: 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:2091: 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:2096: 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 "$as_me:2103: 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
+else
+  ac_cv_host_alias=$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:2112: 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; }; }
 
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
+fi
+echo "$as_me:2117: 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/'`
 
 # Check whether --with-gnu-ld or --without-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
@@ -1197,13 +2127,12 @@ if test "${with_gnu_ld+set}" = set; then
   test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
-fi
-
+fi;
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1207: checking for ld used by GCC" >&5
+  echo "$as_me:2134: checking for ld used by GCC" >&5
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1232,14 +2161,14 @@ echo "configure:1207: checking for ld used by GCC" >&5
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1237: checking for GNU ld" >&5
+  echo "$as_me:2164: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
 else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1240: checking for non-GNU ld" >&5
+  echo "$as_me:2167: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
 fi
-if eval "test \"`echo '$''{'acl_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${acl_cv_path_LD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
@@ -1265,15 +2194,19 @@ fi
 
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
+  echo "$as_me:2197: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:2200: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1275: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'acl_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+test -z "$LD" && { { echo "$as_me:2203: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+echo "$as_me:2206: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+if test "${acl_cv_prog_gnu_ld+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
@@ -1282,43 +2215,25 @@ else
   acl_cv_prog_gnu_ld=no
 fi
 fi
-
-echo "$ac_t""$acl_cv_prog_gnu_ld" 1>&6
+echo "$as_me:2218: result: $acl_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
-
-
-      if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-
-
-                                                echo $ac_n "checking for shared library run path origin""... $ac_c" 1>&6
-echo "configure:1309: checking for shared library run path origin" >&5
-if eval "test \"`echo '$''{'acl_cv_rpath'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+                                                echo "$as_me:2222: checking for shared library run path origin" >&5
+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
+if test "${acl_cv_rpath+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
+
     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
     ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
     . ./conftest.sh
     rm -f ./conftest.sh
     acl_cv_rpath=done
-  
-fi
 
-echo "$ac_t""$acl_cv_rpath" 1>&6
+fi
+echo "$as_me:2235: result: $acl_cv_rpath" >&5
+echo "${ECHO_T}$acl_cv_rpath" >&6
   wl="$acl_cv_wl"
   libext="$acl_cv_libext"
   shlibext="$acl_cv_shlibext"
@@ -1328,50 +2243,50 @@ echo "$ac_t""$acl_cv_rpath" 1>&6
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
   sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
   sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
+    # Check whether --enable-rpath or --disable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+  enableval="$enable_rpath"
+  :
+else
+  enable_rpath=yes
+fi;
 
-
-  
-  
-  
-  
-  echo $ac_n "checking how to link with librpathx""... $ac_c" 1>&6
-echo "configure:1339: checking how to link with librpathx" >&5
-if eval "test \"`echo '$''{'ac_cv_librpathx_libs'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:2254: checking how to link with librpathx" >&5
+echo $ECHO_N "checking how to link with librpathx... $ECHO_C" >&6
+if test "${ac_cv_librpathx_libs+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
-    
-  
+
     use_additional=yes
-  
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
-  
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
-  # Check whether --with-librpathx-prefix or --without-librpathx-prefix was given.
+# Check whether --with-librpathx-prefix or --without-librpathx-prefix was given.
 if test "${with_librpathx_prefix+set}" = set; then
   withval="$with_librpathx_prefix"
-  
+
     if test "X$withval" = "Xno"; then
       use_additional=no
     else
       if test "X$withval" = "X"; then
-        
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
           eval additional_includedir=\"$includedir\"
           eval additional_libdir=\"$libdir\"
-        
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
@@ -1381,8 +2296,7 @@ if test "${with_librpathx_prefix+set}" = set; then
       fi
     fi
 
-fi
-
+fi;
       LIBRPATHX=
   LTLIBRPATHX=
   INCRPATHX=
@@ -1438,7 +2352,7 @@ fi
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBRPATHX; do
-              
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1475,7 +2389,7 @@ fi
           if test "X$found_dir" != "X"; then
                         LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "X$found_dir" = "X/usr/lib"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
                                 LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
               else
                                                                                 haveit=
@@ -1506,7 +2420,7 @@ fi
                   else
                                                                                 haveit=
                     for x in $LDFLAGS $LIBRPATHX; do
-                      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1557,7 +2471,7 @@ fi
                 fi
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCRPATHX; do
-                    
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1602,7 +2516,7 @@ fi
                       if test -z "$haveit"; then
                         haveit=
                         for x in $LDFLAGS $LIBRPATHX; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1623,7 +2537,7 @@ fi
                         fi
                         haveit=
                         for x in $LDFLAGS $LTLIBRPATHX; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1647,25 +2561,27 @@ fi
                     ;;
                   -R*)
                     dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $dir"
-                    fi
-                                                            haveit=
-                    for x in $ltrpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      ltrpathdirs="$ltrpathdirs $dir"
                     fi
                     ;;
                   -l*)
@@ -1719,18 +2635,18 @@ fi
     ac_cv_librpathx_libs="$LIBRPATHX"
     ac_cv_librpathx_ltlibs="$LTLIBRPATHX"
     ac_cv_librpathx_cppflags="$INCRPATHX"
-  
-fi
 
-echo "$ac_t""$ac_cv_librpathx_libs" 1>&6
+fi
+echo "$as_me:2640: result: $ac_cv_librpathx_libs" >&5
+echo "${ECHO_T}$ac_cv_librpathx_libs" >&6
   LIBRPATHX="$ac_cv_librpathx_libs"
   LTLIBRPATHX="$ac_cv_librpathx_ltlibs"
   INCRPATHX="$ac_cv_librpathx_cppflags"
-  
+
   for element in $INCRPATHX; do
     haveit=
     for x in $CPPFLAGS; do
-      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1749,299 +2665,661 @@ echo "$ac_t""$ac_cv_librpathx_libs" 1>&6
     fi
   done
 
-  
-  
       HAVE_LIBRPATHX=yes
-  
-  
 
-
-trap '' 1 2 15
-cat > confcache <<\EOF
+ac_config_files="$ac_config_files Makefile"
+cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
 #
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
 #
-EOF
+# `ac_cv_env_foo' variables (set or unset) will be overriden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 # So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+        "s/'/'\\\\''/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if cmp -s $cache_file confcache; then :; else
   if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
   else
     echo "not updating unwritable cache $cache_file"
   fi
 fi
 rm -f confcache
 
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[ 	]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[ 	]*$//;
+}'
 fi
 
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then we branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+cat >confdef2opt.sed <<\EOF
+t clear
+: clear
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+d
+: quote
+s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
+s,\[,\\&,g
+s,\],\\&,g
+s,\$,$$,g
+p
 EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
+# We use echo to avoid assuming a particular line-breaking character.
+# The extra dot is to prevent the shell from consuming trailing
+# line-breaks from the sub-command output.  A line-break within
+# single-quotes doesn't work because, if this script is created in a
+# platform that uses two characters for line-breaks (e.g., DOS), tr
+# would break.
+ac_LF_and_DOT=`echo; echo .`
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+rm -f confdef2opt.sed
 
-# Without the "./", some shells look in PATH for config.status.
 : ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ echo "$as_me:2780: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
+#! $SHELL
 # Generated automatically by configure.
 # Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
 # Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
+# configure, is in config.log if it exists.
 
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
+debug=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+ac_cs_invocation="\$0 \$@"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+# NLS nuisances.
+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+
+exec 6>&1
+
+_ACEOF
+
+# Files that config.status was made for.
+if test -n "$ac_config_files"; then
+  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_headers"; then
+  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_links"; then
+  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_commands"; then
+  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+fi
+
+cat >>$CONFIG_STATUS <<\EOF
+
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTIONS] [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number, then exit
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+  --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Configuration commands:
+$config_commands
+
+Report bugs to <bug-autoconf@gnu.org>."
+EOF
+
+cat >>$CONFIG_STATUS <<EOF
+ac_cs_version="\\
+config.status
+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
+Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+srcdir=$srcdir
+INSTALL="$INSTALL"
+EOF
+
+cat >>$CONFIG_STATUS <<\EOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
+ac_need_defaults=:
+while test $# != 0
 do
-  case "\$ac_option" in
+  case $1 in
+  --*=*)
+    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+    shift
+    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
+    shift
+    ;;
+  -*);;
+  *) # This is not an option, so the user has probably given explicit
+     # arguments.
+     ac_need_defaults=false;;
+  esac
+
+  case $1 in
+  # Handling of the options.
+EOF
+cat >>$CONFIG_STATUS <<EOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
+    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
+    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
+EOF
+cat >>$CONFIG_STATUS <<\EOF
+  --version | --vers* | -V )
+    echo "$ac_cs_version"; exit 0 ;;
+  --he | --h)
+    # Conflict between --help and --header
+    { { echo "$as_me:2951: 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;}
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit 0 ;;
+  --debug | --d* | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    shift
+    CONFIG_FILES="$CONFIG_FILES $1"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $1"
+    ac_need_defaults=false;;
+
+  # This is an error.
+  -*) { { echo "$as_me:2970: 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; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1" ;;
+
   esac
+  shift
 done
 
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
+exec 5>>config.log
+cat >&5 << _ACEOF
+
+## ----------------------- ##
+## Running config.status.  ##
+## ----------------------- ##
+
+This file was extended by $as_me 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`
 
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+_ACEOF
 EOF
-cat >> $CONFIG_STATUS <<EOF
 
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@EXEEXT@%$EXEEXT%g
-s%@OBJEXT@%$OBJEXT%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@AMTAR@%$AMTAR%g
-s%@install_sh@%$install_sh%g
-s%@INSTALL_STRIP_PROGRAM@%$INSTALL_STRIP_PROGRAM%g
-s%@AWK@%$AWK%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@AMDEP_TRUE@%$AMDEP_TRUE%g
-s%@AMDEP_FALSE@%$AMDEP_FALSE%g
-s%@AMDEPBACKSLASH@%$AMDEPBACKSLASH%g
-s%@DEPDIR@%$DEPDIR%g
-s%@CC@%$CC%g
-s%@am__include@%$am__include%g
-s%@am__quote@%$am__quote%g
-s%@CCDEPMODE@%$CCDEPMODE%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@LIBRPATHX@%$LIBRPATHX%g
-s%@LTLIBRPATHX@%$LTLIBRPATHX%g
-s%@global_top_srcdir@%$global_top_srcdir%g
+cat >>$CONFIG_STATUS <<EOF
+#
+# INIT-COMMANDS section.
+#
+
+AMDEP_TRUE="$AMDEP_TRUE"
+ac_aux_dir="$ac_aux_dir"
 
-CEOF
 EOF
 
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
+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" ;;
+  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+  *) { { echo "$as_me:3017: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
 done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
+
+# 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
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
+
+# Create a temporary directory, and hook for its removal unless debugging.
+$debug ||
+{
+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+
+# Create a (secure) tmp directory for tmp files.
+: ${TMPDIR=/tmp}
+{
+  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=$TMPDIR/cs$$-$RANDOM
+  (umask 077 && mkdir $tmp)
+} ||
+{
+   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+   { (exit 1); exit 1; }
+}
+
+EOF
+
+cat >>$CONFIG_STATUS <<EOF
+
+#
+# CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "\$CONFIG_FILES"; then
+  # Protect against being on the right side of a sed subst in config.status.
+  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+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,@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,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@DEFS@,$DEFS,;t t
+s,@LIBS@,$LIBS,;t t
+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@PACKAGE@,$PACKAGE,;t t
+s,@VERSION@,$VERSION,;t t
+s,@EXEEXT@,$EXEEXT,;t t
+s,@OBJEXT@,$OBJEXT,;t t
+s,@ACLOCAL@,$ACLOCAL,;t t
+s,@AUTOCONF@,$AUTOCONF,;t t
+s,@AUTOMAKE@,$AUTOMAKE,;t t
+s,@AUTOHEADER@,$AUTOHEADER,;t t
+s,@MAKEINFO@,$MAKEINFO,;t t
+s,@AMTAR@,$AMTAR,;t t
+s,@install_sh@,$install_sh,;t t
+s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+s,@AWK@,$AWK,;t t
+s,@SET_MAKE@,$SET_MAKE,;t t
+s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
+s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
+s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+s,@DEPDIR@,$DEPDIR,;t t
+s,@CC@,$CC,;t t
+s,@CFLAGS@,$CFLAGS,;t t
+s,@LDFLAGS@,$LDFLAGS,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@ac_ct_CC@,$ac_ct_CC,;t t
+s,@am__include@,$am__include,;t t
+s,@am__quote@,$am__quote,;t t
+s,@CCDEPMODE@,$CCDEPMODE,;t t
+s,@build@,$build,;t t
+s,@build_cpu@,$build_cpu,;t t
+s,@build_vendor@,$build_vendor,;t t
+s,@build_os@,$build_os,;t t
+s,@host@,$host,;t t
+s,@host_cpu@,$host_cpu,;t t
+s,@host_vendor@,$host_vendor,;t t
+s,@host_os@,$host_os,;t t
+s,@LIBRPATHX@,$LIBRPATHX,;t t
+s,@LTLIBRPATHX@,$LTLIBRPATHX,;t t
+s,@global_top_srcdir@,$global_top_srcdir,;t t
+CEOF
+
 EOF
 
-cat >> $CONFIG_STATUS <<EOF
+  cat >>$CONFIG_STATUS <<\EOF
+  # Split the substitutions into bite-sized pieces for seds with
+  # small command number limits, like on Digital OSF/1 and HP-UX.
+  ac_max_sed_lines=48
+  ac_sed_frag=1 # Number of current file.
+  ac_beg=1 # First line for current file.
+  ac_end=$ac_max_sed_lines # Line after last line for current file.
+  ac_more_lines=:
+  ac_sed_cmds=
+  while $ac_more_lines; do
+    if test $ac_beg -gt 1; then
+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    else
+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    fi
+    if test ! -s $tmp/subs.frag; then
+      ac_more_lines=false
+    else
+      # The purpose of the label and of the branching condition is to
+      # speed up the sed processing (if there are no `@' at all, there
+      # is no need to browse any of the substitutions).
+      # These are the two extra sed commands mentioned above.
+      (echo ':t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+      if test -z "$ac_sed_cmds"; then
+  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+      else
+  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+      fi
+      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_beg=$ac_end
+      ac_end=`expr $ac_end + $ac_max_sed_lines`
+    fi
+  done
+  if test -z "$ac_sed_cmds"; then
+    ac_sed_cmds=cat
+  fi
+fi # test -n "$CONFIG_FILES"
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
 EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+cat >>$CONFIG_STATUS <<\EOF
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+        cat >$tmp/stdin
+        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
   esac
 
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+  ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_file" : 'X\(//\)[^/]' \| \
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
   if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+    { case "$ac_dir" in
+  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+  *)                      as_incr_dir=.;;
+esac
+as_dummy="$ac_dir"
+for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+  case $as_mkdir_dir in
+    # Skip DOS drivespec
+    ?:) as_incr_dir=$as_mkdir_dir ;;
+    *)
+      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
+    ;;
+  esac
+done; }
+
+    ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`"
     # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+    ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'`
   else
     ac_dir_suffix= ac_dots=
   fi
 
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+  case $srcdir in
+  .)  ac_srcdir=.
+      if test -z "$ac_dots"; then
+         ac_top_srcdir=.
+      else
+         ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
+      fi ;;
+  [\\/]* | ?:[\\/]* )
+      ac_srcdir=$srcdir$ac_dir_suffix;
+      ac_top_srcdir=$srcdir ;;
   *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+    ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_dots$srcdir ;;
   esac
 
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_dots$INSTALL ;;
   esac
 
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:3252: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
+  # Let's still pretend it is `configure' which instantiates (i.e., don't
+  # use $as_me), people would be surprised to read:
+  #    /* config.h.  Generated automatically by config.status.  */
+  configure_input="Generated automatically from `echo $ac_file_in |
+                                                 sed 's,.*/,,'` by configure."
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+         # Absolute (can't be DOS-style, as IFS=:)
+         test -f "$f" || { { echo "$as_me:3270: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         echo $f;;
+      *) # Relative
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$srcdir/$f"; then
+           # Source tree
+           echo $srcdir/$f
+         else
+           # /dev/null tree
+           { { echo "$as_me:3283: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         fi;;
+      esac
+    done` || { (exit 1); exit 1; }
 EOF
-cat >> $CONFIG_STATUS <<EOF
-AMDEP_TRUE="$AMDEP_TRUE"
-ac_aux_dir="$ac_aux_dir"
+cat >>$CONFIG_STATUS <<EOF
+  sed "$ac_vpsub
+$extrasub
+EOF
+cat >>$CONFIG_STATUS <<\EOF
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@configure_input@,$configure_input,;t t
+s,@srcdir@,$ac_srcdir,;t t
+s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@INSTALL@,$ac_INSTALL,;t t
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+  rm -f $tmp/stdin
+  if test x"$ac_file" != x-; then
+    mv $tmp/out $ac_file
+  else
+    cat $tmp/out
+    rm -f $tmp/out
+  fi
 
+done
 EOF
-cat >> $CONFIG_STATUS <<\EOF
+cat >>$CONFIG_STATUS <<\EOF
 
+#
+# CONFIG_COMMANDS section.
+#
+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+
+  case $ac_dest in
+    default-1 )
 test x"$AMDEP_TRUE" != x"" ||
 for mf in $CONFIG_FILES; do
   case "$mf" in
@@ -2079,11 +3357,33 @@ for mf in $CONFIG_FILES; do
     echo '# dummy' > "$dirpart/$file"
   done
 done
+ ;;
+  esac
+done
+EOF
 
+cat >>$CONFIG_STATUS <<\EOF
 
-exit 0
+{ (exit 0); exit 0; }
 EOF
 chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+ac_clean_files=$ac_clean_files_save
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || { (exit 1); exit 1; }
+fi
 
diff --git a/tests/rpathly/Makefile.in b/tests/rpathly/Makefile.in
index a2ae6768f..94c6164ce 100644
--- a/tests/rpathly/Makefile.in
+++ b/tests/rpathly/Makefile.in
@@ -55,8 +55,24 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+AMTAR = @AMTAR@
+AWK = @AWK@
 CC = @CC@
+DEPDIR = @DEPDIR@
+EXEEXT = @EXEEXT@
+HAVE_LIB = @HAVE_LIB@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIB = @LIB@
+LTLIB = @LTLIB@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+am__include = @am__include@
+am__quote = @am__quote@
 global_top_srcdir = @global_top_srcdir@
+install_sh = @install_sh@
 
 AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies
 mkinstalldirs = $(SHELL) @global_top_srcdir@/mkinstalldirs
@@ -64,6 +80,7 @@ bin_PROGRAMS = usey
 usey_SOURCES = usey.c
 LDADD = @LIBRPATHY@
 subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 CONFIG_CLEAN_FILES =
 bin_PROGRAMS = usey$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
@@ -86,8 +103,9 @@ CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 CFLAGS = @CFLAGS@
 DIST_SOURCES = $(usey_SOURCES)
-DIST_COMMON = ../../install-sh ../../missing ../../mkinstalldirs \
-	Makefile.am Makefile.in configure configure.in
+DIST_COMMON = ../../config.guess ../../config.sub ../../install-sh \
+	../../missing ../../mkinstalldirs Makefile.am Makefile.in \
+	aclocal.m4 configure configure.in
 SOURCES = $(usey_SOURCES)
 
 all: all-am
@@ -106,6 +124,9 @@ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 $(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
+
+$(ACLOCAL_M4):  configure.in 
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
diff --git a/tests/rpathly/aclocal.m4 b/tests/rpathly/aclocal.m4
index 0494463ac..297583801 100644
--- a/tests/rpathly/aclocal.m4
+++ b/tests/rpathly/aclocal.m4
@@ -491,7 +491,7 @@ else
   $1_FALSE=
 fi])
 
-# lib-link.m4 serial 2 (gettext-0.11.2)
+# lib-link.m4 serial 3 (gettext-0.11.3)
 dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -609,6 +609,10 @@ AC_DEFUN([AC_LIB_RPATH],
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
   sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
   sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE(rpath,
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
 ])
 
 dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
@@ -738,7 +742,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
               dnl Linking with a shared library. We attempt to hardcode its
               dnl directory into the executable's runpath, unless it's the
               dnl standard /usr/lib.
-              if test "X$found_dir" = "X/usr/lib"; then
+              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
                 dnl No hardcoding is needed.
                 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
               else
@@ -929,29 +933,31 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                     ;;
                   -R*)
                     dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $dir"
-                    fi
-                    dnl Potentially add DIR to ltrpathdirs.
-                    dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                    haveit=
-                    for x in $ltrpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      ltrpathdirs="$ltrpathdirs $dir"
                     fi
                     ;;
                   -l*)
diff --git a/tests/rpathly/configure b/tests/rpathly/configure
index 202f26ded..40291c8a6 100755
--- a/tests/rpathly/configure
+++ b/tests/rpathly/configure
@@ -1,34 +1,119 @@
 #! /bin/sh
-
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Generated by Autoconf 2.52.
 #
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
-# Defaults:
-ac_help=
+# 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
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+# NLS nuisances.
+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+exec 6>&1
+
+#
+# Initializations.
+#
 ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --disable-dependency-tracking Speeds up one-time builds
-  --enable-dependency-tracking  Do not reject slow dependency extractors"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-ac_help="$ac_help
-  --with-librpathy-prefix[=DIR]  search for librpathy in DIR/include and DIR/lib
-  --without-librpathy-prefix     don't search for librpathy in includedir and libdir"
+cross_compiling=no
+subdirs=
+MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete.  It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
+
+ac_unique_file="configure.in"
 
 # Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
 # The variables have the same names as the options, with
 # dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
+cache_file=/dev/null
 exec_prefix=NONE
-host=NONE
 no_create=
-nonopt=NONE
 no_recursion=
 prefix=NONE
 program_prefix=NONE
@@ -37,10 +122,15 @@ program_transform_name=s,x,x,
 silent=
 site=
 srcdir=
-target=NONE
 verbose=
 x_includes=NONE
 x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
@@ -54,17 +144,16 @@ oldincludedir='/usr/include'
 infodir='${prefix}/info'
 mandir='${prefix}/man'
 
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
+# Identity of this package.
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
 
 ac_prev=
 for ac_option
 do
-
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
     eval "$ac_prev=\$ac_option"
@@ -72,59 +161,59 @@ do
     continue
   fi
 
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case "$ac_option" in
+  case $ac_option in
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
   -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
+    bindir=$ac_optarg ;;
 
   -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
+    ac_prev=build_alias ;;
   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
+    build_alias=$ac_optarg ;;
 
   -cache-file | --cache-file | --cache-fil | --cache-fi \
   | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
     ac_prev=cache_file ;;
   -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
   | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
 
   -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
     ac_prev=datadir ;;
   -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
   | --da=*)
-    datadir="$ac_optarg" ;;
+    datadir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
+    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'`
+    eval "enable_$ac_feature=no" ;;
 
   -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
+    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'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
+    eval "enable_$ac_feature='$ac_optarg'" ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -133,95 +222,47 @@ do
   -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
   | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
   | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
+    exec_prefix=$ac_optarg ;;
 
   -gas | --gas | --ga | --g)
     # Obsolete; use --with-gas.
     with_gas=yes ;;
 
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
 
   -host | --host | --hos | --ho)
-    ac_prev=host ;;
+    ac_prev=host_alias ;;
   -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
+    host_alias=$ac_optarg ;;
 
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
   -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
   | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
+    includedir=$ac_optarg ;;
 
   -infodir | --infodir | --infodi | --infod | --info | --inf)
     ac_prev=infodir ;;
   -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
+    infodir=$ac_optarg ;;
 
   -libdir | --libdir | --libdi | --libd)
     ac_prev=libdir ;;
   -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
+    libdir=$ac_optarg ;;
 
   -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
   | --libexe | --libex | --libe)
     ac_prev=libexecdir ;;
   -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
   | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
+    libexecdir=$ac_optarg ;;
 
   -localstatedir | --localstatedir | --localstatedi | --localstated \
   | --localstate | --localstat | --localsta | --localst \
@@ -230,12 +271,12 @@ EOF
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
   | --localstate=* | --localstat=* | --localsta=* | --localst=* \
   | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
+    localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
     ac_prev=mandir ;;
   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
+    mandir=$ac_optarg ;;
 
   -nfp | --nfp | --nf)
     # Obsolete; use --without-fp.
@@ -256,26 +297,26 @@ EOF
   -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
   | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
   | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
+    oldincludedir=$ac_optarg ;;
 
   -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
     ac_prev=prefix ;;
   -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
+    prefix=$ac_optarg ;;
 
   -program-prefix | --program-prefix | --program-prefi | --program-pref \
   | --program-pre | --program-pr | --program-p)
     ac_prev=program_prefix ;;
   -program-prefix=* | --program-prefix=* | --program-prefi=* \
   | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
+    program_prefix=$ac_optarg ;;
 
   -program-suffix | --program-suffix | --program-suffi | --program-suff \
   | --program-suf | --program-su | --program-s)
     ac_prev=program_suffix ;;
   -program-suffix=* | --program-suffix=* | --program-suffi=* \
   | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
+    program_suffix=$ac_optarg ;;
 
   -program-transform-name | --program-transform-name \
   | --program-transform-nam | --program-transform-na \
@@ -292,7 +333,7 @@ EOF
   | --program-transfo=* | --program-transf=* \
   | --program-trans=* | --program-tran=* \
   | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
+    program_transform_name=$ac_optarg ;;
 
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
@@ -302,7 +343,7 @@ EOF
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
   | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
+    sbindir=$ac_optarg ;;
 
   -sharedstatedir | --sharedstatedir | --sharedstatedi \
   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
@@ -313,58 +354,57 @@ EOF
   | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
   | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
   | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
+    sharedstatedir=$ac_optarg ;;
 
   -site | --site | --sit)
     ac_prev=site ;;
   -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
+    site=$ac_optarg ;;
 
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
+    srcdir=$ac_optarg ;;
 
   -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
   | --syscon | --sysco | --sysc | --sys | --sy)
     ac_prev=sysconfdir ;;
   -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
   | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
+    sysconfdir=$ac_optarg ;;
 
   -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
+    ac_prev=target_alias ;;
   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
+    target_alias=$ac_optarg ;;
 
   -v | -verbose | --verbose | --verbos | --verbo | --verb)
     verbose=yes ;;
 
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
+    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'`
-    case "$ac_option" in
-      *=*) ;;
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
+    eval "with_$ac_package='$ac_optarg'" ;;
 
   -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
+    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'`
+    eval "with_$ac_package=no" ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -375,98 +415,98 @@ EOF
     ac_prev=x_includes ;;
   -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
   | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
+    x_includes=$ac_optarg ;;
 
   -x-libraries | --x-libraries | --x-librarie | --x-librari \
   | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
     ac_prev=x_libraries ;;
   -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
+    x_libraries=$ac_optarg ;;
 
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
     ;;
 
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    eval "$ac_envvar='$ac_optarg'"
+    export $ac_envvar ;;
+
   *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
+    # FIXME: should be removed in autoconf 3.0.
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    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}
     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  { echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
 fi
 
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
+# 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
 
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+              localstatedir libdir includedir oldincludedir infodir mandir
 do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* ) ;;
+    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
   esac
 done
 
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: should be removed in autoconf 3.0.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
 
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
 
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=configure.in
+test "$silent" = yes && exec 6>/dev/null
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then its parent.
   ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+  ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
   test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir
   if test ! -r $srcdir/$ac_unique_file; then
@@ -477,13 +517,313 @@ else
 fi
 if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
+   { (exit 1); exit 1; }; }
   else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources in $srcdir" >&2
+   { (exit 1); exit 1; }; }
   fi
 fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<EOF
+\`configure' configures this package to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+EOF
+
+  cat <<EOF
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
+EOF
+
+  cat <<\EOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       build programs to run on HOST [BUILD]
+EOF
+fi
+
+if test -n "$ac_init_help"; then
+
+  cat <<\EOF
+
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-dependency-tracking Speeds up one-time builds
+  --enable-dependency-tracking  Do not reject slow dependency extractors
+  --disable-rpath         do not hardcode runtime library paths
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-gnu-ld           assume the C compiler uses GNU ld default=no
+  --with-librpathy-prefix=DIR  search for librpathy in DIR/include and DIR/lib
+  --without-librpathy-prefix     don't search for librpathy in includedir and libdir
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+              headers in a nonstandard directory <include dir>
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+EOF
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  ac_popdir=`pwd`
+  for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
+    cd $ac_subdir
+    # A "../" for each directory in /$ac_subdir.
+    ac_dots=`echo $ac_subdir |
+             sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
+
+    case $srcdir in
+    .) # No --srcdir option.  We are building in place.
+      ac_sub_srcdir=$srcdir ;;
+    [\\/]* | ?:[\\/]* ) # Absolute path.
+      ac_sub_srcdir=$srcdir/$ac_subdir ;;
+    *) # Relative path.
+      ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
+    esac
 
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_sub_srcdir/configure.gnu; then
+      echo
+      $SHELL $ac_sub_srcdir/configure.gnu  --help=recursive
+    elif test -f $ac_sub_srcdir/configure; then
+      echo
+      $SHELL $ac_sub_srcdir/configure  --help=recursive
+    elif test -f $ac_sub_srcdir/configure.ac ||
+           test -f $ac_sub_srcdir/configure.in; then
+      echo
+      $ac_configure --help
+    else
+      echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
+    fi
+    cd $ac_popdir
+  done
+fi
+
+test -n "$ac_init_help" && exit 0
+if $ac_init_version; then
+  cat <<\EOF
+
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+EOF
+  exit 0
+fi
+exec 5>config.log
+cat >&5 <<EOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by $as_me, which was
+generated by GNU Autoconf 2.52.  Invocation command line was
+
+  $ $0 $@
+
+EOF
+{
+cat <<_ASUNAME
+## ---------- ##
+## Platform.  ##
+## ---------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+PATH = $PATH
+
+_ASUNAME
+} >&5
+
+cat >&5 <<EOF
+## ------------ ##
+## Core tests.  ##
+## ------------ ##
+
+EOF
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell meta-characters.
+ac_configure_args=
+ac_sep=
+for ac_arg
+do
+  case $ac_arg in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c) ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
+    ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+    ac_sep=" " ;;
+  *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg"
+     ac_sep=" " ;;
+  esac
+  # Get rid of the leading space.
+done
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  echo >&5
+  echo "## ----------------- ##" >&5
+  echo "## Cache variables.  ##" >&5
+  echo "## ----------------- ##" >&5
+  echo >&5
+  # The following way of writing the cache mishandles newlines in values,
+{
+  (set) 2>&1 |
+    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      sed -n \
+        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+      ;;
+    *)
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} >&5
+  sed "/^$/d" confdefs.h >conftest.log
+  if test -s conftest.log; then
+    echo >&5
+    echo "## ------------ ##" >&5
+    echo "## confdefs.h.  ##" >&5
+    echo "## ------------ ##" >&5
+    echo >&5
+    cat conftest.log >&5
+  fi
+  (echo; echo) >&5
+  test "$ac_signal" != 0 &&
+    echo "$as_me: caught signal $ac_signal" >&5
+  echo "$as_me: exit $exit_status" >&5
+  rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files &&
+    exit $exit_status
+     ' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
+
+# Let the site file select an alternate cache file if it wants to.
 # Prefer explicitly selected file to automatically selected ones.
 if test -z "$CONFIG_SITE"; then
   if test "x$prefix" != xNONE; then
@@ -494,40 +834,107 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
+    { echo "$as_me:837: 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"
   fi
 done
 
 if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
+  # 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:848: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . $cache_file;;
+      *)                      . ./$cache_file;;
+    esac
+  fi
 else
-  echo "creating cache $cache_file"
-  > $cache_file
+  { echo "$as_me:856: 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.
+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
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+  eval ac_new_val="\$ac_env_${ac_var}_value"
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { echo "$as_me:872: 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)
+      { echo "$as_me:876: 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
+        { echo "$as_me:882: 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:884:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+        { echo "$as_me:886:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+        ac_cache_corrupted=:
+      fi;;
+  esac
+  # Pass precious variables to config.status.  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
+if $ac_cache_corrupted; then
+  { echo "$as_me:905: 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:907: 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
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
+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
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)      ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+echo "#! $SHELL" >conftest.sh
+echo  "exit 0"   >>conftest.sh
+chmod +x conftest.sh
+if { (echo "$as_me:927: PATH=\".;.\"; conftest.sh") >&5
+  (PATH=".;."; conftest.sh) 2>&5
+  ac_status=$?
+  echo "$as_me:930: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  ac_path_separator=';'
 else
-  ac_n= ac_c='\c' ac_t=
+  ac_path_separator=:
 fi
-
+PATH_SEPARATOR="$ac_path_separator"
+rm -f conftest.sh
 
 ac_aux_dir=
 for ac_dir in $global_top_srcdir ../..; do
@@ -539,18 +946,20 @@ for ac_dir in $global_top_srcdir ../..; do
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
+  elif test -f $ac_dir/shtool; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $global_top_srcdir ../.." 1>&2; exit 1; }
+  { { echo "$as_me:956: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -559,31 +968,39 @@ am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:568: checking for a BSD compatible install" >&5
+echo "$as_me:976: 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 eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${ac_cv_path_install+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+    ac_save_IFS=$IFS; IFS=$ac_path_separator
   for ac_dir in $PATH; do
+    IFS=$ac_save_IFS
     # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    case $ac_dir/ in
+    / | ./ | .// | /cC/* \
+    | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
+    | /usr/ucb/* ) ;;
     *)
       # OSF1 and SCO ODT 3.0 have their own names for install.
       # Don't use installbsd from OSF since it installs stuff as root
       # by default.
       for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
+        if $as_executable_p "$ac_dir/$ac_prog"; then
 	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+            grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
 	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
 	  else
 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
 	    break 2
@@ -593,31 +1010,31 @@ else
       ;;
     esac
   done
-  IFS="$ac_save_IFS"
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
+    INSTALL=$ac_cv_path_install
   else
     # As a last resort, use the slow shell script.  We don't cache a
     # path for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
+    INSTALL=$ac_install_sh
   fi
 fi
-echo "$ac_t""$INSTALL" 1>&6
+echo "$as_me:1025: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:621: checking whether build environment is sane" >&5
+echo "$as_me:1036: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -640,8 +1057,11 @@ 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".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
+      { { echo "$as_me:1060: 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;}
+   { (exit 1); exit 1; }; }
    fi
 
    test "$2" = conftest.file
@@ -650,28 +1070,29 @@ then
    # Ok.
    :
 else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
+   { { echo "$as_me:1073: 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
+echo "$as_me:1079: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 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 &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+  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
 
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
 
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
@@ -680,82 +1101,86 @@ if eval "$MISSING --run true"; then
 else
   am_missing_run=
   am_backtick='`'
-  echo "configure: warning: ${am_backtick}missing' script is too old or missing" 1>&2
+  { echo "$as_me:1104: WARNING: ${am_backtick}missing' script is too old or missing" >&5
+echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;}
 fi
 
 for ac_prog in mawk gawk nawk awk
 do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:692: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1112: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AWK+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AWK="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_AWK="$ac_prog"
+echo "$as_me:1127: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-AWK="$ac_cv_prog_AWK"
+AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$ac_t""$AWK" 1>&6
+  echo "$as_me:1135: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1138: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-test -n "$AWK" && break
+  test -n "$AWK" && break
 done
 
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:722: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1145: 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 "(cached) $ECHO_C" >&6
 else
-  cat > conftestmake <<\EOF
+  cat >conftest.make <<\EOF
 all:
 	@echo 'ac_maketemp="${MAKE}"'
 EOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
 if test -n "$ac_maketemp"; then
   eval ac_cv_prog_make_${ac_make}_set=yes
 else
   eval ac_cv_prog_make_${ac_make}_set=no
 fi
-rm -f conftestmake
+rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+  echo "$as_me:1165: result: yes" >&5
+echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1169: result: no" >&5
+echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 # Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
 if test "${enable_dependency_tracking+set}" = set; then
   enableval="$enable_dependency_tracking"
-  :
-fi
 
+fi;
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
 fi
 
-
 if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
@@ -764,9 +1189,6 @@ else
   AMDEP_FALSE=
 fi
 
-
-
-
 rm -f .deps 2>/dev/null
 mkdir .deps 2>/dev/null
 if test -d .deps; then
@@ -777,25 +1199,26 @@ else
 fi
 rmdir .deps 2>/dev/null
 
-
 # test to see if srcdir already configured
 if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run \"make distclean\" there first" 1>&2; exit 1; }
+  { { echo "$as_me:1205: 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
 
 # Define the identity of the package.
-PACKAGE=gexttext_rpathly
+PACKAGE=gettext_rpathly
 VERSION=0
-cat >> confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
 
-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define VERSION "$VERSION"
 EOF
 
-
 # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
 # the ones we care about.
 
@@ -807,24 +1230,18 @@ EOF
 # requests that it be used.  This is a bit dumb.
 : ${OBJEXT=o}
 
-
 # Some tools Automake needs.
 
 ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"}
 
-
 AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
 
-
 AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"}
 
-
 AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
-
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-
 AMTAR=${AMTAR-"${am_missing_run}tar"}
 
 install_sh=${install_sh-"$am_aux_dir/install-sh"}
@@ -834,214 +1251,578 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 
-# Extract the first word of "gcc", so it can be a program name with args.
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+echo "$as_me:1262: 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
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1277: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:1285: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:1288: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:841: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1297: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="gcc"
+echo "$as_me:1312: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1320: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1323: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+echo "$as_me:1336: 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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1351: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1359: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1362: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
+fi
+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
+echo "$as_me:1371: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="cc"
+echo "$as_me:1386: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1394: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1397: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:871: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1410: 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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+  ac_prog_rejected=yes
+  continue
+fi
+ac_cv_prog_CC="cc"
+echo "$as_me:1430: found $ac_dir/$ac_word" >&5
+break
+done
+
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
   set dummy $ac_cv_prog_CC
   shift
-  if test $# -gt 0; then
+  if test $# != 0; then
     # We chose a different compiler from the bogus one.
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
-    set dummy "$ac_dir/$ac_word" "$@"
+    set dummy "$ac_dir/$ac_word" ${1+"$@"}
     shift
     ac_cv_prog_CC="$@"
   fi
 fi
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1452: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1455: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:922: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl
+  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:1466: 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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1481: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1489: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1492: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+
+    test -n "$CC" && break
+  done
 fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl
+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:1505: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1520: found $ac_dir/$ac_word" >&5
+break
+done
 
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:954: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1528: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1531: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
 
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+  test -n "$ac_ct_CC" && break
+done
 
-cat > conftest.$ac_ext << EOF
+  CC=$ac_ct_CC
+fi
+
+fi
 
-#line 965 "configure"
+test -z "$CC" && { { echo "$as_me:1543: error: no acceptable cc found in \$PATH" >&5
+echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+
+# Provide some information about the compiler.
+echo "$as_me:1548:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:1551: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1554: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1556: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1559: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1561: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1564: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 1568 "configure"
 #include "confdefs.h"
 
-main(){return(0);}
-EOF
-if { (eval echo configure:970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_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.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+echo "$as_me:1584: 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[^ ]*//'`
+if { (eval echo "$as_me:1587: \"$ac_link_default\"") >&5
+  (eval $ac_link_default) 2>&5
+  ac_status=$?
+  echo "$as_me:1590: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # 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" : '[^.]*\(\..*\)'`
+          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
+          export ac_cv_exeext
+          break;;
+    * ) break;;
+  esac
+done
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:1613: 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:1619: 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 "$as_me:1624: 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'
+  { (eval echo "$as_me:1630: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1633: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no
   else
-    ac_cv_prog_cc_cross=yes
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { echo "$as_me:1640: 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;}
+   { (exit 1); exit 1; }; }
+    fi
   fi
+fi
+echo "$as_me:1648: 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 "$as_me:1655: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+echo "$as_me:1657: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6
+
+echo "$as_me:1660: checking for executable suffix" >&5
+echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+if { (eval echo "$as_me:1662: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:1665: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
+  case $ac_file in
+    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+          export ac_cv_exeext
+          break;;
+    * ) break;;
+  esac
+done
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
+  { { echo "$as_me:1681: 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 -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:996: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1001: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1010: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
+
+rm -f conftest$ac_cv_exeext
+echo "$as_me:1687: 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 "$as_me:1693: 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
+#line 1699 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (eval echo "$as_me:1711: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1714: \$? = $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
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
 else
-  ac_cv_prog_gcc=no
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:1726: 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:1733: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+echo "$as_me:1737: 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
+#line 1743 "configure"
+#include "confdefs.h"
 
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
 
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1758: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1761: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1764: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1767: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_compiler_gnu=yes
 else
-  GCC=
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_compiler_gnu=no
 fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1029: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+fi
+echo "$as_me:1779: 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 "$as_me:1785: 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
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1791 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1803: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1806: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1809: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1812: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
-  ac_cv_prog_cc_g=no
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_prog_cc_g=no
 fi
-rm -f conftest*
-
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+echo "$as_me:1822: 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"
+  CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
     CFLAGS="-g -O2"
@@ -1055,7 +1836,118 @@ else
     CFLAGS=
   fi
 fi
+# Some people use a C++ compiler to compile C.  Since we use `exit',
+# in C++ we need to declare it.  In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+  choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1849: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1852: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1855: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1858: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1870 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1883: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1886: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1889: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1892: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+continue
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1902 "configure"
+#include "confdefs.h"
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1914: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1917: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1920: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1923: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+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
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_config_commands="$ac_config_commands default-1"
 
 am_make=${MAKE-make}
 cat > confinc << 'END'
@@ -1063,8 +1955,8 @@ doit:
 	@echo done
 END
 # If we don't find an include directive, just comment out the code.
-echo $ac_n "checking for style of include used by $am_make""... $ac_c" 1>&6
-echo "configure:1068: checking for style of include used by $am_make" >&5
+echo "$as_me:1958: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
 am__include='#'
 am__quote=
 _am_result=none
@@ -1090,17 +1982,16 @@ if test "$am__include" = "#"; then
    fi
 fi
 
-
-echo "$ac_t""$_am_result" 1>&6
+echo "$as_me:1985: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6
 rm -f confinc confmf
 
-
 depcc="$CC"   am_compiler_list=
 
-echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6
-echo "configure:1102: checking dependency style of $depcc" >&5
-if eval "test \"`echo '$''{'am_cv_CC_dependencies_compiler_type'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1991: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -1159,37 +2050,76 @@ else
 fi
 
 fi
-
-echo "$ac_t""$am_cv_CC_dependencies_compiler_type" 1>&6
+echo "$as_me:2053: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
 
-
+      if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
 
 # Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1175: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:2074: error: cannot run $ac_config_sub" >&5
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+echo "$as_me:2078: 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
+else
+  ac_cv_build_alias=$build_alias
+test -z "$ac_cv_build_alias" &&
+  ac_cv_build_alias=`$ac_config_guess`
+test -z "$ac_cv_build_alias" &&
+  { { echo "$as_me:2087: 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:2091: 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:2096: 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 "$as_me:2103: 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
+else
+  ac_cv_host_alias=$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:2112: 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; }; }
 
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
+fi
+echo "$as_me:2117: 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/'`
 
 # Check whether --with-gnu-ld or --without-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
@@ -1197,13 +2127,12 @@ if test "${with_gnu_ld+set}" = set; then
   test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
-fi
-
+fi;
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1207: checking for ld used by GCC" >&5
+  echo "$as_me:2134: checking for ld used by GCC" >&5
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1232,14 +2161,14 @@ echo "configure:1207: checking for ld used by GCC" >&5
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1237: checking for GNU ld" >&5
+  echo "$as_me:2164: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
 else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1240: checking for non-GNU ld" >&5
+  echo "$as_me:2167: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
 fi
-if eval "test \"`echo '$''{'acl_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${acl_cv_path_LD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
@@ -1265,15 +2194,19 @@ fi
 
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
+  echo "$as_me:2197: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:2200: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1275: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'acl_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+test -z "$LD" && { { echo "$as_me:2203: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+echo "$as_me:2206: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+if test "${acl_cv_prog_gnu_ld+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
@@ -1282,43 +2215,25 @@ else
   acl_cv_prog_gnu_ld=no
 fi
 fi
-
-echo "$ac_t""$acl_cv_prog_gnu_ld" 1>&6
+echo "$as_me:2218: result: $acl_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
-
-
-      if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-
-
-                                                echo $ac_n "checking for shared library run path origin""... $ac_c" 1>&6
-echo "configure:1309: checking for shared library run path origin" >&5
-if eval "test \"`echo '$''{'acl_cv_rpath'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+                                                echo "$as_me:2222: checking for shared library run path origin" >&5
+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
+if test "${acl_cv_rpath+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
+
     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
     ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
     . ./conftest.sh
     rm -f ./conftest.sh
     acl_cv_rpath=done
-  
-fi
 
-echo "$ac_t""$acl_cv_rpath" 1>&6
+fi
+echo "$as_me:2235: result: $acl_cv_rpath" >&5
+echo "${ECHO_T}$acl_cv_rpath" >&6
   wl="$acl_cv_wl"
   libext="$acl_cv_libext"
   shlibext="$acl_cv_shlibext"
@@ -1328,50 +2243,50 @@ echo "$ac_t""$acl_cv_rpath" 1>&6
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
   sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
   sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
+    # Check whether --enable-rpath or --disable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+  enableval="$enable_rpath"
+  :
+else
+  enable_rpath=yes
+fi;
 
-
-  
-  
-  
-  
-  echo $ac_n "checking how to link with librpathy""... $ac_c" 1>&6
-echo "configure:1339: checking how to link with librpathy" >&5
-if eval "test \"`echo '$''{'ac_cv_librpathy_libs'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:2254: checking how to link with librpathy" >&5
+echo $ECHO_N "checking how to link with librpathy... $ECHO_C" >&6
+if test "${ac_cv_librpathy_libs+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
-    
-  
+
     use_additional=yes
-  
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
-  
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
-  # Check whether --with-librpathy-prefix or --without-librpathy-prefix was given.
+# Check whether --with-librpathy-prefix or --without-librpathy-prefix was given.
 if test "${with_librpathy_prefix+set}" = set; then
   withval="$with_librpathy_prefix"
-  
+
     if test "X$withval" = "Xno"; then
       use_additional=no
     else
       if test "X$withval" = "X"; then
-        
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
           eval additional_includedir=\"$includedir\"
           eval additional_libdir=\"$libdir\"
-        
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
@@ -1381,8 +2296,7 @@ if test "${with_librpathy_prefix+set}" = set; then
       fi
     fi
 
-fi
-
+fi;
       LIBRPATHY=
   LTLIBRPATHY=
   INCRPATHY=
@@ -1438,7 +2352,7 @@ fi
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBRPATHY; do
-              
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1475,7 +2389,7 @@ fi
           if test "X$found_dir" != "X"; then
                         LTLIBRPATHY="${LTLIBRPATHY}${LTLIBRPATHY:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "X$found_dir" = "X/usr/lib"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
                                 LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so"
               else
                                                                                 haveit=
@@ -1506,7 +2420,7 @@ fi
                   else
                                                                                 haveit=
                     for x in $LDFLAGS $LIBRPATHY; do
-                      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1557,7 +2471,7 @@ fi
                 fi
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCRPATHY; do
-                    
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1602,7 +2516,7 @@ fi
                       if test -z "$haveit"; then
                         haveit=
                         for x in $LDFLAGS $LIBRPATHY; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1623,7 +2537,7 @@ fi
                         fi
                         haveit=
                         for x in $LDFLAGS $LTLIBRPATHY; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1647,25 +2561,27 @@ fi
                     ;;
                   -R*)
                     dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $dir"
-                    fi
-                                                            haveit=
-                    for x in $ltrpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      ltrpathdirs="$ltrpathdirs $dir"
                     fi
                     ;;
                   -l*)
@@ -1719,18 +2635,18 @@ fi
     ac_cv_librpathy_libs="$LIBRPATHY"
     ac_cv_librpathy_ltlibs="$LTLIBRPATHY"
     ac_cv_librpathy_cppflags="$INCRPATHY"
-  
-fi
 
-echo "$ac_t""$ac_cv_librpathy_libs" 1>&6
+fi
+echo "$as_me:2640: result: $ac_cv_librpathy_libs" >&5
+echo "${ECHO_T}$ac_cv_librpathy_libs" >&6
   LIBRPATHY="$ac_cv_librpathy_libs"
   LTLIBRPATHY="$ac_cv_librpathy_ltlibs"
   INCRPATHY="$ac_cv_librpathy_cppflags"
-  
+
   for element in $INCRPATHY; do
     haveit=
     for x in $CPPFLAGS; do
-      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1749,299 +2665,661 @@ echo "$ac_t""$ac_cv_librpathy_libs" 1>&6
     fi
   done
 
-  
-  
       HAVE_LIBRPATHY=yes
-  
-  
 
-
-trap '' 1 2 15
-cat > confcache <<\EOF
+ac_config_files="$ac_config_files Makefile"
+cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
 #
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
 #
-EOF
+# `ac_cv_env_foo' variables (set or unset) will be overriden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 # So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+        "s/'/'\\\\''/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if cmp -s $cache_file confcache; then :; else
   if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
   else
     echo "not updating unwritable cache $cache_file"
   fi
 fi
 rm -f confcache
 
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[ 	]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[ 	]*$//;
+}'
 fi
 
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then we branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+cat >confdef2opt.sed <<\EOF
+t clear
+: clear
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+d
+: quote
+s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
+s,\[,\\&,g
+s,\],\\&,g
+s,\$,$$,g
+p
 EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
+# We use echo to avoid assuming a particular line-breaking character.
+# The extra dot is to prevent the shell from consuming trailing
+# line-breaks from the sub-command output.  A line-break within
+# single-quotes doesn't work because, if this script is created in a
+# platform that uses two characters for line-breaks (e.g., DOS), tr
+# would break.
+ac_LF_and_DOT=`echo; echo .`
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+rm -f confdef2opt.sed
 
-# Without the "./", some shells look in PATH for config.status.
 : ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ echo "$as_me:2780: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
+#! $SHELL
 # Generated automatically by configure.
 # Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
 # Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
+# configure, is in config.log if it exists.
 
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
+debug=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+ac_cs_invocation="\$0 \$@"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+# NLS nuisances.
+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+
+exec 6>&1
+
+_ACEOF
+
+# Files that config.status was made for.
+if test -n "$ac_config_files"; then
+  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_headers"; then
+  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_links"; then
+  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_commands"; then
+  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+fi
+
+cat >>$CONFIG_STATUS <<\EOF
+
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTIONS] [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number, then exit
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+  --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Configuration commands:
+$config_commands
+
+Report bugs to <bug-autoconf@gnu.org>."
+EOF
+
+cat >>$CONFIG_STATUS <<EOF
+ac_cs_version="\\
+config.status
+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
+Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+srcdir=$srcdir
+INSTALL="$INSTALL"
+EOF
+
+cat >>$CONFIG_STATUS <<\EOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
+ac_need_defaults=:
+while test $# != 0
 do
-  case "\$ac_option" in
+  case $1 in
+  --*=*)
+    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+    shift
+    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
+    shift
+    ;;
+  -*);;
+  *) # This is not an option, so the user has probably given explicit
+     # arguments.
+     ac_need_defaults=false;;
+  esac
+
+  case $1 in
+  # Handling of the options.
+EOF
+cat >>$CONFIG_STATUS <<EOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
+    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
+    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
+EOF
+cat >>$CONFIG_STATUS <<\EOF
+  --version | --vers* | -V )
+    echo "$ac_cs_version"; exit 0 ;;
+  --he | --h)
+    # Conflict between --help and --header
+    { { echo "$as_me:2951: 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;}
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit 0 ;;
+  --debug | --d* | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    shift
+    CONFIG_FILES="$CONFIG_FILES $1"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $1"
+    ac_need_defaults=false;;
+
+  # This is an error.
+  -*) { { echo "$as_me:2970: 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; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1" ;;
+
   esac
+  shift
 done
 
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
+exec 5>>config.log
+cat >&5 << _ACEOF
+
+## ----------------------- ##
+## Running config.status.  ##
+## ----------------------- ##
+
+This file was extended by $as_me 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`
 
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+_ACEOF
 EOF
-cat >> $CONFIG_STATUS <<EOF
 
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@EXEEXT@%$EXEEXT%g
-s%@OBJEXT@%$OBJEXT%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@AMTAR@%$AMTAR%g
-s%@install_sh@%$install_sh%g
-s%@INSTALL_STRIP_PROGRAM@%$INSTALL_STRIP_PROGRAM%g
-s%@AWK@%$AWK%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@AMDEP_TRUE@%$AMDEP_TRUE%g
-s%@AMDEP_FALSE@%$AMDEP_FALSE%g
-s%@AMDEPBACKSLASH@%$AMDEPBACKSLASH%g
-s%@DEPDIR@%$DEPDIR%g
-s%@CC@%$CC%g
-s%@am__include@%$am__include%g
-s%@am__quote@%$am__quote%g
-s%@CCDEPMODE@%$CCDEPMODE%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@LIBRPATHY@%$LIBRPATHY%g
-s%@LTLIBRPATHY@%$LTLIBRPATHY%g
-s%@global_top_srcdir@%$global_top_srcdir%g
+cat >>$CONFIG_STATUS <<EOF
+#
+# INIT-COMMANDS section.
+#
+
+AMDEP_TRUE="$AMDEP_TRUE"
+ac_aux_dir="$ac_aux_dir"
 
-CEOF
 EOF
 
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
+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" ;;
+  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+  *) { { echo "$as_me:3017: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
 done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
+
+# 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
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
+
+# Create a temporary directory, and hook for its removal unless debugging.
+$debug ||
+{
+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+
+# Create a (secure) tmp directory for tmp files.
+: ${TMPDIR=/tmp}
+{
+  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=$TMPDIR/cs$$-$RANDOM
+  (umask 077 && mkdir $tmp)
+} ||
+{
+   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+   { (exit 1); exit 1; }
+}
+
+EOF
+
+cat >>$CONFIG_STATUS <<EOF
+
+#
+# CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "\$CONFIG_FILES"; then
+  # Protect against being on the right side of a sed subst in config.status.
+  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+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,@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,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@DEFS@,$DEFS,;t t
+s,@LIBS@,$LIBS,;t t
+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@PACKAGE@,$PACKAGE,;t t
+s,@VERSION@,$VERSION,;t t
+s,@EXEEXT@,$EXEEXT,;t t
+s,@OBJEXT@,$OBJEXT,;t t
+s,@ACLOCAL@,$ACLOCAL,;t t
+s,@AUTOCONF@,$AUTOCONF,;t t
+s,@AUTOMAKE@,$AUTOMAKE,;t t
+s,@AUTOHEADER@,$AUTOHEADER,;t t
+s,@MAKEINFO@,$MAKEINFO,;t t
+s,@AMTAR@,$AMTAR,;t t
+s,@install_sh@,$install_sh,;t t
+s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+s,@AWK@,$AWK,;t t
+s,@SET_MAKE@,$SET_MAKE,;t t
+s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
+s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
+s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+s,@DEPDIR@,$DEPDIR,;t t
+s,@CC@,$CC,;t t
+s,@CFLAGS@,$CFLAGS,;t t
+s,@LDFLAGS@,$LDFLAGS,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@ac_ct_CC@,$ac_ct_CC,;t t
+s,@am__include@,$am__include,;t t
+s,@am__quote@,$am__quote,;t t
+s,@CCDEPMODE@,$CCDEPMODE,;t t
+s,@build@,$build,;t t
+s,@build_cpu@,$build_cpu,;t t
+s,@build_vendor@,$build_vendor,;t t
+s,@build_os@,$build_os,;t t
+s,@host@,$host,;t t
+s,@host_cpu@,$host_cpu,;t t
+s,@host_vendor@,$host_vendor,;t t
+s,@host_os@,$host_os,;t t
+s,@LIBRPATHY@,$LIBRPATHY,;t t
+s,@LTLIBRPATHY@,$LTLIBRPATHY,;t t
+s,@global_top_srcdir@,$global_top_srcdir,;t t
+CEOF
+
 EOF
 
-cat >> $CONFIG_STATUS <<EOF
+  cat >>$CONFIG_STATUS <<\EOF
+  # Split the substitutions into bite-sized pieces for seds with
+  # small command number limits, like on Digital OSF/1 and HP-UX.
+  ac_max_sed_lines=48
+  ac_sed_frag=1 # Number of current file.
+  ac_beg=1 # First line for current file.
+  ac_end=$ac_max_sed_lines # Line after last line for current file.
+  ac_more_lines=:
+  ac_sed_cmds=
+  while $ac_more_lines; do
+    if test $ac_beg -gt 1; then
+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    else
+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    fi
+    if test ! -s $tmp/subs.frag; then
+      ac_more_lines=false
+    else
+      # The purpose of the label and of the branching condition is to
+      # speed up the sed processing (if there are no `@' at all, there
+      # is no need to browse any of the substitutions).
+      # These are the two extra sed commands mentioned above.
+      (echo ':t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+      if test -z "$ac_sed_cmds"; then
+  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+      else
+  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+      fi
+      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_beg=$ac_end
+      ac_end=`expr $ac_end + $ac_max_sed_lines`
+    fi
+  done
+  if test -z "$ac_sed_cmds"; then
+    ac_sed_cmds=cat
+  fi
+fi # test -n "$CONFIG_FILES"
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
 EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+cat >>$CONFIG_STATUS <<\EOF
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+        cat >$tmp/stdin
+        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
   esac
 
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+  ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_file" : 'X\(//\)[^/]' \| \
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
   if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+    { case "$ac_dir" in
+  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+  *)                      as_incr_dir=.;;
+esac
+as_dummy="$ac_dir"
+for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+  case $as_mkdir_dir in
+    # Skip DOS drivespec
+    ?:) as_incr_dir=$as_mkdir_dir ;;
+    *)
+      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
+    ;;
+  esac
+done; }
+
+    ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`"
     # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+    ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'`
   else
     ac_dir_suffix= ac_dots=
   fi
 
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+  case $srcdir in
+  .)  ac_srcdir=.
+      if test -z "$ac_dots"; then
+         ac_top_srcdir=.
+      else
+         ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
+      fi ;;
+  [\\/]* | ?:[\\/]* )
+      ac_srcdir=$srcdir$ac_dir_suffix;
+      ac_top_srcdir=$srcdir ;;
   *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+    ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_dots$srcdir ;;
   esac
 
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_dots$INSTALL ;;
   esac
 
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:3252: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
+  # Let's still pretend it is `configure' which instantiates (i.e., don't
+  # use $as_me), people would be surprised to read:
+  #    /* config.h.  Generated automatically by config.status.  */
+  configure_input="Generated automatically from `echo $ac_file_in |
+                                                 sed 's,.*/,,'` by configure."
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+         # Absolute (can't be DOS-style, as IFS=:)
+         test -f "$f" || { { echo "$as_me:3270: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         echo $f;;
+      *) # Relative
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$srcdir/$f"; then
+           # Source tree
+           echo $srcdir/$f
+         else
+           # /dev/null tree
+           { { echo "$as_me:3283: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         fi;;
+      esac
+    done` || { (exit 1); exit 1; }
 EOF
-cat >> $CONFIG_STATUS <<EOF
-AMDEP_TRUE="$AMDEP_TRUE"
-ac_aux_dir="$ac_aux_dir"
+cat >>$CONFIG_STATUS <<EOF
+  sed "$ac_vpsub
+$extrasub
+EOF
+cat >>$CONFIG_STATUS <<\EOF
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@configure_input@,$configure_input,;t t
+s,@srcdir@,$ac_srcdir,;t t
+s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@INSTALL@,$ac_INSTALL,;t t
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+  rm -f $tmp/stdin
+  if test x"$ac_file" != x-; then
+    mv $tmp/out $ac_file
+  else
+    cat $tmp/out
+    rm -f $tmp/out
+  fi
 
+done
 EOF
-cat >> $CONFIG_STATUS <<\EOF
+cat >>$CONFIG_STATUS <<\EOF
 
+#
+# CONFIG_COMMANDS section.
+#
+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+
+  case $ac_dest in
+    default-1 )
 test x"$AMDEP_TRUE" != x"" ||
 for mf in $CONFIG_FILES; do
   case "$mf" in
@@ -2079,11 +3357,33 @@ for mf in $CONFIG_FILES; do
     echo '# dummy' > "$dirpart/$file"
   done
 done
+ ;;
+  esac
+done
+EOF
 
+cat >>$CONFIG_STATUS <<\EOF
 
-exit 0
+{ (exit 0); exit 0; }
 EOF
 chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+ac_clean_files=$ac_clean_files_save
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || { (exit 1); exit 1; }
+fi
 
diff --git a/tests/rpathlyx/Makefile.in b/tests/rpathlyx/Makefile.in
index 20cded962..94c6164ce 100644
--- a/tests/rpathlyx/Makefile.in
+++ b/tests/rpathlyx/Makefile.in
@@ -65,6 +65,7 @@ EXEEXT = @EXEEXT@
 HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LIB = @LIB@
+LTLIB = @LTLIB@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
diff --git a/tests/rpathlyx/aclocal.m4 b/tests/rpathlyx/aclocal.m4
index 0494463ac..297583801 100644
--- a/tests/rpathlyx/aclocal.m4
+++ b/tests/rpathlyx/aclocal.m4
@@ -491,7 +491,7 @@ else
   $1_FALSE=
 fi])
 
-# lib-link.m4 serial 2 (gettext-0.11.2)
+# lib-link.m4 serial 3 (gettext-0.11.3)
 dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -609,6 +609,10 @@ AC_DEFUN([AC_LIB_RPATH],
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
   sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
   sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE(rpath,
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
 ])
 
 dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
@@ -738,7 +742,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
               dnl Linking with a shared library. We attempt to hardcode its
               dnl directory into the executable's runpath, unless it's the
               dnl standard /usr/lib.
-              if test "X$found_dir" = "X/usr/lib"; then
+              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
                 dnl No hardcoding is needed.
                 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
               else
@@ -929,29 +933,31 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                     ;;
                   -R*)
                     dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $dir"
-                    fi
-                    dnl Potentially add DIR to ltrpathdirs.
-                    dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                    haveit=
-                    for x in $ltrpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      ltrpathdirs="$ltrpathdirs $dir"
                     fi
                     ;;
                   -l*)
diff --git a/tests/rpathlyx/configure b/tests/rpathlyx/configure
index 647b92cf0..039b01adf 100755
--- a/tests/rpathlyx/configure
+++ b/tests/rpathlyx/configure
@@ -1,37 +1,119 @@
 #! /bin/sh
-
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Generated by Autoconf 2.52.
 #
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
-# Defaults:
-ac_help=
+# 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
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+# NLS nuisances.
+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+exec 6>&1
+
+#
+# Initializations.
+#
 ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --disable-dependency-tracking Speeds up one-time builds
-  --enable-dependency-tracking  Do not reject slow dependency extractors"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-ac_help="$ac_help
-  --with-librpathx-prefix[=DIR]  search for librpathx in DIR/include and DIR/lib
-  --without-librpathx-prefix     don't search for librpathx in includedir and libdir"
-ac_help="$ac_help
-  --with-librpathy-prefix[=DIR]  search for librpathy in DIR/include and DIR/lib
-  --without-librpathy-prefix     don't search for librpathy in includedir and libdir"
+cross_compiling=no
+subdirs=
+MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete.  It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
+
+ac_unique_file="configure.in"
 
 # Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
 # The variables have the same names as the options, with
 # dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
+cache_file=/dev/null
 exec_prefix=NONE
-host=NONE
 no_create=
-nonopt=NONE
 no_recursion=
 prefix=NONE
 program_prefix=NONE
@@ -40,10 +122,15 @@ program_transform_name=s,x,x,
 silent=
 site=
 srcdir=
-target=NONE
 verbose=
 x_includes=NONE
 x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
@@ -57,17 +144,16 @@ oldincludedir='/usr/include'
 infodir='${prefix}/info'
 mandir='${prefix}/man'
 
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
+# Identity of this package.
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
 
 ac_prev=
 for ac_option
 do
-
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
     eval "$ac_prev=\$ac_option"
@@ -75,59 +161,59 @@ do
     continue
   fi
 
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case "$ac_option" in
+  case $ac_option in
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
   -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
+    bindir=$ac_optarg ;;
 
   -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
+    ac_prev=build_alias ;;
   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
+    build_alias=$ac_optarg ;;
 
   -cache-file | --cache-file | --cache-fil | --cache-fi \
   | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
     ac_prev=cache_file ;;
   -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
   | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
 
   -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
     ac_prev=datadir ;;
   -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
   | --da=*)
-    datadir="$ac_optarg" ;;
+    datadir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
+    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'`
+    eval "enable_$ac_feature=no" ;;
 
   -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
+    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'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
+    eval "enable_$ac_feature='$ac_optarg'" ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -136,95 +222,47 @@ do
   -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
   | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
   | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
+    exec_prefix=$ac_optarg ;;
 
   -gas | --gas | --ga | --g)
     # Obsolete; use --with-gas.
     with_gas=yes ;;
 
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
 
   -host | --host | --hos | --ho)
-    ac_prev=host ;;
+    ac_prev=host_alias ;;
   -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
+    host_alias=$ac_optarg ;;
 
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
   -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
   | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
+    includedir=$ac_optarg ;;
 
   -infodir | --infodir | --infodi | --infod | --info | --inf)
     ac_prev=infodir ;;
   -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
+    infodir=$ac_optarg ;;
 
   -libdir | --libdir | --libdi | --libd)
     ac_prev=libdir ;;
   -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
+    libdir=$ac_optarg ;;
 
   -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
   | --libexe | --libex | --libe)
     ac_prev=libexecdir ;;
   -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
   | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
+    libexecdir=$ac_optarg ;;
 
   -localstatedir | --localstatedir | --localstatedi | --localstated \
   | --localstate | --localstat | --localsta | --localst \
@@ -233,12 +271,12 @@ EOF
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
   | --localstate=* | --localstat=* | --localsta=* | --localst=* \
   | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
+    localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
     ac_prev=mandir ;;
   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
+    mandir=$ac_optarg ;;
 
   -nfp | --nfp | --nf)
     # Obsolete; use --without-fp.
@@ -259,26 +297,26 @@ EOF
   -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
   | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
   | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
+    oldincludedir=$ac_optarg ;;
 
   -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
     ac_prev=prefix ;;
   -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
+    prefix=$ac_optarg ;;
 
   -program-prefix | --program-prefix | --program-prefi | --program-pref \
   | --program-pre | --program-pr | --program-p)
     ac_prev=program_prefix ;;
   -program-prefix=* | --program-prefix=* | --program-prefi=* \
   | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
+    program_prefix=$ac_optarg ;;
 
   -program-suffix | --program-suffix | --program-suffi | --program-suff \
   | --program-suf | --program-su | --program-s)
     ac_prev=program_suffix ;;
   -program-suffix=* | --program-suffix=* | --program-suffi=* \
   | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
+    program_suffix=$ac_optarg ;;
 
   -program-transform-name | --program-transform-name \
   | --program-transform-nam | --program-transform-na \
@@ -295,7 +333,7 @@ EOF
   | --program-transfo=* | --program-transf=* \
   | --program-trans=* | --program-tran=* \
   | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
+    program_transform_name=$ac_optarg ;;
 
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
@@ -305,7 +343,7 @@ EOF
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
   | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
+    sbindir=$ac_optarg ;;
 
   -sharedstatedir | --sharedstatedir | --sharedstatedi \
   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
@@ -316,58 +354,57 @@ EOF
   | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
   | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
   | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
+    sharedstatedir=$ac_optarg ;;
 
   -site | --site | --sit)
     ac_prev=site ;;
   -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
+    site=$ac_optarg ;;
 
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
+    srcdir=$ac_optarg ;;
 
   -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
   | --syscon | --sysco | --sysc | --sys | --sy)
     ac_prev=sysconfdir ;;
   -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
   | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
+    sysconfdir=$ac_optarg ;;
 
   -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
+    ac_prev=target_alias ;;
   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
+    target_alias=$ac_optarg ;;
 
   -v | -verbose | --verbose | --verbos | --verbo | --verb)
     verbose=yes ;;
 
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
+    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'`
-    case "$ac_option" in
-      *=*) ;;
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
+    eval "with_$ac_package='$ac_optarg'" ;;
 
   -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
+    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'`
+    eval "with_$ac_package=no" ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -378,98 +415,98 @@ EOF
     ac_prev=x_includes ;;
   -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
   | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
+    x_includes=$ac_optarg ;;
 
   -x-libraries | --x-libraries | --x-librarie | --x-librari \
   | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
     ac_prev=x_libraries ;;
   -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
+    x_libraries=$ac_optarg ;;
 
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
     ;;
 
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    eval "$ac_envvar='$ac_optarg'"
+    export $ac_envvar ;;
+
   *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
+    # FIXME: should be removed in autoconf 3.0.
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    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}
     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  { echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
 fi
-exec 5>./config.log
 
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
+# 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
 
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+              localstatedir libdir includedir oldincludedir infodir mandir
 do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* ) ;;
+    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
   esac
 done
 
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: should be removed in autoconf 3.0.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
 
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
 
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=configure.in
+test "$silent" = yes && exec 6>/dev/null
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then its parent.
   ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+  ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
   test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir
   if test ! -r $srcdir/$ac_unique_file; then
@@ -480,13 +517,315 @@ else
 fi
 if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
+   { (exit 1); exit 1; }; }
   else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources in $srcdir" >&2
+   { (exit 1); exit 1; }; }
   fi
 fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<EOF
+\`configure' configures this package to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
 
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+EOF
+
+  cat <<EOF
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
+EOF
+
+  cat <<\EOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       build programs to run on HOST [BUILD]
+EOF
+fi
+
+if test -n "$ac_init_help"; then
+
+  cat <<\EOF
+
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-dependency-tracking Speeds up one-time builds
+  --enable-dependency-tracking  Do not reject slow dependency extractors
+  --disable-rpath         do not hardcode runtime library paths
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-gnu-ld           assume the C compiler uses GNU ld default=no
+  --with-librpathx-prefix=DIR  search for librpathx in DIR/include and DIR/lib
+  --without-librpathx-prefix     don't search for librpathx in includedir and libdir
+  --with-librpathy-prefix=DIR  search for librpathy in DIR/include and DIR/lib
+  --without-librpathy-prefix     don't search for librpathy in includedir and libdir
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+              headers in a nonstandard directory <include dir>
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+EOF
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  ac_popdir=`pwd`
+  for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
+    cd $ac_subdir
+    # A "../" for each directory in /$ac_subdir.
+    ac_dots=`echo $ac_subdir |
+             sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
+
+    case $srcdir in
+    .) # No --srcdir option.  We are building in place.
+      ac_sub_srcdir=$srcdir ;;
+    [\\/]* | ?:[\\/]* ) # Absolute path.
+      ac_sub_srcdir=$srcdir/$ac_subdir ;;
+    *) # Relative path.
+      ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
+    esac
+
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_sub_srcdir/configure.gnu; then
+      echo
+      $SHELL $ac_sub_srcdir/configure.gnu  --help=recursive
+    elif test -f $ac_sub_srcdir/configure; then
+      echo
+      $SHELL $ac_sub_srcdir/configure  --help=recursive
+    elif test -f $ac_sub_srcdir/configure.ac ||
+           test -f $ac_sub_srcdir/configure.in; then
+      echo
+      $ac_configure --help
+    else
+      echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
+    fi
+    cd $ac_popdir
+  done
+fi
+
+test -n "$ac_init_help" && exit 0
+if $ac_init_version; then
+  cat <<\EOF
+
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+EOF
+  exit 0
+fi
+exec 5>config.log
+cat >&5 <<EOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by $as_me, which was
+generated by GNU Autoconf 2.52.  Invocation command line was
+
+  $ $0 $@
+
+EOF
+{
+cat <<_ASUNAME
+## ---------- ##
+## Platform.  ##
+## ---------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+PATH = $PATH
+
+_ASUNAME
+} >&5
+
+cat >&5 <<EOF
+## ------------ ##
+## Core tests.  ##
+## ------------ ##
+
+EOF
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell meta-characters.
+ac_configure_args=
+ac_sep=
+for ac_arg
+do
+  case $ac_arg in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c) ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
+    ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+    ac_sep=" " ;;
+  *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg"
+     ac_sep=" " ;;
+  esac
+  # Get rid of the leading space.
+done
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  echo >&5
+  echo "## ----------------- ##" >&5
+  echo "## Cache variables.  ##" >&5
+  echo "## ----------------- ##" >&5
+  echo >&5
+  # The following way of writing the cache mishandles newlines in values,
+{
+  (set) 2>&1 |
+    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      sed -n \
+        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+      ;;
+    *)
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} >&5
+  sed "/^$/d" confdefs.h >conftest.log
+  if test -s conftest.log; then
+    echo >&5
+    echo "## ------------ ##" >&5
+    echo "## confdefs.h.  ##" >&5
+    echo "## ------------ ##" >&5
+    echo >&5
+    cat conftest.log >&5
+  fi
+  (echo; echo) >&5
+  test "$ac_signal" != 0 &&
+    echo "$as_me: caught signal $ac_signal" >&5
+  echo "$as_me: exit $exit_status" >&5
+  rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files &&
+    exit $exit_status
+     ' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
+
+# Let the site file select an alternate cache file if it wants to.
 # Prefer explicitly selected file to automatically selected ones.
 if test -z "$CONFIG_SITE"; then
   if test "x$prefix" != xNONE; then
@@ -497,40 +836,107 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
+    { echo "$as_me:839: 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"
   fi
 done
 
 if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
+  # 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:850: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . $cache_file;;
+      *)                      . ./$cache_file;;
+    esac
+  fi
 else
-  echo "creating cache $cache_file"
-  > $cache_file
+  { echo "$as_me:858: 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.
+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
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+  eval ac_new_val="\$ac_env_${ac_var}_value"
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { echo "$as_me:874: 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)
+      { echo "$as_me:878: 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
+        { echo "$as_me:884: 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:886:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+        { echo "$as_me:888:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+        ac_cache_corrupted=:
+      fi;;
+  esac
+  # Pass precious variables to config.status.  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
+if $ac_cache_corrupted; then
+  { echo "$as_me:907: 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:909: 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
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
+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
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)      ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+echo "#! $SHELL" >conftest.sh
+echo  "exit 0"   >>conftest.sh
+chmod +x conftest.sh
+if { (echo "$as_me:929: PATH=\".;.\"; conftest.sh") >&5
+  (PATH=".;."; conftest.sh) 2>&5
+  ac_status=$?
+  echo "$as_me:932: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  ac_path_separator=';'
 else
-  ac_n= ac_c='\c' ac_t=
+  ac_path_separator=:
 fi
-
+PATH_SEPARATOR="$ac_path_separator"
+rm -f conftest.sh
 
 ac_aux_dir=
 for ac_dir in $global_top_srcdir ../..; do
@@ -542,18 +948,20 @@ for ac_dir in $global_top_srcdir ../..; do
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
+  elif test -f $ac_dir/shtool; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $global_top_srcdir ../.." 1>&2; exit 1; }
+  { { echo "$as_me:958: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -562,31 +970,39 @@ am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:571: checking for a BSD compatible install" >&5
+echo "$as_me:978: 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 eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${ac_cv_path_install+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+    ac_save_IFS=$IFS; IFS=$ac_path_separator
   for ac_dir in $PATH; do
+    IFS=$ac_save_IFS
     # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    case $ac_dir/ in
+    / | ./ | .// | /cC/* \
+    | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
+    | /usr/ucb/* ) ;;
     *)
       # OSF1 and SCO ODT 3.0 have their own names for install.
       # Don't use installbsd from OSF since it installs stuff as root
       # by default.
       for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
+        if $as_executable_p "$ac_dir/$ac_prog"; then
 	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+            grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
 	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
 	  else
 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
 	    break 2
@@ -596,31 +1012,31 @@ else
       ;;
     esac
   done
-  IFS="$ac_save_IFS"
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
+    INSTALL=$ac_cv_path_install
   else
     # As a last resort, use the slow shell script.  We don't cache a
     # path for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
+    INSTALL=$ac_install_sh
   fi
 fi
-echo "$ac_t""$INSTALL" 1>&6
+echo "$as_me:1027: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:624: checking whether build environment is sane" >&5
+echo "$as_me:1038: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -643,8 +1059,11 @@ 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".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
+      { { echo "$as_me:1062: 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;}
+   { (exit 1); exit 1; }; }
    fi
 
    test "$2" = conftest.file
@@ -653,28 +1072,29 @@ then
    # Ok.
    :
 else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
+   { { echo "$as_me:1075: 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
+echo "$as_me:1081: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 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 &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+  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
 
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
 
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
@@ -683,82 +1103,86 @@ if eval "$MISSING --run true"; then
 else
   am_missing_run=
   am_backtick='`'
-  echo "configure: warning: ${am_backtick}missing' script is too old or missing" 1>&2
+  { echo "$as_me:1106: WARNING: ${am_backtick}missing' script is too old or missing" >&5
+echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;}
 fi
 
 for ac_prog in mawk gawk nawk awk
 do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:695: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1114: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AWK+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AWK="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_AWK="$ac_prog"
+echo "$as_me:1129: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-AWK="$ac_cv_prog_AWK"
+AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$ac_t""$AWK" 1>&6
+  echo "$as_me:1137: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1140: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-test -n "$AWK" && break
+  test -n "$AWK" && break
 done
 
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:725: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1147: 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 "(cached) $ECHO_C" >&6
 else
-  cat > conftestmake <<\EOF
+  cat >conftest.make <<\EOF
 all:
 	@echo 'ac_maketemp="${MAKE}"'
 EOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
 if test -n "$ac_maketemp"; then
   eval ac_cv_prog_make_${ac_make}_set=yes
 else
   eval ac_cv_prog_make_${ac_make}_set=no
 fi
-rm -f conftestmake
+rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+  echo "$as_me:1167: result: yes" >&5
+echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1171: result: no" >&5
+echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 # Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
 if test "${enable_dependency_tracking+set}" = set; then
   enableval="$enable_dependency_tracking"
-  :
-fi
 
+fi;
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
 fi
 
-
 if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
@@ -767,9 +1191,6 @@ else
   AMDEP_FALSE=
 fi
 
-
-
-
 rm -f .deps 2>/dev/null
 mkdir .deps 2>/dev/null
 if test -d .deps; then
@@ -780,25 +1201,26 @@ else
 fi
 rmdir .deps 2>/dev/null
 
-
 # test to see if srcdir already configured
 if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run \"make distclean\" there first" 1>&2; exit 1; }
+  { { echo "$as_me:1207: 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
 
 # Define the identity of the package.
-PACKAGE=gexttext_rpathlyx
+PACKAGE=gettext_rpathlyx
 VERSION=0
-cat >> confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
 
-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define VERSION "$VERSION"
 EOF
 
-
 # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
 # the ones we care about.
 
@@ -810,24 +1232,18 @@ EOF
 # requests that it be used.  This is a bit dumb.
 : ${OBJEXT=o}
 
-
 # Some tools Automake needs.
 
 ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"}
 
-
 AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
 
-
 AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"}
 
-
 AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
-
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-
 AMTAR=${AMTAR-"${am_missing_run}tar"}
 
 install_sh=${install_sh-"$am_aux_dir/install-sh"}
@@ -837,214 +1253,578 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 
-# Extract the first word of "gcc", so it can be a program name with args.
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+echo "$as_me:1264: 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
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1279: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:1287: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:1290: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:844: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1299: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="gcc"
+echo "$as_me:1314: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1322: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1325: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+echo "$as_me:1338: 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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1353: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1361: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:1364: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+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
+echo "$as_me:1373: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="cc"
+echo "$as_me:1388: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1396: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1399: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
 else
-  echo "$ac_t""no" 1>&6
+  CC="$ac_cv_prog_CC"
 fi
 
+fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:874: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1412: 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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+  ac_prog_rejected=yes
+  continue
+fi
+ac_cv_prog_CC="cc"
+echo "$as_me:1432: found $ac_dir/$ac_word" >&5
+break
+done
+
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
   set dummy $ac_cv_prog_CC
   shift
-  if test $# -gt 0; then
+  if test $# != 0; then
     # We chose a different compiler from the bogus one.
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
-    set dummy "$ac_dir/$ac_word" "$@"
+    set dummy "$ac_dir/$ac_word" ${1+"$@"}
     shift
     ac_cv_prog_CC="$@"
   fi
 fi
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1454: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1457: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:925: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl
+  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:1468: 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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1483: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1491: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1494: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+
+    test -n "$CC" && break
+  done
 fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl
+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:1507: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1522: found $ac_dir/$ac_word" >&5
+break
+done
 
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:957: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1530: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1533: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
 
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+  test -n "$ac_ct_CC" && break
+done
 
-cat > conftest.$ac_ext << EOF
+  CC=$ac_ct_CC
+fi
+
+fi
 
-#line 968 "configure"
+test -z "$CC" && { { echo "$as_me:1545: error: no acceptable cc found in \$PATH" >&5
+echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+
+# Provide some information about the compiler.
+echo "$as_me:1550:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:1553: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1556: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1558: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1561: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1563: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1566: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 1570 "configure"
 #include "confdefs.h"
 
-main(){return(0);}
-EOF
-if { (eval echo configure:973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_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.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+echo "$as_me:1586: 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[^ ]*//'`
+if { (eval echo "$as_me:1589: \"$ac_link_default\"") >&5
+  (eval $ac_link_default) 2>&5
+  ac_status=$?
+  echo "$as_me:1592: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # 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" : '[^.]*\(\..*\)'`
+          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
+          export ac_cv_exeext
+          break;;
+    * ) break;;
+  esac
+done
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:1615: 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:1621: 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 "$as_me:1626: 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'
+  { (eval echo "$as_me:1632: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1635: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no
   else
-    ac_cv_prog_cc_cross=yes
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { echo "$as_me:1642: 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;}
+   { (exit 1); exit 1; }; }
+    fi
   fi
+fi
+echo "$as_me:1650: 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 "$as_me:1657: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+echo "$as_me:1659: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6
+
+echo "$as_me:1662: checking for executable suffix" >&5
+echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+if { (eval echo "$as_me:1664: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:1667: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
+  case $ac_file in
+    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+          export ac_cv_exeext
+          break;;
+    * ) break;;
+  esac
+done
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
+  { { echo "$as_me:1683: 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 -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:999: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1004: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1013: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
+
+rm -f conftest$ac_cv_exeext
+echo "$as_me:1689: 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 "$as_me:1695: 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
-  ac_cv_prog_gcc=no
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1701 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (eval echo "$as_me:1713: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1716: \$? = $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
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:1728: 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:1735: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+echo "$as_me:1739: 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
+#line 1745 "configure"
+#include "confdefs.h"
 
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
 
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1760: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1763: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1766: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1769: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_compiler_gnu=yes
 else
-  GCC=
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_compiler_gnu=no
 fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1032: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+fi
+echo "$as_me:1781: 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 "$as_me:1787: 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
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1793 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1805: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1808: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1811: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1814: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
-  ac_cv_prog_cc_g=no
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_prog_cc_g=no
 fi
-rm -f conftest*
-
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+echo "$as_me:1824: 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"
+  CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
     CFLAGS="-g -O2"
@@ -1058,7 +1838,118 @@ else
     CFLAGS=
   fi
 fi
+# Some people use a C++ compiler to compile C.  Since we use `exit',
+# in C++ we need to declare it.  In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+  choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1851: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1854: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1857: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1860: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1872 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1885: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1888: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1891: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1894: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+continue
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1904 "configure"
+#include "confdefs.h"
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1916: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1919: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1922: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1925: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+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
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_config_commands="$ac_config_commands default-1"
 
 am_make=${MAKE-make}
 cat > confinc << 'END'
@@ -1066,8 +1957,8 @@ doit:
 	@echo done
 END
 # If we don't find an include directive, just comment out the code.
-echo $ac_n "checking for style of include used by $am_make""... $ac_c" 1>&6
-echo "configure:1071: checking for style of include used by $am_make" >&5
+echo "$as_me:1960: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
 am__include='#'
 am__quote=
 _am_result=none
@@ -1093,17 +1984,16 @@ if test "$am__include" = "#"; then
    fi
 fi
 
-
-echo "$ac_t""$_am_result" 1>&6
+echo "$as_me:1987: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6
 rm -f confinc confmf
 
-
 depcc="$CC"   am_compiler_list=
 
-echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6
-echo "configure:1105: checking dependency style of $depcc" >&5
-if eval "test \"`echo '$''{'am_cv_CC_dependencies_compiler_type'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1993: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -1162,37 +2052,76 @@ else
 fi
 
 fi
-
-echo "$ac_t""$am_cv_CC_dependencies_compiler_type" 1>&6
+echo "$as_me:2055: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
 
-
+      if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
 
 # Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1178: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:2076: error: cannot run $ac_config_sub" >&5
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+echo "$as_me:2080: 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
+else
+  ac_cv_build_alias=$build_alias
+test -z "$ac_cv_build_alias" &&
+  ac_cv_build_alias=`$ac_config_guess`
+test -z "$ac_cv_build_alias" &&
+  { { echo "$as_me:2089: 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:2093: 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:2098: 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 "$as_me:2105: 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
+else
+  ac_cv_host_alias=$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:2114: 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; }; }
 
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
+fi
+echo "$as_me:2119: 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/'`
 
 # Check whether --with-gnu-ld or --without-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
@@ -1200,13 +2129,12 @@ if test "${with_gnu_ld+set}" = set; then
   test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
-fi
-
+fi;
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1210: checking for ld used by GCC" >&5
+  echo "$as_me:2136: checking for ld used by GCC" >&5
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1235,14 +2163,14 @@ echo "configure:1210: checking for ld used by GCC" >&5
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1240: checking for GNU ld" >&5
+  echo "$as_me:2166: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
 else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1243: checking for non-GNU ld" >&5
+  echo "$as_me:2169: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
 fi
-if eval "test \"`echo '$''{'acl_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${acl_cv_path_LD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
@@ -1268,15 +2196,19 @@ fi
 
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
+  echo "$as_me:2199: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:2202: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1278: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'acl_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+test -z "$LD" && { { echo "$as_me:2205: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+echo "$as_me:2208: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+if test "${acl_cv_prog_gnu_ld+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
@@ -1285,43 +2217,25 @@ else
   acl_cv_prog_gnu_ld=no
 fi
 fi
-
-echo "$ac_t""$acl_cv_prog_gnu_ld" 1>&6
+echo "$as_me:2220: result: $acl_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
-
-
-      if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-
-
-                                                echo $ac_n "checking for shared library run path origin""... $ac_c" 1>&6
-echo "configure:1312: checking for shared library run path origin" >&5
-if eval "test \"`echo '$''{'acl_cv_rpath'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+                                                echo "$as_me:2224: checking for shared library run path origin" >&5
+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
+if test "${acl_cv_rpath+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
+
     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
     ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
     . ./conftest.sh
     rm -f ./conftest.sh
     acl_cv_rpath=done
-  
-fi
 
-echo "$ac_t""$acl_cv_rpath" 1>&6
+fi
+echo "$as_me:2237: result: $acl_cv_rpath" >&5
+echo "${ECHO_T}$acl_cv_rpath" >&6
   wl="$acl_cv_wl"
   libext="$acl_cv_libext"
   shlibext="$acl_cv_shlibext"
@@ -1331,50 +2245,50 @@ echo "$ac_t""$acl_cv_rpath" 1>&6
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
   sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
   sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
+    # Check whether --enable-rpath or --disable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+  enableval="$enable_rpath"
+  :
+else
+  enable_rpath=yes
+fi;
 
-
-  
-  
-  
-  
-  echo $ac_n "checking how to link with librpathx""... $ac_c" 1>&6
-echo "configure:1342: checking how to link with librpathx" >&5
-if eval "test \"`echo '$''{'ac_cv_librpathx_libs'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:2256: checking how to link with librpathx" >&5
+echo $ECHO_N "checking how to link with librpathx... $ECHO_C" >&6
+if test "${ac_cv_librpathx_libs+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
-    
-  
+
     use_additional=yes
-  
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
-  
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
-  # Check whether --with-librpathx-prefix or --without-librpathx-prefix was given.
+# Check whether --with-librpathx-prefix or --without-librpathx-prefix was given.
 if test "${with_librpathx_prefix+set}" = set; then
   withval="$with_librpathx_prefix"
-  
+
     if test "X$withval" = "Xno"; then
       use_additional=no
     else
       if test "X$withval" = "X"; then
-        
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
           eval additional_includedir=\"$includedir\"
           eval additional_libdir=\"$libdir\"
-        
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
@@ -1384,8 +2298,7 @@ if test "${with_librpathx_prefix+set}" = set; then
       fi
     fi
 
-fi
-
+fi;
       LIBRPATHX=
   LTLIBRPATHX=
   INCRPATHX=
@@ -1441,7 +2354,7 @@ fi
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBRPATHX; do
-              
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1478,7 +2391,7 @@ fi
           if test "X$found_dir" != "X"; then
                         LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "X$found_dir" = "X/usr/lib"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
                                 LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
               else
                                                                                 haveit=
@@ -1509,7 +2422,7 @@ fi
                   else
                                                                                 haveit=
                     for x in $LDFLAGS $LIBRPATHX; do
-                      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1560,7 +2473,7 @@ fi
                 fi
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCRPATHX; do
-                    
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1605,7 +2518,7 @@ fi
                       if test -z "$haveit"; then
                         haveit=
                         for x in $LDFLAGS $LIBRPATHX; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1626,7 +2539,7 @@ fi
                         fi
                         haveit=
                         for x in $LDFLAGS $LTLIBRPATHX; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1650,25 +2563,27 @@ fi
                     ;;
                   -R*)
                     dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $dir"
-                    fi
-                                                            haveit=
-                    for x in $ltrpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      ltrpathdirs="$ltrpathdirs $dir"
                     fi
                     ;;
                   -l*)
@@ -1722,18 +2637,18 @@ fi
     ac_cv_librpathx_libs="$LIBRPATHX"
     ac_cv_librpathx_ltlibs="$LTLIBRPATHX"
     ac_cv_librpathx_cppflags="$INCRPATHX"
-  
-fi
 
-echo "$ac_t""$ac_cv_librpathx_libs" 1>&6
+fi
+echo "$as_me:2642: result: $ac_cv_librpathx_libs" >&5
+echo "${ECHO_T}$ac_cv_librpathx_libs" >&6
   LIBRPATHX="$ac_cv_librpathx_libs"
   LTLIBRPATHX="$ac_cv_librpathx_ltlibs"
   INCRPATHX="$ac_cv_librpathx_cppflags"
-  
+
   for element in $INCRPATHX; do
     haveit=
     for x in $CPPFLAGS; do
-      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1752,55 +2667,44 @@ echo "$ac_t""$ac_cv_librpathx_libs" 1>&6
     fi
   done
 
-  
-  
       HAVE_LIBRPATHX=yes
-  
-  
-
-
-  
-  
-  
-  
-  echo $ac_n "checking how to link with librpathy""... $ac_c" 1>&6
-echo "configure:1768: checking how to link with librpathy" >&5
-if eval "test \"`echo '$''{'ac_cv_librpathy_libs'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    
-  
+
+  echo "$as_me:2672: checking how to link with librpathy" >&5
+echo $ECHO_N "checking how to link with librpathy... $ECHO_C" >&6
+if test "${ac_cv_librpathy_libs+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
     use_additional=yes
-  
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
-  
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
-  # Check whether --with-librpathy-prefix or --without-librpathy-prefix was given.
+# Check whether --with-librpathy-prefix or --without-librpathy-prefix was given.
 if test "${with_librpathy_prefix+set}" = set; then
   withval="$with_librpathy_prefix"
-  
+
     if test "X$withval" = "Xno"; then
       use_additional=no
     else
       if test "X$withval" = "X"; then
-        
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
           eval additional_includedir=\"$includedir\"
           eval additional_libdir=\"$libdir\"
-        
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
@@ -1810,8 +2714,7 @@ if test "${with_librpathy_prefix+set}" = set; then
       fi
     fi
 
-fi
-
+fi;
       LIBRPATHY=
   LTLIBRPATHY=
   INCRPATHY=
@@ -1867,7 +2770,7 @@ fi
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBRPATHY; do
-              
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1904,7 +2807,7 @@ fi
           if test "X$found_dir" != "X"; then
                         LTLIBRPATHY="${LTLIBRPATHY}${LTLIBRPATHY:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "X$found_dir" = "X/usr/lib"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
                                 LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so"
               else
                                                                                 haveit=
@@ -1935,7 +2838,7 @@ fi
                   else
                                                                                 haveit=
                     for x in $LDFLAGS $LIBRPATHY; do
-                      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1986,7 +2889,7 @@ fi
                 fi
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCRPATHY; do
-                    
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -2031,7 +2934,7 @@ fi
                       if test -z "$haveit"; then
                         haveit=
                         for x in $LDFLAGS $LIBRPATHY; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -2052,7 +2955,7 @@ fi
                         fi
                         haveit=
                         for x in $LDFLAGS $LTLIBRPATHY; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -2076,25 +2979,27 @@ fi
                     ;;
                   -R*)
                     dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $dir"
-                    fi
-                                                            haveit=
-                    for x in $ltrpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      ltrpathdirs="$ltrpathdirs $dir"
                     fi
                     ;;
                   -l*)
@@ -2148,18 +3053,18 @@ fi
     ac_cv_librpathy_libs="$LIBRPATHY"
     ac_cv_librpathy_ltlibs="$LTLIBRPATHY"
     ac_cv_librpathy_cppflags="$INCRPATHY"
-  
-fi
 
-echo "$ac_t""$ac_cv_librpathy_libs" 1>&6
+fi
+echo "$as_me:3058: result: $ac_cv_librpathy_libs" >&5
+echo "${ECHO_T}$ac_cv_librpathy_libs" >&6
   LIBRPATHY="$ac_cv_librpathy_libs"
   LTLIBRPATHY="$ac_cv_librpathy_ltlibs"
   INCRPATHY="$ac_cv_librpathy_cppflags"
-  
+
   for element in $INCRPATHY; do
     haveit=
     for x in $CPPFLAGS; do
-      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -2178,302 +3083,665 @@ echo "$ac_t""$ac_cv_librpathy_libs" 1>&6
     fi
   done
 
-  
-  
       HAVE_LIBRPATHY=yes
-  
-  
 
 LIBRPATHY="$LIBRPATHY $LIBRPATHX"
 
-trap '' 1 2 15
-cat > confcache <<\EOF
+ac_config_files="$ac_config_files Makefile"
+cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
 #
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
 #
-EOF
+# `ac_cv_env_foo' variables (set or unset) will be overriden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 # So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+        "s/'/'\\\\''/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if cmp -s $cache_file confcache; then :; else
   if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
   else
     echo "not updating unwritable cache $cache_file"
   fi
 fi
 rm -f confcache
 
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[ 	]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[ 	]*$//;
+}'
 fi
 
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then we branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+cat >confdef2opt.sed <<\EOF
+t clear
+: clear
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+d
+: quote
+s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
+s,\[,\\&,g
+s,\],\\&,g
+s,\$,$$,g
+p
 EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
+# We use echo to avoid assuming a particular line-breaking character.
+# The extra dot is to prevent the shell from consuming trailing
+# line-breaks from the sub-command output.  A line-break within
+# single-quotes doesn't work because, if this script is created in a
+# platform that uses two characters for line-breaks (e.g., DOS), tr
+# would break.
+ac_LF_and_DOT=`echo; echo .`
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+rm -f confdef2opt.sed
 
-# Without the "./", some shells look in PATH for config.status.
 : ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ echo "$as_me:3200: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
+#! $SHELL
 # Generated automatically by configure.
 # Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
 # Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
+# configure, is in config.log if it exists.
 
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
+debug=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+ac_cs_invocation="\$0 \$@"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+# NLS nuisances.
+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+
+exec 6>&1
+
+_ACEOF
+
+# Files that config.status was made for.
+if test -n "$ac_config_files"; then
+  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_headers"; then
+  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_links"; then
+  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_commands"; then
+  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+fi
+
+cat >>$CONFIG_STATUS <<\EOF
+
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTIONS] [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number, then exit
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+  --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Configuration commands:
+$config_commands
+
+Report bugs to <bug-autoconf@gnu.org>."
+EOF
+
+cat >>$CONFIG_STATUS <<EOF
+ac_cs_version="\\
+config.status
+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
+Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+srcdir=$srcdir
+INSTALL="$INSTALL"
+EOF
+
+cat >>$CONFIG_STATUS <<\EOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
+ac_need_defaults=:
+while test $# != 0
 do
-  case "\$ac_option" in
+  case $1 in
+  --*=*)
+    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+    shift
+    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
+    shift
+    ;;
+  -*);;
+  *) # This is not an option, so the user has probably given explicit
+     # arguments.
+     ac_need_defaults=false;;
+  esac
+
+  case $1 in
+  # Handling of the options.
+EOF
+cat >>$CONFIG_STATUS <<EOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
+    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
+    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
+EOF
+cat >>$CONFIG_STATUS <<\EOF
+  --version | --vers* | -V )
+    echo "$ac_cs_version"; exit 0 ;;
+  --he | --h)
+    # Conflict between --help and --header
+    { { echo "$as_me:3371: 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;}
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit 0 ;;
+  --debug | --d* | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    shift
+    CONFIG_FILES="$CONFIG_FILES $1"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $1"
+    ac_need_defaults=false;;
+
+  # This is an error.
+  -*) { { echo "$as_me:3390: 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; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1" ;;
+
   esac
+  shift
 done
 
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
+exec 5>>config.log
+cat >&5 << _ACEOF
+
+## ----------------------- ##
+## Running config.status.  ##
+## ----------------------- ##
+
+This file was extended by $as_me 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`
 
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+_ACEOF
 EOF
-cat >> $CONFIG_STATUS <<EOF
 
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@EXEEXT@%$EXEEXT%g
-s%@OBJEXT@%$OBJEXT%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@AMTAR@%$AMTAR%g
-s%@install_sh@%$install_sh%g
-s%@INSTALL_STRIP_PROGRAM@%$INSTALL_STRIP_PROGRAM%g
-s%@AWK@%$AWK%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@AMDEP_TRUE@%$AMDEP_TRUE%g
-s%@AMDEP_FALSE@%$AMDEP_FALSE%g
-s%@AMDEPBACKSLASH@%$AMDEPBACKSLASH%g
-s%@DEPDIR@%$DEPDIR%g
-s%@CC@%$CC%g
-s%@am__include@%$am__include%g
-s%@am__quote@%$am__quote%g
-s%@CCDEPMODE@%$CCDEPMODE%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@LIBRPATHX@%$LIBRPATHX%g
-s%@LTLIBRPATHX@%$LTLIBRPATHX%g
-s%@LIBRPATHY@%$LIBRPATHY%g
-s%@LTLIBRPATHY@%$LTLIBRPATHY%g
-s%@global_top_srcdir@%$global_top_srcdir%g
+cat >>$CONFIG_STATUS <<EOF
+#
+# INIT-COMMANDS section.
+#
+
+AMDEP_TRUE="$AMDEP_TRUE"
+ac_aux_dir="$ac_aux_dir"
 
-CEOF
 EOF
 
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
+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" ;;
+  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+  *) { { echo "$as_me:3437: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
 done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
+
+# 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
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
+
+# Create a temporary directory, and hook for its removal unless debugging.
+$debug ||
+{
+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+
+# Create a (secure) tmp directory for tmp files.
+: ${TMPDIR=/tmp}
+{
+  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=$TMPDIR/cs$$-$RANDOM
+  (umask 077 && mkdir $tmp)
+} ||
+{
+   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+   { (exit 1); exit 1; }
+}
+
+EOF
+
+cat >>$CONFIG_STATUS <<EOF
+
+#
+# CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "\$CONFIG_FILES"; then
+  # Protect against being on the right side of a sed subst in config.status.
+  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+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,@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,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@DEFS@,$DEFS,;t t
+s,@LIBS@,$LIBS,;t t
+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@PACKAGE@,$PACKAGE,;t t
+s,@VERSION@,$VERSION,;t t
+s,@EXEEXT@,$EXEEXT,;t t
+s,@OBJEXT@,$OBJEXT,;t t
+s,@ACLOCAL@,$ACLOCAL,;t t
+s,@AUTOCONF@,$AUTOCONF,;t t
+s,@AUTOMAKE@,$AUTOMAKE,;t t
+s,@AUTOHEADER@,$AUTOHEADER,;t t
+s,@MAKEINFO@,$MAKEINFO,;t t
+s,@AMTAR@,$AMTAR,;t t
+s,@install_sh@,$install_sh,;t t
+s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+s,@AWK@,$AWK,;t t
+s,@SET_MAKE@,$SET_MAKE,;t t
+s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
+s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
+s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+s,@DEPDIR@,$DEPDIR,;t t
+s,@CC@,$CC,;t t
+s,@CFLAGS@,$CFLAGS,;t t
+s,@LDFLAGS@,$LDFLAGS,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@ac_ct_CC@,$ac_ct_CC,;t t
+s,@am__include@,$am__include,;t t
+s,@am__quote@,$am__quote,;t t
+s,@CCDEPMODE@,$CCDEPMODE,;t t
+s,@build@,$build,;t t
+s,@build_cpu@,$build_cpu,;t t
+s,@build_vendor@,$build_vendor,;t t
+s,@build_os@,$build_os,;t t
+s,@host@,$host,;t t
+s,@host_cpu@,$host_cpu,;t t
+s,@host_vendor@,$host_vendor,;t t
+s,@host_os@,$host_os,;t t
+s,@LIBRPATHX@,$LIBRPATHX,;t t
+s,@LTLIBRPATHX@,$LTLIBRPATHX,;t t
+s,@LIBRPATHY@,$LIBRPATHY,;t t
+s,@LTLIBRPATHY@,$LTLIBRPATHY,;t t
+s,@global_top_srcdir@,$global_top_srcdir,;t t
+CEOF
+
 EOF
 
-cat >> $CONFIG_STATUS <<EOF
+  cat >>$CONFIG_STATUS <<\EOF
+  # Split the substitutions into bite-sized pieces for seds with
+  # small command number limits, like on Digital OSF/1 and HP-UX.
+  ac_max_sed_lines=48
+  ac_sed_frag=1 # Number of current file.
+  ac_beg=1 # First line for current file.
+  ac_end=$ac_max_sed_lines # Line after last line for current file.
+  ac_more_lines=:
+  ac_sed_cmds=
+  while $ac_more_lines; do
+    if test $ac_beg -gt 1; then
+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    else
+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    fi
+    if test ! -s $tmp/subs.frag; then
+      ac_more_lines=false
+    else
+      # The purpose of the label and of the branching condition is to
+      # speed up the sed processing (if there are no `@' at all, there
+      # is no need to browse any of the substitutions).
+      # These are the two extra sed commands mentioned above.
+      (echo ':t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+      if test -z "$ac_sed_cmds"; then
+  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+      else
+  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+      fi
+      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_beg=$ac_end
+      ac_end=`expr $ac_end + $ac_max_sed_lines`
+    fi
+  done
+  if test -z "$ac_sed_cmds"; then
+    ac_sed_cmds=cat
+  fi
+fi # test -n "$CONFIG_FILES"
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
 EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+cat >>$CONFIG_STATUS <<\EOF
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+        cat >$tmp/stdin
+        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
   esac
 
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+  ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_file" : 'X\(//\)[^/]' \| \
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
   if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+    { case "$ac_dir" in
+  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+  *)                      as_incr_dir=.;;
+esac
+as_dummy="$ac_dir"
+for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+  case $as_mkdir_dir in
+    # Skip DOS drivespec
+    ?:) as_incr_dir=$as_mkdir_dir ;;
+    *)
+      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
+    ;;
+  esac
+done; }
+
+    ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`"
     # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+    ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'`
   else
     ac_dir_suffix= ac_dots=
   fi
 
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+  case $srcdir in
+  .)  ac_srcdir=.
+      if test -z "$ac_dots"; then
+         ac_top_srcdir=.
+      else
+         ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
+      fi ;;
+  [\\/]* | ?:[\\/]* )
+      ac_srcdir=$srcdir$ac_dir_suffix;
+      ac_top_srcdir=$srcdir ;;
   *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+    ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_dots$srcdir ;;
   esac
 
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_dots$INSTALL ;;
   esac
 
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:3674: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
+  # Let's still pretend it is `configure' which instantiates (i.e., don't
+  # use $as_me), people would be surprised to read:
+  #    /* config.h.  Generated automatically by config.status.  */
+  configure_input="Generated automatically from `echo $ac_file_in |
+                                                 sed 's,.*/,,'` by configure."
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+         # Absolute (can't be DOS-style, as IFS=:)
+         test -f "$f" || { { echo "$as_me:3692: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         echo $f;;
+      *) # Relative
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$srcdir/$f"; then
+           # Source tree
+           echo $srcdir/$f
+         else
+           # /dev/null tree
+           { { echo "$as_me:3705: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         fi;;
+      esac
+    done` || { (exit 1); exit 1; }
 EOF
-cat >> $CONFIG_STATUS <<EOF
-AMDEP_TRUE="$AMDEP_TRUE"
-ac_aux_dir="$ac_aux_dir"
+cat >>$CONFIG_STATUS <<EOF
+  sed "$ac_vpsub
+$extrasub
+EOF
+cat >>$CONFIG_STATUS <<\EOF
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@configure_input@,$configure_input,;t t
+s,@srcdir@,$ac_srcdir,;t t
+s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@INSTALL@,$ac_INSTALL,;t t
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+  rm -f $tmp/stdin
+  if test x"$ac_file" != x-; then
+    mv $tmp/out $ac_file
+  else
+    cat $tmp/out
+    rm -f $tmp/out
+  fi
 
+done
 EOF
-cat >> $CONFIG_STATUS <<\EOF
+cat >>$CONFIG_STATUS <<\EOF
 
+#
+# CONFIG_COMMANDS section.
+#
+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+
+  case $ac_dest in
+    default-1 )
 test x"$AMDEP_TRUE" != x"" ||
 for mf in $CONFIG_FILES; do
   case "$mf" in
@@ -2511,11 +3779,33 @@ for mf in $CONFIG_FILES; do
     echo '# dummy' > "$dirpart/$file"
   done
 done
+ ;;
+  esac
+done
+EOF
 
+cat >>$CONFIG_STATUS <<\EOF
 
-exit 0
+{ (exit 0); exit 0; }
 EOF
 chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+ac_clean_files=$ac_clean_files_save
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || { (exit 1); exit 1; }
+fi
 
diff --git a/tests/rpathlz/aclocal.m4 b/tests/rpathlz/aclocal.m4
index 0494463ac..297583801 100644
--- a/tests/rpathlz/aclocal.m4
+++ b/tests/rpathlz/aclocal.m4
@@ -491,7 +491,7 @@ else
   $1_FALSE=
 fi])
 
-# lib-link.m4 serial 2 (gettext-0.11.2)
+# lib-link.m4 serial 3 (gettext-0.11.3)
 dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -609,6 +609,10 @@ AC_DEFUN([AC_LIB_RPATH],
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
   sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
   sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE(rpath,
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
 ])
 
 dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
@@ -738,7 +742,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
               dnl Linking with a shared library. We attempt to hardcode its
               dnl directory into the executable's runpath, unless it's the
               dnl standard /usr/lib.
-              if test "X$found_dir" = "X/usr/lib"; then
+              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
                 dnl No hardcoding is needed.
                 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
               else
@@ -929,29 +933,31 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                     ;;
                   -R*)
                     dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $dir"
-                    fi
-                    dnl Potentially add DIR to ltrpathdirs.
-                    dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                    haveit=
-                    for x in $ltrpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      ltrpathdirs="$ltrpathdirs $dir"
                     fi
                     ;;
                   -l*)
diff --git a/tests/rpathlz/configure b/tests/rpathlz/configure
index c320c0a30..107bce915 100755
--- a/tests/rpathlz/configure
+++ b/tests/rpathlz/configure
@@ -1,34 +1,119 @@
 #! /bin/sh
-
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Generated by Autoconf 2.52.
 #
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
-# Defaults:
-ac_help=
+# 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
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+# NLS nuisances.
+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+exec 6>&1
+
+#
+# Initializations.
+#
 ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --disable-dependency-tracking Speeds up one-time builds
-  --enable-dependency-tracking  Do not reject slow dependency extractors"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-ac_help="$ac_help
-  --with-librpathz-prefix[=DIR]  search for librpathz in DIR/include and DIR/lib
-  --without-librpathz-prefix     don't search for librpathz in includedir and libdir"
+cross_compiling=no
+subdirs=
+MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete.  It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
+
+ac_unique_file="configure.in"
 
 # Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
 # The variables have the same names as the options, with
 # dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
+cache_file=/dev/null
 exec_prefix=NONE
-host=NONE
 no_create=
-nonopt=NONE
 no_recursion=
 prefix=NONE
 program_prefix=NONE
@@ -37,10 +122,15 @@ program_transform_name=s,x,x,
 silent=
 site=
 srcdir=
-target=NONE
 verbose=
 x_includes=NONE
 x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
@@ -54,17 +144,16 @@ oldincludedir='/usr/include'
 infodir='${prefix}/info'
 mandir='${prefix}/man'
 
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
+# Identity of this package.
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
 
 ac_prev=
 for ac_option
 do
-
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
     eval "$ac_prev=\$ac_option"
@@ -72,59 +161,59 @@ do
     continue
   fi
 
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case "$ac_option" in
+  case $ac_option in
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
   -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
+    bindir=$ac_optarg ;;
 
   -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
+    ac_prev=build_alias ;;
   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
+    build_alias=$ac_optarg ;;
 
   -cache-file | --cache-file | --cache-fil | --cache-fi \
   | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
     ac_prev=cache_file ;;
   -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
   | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
 
   -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
     ac_prev=datadir ;;
   -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
   | --da=*)
-    datadir="$ac_optarg" ;;
+    datadir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
+    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'`
+    eval "enable_$ac_feature=no" ;;
 
   -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
+    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'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
+    eval "enable_$ac_feature='$ac_optarg'" ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -133,95 +222,47 @@ do
   -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
   | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
   | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
+    exec_prefix=$ac_optarg ;;
 
   -gas | --gas | --ga | --g)
     # Obsolete; use --with-gas.
     with_gas=yes ;;
 
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
 
   -host | --host | --hos | --ho)
-    ac_prev=host ;;
+    ac_prev=host_alias ;;
   -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
+    host_alias=$ac_optarg ;;
 
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
   -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
   | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
+    includedir=$ac_optarg ;;
 
   -infodir | --infodir | --infodi | --infod | --info | --inf)
     ac_prev=infodir ;;
   -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
+    infodir=$ac_optarg ;;
 
   -libdir | --libdir | --libdi | --libd)
     ac_prev=libdir ;;
   -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
+    libdir=$ac_optarg ;;
 
   -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
   | --libexe | --libex | --libe)
     ac_prev=libexecdir ;;
   -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
   | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
+    libexecdir=$ac_optarg ;;
 
   -localstatedir | --localstatedir | --localstatedi | --localstated \
   | --localstate | --localstat | --localsta | --localst \
@@ -230,12 +271,12 @@ EOF
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
   | --localstate=* | --localstat=* | --localsta=* | --localst=* \
   | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
+    localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
     ac_prev=mandir ;;
   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
+    mandir=$ac_optarg ;;
 
   -nfp | --nfp | --nf)
     # Obsolete; use --without-fp.
@@ -256,26 +297,26 @@ EOF
   -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
   | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
   | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
+    oldincludedir=$ac_optarg ;;
 
   -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
     ac_prev=prefix ;;
   -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
+    prefix=$ac_optarg ;;
 
   -program-prefix | --program-prefix | --program-prefi | --program-pref \
   | --program-pre | --program-pr | --program-p)
     ac_prev=program_prefix ;;
   -program-prefix=* | --program-prefix=* | --program-prefi=* \
   | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
+    program_prefix=$ac_optarg ;;
 
   -program-suffix | --program-suffix | --program-suffi | --program-suff \
   | --program-suf | --program-su | --program-s)
     ac_prev=program_suffix ;;
   -program-suffix=* | --program-suffix=* | --program-suffi=* \
   | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
+    program_suffix=$ac_optarg ;;
 
   -program-transform-name | --program-transform-name \
   | --program-transform-nam | --program-transform-na \
@@ -292,7 +333,7 @@ EOF
   | --program-transfo=* | --program-transf=* \
   | --program-trans=* | --program-tran=* \
   | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
+    program_transform_name=$ac_optarg ;;
 
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
@@ -302,7 +343,7 @@ EOF
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
   | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
+    sbindir=$ac_optarg ;;
 
   -sharedstatedir | --sharedstatedir | --sharedstatedi \
   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
@@ -313,58 +354,57 @@ EOF
   | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
   | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
   | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
+    sharedstatedir=$ac_optarg ;;
 
   -site | --site | --sit)
     ac_prev=site ;;
   -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
+    site=$ac_optarg ;;
 
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
+    srcdir=$ac_optarg ;;
 
   -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
   | --syscon | --sysco | --sysc | --sys | --sy)
     ac_prev=sysconfdir ;;
   -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
   | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
+    sysconfdir=$ac_optarg ;;
 
   -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
+    ac_prev=target_alias ;;
   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
+    target_alias=$ac_optarg ;;
 
   -v | -verbose | --verbose | --verbos | --verbo | --verb)
     verbose=yes ;;
 
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
+    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'`
-    case "$ac_option" in
-      *=*) ;;
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
+    eval "with_$ac_package='$ac_optarg'" ;;
 
   -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
+    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'`
+    eval "with_$ac_package=no" ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -375,98 +415,98 @@ EOF
     ac_prev=x_includes ;;
   -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
   | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
+    x_includes=$ac_optarg ;;
 
   -x-libraries | --x-libraries | --x-librarie | --x-librari \
   | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
     ac_prev=x_libraries ;;
   -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
+    x_libraries=$ac_optarg ;;
 
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
     ;;
 
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    eval "$ac_envvar='$ac_optarg'"
+    export $ac_envvar ;;
+
   *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
+    # FIXME: should be removed in autoconf 3.0.
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    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}
     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  { echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
 fi
 
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
+# 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
 
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+              localstatedir libdir includedir oldincludedir infodir mandir
 do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* ) ;;
+    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
   esac
 done
 
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: should be removed in autoconf 3.0.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
 
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
 
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=configure.in
+test "$silent" = yes && exec 6>/dev/null
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then its parent.
   ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+  ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
   test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir
   if test ! -r $srcdir/$ac_unique_file; then
@@ -477,13 +517,313 @@ else
 fi
 if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
+   { (exit 1); exit 1; }; }
   else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources in $srcdir" >&2
+   { (exit 1); exit 1; }; }
   fi
 fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<EOF
+\`configure' configures this package to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+EOF
+
+  cat <<EOF
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
+EOF
+
+  cat <<\EOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       build programs to run on HOST [BUILD]
+EOF
+fi
+
+if test -n "$ac_init_help"; then
+
+  cat <<\EOF
+
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-dependency-tracking Speeds up one-time builds
+  --enable-dependency-tracking  Do not reject slow dependency extractors
+  --disable-rpath         do not hardcode runtime library paths
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-gnu-ld           assume the C compiler uses GNU ld default=no
+  --with-librpathz-prefix=DIR  search for librpathz in DIR/include and DIR/lib
+  --without-librpathz-prefix     don't search for librpathz in includedir and libdir
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+              headers in a nonstandard directory <include dir>
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+EOF
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  ac_popdir=`pwd`
+  for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
+    cd $ac_subdir
+    # A "../" for each directory in /$ac_subdir.
+    ac_dots=`echo $ac_subdir |
+             sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
+
+    case $srcdir in
+    .) # No --srcdir option.  We are building in place.
+      ac_sub_srcdir=$srcdir ;;
+    [\\/]* | ?:[\\/]* ) # Absolute path.
+      ac_sub_srcdir=$srcdir/$ac_subdir ;;
+    *) # Relative path.
+      ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
+    esac
 
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_sub_srcdir/configure.gnu; then
+      echo
+      $SHELL $ac_sub_srcdir/configure.gnu  --help=recursive
+    elif test -f $ac_sub_srcdir/configure; then
+      echo
+      $SHELL $ac_sub_srcdir/configure  --help=recursive
+    elif test -f $ac_sub_srcdir/configure.ac ||
+           test -f $ac_sub_srcdir/configure.in; then
+      echo
+      $ac_configure --help
+    else
+      echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
+    fi
+    cd $ac_popdir
+  done
+fi
+
+test -n "$ac_init_help" && exit 0
+if $ac_init_version; then
+  cat <<\EOF
+
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+EOF
+  exit 0
+fi
+exec 5>config.log
+cat >&5 <<EOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by $as_me, which was
+generated by GNU Autoconf 2.52.  Invocation command line was
+
+  $ $0 $@
+
+EOF
+{
+cat <<_ASUNAME
+## ---------- ##
+## Platform.  ##
+## ---------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+PATH = $PATH
+
+_ASUNAME
+} >&5
+
+cat >&5 <<EOF
+## ------------ ##
+## Core tests.  ##
+## ------------ ##
+
+EOF
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell meta-characters.
+ac_configure_args=
+ac_sep=
+for ac_arg
+do
+  case $ac_arg in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c) ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
+    ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+    ac_sep=" " ;;
+  *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg"
+     ac_sep=" " ;;
+  esac
+  # Get rid of the leading space.
+done
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  echo >&5
+  echo "## ----------------- ##" >&5
+  echo "## Cache variables.  ##" >&5
+  echo "## ----------------- ##" >&5
+  echo >&5
+  # The following way of writing the cache mishandles newlines in values,
+{
+  (set) 2>&1 |
+    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      sed -n \
+        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+      ;;
+    *)
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} >&5
+  sed "/^$/d" confdefs.h >conftest.log
+  if test -s conftest.log; then
+    echo >&5
+    echo "## ------------ ##" >&5
+    echo "## confdefs.h.  ##" >&5
+    echo "## ------------ ##" >&5
+    echo >&5
+    cat conftest.log >&5
+  fi
+  (echo; echo) >&5
+  test "$ac_signal" != 0 &&
+    echo "$as_me: caught signal $ac_signal" >&5
+  echo "$as_me: exit $exit_status" >&5
+  rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files &&
+    exit $exit_status
+     ' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
+
+# Let the site file select an alternate cache file if it wants to.
 # Prefer explicitly selected file to automatically selected ones.
 if test -z "$CONFIG_SITE"; then
   if test "x$prefix" != xNONE; then
@@ -494,40 +834,107 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
+    { echo "$as_me:837: 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"
   fi
 done
 
 if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
+  # 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:848: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . $cache_file;;
+      *)                      . ./$cache_file;;
+    esac
+  fi
 else
-  echo "creating cache $cache_file"
-  > $cache_file
+  { echo "$as_me:856: 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.
+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
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+  eval ac_new_val="\$ac_env_${ac_var}_value"
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { echo "$as_me:872: 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)
+      { echo "$as_me:876: 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
+        { echo "$as_me:882: 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:884:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+        { echo "$as_me:886:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+        ac_cache_corrupted=:
+      fi;;
+  esac
+  # Pass precious variables to config.status.  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
+if $ac_cache_corrupted; then
+  { echo "$as_me:905: 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:907: 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
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
+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
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)      ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+echo "#! $SHELL" >conftest.sh
+echo  "exit 0"   >>conftest.sh
+chmod +x conftest.sh
+if { (echo "$as_me:927: PATH=\".;.\"; conftest.sh") >&5
+  (PATH=".;."; conftest.sh) 2>&5
+  ac_status=$?
+  echo "$as_me:930: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  ac_path_separator=';'
 else
-  ac_n= ac_c='\c' ac_t=
+  ac_path_separator=:
 fi
-
+PATH_SEPARATOR="$ac_path_separator"
+rm -f conftest.sh
 
 ac_aux_dir=
 for ac_dir in $global_top_srcdir ../..; do
@@ -539,18 +946,20 @@ for ac_dir in $global_top_srcdir ../..; do
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
+  elif test -f $ac_dir/shtool; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $global_top_srcdir ../.." 1>&2; exit 1; }
+  { { echo "$as_me:956: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -559,31 +968,39 @@ am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:568: checking for a BSD compatible install" >&5
+echo "$as_me:976: 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 eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${ac_cv_path_install+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+    ac_save_IFS=$IFS; IFS=$ac_path_separator
   for ac_dir in $PATH; do
+    IFS=$ac_save_IFS
     # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    case $ac_dir/ in
+    / | ./ | .// | /cC/* \
+    | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
+    | /usr/ucb/* ) ;;
     *)
       # OSF1 and SCO ODT 3.0 have their own names for install.
       # Don't use installbsd from OSF since it installs stuff as root
       # by default.
       for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
+        if $as_executable_p "$ac_dir/$ac_prog"; then
 	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+            grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
 	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
 	  else
 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
 	    break 2
@@ -593,31 +1010,31 @@ else
       ;;
     esac
   done
-  IFS="$ac_save_IFS"
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
+    INSTALL=$ac_cv_path_install
   else
     # As a last resort, use the slow shell script.  We don't cache a
     # path for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
+    INSTALL=$ac_install_sh
   fi
 fi
-echo "$ac_t""$INSTALL" 1>&6
+echo "$as_me:1025: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:621: checking whether build environment is sane" >&5
+echo "$as_me:1036: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -640,8 +1057,11 @@ 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".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
+      { { echo "$as_me:1060: 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;}
+   { (exit 1); exit 1; }; }
    fi
 
    test "$2" = conftest.file
@@ -650,28 +1070,29 @@ then
    # Ok.
    :
 else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
+   { { echo "$as_me:1073: 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
+echo "$as_me:1079: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 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 &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+  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
 
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
 
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
@@ -680,82 +1101,86 @@ if eval "$MISSING --run true"; then
 else
   am_missing_run=
   am_backtick='`'
-  echo "configure: warning: ${am_backtick}missing' script is too old or missing" 1>&2
+  { echo "$as_me:1104: WARNING: ${am_backtick}missing' script is too old or missing" >&5
+echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;}
 fi
 
 for ac_prog in mawk gawk nawk awk
 do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:692: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1112: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AWK+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AWK="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_AWK="$ac_prog"
+echo "$as_me:1127: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-AWK="$ac_cv_prog_AWK"
+AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$ac_t""$AWK" 1>&6
+  echo "$as_me:1135: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1138: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-test -n "$AWK" && break
+  test -n "$AWK" && break
 done
 
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:722: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1145: 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 "(cached) $ECHO_C" >&6
 else
-  cat > conftestmake <<\EOF
+  cat >conftest.make <<\EOF
 all:
 	@echo 'ac_maketemp="${MAKE}"'
 EOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
 if test -n "$ac_maketemp"; then
   eval ac_cv_prog_make_${ac_make}_set=yes
 else
   eval ac_cv_prog_make_${ac_make}_set=no
 fi
-rm -f conftestmake
+rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+  echo "$as_me:1165: result: yes" >&5
+echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1169: result: no" >&5
+echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 # Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
 if test "${enable_dependency_tracking+set}" = set; then
   enableval="$enable_dependency_tracking"
-  :
-fi
 
+fi;
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
 fi
 
-
 if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
@@ -764,9 +1189,6 @@ else
   AMDEP_FALSE=
 fi
 
-
-
-
 rm -f .deps 2>/dev/null
 mkdir .deps 2>/dev/null
 if test -d .deps; then
@@ -777,25 +1199,26 @@ else
 fi
 rmdir .deps 2>/dev/null
 
-
 # test to see if srcdir already configured
 if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run \"make distclean\" there first" 1>&2; exit 1; }
+  { { echo "$as_me:1205: 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
 
 # Define the identity of the package.
 PACKAGE=gettext_rpathlz
 VERSION=0
-cat >> confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
 
-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define VERSION "$VERSION"
 EOF
 
-
 # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
 # the ones we care about.
 
@@ -807,24 +1230,18 @@ EOF
 # requests that it be used.  This is a bit dumb.
 : ${OBJEXT=o}
 
-
 # Some tools Automake needs.
 
 ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"}
 
-
 AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
 
-
 AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"}
 
-
 AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
-
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-
 AMTAR=${AMTAR-"${am_missing_run}tar"}
 
 install_sh=${install_sh-"$am_aux_dir/install-sh"}
@@ -834,214 +1251,578 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 
-# Extract the first word of "gcc", so it can be a program name with args.
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+echo "$as_me:1262: 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
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1277: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:1285: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:1288: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:841: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1297: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="gcc"
+echo "$as_me:1312: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1320: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1323: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+echo "$as_me:1336: 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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1351: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1359: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1362: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
+fi
+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
+echo "$as_me:1371: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="cc"
+echo "$as_me:1386: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1394: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1397: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:871: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1410: 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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+  ac_prog_rejected=yes
+  continue
+fi
+ac_cv_prog_CC="cc"
+echo "$as_me:1430: found $ac_dir/$ac_word" >&5
+break
+done
+
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
   set dummy $ac_cv_prog_CC
   shift
-  if test $# -gt 0; then
+  if test $# != 0; then
     # We chose a different compiler from the bogus one.
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
-    set dummy "$ac_dir/$ac_word" "$@"
+    set dummy "$ac_dir/$ac_word" ${1+"$@"}
     shift
     ac_cv_prog_CC="$@"
   fi
 fi
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1452: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1455: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:922: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl
+  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:1466: 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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1481: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1489: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1492: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+
+    test -n "$CC" && break
+  done
 fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl
+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:1505: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1520: found $ac_dir/$ac_word" >&5
+break
+done
 
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:954: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1528: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1531: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
 
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+  test -n "$ac_ct_CC" && break
+done
 
-cat > conftest.$ac_ext << EOF
+  CC=$ac_ct_CC
+fi
+
+fi
 
-#line 965 "configure"
+test -z "$CC" && { { echo "$as_me:1543: error: no acceptable cc found in \$PATH" >&5
+echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+
+# Provide some information about the compiler.
+echo "$as_me:1548:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:1551: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1554: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1556: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1559: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1561: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1564: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 1568 "configure"
 #include "confdefs.h"
 
-main(){return(0);}
-EOF
-if { (eval echo configure:970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_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.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+echo "$as_me:1584: 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[^ ]*//'`
+if { (eval echo "$as_me:1587: \"$ac_link_default\"") >&5
+  (eval $ac_link_default) 2>&5
+  ac_status=$?
+  echo "$as_me:1590: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # 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" : '[^.]*\(\..*\)'`
+          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
+          export ac_cv_exeext
+          break;;
+    * ) break;;
+  esac
+done
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:1613: 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:1619: 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 "$as_me:1624: 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'
+  { (eval echo "$as_me:1630: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1633: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no
   else
-    ac_cv_prog_cc_cross=yes
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { echo "$as_me:1640: 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;}
+   { (exit 1); exit 1; }; }
+    fi
   fi
+fi
+echo "$as_me:1648: 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 "$as_me:1655: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+echo "$as_me:1657: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6
+
+echo "$as_me:1660: checking for executable suffix" >&5
+echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+if { (eval echo "$as_me:1662: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:1665: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
+  case $ac_file in
+    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+          export ac_cv_exeext
+          break;;
+    * ) break;;
+  esac
+done
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
+  { { echo "$as_me:1681: 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 -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:996: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1001: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1010: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
+
+rm -f conftest$ac_cv_exeext
+echo "$as_me:1687: 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 "$as_me:1693: 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
+#line 1699 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (eval echo "$as_me:1711: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1714: \$? = $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
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
 else
-  ac_cv_prog_gcc=no
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:1726: 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:1733: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+echo "$as_me:1737: 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
+#line 1743 "configure"
+#include "confdefs.h"
 
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
 
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1758: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1761: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1764: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1767: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_compiler_gnu=yes
 else
-  GCC=
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_compiler_gnu=no
 fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1029: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+fi
+echo "$as_me:1779: 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 "$as_me:1785: 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
-  echo 'void f(){}' > conftest.c
-if test X"`${CC-cc} -c conftest.c 2>&1`" = X"`${CC-cc} -g -c conftest.c 2>&1`"; then
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1791 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1803: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1806: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1809: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1812: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
-  ac_cv_prog_cc_g=no
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_prog_cc_g=no
 fi
-rm -f conftest*
-
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+echo "$as_me:1822: 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"
+  CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
     CFLAGS="-g -O2"
@@ -1055,7 +1836,118 @@ else
     CFLAGS=
   fi
 fi
+# Some people use a C++ compiler to compile C.  Since we use `exit',
+# in C++ we need to declare it.  In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+  choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1849: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1852: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1855: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1858: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1870 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1883: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1886: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1889: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1892: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+continue
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1902 "configure"
+#include "confdefs.h"
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1914: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1917: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1920: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1923: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+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
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_config_commands="$ac_config_commands default-1"
 
 am_make=${MAKE-make}
 cat > confinc << 'END'
@@ -1063,8 +1955,8 @@ doit:
 	@echo done
 END
 # If we don't find an include directive, just comment out the code.
-echo $ac_n "checking for style of include used by $am_make""... $ac_c" 1>&6
-echo "configure:1068: checking for style of include used by $am_make" >&5
+echo "$as_me:1958: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
 am__include='#'
 am__quote=
 _am_result=none
@@ -1090,17 +1982,16 @@ if test "$am__include" = "#"; then
    fi
 fi
 
-
-echo "$ac_t""$_am_result" 1>&6
+echo "$as_me:1985: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6
 rm -f confinc confmf
 
-
 depcc="$CC"   am_compiler_list=
 
-echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6
-echo "configure:1102: checking dependency style of $depcc" >&5
-if eval "test \"`echo '$''{'am_cv_CC_dependencies_compiler_type'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1991: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -1159,37 +2050,76 @@ else
 fi
 
 fi
-
-echo "$ac_t""$am_cv_CC_dependencies_compiler_type" 1>&6
+echo "$as_me:2053: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
 
-
+      if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
 
 # Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1175: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:2074: error: cannot run $ac_config_sub" >&5
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+echo "$as_me:2078: 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
+else
+  ac_cv_build_alias=$build_alias
+test -z "$ac_cv_build_alias" &&
+  ac_cv_build_alias=`$ac_config_guess`
+test -z "$ac_cv_build_alias" &&
+  { { echo "$as_me:2087: 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:2091: 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:2096: 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 "$as_me:2103: 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
+else
+  ac_cv_host_alias=$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:2112: 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; }; }
 
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
+fi
+echo "$as_me:2117: 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/'`
 
 # Check whether --with-gnu-ld or --without-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
@@ -1197,13 +2127,12 @@ if test "${with_gnu_ld+set}" = set; then
   test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
-fi
-
+fi;
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1207: checking for ld used by GCC" >&5
+  echo "$as_me:2134: checking for ld used by GCC" >&5
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1232,14 +2161,14 @@ echo "configure:1207: checking for ld used by GCC" >&5
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1237: checking for GNU ld" >&5
+  echo "$as_me:2164: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
 else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1240: checking for non-GNU ld" >&5
+  echo "$as_me:2167: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
 fi
-if eval "test \"`echo '$''{'acl_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${acl_cv_path_LD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
@@ -1265,15 +2194,19 @@ fi
 
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
+  echo "$as_me:2197: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:2200: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1275: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'acl_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+test -z "$LD" && { { echo "$as_me:2203: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+echo "$as_me:2206: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+if test "${acl_cv_prog_gnu_ld+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
@@ -1282,43 +2215,25 @@ else
   acl_cv_prog_gnu_ld=no
 fi
 fi
-
-echo "$ac_t""$acl_cv_prog_gnu_ld" 1>&6
+echo "$as_me:2218: result: $acl_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
-
-
-      if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-
-
-                                                echo $ac_n "checking for shared library run path origin""... $ac_c" 1>&6
-echo "configure:1309: checking for shared library run path origin" >&5
-if eval "test \"`echo '$''{'acl_cv_rpath'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+                                                echo "$as_me:2222: checking for shared library run path origin" >&5
+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
+if test "${acl_cv_rpath+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
+
     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
     ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
     . ./conftest.sh
     rm -f ./conftest.sh
     acl_cv_rpath=done
-  
-fi
 
-echo "$ac_t""$acl_cv_rpath" 1>&6
+fi
+echo "$as_me:2235: result: $acl_cv_rpath" >&5
+echo "${ECHO_T}$acl_cv_rpath" >&6
   wl="$acl_cv_wl"
   libext="$acl_cv_libext"
   shlibext="$acl_cv_shlibext"
@@ -1328,50 +2243,50 @@ echo "$ac_t""$acl_cv_rpath" 1>&6
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
   sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
   sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
+    # Check whether --enable-rpath or --disable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+  enableval="$enable_rpath"
+  :
+else
+  enable_rpath=yes
+fi;
 
-
-  
-  
-  
-  
-  echo $ac_n "checking how to link with librpathz""... $ac_c" 1>&6
-echo "configure:1339: checking how to link with librpathz" >&5
-if eval "test \"`echo '$''{'ac_cv_librpathz_libs'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:2254: checking how to link with librpathz" >&5
+echo $ECHO_N "checking how to link with librpathz... $ECHO_C" >&6
+if test "${ac_cv_librpathz_libs+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
-    
-  
+
     use_additional=yes
-  
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
-  
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
-  # Check whether --with-librpathz-prefix or --without-librpathz-prefix was given.
+# Check whether --with-librpathz-prefix or --without-librpathz-prefix was given.
 if test "${with_librpathz_prefix+set}" = set; then
   withval="$with_librpathz_prefix"
-  
+
     if test "X$withval" = "Xno"; then
       use_additional=no
     else
       if test "X$withval" = "X"; then
-        
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
           eval additional_includedir=\"$includedir\"
           eval additional_libdir=\"$libdir\"
-        
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
@@ -1381,8 +2296,7 @@ if test "${with_librpathz_prefix+set}" = set; then
       fi
     fi
 
-fi
-
+fi;
       LIBRPATHZ=
   LTLIBRPATHZ=
   INCRPATHZ=
@@ -1438,7 +2352,7 @@ fi
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBRPATHZ; do
-              
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1475,7 +2389,7 @@ fi
           if test "X$found_dir" != "X"; then
                         LTLIBRPATHZ="${LTLIBRPATHZ}${LTLIBRPATHZ:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "X$found_dir" = "X/usr/lib"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
                                 LIBRPATHZ="${LIBRPATHZ}${LIBRPATHZ:+ }$found_so"
               else
                                                                                 haveit=
@@ -1506,7 +2420,7 @@ fi
                   else
                                                                                 haveit=
                     for x in $LDFLAGS $LIBRPATHZ; do
-                      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1557,7 +2471,7 @@ fi
                 fi
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCRPATHZ; do
-                    
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1602,7 +2516,7 @@ fi
                       if test -z "$haveit"; then
                         haveit=
                         for x in $LDFLAGS $LIBRPATHZ; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1623,7 +2537,7 @@ fi
                         fi
                         haveit=
                         for x in $LDFLAGS $LTLIBRPATHZ; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1647,25 +2561,27 @@ fi
                     ;;
                   -R*)
                     dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $dir"
-                    fi
-                                                            haveit=
-                    for x in $ltrpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      ltrpathdirs="$ltrpathdirs $dir"
                     fi
                     ;;
                   -l*)
@@ -1719,18 +2635,18 @@ fi
     ac_cv_librpathz_libs="$LIBRPATHZ"
     ac_cv_librpathz_ltlibs="$LTLIBRPATHZ"
     ac_cv_librpathz_cppflags="$INCRPATHZ"
-  
-fi
 
-echo "$ac_t""$ac_cv_librpathz_libs" 1>&6
+fi
+echo "$as_me:2640: result: $ac_cv_librpathz_libs" >&5
+echo "${ECHO_T}$ac_cv_librpathz_libs" >&6
   LIBRPATHZ="$ac_cv_librpathz_libs"
   LTLIBRPATHZ="$ac_cv_librpathz_ltlibs"
   INCRPATHZ="$ac_cv_librpathz_cppflags"
-  
+
   for element in $INCRPATHZ; do
     haveit=
     for x in $CPPFLAGS; do
-      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1749,299 +2665,661 @@ echo "$ac_t""$ac_cv_librpathz_libs" 1>&6
     fi
   done
 
-  
-  
       HAVE_LIBRPATHZ=yes
-  
-  
 
-
-trap '' 1 2 15
-cat > confcache <<\EOF
+ac_config_files="$ac_config_files Makefile"
+cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
 #
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
 #
-EOF
+# `ac_cv_env_foo' variables (set or unset) will be overriden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 # So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+        "s/'/'\\\\''/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if cmp -s $cache_file confcache; then :; else
   if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
   else
     echo "not updating unwritable cache $cache_file"
   fi
 fi
 rm -f confcache
 
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[ 	]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[ 	]*$//;
+}'
 fi
 
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then we branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+cat >confdef2opt.sed <<\EOF
+t clear
+: clear
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+d
+: quote
+s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
+s,\[,\\&,g
+s,\],\\&,g
+s,\$,$$,g
+p
 EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
+# We use echo to avoid assuming a particular line-breaking character.
+# The extra dot is to prevent the shell from consuming trailing
+# line-breaks from the sub-command output.  A line-break within
+# single-quotes doesn't work because, if this script is created in a
+# platform that uses two characters for line-breaks (e.g., DOS), tr
+# would break.
+ac_LF_and_DOT=`echo; echo .`
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+rm -f confdef2opt.sed
 
-# Without the "./", some shells look in PATH for config.status.
 : ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ echo "$as_me:2780: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
+#! $SHELL
 # Generated automatically by configure.
 # Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
 # Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
+# configure, is in config.log if it exists.
 
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
+debug=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+ac_cs_invocation="\$0 \$@"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+# NLS nuisances.
+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+
+exec 6>&1
+
+_ACEOF
+
+# Files that config.status was made for.
+if test -n "$ac_config_files"; then
+  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_headers"; then
+  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_links"; then
+  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_commands"; then
+  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+fi
+
+cat >>$CONFIG_STATUS <<\EOF
+
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTIONS] [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number, then exit
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+  --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Configuration commands:
+$config_commands
+
+Report bugs to <bug-autoconf@gnu.org>."
+EOF
+
+cat >>$CONFIG_STATUS <<EOF
+ac_cs_version="\\
+config.status
+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
+Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+srcdir=$srcdir
+INSTALL="$INSTALL"
+EOF
+
+cat >>$CONFIG_STATUS <<\EOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
+ac_need_defaults=:
+while test $# != 0
 do
-  case "\$ac_option" in
+  case $1 in
+  --*=*)
+    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+    shift
+    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
+    shift
+    ;;
+  -*);;
+  *) # This is not an option, so the user has probably given explicit
+     # arguments.
+     ac_need_defaults=false;;
+  esac
+
+  case $1 in
+  # Handling of the options.
+EOF
+cat >>$CONFIG_STATUS <<EOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
+    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
+    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
+EOF
+cat >>$CONFIG_STATUS <<\EOF
+  --version | --vers* | -V )
+    echo "$ac_cs_version"; exit 0 ;;
+  --he | --h)
+    # Conflict between --help and --header
+    { { echo "$as_me:2951: 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;}
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit 0 ;;
+  --debug | --d* | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    shift
+    CONFIG_FILES="$CONFIG_FILES $1"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $1"
+    ac_need_defaults=false;;
+
+  # This is an error.
+  -*) { { echo "$as_me:2970: 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; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1" ;;
+
   esac
+  shift
 done
 
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
+exec 5>>config.log
+cat >&5 << _ACEOF
+
+## ----------------------- ##
+## Running config.status.  ##
+## ----------------------- ##
+
+This file was extended by $as_me 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`
 
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+_ACEOF
 EOF
-cat >> $CONFIG_STATUS <<EOF
 
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@EXEEXT@%$EXEEXT%g
-s%@OBJEXT@%$OBJEXT%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@AMTAR@%$AMTAR%g
-s%@install_sh@%$install_sh%g
-s%@INSTALL_STRIP_PROGRAM@%$INSTALL_STRIP_PROGRAM%g
-s%@AWK@%$AWK%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@AMDEP_TRUE@%$AMDEP_TRUE%g
-s%@AMDEP_FALSE@%$AMDEP_FALSE%g
-s%@AMDEPBACKSLASH@%$AMDEPBACKSLASH%g
-s%@DEPDIR@%$DEPDIR%g
-s%@CC@%$CC%g
-s%@am__include@%$am__include%g
-s%@am__quote@%$am__quote%g
-s%@CCDEPMODE@%$CCDEPMODE%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@LIBRPATHZ@%$LIBRPATHZ%g
-s%@LTLIBRPATHZ@%$LTLIBRPATHZ%g
-s%@global_top_srcdir@%$global_top_srcdir%g
+cat >>$CONFIG_STATUS <<EOF
+#
+# INIT-COMMANDS section.
+#
+
+AMDEP_TRUE="$AMDEP_TRUE"
+ac_aux_dir="$ac_aux_dir"
 
-CEOF
 EOF
 
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
+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" ;;
+  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+  *) { { echo "$as_me:3017: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
 done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
+
+# 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
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
+
+# Create a temporary directory, and hook for its removal unless debugging.
+$debug ||
+{
+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+
+# Create a (secure) tmp directory for tmp files.
+: ${TMPDIR=/tmp}
+{
+  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=$TMPDIR/cs$$-$RANDOM
+  (umask 077 && mkdir $tmp)
+} ||
+{
+   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+   { (exit 1); exit 1; }
+}
+
+EOF
+
+cat >>$CONFIG_STATUS <<EOF
+
+#
+# CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "\$CONFIG_FILES"; then
+  # Protect against being on the right side of a sed subst in config.status.
+  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+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,@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,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@DEFS@,$DEFS,;t t
+s,@LIBS@,$LIBS,;t t
+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@PACKAGE@,$PACKAGE,;t t
+s,@VERSION@,$VERSION,;t t
+s,@EXEEXT@,$EXEEXT,;t t
+s,@OBJEXT@,$OBJEXT,;t t
+s,@ACLOCAL@,$ACLOCAL,;t t
+s,@AUTOCONF@,$AUTOCONF,;t t
+s,@AUTOMAKE@,$AUTOMAKE,;t t
+s,@AUTOHEADER@,$AUTOHEADER,;t t
+s,@MAKEINFO@,$MAKEINFO,;t t
+s,@AMTAR@,$AMTAR,;t t
+s,@install_sh@,$install_sh,;t t
+s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+s,@AWK@,$AWK,;t t
+s,@SET_MAKE@,$SET_MAKE,;t t
+s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
+s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
+s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+s,@DEPDIR@,$DEPDIR,;t t
+s,@CC@,$CC,;t t
+s,@CFLAGS@,$CFLAGS,;t t
+s,@LDFLAGS@,$LDFLAGS,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@ac_ct_CC@,$ac_ct_CC,;t t
+s,@am__include@,$am__include,;t t
+s,@am__quote@,$am__quote,;t t
+s,@CCDEPMODE@,$CCDEPMODE,;t t
+s,@build@,$build,;t t
+s,@build_cpu@,$build_cpu,;t t
+s,@build_vendor@,$build_vendor,;t t
+s,@build_os@,$build_os,;t t
+s,@host@,$host,;t t
+s,@host_cpu@,$host_cpu,;t t
+s,@host_vendor@,$host_vendor,;t t
+s,@host_os@,$host_os,;t t
+s,@LIBRPATHZ@,$LIBRPATHZ,;t t
+s,@LTLIBRPATHZ@,$LTLIBRPATHZ,;t t
+s,@global_top_srcdir@,$global_top_srcdir,;t t
+CEOF
+
 EOF
 
-cat >> $CONFIG_STATUS <<EOF
+  cat >>$CONFIG_STATUS <<\EOF
+  # Split the substitutions into bite-sized pieces for seds with
+  # small command number limits, like on Digital OSF/1 and HP-UX.
+  ac_max_sed_lines=48
+  ac_sed_frag=1 # Number of current file.
+  ac_beg=1 # First line for current file.
+  ac_end=$ac_max_sed_lines # Line after last line for current file.
+  ac_more_lines=:
+  ac_sed_cmds=
+  while $ac_more_lines; do
+    if test $ac_beg -gt 1; then
+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    else
+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    fi
+    if test ! -s $tmp/subs.frag; then
+      ac_more_lines=false
+    else
+      # The purpose of the label and of the branching condition is to
+      # speed up the sed processing (if there are no `@' at all, there
+      # is no need to browse any of the substitutions).
+      # These are the two extra sed commands mentioned above.
+      (echo ':t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+      if test -z "$ac_sed_cmds"; then
+  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+      else
+  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+      fi
+      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_beg=$ac_end
+      ac_end=`expr $ac_end + $ac_max_sed_lines`
+    fi
+  done
+  if test -z "$ac_sed_cmds"; then
+    ac_sed_cmds=cat
+  fi
+fi # test -n "$CONFIG_FILES"
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
 EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+cat >>$CONFIG_STATUS <<\EOF
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+        cat >$tmp/stdin
+        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
   esac
 
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+  ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_file" : 'X\(//\)[^/]' \| \
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
   if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+    { case "$ac_dir" in
+  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+  *)                      as_incr_dir=.;;
+esac
+as_dummy="$ac_dir"
+for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+  case $as_mkdir_dir in
+    # Skip DOS drivespec
+    ?:) as_incr_dir=$as_mkdir_dir ;;
+    *)
+      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
+    ;;
+  esac
+done; }
+
+    ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`"
     # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+    ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'`
   else
     ac_dir_suffix= ac_dots=
   fi
 
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+  case $srcdir in
+  .)  ac_srcdir=.
+      if test -z "$ac_dots"; then
+         ac_top_srcdir=.
+      else
+         ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
+      fi ;;
+  [\\/]* | ?:[\\/]* )
+      ac_srcdir=$srcdir$ac_dir_suffix;
+      ac_top_srcdir=$srcdir ;;
   *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+    ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_dots$srcdir ;;
   esac
 
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_dots$INSTALL ;;
   esac
 
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:3252: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
+  # Let's still pretend it is `configure' which instantiates (i.e., don't
+  # use $as_me), people would be surprised to read:
+  #    /* config.h.  Generated automatically by config.status.  */
+  configure_input="Generated automatically from `echo $ac_file_in |
+                                                 sed 's,.*/,,'` by configure."
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+         # Absolute (can't be DOS-style, as IFS=:)
+         test -f "$f" || { { echo "$as_me:3270: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         echo $f;;
+      *) # Relative
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$srcdir/$f"; then
+           # Source tree
+           echo $srcdir/$f
+         else
+           # /dev/null tree
+           { { echo "$as_me:3283: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         fi;;
+      esac
+    done` || { (exit 1); exit 1; }
 EOF
-cat >> $CONFIG_STATUS <<EOF
-AMDEP_TRUE="$AMDEP_TRUE"
-ac_aux_dir="$ac_aux_dir"
+cat >>$CONFIG_STATUS <<EOF
+  sed "$ac_vpsub
+$extrasub
+EOF
+cat >>$CONFIG_STATUS <<\EOF
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@configure_input@,$configure_input,;t t
+s,@srcdir@,$ac_srcdir,;t t
+s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@INSTALL@,$ac_INSTALL,;t t
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+  rm -f $tmp/stdin
+  if test x"$ac_file" != x-; then
+    mv $tmp/out $ac_file
+  else
+    cat $tmp/out
+    rm -f $tmp/out
+  fi
 
+done
 EOF
-cat >> $CONFIG_STATUS <<\EOF
+cat >>$CONFIG_STATUS <<\EOF
 
+#
+# CONFIG_COMMANDS section.
+#
+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+
+  case $ac_dest in
+    default-1 )
 test x"$AMDEP_TRUE" != x"" ||
 for mf in $CONFIG_FILES; do
   case "$mf" in
@@ -2079,11 +3357,33 @@ for mf in $CONFIG_FILES; do
     echo '# dummy' > "$dirpart/$file"
   done
 done
+ ;;
+  esac
+done
+EOF
 
+cat >>$CONFIG_STATUS <<\EOF
 
-exit 0
+{ (exit 0); exit 0; }
 EOF
 chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+ac_clean_files=$ac_clean_files_save
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || { (exit 1); exit 1; }
+fi
 
diff --git a/tests/rpathlzyx/aclocal.m4 b/tests/rpathlzyx/aclocal.m4
index 0494463ac..297583801 100644
--- a/tests/rpathlzyx/aclocal.m4
+++ b/tests/rpathlzyx/aclocal.m4
@@ -491,7 +491,7 @@ else
   $1_FALSE=
 fi])
 
-# lib-link.m4 serial 2 (gettext-0.11.2)
+# lib-link.m4 serial 3 (gettext-0.11.3)
 dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -609,6 +609,10 @@ AC_DEFUN([AC_LIB_RPATH],
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
   sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
   sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE(rpath,
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
 ])
 
 dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
@@ -738,7 +742,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
               dnl Linking with a shared library. We attempt to hardcode its
               dnl directory into the executable's runpath, unless it's the
               dnl standard /usr/lib.
-              if test "X$found_dir" = "X/usr/lib"; then
+              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
                 dnl No hardcoding is needed.
                 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
               else
@@ -929,29 +933,31 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                     ;;
                   -R*)
                     dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $dir"
-                    fi
-                    dnl Potentially add DIR to ltrpathdirs.
-                    dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                    haveit=
-                    for x in $ltrpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      ltrpathdirs="$ltrpathdirs $dir"
                     fi
                     ;;
                   -l*)
diff --git a/tests/rpathlzyx/configure b/tests/rpathlzyx/configure
index 4f611eda0..49e806956 100755
--- a/tests/rpathlzyx/configure
+++ b/tests/rpathlzyx/configure
@@ -1,40 +1,119 @@
 #! /bin/sh
-
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Generated by Autoconf 2.52.
 #
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
-# Defaults:
-ac_help=
+# 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
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+# NLS nuisances.
+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+exec 6>&1
+
+#
+# Initializations.
+#
 ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --disable-dependency-tracking Speeds up one-time builds
-  --enable-dependency-tracking  Do not reject slow dependency extractors"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-ac_help="$ac_help
-  --with-librpathx-prefix[=DIR]  search for librpathx in DIR/include and DIR/lib
-  --without-librpathx-prefix     don't search for librpathx in includedir and libdir"
-ac_help="$ac_help
-  --with-librpathy-prefix[=DIR]  search for librpathy in DIR/include and DIR/lib
-  --without-librpathy-prefix     don't search for librpathy in includedir and libdir"
-ac_help="$ac_help
-  --with-librpathz-prefix[=DIR]  search for librpathz in DIR/include and DIR/lib
-  --without-librpathz-prefix     don't search for librpathz in includedir and libdir"
+cross_compiling=no
+subdirs=
+MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete.  It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
+
+ac_unique_file="configure.in"
 
 # Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
 # The variables have the same names as the options, with
 # dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
+cache_file=/dev/null
 exec_prefix=NONE
-host=NONE
 no_create=
-nonopt=NONE
 no_recursion=
 prefix=NONE
 program_prefix=NONE
@@ -43,10 +122,15 @@ program_transform_name=s,x,x,
 silent=
 site=
 srcdir=
-target=NONE
 verbose=
 x_includes=NONE
 x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
@@ -60,17 +144,16 @@ oldincludedir='/usr/include'
 infodir='${prefix}/info'
 mandir='${prefix}/man'
 
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
+# Identity of this package.
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
 
 ac_prev=
 for ac_option
 do
-
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
     eval "$ac_prev=\$ac_option"
@@ -78,59 +161,59 @@ do
     continue
   fi
 
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case "$ac_option" in
+  case $ac_option in
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
   -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
+    bindir=$ac_optarg ;;
 
   -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
+    ac_prev=build_alias ;;
   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
+    build_alias=$ac_optarg ;;
 
   -cache-file | --cache-file | --cache-fil | --cache-fi \
   | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
     ac_prev=cache_file ;;
   -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
   | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
 
   -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
     ac_prev=datadir ;;
   -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
   | --da=*)
-    datadir="$ac_optarg" ;;
+    datadir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
+    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'`
+    eval "enable_$ac_feature=no" ;;
 
   -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
+    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'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
+    eval "enable_$ac_feature='$ac_optarg'" ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -139,95 +222,47 @@ do
   -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
   | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
   | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
+    exec_prefix=$ac_optarg ;;
 
   -gas | --gas | --ga | --g)
     # Obsolete; use --with-gas.
     with_gas=yes ;;
 
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
 
   -host | --host | --hos | --ho)
-    ac_prev=host ;;
+    ac_prev=host_alias ;;
   -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
+    host_alias=$ac_optarg ;;
 
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
   -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
   | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
+    includedir=$ac_optarg ;;
 
   -infodir | --infodir | --infodi | --infod | --info | --inf)
     ac_prev=infodir ;;
   -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
+    infodir=$ac_optarg ;;
 
   -libdir | --libdir | --libdi | --libd)
     ac_prev=libdir ;;
   -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
+    libdir=$ac_optarg ;;
 
   -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
   | --libexe | --libex | --libe)
     ac_prev=libexecdir ;;
   -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
   | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
+    libexecdir=$ac_optarg ;;
 
   -localstatedir | --localstatedir | --localstatedi | --localstated \
   | --localstate | --localstat | --localsta | --localst \
@@ -236,12 +271,12 @@ EOF
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
   | --localstate=* | --localstat=* | --localsta=* | --localst=* \
   | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
+    localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
     ac_prev=mandir ;;
   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
+    mandir=$ac_optarg ;;
 
   -nfp | --nfp | --nf)
     # Obsolete; use --without-fp.
@@ -262,26 +297,26 @@ EOF
   -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
   | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
   | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
+    oldincludedir=$ac_optarg ;;
 
   -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
     ac_prev=prefix ;;
   -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
+    prefix=$ac_optarg ;;
 
   -program-prefix | --program-prefix | --program-prefi | --program-pref \
   | --program-pre | --program-pr | --program-p)
     ac_prev=program_prefix ;;
   -program-prefix=* | --program-prefix=* | --program-prefi=* \
   | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
+    program_prefix=$ac_optarg ;;
 
   -program-suffix | --program-suffix | --program-suffi | --program-suff \
   | --program-suf | --program-su | --program-s)
     ac_prev=program_suffix ;;
   -program-suffix=* | --program-suffix=* | --program-suffi=* \
   | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
+    program_suffix=$ac_optarg ;;
 
   -program-transform-name | --program-transform-name \
   | --program-transform-nam | --program-transform-na \
@@ -298,7 +333,7 @@ EOF
   | --program-transfo=* | --program-transf=* \
   | --program-trans=* | --program-tran=* \
   | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
+    program_transform_name=$ac_optarg ;;
 
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
@@ -308,7 +343,7 @@ EOF
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
   | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
+    sbindir=$ac_optarg ;;
 
   -sharedstatedir | --sharedstatedir | --sharedstatedi \
   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
@@ -319,58 +354,57 @@ EOF
   | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
   | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
   | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
+    sharedstatedir=$ac_optarg ;;
 
   -site | --site | --sit)
     ac_prev=site ;;
   -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
+    site=$ac_optarg ;;
 
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
+    srcdir=$ac_optarg ;;
 
   -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
   | --syscon | --sysco | --sysc | --sys | --sy)
     ac_prev=sysconfdir ;;
   -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
   | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
+    sysconfdir=$ac_optarg ;;
 
   -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
+    ac_prev=target_alias ;;
   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
+    target_alias=$ac_optarg ;;
 
   -v | -verbose | --verbose | --verbos | --verbo | --verb)
     verbose=yes ;;
 
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
+    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'`
-    case "$ac_option" in
-      *=*) ;;
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
+    eval "with_$ac_package='$ac_optarg'" ;;
 
   -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
+    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'`
+    eval "with_$ac_package=no" ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -381,98 +415,98 @@ EOF
     ac_prev=x_includes ;;
   -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
   | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
+    x_includes=$ac_optarg ;;
 
   -x-libraries | --x-libraries | --x-librarie | --x-librari \
   | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
     ac_prev=x_libraries ;;
   -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
+    x_libraries=$ac_optarg ;;
 
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
     ;;
 
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    eval "$ac_envvar='$ac_optarg'"
+    export $ac_envvar ;;
+
   *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
+    # FIXME: should be removed in autoconf 3.0.
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    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}
     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  { echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
 fi
 
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
+# 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
 
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+              localstatedir libdir includedir oldincludedir infodir mandir
 do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* ) ;;
+    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
   esac
 done
 
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: should be removed in autoconf 3.0.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
 
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
 
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=configure.in
+test "$silent" = yes && exec 6>/dev/null
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then its parent.
   ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+  ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
   test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir
   if test ! -r $srcdir/$ac_unique_file; then
@@ -483,13 +517,317 @@ else
 fi
 if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
+   { (exit 1); exit 1; }; }
   else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources in $srcdir" >&2
+   { (exit 1); exit 1; }; }
   fi
 fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<EOF
+\`configure' configures this package to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+EOF
+
+  cat <<EOF
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
+EOF
+
+  cat <<\EOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       build programs to run on HOST [BUILD]
+EOF
+fi
+
+if test -n "$ac_init_help"; then
 
+  cat <<\EOF
+
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-dependency-tracking Speeds up one-time builds
+  --enable-dependency-tracking  Do not reject slow dependency extractors
+  --disable-rpath         do not hardcode runtime library paths
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-gnu-ld           assume the C compiler uses GNU ld default=no
+  --with-librpathx-prefix=DIR  search for librpathx in DIR/include and DIR/lib
+  --without-librpathx-prefix     don't search for librpathx in includedir and libdir
+  --with-librpathy-prefix=DIR  search for librpathy in DIR/include and DIR/lib
+  --without-librpathy-prefix     don't search for librpathy in includedir and libdir
+  --with-librpathz-prefix=DIR  search for librpathz in DIR/include and DIR/lib
+  --without-librpathz-prefix     don't search for librpathz in includedir and libdir
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+              headers in a nonstandard directory <include dir>
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+EOF
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  ac_popdir=`pwd`
+  for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
+    cd $ac_subdir
+    # A "../" for each directory in /$ac_subdir.
+    ac_dots=`echo $ac_subdir |
+             sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
+
+    case $srcdir in
+    .) # No --srcdir option.  We are building in place.
+      ac_sub_srcdir=$srcdir ;;
+    [\\/]* | ?:[\\/]* ) # Absolute path.
+      ac_sub_srcdir=$srcdir/$ac_subdir ;;
+    *) # Relative path.
+      ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
+    esac
+
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_sub_srcdir/configure.gnu; then
+      echo
+      $SHELL $ac_sub_srcdir/configure.gnu  --help=recursive
+    elif test -f $ac_sub_srcdir/configure; then
+      echo
+      $SHELL $ac_sub_srcdir/configure  --help=recursive
+    elif test -f $ac_sub_srcdir/configure.ac ||
+           test -f $ac_sub_srcdir/configure.in; then
+      echo
+      $ac_configure --help
+    else
+      echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
+    fi
+    cd $ac_popdir
+  done
+fi
+
+test -n "$ac_init_help" && exit 0
+if $ac_init_version; then
+  cat <<\EOF
+
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+EOF
+  exit 0
+fi
+exec 5>config.log
+cat >&5 <<EOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by $as_me, which was
+generated by GNU Autoconf 2.52.  Invocation command line was
+
+  $ $0 $@
+
+EOF
+{
+cat <<_ASUNAME
+## ---------- ##
+## Platform.  ##
+## ---------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+PATH = $PATH
+
+_ASUNAME
+} >&5
+
+cat >&5 <<EOF
+## ------------ ##
+## Core tests.  ##
+## ------------ ##
+
+EOF
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell meta-characters.
+ac_configure_args=
+ac_sep=
+for ac_arg
+do
+  case $ac_arg in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c) ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
+    ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+    ac_sep=" " ;;
+  *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg"
+     ac_sep=" " ;;
+  esac
+  # Get rid of the leading space.
+done
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  echo >&5
+  echo "## ----------------- ##" >&5
+  echo "## Cache variables.  ##" >&5
+  echo "## ----------------- ##" >&5
+  echo >&5
+  # The following way of writing the cache mishandles newlines in values,
+{
+  (set) 2>&1 |
+    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      sed -n \
+        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+      ;;
+    *)
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} >&5
+  sed "/^$/d" confdefs.h >conftest.log
+  if test -s conftest.log; then
+    echo >&5
+    echo "## ------------ ##" >&5
+    echo "## confdefs.h.  ##" >&5
+    echo "## ------------ ##" >&5
+    echo >&5
+    cat conftest.log >&5
+  fi
+  (echo; echo) >&5
+  test "$ac_signal" != 0 &&
+    echo "$as_me: caught signal $ac_signal" >&5
+  echo "$as_me: exit $exit_status" >&5
+  rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files &&
+    exit $exit_status
+     ' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
+
+# Let the site file select an alternate cache file if it wants to.
 # Prefer explicitly selected file to automatically selected ones.
 if test -z "$CONFIG_SITE"; then
   if test "x$prefix" != xNONE; then
@@ -500,40 +838,107 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
+    { echo "$as_me:841: 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"
   fi
 done
 
 if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
+  # 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:852: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . $cache_file;;
+      *)                      . ./$cache_file;;
+    esac
+  fi
 else
-  echo "creating cache $cache_file"
-  > $cache_file
+  { echo "$as_me:860: 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.
+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
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+  eval ac_new_val="\$ac_env_${ac_var}_value"
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { echo "$as_me:876: 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)
+      { echo "$as_me:880: 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
+        { echo "$as_me:886: 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:888:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+        { echo "$as_me:890:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+        ac_cache_corrupted=:
+      fi;;
+  esac
+  # Pass precious variables to config.status.  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
+if $ac_cache_corrupted; then
+  { echo "$as_me:909: 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:911: 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
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
+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
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)      ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+echo "#! $SHELL" >conftest.sh
+echo  "exit 0"   >>conftest.sh
+chmod +x conftest.sh
+if { (echo "$as_me:931: PATH=\".;.\"; conftest.sh") >&5
+  (PATH=".;."; conftest.sh) 2>&5
+  ac_status=$?
+  echo "$as_me:934: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  ac_path_separator=';'
 else
-  ac_n= ac_c='\c' ac_t=
+  ac_path_separator=:
 fi
-
+PATH_SEPARATOR="$ac_path_separator"
+rm -f conftest.sh
 
 ac_aux_dir=
 for ac_dir in $global_top_srcdir ../..; do
@@ -545,18 +950,20 @@ for ac_dir in $global_top_srcdir ../..; do
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
+  elif test -f $ac_dir/shtool; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $global_top_srcdir ../.." 1>&2; exit 1; }
+  { { echo "$as_me:960: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -565,31 +972,39 @@ am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:574: checking for a BSD compatible install" >&5
+echo "$as_me:980: 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 eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${ac_cv_path_install+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+    ac_save_IFS=$IFS; IFS=$ac_path_separator
   for ac_dir in $PATH; do
+    IFS=$ac_save_IFS
     # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    case $ac_dir/ in
+    / | ./ | .// | /cC/* \
+    | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
+    | /usr/ucb/* ) ;;
     *)
       # OSF1 and SCO ODT 3.0 have their own names for install.
       # Don't use installbsd from OSF since it installs stuff as root
       # by default.
       for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
+        if $as_executable_p "$ac_dir/$ac_prog"; then
 	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+            grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
 	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
 	  else
 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
 	    break 2
@@ -599,31 +1014,31 @@ else
       ;;
     esac
   done
-  IFS="$ac_save_IFS"
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
+    INSTALL=$ac_cv_path_install
   else
     # As a last resort, use the slow shell script.  We don't cache a
     # path for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
+    INSTALL=$ac_install_sh
   fi
 fi
-echo "$ac_t""$INSTALL" 1>&6
+echo "$as_me:1029: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:627: checking whether build environment is sane" >&5
+echo "$as_me:1040: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -646,8 +1061,11 @@ 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".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
+      { { echo "$as_me:1064: 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;}
+   { (exit 1); exit 1; }; }
    fi
 
    test "$2" = conftest.file
@@ -656,28 +1074,29 @@ then
    # Ok.
    :
 else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
+   { { echo "$as_me:1077: 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
+echo "$as_me:1083: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 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 &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+  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
 
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
 
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
@@ -686,82 +1105,86 @@ if eval "$MISSING --run true"; then
 else
   am_missing_run=
   am_backtick='`'
-  echo "configure: warning: ${am_backtick}missing' script is too old or missing" 1>&2
+  { echo "$as_me:1108: WARNING: ${am_backtick}missing' script is too old or missing" >&5
+echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;}
 fi
 
 for ac_prog in mawk gawk nawk awk
 do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:698: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1116: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AWK+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AWK="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_AWK="$ac_prog"
+echo "$as_me:1131: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-AWK="$ac_cv_prog_AWK"
+AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$ac_t""$AWK" 1>&6
+  echo "$as_me:1139: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1142: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-test -n "$AWK" && break
+  test -n "$AWK" && break
 done
 
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:728: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1149: 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 "(cached) $ECHO_C" >&6
 else
-  cat > conftestmake <<\EOF
+  cat >conftest.make <<\EOF
 all:
 	@echo 'ac_maketemp="${MAKE}"'
 EOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
 if test -n "$ac_maketemp"; then
   eval ac_cv_prog_make_${ac_make}_set=yes
 else
   eval ac_cv_prog_make_${ac_make}_set=no
 fi
-rm -f conftestmake
+rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+  echo "$as_me:1169: result: yes" >&5
+echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1173: result: no" >&5
+echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 # Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
 if test "${enable_dependency_tracking+set}" = set; then
   enableval="$enable_dependency_tracking"
-  :
-fi
 
+fi;
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
 fi
 
-
 if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
@@ -770,9 +1193,6 @@ else
   AMDEP_FALSE=
 fi
 
-
-
-
 rm -f .deps 2>/dev/null
 mkdir .deps 2>/dev/null
 if test -d .deps; then
@@ -783,25 +1203,26 @@ else
 fi
 rmdir .deps 2>/dev/null
 
-
 # test to see if srcdir already configured
 if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run \"make distclean\" there first" 1>&2; exit 1; }
+  { { echo "$as_me:1209: 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
 
 # Define the identity of the package.
 PACKAGE=gettext_rpathlzyx
 VERSION=0
-cat >> confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
 
-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define VERSION "$VERSION"
 EOF
 
-
 # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
 # the ones we care about.
 
@@ -813,24 +1234,18 @@ EOF
 # requests that it be used.  This is a bit dumb.
 : ${OBJEXT=o}
 
-
 # Some tools Automake needs.
 
 ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"}
 
-
 AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
 
-
 AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"}
 
-
 AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
-
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-
 AMTAR=${AMTAR-"${am_missing_run}tar"}
 
 install_sh=${install_sh-"$am_aux_dir/install-sh"}
@@ -840,214 +1255,578 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 
-# Extract the first word of "gcc", so it can be a program name with args.
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+echo "$as_me:1266: 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
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1281: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:1289: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:1292: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:847: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1301: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="gcc"
+echo "$as_me:1316: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1324: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1327: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+echo "$as_me:1340: 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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1355: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1363: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:1366: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+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
+echo "$as_me:1375: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="cc"
+echo "$as_me:1390: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1398: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1401: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
 else
-  echo "$ac_t""no" 1>&6
+  CC="$ac_cv_prog_CC"
 fi
 
+fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:877: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1414: 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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+  ac_prog_rejected=yes
+  continue
+fi
+ac_cv_prog_CC="cc"
+echo "$as_me:1434: found $ac_dir/$ac_word" >&5
+break
+done
+
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
   set dummy $ac_cv_prog_CC
   shift
-  if test $# -gt 0; then
+  if test $# != 0; then
     # We chose a different compiler from the bogus one.
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
-    set dummy "$ac_dir/$ac_word" "$@"
+    set dummy "$ac_dir/$ac_word" ${1+"$@"}
     shift
     ac_cv_prog_CC="$@"
   fi
 fi
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1456: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1459: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:928: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl
+  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:1470: 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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1485: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1493: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1496: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl
+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:1509: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1524: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1532: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1535: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:960: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+  test -n "$ac_ct_CC" && break
+done
 
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+  CC=$ac_ct_CC
+fi
 
-cat > conftest.$ac_ext << EOF
+fi
 
-#line 971 "configure"
+test -z "$CC" && { { echo "$as_me:1547: error: no acceptable cc found in \$PATH" >&5
+echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+
+# Provide some information about the compiler.
+echo "$as_me:1552:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:1555: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1558: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1560: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1563: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1565: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1568: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 1572 "configure"
 #include "confdefs.h"
 
-main(){return(0);}
-EOF
-if { (eval echo configure:976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_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.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+echo "$as_me:1588: 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[^ ]*//'`
+if { (eval echo "$as_me:1591: \"$ac_link_default\"") >&5
+  (eval $ac_link_default) 2>&5
+  ac_status=$?
+  echo "$as_me:1594: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # 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" : '[^.]*\(\..*\)'`
+          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
+          export ac_cv_exeext
+          break;;
+    * ) break;;
+  esac
+done
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:1617: 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:1623: 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 "$as_me:1628: 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'
+  { (eval echo "$as_me:1634: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1637: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no
   else
-    ac_cv_prog_cc_cross=yes
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { echo "$as_me:1644: 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;}
+   { (exit 1); exit 1; }; }
+    fi
   fi
+fi
+echo "$as_me:1652: 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 "$as_me:1659: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+echo "$as_me:1661: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6
+
+echo "$as_me:1664: checking for executable suffix" >&5
+echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+if { (eval echo "$as_me:1666: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:1669: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
+  case $ac_file in
+    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+          export ac_cv_exeext
+          break;;
+    * ) break;;
+  esac
+done
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
+  { { echo "$as_me:1685: 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 -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1002: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1007: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1016: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
+
+rm -f conftest$ac_cv_exeext
+echo "$as_me:1691: 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 "$as_me:1697: 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
-  ac_cv_prog_gcc=no
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1703 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (eval echo "$as_me:1715: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1718: \$? = $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
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:1730: 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:1737: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+echo "$as_me:1741: 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
+#line 1747 "configure"
+#include "confdefs.h"
 
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
 
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1762: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1765: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1768: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1771: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_compiler_gnu=yes
 else
-  GCC=
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_compiler_gnu=no
 fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1035: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+fi
+echo "$as_me:1783: 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 "$as_me:1789: 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
-  echo 'void f(){}' > conftest.c
-if test X"`${CC-cc} -c conftest.c 2>&1`" = X"`${CC-cc} -g -c conftest.c 2>&1`"; then
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1795 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1807: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1810: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1813: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1816: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
-  ac_cv_prog_cc_g=no
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_prog_cc_g=no
 fi
-rm -f conftest*
-
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+echo "$as_me:1826: 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"
+  CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
     CFLAGS="-g -O2"
@@ -1061,7 +1840,118 @@ else
     CFLAGS=
   fi
 fi
+# Some people use a C++ compiler to compile C.  Since we use `exit',
+# in C++ we need to declare it.  In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+  choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1853: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1856: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1859: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1862: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1874 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1887: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1890: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1893: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1896: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+continue
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1906 "configure"
+#include "confdefs.h"
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1918: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1921: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1924: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1927: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+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
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_config_commands="$ac_config_commands default-1"
 
 am_make=${MAKE-make}
 cat > confinc << 'END'
@@ -1069,8 +1959,8 @@ doit:
 	@echo done
 END
 # If we don't find an include directive, just comment out the code.
-echo $ac_n "checking for style of include used by $am_make""... $ac_c" 1>&6
-echo "configure:1074: checking for style of include used by $am_make" >&5
+echo "$as_me:1962: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
 am__include='#'
 am__quote=
 _am_result=none
@@ -1096,17 +1986,16 @@ if test "$am__include" = "#"; then
    fi
 fi
 
-
-echo "$ac_t""$_am_result" 1>&6
+echo "$as_me:1989: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6
 rm -f confinc confmf
 
-
 depcc="$CC"   am_compiler_list=
 
-echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6
-echo "configure:1108: checking dependency style of $depcc" >&5
-if eval "test \"`echo '$''{'am_cv_CC_dependencies_compiler_type'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1995: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -1165,37 +2054,76 @@ else
 fi
 
 fi
-
-echo "$ac_t""$am_cv_CC_dependencies_compiler_type" 1>&6
+echo "$as_me:2057: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
 
-
+      if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
 
 # Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1181: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:2078: error: cannot run $ac_config_sub" >&5
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+echo "$as_me:2082: 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
+else
+  ac_cv_build_alias=$build_alias
+test -z "$ac_cv_build_alias" &&
+  ac_cv_build_alias=`$ac_config_guess`
+test -z "$ac_cv_build_alias" &&
+  { { echo "$as_me:2091: 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:2095: 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:2100: 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 "$as_me:2107: 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
+else
+  ac_cv_host_alias=$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:2116: 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; }; }
 
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
+fi
+echo "$as_me:2121: 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/'`
 
 # Check whether --with-gnu-ld or --without-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
@@ -1203,13 +2131,12 @@ if test "${with_gnu_ld+set}" = set; then
   test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
-fi
-
+fi;
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1213: checking for ld used by GCC" >&5
+  echo "$as_me:2138: checking for ld used by GCC" >&5
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1238,14 +2165,14 @@ echo "configure:1213: checking for ld used by GCC" >&5
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1243: checking for GNU ld" >&5
+  echo "$as_me:2168: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
 else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1246: checking for non-GNU ld" >&5
+  echo "$as_me:2171: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
 fi
-if eval "test \"`echo '$''{'acl_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${acl_cv_path_LD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
@@ -1271,60 +2198,46 @@ fi
 
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1281: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'acl_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  acl_cv_prog_gnu_ld=yes
+  echo "$as_me:2201: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
 else
-  acl_cv_prog_gnu_ld=no
-fi
-fi
-
-echo "$ac_t""$acl_cv_prog_gnu_ld" 1>&6
-with_gnu_ld=$acl_cv_prog_gnu_ld
-
-
-
-      if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-
+  echo "$as_me:2204: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+test -z "$LD" && { { echo "$as_me:2207: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+echo "$as_me:2210: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+if test "${acl_cv_prog_gnu_ld+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+  acl_cv_prog_gnu_ld=yes
+else
+  acl_cv_prog_gnu_ld=no
+fi
+fi
+echo "$as_me:2222: result: $acl_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
+with_gnu_ld=$acl_cv_prog_gnu_ld
 
-                                                echo $ac_n "checking for shared library run path origin""... $ac_c" 1>&6
-echo "configure:1315: checking for shared library run path origin" >&5
-if eval "test \"`echo '$''{'acl_cv_rpath'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+                                                echo "$as_me:2226: checking for shared library run path origin" >&5
+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
+if test "${acl_cv_rpath+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
+
     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
     ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
     . ./conftest.sh
     rm -f ./conftest.sh
     acl_cv_rpath=done
-  
-fi
 
-echo "$ac_t""$acl_cv_rpath" 1>&6
+fi
+echo "$as_me:2239: result: $acl_cv_rpath" >&5
+echo "${ECHO_T}$acl_cv_rpath" >&6
   wl="$acl_cv_wl"
   libext="$acl_cv_libext"
   shlibext="$acl_cv_shlibext"
@@ -1334,50 +2247,50 @@ echo "$ac_t""$acl_cv_rpath" 1>&6
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
   sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
   sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
+    # Check whether --enable-rpath or --disable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+  enableval="$enable_rpath"
+  :
+else
+  enable_rpath=yes
+fi;
 
-
-  
-  
-  
-  
-  echo $ac_n "checking how to link with librpathx""... $ac_c" 1>&6
-echo "configure:1345: checking how to link with librpathx" >&5
-if eval "test \"`echo '$''{'ac_cv_librpathx_libs'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:2258: checking how to link with librpathx" >&5
+echo $ECHO_N "checking how to link with librpathx... $ECHO_C" >&6
+if test "${ac_cv_librpathx_libs+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
-    
-  
+
     use_additional=yes
-  
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
-  
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
-  # Check whether --with-librpathx-prefix or --without-librpathx-prefix was given.
+# Check whether --with-librpathx-prefix or --without-librpathx-prefix was given.
 if test "${with_librpathx_prefix+set}" = set; then
   withval="$with_librpathx_prefix"
-  
+
     if test "X$withval" = "Xno"; then
       use_additional=no
     else
       if test "X$withval" = "X"; then
-        
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
           eval additional_includedir=\"$includedir\"
           eval additional_libdir=\"$libdir\"
-        
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
@@ -1387,8 +2300,7 @@ if test "${with_librpathx_prefix+set}" = set; then
       fi
     fi
 
-fi
-
+fi;
       LIBRPATHX=
   LTLIBRPATHX=
   INCRPATHX=
@@ -1444,7 +2356,7 @@ fi
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBRPATHX; do
-              
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1481,7 +2393,7 @@ fi
           if test "X$found_dir" != "X"; then
                         LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "X$found_dir" = "X/usr/lib"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
                                 LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
               else
                                                                                 haveit=
@@ -1512,7 +2424,7 @@ fi
                   else
                                                                                 haveit=
                     for x in $LDFLAGS $LIBRPATHX; do
-                      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1563,7 +2475,7 @@ fi
                 fi
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCRPATHX; do
-                    
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1608,7 +2520,7 @@ fi
                       if test -z "$haveit"; then
                         haveit=
                         for x in $LDFLAGS $LIBRPATHX; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1629,7 +2541,7 @@ fi
                         fi
                         haveit=
                         for x in $LDFLAGS $LTLIBRPATHX; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1653,25 +2565,27 @@ fi
                     ;;
                   -R*)
                     dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $dir"
-                    fi
-                                                            haveit=
-                    for x in $ltrpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      ltrpathdirs="$ltrpathdirs $dir"
                     fi
                     ;;
                   -l*)
@@ -1725,18 +2639,18 @@ fi
     ac_cv_librpathx_libs="$LIBRPATHX"
     ac_cv_librpathx_ltlibs="$LTLIBRPATHX"
     ac_cv_librpathx_cppflags="$INCRPATHX"
-  
-fi
 
-echo "$ac_t""$ac_cv_librpathx_libs" 1>&6
+fi
+echo "$as_me:2644: result: $ac_cv_librpathx_libs" >&5
+echo "${ECHO_T}$ac_cv_librpathx_libs" >&6
   LIBRPATHX="$ac_cv_librpathx_libs"
   LTLIBRPATHX="$ac_cv_librpathx_ltlibs"
   INCRPATHX="$ac_cv_librpathx_cppflags"
-  
+
   for element in $INCRPATHX; do
     haveit=
     for x in $CPPFLAGS; do
-      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1755,55 +2669,44 @@ echo "$ac_t""$ac_cv_librpathx_libs" 1>&6
     fi
   done
 
-  
-  
       HAVE_LIBRPATHX=yes
-  
-  
-
-
-  
-  
-  
-  
-  echo $ac_n "checking how to link with librpathy""... $ac_c" 1>&6
-echo "configure:1771: checking how to link with librpathy" >&5
-if eval "test \"`echo '$''{'ac_cv_librpathy_libs'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    
-  
+
+  echo "$as_me:2674: checking how to link with librpathy" >&5
+echo $ECHO_N "checking how to link with librpathy... $ECHO_C" >&6
+if test "${ac_cv_librpathy_libs+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
     use_additional=yes
-  
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
-  
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
-  # Check whether --with-librpathy-prefix or --without-librpathy-prefix was given.
+# Check whether --with-librpathy-prefix or --without-librpathy-prefix was given.
 if test "${with_librpathy_prefix+set}" = set; then
   withval="$with_librpathy_prefix"
-  
+
     if test "X$withval" = "Xno"; then
       use_additional=no
     else
       if test "X$withval" = "X"; then
-        
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
           eval additional_includedir=\"$includedir\"
           eval additional_libdir=\"$libdir\"
-        
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
@@ -1813,8 +2716,7 @@ if test "${with_librpathy_prefix+set}" = set; then
       fi
     fi
 
-fi
-
+fi;
       LIBRPATHY=
   LTLIBRPATHY=
   INCRPATHY=
@@ -1870,7 +2772,7 @@ fi
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBRPATHY; do
-              
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1907,7 +2809,7 @@ fi
           if test "X$found_dir" != "X"; then
                         LTLIBRPATHY="${LTLIBRPATHY}${LTLIBRPATHY:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "X$found_dir" = "X/usr/lib"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
                                 LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so"
               else
                                                                                 haveit=
@@ -1938,7 +2840,7 @@ fi
                   else
                                                                                 haveit=
                     for x in $LDFLAGS $LIBRPATHY; do
-                      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -1989,7 +2891,7 @@ fi
                 fi
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCRPATHY; do
-                    
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -2034,7 +2936,7 @@ fi
                       if test -z "$haveit"; then
                         haveit=
                         for x in $LDFLAGS $LIBRPATHY; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -2055,7 +2957,7 @@ fi
                         fi
                         haveit=
                         for x in $LDFLAGS $LTLIBRPATHY; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -2079,25 +2981,27 @@ fi
                     ;;
                   -R*)
                     dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $dir"
-                    fi
-                                                            haveit=
-                    for x in $ltrpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      ltrpathdirs="$ltrpathdirs $dir"
                     fi
                     ;;
                   -l*)
@@ -2151,18 +3055,18 @@ fi
     ac_cv_librpathy_libs="$LIBRPATHY"
     ac_cv_librpathy_ltlibs="$LTLIBRPATHY"
     ac_cv_librpathy_cppflags="$INCRPATHY"
-  
-fi
 
-echo "$ac_t""$ac_cv_librpathy_libs" 1>&6
+fi
+echo "$as_me:3060: result: $ac_cv_librpathy_libs" >&5
+echo "${ECHO_T}$ac_cv_librpathy_libs" >&6
   LIBRPATHY="$ac_cv_librpathy_libs"
   LTLIBRPATHY="$ac_cv_librpathy_ltlibs"
   INCRPATHY="$ac_cv_librpathy_cppflags"
-  
+
   for element in $INCRPATHY; do
     haveit=
     for x in $CPPFLAGS; do
-      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -2181,55 +3085,44 @@ echo "$ac_t""$ac_cv_librpathy_libs" 1>&6
     fi
   done
 
-  
-  
       HAVE_LIBRPATHY=yes
-  
-  
-
-
-  
-  
-  
-  
-  echo $ac_n "checking how to link with librpathz""... $ac_c" 1>&6
-echo "configure:2197: checking how to link with librpathz" >&5
-if eval "test \"`echo '$''{'ac_cv_librpathz_libs'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    
-  
+
+  echo "$as_me:3090: checking how to link with librpathz" >&5
+echo $ECHO_N "checking how to link with librpathz... $ECHO_C" >&6
+if test "${ac_cv_librpathz_libs+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
     use_additional=yes
-  
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
-  
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
-  # Check whether --with-librpathz-prefix or --without-librpathz-prefix was given.
+# Check whether --with-librpathz-prefix or --without-librpathz-prefix was given.
 if test "${with_librpathz_prefix+set}" = set; then
   withval="$with_librpathz_prefix"
-  
+
     if test "X$withval" = "Xno"; then
       use_additional=no
     else
       if test "X$withval" = "X"; then
-        
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
           eval additional_includedir=\"$includedir\"
           eval additional_libdir=\"$libdir\"
-        
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
@@ -2239,8 +3132,7 @@ if test "${with_librpathz_prefix+set}" = set; then
       fi
     fi
 
-fi
-
+fi;
       LIBRPATHZ=
   LTLIBRPATHZ=
   INCRPATHZ=
@@ -2296,7 +3188,7 @@ fi
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBRPATHZ; do
-              
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -2333,7 +3225,7 @@ fi
           if test "X$found_dir" != "X"; then
                         LTLIBRPATHZ="${LTLIBRPATHZ}${LTLIBRPATHZ:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "X$found_dir" = "X/usr/lib"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
                                 LIBRPATHZ="${LIBRPATHZ}${LIBRPATHZ:+ }$found_so"
               else
                                                                                 haveit=
@@ -2364,7 +3256,7 @@ fi
                   else
                                                                                 haveit=
                     for x in $LDFLAGS $LIBRPATHZ; do
-                      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -2415,7 +3307,7 @@ fi
                 fi
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCRPATHZ; do
-                    
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -2460,7 +3352,7 @@ fi
                       if test -z "$haveit"; then
                         haveit=
                         for x in $LDFLAGS $LIBRPATHZ; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -2481,7 +3373,7 @@ fi
                         fi
                         haveit=
                         for x in $LDFLAGS $LTLIBRPATHZ; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -2505,25 +3397,27 @@ fi
                     ;;
                   -R*)
                     dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $dir"
-                    fi
-                                                            haveit=
-                    for x in $ltrpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      ltrpathdirs="$ltrpathdirs $dir"
                     fi
                     ;;
                   -l*)
@@ -2577,18 +3471,18 @@ fi
     ac_cv_librpathz_libs="$LIBRPATHZ"
     ac_cv_librpathz_ltlibs="$LTLIBRPATHZ"
     ac_cv_librpathz_cppflags="$INCRPATHZ"
-  
-fi
 
-echo "$ac_t""$ac_cv_librpathz_libs" 1>&6
+fi
+echo "$as_me:3476: result: $ac_cv_librpathz_libs" >&5
+echo "${ECHO_T}$ac_cv_librpathz_libs" >&6
   LIBRPATHZ="$ac_cv_librpathz_libs"
   LTLIBRPATHZ="$ac_cv_librpathz_ltlibs"
   INCRPATHZ="$ac_cv_librpathz_cppflags"
-  
+
   for element in $INCRPATHZ; do
     haveit=
     for x in $CPPFLAGS; do
-      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -2607,304 +3501,667 @@ echo "$ac_t""$ac_cv_librpathz_libs" 1>&6
     fi
   done
 
-  
-  
       HAVE_LIBRPATHZ=yes
-  
-  
 
 LIBRPATHZ="$LIBRPATHZ $LIBRPATHY $LIBRPATHX"
 
-trap '' 1 2 15
-cat > confcache <<\EOF
+ac_config_files="$ac_config_files Makefile"
+cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
 #
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
 #
-EOF
+# `ac_cv_env_foo' variables (set or unset) will be overriden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 # So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+        "s/'/'\\\\''/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if cmp -s $cache_file confcache; then :; else
   if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
   else
     echo "not updating unwritable cache $cache_file"
   fi
 fi
 rm -f confcache
 
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[ 	]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[ 	]*$//;
+}'
 fi
 
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then we branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+cat >confdef2opt.sed <<\EOF
+t clear
+: clear
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+d
+: quote
+s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
+s,\[,\\&,g
+s,\],\\&,g
+s,\$,$$,g
+p
 EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
+# We use echo to avoid assuming a particular line-breaking character.
+# The extra dot is to prevent the shell from consuming trailing
+# line-breaks from the sub-command output.  A line-break within
+# single-quotes doesn't work because, if this script is created in a
+# platform that uses two characters for line-breaks (e.g., DOS), tr
+# would break.
+ac_LF_and_DOT=`echo; echo .`
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+rm -f confdef2opt.sed
 
-# Without the "./", some shells look in PATH for config.status.
 : ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ echo "$as_me:3618: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
+#! $SHELL
 # Generated automatically by configure.
 # Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
 # Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
+# configure, is in config.log if it exists.
 
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
+debug=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+ac_cs_invocation="\$0 \$@"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+# NLS nuisances.
+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+
+exec 6>&1
+
+_ACEOF
+
+# Files that config.status was made for.
+if test -n "$ac_config_files"; then
+  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_headers"; then
+  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_links"; then
+  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_commands"; then
+  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+fi
+
+cat >>$CONFIG_STATUS <<\EOF
+
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTIONS] [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number, then exit
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+  --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Configuration commands:
+$config_commands
+
+Report bugs to <bug-autoconf@gnu.org>."
+EOF
+
+cat >>$CONFIG_STATUS <<EOF
+ac_cs_version="\\
+config.status
+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
+Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+srcdir=$srcdir
+INSTALL="$INSTALL"
+EOF
+
+cat >>$CONFIG_STATUS <<\EOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
+ac_need_defaults=:
+while test $# != 0
 do
-  case "\$ac_option" in
+  case $1 in
+  --*=*)
+    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+    shift
+    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
+    shift
+    ;;
+  -*);;
+  *) # This is not an option, so the user has probably given explicit
+     # arguments.
+     ac_need_defaults=false;;
+  esac
+
+  case $1 in
+  # Handling of the options.
+EOF
+cat >>$CONFIG_STATUS <<EOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
+    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
+    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
+EOF
+cat >>$CONFIG_STATUS <<\EOF
+  --version | --vers* | -V )
+    echo "$ac_cs_version"; exit 0 ;;
+  --he | --h)
+    # Conflict between --help and --header
+    { { echo "$as_me:3789: 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;}
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit 0 ;;
+  --debug | --d* | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    shift
+    CONFIG_FILES="$CONFIG_FILES $1"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $1"
+    ac_need_defaults=false;;
+
+  # This is an error.
+  -*) { { echo "$as_me:3808: 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; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1" ;;
+
   esac
+  shift
 done
 
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
+exec 5>>config.log
+cat >&5 << _ACEOF
+
+## ----------------------- ##
+## Running config.status.  ##
+## ----------------------- ##
+
+This file was extended by $as_me 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`
 
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+_ACEOF
 EOF
-cat >> $CONFIG_STATUS <<EOF
 
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@EXEEXT@%$EXEEXT%g
-s%@OBJEXT@%$OBJEXT%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@AMTAR@%$AMTAR%g
-s%@install_sh@%$install_sh%g
-s%@INSTALL_STRIP_PROGRAM@%$INSTALL_STRIP_PROGRAM%g
-s%@AWK@%$AWK%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@AMDEP_TRUE@%$AMDEP_TRUE%g
-s%@AMDEP_FALSE@%$AMDEP_FALSE%g
-s%@AMDEPBACKSLASH@%$AMDEPBACKSLASH%g
-s%@DEPDIR@%$DEPDIR%g
-s%@CC@%$CC%g
-s%@am__include@%$am__include%g
-s%@am__quote@%$am__quote%g
-s%@CCDEPMODE@%$CCDEPMODE%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@LIBRPATHX@%$LIBRPATHX%g
-s%@LTLIBRPATHX@%$LTLIBRPATHX%g
-s%@LIBRPATHY@%$LIBRPATHY%g
-s%@LTLIBRPATHY@%$LTLIBRPATHY%g
-s%@LIBRPATHZ@%$LIBRPATHZ%g
-s%@LTLIBRPATHZ@%$LTLIBRPATHZ%g
-s%@global_top_srcdir@%$global_top_srcdir%g
+cat >>$CONFIG_STATUS <<EOF
+#
+# INIT-COMMANDS section.
+#
+
+AMDEP_TRUE="$AMDEP_TRUE"
+ac_aux_dir="$ac_aux_dir"
 
-CEOF
 EOF
 
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
+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" ;;
+  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+  *) { { echo "$as_me:3855: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
 done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
+
+# 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
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
+
+# Create a temporary directory, and hook for its removal unless debugging.
+$debug ||
+{
+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+
+# Create a (secure) tmp directory for tmp files.
+: ${TMPDIR=/tmp}
+{
+  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=$TMPDIR/cs$$-$RANDOM
+  (umask 077 && mkdir $tmp)
+} ||
+{
+   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+   { (exit 1); exit 1; }
+}
+
+EOF
+
+cat >>$CONFIG_STATUS <<EOF
+
+#
+# CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "\$CONFIG_FILES"; then
+  # Protect against being on the right side of a sed subst in config.status.
+  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+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,@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,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@DEFS@,$DEFS,;t t
+s,@LIBS@,$LIBS,;t t
+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@PACKAGE@,$PACKAGE,;t t
+s,@VERSION@,$VERSION,;t t
+s,@EXEEXT@,$EXEEXT,;t t
+s,@OBJEXT@,$OBJEXT,;t t
+s,@ACLOCAL@,$ACLOCAL,;t t
+s,@AUTOCONF@,$AUTOCONF,;t t
+s,@AUTOMAKE@,$AUTOMAKE,;t t
+s,@AUTOHEADER@,$AUTOHEADER,;t t
+s,@MAKEINFO@,$MAKEINFO,;t t
+s,@AMTAR@,$AMTAR,;t t
+s,@install_sh@,$install_sh,;t t
+s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+s,@AWK@,$AWK,;t t
+s,@SET_MAKE@,$SET_MAKE,;t t
+s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
+s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
+s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+s,@DEPDIR@,$DEPDIR,;t t
+s,@CC@,$CC,;t t
+s,@CFLAGS@,$CFLAGS,;t t
+s,@LDFLAGS@,$LDFLAGS,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@ac_ct_CC@,$ac_ct_CC,;t t
+s,@am__include@,$am__include,;t t
+s,@am__quote@,$am__quote,;t t
+s,@CCDEPMODE@,$CCDEPMODE,;t t
+s,@build@,$build,;t t
+s,@build_cpu@,$build_cpu,;t t
+s,@build_vendor@,$build_vendor,;t t
+s,@build_os@,$build_os,;t t
+s,@host@,$host,;t t
+s,@host_cpu@,$host_cpu,;t t
+s,@host_vendor@,$host_vendor,;t t
+s,@host_os@,$host_os,;t t
+s,@LIBRPATHX@,$LIBRPATHX,;t t
+s,@LTLIBRPATHX@,$LTLIBRPATHX,;t t
+s,@LIBRPATHY@,$LIBRPATHY,;t t
+s,@LTLIBRPATHY@,$LTLIBRPATHY,;t t
+s,@LIBRPATHZ@,$LIBRPATHZ,;t t
+s,@LTLIBRPATHZ@,$LTLIBRPATHZ,;t t
+s,@global_top_srcdir@,$global_top_srcdir,;t t
+CEOF
+
 EOF
 
-cat >> $CONFIG_STATUS <<EOF
+  cat >>$CONFIG_STATUS <<\EOF
+  # Split the substitutions into bite-sized pieces for seds with
+  # small command number limits, like on Digital OSF/1 and HP-UX.
+  ac_max_sed_lines=48
+  ac_sed_frag=1 # Number of current file.
+  ac_beg=1 # First line for current file.
+  ac_end=$ac_max_sed_lines # Line after last line for current file.
+  ac_more_lines=:
+  ac_sed_cmds=
+  while $ac_more_lines; do
+    if test $ac_beg -gt 1; then
+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    else
+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    fi
+    if test ! -s $tmp/subs.frag; then
+      ac_more_lines=false
+    else
+      # The purpose of the label and of the branching condition is to
+      # speed up the sed processing (if there are no `@' at all, there
+      # is no need to browse any of the substitutions).
+      # These are the two extra sed commands mentioned above.
+      (echo ':t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+      if test -z "$ac_sed_cmds"; then
+  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+      else
+  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+      fi
+      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_beg=$ac_end
+      ac_end=`expr $ac_end + $ac_max_sed_lines`
+    fi
+  done
+  if test -z "$ac_sed_cmds"; then
+    ac_sed_cmds=cat
+  fi
+fi # test -n "$CONFIG_FILES"
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
 EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+cat >>$CONFIG_STATUS <<\EOF
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+        cat >$tmp/stdin
+        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
   esac
 
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+  ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_file" : 'X\(//\)[^/]' \| \
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
   if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+    { case "$ac_dir" in
+  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+  *)                      as_incr_dir=.;;
+esac
+as_dummy="$ac_dir"
+for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+  case $as_mkdir_dir in
+    # Skip DOS drivespec
+    ?:) as_incr_dir=$as_mkdir_dir ;;
+    *)
+      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
+    ;;
+  esac
+done; }
+
+    ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`"
     # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+    ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'`
   else
     ac_dir_suffix= ac_dots=
   fi
 
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+  case $srcdir in
+  .)  ac_srcdir=.
+      if test -z "$ac_dots"; then
+         ac_top_srcdir=.
+      else
+         ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
+      fi ;;
+  [\\/]* | ?:[\\/]* )
+      ac_srcdir=$srcdir$ac_dir_suffix;
+      ac_top_srcdir=$srcdir ;;
   *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+    ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_dots$srcdir ;;
   esac
 
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_dots$INSTALL ;;
   esac
 
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:4094: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
+  # Let's still pretend it is `configure' which instantiates (i.e., don't
+  # use $as_me), people would be surprised to read:
+  #    /* config.h.  Generated automatically by config.status.  */
+  configure_input="Generated automatically from `echo $ac_file_in |
+                                                 sed 's,.*/,,'` by configure."
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+         # Absolute (can't be DOS-style, as IFS=:)
+         test -f "$f" || { { echo "$as_me:4112: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         echo $f;;
+      *) # Relative
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$srcdir/$f"; then
+           # Source tree
+           echo $srcdir/$f
+         else
+           # /dev/null tree
+           { { echo "$as_me:4125: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         fi;;
+      esac
+    done` || { (exit 1); exit 1; }
 EOF
-cat >> $CONFIG_STATUS <<EOF
-AMDEP_TRUE="$AMDEP_TRUE"
-ac_aux_dir="$ac_aux_dir"
+cat >>$CONFIG_STATUS <<EOF
+  sed "$ac_vpsub
+$extrasub
+EOF
+cat >>$CONFIG_STATUS <<\EOF
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@configure_input@,$configure_input,;t t
+s,@srcdir@,$ac_srcdir,;t t
+s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@INSTALL@,$ac_INSTALL,;t t
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+  rm -f $tmp/stdin
+  if test x"$ac_file" != x-; then
+    mv $tmp/out $ac_file
+  else
+    cat $tmp/out
+    rm -f $tmp/out
+  fi
 
+done
 EOF
-cat >> $CONFIG_STATUS <<\EOF
+cat >>$CONFIG_STATUS <<\EOF
 
+#
+# CONFIG_COMMANDS section.
+#
+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+
+  case $ac_dest in
+    default-1 )
 test x"$AMDEP_TRUE" != x"" ||
 for mf in $CONFIG_FILES; do
   case "$mf" in
@@ -2942,11 +4199,33 @@ for mf in $CONFIG_FILES; do
     echo '# dummy' > "$dirpart/$file"
   done
 done
+ ;;
+  esac
+done
+EOF
 
+cat >>$CONFIG_STATUS <<\EOF
 
-exit 0
+{ (exit 0); exit 0; }
 EOF
 chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+ac_clean_files=$ac_clean_files_save
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || { (exit 1); exit 1; }
+fi
 
diff --git a/tests/rpathx/Makefile.in b/tests/rpathx/Makefile.in
index c9519c1b8..32667b5b1 100644
--- a/tests/rpathx/Makefile.in
+++ b/tests/rpathx/Makefile.in
@@ -57,10 +57,27 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AMTAR = @AMTAR@
+AS = @AS@
+AWK = @AWK@
 CC = @CC@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+EXEEXT = @EXEEXT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
+STRIP = @STRIP@
+VERSION = @VERSION@
+am__include = @am__include@
+am__quote = @am__quote@
 global_top_srcdir = @global_top_srcdir@
+install_sh = @install_sh@
 
 AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies
 mkinstalldirs = $(SHELL) @global_top_srcdir@/mkinstalldirs
@@ -68,6 +85,7 @@ lib_LTLIBRARIES = librpathx.la
 librpathx_la_SOURCES = rpathx.c
 librpathx_la_LDFLAGS = -lc -no-undefined
 subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(lib_LTLIBRARIES)
 
@@ -92,7 +110,7 @@ CFLAGS = @CFLAGS@
 DIST_SOURCES = $(librpathx_la_SOURCES)
 DIST_COMMON = ../../config.guess ../../config.sub ../../install-sh \
 	../../ltmain.sh ../../missing ../../mkinstalldirs Makefile.am \
-	Makefile.in configure configure.in
+	Makefile.in aclocal.m4 configure configure.in
 SOURCES = $(librpathx_la_SOURCES)
 
 all: all-am
@@ -120,6 +138,9 @@ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 $(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
+
+$(ACLOCAL_M4):  configure.in 
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(libdir)
diff --git a/tests/rpathx/aclocal.m4 b/tests/rpathx/aclocal.m4
index c2fb526be..39c401c6b 100644
--- a/tests/rpathx/aclocal.m4
+++ b/tests/rpathx/aclocal.m4
@@ -497,6 +497,7 @@ fi])
 builtin([undefine],[symbols])
 
 # serial 46 AC_PROG_LIBTOOL
+
 AC_DEFUN([AC_PROG_LIBTOOL],
 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
 
@@ -622,9 +623,30 @@ _LT_AC_LTCONFIG_HACK
 
 ])
 
+# AC_LIBTOOL_HEADER_ASSERT
+# ------------------------
+AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT],
+[AC_CACHE_CHECK([whether $CC supports assert without backlinking],
+    [lt_cv_func_assert_works],
+    [case $host in
+    *-*-solaris*)
+      if test "$GCC" = yes && test "$with_gnu_ld" != yes; then
+        case `$CC --version 2>/dev/null` in
+        [[12]].*) lt_cv_func_assert_works=no ;;
+        *)        lt_cv_func_assert_works=yes ;;
+        esac
+      fi
+      ;;
+    esac])
+
+if test "x$lt_cv_func_assert_works" = xyes; then
+  AC_CHECK_HEADERS(assert.h)
+fi
+])# AC_LIBTOOL_HEADER_ASSERT
+
 # _LT_AC_CHECK_DLFCN
 # --------------------
-AC_DEFUN(_LT_AC_CHECK_DLFCN,
+AC_DEFUN([_LT_AC_CHECK_DLFCN],
 [AC_CHECK_HEADERS(dlfcn.h)
 ])# _LT_AC_CHECK_DLFCN
 
@@ -642,10 +664,10 @@ AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl
 # [They come from Ultrix.  What could be older than Ultrix?!! ;)]
 
 # Character class describing NM global symbol codes.
-[symcode='[BCDEGRST]']
+symcode='[[BCDEGRST]]'
 
 # Regexp to match symbols that can be accessed directly from C.
-[sympat='\([_A-Za-z][_A-Za-z0-9]*\)']
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
 
 # Transform the above into a raw symbol and a C symbol.
 symxfrm='\1 \2\3 \3'
@@ -653,25 +675,29 @@ symxfrm='\1 \2\3 \3'
 # Transform an extracted symbol line into a proper C declaration
 lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
 
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+
 # Define system-specific variables.
 case $host_os in
 aix*)
-  [symcode='[BCDT]']
+  symcode='[[BCDT]]'
   ;;
 cygwin* | mingw* | pw32*)
-  [symcode='[ABCDGISTW]']
+  symcode='[[ABCDGISTW]]'
   ;;
 hpux*) # Its linker distinguishes data from code symbols
   lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
 irix*)
-  [symcode='[BCDEGRST]']
+  symcode='[[BCDEGRST]]'
   ;;
 solaris* | sysv5*)
-  [symcode='[BDT]']
+  symcode='[[BDT]]'
   ;;
 sysv4)
-  [symcode='[DFNSTU]']
+  symcode='[[DFNSTU]]'
   ;;
 esac
 
@@ -685,14 +711,14 @@ esac
 
 # If we're using GNU nm, then use its standard symbol codes.
 if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-  [symcode='[ABCDGISTW]']
+  symcode='[[ABCDGISTW]]'
 fi
 
 # Try without a prefix undercore, then with it.
 for ac_symprfx in "" "_"; do
 
   # Write the raw and C identifiers.
-[lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"]
+lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -734,23 +760,23 @@ EOF
 
 	  cat <<EOF >> conftest.$ac_ext
 #if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
+# define lt_ptr void *
 #else
-# define lt_ptr_t char *
+# define lt_ptr char *
 # define const
 #endif
 
 /* The mapping between symbol names and symbols. */
 const struct {
   const char *name;
-  lt_ptr_t address;
+  lt_ptr address;
 }
-[lt_preloaded_symbols[] =]
+lt_preloaded_symbols[[]] =
 {
 EOF
-	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext
+	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
 	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
+  {0, (lt_ptr) 0}
 };
 
 #ifdef __cplusplus
@@ -794,10 +820,13 @@ done
 global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
 if test -z "$lt_cv_sys_global_symbol_pipe"; then
   global_symbol_to_cdecl=
+  global_symbol_to_c_name_address=
 else
   global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
+  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
 fi
-if test -z "$global_symbol_pipe$global_symbol_to_cdecl"; then
+if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
+then
   AC_MSG_RESULT(failed)
 else
   AC_MSG_RESULT(ok)
@@ -815,16 +844,17 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then
     *-DOS) lt_cv_sys_path_separator=';' ;;
     *)     lt_cv_sys_path_separator=':' ;;
   esac
+  PATH_SEPARATOR=$lt_cv_sys_path_separator
 fi
 ])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
 
 # _LT_AC_PROG_ECHO_BACKSLASH
 # --------------------------
 # Add some code to the start of the generated configure script which
-# will find an echo command which doesn;t interpret backslashes.
+# will find an echo command which doesn't interpret backslashes.
 AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
 [ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-                              [AC_DIVERT_PUSH(NOTICE)])
+			      [AC_DIVERT_PUSH(NOTICE)])
 _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
 
 # Check that we are running under the correct shell.
@@ -890,7 +920,7 @@ else
   #
   # So, first we look for a working echo in the user's PATH.
 
-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for dir in $PATH /usr/ucb; do
     if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
        test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
@@ -979,7 +1009,7 @@ AC_DIVERT_POP
 # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
 #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
 # ------------------------------------------------------------------
-AC_DEFUN(_LT_AC_TRY_DLOPEN_SELF,
+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
 [if test "$cross_compiling" = yes; then :
   [$4]
 else
@@ -1066,7 +1096,7 @@ rm -fr conftest*
 
 # AC_LIBTOOL_DLOPEN_SELF
 # -------------------
-AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF,
+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
 [if test "x$enable_dlopen" != xyes; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
@@ -1088,16 +1118,22 @@ else
    ;;
 
   *)
-    AC_CHECK_LIB(dl, dlopen,  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-      [AC_CHECK_FUNC(dlopen, lt_cv_dlopen="dlopen",
-        [AC_CHECK_FUNC(shl_load, lt_cv_dlopen="shl_load",
-          [AC_CHECK_LIB(svld, dlopen,
-	    [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-            [AC_CHECK_LIB(dld, shl_load,
-              [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+    AC_CHECK_FUNC([shl_load],
+          [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+            [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+	        [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+	          [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+	            [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+	      ])
 	    ])
-          ])
-        ])
+	  ])
+	])
       ])
     ;;
   esac
@@ -1160,10 +1196,10 @@ AC_DEFUN([_LT_AC_LTCONFIG_HACK],
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
 Xsed='sed -e s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g'
 
 # Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g'
 
 # Sed substitution to delay expansion of an escaped shell variable in a
 # double_quote_subst'ed string.
@@ -1232,8 +1268,15 @@ old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
 if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    ;;
+  *)
+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    ;;
+  esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
 fi
 
 # Allow CC to be a program name with arguments.
@@ -1253,7 +1296,7 @@ rmdir .libs 2>/dev/null
 AC_MSG_RESULT($objdir)
 
 
-AC_ARG_WITH(pic, 
+AC_ARG_WITH(pic,
 [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
 pic_mode="$withval", pic_mode=default)
 test -z "$pic_mode" && pic_mode=default
@@ -1281,7 +1324,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
       # libC (AIX C++ library), which obviously doesn't included in libraries
       # list by gcc. This cause undefined symbols with -static flags.
       # This hack allows C programs to be linked with "-static -ldl", but
-      # we not sure about C++ programs.
+      # not sure about C++ programs.
       lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
       ;;
     amigaos*)
@@ -1316,13 +1359,13 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
     # PORTME Check for PIC flags for the system compiler.
     case $host_os in
     aix3* | aix4* | aix5*)
+      lt_cv_prog_cc_wl='-Wl,'
       # All AIX code is PIC.
       if test "$host_cpu" = ia64; then
-        # AIX 5 now supports IA64 processor
-        lt_cv_prog_cc_static='-Bstatic'
-        lt_cv_prog_cc_wl='-Wl,'
+	# AIX 5 now supports IA64 processor
+	lt_cv_prog_cc_static='-Bstatic'
       else
-        lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
+	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
 
@@ -1391,9 +1434,9 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
       lt_cv_prog_cc_pic='-KPIC'
       lt_cv_prog_cc_static='-Bstatic'
       if test "x$host_vendor" = xsni; then
-        lt_cv_prog_cc_wl='-LD'
+	lt_cv_prog_cc_wl='-LD'
       else
-        lt_cv_prog_cc_wl='-Wl,'
+	lt_cv_prog_cc_wl='-Wl,'
       fi
       ;;
 
@@ -1460,7 +1503,7 @@ fi
 # Check for any special shared library compilation flags.
 if test -n "$lt_cv_prog_cc_shlib"; then
   AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries])
-  if echo "$old_CC $old_CFLAGS " | [egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]"] >/dev/null; then :
+  if echo "$old_CC $old_CFLAGS " | egrep -e "[[ 	]]$lt_cv_prog_cc_shlib[[ 	]]" >/dev/null; then :
   else
    AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure])
     lt_cv_prog_cc_can_build_shared=no
@@ -1536,6 +1579,8 @@ if test x"$compiler_c_o" = x"yes"; then
   lt_cv_compiler_o_lo=no
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -c -o conftest.lo"
+  save_objext="$ac_objext"
+  ac_objext=lo
   AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@@ -1545,10 +1590,11 @@ if test x"$compiler_c_o" = x"yes"; then
       lt_cv_compiler_o_lo=yes
     fi
   ])
+  ac_objext="$save_objext"
   CFLAGS="$save_CFLAGS"
   ])
   compiler_o_lo=$lt_cv_compiler_o_lo
-  AC_MSG_RESULT([$compiler_c_lo])
+  AC_MSG_RESULT([$compiler_o_lo])
 else
   compiler_o_lo=no
 fi
@@ -1641,7 +1687,7 @@ exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
 extract_expsyms_cmds=
 
 case $host_os in
-cygwin* | mingw* | pw32* )
+cygwin* | mingw* | pw32*)
   # FIXME: the MSVC++ port hasn't been tested in a loooong time
   # When not using gcc, we currently assume that we are using
   # Microsoft Visual C++.
@@ -1649,7 +1695,9 @@ cygwin* | mingw* | pw32* )
     with_gnu_ld=no
   fi
   ;;
-
+openbsd*)
+  with_gnu_ld=no
+  ;;
 esac
 
 ld_shlibs=yes
@@ -1736,7 +1784,7 @@ EOF
     # can override, but on older systems we have to supply one (in ltdll.c)
     if test "x$lt_cv_need_dllmain" = "xyes"; then
       ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
-      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~
+      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
 	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
     else
       ltdll_obj=
@@ -1749,24 +1797,24 @@ EOF
     # Be careful not to strip the DATA tag left be newer dlltools.
     export_symbols_cmds="$ltdll_cmds"'
       $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
-      [sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//"] < $output_objdir/$soname-def > $export_symbols'
+      sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
 
     # If the export-symbols file already is a .def file (1st line
     # is EXPORTS), use it as is.
     # If DATA tags from a recent dlltool are present, honour them!
     archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
-        cp $export_symbols $output_objdir/$soname-def;
+	cp $export_symbols $output_objdir/$soname-def;
       else
-        echo EXPORTS > $output_objdir/$soname-def;
-        _lt_hint=1;
-        cat $export_symbols | while read symbol; do
-         set dummy \$symbol;
-         case \[$]# in
-           2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
-           *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
-         esac;
-         _lt_hint=`expr 1 + \$_lt_hint`;
-        done;
+	echo EXPORTS > $output_objdir/$soname-def;
+	_lt_hint=1;
+	cat $export_symbols | while read symbol; do
+	 set dummy \$symbol;
+	 case \[$]# in
+	   2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
+	   *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
+	 esac;
+	 _lt_hint=`expr 1 + \$_lt_hint`;
+	done;
       fi~
       '"$ltdll_cmds"'
       $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
@@ -1861,80 +1909,96 @@ else
     ;;
 
   aix4* | aix5*)
+    if test "$host_cpu" = ia64; then
+      # On IA64, the linker does run time linking by default, so we don't
+      # have to do anything special.
+      aix_use_runtimelinking=no
+      exp_sym_flag='-Bexport'
+      no_entry_flag=""
+    else
+      aix_use_runtimelinking=no
+
+      # Test if we are trying to use run time linking or normal
+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+      # need to do runtime linking.
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+	for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	done
+      esac
+
+      exp_sym_flag='-bexport'
+      no_entry_flag='-bnoentry'
+    fi
+
     # When large executables or shared objects are built, AIX ld can
     # have problems creating the table of contents.  If linking a library
     # or program results in "error TOC overflow" add -mminimal-toc to
     # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
     # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 
+    hardcode_direct=yes
     archive_cmds=''
     hardcode_libdir_separator=':'
     if test "$GCC" = yes; then
-      collect2name=`${CC} -print-prog-name=collect2`
-      if test -f "$collect2name" && \
-	 strings "$collect2name" | grep resolve_lib_name >/dev/null
-      then
-	# We have reworked collect2
-	hardcode_direct=yes
-      else
-        # We have old collect2
-        hardcode_direct=unsupported
-        # It fails to find uninstalled libraries when the uninstalled
-        # path is not listed in the libpath.  Setting hardcode_minus_L
-        # to unsupported forces relinking
-        hardcode_minus_L=yes
-        hardcode_libdir_flag_spec='-L$libdir'
-        hardcode_libdir_separator=
-      fi
+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	collect2name=`${CC} -print-prog-name=collect2`
+	if test -f "$collect2name" && \
+	  strings "$collect2name" | grep resolve_lib_name >/dev/null
+	then
+	  # We have reworked collect2
+	  hardcode_direct=yes
+	else
+	  # We have old collect2
+	  hardcode_direct=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L=yes
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_libdir_separator=
+	fi
+      esac
+
       shared_flag='-shared'
     else
+      # not using gcc
       if test "$host_cpu" = ia64; then
-        shared_flag='-G'
+	shared_flag='${wl}-G'
       else
-        shared_flag='${wl}-bM:SRE'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag='${wl}-G'
+	else
+	  shared_flag='${wl}-bM:SRE'
+	fi
       fi
-      hardcode_direct=yes
     fi
 
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      # Test if we are trying to use run time linking, or normal AIX style linking.
-      # If -brtl is somewhere in LDFLAGS, we need to do run time linking.
-      aix_use_runtimelinking=no
-      for ld_flag in $LDFLAGS; do
-        if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then
-          aix_use_runtimelinking=yes
-          break
-        fi
-      done
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
     # It seems that -bexpall can do strange things, so it is better to
     # generate a list of symbols to export.
     always_export_symbols=yes
     if test "$aix_use_runtimelinking" = yes; then
+      # Warning - without using the other runtime loading flags (-brtl),
+      # -berok will link without error, but may produce a broken library.
+      allow_undefined_flag='-berok'
       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
-      allow_undefined_flag=' -Wl,-G'
-      archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
     else
       if test "$host_cpu" = ia64; then
-        hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-       allow_undefined_flag="-znodefs"
-        archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	allow_undefined_flag="-z nodefs"
+	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
       else
-        hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
-        # Warning - without using the other run time loading flags, -berok will
-        #           link without error, but may produce a broken library.
-        allow_undefined_flag='${wl}-berok"
-        # This is a bit strange, but is similar to how AIX traditionally builds
-        # it's shared libraries.
-        archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
+	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
+	# Warning - without using the other run time loading flags,
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='${wl}-berok'
+	# This is a bit strange, but is similar to how AIX traditionally builds
+	# it's shared libraries.
+	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
       fi
     fi
     ;;
@@ -1966,11 +2030,18 @@ else
     ;;
 
   darwin* | rhapsody*)
-    allow_undefined_flag='-undefined suppress'
+    case "$host_os" in
+    rhapsody* | darwin1.[[012]])
+      allow_undefined_flag='-undefined suppress'
+      ;;
+    *) # Darwin 1.3 on
+      allow_undefined_flag='-flat_namespace -undefined suppress'
+      ;;
+    esac
     # FIXME: Relying on posixy $() will cause problems for
     #        cross-compilation, but unfortunately the echo tests do not
     #        yet detect zsh echo's removal of \ escapes.
-    archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
+    archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
     # We need to add '_' to the symbols in $export_symbols first
     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
     hardcode_direct=yes
@@ -2045,7 +2116,7 @@ else
     ;;
 
   newsos6)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
     hardcode_direct=yes
     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
     hardcode_libdir_separator=:
@@ -2053,10 +2124,24 @@ else
     ;;
 
   openbsd*)
-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_libdir_flag_spec='-R$libdir'
     hardcode_direct=yes
     hardcode_shlibpath_var=no
+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec='${wl}-E'
+    else
+      case "$host_os" in
+      openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_libdir_flag_spec='-R$libdir'
+        ;;
+      *)
+        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+        ;;
+      esac
+    fi
     ;;
 
   os2*)
@@ -2101,10 +2186,39 @@ else
     hardcode_shlibpath_var=no
     runpath_var=LD_RUN_PATH
     hardcode_runpath_var=yes
+    export_dynamic_flag_spec='${wl}-Bexport'
     ;;
 
   solaris*)
+    # gcc --version < 3.0 without binutils cannot create self contained
+    # shared libraries reliably, requiring libgcc.a to resolve some of
+    # the object symbols generated in some cases.  Libraries that use
+    # assert need libgcc.a to resolve __eprintf, for example.  Linking
+    # a copy of libgcc.a into every shared library to guarantee resolving
+    # such symbols causes other problems:  According to Tim Van Holder
+    # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
+    # (to the application) exception stack for one thing.
     no_undefined_flag=' -z defs'
+    if test "$GCC" = yes; then
+      case `$CC --version 2>/dev/null` in
+      [[12]].*)
+	cat <<EOF 1>&2
+
+*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
+*** create self contained shared libraries on Solaris systems, without
+*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
+*** -no-undefined support, which will at least allow you to build shared
+*** libraries.  However, you may find that when you link such libraries
+*** into an application without using GCC, you have to manually add
+*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
+*** upgrade to a newer version of GCC.  Another option is to rebuild your
+*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
+
+EOF
+        no_undefined_flag=
+	;;
+      esac
+    fi
     # $CC -shared without GNU ld will not create a library from C++
     # object files and a static libstdc++, better avoid it by now
     archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -2113,7 +2227,7 @@ else
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_shlibpath_var=no
     case $host_os in
-    [solaris2.[0-5] | solaris2.[0-5].*]) ;;
+    solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
     *) # Supported since Solaris 2.6 (maybe 2.5.1?)
       whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
     esac
@@ -2136,7 +2250,7 @@ else
 
   sysv4)
     if test "x$host_vendor" = xsno; then
-      archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts'
+      archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes # is this really true???
     else
       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -2293,22 +2407,24 @@ aix4* | aix5*)
     # depend on `.', always an invalid library.  This was fixed in
     # development snapshots of GCC prior to 3.0.
     case $host_os in
-      [ aix4 | aix4.[01] | aix4.[01].*)]
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-           echo ' yes '
-           echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-        :
-      else
-        can_build_shared=no
-      fi
-      ;;
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	     echo ' yes '
+	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	  :
+	else
+	  can_build_shared=no
+	fi
+	;;
     esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
+    # AIX (on Power*) has no versioning support, so currently we can
+    # not hardcode correct soname into executable. Probably we can
+    # add versioning support to collect2, so additional links can
+    # be useful in future.
     if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so instead of
-      # lib<name>.a to let people know that these are not typical AIX shared libraries.
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
       library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
     else
       # We preserve .a as extension for shared libraries through AIX4.2
@@ -2317,14 +2433,13 @@ aix4* | aix5*)
       soname_spec='${libname}${release}.so$major'
     fi
     shlibpath_var=LIBPATH
-    deplibs_check_method=pass_all
   fi
   ;;
 
 amigaos*)
   library_names_spec='$libname.ixlibrary $libname.a'
   # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | [$Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\'']`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
   ;;
 
 beos*)
@@ -2355,7 +2470,7 @@ cygwin* | mingw* | pw32*)
   case $GCC,$host_os in
   yes,cygwin*)
     library_names_spec='$libname.dll.a'
-    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
+    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
     postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
@@ -2365,14 +2480,14 @@ cygwin* | mingw* | pw32*)
        $rm \$dlpath'
     ;;
   yes,mingw*)
-    library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
+    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
     sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
     ;;
   yes,pw32*)
     library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
     ;;
   *)
-    library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll $libname.lib'
+    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib'
     ;;
   esac
   dynamic_linker='Win32 ld.exe'
@@ -2398,6 +2513,18 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
+freebsd*-gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
+  ;;
+
 freebsd*)
   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
   version_type=freebsd-$objformat
@@ -2530,9 +2657,19 @@ newsos6)
 
 openbsd*)
   version_type=sunos
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-    need_version=no
+  need_lib_prefix=no
+  need_version=no
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case "$host_os" in
+    openbsd2.[[89]] | openbsd2.[[89]].*)
+      shlibpath_overrides_runpath=no
+      ;;
+    *)
+      shlibpath_overrides_runpath=yes
+      ;;
+    esac
+  else
+    shlibpath_overrides_runpath=yes
   fi
   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -2643,6 +2780,33 @@ test "$dynamic_linker" = no && can_build_shared=no
 AC_MSG_CHECKING([if libtool supports shared libraries])
 AC_MSG_RESULT([$can_build_shared])
 
+AC_MSG_CHECKING([whether to build shared libraries])
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case "$host_os" in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+
+aix4*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
+  ;;
+esac
+AC_MSG_RESULT([$enable_shared])
+
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
+
 if test "$hardcode_action" = relink; then
   # Fast installation is not supported
   enable_fast_install=no
@@ -2738,6 +2902,7 @@ if test -f "$ltmain"; then
     old_striplib striplib file_magic_cmd export_symbols_cmds \
     deplibs_check_method allow_undefined_flag no_undefined_flag \
     finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
+    global_symbol_to_c_name_address \
     hardcode_libdir_flag_spec hardcode_libdir_separator  \
     sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
     compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
@@ -2804,12 +2969,12 @@ SHELL=$lt_SHELL
 # Whether or not to build shared libraries.
 build_libtool_libs=$enable_shared
 
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$need_lc
-
 # Whether or not to build static libraries.
 build_old_libs=$enable_static
 
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$need_lc
+
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install
 
@@ -2975,6 +3140,9 @@ global_symbol_pipe=$lt_global_symbol_pipe
 # Transform the output of nm in a proper C declaration
 global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
 
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
+
 # This is the shared library runtime path variable.
 runpath_var=$runpath_var
 
@@ -3097,9 +3265,9 @@ EOF
 #   return TRUE;
 # }
 # /* ltdll.c ends here */
-        # This is a source program that is used to create import libraries
-        # on Windows for dlls which lack them. Don't remove nor modify the
-        # starting and closing comments
+	# This is a source program that is used to create import libraries
+	# on Windows for dlls which lack them. Don't remove nor modify the
+	# starting and closing comments
 # /* impgen.c starts here */
 # /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
 #
@@ -3454,6 +3622,7 @@ test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
 AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
@@ -3467,8 +3636,8 @@ if test "$GCC" = yes; then
   esac
   case $ac_prog in
     # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      [re_direlt='/[^/][^/]*/\.\./']
+    [[\\/]]* | [[A-Za-z]]:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
       # Canonicalize the path of ld
       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
@@ -3492,7 +3661,7 @@ else
 fi
 AC_CACHE_VAL(lt_cv_path_LD,
 [if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
@@ -3556,7 +3725,7 @@ lt_cv_deplibs_check_method='unknown'
 # `unknown' -- same as none, but documents that we really don't know.
 # 'pass_all' -- all dependencies passed with no checks.
 # 'test_compile' -- check by making test program.
-# ['file_magic [regex]'] -- check by looking for files in library path
+# 'file_magic [[regex]]' -- check by looking for files in library path
 # which responds to the $file_magic_cmd with a given egrep regex.
 # If you have `file' or equivalent on your system and you're not sure
 # whether `pass_all' will *always* work, you probably want this one.
@@ -3571,7 +3740,7 @@ beos*)
   ;;
 
 bsdi4*)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
@@ -3585,7 +3754,7 @@ darwin* | rhapsody*)
   lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   case "$host_os" in
-  rhapsody* | darwin1.[012])
+  rhapsody* | darwin1.[[012]])
     lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
     ;;
   *) # Darwin 1.3 on
@@ -3600,7 +3769,7 @@ freebsd*)
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
-      [lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
@@ -3615,7 +3784,7 @@ gnu*)
   ;;
 
 hpux10.20*|hpux11*)
-  [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
+  lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
   lt_cv_file_magic_cmd=/usr/bin/file
   lt_cv_file_magic_test_file=/usr/lib/libc.sl
   ;;
@@ -3634,7 +3803,7 @@ irix5* | irix6*)
     *) libmagic=never-match;;
     esac
     # this will be overridden with pass_all, but let us keep it just in case
-    [lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
+    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
     ;;
   esac
   lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
@@ -3644,29 +3813,39 @@ irix5* | irix6*)
 # This must be Linux ELF.
 linux-gnu*)
   case $host_cpu in
-  alpha* | i*86 | powerpc* | sparc* | ia64* )
+  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
     lt_cv_deplibs_check_method=pass_all ;;
   *)
     # glibc up to 2.1.1 does not perform some relocations on ARM
-    [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;]
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
   esac
   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
   ;;
 
 netbsd*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$'
   else
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$'
   fi
   ;;
 
 newos6*)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
   lt_cv_file_magic_cmd=/usr/bin/file
   lt_cv_file_magic_test_file=/usr/lib/libnls.so
   ;;
 
+openbsd*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
+  else
+    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+  fi
+  ;;
+
 osf3* | osf4* | osf5*)
   # this will be overridden with pass_all, but let us keep it just in case
   lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
@@ -3683,14 +3862,14 @@ solaris*)
   lt_cv_file_magic_test_file=/lib/libc.so
   ;;
 
-[sysv5uw[78]* | sysv4*uw2*)]
+sysv5uw[[78]]* | sysv4*uw2*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
   case $host_vendor in
   motorola)
-    [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
     lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
     ;;
   ncr)
@@ -3698,11 +3877,11 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
     ;;
   sequent)
     lt_cv_file_magic_cmd='/bin/file'
-    [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )']
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
     ;;
   sni)
     lt_cv_file_magic_cmd='/bin/file'
-    [lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"]
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
     lt_cv_file_magic_test_file=/lib/libc.so
     ;;
   esac
@@ -3716,13 +3895,14 @@ deplibs_check_method=$lt_cv_deplibs_check_method
 
 # AC_PROG_NM - find the path to a BSD-compatible name lister
 AC_DEFUN([AC_PROG_NM],
-[AC_MSG_CHECKING([for BSD-compatible nm])
+[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
+AC_MSG_CHECKING([for BSD-compatible nm])
 AC_CACHE_VAL(lt_cv_path_NM,
 [if test -n "$NM"; then
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
     tmp_nm=$ac_dir/${ac_tool_prefix}nm
diff --git a/tests/rpathx/configure b/tests/rpathx/configure
index c84d58432..7a073caae 100755
--- a/tests/rpathx/configure
+++ b/tests/rpathx/configure
@@ -1,28 +1,12 @@
 #! /bin/sh
-
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Generated by Autoconf 2.52.
 #
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --disable-dependency-tracking Speeds up one-time builds
-  --enable-dependency-tracking  Do not reject slow dependency extractors"
-ac_help="$ac_help
-  --enable-shared[=PKGS]  build shared libraries [default=yes]"
-ac_help="$ac_help
-  --enable-static[=PKGS]  build static libraries [default=yes]"
-ac_help="$ac_help
-  --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-
 # Find the correct PATH separator.  Usually this is `:', but
 # DJGPP uses `;' like DOS.
 if test "X${PATH_SEPARATOR+set}" != Xset; then
@@ -31,9 +15,9 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then
     *-DOS) lt_cv_sys_path_separator=';' ;;
     *)     lt_cv_sys_path_separator=':' ;;
   esac
+  PATH_SEPARATOR=$lt_cv_sys_path_separator
 fi
 
-
 # Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
@@ -97,7 +81,7 @@ else
   #
   # So, first we look for a working echo in the user's PATH.
 
-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for dir in $PATH /usr/ucb; do
     if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
        test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
@@ -179,21 +163,113 @@ if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
    ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
 fi
 
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# 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
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+# NLS nuisances.
+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+exec 6>&1
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+cross_compiling=no
+subdirs=
+MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete.  It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
 
-ac_help="$ac_help
-  --disable-libtool-lock  avoid locking (might break parallel builds)"
-ac_help="$ac_help
-  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
+ac_unique_file="configure.in"
 
 # Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
 # The variables have the same names as the options, with
 # dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
+cache_file=/dev/null
 exec_prefix=NONE
-host=NONE
 no_create=
-nonopt=NONE
 no_recursion=
 prefix=NONE
 program_prefix=NONE
@@ -202,10 +278,15 @@ program_transform_name=s,x,x,
 silent=
 site=
 srcdir=
-target=NONE
 verbose=
 x_includes=NONE
 x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
@@ -219,17 +300,16 @@ oldincludedir='/usr/include'
 infodir='${prefix}/info'
 mandir='${prefix}/man'
 
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
+# Identity of this package.
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
 
 ac_prev=
 for ac_option
 do
-
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
     eval "$ac_prev=\$ac_option"
@@ -237,59 +317,59 @@ do
     continue
   fi
 
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case "$ac_option" in
+  case $ac_option in
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
   -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
+    bindir=$ac_optarg ;;
 
   -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
+    ac_prev=build_alias ;;
   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
+    build_alias=$ac_optarg ;;
 
   -cache-file | --cache-file | --cache-fil | --cache-fi \
   | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
     ac_prev=cache_file ;;
   -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
   | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
 
   -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
     ac_prev=datadir ;;
   -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
   | --da=*)
-    datadir="$ac_optarg" ;;
+    datadir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
+    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'`
+    eval "enable_$ac_feature=no" ;;
 
   -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
+    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'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
+    eval "enable_$ac_feature='$ac_optarg'" ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -298,95 +378,47 @@ do
   -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
   | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
   | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
+    exec_prefix=$ac_optarg ;;
 
   -gas | --gas | --ga | --g)
     # Obsolete; use --with-gas.
     with_gas=yes ;;
 
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
 
   -host | --host | --hos | --ho)
-    ac_prev=host ;;
+    ac_prev=host_alias ;;
   -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
+    host_alias=$ac_optarg ;;
 
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
   -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
   | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
+    includedir=$ac_optarg ;;
 
   -infodir | --infodir | --infodi | --infod | --info | --inf)
     ac_prev=infodir ;;
   -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
+    infodir=$ac_optarg ;;
 
   -libdir | --libdir | --libdi | --libd)
     ac_prev=libdir ;;
   -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
+    libdir=$ac_optarg ;;
 
   -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
   | --libexe | --libex | --libe)
     ac_prev=libexecdir ;;
   -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
   | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
+    libexecdir=$ac_optarg ;;
 
   -localstatedir | --localstatedir | --localstatedi | --localstated \
   | --localstate | --localstat | --localsta | --localst \
@@ -395,12 +427,12 @@ EOF
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
   | --localstate=* | --localstat=* | --localsta=* | --localst=* \
   | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
+    localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
     ac_prev=mandir ;;
   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
+    mandir=$ac_optarg ;;
 
   -nfp | --nfp | --nf)
     # Obsolete; use --without-fp.
@@ -421,26 +453,26 @@ EOF
   -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
   | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
   | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
+    oldincludedir=$ac_optarg ;;
 
   -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
     ac_prev=prefix ;;
   -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
+    prefix=$ac_optarg ;;
 
   -program-prefix | --program-prefix | --program-prefi | --program-pref \
   | --program-pre | --program-pr | --program-p)
     ac_prev=program_prefix ;;
   -program-prefix=* | --program-prefix=* | --program-prefi=* \
   | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
+    program_prefix=$ac_optarg ;;
 
   -program-suffix | --program-suffix | --program-suffi | --program-suff \
   | --program-suf | --program-su | --program-s)
     ac_prev=program_suffix ;;
   -program-suffix=* | --program-suffix=* | --program-suffi=* \
   | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
+    program_suffix=$ac_optarg ;;
 
   -program-transform-name | --program-transform-name \
   | --program-transform-nam | --program-transform-na \
@@ -457,7 +489,7 @@ EOF
   | --program-transfo=* | --program-transf=* \
   | --program-trans=* | --program-tran=* \
   | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
+    program_transform_name=$ac_optarg ;;
 
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
@@ -467,7 +499,7 @@ EOF
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
   | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
+    sbindir=$ac_optarg ;;
 
   -sharedstatedir | --sharedstatedir | --sharedstatedi \
   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
@@ -478,58 +510,57 @@ EOF
   | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
   | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
   | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
+    sharedstatedir=$ac_optarg ;;
 
   -site | --site | --sit)
     ac_prev=site ;;
   -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
+    site=$ac_optarg ;;
 
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
+    srcdir=$ac_optarg ;;
 
   -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
   | --syscon | --sysco | --sysc | --sys | --sy)
     ac_prev=sysconfdir ;;
   -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
   | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
+    sysconfdir=$ac_optarg ;;
 
   -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
+    ac_prev=target_alias ;;
   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
+    target_alias=$ac_optarg ;;
 
   -v | -verbose | --verbose | --verbos | --verbo | --verb)
     verbose=yes ;;
 
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
+    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'`
-    case "$ac_option" in
-      *=*) ;;
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
+    eval "with_$ac_package='$ac_optarg'" ;;
 
   -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
+    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'`
+    eval "with_$ac_package=no" ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -540,98 +571,98 @@ EOF
     ac_prev=x_includes ;;
   -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
   | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
+    x_includes=$ac_optarg ;;
 
   -x-libraries | --x-libraries | --x-librarie | --x-librari \
   | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
     ac_prev=x_libraries ;;
   -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
+    x_libraries=$ac_optarg ;;
 
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
     ;;
 
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    eval "$ac_envvar='$ac_optarg'"
+    export $ac_envvar ;;
+
   *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
+    # FIXME: should be removed in autoconf 3.0.
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    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}
     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  { echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
 fi
-exec 5>./config.log
 
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
+# 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
 
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+              localstatedir libdir includedir oldincludedir infodir mandir
 do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* ) ;;
+    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
   esac
 done
 
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: should be removed in autoconf 3.0.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
 
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
 
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=configure.in
+test "$silent" = yes && exec 6>/dev/null
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then its parent.
   ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+  ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
   test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir
   if test ! -r $srcdir/$ac_unique_file; then
@@ -642,13 +673,320 @@ else
 fi
 if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
+   { (exit 1); exit 1; }; }
   else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources in $srcdir" >&2
+   { (exit 1); exit 1; }; }
   fi
 fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CPP_set=${CPP+set}
+ac_env_CPP_value=$CPP
+ac_cv_env_CPP_set=${CPP+set}
+ac_cv_env_CPP_value=$CPP
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<EOF
+\`configure' configures this package to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+EOF
+
+  cat <<EOF
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
+EOF
+
+  cat <<\EOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       build programs to run on HOST [BUILD]
+EOF
+fi
+
+if test -n "$ac_init_help"; then
+
+  cat <<\EOF
+
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-dependency-tracking Speeds up one-time builds
+  --enable-dependency-tracking  Do not reject slow dependency extractors
+  --enable-shared=PKGS  build shared libraries default=yes
+  --enable-static=PKGS  build static libraries default=yes
+  --enable-fast-install=PKGS  optimize for fast installation default=yes
+  --disable-libtool-lock  avoid locking (might break parallel builds)
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-gnu-ld           assume the C compiler uses GNU ld default=no
+  --with-pic              try to use only PIC/non-PIC objects default=use both
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+              headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+EOF
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  ac_popdir=`pwd`
+  for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
+    cd $ac_subdir
+    # A "../" for each directory in /$ac_subdir.
+    ac_dots=`echo $ac_subdir |
+             sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
+
+    case $srcdir in
+    .) # No --srcdir option.  We are building in place.
+      ac_sub_srcdir=$srcdir ;;
+    [\\/]* | ?:[\\/]* ) # Absolute path.
+      ac_sub_srcdir=$srcdir/$ac_subdir ;;
+    *) # Relative path.
+      ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
+    esac
+
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_sub_srcdir/configure.gnu; then
+      echo
+      $SHELL $ac_sub_srcdir/configure.gnu  --help=recursive
+    elif test -f $ac_sub_srcdir/configure; then
+      echo
+      $SHELL $ac_sub_srcdir/configure  --help=recursive
+    elif test -f $ac_sub_srcdir/configure.ac ||
+           test -f $ac_sub_srcdir/configure.in; then
+      echo
+      $ac_configure --help
+    else
+      echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
+    fi
+    cd $ac_popdir
+  done
+fi
+
+test -n "$ac_init_help" && exit 0
+if $ac_init_version; then
+  cat <<\EOF
+
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+EOF
+  exit 0
+fi
+exec 5>config.log
+cat >&5 <<EOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by $as_me, which was
+generated by GNU Autoconf 2.52.  Invocation command line was
+
+  $ $0 $@
+
+EOF
+{
+cat <<_ASUNAME
+## ---------- ##
+## Platform.  ##
+## ---------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+PATH = $PATH
+
+_ASUNAME
+} >&5
+
+cat >&5 <<EOF
+## ------------ ##
+## Core tests.  ##
+## ------------ ##
+
+EOF
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell meta-characters.
+ac_configure_args=
+ac_sep=
+for ac_arg
+do
+  case $ac_arg in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c) ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
+    ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+    ac_sep=" " ;;
+  *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg"
+     ac_sep=" " ;;
+  esac
+  # Get rid of the leading space.
+done
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  echo >&5
+  echo "## ----------------- ##" >&5
+  echo "## Cache variables.  ##" >&5
+  echo "## ----------------- ##" >&5
+  echo >&5
+  # The following way of writing the cache mishandles newlines in values,
+{
+  (set) 2>&1 |
+    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      sed -n \
+        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+      ;;
+    *)
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} >&5
+  sed "/^$/d" confdefs.h >conftest.log
+  if test -s conftest.log; then
+    echo >&5
+    echo "## ------------ ##" >&5
+    echo "## confdefs.h.  ##" >&5
+    echo "## ------------ ##" >&5
+    echo >&5
+    cat conftest.log >&5
+  fi
+  (echo; echo) >&5
+  test "$ac_signal" != 0 &&
+    echo "$as_me: caught signal $ac_signal" >&5
+  echo "$as_me: exit $exit_status" >&5
+  rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files &&
+    exit $exit_status
+     ' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
 
+# Let the site file select an alternate cache file if it wants to.
 # Prefer explicitly selected file to automatically selected ones.
 if test -z "$CONFIG_SITE"; then
   if test "x$prefix" != xNONE; then
@@ -659,40 +997,107 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
+    { echo "$as_me:1000: 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"
   fi
 done
 
 if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
+  # 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:1011: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . $cache_file;;
+      *)                      . ./$cache_file;;
+    esac
+  fi
 else
-  echo "creating cache $cache_file"
-  > $cache_file
+  { echo "$as_me:1019: 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.
+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
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+  eval ac_new_val="\$ac_env_${ac_var}_value"
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { echo "$as_me:1035: 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)
+      { echo "$as_me:1039: 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
+        { echo "$as_me:1045: 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:1047:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+        { echo "$as_me:1049:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+        ac_cache_corrupted=:
+      fi;;
+  esac
+  # Pass precious variables to config.status.  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
+if $ac_cache_corrupted; then
+  { echo "$as_me:1068: 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:1070: 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
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
+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
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)      ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+echo "#! $SHELL" >conftest.sh
+echo  "exit 0"   >>conftest.sh
+chmod +x conftest.sh
+if { (echo "$as_me:1090: PATH=\".;.\"; conftest.sh") >&5
+  (PATH=".;."; conftest.sh) 2>&5
+  ac_status=$?
+  echo "$as_me:1093: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  ac_path_separator=';'
 else
-  ac_n= ac_c='\c' ac_t=
+  ac_path_separator=:
 fi
-
+PATH_SEPARATOR="$ac_path_separator"
+rm -f conftest.sh
 
 ac_aux_dir=
 for ac_dir in $global_top_srcdir ../..; do
@@ -704,18 +1109,20 @@ for ac_dir in $global_top_srcdir ../..; do
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
+  elif test -f $ac_dir/shtool; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $global_top_srcdir ../.." 1>&2; exit 1; }
+  { { echo "$as_me:1119: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -724,31 +1131,39 @@ am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:733: checking for a BSD compatible install" >&5
+echo "$as_me:1139: 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 eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${ac_cv_path_install+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+    ac_save_IFS=$IFS; IFS=$ac_path_separator
   for ac_dir in $PATH; do
+    IFS=$ac_save_IFS
     # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    case $ac_dir/ in
+    / | ./ | .// | /cC/* \
+    | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
+    | /usr/ucb/* ) ;;
     *)
       # OSF1 and SCO ODT 3.0 have their own names for install.
       # Don't use installbsd from OSF since it installs stuff as root
       # by default.
       for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
+        if $as_executable_p "$ac_dir/$ac_prog"; then
 	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+            grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
 	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
 	  else
 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
 	    break 2
@@ -758,31 +1173,31 @@ else
       ;;
     esac
   done
-  IFS="$ac_save_IFS"
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
+    INSTALL=$ac_cv_path_install
   else
     # As a last resort, use the slow shell script.  We don't cache a
     # path for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
+    INSTALL=$ac_install_sh
   fi
 fi
-echo "$ac_t""$INSTALL" 1>&6
+echo "$as_me:1188: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:786: checking whether build environment is sane" >&5
+echo "$as_me:1199: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -805,8 +1220,11 @@ 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".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
+      { { echo "$as_me:1223: 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;}
+   { (exit 1); exit 1; }; }
    fi
 
    test "$2" = conftest.file
@@ -815,28 +1233,29 @@ then
    # Ok.
    :
 else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
+   { { echo "$as_me:1236: 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
+echo "$as_me:1242: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 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 &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+  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
 
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
 
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
@@ -845,82 +1264,86 @@ if eval "$MISSING --run true"; then
 else
   am_missing_run=
   am_backtick='`'
-  echo "configure: warning: ${am_backtick}missing' script is too old or missing" 1>&2
+  { echo "$as_me:1267: WARNING: ${am_backtick}missing' script is too old or missing" >&5
+echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;}
 fi
 
 for ac_prog in mawk gawk nawk awk
 do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:857: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1275: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AWK+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AWK="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_AWK="$ac_prog"
+echo "$as_me:1290: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-AWK="$ac_cv_prog_AWK"
+AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$ac_t""$AWK" 1>&6
+  echo "$as_me:1298: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1301: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-test -n "$AWK" && break
+  test -n "$AWK" && break
 done
 
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:887: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1308: 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 "(cached) $ECHO_C" >&6
 else
-  cat > conftestmake <<\EOF
+  cat >conftest.make <<\EOF
 all:
 	@echo 'ac_maketemp="${MAKE}"'
 EOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
 if test -n "$ac_maketemp"; then
   eval ac_cv_prog_make_${ac_make}_set=yes
 else
   eval ac_cv_prog_make_${ac_make}_set=no
 fi
-rm -f conftestmake
+rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+  echo "$as_me:1328: result: yes" >&5
+echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1332: result: no" >&5
+echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 # Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
 if test "${enable_dependency_tracking+set}" = set; then
   enableval="$enable_dependency_tracking"
-  :
-fi
 
+fi;
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
 fi
 
-
 if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
@@ -929,9 +1352,6 @@ else
   AMDEP_FALSE=
 fi
 
-
-
-
 rm -f .deps 2>/dev/null
 mkdir .deps 2>/dev/null
 if test -d .deps; then
@@ -942,25 +1362,26 @@ else
 fi
 rmdir .deps 2>/dev/null
 
-
 # test to see if srcdir already configured
 if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run \"make distclean\" there first" 1>&2; exit 1; }
+  { { echo "$as_me:1368: 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
 
 # Define the identity of the package.
-PACKAGE=gexttext_rpathx
+PACKAGE=gettext_rpathx
 VERSION=0
-cat >> confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
 
-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define VERSION "$VERSION"
 EOF
 
-
 # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
 # the ones we care about.
 
@@ -972,24 +1393,18 @@ EOF
 # requests that it be used.  This is a bit dumb.
 : ${OBJEXT=o}
 
-
 # Some tools Automake needs.
 
 ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"}
 
-
 AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
 
-
 AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"}
 
-
 AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
-
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-
 AMTAR=${AMTAR-"${am_missing_run}tar"}
 
 install_sh=${install_sh-"$am_aux_dir/install-sh"}
@@ -999,214 +1414,578 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1006: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+echo "$as_me:1425: 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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1440: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1448: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1451: result: no" >&5
+echo "${ECHO_T}no" >&6
 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
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1036: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo "$as_me:1460: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="gcc"
+echo "$as_me:1475: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1483: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1486: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+
+  CC=$ac_ct_CC
 else
-  echo "$ac_t""no" 1>&6
+  CC="$ac_cv_prog_CC"
 fi
 
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1087: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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
+echo "$as_me:1499: 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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1514: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1522: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+  echo "$as_me:1525: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1119: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+fi
+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
+echo "$as_me:1534: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="cc"
+echo "$as_me:1549: found $ac_dir/$ac_word" >&5
+break
+done
 
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1557: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1560: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
 
-cat > conftest.$ac_ext << EOF
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
 
-#line 1130 "configure"
-#include "confdefs.h"
+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
+echo "$as_me:1573: 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
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+  ac_prog_rejected=yes
+  continue
+fi
+ac_cv_prog_CC="cc"
+echo "$as_me:1593: found $ac_dir/$ac_word" >&5
+break
+done
 
-main(){return(0);}
-EOF
-if { (eval echo configure:1135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    set dummy "$ac_dir/$ac_word" ${1+"$@"}
+    shift
+    ac_cv_prog_CC="$@"
   fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:1615: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
+  echo "$as_me:1618: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1161: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1166: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl
+  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:1629: 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
 else
-  ac_cv_prog_gcc=no
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1644: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:1652: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:1655: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl
+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:1668: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1683: found $ac_dir/$ac_word" >&5
+break
+done
 
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1691: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  GCC=
+  echo "$as_me:1694: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1194: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  test -n "$ac_ct_CC" && break
+done
+
+  CC=$ac_ct_CC
+fi
+
+fi
+
+test -z "$CC" && { { echo "$as_me:1706: error: no acceptable cc found in \$PATH" >&5
+echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+
+# Provide some information about the compiler.
+echo "$as_me:1711:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:1714: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1717: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1719: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1722: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1724: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1727: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 1731 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_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.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+echo "$as_me:1747: 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[^ ]*//'`
+if { (eval echo "$as_me:1750: \"$ac_link_default\"") >&5
+  (eval $ac_link_default) 2>&5
+  ac_status=$?
+  echo "$as_me:1753: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # 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" : '[^.]*\(\..*\)'`
+          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
+          export ac_cv_exeext
+          break;;
+    * ) break;;
+  esac
+done
 else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:1776: 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:1782: 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 "$as_me:1787: 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'
+  { (eval echo "$as_me:1793: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1796: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { echo "$as_me:1803: 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;}
+   { (exit 1); exit 1; }; }
+    fi
+  fi
+fi
+echo "$as_me:1811: 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 "$as_me:1818: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+echo "$as_me:1820: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6
+
+echo "$as_me:1823: checking for executable suffix" >&5
+echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+if { (eval echo "$as_me:1825: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:1828: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
+  case $ac_file in
+    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+          export ac_cv_exeext
+          break;;
+    * ) break;;
+  esac
+done
 else
-  ac_cv_prog_cc_g=no
+  { { echo "$as_me:1844: 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*
 
+rm -f conftest$ac_cv_exeext
+echo "$as_me:1850: 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 "$as_me:1856: 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
+#line 1862 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (eval echo "$as_me:1874: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1877: \$? = $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
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:1889: 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:1896: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+echo "$as_me:1900: 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
+#line 1906 "configure"
+#include "confdefs.h"
 
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1921: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1924: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1927: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1930: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_compiler_gnu=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_compiler_gnu=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+echo "$as_me:1942: 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 "$as_me:1948: 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
+#line 1954 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1966: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1969: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1972: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1975: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_prog_cc_g=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:1985: 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"
+  CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
     CFLAGS="-g -O2"
@@ -1220,7 +1999,118 @@ else
     CFLAGS=
   fi
 fi
+# Some people use a C++ compiler to compile C.  Since we use `exit',
+# in C++ we need to declare it.  In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+  choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2012: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:2015: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:2018: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2021: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+#line 2033 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2046: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:2049: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:2052: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2055: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+continue
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line 2065 "configure"
+#include "confdefs.h"
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2077: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:2080: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:2083: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2086: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+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
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_config_commands="$ac_config_commands default-1"
 
 am_make=${MAKE-make}
 cat > confinc << 'END'
@@ -1228,8 +2118,8 @@ doit:
 	@echo done
 END
 # If we don't find an include directive, just comment out the code.
-echo $ac_n "checking for style of include used by $am_make""... $ac_c" 1>&6
-echo "configure:1233: checking for style of include used by $am_make" >&5
+echo "$as_me:2121: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
 am__include='#'
 am__quote=
 _am_result=none
@@ -1255,17 +2145,16 @@ if test "$am__include" = "#"; then
    fi
 fi
 
-
-echo "$ac_t""$_am_result" 1>&6
+echo "$as_me:2148: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6
 rm -f confinc confmf
 
-
 depcc="$CC"   am_compiler_list=
 
-echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6
-echo "configure:1267: checking dependency style of $depcc" >&5
-if eval "test \"`echo '$''{'am_cv_CC_dependencies_compiler_type'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2154: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -1324,153 +2213,10 @@ else
 fi
 
 fi
-
-echo "$ac_t""$am_cv_CC_dependencies_compiler_type" 1>&6
+echo "$as_me:2216: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
 
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:1334: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1339 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:1350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:1367: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1372 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:1379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1396: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 1411 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1417: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 1428 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 1445 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
 # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
@@ -1492,8 +2238,7 @@ no) enable_shared=no ;;
 esac
 else
   enable_shared=yes
-fi
-
+fi;
 # Check whether --enable-static or --disable-static was given.
 if test "${enable_static+set}" = set; then
   enableval="$enable_static"
@@ -1515,8 +2260,7 @@ no) enable_static=no ;;
 esac
 else
   enable_static=yes
-fi
-
+fi;
 # Check whether --enable-fast-install or --disable-fast-install was given.
 if test "${enable_fast_install+set}" = set; then
   enableval="$enable_fast_install"
@@ -1538,52 +2282,69 @@ no) enable_fast_install=no ;;
 esac
 else
   enable_fast_install=yes
-fi
-
-
+fi;
 # Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1551: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:2288: error: cannot run $ac_config_sub" >&5
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+echo "$as_me:2292: 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
+else
+  ac_cv_build_alias=$build_alias
+test -z "$ac_cv_build_alias" &&
+  ac_cv_build_alias=`$ac_config_guess`
+test -z "$ac_cv_build_alias" &&
+  { { echo "$as_me:2301: 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:2305: 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:2310: 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 "$as_me:2317: 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
+else
+  ac_cv_host_alias=$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:2326: 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:2331: 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/'`
 
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1572: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
+# Find the correct PATH separator.  Usually this is `:', but
+# DJGPP uses `;' like DOS.
+if test "X${PATH_SEPARATOR+set}" != Xset; then
+  UNAME=${UNAME-`uname 2>/dev/null`}
+  case X$UNAME in
+    *-DOS) lt_cv_sys_path_separator=';' ;;
+    *)     lt_cv_sys_path_separator=':' ;;
+  esac
+  PATH_SEPARATOR=$lt_cv_sys_path_separator
+fi
 
 # Check whether --with-gnu-ld or --without-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
@@ -1591,13 +2352,12 @@ if test "${with_gnu_ld+set}" = set; then
   test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
-fi
-
+fi;
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1601: checking for ld used by GCC" >&5
+  echo "$as_me:2359: checking for ld used by GCC" >&5
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1626,17 +2386,17 @@ echo "configure:1601: checking for ld used by GCC" >&5
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1631: checking for GNU ld" >&5
+  echo "$as_me:2389: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
 else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1634: checking for non-GNU ld" >&5
+  echo "$as_me:2392: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
 fi
-if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${lt_cv_path_LD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
@@ -1659,15 +2419,19 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
+  echo "$as_me:2422: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:2425: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1669: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+test -z "$LD" && { { echo "$as_me:2428: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+echo "$as_me:2431: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+if test "${lt_cv_prog_gnu_ld+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
@@ -1676,33 +2440,32 @@ else
   lt_cv_prog_gnu_ld=no
 fi
 fi
-
-echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
+echo "$as_me:2443: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
-
-echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1686: checking for $LD option to reload object files" >&5
-if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2447: checking for $LD option to reload object files" >&5
+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
+if test "${lt_cv_ld_reload_flag+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-
-echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
+echo "$as_me:2454: result: $lt_cv_ld_reload_flag" >&5
+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
 reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
-echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1698: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2459: checking for BSD-compatible nm" >&5
+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
+if test "${lt_cv_path_NM+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
     tmp_nm=$ac_dir/${ac_tool_prefix}nm
@@ -1729,33 +2492,24 @@ fi
 fi
 
 NM="$lt_cv_path_NM"
-echo "$ac_t""$NM" 1>&6
+echo "$as_me:2495: result: $NM" >&5
+echo "${ECHO_T}$NM" >&6
 
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1736: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2498: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  echo "$as_me:2502: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:2505: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:1757: checking how to recognise dependant libraries" >&5
-if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2509: checking how to recognise dependant libraries" >&5
+echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6
+if test "${lt_cv_deplibs_check_method+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -1766,7 +2520,7 @@ lt_cv_deplibs_check_method='unknown'
 # `unknown' -- same as none, but documents that we really don't know.
 # 'pass_all' -- all dependencies passed with no checks.
 # 'test_compile' -- check by making test program.
-# ['file_magic [regex]'] -- check by looking for files in library path
+# 'file_magic [[regex]]' -- check by looking for files in library path
 # which responds to the $file_magic_cmd with a given egrep regex.
 # If you have `file' or equivalent on your system and you're not sure
 # whether `pass_all' will *always* work, you probably want this one.
@@ -1795,7 +2549,7 @@ darwin* | rhapsody*)
   lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   case "$host_os" in
-  rhapsody* | darwin1.012)
+  rhapsody* | darwin1.[012])
     lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
     ;;
   *) # Darwin 1.3 on
@@ -1854,7 +2608,7 @@ irix5* | irix6*)
 # This must be Linux ELF.
 linux-gnu*)
   case $host_cpu in
-  alpha* | i*86 | powerpc* | sparc* | ia64* )
+  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
     lt_cv_deplibs_check_method=pass_all ;;
   *)
     # glibc up to 2.1.1 does not perform some relocations on ARM
@@ -1877,6 +2631,16 @@ newos6*)
   lt_cv_file_magic_test_file=/usr/lib/libnls.so
   ;;
 
+openbsd*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+  else
+    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+  fi
+  ;;
+
 osf3* | osf4* | osf5*)
   # this will be overridden with pass_all, but let us keep it just in case
   lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
@@ -1920,84 +2684,18 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
 esac
 
 fi
-
-echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
+echo "$as_me:2687: result: $lt_cv_deplibs_check_method" >&5
+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:1930: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:1936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1956: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-
-
-
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
-echo "configure:1997: checking command to parse $NM output" >&5
-if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2693: checking command to parse $NM output" >&5
+echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
+
 # These are sane defaults that work on at least a few old systems.
 # [They come from Ultrix.  What could be older than Ultrix?!! ;)]
 
@@ -2013,6 +2711,9 @@ symxfrm='\1 \2\3 \3'
 # Transform an extracted symbol line into a proper C declaration
 lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
 
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+
 # Define system-specific variables.
 case $host_os in
 aix*)
@@ -2023,6 +2724,7 @@ cygwin* | mingw* | pw32*)
   ;;
 hpux*) # Its linker distinguishes data from code symbols
   lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
 irix*)
   symcode='[BCDEGRST]'
@@ -2069,10 +2771,18 @@ void nm_test_func(){}
 int main(){nm_test_var='a';nm_test_func();return(0);}
 EOF
 
-  if { (eval echo configure:2073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo "$as_me:2774: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:2777: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { (eval echo configure:2076: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
+    if { (eval echo "$as_me:2781: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+  ac_status=$?
+  echo "$as_me:2784: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -2094,23 +2804,23 @@ EOF
 
 	  cat <<EOF >> conftest.$ac_ext
 #if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
+# define lt_ptr void *
 #else
-# define lt_ptr_t char *
+# define lt_ptr char *
 # define const
 #endif
 
 /* The mapping between symbol names and symbols. */
 const struct {
   const char *name;
-  lt_ptr_t address;
+  lt_ptr address;
 }
 lt_preloaded_symbols[] =
 {
 EOF
-	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext
+	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
 	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
+  {0, (lt_ptr) 0}
 };
 
 #ifdef __cplusplus
@@ -2123,7 +2833,11 @@ EOF
 	  save_CFLAGS="$CFLAGS"
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$no_builtin_flag"
-	  if { (eval echo configure:2127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+	  if { (eval echo "$as_me:2836: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:2839: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest; then
 	    pipe_works=yes
 	  fi
 	  LIBS="$save_LIBS"
@@ -2156,67 +2870,276 @@ fi
 global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
 if test -z "$lt_cv_sys_global_symbol_pipe"; then
   global_symbol_to_cdecl=
+  global_symbol_to_c_name_address=
+else
+  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
+  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
+fi
+if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
+then
+  echo "$as_me:2880: result: failed" >&5
+echo "${ECHO_T}failed" >&6
+else
+  echo "$as_me:2883: result: ok" >&5
+echo "${ECHO_T}ok" >&6
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+echo "$as_me:2892: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # 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 2913 "configure"
+#include "confdefs.h"
+#include <assert.h>
+                     Syntax error
+_ACEOF
+if { (eval echo "$as_me:2918: \"$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
+  echo "$as_me:2924: \$? = $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
+  :
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  # Broken: fails on valid input.
+continue
+fi
+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
+#line 2947 "configure"
+#include "confdefs.h"
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:2951: \"$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
+  echo "$as_me:2957: \$? = $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
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+echo "$as_me:2994: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # 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 3004 "configure"
+#include "confdefs.h"
+#include <assert.h>
+                     Syntax error
+_ACEOF
+if { (eval echo "$as_me:3009: \"$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
+  echo "$as_me:3015: \$? = $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
+  :
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  # Broken: fails on valid input.
+continue
+fi
+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
+#line 3038 "configure"
+#include "confdefs.h"
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:3042: \"$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
+  echo "$as_me:3048: \$? = $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
-  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
+  ac_cpp_err=yes
 fi
-if test -z "$global_symbol_pipe$global_symbol_to_cdecl"; then
-  echo "$ac_t""failed" 1>&6
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
 else
-  echo "$ac_t""ok" 1>&6
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
+rm -f conftest.err conftest.$ac_ext
 
-for ac_hdr in dlfcn.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2173: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
 else
-  cat > conftest.$ac_ext <<EOF
-#line 2178 "configure"
+  { { echo "$as_me:3076: error: C preprocessor \"$CPP\" fails sanity check" >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+for ac_header in dlfcn.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:3090: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 3096 "configure"
 #include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:3100: \"$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
+  echo "$as_me:3106: \$? = $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
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+  eval "$as_ac_Header=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+echo "$as_me:3125: 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
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
- 
-else
-  echo "$ac_t""no" 1>&6
+
 fi
 done
 
-
-
-
-
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2218: checking for ${ac_tool_prefix}file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    echo "$as_me:3139: checking for ${ac_tool_prefix}file" >&5
+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $MAGIC_CMD in
   /*)
@@ -2268,17 +3191,19 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
+  echo "$as_me:3194: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:3197: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2280: checking for file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    echo "$as_me:3203: checking for file" >&5
+echo $ECHO_N "checking for file... $ECHO_C" >&6
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $MAGIC_CMD in
   /*)
@@ -2330,9 +3255,11 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
+  echo "$as_me:3258: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:3261: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
   else
@@ -2344,150 +3271,162 @@ fi
   ;;
 esac
 
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2351: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3277: 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
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:3292: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-RANLIB="$ac_cv_prog_RANLIB"
+RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
+  echo "$as_me:3300: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:3303: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
+fi
 if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; 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
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2383: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+echo "$as_me:3312: 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
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_RANLIB="ranlib"
+echo "$as_me:3327: found $ac_dir/$ac_word" >&5
+break
+done
+
+  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
 fi
 fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  echo "$as_me:3336: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:3339: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
+  RANLIB=$ac_ct_RANLIB
 else
-  RANLIB=":"
-fi
+  RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2418: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3351: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+echo "$as_me:3366: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-STRIP="$ac_cv_prog_STRIP"
+STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
+  echo "$as_me:3374: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:3377: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
+fi
 if test -z "$ac_cv_prog_STRIP"; then
-if test -n "$ac_tool_prefix"; then
+  ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2450: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
+echo "$as_me:3386: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_STRIP="strip"
+echo "$as_me:3401: found $ac_dir/$ac_word" >&5
+break
+done
+
+  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
 fi
 fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  echo "$as_me:3410: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:3413: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
+  STRIP=$ac_ct_STRIP
 else
-  STRIP=":"
-fi
+  STRIP="$ac_cv_prog_STRIP"
 fi
 
-
 enable_dlopen=no
 enable_win32_dll=no
 
 # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then
   enableval="$enable_libtool_lock"
-  :
-fi
 
+fi;
 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
 # Some flags need to be propagated to the compiler or linker for good
@@ -2495,8 +3434,12 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2499 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 3437 "configure"' > conftest.$ac_ext
+  if { (eval echo "$as_me:3438: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:3441: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -2516,54 +3459,64 @@ case $host in
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2521: checking whether the C compiler needs -belf" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:3462: checking whether the C compiler needs -belf" >&5
+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
+if test "${lt_cv_cc_needs_belf+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
+
      ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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
 
-     cat > conftest.$ac_ext <<EOF
-#line 2534 "configure"
+     cat >conftest.$ac_ext <<_ACEOF
+#line 3475 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main ()
+{
 
-; return 0; }
-EOF
-if { (eval echo configure:2541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3487: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:3490: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:3493: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3496: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   lt_cv_cc_needs_belf=yes
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=no
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+lt_cv_cc_needs_belf=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-
-echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
+echo "$as_me:3512: result: $lt_cv_cc_needs_belf" >&5
+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
 
-
 esac
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
@@ -2641,16 +3594,23 @@ old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
 if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    ;;
+  *)
+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    ;;
+  esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
 fi
 
 # Allow CC to be a program name with arguments.
 set dummy $CC
 compiler="$2"
 
-echo $ac_n "checking for objdir""... $ac_c" 1>&6
-echo "configure:2654: checking for objdir" >&5
+echo "$as_me:3612: checking for objdir" >&5
+echo $ECHO_N "checking for objdir... $ECHO_C" >&6
 rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
 if test -d .libs; then
@@ -2660,8 +3620,8 @@ else
   objdir=_libs
 fi
 rmdir .libs 2>/dev/null
-echo "$ac_t""$objdir" 1>&6
-
+echo "$as_me:3623: result: $objdir" >&5
+echo "${ECHO_T}$objdir" >&6
 
 # Check whether --with-pic or --without-pic was given.
 if test "${with_pic+set}" = set; then
@@ -2669,17 +3629,16 @@ if test "${with_pic+set}" = set; then
   pic_mode="$withval"
 else
   pic_mode=default
-fi
-
+fi;
 test -z "$pic_mode" && pic_mode=default
 
 # We assume here that the value for lt_cv_prog_cc_pic will not be cached
 # in isolation, and that seeing it set (from the cache) indicates that
 # the associated values are set (in the cache) correctly too.
-echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
-echo "configure:2681: checking for $compiler option to produce PIC" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3638: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+if test "${lt_cv_prog_cc_pic+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
    lt_cv_prog_cc_pic=
   lt_cv_prog_cc_shlib=
@@ -2699,7 +3658,7 @@ else
       # libC (AIX C++ library), which obviously doesn't included in libraries
       # list by gcc. This cause undefined symbols with -static flags.
       # This hack allows C programs to be linked with "-static -ldl", but
-      # we not sure about C++ programs.
+      # not sure about C++ programs.
       lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
       ;;
     amigaos*)
@@ -2734,13 +3693,13 @@ else
     # PORTME Check for PIC flags for the system compiler.
     case $host_os in
     aix3* | aix4* | aix5*)
+      lt_cv_prog_cc_wl='-Wl,'
       # All AIX code is PIC.
       if test "$host_cpu" = ia64; then
-        # AIX 5 now supports IA64 processor
-        lt_cv_prog_cc_static='-Bstatic'
-        lt_cv_prog_cc_wl='-Wl,'
+	# AIX 5 now supports IA64 processor
+	lt_cv_prog_cc_static='-Bstatic'
       else
-        lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
+	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
 
@@ -2809,9 +3768,9 @@ else
       lt_cv_prog_cc_pic='-KPIC'
       lt_cv_prog_cc_static='-Bstatic'
       if test "x$host_vendor" = xsni; then
-        lt_cv_prog_cc_wl='-LD'
+	lt_cv_prog_cc_wl='-LD'
       else
-        lt_cv_prog_cc_wl='-Wl,'
+	lt_cv_prog_cc_wl='-Wl,'
       fi
       ;;
 
@@ -2836,28 +3795,44 @@ else
 fi
 
 if test -z "$lt_cv_prog_cc_pic"; then
-  echo "$ac_t""none" 1>&6
+  echo "$as_me:3798: result: none" >&5
+echo "${ECHO_T}none" >&6
 else
-  echo "$ac_t""$lt_cv_prog_cc_pic" 1>&6
+  echo "$as_me:3801: result: $lt_cv_prog_cc_pic" >&5
+echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6
 
   # Check to make sure the pic_flag actually works.
-  echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
-echo "configure:2846: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
-  if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:3805: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6
+  if test "${lt_cv_prog_cc_pic_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
       save_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
-    cat > conftest.$ac_ext <<EOF
-#line 2853 "configure"
+    cat >conftest.$ac_ext <<_ACEOF
+#line 3813 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main ()
+{
 
-; return 0; }
-EOF
-if { (eval echo configure:2860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3825: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:3828: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:3831: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3834: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
         case $host_os in
       hpux9* | hpux10* | hpux11*)
 	# On HP-UX, both CC and GCC only warn that PIC is supported... then
@@ -2873,19 +3848,17 @@ if { (eval echo configure:2860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5;
 	lt_cv_prog_cc_pic_works=yes
 	;;
       esac
-    
+
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-        lt_cv_prog_cc_pic_works=no
-    
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+      lt_cv_prog_cc_pic_works=no
+
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
     CFLAGS="$save_CFLAGS"
-  
-fi
 
+fi
 
   if test "X$lt_cv_prog_cc_pic_works" = Xno; then
     lt_cv_prog_cc_pic=
@@ -2894,51 +3867,68 @@ fi
     lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
   fi
 
-  echo "$ac_t""$lt_cv_prog_cc_pic_works" 1>&6
+  echo "$as_me:3870: result: $lt_cv_prog_cc_pic_works" >&5
+echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6
 fi
 
 # Check for any special shared library compilation flags.
 if test -n "$lt_cv_prog_cc_shlib"; then
-  echo "configure: warning: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" 1>&2
+  { echo "$as_me:3876: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5
+echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;}
   if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]" >/dev/null; then :
   else
-   echo "configure: warning: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" 1>&2
+   { echo "$as_me:3880: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
+echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
     lt_cv_prog_cc_can_build_shared=no
   fi
 fi
 
-echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
-echo "configure:2912: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3886: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6
+if test "${lt_cv_prog_cc_static_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     lt_cv_prog_cc_static_works=no
   save_LDFLAGS="$LDFLAGS"
   LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
-  cat > conftest.$ac_ext <<EOF
-#line 2920 "configure"
+  cat >conftest.$ac_ext <<_ACEOF
+#line 3895 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main ()
+{
 
-; return 0; }
-EOF
-if { (eval echo configure:2927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3907: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:3910: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:3913: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3916: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   lt_cv_prog_cc_static_works=yes
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
   LDFLAGS="$save_LDFLAGS"
 
 fi
 
-
 # Belt *and* braces to stop my trousers falling down:
 test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
-echo "$ac_t""$lt_cv_prog_cc_static_works" 1>&6
+echo "$as_me:3930: result: $lt_cv_prog_cc_static_works" >&5
+echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6
 
 pic_flag="$lt_cv_prog_cc_pic"
 special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
@@ -2947,14 +3937,13 @@ link_static_flag="$lt_cv_prog_cc_static"
 no_builtin_flag="$lt_cv_prog_cc_no_builtin"
 can_build_shared="$lt_cv_prog_cc_can_build_shared"
 
-
 # Check to see if options -o and -c are simultaneously supported by compiler
-echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
-echo "configure:2954: checking if $compiler supports -c -o file.$ac_objext" >&5
-if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3941: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+if test "${lt_cv_compiler_c_o+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
+
 $rm -r conftest 2>/dev/null
 mkdir conftest
 cd conftest
@@ -2969,7 +3958,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:2973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:3961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -2993,29 +3982,46 @@ $rm -r conftest 2>/dev/null
 fi
 
 compiler_c_o=$lt_cv_compiler_c_o
-echo "$ac_t""$compiler_c_o" 1>&6
+echo "$as_me:3985: result: $compiler_c_o" >&5
+echo "${ECHO_T}$compiler_c_o" >&6
 
 if test x"$compiler_c_o" = x"yes"; then
   # Check to see if we can write to a .lo
-  echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
-echo "configure:3002: checking if $compiler supports -c -o file.lo" >&5
-  if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:3990: checking if $compiler supports -c -o file.lo" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6
+  if test "${lt_cv_compiler_o_lo+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
+
   lt_cv_compiler_o_lo=no
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -c -o conftest.lo"
-  cat > conftest.$ac_ext <<EOF
-#line 3011 "configure"
+  save_objext="$ac_objext"
+  ac_objext=lo
+  cat >conftest.$ac_ext <<_ACEOF
+#line 4002 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main ()
+{
 int some_variable = 0;
-; return 0; }
-EOF
-if { (eval echo configure:3018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4014: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4017: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4020: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4023: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
       # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
     if test -s conftest.err; then
@@ -3023,18 +4029,20 @@ if { (eval echo configure:3018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5;
     else
       lt_cv_compiler_o_lo=yes
     fi
-  
+
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
+  ac_objext="$save_objext"
   CFLAGS="$save_CFLAGS"
-  
+
 fi
 
   compiler_o_lo=$lt_cv_compiler_o_lo
-  echo "$ac_t""$compiler_c_lo" 1>&6
+  echo "$as_me:4044: result: $compiler_o_lo" >&5
+echo "${ECHO_T}$compiler_o_lo" >&6
 else
   compiler_o_lo=no
 fi
@@ -3043,17 +4051,19 @@ fi
 hard_links="nottested"
 if test "$compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
-echo "configure:3048: checking if we can lock with hard links" >&5
+  echo "$as_me:4054: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$ac_t""$hard_links" 1>&6
+  echo "$as_me:4062: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6
   if test "$hard_links" = no; then
-    echo "configure: warning: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" 1>&2
+    { echo "$as_me:4065: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -3062,22 +4072,36 @@ fi
 
 if test "$GCC" = yes; then
   # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
-  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
-echo "configure:3067: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  echo "$as_me:4075: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
   echo "int some_variable = 0;" > conftest.$ac_ext
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
   compiler_rtti_exceptions=no
-  cat > conftest.$ac_ext <<EOF
-#line 3073 "configure"
+  cat >conftest.$ac_ext <<_ACEOF
+#line 4082 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main ()
+{
 int some_variable = 0;
-; return 0; }
-EOF
-if { (eval echo configure:3080: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4094: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4097: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4100: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4103: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
       # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
     if test -s conftest.err; then
@@ -3085,14 +4109,15 @@ if { (eval echo configure:3080: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5;
     else
       compiler_rtti_exceptions=yes
     fi
-  
+
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
   CFLAGS="$save_CFLAGS"
-  echo "$ac_t""$compiler_rtti_exceptions" 1>&6
+  echo "$as_me:4119: result: $compiler_rtti_exceptions" >&5
+echo "${ECHO_T}$compiler_rtti_exceptions" >&6
 
   if test "$compiler_rtti_exceptions" = "yes"; then
     no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
@@ -3102,8 +4127,8 @@ rm -f conftest*
 fi
 
 # See if the linker supports building shared libraries.
-echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
-echo "configure:3107: checking whether the linker ($LD) supports shared libraries" >&5
+echo "$as_me:4130: checking whether the linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6
 
 allow_undefined_flag=
 no_undefined_flag=
@@ -3144,7 +4169,7 @@ exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
 extract_expsyms_cmds=
 
 case $host_os in
-cygwin* | mingw* | pw32* )
+cygwin* | mingw* | pw32*)
   # FIXME: the MSVC++ port hasn't been tested in a loooong time
   # When not using gcc, we currently assume that we are using
   # Microsoft Visual C++.
@@ -3152,7 +4177,9 @@ cygwin* | mingw* | pw32* )
     with_gnu_ld=no
   fi
   ;;
-
+openbsd*)
+  with_gnu_ld=no
+  ;;
 esac
 
 ld_shlibs=yes
@@ -3239,7 +4266,7 @@ EOF
     # can override, but on older systems we have to supply one (in ltdll.c)
     if test "x$lt_cv_need_dllmain" = "xyes"; then
       ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
-      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~
+      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
 	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
     else
       ltdll_obj=
@@ -3258,18 +4285,18 @@ EOF
     # is EXPORTS), use it as is.
     # If DATA tags from a recent dlltool are present, honour them!
     archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
-        cp $export_symbols $output_objdir/$soname-def;
+	cp $export_symbols $output_objdir/$soname-def;
       else
-        echo EXPORTS > $output_objdir/$soname-def;
-        _lt_hint=1;
-        cat $export_symbols | while read symbol; do
-         set dummy \$symbol;
-         case \$# in
-           2) echo "   \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
-           *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
-         esac;
-         _lt_hint=`expr 1 + \$_lt_hint`;
-        done;
+	echo EXPORTS > $output_objdir/$soname-def;
+	_lt_hint=1;
+	cat $export_symbols | while read symbol; do
+	 set dummy \$symbol;
+	 case \$# in
+	   2) echo "   \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
+	   *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
+	 esac;
+	 _lt_hint=`expr 1 + \$_lt_hint`;
+	done;
       fi~
       '"$ltdll_cmds"'
       $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
@@ -3364,80 +4391,96 @@ else
     ;;
 
   aix4* | aix5*)
+    if test "$host_cpu" = ia64; then
+      # On IA64, the linker does run time linking by default, so we don't
+      # have to do anything special.
+      aix_use_runtimelinking=no
+      exp_sym_flag='-Bexport'
+      no_entry_flag=""
+    else
+      aix_use_runtimelinking=no
+
+      # Test if we are trying to use run time linking or normal
+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+      # need to do runtime linking.
+      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	done
+      esac
+
+      exp_sym_flag='-bexport'
+      no_entry_flag='-bnoentry'
+    fi
+
     # When large executables or shared objects are built, AIX ld can
     # have problems creating the table of contents.  If linking a library
     # or program results in "error TOC overflow" add -mminimal-toc to
     # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
     # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 
+    hardcode_direct=yes
     archive_cmds=''
     hardcode_libdir_separator=':'
     if test "$GCC" = yes; then
-      collect2name=`${CC} -print-prog-name=collect2`
-      if test -f "$collect2name" && \
-	 strings "$collect2name" | grep resolve_lib_name >/dev/null
-      then
-	# We have reworked collect2
-	hardcode_direct=yes
-      else
-        # We have old collect2
-        hardcode_direct=unsupported
-        # It fails to find uninstalled libraries when the uninstalled
-        # path is not listed in the libpath.  Setting hardcode_minus_L
-        # to unsupported forces relinking
-        hardcode_minus_L=yes
-        hardcode_libdir_flag_spec='-L$libdir'
-        hardcode_libdir_separator=
-      fi
+      case $host_os in aix4.[012]|aix4.[012].*)
+	collect2name=`${CC} -print-prog-name=collect2`
+	if test -f "$collect2name" && \
+	  strings "$collect2name" | grep resolve_lib_name >/dev/null
+	then
+	  # We have reworked collect2
+	  hardcode_direct=yes
+	else
+	  # We have old collect2
+	  hardcode_direct=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L=yes
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_libdir_separator=
+	fi
+      esac
+
       shared_flag='-shared'
     else
+      # not using gcc
       if test "$host_cpu" = ia64; then
-        shared_flag='-G'
+	shared_flag='${wl}-G'
       else
-        shared_flag='${wl}-bM:SRE'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag='${wl}-G'
+	else
+	  shared_flag='${wl}-bM:SRE'
+	fi
       fi
-      hardcode_direct=yes
     fi
 
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      # Test if we are trying to use run time linking, or normal AIX style linking.
-      # If -brtl is somewhere in LDFLAGS, we need to do run time linking.
-      aix_use_runtimelinking=no
-      for ld_flag in $LDFLAGS; do
-        if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then
-          aix_use_runtimelinking=yes
-          break
-        fi
-      done
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
     # It seems that -bexpall can do strange things, so it is better to
     # generate a list of symbols to export.
     always_export_symbols=yes
     if test "$aix_use_runtimelinking" = yes; then
+      # Warning - without using the other runtime loading flags (-brtl),
+      # -berok will link without error, but may produce a broken library.
+      allow_undefined_flag='-berok'
       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
-      allow_undefined_flag=' -Wl,-G'
-      archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
     else
       if test "$host_cpu" = ia64; then
-        hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-       allow_undefined_flag="-znodefs"
-        archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	allow_undefined_flag="-z nodefs"
+	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
       else
-        hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
-        # Warning - without using the other run time loading flags, -berok will
-        #           link without error, but may produce a broken library.
-        allow_undefined_flag='${wl}-berok"
-        # This is a bit strange, but is similar to how AIX traditionally builds
-        # it's shared libraries.
-        archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
+	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
+	# Warning - without using the other run time loading flags,
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='${wl}-berok'
+	# This is a bit strange, but is similar to how AIX traditionally builds
+	# it's shared libraries.
+	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
       fi
     fi
     ;;
@@ -3469,11 +4512,18 @@ else
     ;;
 
   darwin* | rhapsody*)
-    allow_undefined_flag='-undefined suppress'
+    case "$host_os" in
+    rhapsody* | darwin1.[012])
+      allow_undefined_flag='-undefined suppress'
+      ;;
+    *) # Darwin 1.3 on
+      allow_undefined_flag='-flat_namespace -undefined suppress'
+      ;;
+    esac
     # FIXME: Relying on posixy $() will cause problems for
     #        cross-compilation, but unfortunately the echo tests do not
     #        yet detect zsh echo's removal of \ escapes.
-    archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
+    archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
     # We need to add '_' to the symbols in $export_symbols first
     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
     hardcode_direct=yes
@@ -3548,7 +4598,7 @@ else
     ;;
 
   newsos6)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
     hardcode_direct=yes
     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
     hardcode_libdir_separator=:
@@ -3556,10 +4606,24 @@ else
     ;;
 
   openbsd*)
-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_libdir_flag_spec='-R$libdir'
     hardcode_direct=yes
     hardcode_shlibpath_var=no
+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec='${wl}-E'
+    else
+      case "$host_os" in
+      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_libdir_flag_spec='-R$libdir'
+        ;;
+      *)
+        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+        ;;
+      esac
+    fi
     ;;
 
   os2*)
@@ -3604,10 +4668,39 @@ else
     hardcode_shlibpath_var=no
     runpath_var=LD_RUN_PATH
     hardcode_runpath_var=yes
+    export_dynamic_flag_spec='${wl}-Bexport'
     ;;
 
   solaris*)
+    # gcc --version < 3.0 without binutils cannot create self contained
+    # shared libraries reliably, requiring libgcc.a to resolve some of
+    # the object symbols generated in some cases.  Libraries that use
+    # assert need libgcc.a to resolve __eprintf, for example.  Linking
+    # a copy of libgcc.a into every shared library to guarantee resolving
+    # such symbols causes other problems:  According to Tim Van Holder
+    # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
+    # (to the application) exception stack for one thing.
     no_undefined_flag=' -z defs'
+    if test "$GCC" = yes; then
+      case `$CC --version 2>/dev/null` in
+      [12].*)
+	cat <<EOF 1>&2
+
+*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
+*** create self contained shared libraries on Solaris systems, without
+*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
+*** -no-undefined support, which will at least allow you to build shared
+*** libraries.  However, you may find that when you link such libraries
+*** into an application without using GCC, you have to manually add
+*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
+*** upgrade to a newer version of GCC.  Another option is to rebuild your
+*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
+
+EOF
+        no_undefined_flag=
+	;;
+      esac
+    fi
     # $CC -shared without GNU ld will not create a library from C++
     # object files and a static libstdc++, better avoid it by now
     archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -3639,7 +4732,7 @@ else
 
   sysv4)
     if test "x$host_vendor" = xsno; then
-      archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts'
+      archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes # is this really true???
     else
       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -3714,12 +4807,13 @@ else
     ;;
   esac
 fi
-echo "$ac_t""$ld_shlibs" 1>&6
+echo "$as_me:4810: result: $ld_shlibs" >&5
+echo "${ECHO_T}$ld_shlibs" >&6
 test "$ld_shlibs" = no && can_build_shared=no
 
 # Check hardcoding attributes.
-echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
-echo "configure:3723: checking how to hardcode library paths into programs" >&5
+echo "$as_me:4815: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
    test -n "$runpath_var"; then
@@ -3742,26 +4836,29 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-echo "$ac_t""$hardcode_action" 1>&6
+echo "$as_me:4839: result: $hardcode_action" >&5
+echo "${ECHO_T}$hardcode_action" >&6
 
 striplib=
 old_striplib=
-echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
-echo "configure:3751: checking whether stripping libraries is possible" >&5
+echo "$as_me:4844: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$ac_t""yes" 1>&6
+  echo "$as_me:4849: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:4852: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
 
 # PORTME Fill in your ld.so characteristics
-echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
-echo "configure:3765: checking dynamic linker characteristics" >&5
+echo "$as_me:4860: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -3799,22 +4896,24 @@ aix4* | aix5*)
     # depend on `.', always an invalid library.  This was fixed in
     # development snapshots of GCC prior to 3.0.
     case $host_os in
-       aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-           echo ' yes '
-           echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-        :
-      else
-        can_build_shared=no
-      fi
-      ;;
+      aix4 | aix4.[01] | aix4.[01].*)
+	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	     echo ' yes '
+	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	  :
+	else
+	  can_build_shared=no
+	fi
+	;;
     esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
+    # AIX (on Power*) has no versioning support, so currently we can
+    # not hardcode correct soname into executable. Probably we can
+    # add versioning support to collect2, so additional links can
+    # be useful in future.
     if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so instead of
-      # lib<name>.a to let people know that these are not typical AIX shared libraries.
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
       library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
     else
       # We preserve .a as extension for shared libraries through AIX4.2
@@ -3823,7 +4922,6 @@ aix4* | aix5*)
       soname_spec='${libname}${release}.so$major'
     fi
     shlibpath_var=LIBPATH
-    deplibs_check_method=pass_all
   fi
   ;;
 
@@ -3904,6 +5002,18 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
+freebsd*-gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
+  ;;
+
 freebsd*)
   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
   version_type=freebsd-$objformat
@@ -4036,9 +5146,19 @@ newsos6)
 
 openbsd*)
   version_type=sunos
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-    need_version=no
+  need_lib_prefix=no
+  need_version=no
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case "$host_os" in
+    openbsd2.[89] | openbsd2.[89].*)
+      shlibpath_overrides_runpath=no
+      ;;
+    *)
+      shlibpath_overrides_runpath=yes
+      ;;
+    esac
+  else
+    shlibpath_overrides_runpath=yes
   fi
   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -4142,13 +5262,46 @@ sysv4*MP*)
   dynamic_linker=no
   ;;
 esac
-echo "$ac_t""$dynamic_linker" 1>&6
+echo "$as_me:5265: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6
 test "$dynamic_linker" = no && can_build_shared=no
 
 # Report the final consequences.
-echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
-echo "configure:4151: checking if libtool supports shared libraries" >&5
-echo "$ac_t""$can_build_shared" 1>&6
+echo "$as_me:5270: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+echo "$as_me:5272: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6
+
+echo "$as_me:5275: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case "$host_os" in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+
+aix4*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
+  ;;
+esac
+echo "$as_me:5296: result: $enable_shared" >&5
+echo "${ECHO_T}$enable_shared" >&6
+
+echo "$as_me:5299: checking whether to build static libraries" >&5
+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+echo "$as_me:5303: result: $enable_static" >&5
+echo "${ECHO_T}$enable_static" >&6
 
 if test "$hardcode_action" = relink; then
   # Fast installation is not supported
@@ -4180,229 +5333,350 @@ else
     ;;
 
   cygwin* | mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  *)
-    echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4190: checking for dlopen in -ldl" >&5
-ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4198 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dlopen();
-
-int main() {
-dlopen()
-; return 0; }
-EOF
-if { (eval echo configure:4209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+   ;;
 
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:4228: checking for dlopen" >&5
-if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  *)
+    echo "$as_me:5341: checking for shl_load" >&5
+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+if test "${ac_cv_func_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 4233 "configure"
+  cat >conftest.$ac_ext <<_ACEOF
+#line 5347 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen(); below.  */
+    which can conflict with char shl_load (); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dlopen();
-
-int main() {
+   builtin and then its argument prototype would still apply.  */
+char shl_load ();
+char (*f) ();
 
+int
+main ()
+{
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
+#if defined (__stub_shl_load) || defined (__stub___shl_load)
 choke me
 #else
-dlopen();
+f = shl_load;
 #endif
 
-; return 0; }
-EOF
-if { (eval echo configure:4256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_dlopen=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_dlopen=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="dlopen"
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5378: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5381: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5384: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5387: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_shl_load=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_shl_load=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:5397: result: $ac_cv_func_shl_load" >&5
+echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+if test $ac_cv_func_shl_load = yes; then
+  lt_cv_dlopen="shl_load"
 else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "configure:4274: checking for shl_load" >&5
-if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:5402: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 4279 "configure"
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line 5410 "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char shl_load ();
+int
+main ()
+{
+shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5429: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5432: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5435: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5438: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dld_shl_load=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_dld_shl_load=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:5449: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+if test $ac_cv_lib_dld_shl_load = yes; then
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+else
+  echo "$as_me:5454: checking for dlopen" >&5
+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+if test "${ac_cv_func_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 5460 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load(); below.  */
+    which can conflict with char dlopen (); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char shl_load();
-
-int main() {
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+char (*f) ();
 
+int
+main ()
+{
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
+#if defined (__stub_dlopen) || defined (__stub___dlopen)
 choke me
 #else
-shl_load();
+f = dlopen;
 #endif
 
-; return 0; }
-EOF
-if { (eval echo configure:4302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_shl_load=yes"
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5491: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5494: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5497: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5500: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:5510: result: $ac_cv_func_dlopen" >&5
+echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+if test $ac_cv_func_dlopen = yes; then
+  lt_cv_dlopen="dlopen"
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_shl_load=no"
-fi
-rm -f conftest*
-fi
+  echo "$as_me:5515: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line 5523 "configure"
+#include "confdefs.h"
 
-if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="shl_load"
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5542: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5545: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5548: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5551: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:5562: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
-echo "configure:4320: checking for dlopen in -lsvld" >&5
-ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:5567: checking for dlopen in -lsvld" >&5
+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4328 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 5575 "configure"
 #include "confdefs.h"
+
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dlopen();
-
-int main() {
-dlopen()
-; return 0; }
-EOF
-if { (eval echo configure:4339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5594: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5597: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5600: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5603: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_svld_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_svld_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:5614: result: $ac_cv_lib_svld_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+if test $ac_cv_lib_svld_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:4358: checking for shl_load in -ldld" >&5
-ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:5619: checking for dld_link in -ldld" >&5
+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4366 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 5627 "configure"
 #include "confdefs.h"
+
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char shl_load();
-
-int main() {
-shl_load()
-; return 0; }
-EOF
-if { (eval echo configure:4377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+   builtin and then its argument prototype would still apply.  */
+char dld_link ();
+int
+main ()
+{
+dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5646: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5649: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5652: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5655: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dld_dld_link=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_dld_dld_link=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:5666: result: $ac_cv_lib_dld_dld_link" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+if test $ac_cv_lib_dld_dld_link = yes; then
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
 
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-else
-  echo "$ac_t""no" 1>&6
-fi
 
-	    
 fi
 
-          
 fi
 
-        
 fi
 
-      
 fi
 
     ;;
@@ -4425,10 +5699,10 @@ fi
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-echo "configure:4430: checking whether a program can dlopen itself" >&5
-if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    echo "$as_me:5702: checking whether a program can dlopen itself" >&5
+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+if test "${lt_cv_dlopen_self+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self=cross
@@ -4436,7 +5710,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 4440 "configure"
+#line 5713 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -4497,7 +5771,11 @@ int main ()
     exit (status);
 }
 EOF
-  if { (eval echo configure:4501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  if { (eval echo "$as_me:5774: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5777: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -4512,17 +5790,16 @@ EOF
 fi
 rm -fr conftest*
 
-    
 fi
-
-echo "$ac_t""$lt_cv_dlopen_self" 1>&6
+echo "$as_me:5794: result: $lt_cv_dlopen_self" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self" >&6
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       LDFLAGS="$LDFLAGS $link_static_flag"
-      echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-echo "configure:4524: checking whether a statically linked program can dlopen itself" >&5
-if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+      echo "$as_me:5799: checking whether a statically linked program can dlopen itself" >&5
+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+if test "${lt_cv_dlopen_self_static+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self_static=cross
@@ -4530,7 +5807,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 4534 "configure"
+#line 5810 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -4591,7 +5868,11 @@ int main ()
     exit (status);
 }
 EOF
-  if { (eval echo configure:4595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  if { (eval echo "$as_me:5871: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5874: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -4606,10 +5887,9 @@ EOF
 fi
 rm -fr conftest*
 
-      
 fi
-
-echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
+echo "$as_me:5891: result: $lt_cv_dlopen_self_static" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
     fi
 
     CPPFLAGS="$save_CPPFLAGS"
@@ -4629,7 +5909,6 @@ echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
   esac
 fi
 
-
 if test "$enable_shared" = yes && test "$GCC" = yes; then
   case $archive_cmds in
   *'~'*)
@@ -4639,15 +5918,19 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then
     # Test whether the compiler implicitly links with -lc since on some
     # systems, -lgcc has to come before -lc. If gcc already passes -lc
     # to ld, don't add -lc before -lgcc.
-    echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
-echo "configure:4644: checking whether -lc should be explicitly linked in" >&5
-    if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    echo "$as_me:5921: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+    if test "${lt_cv_archive_cmds_need_lc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   $rm conftest*
     echo 'static int dummy;' > conftest.$ac_ext
 
-    if { (eval echo configure:4651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    if { (eval echo "$as_me:5929: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:5932: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
       soname=conftest
       lib=conftest
       libobjs=conftest.$ac_objext
@@ -4660,7 +5943,11 @@ else
       libname=conftest
       save_allow_undefined_flag=$allow_undefined_flag
       allow_undefined_flag=
-      if { (eval echo configure:4664: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
+      if { (eval echo "$as_me:5946: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  echo "$as_me:5949: \$? = $ac_status" >&5
+  (exit $ac_status); }
       then
 	lt_cv_archive_cmds_need_lc=no
       else
@@ -4671,10 +5958,11 @@ else
       cat conftest.err 1>&5
     fi
     $rm conftest*
-    
+
 fi
 
-    echo "$ac_t""$lt_cv_archive_cmds_need_lc" 1>&6
+    echo "$as_me:5964: result: $lt_cv_archive_cmds_need_lc" >&5
+echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6
     ;;
   esac
 fi
@@ -4714,6 +6002,7 @@ if test -f "$ltmain"; then
     old_striplib striplib file_magic_cmd export_symbols_cmds \
     deplibs_check_method allow_undefined_flag no_undefined_flag \
     finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
+    global_symbol_to_c_name_address \
     hardcode_libdir_flag_spec hardcode_libdir_separator  \
     sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
     compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
@@ -4780,12 +6069,12 @@ SHELL=$lt_SHELL
 # Whether or not to build shared libraries.
 build_libtool_libs=$enable_shared
 
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$need_lc
-
 # Whether or not to build static libraries.
 build_old_libs=$enable_static
 
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$need_lc
+
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install
 
@@ -4951,6 +6240,9 @@ global_symbol_pipe=$lt_global_symbol_pipe
 # Transform the output of nm in a proper C declaration
 global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
 
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
+
 # This is the shared library runtime path variable.
 runpath_var=$runpath_var
 
@@ -5073,9 +6365,9 @@ EOF
 #   return TRUE;
 # }
 # /* ltdll.c ends here */
-        # This is a source program that is used to create import libraries
-        # on Windows for dlls which lack them. Don't remove nor modify the
-        # starting and closing comments
+	# This is a source program that is used to create import libraries
+	# on Windows for dlls which lack them. Don't remove nor modify the
+	# starting and closing comments
 # /* impgen.c starts here */
 # /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
 #
@@ -5226,10 +6518,6 @@ EOF
   chmod +x "$ofile"
 fi
 
-
-
-
-
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
@@ -5238,303 +6526,665 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 # Prevent multiple expansion
 
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
+ac_config_files="$ac_config_files Makefile"
+cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
 #
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
 #
-EOF
+# `ac_cv_env_foo' variables (set or unset) will be overriden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 # So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+        "s/'/'\\\\''/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if cmp -s $cache_file confcache; then :; else
   if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
   else
     echo "not updating unwritable cache $cache_file"
   fi
 fi
 rm -f confcache
 
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[ 	]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[ 	]*$//;
+}'
 fi
 
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then we branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+cat >confdef2opt.sed <<\EOF
+t clear
+: clear
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+d
+: quote
+s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
+s,\[,\\&,g
+s,\],\\&,g
+s,\$,$$,g
+p
 EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
+# We use echo to avoid assuming a particular line-breaking character.
+# The extra dot is to prevent the shell from consuming trailing
+# line-breaks from the sub-command output.  A line-break within
+# single-quotes doesn't work because, if this script is created in a
+# platform that uses two characters for line-breaks (e.g., DOS), tr
+# would break.
+ac_LF_and_DOT=`echo; echo .`
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+rm -f confdef2opt.sed
 
-# Without the "./", some shells look in PATH for config.status.
 : ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ echo "$as_me:6639: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
+#! $SHELL
 # Generated automatically by configure.
 # Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
 # Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
+# configure, is in config.log if it exists.
 
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
+debug=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+ac_cs_invocation="\$0 \$@"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+# NLS nuisances.
+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+
+exec 6>&1
+
+_ACEOF
+
+# Files that config.status was made for.
+if test -n "$ac_config_files"; then
+  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_headers"; then
+  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_links"; then
+  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_commands"; then
+  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+fi
+
+cat >>$CONFIG_STATUS <<\EOF
+
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTIONS] [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number, then exit
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+  --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Configuration commands:
+$config_commands
+
+Report bugs to <bug-autoconf@gnu.org>."
+EOF
+
+cat >>$CONFIG_STATUS <<EOF
+ac_cs_version="\\
+config.status
+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
+Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+srcdir=$srcdir
+INSTALL="$INSTALL"
+EOF
+
+cat >>$CONFIG_STATUS <<\EOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
+ac_need_defaults=:
+while test $# != 0
 do
-  case "\$ac_option" in
+  case $1 in
+  --*=*)
+    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+    shift
+    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
+    shift
+    ;;
+  -*);;
+  *) # This is not an option, so the user has probably given explicit
+     # arguments.
+     ac_need_defaults=false;;
+  esac
+
+  case $1 in
+  # Handling of the options.
+EOF
+cat >>$CONFIG_STATUS <<EOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
+    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
+    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
+EOF
+cat >>$CONFIG_STATUS <<\EOF
+  --version | --vers* | -V )
+    echo "$ac_cs_version"; exit 0 ;;
+  --he | --h)
+    # Conflict between --help and --header
+    { { echo "$as_me:6810: 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;}
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit 0 ;;
+  --debug | --d* | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    shift
+    CONFIG_FILES="$CONFIG_FILES $1"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $1"
+    ac_need_defaults=false;;
+
+  # This is an error.
+  -*) { { echo "$as_me:6829: 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; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1" ;;
+
   esac
+  shift
 done
 
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
+exec 5>>config.log
+cat >&5 << _ACEOF
+
+## ----------------------- ##
+## Running config.status.  ##
+## ----------------------- ##
+
+This file was extended by $as_me 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`
 
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+_ACEOF
 EOF
-cat >> $CONFIG_STATUS <<EOF
 
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@EXEEXT@%$EXEEXT%g
-s%@OBJEXT@%$OBJEXT%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@AMTAR@%$AMTAR%g
-s%@install_sh@%$install_sh%g
-s%@INSTALL_STRIP_PROGRAM@%$INSTALL_STRIP_PROGRAM%g
-s%@AWK@%$AWK%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@AMDEP_TRUE@%$AMDEP_TRUE%g
-s%@AMDEP_FALSE@%$AMDEP_FALSE%g
-s%@AMDEPBACKSLASH@%$AMDEPBACKSLASH%g
-s%@DEPDIR@%$DEPDIR%g
-s%@CC@%$CC%g
-s%@am__include@%$am__include%g
-s%@am__quote@%$am__quote%g
-s%@CCDEPMODE@%$CCDEPMODE%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@LN_S@%$LN_S%g
-s%@ECHO@%$ECHO%g
-s%@RANLIB@%$RANLIB%g
-s%@STRIP@%$STRIP%g
-s%@CPP@%$CPP%g
-s%@LIBTOOL@%$LIBTOOL%g
-s%@global_top_srcdir@%$global_top_srcdir%g
+cat >>$CONFIG_STATUS <<EOF
+#
+# INIT-COMMANDS section.
+#
+
+AMDEP_TRUE="$AMDEP_TRUE"
+ac_aux_dir="$ac_aux_dir"
 
-CEOF
 EOF
 
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
+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" ;;
+  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+  *) { { echo "$as_me:6876: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
 done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
+
+# 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
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
+
+# Create a temporary directory, and hook for its removal unless debugging.
+$debug ||
+{
+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+
+# Create a (secure) tmp directory for tmp files.
+: ${TMPDIR=/tmp}
+{
+  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=$TMPDIR/cs$$-$RANDOM
+  (umask 077 && mkdir $tmp)
+} ||
+{
+   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+   { (exit 1); exit 1; }
+}
+
+EOF
+
+cat >>$CONFIG_STATUS <<EOF
+
+#
+# CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "\$CONFIG_FILES"; then
+  # Protect against being on the right side of a sed subst in config.status.
+  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+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,@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,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@DEFS@,$DEFS,;t t
+s,@LIBS@,$LIBS,;t t
+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@PACKAGE@,$PACKAGE,;t t
+s,@VERSION@,$VERSION,;t t
+s,@EXEEXT@,$EXEEXT,;t t
+s,@OBJEXT@,$OBJEXT,;t t
+s,@ACLOCAL@,$ACLOCAL,;t t
+s,@AUTOCONF@,$AUTOCONF,;t t
+s,@AUTOMAKE@,$AUTOMAKE,;t t
+s,@AUTOHEADER@,$AUTOHEADER,;t t
+s,@MAKEINFO@,$MAKEINFO,;t t
+s,@AMTAR@,$AMTAR,;t t
+s,@install_sh@,$install_sh,;t t
+s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+s,@AWK@,$AWK,;t t
+s,@SET_MAKE@,$SET_MAKE,;t t
+s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
+s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
+s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+s,@DEPDIR@,$DEPDIR,;t t
+s,@CC@,$CC,;t t
+s,@CFLAGS@,$CFLAGS,;t t
+s,@LDFLAGS@,$LDFLAGS,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@ac_ct_CC@,$ac_ct_CC,;t t
+s,@am__include@,$am__include,;t t
+s,@am__quote@,$am__quote,;t t
+s,@CCDEPMODE@,$CCDEPMODE,;t t
+s,@build@,$build,;t t
+s,@build_cpu@,$build_cpu,;t t
+s,@build_vendor@,$build_vendor,;t t
+s,@build_os@,$build_os,;t t
+s,@host@,$host,;t t
+s,@host_cpu@,$host_cpu,;t t
+s,@host_vendor@,$host_vendor,;t t
+s,@host_os@,$host_os,;t t
+s,@LN_S@,$LN_S,;t t
+s,@ECHO@,$ECHO,;t t
+s,@RANLIB@,$RANLIB,;t t
+s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+s,@STRIP@,$STRIP,;t t
+s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
+s,@CPP@,$CPP,;t t
+s,@LIBTOOL@,$LIBTOOL,;t t
+s,@global_top_srcdir@,$global_top_srcdir,;t t
+CEOF
+
 EOF
 
-cat >> $CONFIG_STATUS <<EOF
+  cat >>$CONFIG_STATUS <<\EOF
+  # Split the substitutions into bite-sized pieces for seds with
+  # small command number limits, like on Digital OSF/1 and HP-UX.
+  ac_max_sed_lines=48
+  ac_sed_frag=1 # Number of current file.
+  ac_beg=1 # First line for current file.
+  ac_end=$ac_max_sed_lines # Line after last line for current file.
+  ac_more_lines=:
+  ac_sed_cmds=
+  while $ac_more_lines; do
+    if test $ac_beg -gt 1; then
+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    else
+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    fi
+    if test ! -s $tmp/subs.frag; then
+      ac_more_lines=false
+    else
+      # The purpose of the label and of the branching condition is to
+      # speed up the sed processing (if there are no `@' at all, there
+      # is no need to browse any of the substitutions).
+      # These are the two extra sed commands mentioned above.
+      (echo ':t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+      if test -z "$ac_sed_cmds"; then
+  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+      else
+  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+      fi
+      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_beg=$ac_end
+      ac_end=`expr $ac_end + $ac_max_sed_lines`
+    fi
+  done
+  if test -z "$ac_sed_cmds"; then
+    ac_sed_cmds=cat
+  fi
+fi # test -n "$CONFIG_FILES"
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
 EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+cat >>$CONFIG_STATUS <<\EOF
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+        cat >$tmp/stdin
+        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
   esac
 
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+  ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_file" : 'X\(//\)[^/]' \| \
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
   if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+    { case "$ac_dir" in
+  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+  *)                      as_incr_dir=.;;
+esac
+as_dummy="$ac_dir"
+for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+  case $as_mkdir_dir in
+    # Skip DOS drivespec
+    ?:) as_incr_dir=$as_mkdir_dir ;;
+    *)
+      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
+    ;;
+  esac
+done; }
+
+    ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`"
     # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+    ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'`
   else
     ac_dir_suffix= ac_dots=
   fi
 
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+  case $srcdir in
+  .)  ac_srcdir=.
+      if test -z "$ac_dots"; then
+         ac_top_srcdir=.
+      else
+         ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
+      fi ;;
+  [\\/]* | ?:[\\/]* )
+      ac_srcdir=$srcdir$ac_dir_suffix;
+      ac_top_srcdir=$srcdir ;;
   *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
+    ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_dots$srcdir ;;
   esac
 
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_dots$INSTALL ;;
   esac
 
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:7117: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
+  # Let's still pretend it is `configure' which instantiates (i.e., don't
+  # use $as_me), people would be surprised to read:
+  #    /* config.h.  Generated automatically by config.status.  */
+  configure_input="Generated automatically from `echo $ac_file_in |
+                                                 sed 's,.*/,,'` by configure."
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+         # Absolute (can't be DOS-style, as IFS=:)
+         test -f "$f" || { { echo "$as_me:7135: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         echo $f;;
+      *) # Relative
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$srcdir/$f"; then
+           # Source tree
+           echo $srcdir/$f
+         else
+           # /dev/null tree
+           { { echo "$as_me:7148: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         fi;;
+      esac
+    done` || { (exit 1); exit 1; }
 EOF
-cat >> $CONFIG_STATUS <<EOF
-AMDEP_TRUE="$AMDEP_TRUE"
-ac_aux_dir="$ac_aux_dir"
+cat >>$CONFIG_STATUS <<EOF
+  sed "$ac_vpsub
+$extrasub
+EOF
+cat >>$CONFIG_STATUS <<\EOF
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@configure_input@,$configure_input,;t t
+s,@srcdir@,$ac_srcdir,;t t
+s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@INSTALL@,$ac_INSTALL,;t t
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+  rm -f $tmp/stdin
+  if test x"$ac_file" != x-; then
+    mv $tmp/out $ac_file
+  else
+    cat $tmp/out
+    rm -f $tmp/out
+  fi
 
+done
 EOF
-cat >> $CONFIG_STATUS <<\EOF
+cat >>$CONFIG_STATUS <<\EOF
 
+#
+# CONFIG_COMMANDS section.
+#
+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+
+  case $ac_dest in
+    default-1 )
 test x"$AMDEP_TRUE" != x"" ||
 for mf in $CONFIG_FILES; do
   case "$mf" in
@@ -5572,11 +7222,33 @@ for mf in $CONFIG_FILES; do
     echo '# dummy' > "$dirpart/$file"
   done
 done
+ ;;
+  esac
+done
+EOF
 
+cat >>$CONFIG_STATUS <<\EOF
 
-exit 0
+{ (exit 0); exit 0; }
 EOF
 chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+ac_clean_files=$ac_clean_files_save
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || { (exit 1); exit 1; }
+fi
 
diff --git a/tests/rpathy/Makefile.in b/tests/rpathy/Makefile.in
index 6df092bb7..2994e148e 100644
--- a/tests/rpathy/Makefile.in
+++ b/tests/rpathy/Makefile.in
@@ -70,6 +70,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LIB = @LIB@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/tests/rpathy/aclocal.m4 b/tests/rpathy/aclocal.m4
index 65a070fcf..483a341ba 100644
--- a/tests/rpathy/aclocal.m4
+++ b/tests/rpathy/aclocal.m4
@@ -2513,6 +2513,18 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
+freebsd*-gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
+  ;;
+
 freebsd*)
   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
   version_type=freebsd-$objformat
@@ -4001,7 +4013,7 @@ AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
 # This is just to silence aclocal about the macro not being used
 ifelse([AC_DISABLE_FAST_INSTALL])
 
-# lib-link.m4 serial 2 (gettext-0.11.2)
+# lib-link.m4 serial 3 (gettext-0.11.3)
 dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -4119,6 +4131,10 @@ AC_DEFUN([AC_LIB_RPATH],
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
   sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
   sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE(rpath,
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
 ])
 
 dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
@@ -4248,7 +4264,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
               dnl Linking with a shared library. We attempt to hardcode its
               dnl directory into the executable's runpath, unless it's the
               dnl standard /usr/lib.
-              if test "X$found_dir" = "X/usr/lib"; then
+              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
                 dnl No hardcoding is needed.
                 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
               else
@@ -4439,29 +4455,31 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                     ;;
                   -R*)
                     dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $dir"
-                    fi
-                    dnl Potentially add DIR to ltrpathdirs.
-                    dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                    haveit=
-                    for x in $ltrpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      ltrpathdirs="$ltrpathdirs $dir"
                     fi
                     ;;
                   -l*)
diff --git a/tests/rpathy/configure b/tests/rpathy/configure
index cab8084d3..af31348de 100755
--- a/tests/rpathy/configure
+++ b/tests/rpathy/configure
@@ -1,28 +1,12 @@
 #! /bin/sh
-
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Generated by Autoconf 2.52.
 #
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --disable-dependency-tracking Speeds up one-time builds
-  --enable-dependency-tracking  Do not reject slow dependency extractors"
-ac_help="$ac_help
-  --enable-shared[=PKGS]  build shared libraries [default=yes]"
-ac_help="$ac_help
-  --enable-static[=PKGS]  build static libraries [default=yes]"
-ac_help="$ac_help
-  --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-
 # Find the correct PATH separator.  Usually this is `:', but
 # DJGPP uses `;' like DOS.
 if test "X${PATH_SEPARATOR+set}" != Xset; then
@@ -34,7 +18,6 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then
   PATH_SEPARATOR=$lt_cv_sys_path_separator
 fi
 
-
 # Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
@@ -180,26 +163,113 @@ if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
    ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
 fi
 
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# 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
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+# NLS nuisances.
+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+exec 6>&1
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+cross_compiling=no
+subdirs=
+MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete.  It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
 
-ac_help="$ac_help
-  --disable-libtool-lock  avoid locking (might break parallel builds)"
-ac_help="$ac_help
-  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-ac_help="$ac_help
-  --with-librpathx-prefix[=DIR]  search for librpathx in DIR/include and DIR/lib
-  --without-librpathx-prefix     don't search for librpathx in includedir and libdir"
+ac_unique_file="configure.in"
 
 # Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
 # The variables have the same names as the options, with
 # dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
+cache_file=/dev/null
 exec_prefix=NONE
-host=NONE
 no_create=
-nonopt=NONE
 no_recursion=
 prefix=NONE
 program_prefix=NONE
@@ -208,10 +278,15 @@ program_transform_name=s,x,x,
 silent=
 site=
 srcdir=
-target=NONE
 verbose=
 x_includes=NONE
 x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
@@ -225,17 +300,16 @@ oldincludedir='/usr/include'
 infodir='${prefix}/info'
 mandir='${prefix}/man'
 
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
+# Identity of this package.
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
 
 ac_prev=
 for ac_option
 do
-
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
     eval "$ac_prev=\$ac_option"
@@ -243,59 +317,59 @@ do
     continue
   fi
 
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case "$ac_option" in
+  case $ac_option in
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
   -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
+    bindir=$ac_optarg ;;
 
   -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
+    ac_prev=build_alias ;;
   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
+    build_alias=$ac_optarg ;;
 
   -cache-file | --cache-file | --cache-fil | --cache-fi \
   | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
     ac_prev=cache_file ;;
   -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
   | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
 
   -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
     ac_prev=datadir ;;
   -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
   | --da=*)
-    datadir="$ac_optarg" ;;
+    datadir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
+    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'`
+    eval "enable_$ac_feature=no" ;;
 
   -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
+    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'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
+    eval "enable_$ac_feature='$ac_optarg'" ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -304,95 +378,47 @@ do
   -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
   | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
   | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
+    exec_prefix=$ac_optarg ;;
 
   -gas | --gas | --ga | --g)
     # Obsolete; use --with-gas.
     with_gas=yes ;;
 
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
 
   -host | --host | --hos | --ho)
-    ac_prev=host ;;
+    ac_prev=host_alias ;;
   -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
+    host_alias=$ac_optarg ;;
 
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
   -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
   | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
+    includedir=$ac_optarg ;;
 
   -infodir | --infodir | --infodi | --infod | --info | --inf)
     ac_prev=infodir ;;
   -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
+    infodir=$ac_optarg ;;
 
   -libdir | --libdir | --libdi | --libd)
     ac_prev=libdir ;;
   -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
+    libdir=$ac_optarg ;;
 
   -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
   | --libexe | --libex | --libe)
     ac_prev=libexecdir ;;
   -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
   | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
+    libexecdir=$ac_optarg ;;
 
   -localstatedir | --localstatedir | --localstatedi | --localstated \
   | --localstate | --localstat | --localsta | --localst \
@@ -401,12 +427,12 @@ EOF
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
   | --localstate=* | --localstat=* | --localsta=* | --localst=* \
   | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
+    localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
     ac_prev=mandir ;;
   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
+    mandir=$ac_optarg ;;
 
   -nfp | --nfp | --nf)
     # Obsolete; use --without-fp.
@@ -427,26 +453,26 @@ EOF
   -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
   | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
   | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
+    oldincludedir=$ac_optarg ;;
 
   -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
     ac_prev=prefix ;;
   -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
+    prefix=$ac_optarg ;;
 
   -program-prefix | --program-prefix | --program-prefi | --program-pref \
   | --program-pre | --program-pr | --program-p)
     ac_prev=program_prefix ;;
   -program-prefix=* | --program-prefix=* | --program-prefi=* \
   | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
+    program_prefix=$ac_optarg ;;
 
   -program-suffix | --program-suffix | --program-suffi | --program-suff \
   | --program-suf | --program-su | --program-s)
     ac_prev=program_suffix ;;
   -program-suffix=* | --program-suffix=* | --program-suffi=* \
   | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
+    program_suffix=$ac_optarg ;;
 
   -program-transform-name | --program-transform-name \
   | --program-transform-nam | --program-transform-na \
@@ -463,7 +489,7 @@ EOF
   | --program-transfo=* | --program-transf=* \
   | --program-trans=* | --program-tran=* \
   | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
+    program_transform_name=$ac_optarg ;;
 
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
@@ -473,7 +499,7 @@ EOF
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
   | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
+    sbindir=$ac_optarg ;;
 
   -sharedstatedir | --sharedstatedir | --sharedstatedi \
   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
@@ -484,58 +510,57 @@ EOF
   | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
   | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
   | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
+    sharedstatedir=$ac_optarg ;;
 
   -site | --site | --sit)
     ac_prev=site ;;
   -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
+    site=$ac_optarg ;;
 
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
+    srcdir=$ac_optarg ;;
 
   -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
   | --syscon | --sysco | --sysc | --sys | --sy)
     ac_prev=sysconfdir ;;
   -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
   | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
+    sysconfdir=$ac_optarg ;;
 
   -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
+    ac_prev=target_alias ;;
   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
+    target_alias=$ac_optarg ;;
 
   -v | -verbose | --verbose | --verbos | --verbo | --verb)
     verbose=yes ;;
 
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
+    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'`
-    case "$ac_option" in
-      *=*) ;;
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
+    eval "with_$ac_package='$ac_optarg'" ;;
 
   -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
+    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'`
+    eval "with_$ac_package=no" ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -546,98 +571,98 @@ EOF
     ac_prev=x_includes ;;
   -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
   | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
+    x_includes=$ac_optarg ;;
 
   -x-libraries | --x-libraries | --x-librarie | --x-librari \
   | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
     ac_prev=x_libraries ;;
   -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
+    x_libraries=$ac_optarg ;;
 
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
     ;;
 
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    eval "$ac_envvar='$ac_optarg'"
+    export $ac_envvar ;;
+
   *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
+    # FIXME: should be removed in autoconf 3.0.
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    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}
     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  { echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
 fi
-exec 5>./config.log
 
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
+# 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
 
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+              localstatedir libdir includedir oldincludedir infodir mandir
 do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* ) ;;
+    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
   esac
 done
 
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: should be removed in autoconf 3.0.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
 
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
 
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=configure.in
+test "$silent" = yes && exec 6>/dev/null
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then its parent.
   ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+  ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
   test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir
   if test ! -r $srcdir/$ac_unique_file; then
@@ -648,13 +673,323 @@ else
 fi
 if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
+   { (exit 1); exit 1; }; }
   else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources in $srcdir" >&2
+   { (exit 1); exit 1; }; }
   fi
 fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CPP_set=${CPP+set}
+ac_env_CPP_value=$CPP
+ac_cv_env_CPP_set=${CPP+set}
+ac_cv_env_CPP_value=$CPP
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<EOF
+\`configure' configures this package to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+EOF
+
+  cat <<EOF
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
+EOF
+
+  cat <<\EOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       build programs to run on HOST [BUILD]
+EOF
+fi
+
+if test -n "$ac_init_help"; then
+
+  cat <<\EOF
+
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-dependency-tracking Speeds up one-time builds
+  --enable-dependency-tracking  Do not reject slow dependency extractors
+  --enable-shared=PKGS  build shared libraries default=yes
+  --enable-static=PKGS  build static libraries default=yes
+  --enable-fast-install=PKGS  optimize for fast installation default=yes
+  --disable-libtool-lock  avoid locking (might break parallel builds)
+  --disable-rpath         do not hardcode runtime library paths
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-gnu-ld           assume the C compiler uses GNU ld default=no
+  --with-pic              try to use only PIC/non-PIC objects default=use both
+  --with-librpathx-prefix=DIR  search for librpathx in DIR/include and DIR/lib
+  --without-librpathx-prefix     don't search for librpathx in includedir and libdir
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+              headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+EOF
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  ac_popdir=`pwd`
+  for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
+    cd $ac_subdir
+    # A "../" for each directory in /$ac_subdir.
+    ac_dots=`echo $ac_subdir |
+             sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
+
+    case $srcdir in
+    .) # No --srcdir option.  We are building in place.
+      ac_sub_srcdir=$srcdir ;;
+    [\\/]* | ?:[\\/]* ) # Absolute path.
+      ac_sub_srcdir=$srcdir/$ac_subdir ;;
+    *) # Relative path.
+      ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
+    esac
+
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_sub_srcdir/configure.gnu; then
+      echo
+      $SHELL $ac_sub_srcdir/configure.gnu  --help=recursive
+    elif test -f $ac_sub_srcdir/configure; then
+      echo
+      $SHELL $ac_sub_srcdir/configure  --help=recursive
+    elif test -f $ac_sub_srcdir/configure.ac ||
+           test -f $ac_sub_srcdir/configure.in; then
+      echo
+      $ac_configure --help
+    else
+      echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
+    fi
+    cd $ac_popdir
+  done
+fi
+
+test -n "$ac_init_help" && exit 0
+if $ac_init_version; then
+  cat <<\EOF
+
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+EOF
+  exit 0
+fi
+exec 5>config.log
+cat >&5 <<EOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by $as_me, which was
+generated by GNU Autoconf 2.52.  Invocation command line was
+
+  $ $0 $@
+
+EOF
+{
+cat <<_ASUNAME
+## ---------- ##
+## Platform.  ##
+## ---------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+PATH = $PATH
+
+_ASUNAME
+} >&5
+
+cat >&5 <<EOF
+## ------------ ##
+## Core tests.  ##
+## ------------ ##
+
+EOF
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell meta-characters.
+ac_configure_args=
+ac_sep=
+for ac_arg
+do
+  case $ac_arg in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c) ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
+    ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+    ac_sep=" " ;;
+  *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg"
+     ac_sep=" " ;;
+  esac
+  # Get rid of the leading space.
+done
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  echo >&5
+  echo "## ----------------- ##" >&5
+  echo "## Cache variables.  ##" >&5
+  echo "## ----------------- ##" >&5
+  echo >&5
+  # The following way of writing the cache mishandles newlines in values,
+{
+  (set) 2>&1 |
+    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      sed -n \
+        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+      ;;
+    *)
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} >&5
+  sed "/^$/d" confdefs.h >conftest.log
+  if test -s conftest.log; then
+    echo >&5
+    echo "## ------------ ##" >&5
+    echo "## confdefs.h.  ##" >&5
+    echo "## ------------ ##" >&5
+    echo >&5
+    cat conftest.log >&5
+  fi
+  (echo; echo) >&5
+  test "$ac_signal" != 0 &&
+    echo "$as_me: caught signal $ac_signal" >&5
+  echo "$as_me: exit $exit_status" >&5
+  rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files &&
+    exit $exit_status
+     ' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
 
+# Let the site file select an alternate cache file if it wants to.
 # Prefer explicitly selected file to automatically selected ones.
 if test -z "$CONFIG_SITE"; then
   if test "x$prefix" != xNONE; then
@@ -665,40 +1000,107 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
+    { echo "$as_me:1003: 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"
   fi
 done
 
 if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
+  # 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:1014: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . $cache_file;;
+      *)                      . ./$cache_file;;
+    esac
+  fi
 else
-  echo "creating cache $cache_file"
-  > $cache_file
+  { echo "$as_me:1022: 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.
+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
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+  eval ac_new_val="\$ac_env_${ac_var}_value"
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { echo "$as_me:1038: 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)
+      { echo "$as_me:1042: 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
+        { echo "$as_me:1048: 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:1050:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+        { echo "$as_me:1052:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+        ac_cache_corrupted=:
+      fi;;
+  esac
+  # Pass precious variables to config.status.  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
+if $ac_cache_corrupted; then
+  { echo "$as_me:1071: 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:1073: 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
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
+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
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)      ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+echo "#! $SHELL" >conftest.sh
+echo  "exit 0"   >>conftest.sh
+chmod +x conftest.sh
+if { (echo "$as_me:1093: PATH=\".;.\"; conftest.sh") >&5
+  (PATH=".;."; conftest.sh) 2>&5
+  ac_status=$?
+  echo "$as_me:1096: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  ac_path_separator=';'
 else
-  ac_n= ac_c='\c' ac_t=
+  ac_path_separator=:
 fi
-
+PATH_SEPARATOR="$ac_path_separator"
+rm -f conftest.sh
 
 ac_aux_dir=
 for ac_dir in $global_top_srcdir ../..; do
@@ -710,18 +1112,20 @@ for ac_dir in $global_top_srcdir ../..; do
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
+  elif test -f $ac_dir/shtool; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $global_top_srcdir ../.." 1>&2; exit 1; }
+  { { echo "$as_me:1122: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -730,31 +1134,39 @@ am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:739: checking for a BSD compatible install" >&5
+echo "$as_me:1142: 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 eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${ac_cv_path_install+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+    ac_save_IFS=$IFS; IFS=$ac_path_separator
   for ac_dir in $PATH; do
+    IFS=$ac_save_IFS
     # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    case $ac_dir/ in
+    / | ./ | .// | /cC/* \
+    | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
+    | /usr/ucb/* ) ;;
     *)
       # OSF1 and SCO ODT 3.0 have their own names for install.
       # Don't use installbsd from OSF since it installs stuff as root
       # by default.
       for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
+        if $as_executable_p "$ac_dir/$ac_prog"; then
 	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+            grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
 	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
 	  else
 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
 	    break 2
@@ -764,31 +1176,31 @@ else
       ;;
     esac
   done
-  IFS="$ac_save_IFS"
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
+    INSTALL=$ac_cv_path_install
   else
     # As a last resort, use the slow shell script.  We don't cache a
     # path for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
+    INSTALL=$ac_install_sh
   fi
 fi
-echo "$ac_t""$INSTALL" 1>&6
+echo "$as_me:1191: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:792: checking whether build environment is sane" >&5
+echo "$as_me:1202: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -811,8 +1223,11 @@ 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".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
+      { { echo "$as_me:1226: 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;}
+   { (exit 1); exit 1; }; }
    fi
 
    test "$2" = conftest.file
@@ -821,28 +1236,29 @@ then
    # Ok.
    :
 else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
+   { { echo "$as_me:1239: 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
+echo "$as_me:1245: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 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 &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+  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
 
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
 
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
@@ -851,82 +1267,86 @@ if eval "$MISSING --run true"; then
 else
   am_missing_run=
   am_backtick='`'
-  echo "configure: warning: ${am_backtick}missing' script is too old or missing" 1>&2
+  { echo "$as_me:1270: WARNING: ${am_backtick}missing' script is too old or missing" >&5
+echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;}
 fi
 
 for ac_prog in mawk gawk nawk awk
 do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:863: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1278: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AWK+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AWK="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_AWK="$ac_prog"
+echo "$as_me:1293: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-AWK="$ac_cv_prog_AWK"
+AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$ac_t""$AWK" 1>&6
+  echo "$as_me:1301: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1304: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-test -n "$AWK" && break
+  test -n "$AWK" && break
 done
 
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:893: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1311: 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 "(cached) $ECHO_C" >&6
 else
-  cat > conftestmake <<\EOF
+  cat >conftest.make <<\EOF
 all:
 	@echo 'ac_maketemp="${MAKE}"'
 EOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
 if test -n "$ac_maketemp"; then
   eval ac_cv_prog_make_${ac_make}_set=yes
 else
   eval ac_cv_prog_make_${ac_make}_set=no
 fi
-rm -f conftestmake
+rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+  echo "$as_me:1331: result: yes" >&5
+echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1335: result: no" >&5
+echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 # Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
 if test "${enable_dependency_tracking+set}" = set; then
   enableval="$enable_dependency_tracking"
-  :
-fi
 
+fi;
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
 fi
 
-
 if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
@@ -935,9 +1355,6 @@ else
   AMDEP_FALSE=
 fi
 
-
-
-
 rm -f .deps 2>/dev/null
 mkdir .deps 2>/dev/null
 if test -d .deps; then
@@ -948,25 +1365,26 @@ else
 fi
 rmdir .deps 2>/dev/null
 
-
 # test to see if srcdir already configured
 if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run \"make distclean\" there first" 1>&2; exit 1; }
+  { { echo "$as_me:1371: 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
 
 # Define the identity of the package.
-PACKAGE=gexttext_rpathy
+PACKAGE=gettext_rpathy
 VERSION=0
-cat >> confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
 
-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define VERSION "$VERSION"
 EOF
 
-
 # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
 # the ones we care about.
 
@@ -978,24 +1396,18 @@ EOF
 # requests that it be used.  This is a bit dumb.
 : ${OBJEXT=o}
 
-
 # Some tools Automake needs.
 
 ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"}
 
-
 AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
 
-
 AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"}
 
-
 AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
-
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-
 AMTAR=${AMTAR-"${am_missing_run}tar"}
 
 install_sh=${install_sh-"$am_aux_dir/install-sh"}
@@ -1005,214 +1417,578 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1012: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+echo "$as_me:1428: 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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1443: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1451: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:1454: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo "$as_me:1463: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="gcc"
+echo "$as_me:1478: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1486: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1489: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
 else
-  echo "$ac_t""no" 1>&6
+  CC="$ac_cv_prog_CC"
 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
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1042: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  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:1502: 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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1517: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1525: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1528: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1093: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
+fi
+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
+echo "$as_me:1537: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="cc"
+echo "$as_me:1552: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1560: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1563: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:1576: 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
+else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_prog_rejected=no
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+  ac_prog_rejected=yes
+  continue
+fi
+ac_cv_prog_CC="cc"
+echo "$as_me:1596: found $ac_dir/$ac_word" >&5
+break
+done
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    set dummy "$ac_dir/$ac_word" ${1+"$@"}
+    shift
+    ac_cv_prog_CC="$@"
+  fi
+fi
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1618: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1621: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+
 fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl
+  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:1632: 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
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1647: found $ac_dir/$ac_word" >&5
+break
+done
 
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1125: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:1655: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:1658: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
 
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl
+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:1671: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1686: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1694: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1697: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
 
-cat > conftest.$ac_ext << EOF
+  test -n "$ac_ct_CC" && break
+done
 
-#line 1136 "configure"
+  CC=$ac_ct_CC
+fi
+
+fi
+
+test -z "$CC" && { { echo "$as_me:1709: error: no acceptable cc found in \$PATH" >&5
+echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+
+# Provide some information about the compiler.
+echo "$as_me:1714:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:1717: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1720: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1722: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1725: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1727: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1730: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 1734 "configure"
 #include "confdefs.h"
 
-main(){return(0);}
-EOF
-if { (eval echo configure:1141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_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.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+echo "$as_me:1750: 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[^ ]*//'`
+if { (eval echo "$as_me:1753: \"$ac_link_default\"") >&5
+  (eval $ac_link_default) 2>&5
+  ac_status=$?
+  echo "$as_me:1756: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # 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" : '[^.]*\(\..*\)'`
+          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
+          export ac_cv_exeext
+          break;;
+    * ) break;;
+  esac
+done
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:1779: 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:1785: 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 "$as_me:1790: 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'
+  { (eval echo "$as_me:1796: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1799: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no
   else
-    ac_cv_prog_cc_cross=yes
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { echo "$as_me:1806: 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;}
+   { (exit 1); exit 1; }; }
+    fi
   fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
 fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1167: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1172: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
+echo "$as_me:1814: 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 "$as_me:1821: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+echo "$as_me:1823: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6
+
+echo "$as_me:1826: checking for executable suffix" >&5
+echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+if { (eval echo "$as_me:1828: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:1831: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
+  case $ac_file in
+    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+          export ac_cv_exeext
+          break;;
+    * ) break;;
+  esac
+done
 else
-  ac_cv_prog_gcc=no
-fi
+  { { echo "$as_me:1847: 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
 
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+rm -f conftest$ac_cv_exeext
+echo "$as_me:1853: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6
 
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+echo "$as_me:1859: 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
-  GCC=
-fi
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1865 "configure"
+#include "confdefs.h"
 
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1200: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (eval echo "$as_me:1877: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1880: \$? = $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
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
 else
-  ac_cv_prog_cc_g=no
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:1892: 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*
 
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
+echo "$as_me:1899: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+echo "$as_me:1903: 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
+#line 1909 "configure"
+#include "confdefs.h"
 
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1924: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1927: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1930: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1933: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_compiler_gnu=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_compiler_gnu=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+echo "$as_me:1945: 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 "$as_me:1951: 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
+#line 1957 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1969: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1972: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1975: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1978: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_prog_cc_g=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:1988: 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"
+  CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
     CFLAGS="-g -O2"
@@ -1226,7 +2002,118 @@ else
     CFLAGS=
   fi
 fi
+# Some people use a C++ compiler to compile C.  Since we use `exit',
+# in C++ we need to declare it.  In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+  choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2015: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:2018: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:2021: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2024: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+#line 2036 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2049: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:2052: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:2055: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2058: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+continue
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line 2068 "configure"
+#include "confdefs.h"
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2080: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:2083: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:2086: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2089: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+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
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_config_commands="$ac_config_commands default-1"
 
 am_make=${MAKE-make}
 cat > confinc << 'END'
@@ -1234,8 +2121,8 @@ doit:
 	@echo done
 END
 # If we don't find an include directive, just comment out the code.
-echo $ac_n "checking for style of include used by $am_make""... $ac_c" 1>&6
-echo "configure:1239: checking for style of include used by $am_make" >&5
+echo "$as_me:2124: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
 am__include='#'
 am__quote=
 _am_result=none
@@ -1261,17 +2148,16 @@ if test "$am__include" = "#"; then
    fi
 fi
 
-
-echo "$ac_t""$_am_result" 1>&6
+echo "$as_me:2151: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6
 rm -f confinc confmf
 
-
 depcc="$CC"   am_compiler_list=
 
-echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6
-echo "configure:1273: checking dependency style of $depcc" >&5
-if eval "test \"`echo '$''{'am_cv_CC_dependencies_compiler_type'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2157: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -1330,164 +2216,10 @@ else
 fi
 
 fi
-
-echo "$ac_t""$am_cv_CC_dependencies_compiler_type" 1>&6
+echo "$as_me:2219: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
 
-
-# Find the correct PATH separator.  Usually this is `:', but
-# DJGPP uses `;' like DOS.
-if test "X${PATH_SEPARATOR+set}" != Xset; then
-  UNAME=${UNAME-`uname 2>/dev/null`}
-  case X$UNAME in
-    *-DOS) lt_cv_sys_path_separator=';' ;;
-    *)     lt_cv_sys_path_separator=':' ;;
-  esac
-  PATH_SEPARATOR=$lt_cv_sys_path_separator
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:1351: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1356 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:1367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:1384: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1389 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:1396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1413: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 1428 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 1445 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 1462 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1468: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
 # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
@@ -1509,8 +2241,7 @@ no) enable_shared=no ;;
 esac
 else
   enable_shared=yes
-fi
-
+fi;
 # Check whether --enable-static or --disable-static was given.
 if test "${enable_static+set}" = set; then
   enableval="$enable_static"
@@ -1532,8 +2263,7 @@ no) enable_static=no ;;
 esac
 else
   enable_static=yes
-fi
-
+fi;
 # Check whether --enable-fast-install or --disable-fast-install was given.
 if test "${enable_fast_install+set}" = set; then
   enableval="$enable_fast_install"
@@ -1555,52 +2285,69 @@ no) enable_fast_install=no ;;
 esac
 else
   enable_fast_install=yes
-fi
-
-
+fi;
 # Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1568: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1589: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:2291: error: cannot run $ac_config_sub" >&5
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+echo "$as_me:2295: 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
+else
+  ac_cv_build_alias=$build_alias
+test -z "$ac_cv_build_alias" &&
+  ac_cv_build_alias=`$ac_config_guess`
+test -z "$ac_cv_build_alias" &&
+  { { echo "$as_me:2304: 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:2308: 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:2313: 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 "$as_me:2320: 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
+else
+  ac_cv_host_alias=$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:2329: 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:2334: 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/'`
 
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
+# Find the correct PATH separator.  Usually this is `:', but
+# DJGPP uses `;' like DOS.
+if test "X${PATH_SEPARATOR+set}" != Xset; then
+  UNAME=${UNAME-`uname 2>/dev/null`}
+  case X$UNAME in
+    *-DOS) lt_cv_sys_path_separator=';' ;;
+    *)     lt_cv_sys_path_separator=':' ;;
+  esac
+  PATH_SEPARATOR=$lt_cv_sys_path_separator
+fi
 
 # Check whether --with-gnu-ld or --without-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
@@ -1608,13 +2355,12 @@ if test "${with_gnu_ld+set}" = set; then
   test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
-fi
-
+fi;
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1618: checking for ld used by GCC" >&5
+  echo "$as_me:2362: checking for ld used by GCC" >&5
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1643,14 +2389,14 @@ echo "configure:1618: checking for ld used by GCC" >&5
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1648: checking for GNU ld" >&5
+  echo "$as_me:2392: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
 else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1651: checking for non-GNU ld" >&5
+  echo "$as_me:2395: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
 fi
-if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${lt_cv_path_LD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -1676,15 +2422,19 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
+  echo "$as_me:2425: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:2428: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1686: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+test -z "$LD" && { { echo "$as_me:2431: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+echo "$as_me:2434: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+if test "${lt_cv_prog_gnu_ld+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
@@ -1693,27 +2443,26 @@ else
   lt_cv_prog_gnu_ld=no
 fi
 fi
-
-echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
+echo "$as_me:2446: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
-
-echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1703: checking for $LD option to reload object files" >&5
-if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2450: checking for $LD option to reload object files" >&5
+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
+if test "${lt_cv_ld_reload_flag+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-
-echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
+echo "$as_me:2457: result: $lt_cv_ld_reload_flag" >&5
+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
 reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
-echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1715: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2462: checking for BSD-compatible nm" >&5
+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
+if test "${lt_cv_path_NM+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
@@ -1746,33 +2495,24 @@ fi
 fi
 
 NM="$lt_cv_path_NM"
-echo "$ac_t""$NM" 1>&6
+echo "$as_me:2498: result: $NM" >&5
+echo "${ECHO_T}$NM" >&6
 
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1753: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2501: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  echo "$as_me:2505: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:2508: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:1774: checking how to recognise dependant libraries" >&5
-if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2512: checking how to recognise dependant libraries" >&5
+echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6
+if test "${lt_cv_deplibs_check_method+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -1947,84 +2687,18 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
 esac
 
 fi
-
-echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
+echo "$as_me:2690: result: $lt_cv_deplibs_check_method" >&5
+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:1957: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:1963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1983: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-
-
-
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
-echo "configure:2024: checking command to parse $NM output" >&5
-if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2696: checking command to parse $NM output" >&5
+echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
+
 # These are sane defaults that work on at least a few old systems.
 # [They come from Ultrix.  What could be older than Ultrix?!! ;)]
 
@@ -2100,10 +2774,18 @@ void nm_test_func(){}
 int main(){nm_test_var='a';nm_test_func();return(0);}
 EOF
 
-  if { (eval echo configure:2104: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo "$as_me:2777: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:2780: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { (eval echo configure:2107: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
+    if { (eval echo "$as_me:2784: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+  ac_status=$?
+  echo "$as_me:2787: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -2154,7 +2836,11 @@ EOF
 	  save_CFLAGS="$CFLAGS"
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$no_builtin_flag"
-	  if { (eval echo configure:2158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+	  if { (eval echo "$as_me:2839: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:2842: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest; then
 	    pipe_works=yes
 	  fi
 	  LIBS="$save_LIBS"
@@ -2174,83 +2860,289 @@ EOF
   fi
   rm -f conftest* conftst*
 
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  global_symbol_to_cdecl=
+  global_symbol_to_c_name_address=
+else
+  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
+  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
+fi
+if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
+then
+  echo "$as_me:2883: result: failed" >&5
+echo "${ECHO_T}failed" >&6
+else
+  echo "$as_me:2886: result: ok" >&5
+echo "${ECHO_T}ok" >&6
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+echo "$as_me:2895: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # 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 2916 "configure"
+#include "confdefs.h"
+#include <assert.h>
+                     Syntax error
+_ACEOF
+if { (eval echo "$as_me:2921: \"$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
+  echo "$as_me:2927: \$? = $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
+  :
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  # Broken: fails on valid input.
+continue
+fi
+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
+#line 2950 "configure"
+#include "confdefs.h"
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:2954: \"$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
+  echo "$as_me:2960: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
   else
-    lt_cv_sys_global_symbol_pipe=
+    ac_cpp_err=
   fi
-done
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
 
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
 fi
 
-global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  global_symbol_to_cdecl=
-  global_symbol_to_c_name_address=
-else
-  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
-  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
+    done
+    ac_cv_prog_CPP=$CPP
+
 fi
-if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
-then
-  echo "$ac_t""failed" 1>&6
+  CPP=$ac_cv_prog_CPP
 else
-  echo "$ac_t""ok" 1>&6
+  ac_cv_prog_CPP=$CPP
 fi
-
-for ac_hdr in dlfcn.h
+echo "$as_me:2997: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
 do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2207: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2212 "configure"
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # 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 3007 "configure"
 #include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+#include <assert.h>
+                     Syntax error
+_ACEOF
+if { (eval echo "$as_me:3012: \"$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
+  echo "$as_me:3018: \$? = $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
+  :
 else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+  # Broken: fails on valid input.
+continue
 fi
-rm -f conftest*
+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
+#line 3041 "configure"
+#include "confdefs.h"
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:3045: \"$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
+  echo "$as_me:3051: \$? = $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 eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
-done
+rm -f conftest.err conftest.$ac_ext
 
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { echo "$as_me:3079: error: C preprocessor \"$CPP\" fails sanity check" >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+for ac_header in dlfcn.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:3093: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 3099 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:3103: \"$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
+  echo "$as_me:3109: \$? = $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 "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_ext
+fi
+echo "$as_me:3128: 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
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+EOF
 
+fi
+done
 
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2252: checking for ${ac_tool_prefix}file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    echo "$as_me:3142: checking for ${ac_tool_prefix}file" >&5
+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $MAGIC_CMD in
   /*)
@@ -2302,17 +3194,19 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
+  echo "$as_me:3197: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:3200: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2314: checking for file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    echo "$as_me:3206: checking for file" >&5
+echo $ECHO_N "checking for file... $ECHO_C" >&6
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $MAGIC_CMD in
   /*)
@@ -2364,9 +3258,11 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
+  echo "$as_me:3261: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:3264: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
   else
@@ -2378,140 +3274,153 @@ fi
   ;;
 esac
 
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2385: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3280: 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
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:3295: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-RANLIB="$ac_cv_prog_RANLIB"
+RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
+  echo "$as_me:3303: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:3306: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
+fi
 if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; 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
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2417: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+echo "$as_me:3315: 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
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_RANLIB="ranlib"
+echo "$as_me:3330: found $ac_dir/$ac_word" >&5
+break
+done
+
+  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
 fi
 fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  echo "$as_me:3339: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:3342: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
+  RANLIB=$ac_ct_RANLIB
 else
-  RANLIB=":"
-fi
+  RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2452: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3354: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+echo "$as_me:3369: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-STRIP="$ac_cv_prog_STRIP"
+STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
+  echo "$as_me:3377: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:3380: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
+fi
 if test -z "$ac_cv_prog_STRIP"; then
-if test -n "$ac_tool_prefix"; then
+  ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2484: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
+echo "$as_me:3389: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_STRIP="strip"
+echo "$as_me:3404: found $ac_dir/$ac_word" >&5
+break
+done
+
+  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
 fi
 fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  echo "$as_me:3413: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:3416: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
+  STRIP=$ac_ct_STRIP
 else
-  STRIP=":"
+  STRIP="$ac_cv_prog_STRIP"
 fi
-fi
-
 
 enable_dlopen=no
 enable_win32_dll=no
@@ -2519,9 +3428,8 @@ enable_win32_dll=no
 # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then
   enableval="$enable_libtool_lock"
-  :
-fi
 
+fi;
 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
 # Some flags need to be propagated to the compiler or linker for good
@@ -2529,8 +3437,12 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2533 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 3440 "configure"' > conftest.$ac_ext
+  if { (eval echo "$as_me:3441: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:3444: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -2550,54 +3462,64 @@ case $host in
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2555: checking whether the C compiler needs -belf" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:3465: checking whether the C compiler needs -belf" >&5
+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
+if test "${lt_cv_cc_needs_belf+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
+
      ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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
 
-     cat > conftest.$ac_ext <<EOF
-#line 2568 "configure"
+     cat >conftest.$ac_ext <<_ACEOF
+#line 3478 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main ()
+{
 
-; return 0; }
-EOF
-if { (eval echo configure:2575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3490: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:3493: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:3496: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3499: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   lt_cv_cc_needs_belf=yes
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=no
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+lt_cv_cc_needs_belf=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-
-echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
+echo "$as_me:3515: result: $lt_cv_cc_needs_belf" >&5
+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
 
-
 esac
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
@@ -2690,8 +3612,8 @@ fi
 set dummy $CC
 compiler="$2"
 
-echo $ac_n "checking for objdir""... $ac_c" 1>&6
-echo "configure:2695: checking for objdir" >&5
+echo "$as_me:3615: checking for objdir" >&5
+echo $ECHO_N "checking for objdir... $ECHO_C" >&6
 rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
 if test -d .libs; then
@@ -2701,8 +3623,8 @@ else
   objdir=_libs
 fi
 rmdir .libs 2>/dev/null
-echo "$ac_t""$objdir" 1>&6
-
+echo "$as_me:3626: result: $objdir" >&5
+echo "${ECHO_T}$objdir" >&6
 
 # Check whether --with-pic or --without-pic was given.
 if test "${with_pic+set}" = set; then
@@ -2710,17 +3632,16 @@ if test "${with_pic+set}" = set; then
   pic_mode="$withval"
 else
   pic_mode=default
-fi
-
+fi;
 test -z "$pic_mode" && pic_mode=default
 
 # We assume here that the value for lt_cv_prog_cc_pic will not be cached
 # in isolation, and that seeing it set (from the cache) indicates that
 # the associated values are set (in the cache) correctly too.
-echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
-echo "configure:2722: checking for $compiler option to produce PIC" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3641: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+if test "${lt_cv_prog_cc_pic+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
    lt_cv_prog_cc_pic=
   lt_cv_prog_cc_shlib=
@@ -2877,28 +3798,44 @@ else
 fi
 
 if test -z "$lt_cv_prog_cc_pic"; then
-  echo "$ac_t""none" 1>&6
+  echo "$as_me:3801: result: none" >&5
+echo "${ECHO_T}none" >&6
 else
-  echo "$ac_t""$lt_cv_prog_cc_pic" 1>&6
+  echo "$as_me:3804: result: $lt_cv_prog_cc_pic" >&5
+echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6
 
   # Check to make sure the pic_flag actually works.
-  echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
-echo "configure:2887: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
-  if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:3808: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6
+  if test "${lt_cv_prog_cc_pic_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
       save_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
-    cat > conftest.$ac_ext <<EOF
-#line 2894 "configure"
+    cat >conftest.$ac_ext <<_ACEOF
+#line 3816 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main ()
+{
 
-; return 0; }
-EOF
-if { (eval echo configure:2901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3828: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:3831: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:3834: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3837: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
         case $host_os in
       hpux9* | hpux10* | hpux11*)
 	# On HP-UX, both CC and GCC only warn that PIC is supported... then
@@ -2914,19 +3851,17 @@ if { (eval echo configure:2901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5;
 	lt_cv_prog_cc_pic_works=yes
 	;;
       esac
-    
+
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-        lt_cv_prog_cc_pic_works=no
-    
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+      lt_cv_prog_cc_pic_works=no
+
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
     CFLAGS="$save_CFLAGS"
-  
-fi
 
+fi
 
   if test "X$lt_cv_prog_cc_pic_works" = Xno; then
     lt_cv_prog_cc_pic=
@@ -2935,51 +3870,68 @@ fi
     lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
   fi
 
-  echo "$ac_t""$lt_cv_prog_cc_pic_works" 1>&6
+  echo "$as_me:3873: result: $lt_cv_prog_cc_pic_works" >&5
+echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6
 fi
 
 # Check for any special shared library compilation flags.
 if test -n "$lt_cv_prog_cc_shlib"; then
-  echo "configure: warning: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" 1>&2
+  { echo "$as_me:3879: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5
+echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;}
   if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]" >/dev/null; then :
   else
-   echo "configure: warning: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" 1>&2
+   { echo "$as_me:3883: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
+echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
     lt_cv_prog_cc_can_build_shared=no
   fi
 fi
 
-echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
-echo "configure:2953: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3889: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6
+if test "${lt_cv_prog_cc_static_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     lt_cv_prog_cc_static_works=no
   save_LDFLAGS="$LDFLAGS"
   LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
-  cat > conftest.$ac_ext <<EOF
-#line 2961 "configure"
+  cat >conftest.$ac_ext <<_ACEOF
+#line 3898 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main ()
+{
 
-; return 0; }
-EOF
-if { (eval echo configure:2968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3910: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:3913: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:3916: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3919: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   lt_cv_prog_cc_static_works=yes
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
   LDFLAGS="$save_LDFLAGS"
 
 fi
 
-
 # Belt *and* braces to stop my trousers falling down:
 test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
-echo "$ac_t""$lt_cv_prog_cc_static_works" 1>&6
+echo "$as_me:3933: result: $lt_cv_prog_cc_static_works" >&5
+echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6
 
 pic_flag="$lt_cv_prog_cc_pic"
 special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
@@ -2988,14 +3940,13 @@ link_static_flag="$lt_cv_prog_cc_static"
 no_builtin_flag="$lt_cv_prog_cc_no_builtin"
 can_build_shared="$lt_cv_prog_cc_can_build_shared"
 
-
 # Check to see if options -o and -c are simultaneously supported by compiler
-echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
-echo "configure:2995: checking if $compiler supports -c -o file.$ac_objext" >&5
-if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3944: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+if test "${lt_cv_compiler_c_o+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
+
 $rm -r conftest 2>/dev/null
 mkdir conftest
 cd conftest
@@ -3010,7 +3961,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:3014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:3964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -3034,31 +3985,46 @@ $rm -r conftest 2>/dev/null
 fi
 
 compiler_c_o=$lt_cv_compiler_c_o
-echo "$ac_t""$compiler_c_o" 1>&6
+echo "$as_me:3988: result: $compiler_c_o" >&5
+echo "${ECHO_T}$compiler_c_o" >&6
 
 if test x"$compiler_c_o" = x"yes"; then
   # Check to see if we can write to a .lo
-  echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
-echo "configure:3043: checking if $compiler supports -c -o file.lo" >&5
-  if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:3993: checking if $compiler supports -c -o file.lo" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6
+  if test "${lt_cv_compiler_o_lo+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
+
   lt_cv_compiler_o_lo=no
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -c -o conftest.lo"
   save_objext="$ac_objext"
   ac_objext=lo
-  cat > conftest.$ac_ext <<EOF
-#line 3054 "configure"
+  cat >conftest.$ac_ext <<_ACEOF
+#line 4005 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main ()
+{
 int some_variable = 0;
-; return 0; }
-EOF
-if { (eval echo configure:3061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4017: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4020: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4023: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4026: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
       # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
     if test -s conftest.err; then
@@ -3066,19 +4032,20 @@ if { (eval echo configure:3061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5;
     else
       lt_cv_compiler_o_lo=yes
     fi
-  
+
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
   ac_objext="$save_objext"
   CFLAGS="$save_CFLAGS"
-  
+
 fi
 
   compiler_o_lo=$lt_cv_compiler_o_lo
-  echo "$ac_t""$compiler_o_lo" 1>&6
+  echo "$as_me:4047: result: $compiler_o_lo" >&5
+echo "${ECHO_T}$compiler_o_lo" >&6
 else
   compiler_o_lo=no
 fi
@@ -3087,17 +4054,19 @@ fi
 hard_links="nottested"
 if test "$compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
-echo "configure:3092: checking if we can lock with hard links" >&5
+  echo "$as_me:4057: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$ac_t""$hard_links" 1>&6
+  echo "$as_me:4065: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6
   if test "$hard_links" = no; then
-    echo "configure: warning: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" 1>&2
+    { echo "$as_me:4068: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -3106,22 +4075,36 @@ fi
 
 if test "$GCC" = yes; then
   # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
-  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
-echo "configure:3111: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  echo "$as_me:4078: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
   echo "int some_variable = 0;" > conftest.$ac_ext
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
   compiler_rtti_exceptions=no
-  cat > conftest.$ac_ext <<EOF
-#line 3117 "configure"
+  cat >conftest.$ac_ext <<_ACEOF
+#line 4085 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main ()
+{
 int some_variable = 0;
-; return 0; }
-EOF
-if { (eval echo configure:3124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4097: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4100: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4103: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4106: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
       # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
     if test -s conftest.err; then
@@ -3129,14 +4112,15 @@ if { (eval echo configure:3124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5;
     else
       compiler_rtti_exceptions=yes
     fi
-  
+
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
   CFLAGS="$save_CFLAGS"
-  echo "$ac_t""$compiler_rtti_exceptions" 1>&6
+  echo "$as_me:4122: result: $compiler_rtti_exceptions" >&5
+echo "${ECHO_T}$compiler_rtti_exceptions" >&6
 
   if test "$compiler_rtti_exceptions" = "yes"; then
     no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
@@ -3146,8 +4130,8 @@ rm -f conftest*
 fi
 
 # See if the linker supports building shared libraries.
-echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
-echo "configure:3151: checking whether the linker ($LD) supports shared libraries" >&5
+echo "$as_me:4133: checking whether the linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6
 
 allow_undefined_flag=
 no_undefined_flag=
@@ -3826,12 +4810,13 @@ EOF
     ;;
   esac
 fi
-echo "$ac_t""$ld_shlibs" 1>&6
+echo "$as_me:4813: result: $ld_shlibs" >&5
+echo "${ECHO_T}$ld_shlibs" >&6
 test "$ld_shlibs" = no && can_build_shared=no
 
 # Check hardcoding attributes.
-echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
-echo "configure:3835: checking how to hardcode library paths into programs" >&5
+echo "$as_me:4818: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
    test -n "$runpath_var"; then
@@ -3854,26 +4839,29 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-echo "$ac_t""$hardcode_action" 1>&6
+echo "$as_me:4842: result: $hardcode_action" >&5
+echo "${ECHO_T}$hardcode_action" >&6
 
 striplib=
 old_striplib=
-echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
-echo "configure:3863: checking whether stripping libraries is possible" >&5
+echo "$as_me:4847: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$ac_t""yes" 1>&6
+  echo "$as_me:4852: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:4855: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
 
 # PORTME Fill in your ld.so characteristics
-echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
-echo "configure:3877: checking dynamic linker characteristics" >&5
+echo "$as_me:4863: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -4017,6 +5005,18 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
+freebsd*-gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
+  ;;
+
 freebsd*)
   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
   version_type=freebsd-$objformat
@@ -4265,16 +5265,18 @@ sysv4*MP*)
   dynamic_linker=no
   ;;
 esac
-echo "$ac_t""$dynamic_linker" 1>&6
+echo "$as_me:5268: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6
 test "$dynamic_linker" = no && can_build_shared=no
 
 # Report the final consequences.
-echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
-echo "configure:4274: checking if libtool supports shared libraries" >&5
-echo "$ac_t""$can_build_shared" 1>&6
+echo "$as_me:5273: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+echo "$as_me:5275: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6
 
-echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
-echo "configure:4278: checking whether to build shared libraries" >&5
+echo "$as_me:5278: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -4294,13 +5296,15 @@ aix4*)
   fi
   ;;
 esac
-echo "$ac_t""$enable_shared" 1>&6
+echo "$as_me:5299: result: $enable_shared" >&5
+echo "${ECHO_T}$enable_shared" >&6
 
-echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
-echo "configure:4301: checking whether to build static libraries" >&5
+echo "$as_me:5302: checking whether to build static libraries" >&5
+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-echo "$ac_t""$enable_static" 1>&6
+echo "$as_me:5306: result: $enable_static" >&5
+echo "${ECHO_T}$enable_static" >&6
 
 if test "$hardcode_action" = relink; then
   # Fast installation is not supported
@@ -4337,265 +5341,345 @@ else
    ;;
 
   *)
-    echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "configure:4342: checking for shl_load" >&5
-if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    echo "$as_me:5344: checking for shl_load" >&5
+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+if test "${ac_cv_func_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 4347 "configure"
+  cat >conftest.$ac_ext <<_ACEOF
+#line 5350 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load(); below.  */
+    which can conflict with char shl_load (); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char shl_load();
-
-int main() {
+   builtin and then its argument prototype would still apply.  */
+char shl_load ();
+char (*f) ();
 
+int
+main ()
+{
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_shl_load) || defined (__stub___shl_load)
 choke me
 #else
-shl_load();
+f = shl_load;
 #endif
 
-; return 0; }
-EOF
-if { (eval echo configure:4370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_shl_load=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_shl_load=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5381: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5384: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5387: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5390: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_shl_load=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_shl_load=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:5400: result: $ac_cv_func_shl_load" >&5
+echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+if test $ac_cv_func_shl_load = yes; then
   lt_cv_dlopen="shl_load"
 else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:4388: checking for shl_load in -ldld" >&5
-ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:5405: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4396 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 5413 "configure"
 #include "confdefs.h"
+
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char shl_load();
-
-int main() {
-shl_load()
-; return 0; }
-EOF
-if { (eval echo configure:4407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char shl_load ();
+int
+main ()
+{
+shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5432: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5435: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5438: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5441: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dld_shl_load=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_dld_shl_load=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:5452: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+if test $ac_cv_lib_dld_shl_load = yes; then
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
 else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:4426: checking for dlopen" >&5
-if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:5457: checking for dlopen" >&5
+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+if test "${ac_cv_func_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 4431 "configure"
+  cat >conftest.$ac_ext <<_ACEOF
+#line 5463 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen(); below.  */
+    which can conflict with char dlopen (); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dlopen();
-
-int main() {
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+char (*f) ();
 
+int
+main ()
+{
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_dlopen) || defined (__stub___dlopen)
 choke me
 #else
-dlopen();
+f = dlopen;
 #endif
 
-; return 0; }
-EOF
-if { (eval echo configure:4454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_dlopen=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_dlopen=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5494: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5497: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5500: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5503: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:5513: result: $ac_cv_func_dlopen" >&5
+echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+if test $ac_cv_func_dlopen = yes; then
   lt_cv_dlopen="dlopen"
 else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4472: checking for dlopen in -ldl" >&5
-ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:5518: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4480 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 5526 "configure"
 #include "confdefs.h"
+
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dlopen();
-
-int main() {
-dlopen()
-; return 0; }
-EOF
-if { (eval echo configure:4491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5545: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5548: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5551: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5554: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:5565: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
-echo "configure:4510: checking for dlopen in -lsvld" >&5
-ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lsvld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4518 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dlopen();
-
-int main() {
-dlopen()
-; return 0; }
-EOF
-if { (eval echo configure:4529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  echo "$as_me:5570: checking for dlopen in -lsvld" >&5
+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line 5578 "configure"
+#include "confdefs.h"
 
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5597: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5600: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5603: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5606: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_svld_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_svld_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:5617: result: $ac_cv_lib_svld_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+if test $ac_cv_lib_svld_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-echo "configure:4548: checking for dld_link in -ldld" >&5
-ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:5622: checking for dld_link in -ldld" >&5
+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4556 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 5630 "configure"
 #include "confdefs.h"
+
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dld_link();
-
-int main() {
-dld_link()
-; return 0; }
-EOF
-if { (eval echo configure:4567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char dld_link ();
+int
+main ()
+{
+dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5649: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5652: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5655: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5658: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dld_dld_link=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_dld_dld_link=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:5669: result: $ac_cv_lib_dld_dld_link" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+if test $ac_cv_lib_dld_dld_link = yes; then
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-else
-  echo "$ac_t""no" 1>&6
 fi
 
-	      
 fi
 
-	    
 fi
 
-	  
 fi
 
-	
 fi
 
-      
 fi
 
     ;;
@@ -4618,10 +5702,10 @@ fi
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-echo "configure:4623: checking whether a program can dlopen itself" >&5
-if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    echo "$as_me:5705: checking whether a program can dlopen itself" >&5
+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+if test "${lt_cv_dlopen_self+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self=cross
@@ -4629,7 +5713,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 4633 "configure"
+#line 5716 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -4690,7 +5774,11 @@ int main ()
     exit (status);
 }
 EOF
-  if { (eval echo configure:4694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  if { (eval echo "$as_me:5777: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5780: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -4705,17 +5793,16 @@ EOF
 fi
 rm -fr conftest*
 
-    
 fi
-
-echo "$ac_t""$lt_cv_dlopen_self" 1>&6
+echo "$as_me:5797: result: $lt_cv_dlopen_self" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self" >&6
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       LDFLAGS="$LDFLAGS $link_static_flag"
-      echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-echo "configure:4717: checking whether a statically linked program can dlopen itself" >&5
-if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+      echo "$as_me:5802: checking whether a statically linked program can dlopen itself" >&5
+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+if test "${lt_cv_dlopen_self_static+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self_static=cross
@@ -4723,7 +5810,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 4727 "configure"
+#line 5813 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -4784,7 +5871,11 @@ int main ()
     exit (status);
 }
 EOF
-  if { (eval echo configure:4788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  if { (eval echo "$as_me:5874: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5877: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -4799,10 +5890,9 @@ EOF
 fi
 rm -fr conftest*
 
-      
 fi
-
-echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
+echo "$as_me:5894: result: $lt_cv_dlopen_self_static" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
     fi
 
     CPPFLAGS="$save_CPPFLAGS"
@@ -4822,7 +5912,6 @@ echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
   esac
 fi
 
-
 if test "$enable_shared" = yes && test "$GCC" = yes; then
   case $archive_cmds in
   *'~'*)
@@ -4832,15 +5921,19 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then
     # Test whether the compiler implicitly links with -lc since on some
     # systems, -lgcc has to come before -lc. If gcc already passes -lc
     # to ld, don't add -lc before -lgcc.
-    echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
-echo "configure:4837: checking whether -lc should be explicitly linked in" >&5
-    if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    echo "$as_me:5924: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+    if test "${lt_cv_archive_cmds_need_lc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   $rm conftest*
     echo 'static int dummy;' > conftest.$ac_ext
 
-    if { (eval echo configure:4844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    if { (eval echo "$as_me:5932: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:5935: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
       soname=conftest
       lib=conftest
       libobjs=conftest.$ac_objext
@@ -4853,7 +5946,11 @@ else
       libname=conftest
       save_allow_undefined_flag=$allow_undefined_flag
       allow_undefined_flag=
-      if { (eval echo configure:4857: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
+      if { (eval echo "$as_me:5949: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  echo "$as_me:5952: \$? = $ac_status" >&5
+  (exit $ac_status); }
       then
 	lt_cv_archive_cmds_need_lc=no
       else
@@ -4864,10 +5961,11 @@ else
       cat conftest.err 1>&5
     fi
     $rm conftest*
-    
+
 fi
 
-    echo "$ac_t""$lt_cv_archive_cmds_need_lc" 1>&6
+    echo "$as_me:5967: result: $lt_cv_archive_cmds_need_lc" >&5
+echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6
     ;;
   esac
 fi
@@ -5423,10 +6521,6 @@ EOF
   chmod +x "$ofile"
 fi
 
-
-
-
-
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
@@ -5435,6 +6529,20 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 # Prevent multiple expansion
 
+      if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
 
 # Check whether --with-gnu-ld or --without-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
@@ -5442,13 +6550,12 @@ if test "${with_gnu_ld+set}" = set; then
   test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
-fi
-
+fi;
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:5452: checking for ld used by GCC" >&5
+  echo "$as_me:6557: checking for ld used by GCC" >&5
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -5477,14 +6584,14 @@ echo "configure:5452: checking for ld used by GCC" >&5
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:5482: checking for GNU ld" >&5
+  echo "$as_me:6587: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
 else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:5485: checking for non-GNU ld" >&5
+  echo "$as_me:6590: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
 fi
-if eval "test \"`echo '$''{'acl_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${acl_cv_path_LD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
@@ -5510,15 +6617,19 @@ fi
 
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
+  echo "$as_me:6620: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:6623: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:5520: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'acl_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+test -z "$LD" && { { echo "$as_me:6626: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+echo "$as_me:6629: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+if test "${acl_cv_prog_gnu_ld+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
@@ -5527,43 +6638,25 @@ else
   acl_cv_prog_gnu_ld=no
 fi
 fi
-
-echo "$ac_t""$acl_cv_prog_gnu_ld" 1>&6
+echo "$as_me:6641: result: $acl_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
-
-
-      if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-
-
-                                                echo $ac_n "checking for shared library run path origin""... $ac_c" 1>&6
-echo "configure:5554: checking for shared library run path origin" >&5
-if eval "test \"`echo '$''{'acl_cv_rpath'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+                                                echo "$as_me:6645: checking for shared library run path origin" >&5
+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
+if test "${acl_cv_rpath+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
+
     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
     ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
     . ./conftest.sh
     rm -f ./conftest.sh
     acl_cv_rpath=done
-  
-fi
 
-echo "$ac_t""$acl_cv_rpath" 1>&6
+fi
+echo "$as_me:6658: result: $acl_cv_rpath" >&5
+echo "${ECHO_T}$acl_cv_rpath" >&6
   wl="$acl_cv_wl"
   libext="$acl_cv_libext"
   shlibext="$acl_cv_shlibext"
@@ -5573,50 +6666,50 @@ echo "$ac_t""$acl_cv_rpath" 1>&6
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
   sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
   sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
+    # Check whether --enable-rpath or --disable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+  enableval="$enable_rpath"
+  :
+else
+  enable_rpath=yes
+fi;
 
-
-  
-  
-  
-  
-  echo $ac_n "checking how to link with librpathx""... $ac_c" 1>&6
-echo "configure:5584: checking how to link with librpathx" >&5
-if eval "test \"`echo '$''{'ac_cv_librpathx_libs'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:6677: checking how to link with librpathx" >&5
+echo $ECHO_N "checking how to link with librpathx... $ECHO_C" >&6
+if test "${ac_cv_librpathx_libs+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
-    
-  
+
     use_additional=yes
-  
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
-  
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
-  # Check whether --with-librpathx-prefix or --without-librpathx-prefix was given.
+# Check whether --with-librpathx-prefix or --without-librpathx-prefix was given.
 if test "${with_librpathx_prefix+set}" = set; then
   withval="$with_librpathx_prefix"
-  
+
     if test "X$withval" = "Xno"; then
       use_additional=no
     else
       if test "X$withval" = "X"; then
-        
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
           eval additional_includedir=\"$includedir\"
           eval additional_libdir=\"$libdir\"
-        
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
@@ -5626,8 +6719,7 @@ if test "${with_librpathx_prefix+set}" = set; then
       fi
     fi
 
-fi
-
+fi;
       LIBRPATHX=
   LTLIBRPATHX=
   INCRPATHX=
@@ -5683,7 +6775,7 @@ fi
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBRPATHX; do
-              
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -5720,7 +6812,7 @@ fi
           if test "X$found_dir" != "X"; then
                         LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "X$found_dir" = "X/usr/lib"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
                                 LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
               else
                                                                                 haveit=
@@ -5751,7 +6843,7 @@ fi
                   else
                                                                                 haveit=
                     for x in $LDFLAGS $LIBRPATHX; do
-                      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -5802,7 +6894,7 @@ fi
                 fi
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCRPATHX; do
-                    
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -5847,7 +6939,7 @@ fi
                       if test -z "$haveit"; then
                         haveit=
                         for x in $LDFLAGS $LIBRPATHX; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -5868,7 +6960,7 @@ fi
                         fi
                         haveit=
                         for x in $LDFLAGS $LTLIBRPATHX; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -5892,25 +6984,27 @@ fi
                     ;;
                   -R*)
                     dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $dir"
-                    fi
-                                                            haveit=
-                    for x in $ltrpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      ltrpathdirs="$ltrpathdirs $dir"
                     fi
                     ;;
                   -l*)
@@ -5964,18 +7058,18 @@ fi
     ac_cv_librpathx_libs="$LIBRPATHX"
     ac_cv_librpathx_ltlibs="$LTLIBRPATHX"
     ac_cv_librpathx_cppflags="$INCRPATHX"
-  
-fi
 
-echo "$ac_t""$ac_cv_librpathx_libs" 1>&6
+fi
+echo "$as_me:7063: result: $ac_cv_librpathx_libs" >&5
+echo "${ECHO_T}$ac_cv_librpathx_libs" >&6
   LIBRPATHX="$ac_cv_librpathx_libs"
   LTLIBRPATHX="$ac_cv_librpathx_ltlibs"
   INCRPATHX="$ac_cv_librpathx_cppflags"
-  
+
   for element in $INCRPATHX; do
     haveit=
     for x in $CPPFLAGS; do
-      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -5994,310 +7088,669 @@ echo "$ac_t""$ac_cv_librpathx_libs" 1>&6
     fi
   done
 
-  
-  
       HAVE_LIBRPATHX=yes
-  
-  
-
 
-trap '' 1 2 15
-cat > confcache <<\EOF
+ac_config_files="$ac_config_files Makefile"
+cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
 #
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
 #
-EOF
+# `ac_cv_env_foo' variables (set or unset) will be overriden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 # So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+        "s/'/'\\\\''/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if cmp -s $cache_file confcache; then :; else
   if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
   else
     echo "not updating unwritable cache $cache_file"
   fi
 fi
 rm -f confcache
 
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[ 	]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[ 	]*$//;
+}'
 fi
 
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then we branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+cat >confdef2opt.sed <<\EOF
+t clear
+: clear
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+d
+: quote
+s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
+s,\[,\\&,g
+s,\],\\&,g
+s,\$,$$,g
+p
 EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
+# We use echo to avoid assuming a particular line-breaking character.
+# The extra dot is to prevent the shell from consuming trailing
+# line-breaks from the sub-command output.  A line-break within
+# single-quotes doesn't work because, if this script is created in a
+# platform that uses two characters for line-breaks (e.g., DOS), tr
+# would break.
+ac_LF_and_DOT=`echo; echo .`
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+rm -f confdef2opt.sed
 
-# Without the "./", some shells look in PATH for config.status.
 : ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ echo "$as_me:7203: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
+#! $SHELL
 # Generated automatically by configure.
 # Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
 # Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
+# configure, is in config.log if it exists.
 
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
+debug=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+ac_cs_invocation="\$0 \$@"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+# NLS nuisances.
+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+
+exec 6>&1
+
+_ACEOF
+
+# Files that config.status was made for.
+if test -n "$ac_config_files"; then
+  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_headers"; then
+  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_links"; then
+  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_commands"; then
+  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+fi
+
+cat >>$CONFIG_STATUS <<\EOF
+
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTIONS] [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number, then exit
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+  --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Configuration commands:
+$config_commands
+
+Report bugs to <bug-autoconf@gnu.org>."
+EOF
+
+cat >>$CONFIG_STATUS <<EOF
+ac_cs_version="\\
+config.status
+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
+Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+srcdir=$srcdir
+INSTALL="$INSTALL"
+EOF
+
+cat >>$CONFIG_STATUS <<\EOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
+ac_need_defaults=:
+while test $# != 0
 do
-  case "\$ac_option" in
+  case $1 in
+  --*=*)
+    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+    shift
+    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
+    shift
+    ;;
+  -*);;
+  *) # This is not an option, so the user has probably given explicit
+     # arguments.
+     ac_need_defaults=false;;
+  esac
+
+  case $1 in
+  # Handling of the options.
+EOF
+cat >>$CONFIG_STATUS <<EOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
+    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
+    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
+EOF
+cat >>$CONFIG_STATUS <<\EOF
+  --version | --vers* | -V )
+    echo "$ac_cs_version"; exit 0 ;;
+  --he | --h)
+    # Conflict between --help and --header
+    { { echo "$as_me:7374: 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;}
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit 0 ;;
+  --debug | --d* | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    shift
+    CONFIG_FILES="$CONFIG_FILES $1"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $1"
+    ac_need_defaults=false;;
+
+  # This is an error.
+  -*) { { echo "$as_me:7393: 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; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1" ;;
+
   esac
+  shift
 done
 
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
+exec 5>>config.log
+cat >&5 << _ACEOF
+
+## ----------------------- ##
+## Running config.status.  ##
+## ----------------------- ##
+
+This file was extended by $as_me 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`
 
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+_ACEOF
 EOF
-cat >> $CONFIG_STATUS <<EOF
 
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@EXEEXT@%$EXEEXT%g
-s%@OBJEXT@%$OBJEXT%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@AMTAR@%$AMTAR%g
-s%@install_sh@%$install_sh%g
-s%@INSTALL_STRIP_PROGRAM@%$INSTALL_STRIP_PROGRAM%g
-s%@AWK@%$AWK%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@AMDEP_TRUE@%$AMDEP_TRUE%g
-s%@AMDEP_FALSE@%$AMDEP_FALSE%g
-s%@AMDEPBACKSLASH@%$AMDEPBACKSLASH%g
-s%@DEPDIR@%$DEPDIR%g
-s%@CC@%$CC%g
-s%@am__include@%$am__include%g
-s%@am__quote@%$am__quote%g
-s%@CCDEPMODE@%$CCDEPMODE%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@LN_S@%$LN_S%g
-s%@ECHO@%$ECHO%g
-s%@RANLIB@%$RANLIB%g
-s%@STRIP@%$STRIP%g
-s%@CPP@%$CPP%g
-s%@LIBTOOL@%$LIBTOOL%g
-s%@LIBRPATHX@%$LIBRPATHX%g
-s%@LTLIBRPATHX@%$LTLIBRPATHX%g
-s%@global_top_srcdir@%$global_top_srcdir%g
+cat >>$CONFIG_STATUS <<EOF
+#
+# INIT-COMMANDS section.
+#
+
+AMDEP_TRUE="$AMDEP_TRUE"
+ac_aux_dir="$ac_aux_dir"
 
-CEOF
 EOF
 
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
+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" ;;
+  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+  *) { { echo "$as_me:7440: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
 done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
+
+# 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
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
+
+# Create a temporary directory, and hook for its removal unless debugging.
+$debug ||
+{
+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+
+# Create a (secure) tmp directory for tmp files.
+: ${TMPDIR=/tmp}
+{
+  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=$TMPDIR/cs$$-$RANDOM
+  (umask 077 && mkdir $tmp)
+} ||
+{
+   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+   { (exit 1); exit 1; }
+}
+
+EOF
+
+cat >>$CONFIG_STATUS <<EOF
+
+#
+# CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "\$CONFIG_FILES"; then
+  # Protect against being on the right side of a sed subst in config.status.
+  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+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,@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,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@DEFS@,$DEFS,;t t
+s,@LIBS@,$LIBS,;t t
+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@PACKAGE@,$PACKAGE,;t t
+s,@VERSION@,$VERSION,;t t
+s,@EXEEXT@,$EXEEXT,;t t
+s,@OBJEXT@,$OBJEXT,;t t
+s,@ACLOCAL@,$ACLOCAL,;t t
+s,@AUTOCONF@,$AUTOCONF,;t t
+s,@AUTOMAKE@,$AUTOMAKE,;t t
+s,@AUTOHEADER@,$AUTOHEADER,;t t
+s,@MAKEINFO@,$MAKEINFO,;t t
+s,@AMTAR@,$AMTAR,;t t
+s,@install_sh@,$install_sh,;t t
+s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+s,@AWK@,$AWK,;t t
+s,@SET_MAKE@,$SET_MAKE,;t t
+s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
+s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
+s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+s,@DEPDIR@,$DEPDIR,;t t
+s,@CC@,$CC,;t t
+s,@CFLAGS@,$CFLAGS,;t t
+s,@LDFLAGS@,$LDFLAGS,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@ac_ct_CC@,$ac_ct_CC,;t t
+s,@am__include@,$am__include,;t t
+s,@am__quote@,$am__quote,;t t
+s,@CCDEPMODE@,$CCDEPMODE,;t t
+s,@build@,$build,;t t
+s,@build_cpu@,$build_cpu,;t t
+s,@build_vendor@,$build_vendor,;t t
+s,@build_os@,$build_os,;t t
+s,@host@,$host,;t t
+s,@host_cpu@,$host_cpu,;t t
+s,@host_vendor@,$host_vendor,;t t
+s,@host_os@,$host_os,;t t
+s,@LN_S@,$LN_S,;t t
+s,@ECHO@,$ECHO,;t t
+s,@RANLIB@,$RANLIB,;t t
+s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+s,@STRIP@,$STRIP,;t t
+s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
+s,@CPP@,$CPP,;t t
+s,@LIBTOOL@,$LIBTOOL,;t t
+s,@LIBRPATHX@,$LIBRPATHX,;t t
+s,@LTLIBRPATHX@,$LTLIBRPATHX,;t t
+s,@global_top_srcdir@,$global_top_srcdir,;t t
+CEOF
+
 EOF
 
-cat >> $CONFIG_STATUS <<EOF
+  cat >>$CONFIG_STATUS <<\EOF
+  # Split the substitutions into bite-sized pieces for seds with
+  # small command number limits, like on Digital OSF/1 and HP-UX.
+  ac_max_sed_lines=48
+  ac_sed_frag=1 # Number of current file.
+  ac_beg=1 # First line for current file.
+  ac_end=$ac_max_sed_lines # Line after last line for current file.
+  ac_more_lines=:
+  ac_sed_cmds=
+  while $ac_more_lines; do
+    if test $ac_beg -gt 1; then
+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    else
+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    fi
+    if test ! -s $tmp/subs.frag; then
+      ac_more_lines=false
+    else
+      # The purpose of the label and of the branching condition is to
+      # speed up the sed processing (if there are no `@' at all, there
+      # is no need to browse any of the substitutions).
+      # These are the two extra sed commands mentioned above.
+      (echo ':t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+      if test -z "$ac_sed_cmds"; then
+  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+      else
+  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+      fi
+      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_beg=$ac_end
+      ac_end=`expr $ac_end + $ac_max_sed_lines`
+    fi
+  done
+  if test -z "$ac_sed_cmds"; then
+    ac_sed_cmds=cat
+  fi
+fi # test -n "$CONFIG_FILES"
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
 EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+cat >>$CONFIG_STATUS <<\EOF
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+        cat >$tmp/stdin
+        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
   esac
 
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+  ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_file" : 'X\(//\)[^/]' \| \
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
   if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+    { case "$ac_dir" in
+  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+  *)                      as_incr_dir=.;;
+esac
+as_dummy="$ac_dir"
+for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+  case $as_mkdir_dir in
+    # Skip DOS drivespec
+    ?:) as_incr_dir=$as_mkdir_dir ;;
+    *)
+      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
+    ;;
+  esac
+done; }
+
+    ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`"
     # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+    ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'`
   else
     ac_dir_suffix= ac_dots=
   fi
 
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+  case $srcdir in
+  .)  ac_srcdir=.
+      if test -z "$ac_dots"; then
+         ac_top_srcdir=.
+      else
+         ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
+      fi ;;
+  [\\/]* | ?:[\\/]* )
+      ac_srcdir=$srcdir$ac_dir_suffix;
+      ac_top_srcdir=$srcdir ;;
   *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
+    ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_dots$srcdir ;;
   esac
 
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_dots$INSTALL ;;
   esac
 
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:7683: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
+  # Let's still pretend it is `configure' which instantiates (i.e., don't
+  # use $as_me), people would be surprised to read:
+  #    /* config.h.  Generated automatically by config.status.  */
+  configure_input="Generated automatically from `echo $ac_file_in |
+                                                 sed 's,.*/,,'` by configure."
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+         # Absolute (can't be DOS-style, as IFS=:)
+         test -f "$f" || { { echo "$as_me:7701: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         echo $f;;
+      *) # Relative
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$srcdir/$f"; then
+           # Source tree
+           echo $srcdir/$f
+         else
+           # /dev/null tree
+           { { echo "$as_me:7714: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         fi;;
+      esac
+    done` || { (exit 1); exit 1; }
 EOF
-cat >> $CONFIG_STATUS <<EOF
-AMDEP_TRUE="$AMDEP_TRUE"
-ac_aux_dir="$ac_aux_dir"
+cat >>$CONFIG_STATUS <<EOF
+  sed "$ac_vpsub
+$extrasub
+EOF
+cat >>$CONFIG_STATUS <<\EOF
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@configure_input@,$configure_input,;t t
+s,@srcdir@,$ac_srcdir,;t t
+s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@INSTALL@,$ac_INSTALL,;t t
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+  rm -f $tmp/stdin
+  if test x"$ac_file" != x-; then
+    mv $tmp/out $ac_file
+  else
+    cat $tmp/out
+    rm -f $tmp/out
+  fi
 
+done
 EOF
-cat >> $CONFIG_STATUS <<\EOF
+cat >>$CONFIG_STATUS <<\EOF
 
+#
+# CONFIG_COMMANDS section.
+#
+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+
+  case $ac_dest in
+    default-1 )
 test x"$AMDEP_TRUE" != x"" ||
 for mf in $CONFIG_FILES; do
   case "$mf" in
@@ -6335,11 +7788,33 @@ for mf in $CONFIG_FILES; do
     echo '# dummy' > "$dirpart/$file"
   done
 done
+ ;;
+  esac
+done
+EOF
 
+cat >>$CONFIG_STATUS <<\EOF
 
-exit 0
+{ (exit 0); exit 0; }
 EOF
 chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+ac_clean_files=$ac_clean_files_save
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || { (exit 1); exit 1; }
+fi
 
diff --git a/tests/rpathz/aclocal.m4 b/tests/rpathz/aclocal.m4
index 65a070fcf..483a341ba 100644
--- a/tests/rpathz/aclocal.m4
+++ b/tests/rpathz/aclocal.m4
@@ -2513,6 +2513,18 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
+freebsd*-gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
+  ;;
+
 freebsd*)
   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
   version_type=freebsd-$objformat
@@ -4001,7 +4013,7 @@ AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
 # This is just to silence aclocal about the macro not being used
 ifelse([AC_DISABLE_FAST_INSTALL])
 
-# lib-link.m4 serial 2 (gettext-0.11.2)
+# lib-link.m4 serial 3 (gettext-0.11.3)
 dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -4119,6 +4131,10 @@ AC_DEFUN([AC_LIB_RPATH],
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
   sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
   sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE(rpath,
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
 ])
 
 dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
@@ -4248,7 +4264,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
               dnl Linking with a shared library. We attempt to hardcode its
               dnl directory into the executable's runpath, unless it's the
               dnl standard /usr/lib.
-              if test "X$found_dir" = "X/usr/lib"; then
+              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
                 dnl No hardcoding is needed.
                 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
               else
@@ -4439,29 +4455,31 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                     ;;
                   -R*)
                     dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $dir"
-                    fi
-                    dnl Potentially add DIR to ltrpathdirs.
-                    dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                    haveit=
-                    for x in $ltrpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      ltrpathdirs="$ltrpathdirs $dir"
                     fi
                     ;;
                   -l*)
diff --git a/tests/rpathz/configure b/tests/rpathz/configure
index 6a0d6ce7f..26dba98b3 100755
--- a/tests/rpathz/configure
+++ b/tests/rpathz/configure
@@ -1,28 +1,12 @@
 #! /bin/sh
-
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Generated by Autoconf 2.52.
 #
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --disable-dependency-tracking Speeds up one-time builds
-  --enable-dependency-tracking  Do not reject slow dependency extractors"
-ac_help="$ac_help
-  --enable-shared[=PKGS]  build shared libraries [default=yes]"
-ac_help="$ac_help
-  --enable-static[=PKGS]  build static libraries [default=yes]"
-ac_help="$ac_help
-  --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-
 # Find the correct PATH separator.  Usually this is `:', but
 # DJGPP uses `;' like DOS.
 if test "X${PATH_SEPARATOR+set}" != Xset; then
@@ -34,7 +18,6 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then
   PATH_SEPARATOR=$lt_cv_sys_path_separator
 fi
 
-
 # Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
@@ -180,29 +163,113 @@ if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
    ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
 fi
 
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# 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
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+# NLS nuisances.
+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+exec 6>&1
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+cross_compiling=no
+subdirs=
+MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete.  It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
 
-ac_help="$ac_help
-  --disable-libtool-lock  avoid locking (might break parallel builds)"
-ac_help="$ac_help
-  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-ac_help="$ac_help
-  --with-librpathx-prefix[=DIR]  search for librpathx in DIR/include and DIR/lib
-  --without-librpathx-prefix     don't search for librpathx in includedir and libdir"
-ac_help="$ac_help
-  --with-librpathy-prefix[=DIR]  search for librpathy in DIR/include and DIR/lib
-  --without-librpathy-prefix     don't search for librpathy in includedir and libdir"
+ac_unique_file="configure.in"
 
 # Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
 # The variables have the same names as the options, with
 # dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
+cache_file=/dev/null
 exec_prefix=NONE
-host=NONE
 no_create=
-nonopt=NONE
 no_recursion=
 prefix=NONE
 program_prefix=NONE
@@ -211,10 +278,15 @@ program_transform_name=s,x,x,
 silent=
 site=
 srcdir=
-target=NONE
 verbose=
 x_includes=NONE
 x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
@@ -228,17 +300,16 @@ oldincludedir='/usr/include'
 infodir='${prefix}/info'
 mandir='${prefix}/man'
 
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
+# Identity of this package.
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
 
 ac_prev=
 for ac_option
 do
-
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
     eval "$ac_prev=\$ac_option"
@@ -246,59 +317,59 @@ do
     continue
   fi
 
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case "$ac_option" in
+  case $ac_option in
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
   -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
+    bindir=$ac_optarg ;;
 
   -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
+    ac_prev=build_alias ;;
   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
+    build_alias=$ac_optarg ;;
 
   -cache-file | --cache-file | --cache-fil | --cache-fi \
   | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
     ac_prev=cache_file ;;
   -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
   | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
 
   -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
     ac_prev=datadir ;;
   -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
   | --da=*)
-    datadir="$ac_optarg" ;;
+    datadir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
+    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'`
+    eval "enable_$ac_feature=no" ;;
 
   -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
+    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'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
+    eval "enable_$ac_feature='$ac_optarg'" ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -307,95 +378,47 @@ do
   -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
   | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
   | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
+    exec_prefix=$ac_optarg ;;
 
   -gas | --gas | --ga | --g)
     # Obsolete; use --with-gas.
     with_gas=yes ;;
 
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
 
   -host | --host | --hos | --ho)
-    ac_prev=host ;;
+    ac_prev=host_alias ;;
   -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
+    host_alias=$ac_optarg ;;
 
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
   -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
   | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
+    includedir=$ac_optarg ;;
 
   -infodir | --infodir | --infodi | --infod | --info | --inf)
     ac_prev=infodir ;;
   -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
+    infodir=$ac_optarg ;;
 
   -libdir | --libdir | --libdi | --libd)
     ac_prev=libdir ;;
   -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
+    libdir=$ac_optarg ;;
 
   -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
   | --libexe | --libex | --libe)
     ac_prev=libexecdir ;;
   -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
   | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
+    libexecdir=$ac_optarg ;;
 
   -localstatedir | --localstatedir | --localstatedi | --localstated \
   | --localstate | --localstat | --localsta | --localst \
@@ -404,12 +427,12 @@ EOF
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
   | --localstate=* | --localstat=* | --localsta=* | --localst=* \
   | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
+    localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
     ac_prev=mandir ;;
   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
+    mandir=$ac_optarg ;;
 
   -nfp | --nfp | --nf)
     # Obsolete; use --without-fp.
@@ -430,26 +453,26 @@ EOF
   -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
   | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
   | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
+    oldincludedir=$ac_optarg ;;
 
   -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
     ac_prev=prefix ;;
   -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
+    prefix=$ac_optarg ;;
 
   -program-prefix | --program-prefix | --program-prefi | --program-pref \
   | --program-pre | --program-pr | --program-p)
     ac_prev=program_prefix ;;
   -program-prefix=* | --program-prefix=* | --program-prefi=* \
   | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
+    program_prefix=$ac_optarg ;;
 
   -program-suffix | --program-suffix | --program-suffi | --program-suff \
   | --program-suf | --program-su | --program-s)
     ac_prev=program_suffix ;;
   -program-suffix=* | --program-suffix=* | --program-suffi=* \
   | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
+    program_suffix=$ac_optarg ;;
 
   -program-transform-name | --program-transform-name \
   | --program-transform-nam | --program-transform-na \
@@ -466,7 +489,7 @@ EOF
   | --program-transfo=* | --program-transf=* \
   | --program-trans=* | --program-tran=* \
   | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
+    program_transform_name=$ac_optarg ;;
 
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
@@ -476,7 +499,7 @@ EOF
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
   | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
+    sbindir=$ac_optarg ;;
 
   -sharedstatedir | --sharedstatedir | --sharedstatedi \
   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
@@ -487,58 +510,57 @@ EOF
   | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
   | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
   | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
+    sharedstatedir=$ac_optarg ;;
 
   -site | --site | --sit)
     ac_prev=site ;;
   -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
+    site=$ac_optarg ;;
 
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
+    srcdir=$ac_optarg ;;
 
   -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
   | --syscon | --sysco | --sysc | --sys | --sy)
     ac_prev=sysconfdir ;;
   -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
   | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
+    sysconfdir=$ac_optarg ;;
 
   -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
+    ac_prev=target_alias ;;
   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
+    target_alias=$ac_optarg ;;
 
   -v | -verbose | --verbose | --verbos | --verbo | --verb)
     verbose=yes ;;
 
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
+    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'`
-    case "$ac_option" in
-      *=*) ;;
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
+    eval "with_$ac_package='$ac_optarg'" ;;
 
   -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
+    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'`
+    eval "with_$ac_package=no" ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -549,98 +571,98 @@ EOF
     ac_prev=x_includes ;;
   -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
   | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
+    x_includes=$ac_optarg ;;
 
   -x-libraries | --x-libraries | --x-librarie | --x-librari \
   | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
     ac_prev=x_libraries ;;
   -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
+    x_libraries=$ac_optarg ;;
 
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
     ;;
 
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    eval "$ac_envvar='$ac_optarg'"
+    export $ac_envvar ;;
+
   *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
+    # FIXME: should be removed in autoconf 3.0.
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    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}
     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  { echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
 fi
-exec 5>./config.log
 
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
+# 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
 
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+              localstatedir libdir includedir oldincludedir infodir mandir
 do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* ) ;;
+    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
   esac
 done
 
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: should be removed in autoconf 3.0.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
 
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
 
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=configure.in
+test "$silent" = yes && exec 6>/dev/null
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then its parent.
   ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+  ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
   test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir
   if test ! -r $srcdir/$ac_unique_file; then
@@ -651,13 +673,325 @@ else
 fi
 if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
+   { (exit 1); exit 1; }; }
   else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources in $srcdir" >&2
+   { (exit 1); exit 1; }; }
   fi
 fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CPP_set=${CPP+set}
+ac_env_CPP_value=$CPP
+ac_cv_env_CPP_set=${CPP+set}
+ac_cv_env_CPP_value=$CPP
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<EOF
+\`configure' configures this package to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+EOF
+
+  cat <<EOF
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
+EOF
+
+  cat <<\EOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       build programs to run on HOST [BUILD]
+EOF
+fi
+
+if test -n "$ac_init_help"; then
+
+  cat <<\EOF
+
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-dependency-tracking Speeds up one-time builds
+  --enable-dependency-tracking  Do not reject slow dependency extractors
+  --enable-shared=PKGS  build shared libraries default=yes
+  --enable-static=PKGS  build static libraries default=yes
+  --enable-fast-install=PKGS  optimize for fast installation default=yes
+  --disable-libtool-lock  avoid locking (might break parallel builds)
+  --disable-rpath         do not hardcode runtime library paths
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-gnu-ld           assume the C compiler uses GNU ld default=no
+  --with-pic              try to use only PIC/non-PIC objects default=use both
+  --with-librpathx-prefix=DIR  search for librpathx in DIR/include and DIR/lib
+  --without-librpathx-prefix     don't search for librpathx in includedir and libdir
+  --with-librpathy-prefix=DIR  search for librpathy in DIR/include and DIR/lib
+  --without-librpathy-prefix     don't search for librpathy in includedir and libdir
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+              headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+EOF
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  ac_popdir=`pwd`
+  for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
+    cd $ac_subdir
+    # A "../" for each directory in /$ac_subdir.
+    ac_dots=`echo $ac_subdir |
+             sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
+
+    case $srcdir in
+    .) # No --srcdir option.  We are building in place.
+      ac_sub_srcdir=$srcdir ;;
+    [\\/]* | ?:[\\/]* ) # Absolute path.
+      ac_sub_srcdir=$srcdir/$ac_subdir ;;
+    *) # Relative path.
+      ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
+    esac
+
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_sub_srcdir/configure.gnu; then
+      echo
+      $SHELL $ac_sub_srcdir/configure.gnu  --help=recursive
+    elif test -f $ac_sub_srcdir/configure; then
+      echo
+      $SHELL $ac_sub_srcdir/configure  --help=recursive
+    elif test -f $ac_sub_srcdir/configure.ac ||
+           test -f $ac_sub_srcdir/configure.in; then
+      echo
+      $ac_configure --help
+    else
+      echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
+    fi
+    cd $ac_popdir
+  done
+fi
+
+test -n "$ac_init_help" && exit 0
+if $ac_init_version; then
+  cat <<\EOF
+
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+EOF
+  exit 0
+fi
+exec 5>config.log
+cat >&5 <<EOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by $as_me, which was
+generated by GNU Autoconf 2.52.  Invocation command line was
+
+  $ $0 $@
+
+EOF
+{
+cat <<_ASUNAME
+## ---------- ##
+## Platform.  ##
+## ---------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+PATH = $PATH
+
+_ASUNAME
+} >&5
+
+cat >&5 <<EOF
+## ------------ ##
+## Core tests.  ##
+## ------------ ##
+
+EOF
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell meta-characters.
+ac_configure_args=
+ac_sep=
+for ac_arg
+do
+  case $ac_arg in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c) ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
+    ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+    ac_sep=" " ;;
+  *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg"
+     ac_sep=" " ;;
+  esac
+  # Get rid of the leading space.
+done
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  echo >&5
+  echo "## ----------------- ##" >&5
+  echo "## Cache variables.  ##" >&5
+  echo "## ----------------- ##" >&5
+  echo >&5
+  # The following way of writing the cache mishandles newlines in values,
+{
+  (set) 2>&1 |
+    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      sed -n \
+        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+      ;;
+    *)
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} >&5
+  sed "/^$/d" confdefs.h >conftest.log
+  if test -s conftest.log; then
+    echo >&5
+    echo "## ------------ ##" >&5
+    echo "## confdefs.h.  ##" >&5
+    echo "## ------------ ##" >&5
+    echo >&5
+    cat conftest.log >&5
+  fi
+  (echo; echo) >&5
+  test "$ac_signal" != 0 &&
+    echo "$as_me: caught signal $ac_signal" >&5
+  echo "$as_me: exit $exit_status" >&5
+  rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files &&
+    exit $exit_status
+     ' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
 
+# Let the site file select an alternate cache file if it wants to.
 # Prefer explicitly selected file to automatically selected ones.
 if test -z "$CONFIG_SITE"; then
   if test "x$prefix" != xNONE; then
@@ -668,40 +1002,107 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
+    { echo "$as_me:1005: 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"
   fi
 done
 
 if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
+  # 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:1016: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . $cache_file;;
+      *)                      . ./$cache_file;;
+    esac
+  fi
 else
-  echo "creating cache $cache_file"
-  > $cache_file
+  { echo "$as_me:1024: 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.
+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
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+  eval ac_new_val="\$ac_env_${ac_var}_value"
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { echo "$as_me:1040: 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)
+      { echo "$as_me:1044: 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
+        { echo "$as_me:1050: 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:1052:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+        { echo "$as_me:1054:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+        ac_cache_corrupted=:
+      fi;;
+  esac
+  # Pass precious variables to config.status.  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
+if $ac_cache_corrupted; then
+  { echo "$as_me:1073: 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:1075: 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
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
+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
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)      ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+echo "#! $SHELL" >conftest.sh
+echo  "exit 0"   >>conftest.sh
+chmod +x conftest.sh
+if { (echo "$as_me:1095: PATH=\".;.\"; conftest.sh") >&5
+  (PATH=".;."; conftest.sh) 2>&5
+  ac_status=$?
+  echo "$as_me:1098: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  ac_path_separator=';'
 else
-  ac_n= ac_c='\c' ac_t=
+  ac_path_separator=:
 fi
-
+PATH_SEPARATOR="$ac_path_separator"
+rm -f conftest.sh
 
 ac_aux_dir=
 for ac_dir in $global_top_srcdir ../..; do
@@ -713,18 +1114,20 @@ for ac_dir in $global_top_srcdir ../..; do
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
+  elif test -f $ac_dir/shtool; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $global_top_srcdir ../.." 1>&2; exit 1; }
+  { { echo "$as_me:1124: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -733,31 +1136,39 @@ am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:742: checking for a BSD compatible install" >&5
+echo "$as_me:1144: 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 eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${ac_cv_path_install+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+    ac_save_IFS=$IFS; IFS=$ac_path_separator
   for ac_dir in $PATH; do
+    IFS=$ac_save_IFS
     # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    case $ac_dir/ in
+    / | ./ | .// | /cC/* \
+    | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
+    | /usr/ucb/* ) ;;
     *)
       # OSF1 and SCO ODT 3.0 have their own names for install.
       # Don't use installbsd from OSF since it installs stuff as root
       # by default.
       for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
+        if $as_executable_p "$ac_dir/$ac_prog"; then
 	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+            grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
 	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
 	  else
 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
 	    break 2
@@ -767,31 +1178,31 @@ else
       ;;
     esac
   done
-  IFS="$ac_save_IFS"
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
+    INSTALL=$ac_cv_path_install
   else
     # As a last resort, use the slow shell script.  We don't cache a
     # path for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
+    INSTALL=$ac_install_sh
   fi
 fi
-echo "$ac_t""$INSTALL" 1>&6
+echo "$as_me:1193: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:795: checking whether build environment is sane" >&5
+echo "$as_me:1204: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -814,8 +1225,11 @@ 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".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
+      { { echo "$as_me:1228: 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;}
+   { (exit 1); exit 1; }; }
    fi
 
    test "$2" = conftest.file
@@ -824,28 +1238,29 @@ then
    # Ok.
    :
 else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
+   { { echo "$as_me:1241: 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
+echo "$as_me:1247: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 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 &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+  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
 
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
 
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
@@ -854,82 +1269,86 @@ if eval "$MISSING --run true"; then
 else
   am_missing_run=
   am_backtick='`'
-  echo "configure: warning: ${am_backtick}missing' script is too old or missing" 1>&2
+  { echo "$as_me:1272: WARNING: ${am_backtick}missing' script is too old or missing" >&5
+echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;}
 fi
 
 for ac_prog in mawk gawk nawk awk
 do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:866: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1280: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AWK+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AWK="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_AWK="$ac_prog"
+echo "$as_me:1295: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-AWK="$ac_cv_prog_AWK"
+AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$ac_t""$AWK" 1>&6
+  echo "$as_me:1303: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1306: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-test -n "$AWK" && break
+  test -n "$AWK" && break
 done
 
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:896: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1313: 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 "(cached) $ECHO_C" >&6
 else
-  cat > conftestmake <<\EOF
+  cat >conftest.make <<\EOF
 all:
 	@echo 'ac_maketemp="${MAKE}"'
 EOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
 if test -n "$ac_maketemp"; then
   eval ac_cv_prog_make_${ac_make}_set=yes
 else
   eval ac_cv_prog_make_${ac_make}_set=no
 fi
-rm -f conftestmake
+rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+  echo "$as_me:1333: result: yes" >&5
+echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1337: result: no" >&5
+echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 # Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
 if test "${enable_dependency_tracking+set}" = set; then
   enableval="$enable_dependency_tracking"
-  :
-fi
 
+fi;
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
 fi
 
-
 if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
@@ -938,9 +1357,6 @@ else
   AMDEP_FALSE=
 fi
 
-
-
-
 rm -f .deps 2>/dev/null
 mkdir .deps 2>/dev/null
 if test -d .deps; then
@@ -951,25 +1367,26 @@ else
 fi
 rmdir .deps 2>/dev/null
 
-
 # test to see if srcdir already configured
 if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run \"make distclean\" there first" 1>&2; exit 1; }
+  { { echo "$as_me:1373: 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
 
 # Define the identity of the package.
 PACKAGE=gettext_rpathz
 VERSION=0
-cat >> confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
 
-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define VERSION "$VERSION"
 EOF
 
-
 # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
 # the ones we care about.
 
@@ -981,24 +1398,18 @@ EOF
 # requests that it be used.  This is a bit dumb.
 : ${OBJEXT=o}
 
-
 # Some tools Automake needs.
 
 ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"}
 
-
 AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
 
-
 AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"}
 
-
 AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
-
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-
 AMTAR=${AMTAR-"${am_missing_run}tar"}
 
 install_sh=${install_sh-"$am_aux_dir/install-sh"}
@@ -1008,214 +1419,578 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1015: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+echo "$as_me:1430: 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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1445: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1453: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:1456: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo "$as_me:1465: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="gcc"
+echo "$as_me:1480: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1488: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1491: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
 else
-  echo "$ac_t""no" 1>&6
+  CC="$ac_cv_prog_CC"
 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
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1045: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  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:1504: 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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1519: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1527: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1530: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1096: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
+fi
+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
+echo "$as_me:1539: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="cc"
+echo "$as_me:1554: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1562: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1565: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:1578: 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
+else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_prog_rejected=no
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+  ac_prog_rejected=yes
+  continue
+fi
+ac_cv_prog_CC="cc"
+echo "$as_me:1598: found $ac_dir/$ac_word" >&5
+break
+done
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    set dummy "$ac_dir/$ac_word" ${1+"$@"}
+    shift
+    ac_cv_prog_CC="$@"
+  fi
+fi
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:1620: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:1623: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+
 fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl
+  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:1634: 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
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1649: found $ac_dir/$ac_word" >&5
+break
+done
 
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1128: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:1657: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:1660: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
 
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl
+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:1673: 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
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:1688: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:1696: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:1699: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
 
-cat > conftest.$ac_ext << EOF
+  test -n "$ac_ct_CC" && break
+done
 
-#line 1139 "configure"
+  CC=$ac_ct_CC
+fi
+
+fi
+
+test -z "$CC" && { { echo "$as_me:1711: error: no acceptable cc found in \$PATH" >&5
+echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+
+# Provide some information about the compiler.
+echo "$as_me:1716:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:1719: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1722: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1724: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1727: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1729: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1732: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 1736 "configure"
 #include "confdefs.h"
 
-main(){return(0);}
-EOF
-if { (eval echo configure:1144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_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.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+echo "$as_me:1752: 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[^ ]*//'`
+if { (eval echo "$as_me:1755: \"$ac_link_default\"") >&5
+  (eval $ac_link_default) 2>&5
+  ac_status=$?
+  echo "$as_me:1758: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # 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" : '[^.]*\(\..*\)'`
+          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
+          export ac_cv_exeext
+          break;;
+    * ) break;;
+  esac
+done
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:1781: 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:1787: 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 "$as_me:1792: 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'
+  { (eval echo "$as_me:1798: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1801: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no
   else
-    ac_cv_prog_cc_cross=yes
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { echo "$as_me:1808: 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;}
+   { (exit 1); exit 1; }; }
+    fi
   fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
 fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1170: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1175: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
+echo "$as_me:1816: 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 "$as_me:1823: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+echo "$as_me:1825: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6
+
+echo "$as_me:1828: checking for executable suffix" >&5
+echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+if { (eval echo "$as_me:1830: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:1833: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
+  case $ac_file in
+    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+          export ac_cv_exeext
+          break;;
+    * ) break;;
+  esac
+done
 else
-  ac_cv_prog_gcc=no
-fi
+  { { echo "$as_me:1849: 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
 
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+rm -f conftest$ac_cv_exeext
+echo "$as_me:1855: 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 "$as_me:1861: 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
+#line 1867 "configure"
+#include "confdefs.h"
 
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (eval echo "$as_me:1879: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1882: \$? = $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
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
 else
-  GCC=
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:1894: error: cannot compute OBJEXT: cannot compile" >&5
+echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1203: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test X"`${CC-cc} -c conftest.c 2>&1`" = X"`${CC-cc} -g -c conftest.c 2>&1`"; then
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+echo "$as_me:1901: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+echo "$as_me:1905: 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
+#line 1911 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1926: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1929: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1932: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1935: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_compiler_gnu=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_compiler_gnu=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+echo "$as_me:1947: 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 "$as_me:1953: 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
+#line 1959 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1971: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1974: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1977: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1980: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
-  ac_cv_prog_cc_g=no
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_prog_cc_g=no
 fi
-rm -f conftest*
-
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+echo "$as_me:1990: 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"
+  CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
     CFLAGS="-g -O2"
@@ -1229,7 +2004,118 @@ else
     CFLAGS=
   fi
 fi
+# Some people use a C++ compiler to compile C.  Since we use `exit',
+# in C++ we need to declare it.  In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+  choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2017: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:2020: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:2023: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2026: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+#line 2038 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2051: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:2054: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:2057: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2060: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+continue
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line 2070 "configure"
+#include "confdefs.h"
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2082: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:2085: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:2088: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2091: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+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
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_config_commands="$ac_config_commands default-1"
 
 am_make=${MAKE-make}
 cat > confinc << 'END'
@@ -1237,8 +2123,8 @@ doit:
 	@echo done
 END
 # If we don't find an include directive, just comment out the code.
-echo $ac_n "checking for style of include used by $am_make""... $ac_c" 1>&6
-echo "configure:1242: checking for style of include used by $am_make" >&5
+echo "$as_me:2126: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
 am__include='#'
 am__quote=
 _am_result=none
@@ -1264,17 +2150,16 @@ if test "$am__include" = "#"; then
    fi
 fi
 
-
-echo "$ac_t""$_am_result" 1>&6
+echo "$as_me:2153: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6
 rm -f confinc confmf
 
-
 depcc="$CC"   am_compiler_list=
 
-echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6
-echo "configure:1276: checking dependency style of $depcc" >&5
-if eval "test \"`echo '$''{'am_cv_CC_dependencies_compiler_type'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2159: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -1333,164 +2218,10 @@ else
 fi
 
 fi
-
-echo "$ac_t""$am_cv_CC_dependencies_compiler_type" 1>&6
+echo "$as_me:2221: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
 
-
-# Find the correct PATH separator.  Usually this is `:', but
-# DJGPP uses `;' like DOS.
-if test "X${PATH_SEPARATOR+set}" != Xset; then
-  UNAME=${UNAME-`uname 2>/dev/null`}
-  case X$UNAME in
-    *-DOS) lt_cv_sys_path_separator=';' ;;
-    *)     lt_cv_sys_path_separator=':' ;;
-  esac
-  PATH_SEPARATOR=$lt_cv_sys_path_separator
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:1354: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1359 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:1370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:1387: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1392 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:1399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1416: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 1431 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}:*\$" | grep -v '^icc: NOTE: '`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 1448 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1454: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}:*\$" | grep -v '^icc: NOTE: '`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 1465 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}:*\$" | grep -v '^icc: NOTE: '`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
 # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
@@ -1512,8 +2243,7 @@ no) enable_shared=no ;;
 esac
 else
   enable_shared=yes
-fi
-
+fi;
 # Check whether --enable-static or --disable-static was given.
 if test "${enable_static+set}" = set; then
   enableval="$enable_static"
@@ -1535,8 +2265,7 @@ no) enable_static=no ;;
 esac
 else
   enable_static=yes
-fi
-
+fi;
 # Check whether --enable-fast-install or --disable-fast-install was given.
 if test "${enable_fast_install+set}" = set; then
   enableval="$enable_fast_install"
@@ -1558,52 +2287,69 @@ no) enable_fast_install=no ;;
 esac
 else
   enable_fast_install=yes
-fi
-
-
+fi;
 # Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1571: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1592: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:2293: error: cannot run $ac_config_sub" >&5
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+echo "$as_me:2297: 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
+else
+  ac_cv_build_alias=$build_alias
+test -z "$ac_cv_build_alias" &&
+  ac_cv_build_alias=`$ac_config_guess`
+test -z "$ac_cv_build_alias" &&
+  { { echo "$as_me:2306: 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:2310: 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:2315: 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 "$as_me:2322: 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
+else
+  ac_cv_host_alias=$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:2331: 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:2336: 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/'`
 
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
+# Find the correct PATH separator.  Usually this is `:', but
+# DJGPP uses `;' like DOS.
+if test "X${PATH_SEPARATOR+set}" != Xset; then
+  UNAME=${UNAME-`uname 2>/dev/null`}
+  case X$UNAME in
+    *-DOS) lt_cv_sys_path_separator=';' ;;
+    *)     lt_cv_sys_path_separator=':' ;;
+  esac
+  PATH_SEPARATOR=$lt_cv_sys_path_separator
+fi
 
 # Check whether --with-gnu-ld or --without-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
@@ -1611,13 +2357,12 @@ if test "${with_gnu_ld+set}" = set; then
   test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
-fi
-
+fi;
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1621: checking for ld used by GCC" >&5
+  echo "$as_me:2364: checking for ld used by GCC" >&5
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1646,14 +2391,14 @@ echo "configure:1621: checking for ld used by GCC" >&5
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1651: checking for GNU ld" >&5
+  echo "$as_me:2394: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
 else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1654: checking for non-GNU ld" >&5
+  echo "$as_me:2397: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
 fi
-if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${lt_cv_path_LD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -1679,15 +2424,19 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
+  echo "$as_me:2427: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:2430: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1689: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+test -z "$LD" && { { echo "$as_me:2433: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+echo "$as_me:2436: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+if test "${lt_cv_prog_gnu_ld+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
@@ -1696,27 +2445,26 @@ else
   lt_cv_prog_gnu_ld=no
 fi
 fi
-
-echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
+echo "$as_me:2448: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
-
-echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1706: checking for $LD option to reload object files" >&5
-if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2452: checking for $LD option to reload object files" >&5
+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
+if test "${lt_cv_ld_reload_flag+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-
-echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
+echo "$as_me:2459: result: $lt_cv_ld_reload_flag" >&5
+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
 reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
-echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1718: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2464: checking for BSD-compatible nm" >&5
+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
+if test "${lt_cv_path_NM+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
@@ -1749,33 +2497,24 @@ fi
 fi
 
 NM="$lt_cv_path_NM"
-echo "$ac_t""$NM" 1>&6
+echo "$as_me:2500: result: $NM" >&5
+echo "${ECHO_T}$NM" >&6
 
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1756: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
+echo "$as_me:2503: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  echo "$as_me:2507: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:2510: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:1777: checking how to recognise dependant libraries" >&5
-if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2514: checking how to recognise dependant libraries" >&5
+echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6
+if test "${lt_cv_deplibs_check_method+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -1950,84 +2689,18 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
 esac
 
 fi
-
-echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
+echo "$as_me:2692: result: $lt_cv_deplibs_check_method" >&5
+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:1960: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:1966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1986: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-
-
-
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
-echo "configure:2027: checking command to parse $NM output" >&5
-if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2698: checking command to parse $NM output" >&5
+echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
+
 # These are sane defaults that work on at least a few old systems.
 # [They come from Ultrix.  What could be older than Ultrix?!! ;)]
 
@@ -2103,10 +2776,18 @@ void nm_test_func(){}
 int main(){nm_test_var='a';nm_test_func();return(0);}
 EOF
 
-  if { (eval echo configure:2107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo "$as_me:2779: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:2782: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { (eval echo configure:2110: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
+    if { (eval echo "$as_me:2786: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+  ac_status=$?
+  echo "$as_me:2789: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -2157,7 +2838,11 @@ EOF
 	  save_CFLAGS="$CFLAGS"
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$no_builtin_flag"
-	  if { (eval echo configure:2161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+	  if { (eval echo "$as_me:2841: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:2844: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest; then
 	    pipe_works=yes
 	  fi
 	  LIBS="$save_LIBS"
@@ -2181,79 +2866,285 @@ EOF
   if test "$pipe_works" = yes; then
     break
   else
-    lt_cv_sys_global_symbol_pipe=
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  global_symbol_to_cdecl=
+  global_symbol_to_c_name_address=
+else
+  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
+  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
+fi
+if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
+then
+  echo "$as_me:2885: result: failed" >&5
+echo "${ECHO_T}failed" >&6
+else
+  echo "$as_me:2888: result: ok" >&5
+echo "${ECHO_T}ok" >&6
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+echo "$as_me:2897: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # 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 2918 "configure"
+#include "confdefs.h"
+#include <assert.h>
+                     Syntax error
+_ACEOF
+if { (eval echo "$as_me:2923: \"$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
+  echo "$as_me:2929: \$? = $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
+  :
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  # Broken: fails on valid input.
+continue
+fi
+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
+#line 2952 "configure"
+#include "confdefs.h"
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:2956: \"$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
+  echo "$as_me:2962: \$? = $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
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+echo "$as_me:2999: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # 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 3009 "configure"
+#include "confdefs.h"
+#include <assert.h>
+                     Syntax error
+_ACEOF
+if { (eval echo "$as_me:3014: \"$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
+  echo "$as_me:3020: \$? = $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
+  :
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  # Broken: fails on valid input.
+continue
+fi
+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
+#line 3043 "configure"
+#include "confdefs.h"
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:3047: \"$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
+  echo "$as_me:3053: \$? = $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
-done
-
+else
+  ac_cpp_err=yes
 fi
-
-global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  global_symbol_to_cdecl=
-  global_symbol_to_c_name_address=
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
 else
-  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
-  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
-if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
-then
-  echo "$ac_t""failed" 1>&6
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
 else
-  echo "$ac_t""ok" 1>&6
+  { { echo "$as_me:3081: error: C preprocessor \"$CPP\" fails sanity check" >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
-for ac_hdr in dlfcn.h
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+for ac_header in dlfcn.h
 do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2210: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2215 "configure"
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:3095: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 3101 "configure"
 #include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}:*\$" | grep -v '^icc: NOTE: '`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:3105: \"$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
+  echo "$as_me:3111: \$? = $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 "$as_ac_Header=yes"
 else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+  eval "$as_ac_Header=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+echo "$as_me:3130: 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
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
- 
-else
-  echo "$ac_t""no" 1>&6
+
 fi
 done
 
-
-
-
-
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2255: checking for ${ac_tool_prefix}file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    echo "$as_me:3144: checking for ${ac_tool_prefix}file" >&5
+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $MAGIC_CMD in
   /*)
@@ -2305,17 +3196,19 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
+  echo "$as_me:3199: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:3202: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2317: checking for file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    echo "$as_me:3208: checking for file" >&5
+echo $ECHO_N "checking for file... $ECHO_C" >&6
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $MAGIC_CMD in
   /*)
@@ -2367,9 +3260,11 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
+  echo "$as_me:3263: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:3266: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
   else
@@ -2381,150 +3276,162 @@ fi
   ;;
 esac
 
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2388: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3282: 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
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  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:3297: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-RANLIB="$ac_cv_prog_RANLIB"
+RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
+  echo "$as_me:3305: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:3308: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
+fi
 if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; 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
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2420: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+echo "$as_me:3317: 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
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_RANLIB="ranlib"
+echo "$as_me:3332: found $ac_dir/$ac_word" >&5
+break
+done
+
+  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
 fi
 fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  echo "$as_me:3341: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:3344: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
+  RANLIB=$ac_ct_RANLIB
 else
-  RANLIB=":"
-fi
+  RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2455: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3356: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+echo "$as_me:3371: found $ac_dir/$ac_word" >&5
+break
+done
+
 fi
 fi
-STRIP="$ac_cv_prog_STRIP"
+STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
+  echo "$as_me:3379: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:3382: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
+fi
 if test -z "$ac_cv_prog_STRIP"; then
-if test -n "$ac_tool_prefix"; then
+  ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2487: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
+echo "$as_me:3391: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_STRIP="strip"
+echo "$as_me:3406: found $ac_dir/$ac_word" >&5
+break
+done
+
+  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
 fi
 fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  echo "$as_me:3415: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:3418: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
+  STRIP=$ac_ct_STRIP
 else
-  STRIP=":"
-fi
+  STRIP="$ac_cv_prog_STRIP"
 fi
 
-
 enable_dlopen=no
 enable_win32_dll=no
 
 # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then
   enableval="$enable_libtool_lock"
-  :
-fi
 
+fi;
 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
 # Some flags need to be propagated to the compiler or linker for good
@@ -2532,8 +3439,12 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2536 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 3442 "configure"' > conftest.$ac_ext
+  if { (eval echo "$as_me:3443: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:3446: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -2553,54 +3464,64 @@ case $host in
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2558: checking whether the C compiler needs -belf" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:3467: checking whether the C compiler needs -belf" >&5
+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
+if test "${lt_cv_cc_needs_belf+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
+
      ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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
 
-     cat > conftest.$ac_ext <<EOF
-#line 2571 "configure"
+     cat >conftest.$ac_ext <<_ACEOF
+#line 3480 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main ()
+{
 
-; return 0; }
-EOF
-if { (eval echo configure:2578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3492: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:3495: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:3498: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3501: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   lt_cv_cc_needs_belf=yes
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=no
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+lt_cv_cc_needs_belf=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-
-echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
+echo "$as_me:3517: result: $lt_cv_cc_needs_belf" >&5
+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
 
-
 esac
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
@@ -2693,8 +3614,8 @@ fi
 set dummy $CC
 compiler="$2"
 
-echo $ac_n "checking for objdir""... $ac_c" 1>&6
-echo "configure:2698: checking for objdir" >&5
+echo "$as_me:3617: checking for objdir" >&5
+echo $ECHO_N "checking for objdir... $ECHO_C" >&6
 rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
 if test -d .libs; then
@@ -2704,8 +3625,8 @@ else
   objdir=_libs
 fi
 rmdir .libs 2>/dev/null
-echo "$ac_t""$objdir" 1>&6
-
+echo "$as_me:3628: result: $objdir" >&5
+echo "${ECHO_T}$objdir" >&6
 
 # Check whether --with-pic or --without-pic was given.
 if test "${with_pic+set}" = set; then
@@ -2713,17 +3634,16 @@ if test "${with_pic+set}" = set; then
   pic_mode="$withval"
 else
   pic_mode=default
-fi
-
+fi;
 test -z "$pic_mode" && pic_mode=default
 
 # We assume here that the value for lt_cv_prog_cc_pic will not be cached
 # in isolation, and that seeing it set (from the cache) indicates that
 # the associated values are set (in the cache) correctly too.
-echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
-echo "configure:2725: checking for $compiler option to produce PIC" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3643: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+if test "${lt_cv_prog_cc_pic+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
    lt_cv_prog_cc_pic=
   lt_cv_prog_cc_shlib=
@@ -2880,28 +3800,44 @@ else
 fi
 
 if test -z "$lt_cv_prog_cc_pic"; then
-  echo "$ac_t""none" 1>&6
+  echo "$as_me:3803: result: none" >&5
+echo "${ECHO_T}none" >&6
 else
-  echo "$ac_t""$lt_cv_prog_cc_pic" 1>&6
+  echo "$as_me:3806: result: $lt_cv_prog_cc_pic" >&5
+echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6
 
   # Check to make sure the pic_flag actually works.
-  echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
-echo "configure:2890: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
-  if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:3810: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6
+  if test "${lt_cv_prog_cc_pic_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
       save_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
-    cat > conftest.$ac_ext <<EOF
-#line 2897 "configure"
+    cat >conftest.$ac_ext <<_ACEOF
+#line 3818 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main ()
+{
 
-; return 0; }
-EOF
-if { (eval echo configure:2904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3830: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:3833: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:3836: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3839: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
         case $host_os in
       hpux9* | hpux10* | hpux11*)
 	# On HP-UX, both CC and GCC only warn that PIC is supported... then
@@ -2917,19 +3853,17 @@ if { (eval echo configure:2904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5;
 	lt_cv_prog_cc_pic_works=yes
 	;;
       esac
-    
+
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-        lt_cv_prog_cc_pic_works=no
-    
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+      lt_cv_prog_cc_pic_works=no
+
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
     CFLAGS="$save_CFLAGS"
-  
-fi
 
+fi
 
   if test "X$lt_cv_prog_cc_pic_works" = Xno; then
     lt_cv_prog_cc_pic=
@@ -2938,51 +3872,68 @@ fi
     lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
   fi
 
-  echo "$ac_t""$lt_cv_prog_cc_pic_works" 1>&6
+  echo "$as_me:3875: result: $lt_cv_prog_cc_pic_works" >&5
+echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6
 fi
 
 # Check for any special shared library compilation flags.
 if test -n "$lt_cv_prog_cc_shlib"; then
-  echo "configure: warning: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" 1>&2
+  { echo "$as_me:3881: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5
+echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;}
   if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]" >/dev/null; then :
   else
-   echo "configure: warning: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" 1>&2
+   { echo "$as_me:3885: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
+echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
     lt_cv_prog_cc_can_build_shared=no
   fi
 fi
 
-echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
-echo "configure:2956: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3891: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6
+if test "${lt_cv_prog_cc_static_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     lt_cv_prog_cc_static_works=no
   save_LDFLAGS="$LDFLAGS"
   LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
-  cat > conftest.$ac_ext <<EOF
-#line 2964 "configure"
+  cat >conftest.$ac_ext <<_ACEOF
+#line 3900 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main ()
+{
 
-; return 0; }
-EOF
-if { (eval echo configure:2971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3912: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:3915: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:3918: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3921: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   lt_cv_prog_cc_static_works=yes
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
   LDFLAGS="$save_LDFLAGS"
 
 fi
 
-
 # Belt *and* braces to stop my trousers falling down:
 test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
-echo "$ac_t""$lt_cv_prog_cc_static_works" 1>&6
+echo "$as_me:3935: result: $lt_cv_prog_cc_static_works" >&5
+echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6
 
 pic_flag="$lt_cv_prog_cc_pic"
 special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
@@ -2991,14 +3942,13 @@ link_static_flag="$lt_cv_prog_cc_static"
 no_builtin_flag="$lt_cv_prog_cc_no_builtin"
 can_build_shared="$lt_cv_prog_cc_can_build_shared"
 
-
 # Check to see if options -o and -c are simultaneously supported by compiler
-echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
-echo "configure:2998: checking if $compiler supports -c -o file.$ac_objext" >&5
-if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3946: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+if test "${lt_cv_compiler_c_o+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
+
 $rm -r conftest 2>/dev/null
 mkdir conftest
 cd conftest
@@ -3013,7 +3963,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:3017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:3966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -3037,31 +3987,46 @@ $rm -r conftest 2>/dev/null
 fi
 
 compiler_c_o=$lt_cv_compiler_c_o
-echo "$ac_t""$compiler_c_o" 1>&6
+echo "$as_me:3990: result: $compiler_c_o" >&5
+echo "${ECHO_T}$compiler_c_o" >&6
 
 if test x"$compiler_c_o" = x"yes"; then
   # Check to see if we can write to a .lo
-  echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
-echo "configure:3046: checking if $compiler supports -c -o file.lo" >&5
-  if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:3995: checking if $compiler supports -c -o file.lo" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6
+  if test "${lt_cv_compiler_o_lo+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
+
   lt_cv_compiler_o_lo=no
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -c -o conftest.lo"
   save_objext="$ac_objext"
   ac_objext=lo
-  cat > conftest.$ac_ext <<EOF
-#line 3057 "configure"
+  cat >conftest.$ac_ext <<_ACEOF
+#line 4007 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main ()
+{
 int some_variable = 0;
-; return 0; }
-EOF
-if { (eval echo configure:3064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4019: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4022: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4025: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4028: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
       # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
     if test -s conftest.err; then
@@ -3069,19 +4034,20 @@ if { (eval echo configure:3064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5;
     else
       lt_cv_compiler_o_lo=yes
     fi
-  
+
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
   ac_objext="$save_objext"
   CFLAGS="$save_CFLAGS"
-  
+
 fi
 
   compiler_o_lo=$lt_cv_compiler_o_lo
-  echo "$ac_t""$compiler_o_lo" 1>&6
+  echo "$as_me:4049: result: $compiler_o_lo" >&5
+echo "${ECHO_T}$compiler_o_lo" >&6
 else
   compiler_o_lo=no
 fi
@@ -3090,17 +4056,19 @@ fi
 hard_links="nottested"
 if test "$compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
-echo "configure:3095: checking if we can lock with hard links" >&5
+  echo "$as_me:4059: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$ac_t""$hard_links" 1>&6
+  echo "$as_me:4067: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6
   if test "$hard_links" = no; then
-    echo "configure: warning: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" 1>&2
+    { echo "$as_me:4070: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -3109,22 +4077,36 @@ fi
 
 if test "$GCC" = yes; then
   # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
-  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
-echo "configure:3114: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  echo "$as_me:4080: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
   echo "int some_variable = 0;" > conftest.$ac_ext
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
   compiler_rtti_exceptions=no
-  cat > conftest.$ac_ext <<EOF
-#line 3120 "configure"
+  cat >conftest.$ac_ext <<_ACEOF
+#line 4087 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main ()
+{
 int some_variable = 0;
-; return 0; }
-EOF
-if { (eval echo configure:3127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4099: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4102: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4105: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4108: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
       # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
     if test -s conftest.err; then
@@ -3132,14 +4114,15 @@ if { (eval echo configure:3127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5;
     else
       compiler_rtti_exceptions=yes
     fi
-  
+
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
   CFLAGS="$save_CFLAGS"
-  echo "$ac_t""$compiler_rtti_exceptions" 1>&6
+  echo "$as_me:4124: result: $compiler_rtti_exceptions" >&5
+echo "${ECHO_T}$compiler_rtti_exceptions" >&6
 
   if test "$compiler_rtti_exceptions" = "yes"; then
     no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
@@ -3149,8 +4132,8 @@ rm -f conftest*
 fi
 
 # See if the linker supports building shared libraries.
-echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
-echo "configure:3154: checking whether the linker ($LD) supports shared libraries" >&5
+echo "$as_me:4135: checking whether the linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6
 
 allow_undefined_flag=
 no_undefined_flag=
@@ -3829,12 +4812,13 @@ EOF
     ;;
   esac
 fi
-echo "$ac_t""$ld_shlibs" 1>&6
+echo "$as_me:4815: result: $ld_shlibs" >&5
+echo "${ECHO_T}$ld_shlibs" >&6
 test "$ld_shlibs" = no && can_build_shared=no
 
 # Check hardcoding attributes.
-echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
-echo "configure:3838: checking how to hardcode library paths into programs" >&5
+echo "$as_me:4820: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
    test -n "$runpath_var"; then
@@ -3857,26 +4841,29 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-echo "$ac_t""$hardcode_action" 1>&6
+echo "$as_me:4844: result: $hardcode_action" >&5
+echo "${ECHO_T}$hardcode_action" >&6
 
 striplib=
 old_striplib=
-echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
-echo "configure:3866: checking whether stripping libraries is possible" >&5
+echo "$as_me:4849: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$ac_t""yes" 1>&6
+  echo "$as_me:4854: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:4857: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
 
 # PORTME Fill in your ld.so characteristics
-echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
-echo "configure:3880: checking dynamic linker characteristics" >&5
+echo "$as_me:4865: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -4020,6 +5007,18 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
+freebsd*-gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
+  ;;
+
 freebsd*)
   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
   version_type=freebsd-$objformat
@@ -4268,16 +5267,18 @@ sysv4*MP*)
   dynamic_linker=no
   ;;
 esac
-echo "$ac_t""$dynamic_linker" 1>&6
+echo "$as_me:5270: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6
 test "$dynamic_linker" = no && can_build_shared=no
 
 # Report the final consequences.
-echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
-echo "configure:4277: checking if libtool supports shared libraries" >&5
-echo "$ac_t""$can_build_shared" 1>&6
+echo "$as_me:5275: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+echo "$as_me:5277: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6
 
-echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
-echo "configure:4281: checking whether to build shared libraries" >&5
+echo "$as_me:5280: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -4297,13 +5298,15 @@ aix4*)
   fi
   ;;
 esac
-echo "$ac_t""$enable_shared" 1>&6
+echo "$as_me:5301: result: $enable_shared" >&5
+echo "${ECHO_T}$enable_shared" >&6
 
-echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
-echo "configure:4304: checking whether to build static libraries" >&5
+echo "$as_me:5304: checking whether to build static libraries" >&5
+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-echo "$ac_t""$enable_static" 1>&6
+echo "$as_me:5308: result: $enable_static" >&5
+echo "${ECHO_T}$enable_static" >&6
 
 if test "$hardcode_action" = relink; then
   # Fast installation is not supported
@@ -4340,265 +5343,345 @@ else
    ;;
 
   *)
-    echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "configure:4345: checking for shl_load" >&5
-if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    echo "$as_me:5346: checking for shl_load" >&5
+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+if test "${ac_cv_func_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 4350 "configure"
+  cat >conftest.$ac_ext <<_ACEOF
+#line 5352 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load(); below.  */
+    which can conflict with char shl_load (); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char shl_load();
-
-int main() {
+   builtin and then its argument prototype would still apply.  */
+char shl_load ();
+char (*f) ();
 
+int
+main ()
+{
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_shl_load) || defined (__stub___shl_load)
 choke me
 #else
-shl_load();
+f = shl_load;
 #endif
 
-; return 0; }
-EOF
-if { (eval echo configure:4373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_shl_load=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_shl_load=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5383: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5386: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5389: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5392: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_shl_load=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_shl_load=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:5402: result: $ac_cv_func_shl_load" >&5
+echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+if test $ac_cv_func_shl_load = yes; then
   lt_cv_dlopen="shl_load"
 else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:4391: checking for shl_load in -ldld" >&5
-ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:5407: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4399 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 5415 "configure"
 #include "confdefs.h"
+
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char shl_load();
-
-int main() {
-shl_load()
-; return 0; }
-EOF
-if { (eval echo configure:4410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char shl_load ();
+int
+main ()
+{
+shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5434: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5437: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5440: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5443: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dld_shl_load=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_dld_shl_load=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:5454: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+if test $ac_cv_lib_dld_shl_load = yes; then
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
 else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:4429: checking for dlopen" >&5
-if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:5459: checking for dlopen" >&5
+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+if test "${ac_cv_func_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 4434 "configure"
+  cat >conftest.$ac_ext <<_ACEOF
+#line 5465 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen(); below.  */
+    which can conflict with char dlopen (); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dlopen();
-
-int main() {
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+char (*f) ();
 
+int
+main ()
+{
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_dlopen) || defined (__stub___dlopen)
 choke me
 #else
-dlopen();
+f = dlopen;
 #endif
 
-; return 0; }
-EOF
-if { (eval echo configure:4457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_dlopen=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_dlopen=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5496: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5499: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5502: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5505: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:5515: result: $ac_cv_func_dlopen" >&5
+echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+if test $ac_cv_func_dlopen = yes; then
   lt_cv_dlopen="dlopen"
 else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4475: checking for dlopen in -ldl" >&5
-ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:5520: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4483 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 5528 "configure"
 #include "confdefs.h"
+
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dlopen();
-
-int main() {
-dlopen()
-; return 0; }
-EOF
-if { (eval echo configure:4494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5547: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5550: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5553: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5556: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:5567: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
-echo "configure:4513: checking for dlopen in -lsvld" >&5
-ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:5572: checking for dlopen in -lsvld" >&5
+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4521 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 5580 "configure"
 #include "confdefs.h"
+
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dlopen();
-
-int main() {
-dlopen()
-; return 0; }
-EOF
-if { (eval echo configure:4532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5599: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5602: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5605: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5608: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_svld_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_svld_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:5619: result: $ac_cv_lib_svld_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+if test $ac_cv_lib_svld_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-echo "configure:4551: checking for dld_link in -ldld" >&5
-ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:5624: checking for dld_link in -ldld" >&5
+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4559 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 5632 "configure"
 #include "confdefs.h"
+
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dld_link();
-
-int main() {
-dld_link()
-; return 0; }
-EOF
-if { (eval echo configure:4570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char dld_link ();
+int
+main ()
+{
+dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5651: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5654: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5657: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5660: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dld_dld_link=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_dld_dld_link=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:5671: result: $ac_cv_lib_dld_dld_link" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+if test $ac_cv_lib_dld_dld_link = yes; then
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-else
-  echo "$ac_t""no" 1>&6
 fi
 
-	      
 fi
 
-	    
 fi
 
-	  
 fi
 
-	
 fi
 
-      
 fi
 
     ;;
@@ -4621,10 +5704,10 @@ fi
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-echo "configure:4626: checking whether a program can dlopen itself" >&5
-if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    echo "$as_me:5707: checking whether a program can dlopen itself" >&5
+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+if test "${lt_cv_dlopen_self+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self=cross
@@ -4632,7 +5715,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 4636 "configure"
+#line 5718 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -4693,7 +5776,11 @@ int main ()
     exit (status);
 }
 EOF
-  if { (eval echo configure:4697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  if { (eval echo "$as_me:5779: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5782: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -4708,17 +5795,16 @@ EOF
 fi
 rm -fr conftest*
 
-    
 fi
-
-echo "$ac_t""$lt_cv_dlopen_self" 1>&6
+echo "$as_me:5799: result: $lt_cv_dlopen_self" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self" >&6
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       LDFLAGS="$LDFLAGS $link_static_flag"
-      echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-echo "configure:4720: checking whether a statically linked program can dlopen itself" >&5
-if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+      echo "$as_me:5804: checking whether a statically linked program can dlopen itself" >&5
+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+if test "${lt_cv_dlopen_self_static+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self_static=cross
@@ -4726,7 +5812,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 4730 "configure"
+#line 5815 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -4787,7 +5873,11 @@ int main ()
     exit (status);
 }
 EOF
-  if { (eval echo configure:4791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  if { (eval echo "$as_me:5876: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5879: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -4802,10 +5892,9 @@ EOF
 fi
 rm -fr conftest*
 
-      
 fi
-
-echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
+echo "$as_me:5896: result: $lt_cv_dlopen_self_static" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
     fi
 
     CPPFLAGS="$save_CPPFLAGS"
@@ -4825,7 +5914,6 @@ echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
   esac
 fi
 
-
 if test "$enable_shared" = yes && test "$GCC" = yes; then
   case $archive_cmds in
   *'~'*)
@@ -4835,15 +5923,19 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then
     # Test whether the compiler implicitly links with -lc since on some
     # systems, -lgcc has to come before -lc. If gcc already passes -lc
     # to ld, don't add -lc before -lgcc.
-    echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
-echo "configure:4840: checking whether -lc should be explicitly linked in" >&5
-    if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    echo "$as_me:5926: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+    if test "${lt_cv_archive_cmds_need_lc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   $rm conftest*
     echo 'static int dummy;' > conftest.$ac_ext
 
-    if { (eval echo configure:4847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    if { (eval echo "$as_me:5934: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:5937: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
       soname=conftest
       lib=conftest
       libobjs=conftest.$ac_objext
@@ -4856,7 +5948,11 @@ else
       libname=conftest
       save_allow_undefined_flag=$allow_undefined_flag
       allow_undefined_flag=
-      if { (eval echo configure:4860: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
+      if { (eval echo "$as_me:5951: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  echo "$as_me:5954: \$? = $ac_status" >&5
+  (exit $ac_status); }
       then
 	lt_cv_archive_cmds_need_lc=no
       else
@@ -4867,10 +5963,11 @@ else
       cat conftest.err 1>&5
     fi
     $rm conftest*
-    
+
 fi
 
-    echo "$ac_t""$lt_cv_archive_cmds_need_lc" 1>&6
+    echo "$as_me:5969: result: $lt_cv_archive_cmds_need_lc" >&5
+echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6
     ;;
   esac
 fi
@@ -5426,10 +6523,6 @@ EOF
   chmod +x "$ofile"
 fi
 
-
-
-
-
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
@@ -5438,6 +6531,20 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 # Prevent multiple expansion
 
+      if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
 
 # Check whether --with-gnu-ld or --without-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
@@ -5445,13 +6552,12 @@ if test "${with_gnu_ld+set}" = set; then
   test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
-fi
-
+fi;
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:5455: checking for ld used by GCC" >&5
+  echo "$as_me:6559: checking for ld used by GCC" >&5
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -5480,14 +6586,14 @@ echo "configure:5455: checking for ld used by GCC" >&5
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:5485: checking for GNU ld" >&5
+  echo "$as_me:6589: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
 else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:5488: checking for non-GNU ld" >&5
+  echo "$as_me:6592: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
 fi
-if eval "test \"`echo '$''{'acl_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${acl_cv_path_LD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
@@ -5513,15 +6619,19 @@ fi
 
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
+  echo "$as_me:6622: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:6625: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:5523: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'acl_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+test -z "$LD" && { { echo "$as_me:6628: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+echo "$as_me:6631: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+if test "${acl_cv_prog_gnu_ld+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
@@ -5530,43 +6640,25 @@ else
   acl_cv_prog_gnu_ld=no
 fi
 fi
-
-echo "$ac_t""$acl_cv_prog_gnu_ld" 1>&6
+echo "$as_me:6643: result: $acl_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
-
-
-      if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-
-
-                                                echo $ac_n "checking for shared library run path origin""... $ac_c" 1>&6
-echo "configure:5557: checking for shared library run path origin" >&5
-if eval "test \"`echo '$''{'acl_cv_rpath'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+                                                echo "$as_me:6647: checking for shared library run path origin" >&5
+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
+if test "${acl_cv_rpath+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
+
     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
     ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
     . ./conftest.sh
     rm -f ./conftest.sh
     acl_cv_rpath=done
-  
-fi
 
-echo "$ac_t""$acl_cv_rpath" 1>&6
+fi
+echo "$as_me:6660: result: $acl_cv_rpath" >&5
+echo "${ECHO_T}$acl_cv_rpath" >&6
   wl="$acl_cv_wl"
   libext="$acl_cv_libext"
   shlibext="$acl_cv_shlibext"
@@ -5576,50 +6668,50 @@ echo "$ac_t""$acl_cv_rpath" 1>&6
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
   sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
   sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
+    # Check whether --enable-rpath or --disable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+  enableval="$enable_rpath"
+  :
+else
+  enable_rpath=yes
+fi;
 
-
-  
-  
-  
-  
-  echo $ac_n "checking how to link with librpathx""... $ac_c" 1>&6
-echo "configure:5587: checking how to link with librpathx" >&5
-if eval "test \"`echo '$''{'ac_cv_librpathx_libs'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:6679: checking how to link with librpathx" >&5
+echo $ECHO_N "checking how to link with librpathx... $ECHO_C" >&6
+if test "${ac_cv_librpathx_libs+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  
-    
-  
+
     use_additional=yes
-  
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
-  
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
-  # Check whether --with-librpathx-prefix or --without-librpathx-prefix was given.
+# Check whether --with-librpathx-prefix or --without-librpathx-prefix was given.
 if test "${with_librpathx_prefix+set}" = set; then
   withval="$with_librpathx_prefix"
-  
+
     if test "X$withval" = "Xno"; then
       use_additional=no
     else
       if test "X$withval" = "X"; then
-        
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
           eval additional_includedir=\"$includedir\"
           eval additional_libdir=\"$libdir\"
-        
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
@@ -5629,8 +6721,7 @@ if test "${with_librpathx_prefix+set}" = set; then
       fi
     fi
 
-fi
-
+fi;
       LIBRPATHX=
   LTLIBRPATHX=
   INCRPATHX=
@@ -5686,7 +6777,7 @@ fi
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBRPATHX; do
-              
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -5723,7 +6814,7 @@ fi
           if test "X$found_dir" != "X"; then
                         LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "X$found_dir" = "X/usr/lib"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
                                 LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
               else
                                                                                 haveit=
@@ -5754,7 +6845,7 @@ fi
                   else
                                                                                 haveit=
                     for x in $LDFLAGS $LIBRPATHX; do
-                      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -5805,7 +6896,7 @@ fi
                 fi
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCRPATHX; do
-                    
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -5850,7 +6941,7 @@ fi
                       if test -z "$haveit"; then
                         haveit=
                         for x in $LDFLAGS $LIBRPATHX; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -5871,7 +6962,7 @@ fi
                         fi
                         haveit=
                         for x in $LDFLAGS $LTLIBRPATHX; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -5895,25 +6986,27 @@ fi
                     ;;
                   -R*)
                     dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $dir"
-                    fi
-                                                            haveit=
-                    for x in $ltrpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      ltrpathdirs="$ltrpathdirs $dir"
                     fi
                     ;;
                   -l*)
@@ -5967,18 +7060,18 @@ fi
     ac_cv_librpathx_libs="$LIBRPATHX"
     ac_cv_librpathx_ltlibs="$LTLIBRPATHX"
     ac_cv_librpathx_cppflags="$INCRPATHX"
-  
-fi
 
-echo "$ac_t""$ac_cv_librpathx_libs" 1>&6
+fi
+echo "$as_me:7065: result: $ac_cv_librpathx_libs" >&5
+echo "${ECHO_T}$ac_cv_librpathx_libs" >&6
   LIBRPATHX="$ac_cv_librpathx_libs"
   LTLIBRPATHX="$ac_cv_librpathx_ltlibs"
   INCRPATHX="$ac_cv_librpathx_cppflags"
-  
+
   for element in $INCRPATHX; do
     haveit=
     for x in $CPPFLAGS; do
-      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -5997,55 +7090,44 @@ echo "$ac_t""$ac_cv_librpathx_libs" 1>&6
     fi
   done
 
-  
-  
       HAVE_LIBRPATHX=yes
-  
-  
-
-
-  
-  
-  
-  
-  echo $ac_n "checking how to link with librpathy""... $ac_c" 1>&6
-echo "configure:6013: checking how to link with librpathy" >&5
-if eval "test \"`echo '$''{'ac_cv_librpathy_libs'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    
-  
+
+  echo "$as_me:7095: checking how to link with librpathy" >&5
+echo $ECHO_N "checking how to link with librpathy... $ECHO_C" >&6
+if test "${ac_cv_librpathy_libs+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
     use_additional=yes
-  
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
-  
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
-  # Check whether --with-librpathy-prefix or --without-librpathy-prefix was given.
+# Check whether --with-librpathy-prefix or --without-librpathy-prefix was given.
 if test "${with_librpathy_prefix+set}" = set; then
   withval="$with_librpathy_prefix"
-  
+
     if test "X$withval" = "Xno"; then
       use_additional=no
     else
       if test "X$withval" = "X"; then
-        
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
-  
+
           eval additional_includedir=\"$includedir\"
           eval additional_libdir=\"$libdir\"
-        
+
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
@@ -6055,8 +7137,7 @@ if test "${with_librpathy_prefix+set}" = set; then
       fi
     fi
 
-fi
-
+fi;
       LIBRPATHY=
   LTLIBRPATHY=
   INCRPATHY=
@@ -6112,7 +7193,7 @@ fi
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBRPATHY; do
-              
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -6149,7 +7230,7 @@ fi
           if test "X$found_dir" != "X"; then
                         LTLIBRPATHY="${LTLIBRPATHY}${LTLIBRPATHY:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "X$found_dir" = "X/usr/lib"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
                                 LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so"
               else
                                                                                 haveit=
@@ -6180,7 +7261,7 @@ fi
                   else
                                                                                 haveit=
                     for x in $LDFLAGS $LIBRPATHY; do
-                      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -6231,7 +7312,7 @@ fi
                 fi
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCRPATHY; do
-                    
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -6276,7 +7357,7 @@ fi
                       if test -z "$haveit"; then
                         haveit=
                         for x in $LDFLAGS $LIBRPATHY; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -6297,7 +7378,7 @@ fi
                         fi
                         haveit=
                         for x in $LDFLAGS $LTLIBRPATHY; do
-                          
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -6321,25 +7402,27 @@ fi
                     ;;
                   -R*)
                     dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $dir"
-                    fi
-                                                            haveit=
-                    for x in $ltrpathdirs; do
-                      if test "X$x" = "X$dir"; then
-                        haveit=yes
-                        break
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
                       fi
-                    done
-                    if test -z "$haveit"; then
-                      ltrpathdirs="$ltrpathdirs $dir"
                     fi
                     ;;
                   -l*)
@@ -6393,18 +7476,18 @@ fi
     ac_cv_librpathy_libs="$LIBRPATHY"
     ac_cv_librpathy_ltlibs="$LTLIBRPATHY"
     ac_cv_librpathy_cppflags="$INCRPATHY"
-  
-fi
 
-echo "$ac_t""$ac_cv_librpathy_libs" 1>&6
+fi
+echo "$as_me:7481: result: $ac_cv_librpathy_libs" >&5
+echo "${ECHO_T}$ac_cv_librpathy_libs" >&6
   LIBRPATHY="$ac_cv_librpathy_libs"
   LTLIBRPATHY="$ac_cv_librpathy_ltlibs"
   INCRPATHY="$ac_cv_librpathy_cppflags"
-  
+
   for element in $INCRPATHY; do
     haveit=
     for x in $CPPFLAGS; do
-      
+
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
   acl_save_exec_prefix="$exec_prefix"
@@ -6423,312 +7506,671 @@ echo "$ac_t""$ac_cv_librpathy_libs" 1>&6
     fi
   done
 
-  
-  
       HAVE_LIBRPATHY=yes
-  
-  
-
 
-trap '' 1 2 15
-cat > confcache <<\EOF
+ac_config_files="$ac_config_files Makefile"
+cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
 #
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
 #
-EOF
+# `ac_cv_env_foo' variables (set or unset) will be overriden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 # So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+        "s/'/'\\\\''/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if cmp -s $cache_file confcache; then :; else
   if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
   else
     echo "not updating unwritable cache $cache_file"
   fi
 fi
 rm -f confcache
 
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[ 	]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[ 	]*$//;
+}'
 fi
 
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then we branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+cat >confdef2opt.sed <<\EOF
+t clear
+: clear
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+d
+: quote
+s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
+s,\[,\\&,g
+s,\],\\&,g
+s,\$,$$,g
+p
 EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
+# We use echo to avoid assuming a particular line-breaking character.
+# The extra dot is to prevent the shell from consuming trailing
+# line-breaks from the sub-command output.  A line-break within
+# single-quotes doesn't work because, if this script is created in a
+# platform that uses two characters for line-breaks (e.g., DOS), tr
+# would break.
+ac_LF_and_DOT=`echo; echo .`
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+rm -f confdef2opt.sed
 
-# Without the "./", some shells look in PATH for config.status.
 : ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ echo "$as_me:7621: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
+#! $SHELL
 # Generated automatically by configure.
 # Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
 # Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
+# configure, is in config.log if it exists.
 
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
+debug=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+ac_cs_invocation="\$0 \$@"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+# NLS nuisances.
+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+
+exec 6>&1
+
+_ACEOF
+
+# Files that config.status was made for.
+if test -n "$ac_config_files"; then
+  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_headers"; then
+  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_links"; then
+  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_commands"; then
+  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+fi
+
+cat >>$CONFIG_STATUS <<\EOF
+
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTIONS] [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number, then exit
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+  --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Configuration commands:
+$config_commands
+
+Report bugs to <bug-autoconf@gnu.org>."
+EOF
+
+cat >>$CONFIG_STATUS <<EOF
+ac_cs_version="\\
+config.status
+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
+Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+srcdir=$srcdir
+INSTALL="$INSTALL"
+EOF
+
+cat >>$CONFIG_STATUS <<\EOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
+ac_need_defaults=:
+while test $# != 0
 do
-  case "\$ac_option" in
+  case $1 in
+  --*=*)
+    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+    shift
+    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
+    shift
+    ;;
+  -*);;
+  *) # This is not an option, so the user has probably given explicit
+     # arguments.
+     ac_need_defaults=false;;
+  esac
+
+  case $1 in
+  # Handling of the options.
+EOF
+cat >>$CONFIG_STATUS <<EOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
+    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
+    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
+EOF
+cat >>$CONFIG_STATUS <<\EOF
+  --version | --vers* | -V )
+    echo "$ac_cs_version"; exit 0 ;;
+  --he | --h)
+    # Conflict between --help and --header
+    { { echo "$as_me:7792: 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;}
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit 0 ;;
+  --debug | --d* | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    shift
+    CONFIG_FILES="$CONFIG_FILES $1"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $1"
+    ac_need_defaults=false;;
+
+  # This is an error.
+  -*) { { echo "$as_me:7811: 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; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1" ;;
+
   esac
+  shift
 done
 
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
+exec 5>>config.log
+cat >&5 << _ACEOF
+
+## ----------------------- ##
+## Running config.status.  ##
+## ----------------------- ##
+
+This file was extended by $as_me 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`
 
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+_ACEOF
 EOF
-cat >> $CONFIG_STATUS <<EOF
 
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@EXEEXT@%$EXEEXT%g
-s%@OBJEXT@%$OBJEXT%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@AMTAR@%$AMTAR%g
-s%@install_sh@%$install_sh%g
-s%@INSTALL_STRIP_PROGRAM@%$INSTALL_STRIP_PROGRAM%g
-s%@AWK@%$AWK%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@AMDEP_TRUE@%$AMDEP_TRUE%g
-s%@AMDEP_FALSE@%$AMDEP_FALSE%g
-s%@AMDEPBACKSLASH@%$AMDEPBACKSLASH%g
-s%@DEPDIR@%$DEPDIR%g
-s%@CC@%$CC%g
-s%@am__include@%$am__include%g
-s%@am__quote@%$am__quote%g
-s%@CCDEPMODE@%$CCDEPMODE%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@LN_S@%$LN_S%g
-s%@ECHO@%$ECHO%g
-s%@RANLIB@%$RANLIB%g
-s%@STRIP@%$STRIP%g
-s%@CPP@%$CPP%g
-s%@LIBTOOL@%$LIBTOOL%g
-s%@LIBRPATHX@%$LIBRPATHX%g
-s%@LTLIBRPATHX@%$LTLIBRPATHX%g
-s%@LIBRPATHY@%$LIBRPATHY%g
-s%@LTLIBRPATHY@%$LTLIBRPATHY%g
-s%@global_top_srcdir@%$global_top_srcdir%g
+cat >>$CONFIG_STATUS <<EOF
+#
+# INIT-COMMANDS section.
+#
+
+AMDEP_TRUE="$AMDEP_TRUE"
+ac_aux_dir="$ac_aux_dir"
 
-CEOF
 EOF
 
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
+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" ;;
+  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+  *) { { echo "$as_me:7858: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
 done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
+
+# 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
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
+
+# Create a temporary directory, and hook for its removal unless debugging.
+$debug ||
+{
+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+
+# Create a (secure) tmp directory for tmp files.
+: ${TMPDIR=/tmp}
+{
+  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=$TMPDIR/cs$$-$RANDOM
+  (umask 077 && mkdir $tmp)
+} ||
+{
+   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+   { (exit 1); exit 1; }
+}
+
+EOF
+
+cat >>$CONFIG_STATUS <<EOF
+
+#
+# CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "\$CONFIG_FILES"; then
+  # Protect against being on the right side of a sed subst in config.status.
+  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+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,@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,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@DEFS@,$DEFS,;t t
+s,@LIBS@,$LIBS,;t t
+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@PACKAGE@,$PACKAGE,;t t
+s,@VERSION@,$VERSION,;t t
+s,@EXEEXT@,$EXEEXT,;t t
+s,@OBJEXT@,$OBJEXT,;t t
+s,@ACLOCAL@,$ACLOCAL,;t t
+s,@AUTOCONF@,$AUTOCONF,;t t
+s,@AUTOMAKE@,$AUTOMAKE,;t t
+s,@AUTOHEADER@,$AUTOHEADER,;t t
+s,@MAKEINFO@,$MAKEINFO,;t t
+s,@AMTAR@,$AMTAR,;t t
+s,@install_sh@,$install_sh,;t t
+s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+s,@AWK@,$AWK,;t t
+s,@SET_MAKE@,$SET_MAKE,;t t
+s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
+s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
+s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+s,@DEPDIR@,$DEPDIR,;t t
+s,@CC@,$CC,;t t
+s,@CFLAGS@,$CFLAGS,;t t
+s,@LDFLAGS@,$LDFLAGS,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@ac_ct_CC@,$ac_ct_CC,;t t
+s,@am__include@,$am__include,;t t
+s,@am__quote@,$am__quote,;t t
+s,@CCDEPMODE@,$CCDEPMODE,;t t
+s,@build@,$build,;t t
+s,@build_cpu@,$build_cpu,;t t
+s,@build_vendor@,$build_vendor,;t t
+s,@build_os@,$build_os,;t t
+s,@host@,$host,;t t
+s,@host_cpu@,$host_cpu,;t t
+s,@host_vendor@,$host_vendor,;t t
+s,@host_os@,$host_os,;t t
+s,@LN_S@,$LN_S,;t t
+s,@ECHO@,$ECHO,;t t
+s,@RANLIB@,$RANLIB,;t t
+s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+s,@STRIP@,$STRIP,;t t
+s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
+s,@CPP@,$CPP,;t t
+s,@LIBTOOL@,$LIBTOOL,;t t
+s,@LIBRPATHX@,$LIBRPATHX,;t t
+s,@LTLIBRPATHX@,$LTLIBRPATHX,;t t
+s,@LIBRPATHY@,$LIBRPATHY,;t t
+s,@LTLIBRPATHY@,$LTLIBRPATHY,;t t
+s,@global_top_srcdir@,$global_top_srcdir,;t t
+CEOF
+
 EOF
 
-cat >> $CONFIG_STATUS <<EOF
+  cat >>$CONFIG_STATUS <<\EOF
+  # Split the substitutions into bite-sized pieces for seds with
+  # small command number limits, like on Digital OSF/1 and HP-UX.
+  ac_max_sed_lines=48
+  ac_sed_frag=1 # Number of current file.
+  ac_beg=1 # First line for current file.
+  ac_end=$ac_max_sed_lines # Line after last line for current file.
+  ac_more_lines=:
+  ac_sed_cmds=
+  while $ac_more_lines; do
+    if test $ac_beg -gt 1; then
+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    else
+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    fi
+    if test ! -s $tmp/subs.frag; then
+      ac_more_lines=false
+    else
+      # The purpose of the label and of the branching condition is to
+      # speed up the sed processing (if there are no `@' at all, there
+      # is no need to browse any of the substitutions).
+      # These are the two extra sed commands mentioned above.
+      (echo ':t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+      if test -z "$ac_sed_cmds"; then
+  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+      else
+  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+      fi
+      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_beg=$ac_end
+      ac_end=`expr $ac_end + $ac_max_sed_lines`
+    fi
+  done
+  if test -z "$ac_sed_cmds"; then
+    ac_sed_cmds=cat
+  fi
+fi # test -n "$CONFIG_FILES"
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
 EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+cat >>$CONFIG_STATUS <<\EOF
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+        cat >$tmp/stdin
+        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
   esac
 
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+  ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_file" : 'X\(//\)[^/]' \| \
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
   if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+    { case "$ac_dir" in
+  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+  *)                      as_incr_dir=.;;
+esac
+as_dummy="$ac_dir"
+for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+  case $as_mkdir_dir in
+    # Skip DOS drivespec
+    ?:) as_incr_dir=$as_mkdir_dir ;;
+    *)
+      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
+    ;;
+  esac
+done; }
+
+    ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`"
     # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+    ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'`
   else
     ac_dir_suffix= ac_dots=
   fi
 
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+  case $srcdir in
+  .)  ac_srcdir=.
+      if test -z "$ac_dots"; then
+         ac_top_srcdir=.
+      else
+         ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
+      fi ;;
+  [\\/]* | ?:[\\/]* )
+      ac_srcdir=$srcdir$ac_dir_suffix;
+      ac_top_srcdir=$srcdir ;;
   *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
+    ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_dots$srcdir ;;
   esac
 
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_dots$INSTALL ;;
   esac
 
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:8103: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
+  # Let's still pretend it is `configure' which instantiates (i.e., don't
+  # use $as_me), people would be surprised to read:
+  #    /* config.h.  Generated automatically by config.status.  */
+  configure_input="Generated automatically from `echo $ac_file_in |
+                                                 sed 's,.*/,,'` by configure."
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+         # Absolute (can't be DOS-style, as IFS=:)
+         test -f "$f" || { { echo "$as_me:8121: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         echo $f;;
+      *) # Relative
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$srcdir/$f"; then
+           # Source tree
+           echo $srcdir/$f
+         else
+           # /dev/null tree
+           { { echo "$as_me:8134: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         fi;;
+      esac
+    done` || { (exit 1); exit 1; }
 EOF
-cat >> $CONFIG_STATUS <<EOF
-AMDEP_TRUE="$AMDEP_TRUE"
-ac_aux_dir="$ac_aux_dir"
+cat >>$CONFIG_STATUS <<EOF
+  sed "$ac_vpsub
+$extrasub
+EOF
+cat >>$CONFIG_STATUS <<\EOF
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@configure_input@,$configure_input,;t t
+s,@srcdir@,$ac_srcdir,;t t
+s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@INSTALL@,$ac_INSTALL,;t t
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+  rm -f $tmp/stdin
+  if test x"$ac_file" != x-; then
+    mv $tmp/out $ac_file
+  else
+    cat $tmp/out
+    rm -f $tmp/out
+  fi
 
+done
 EOF
-cat >> $CONFIG_STATUS <<\EOF
+cat >>$CONFIG_STATUS <<\EOF
 
+#
+# CONFIG_COMMANDS section.
+#
+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+
+  case $ac_dest in
+    default-1 )
 test x"$AMDEP_TRUE" != x"" ||
 for mf in $CONFIG_FILES; do
   case "$mf" in
@@ -6766,11 +8208,33 @@ for mf in $CONFIG_FILES; do
     echo '# dummy' > "$dirpart/$file"
   done
 done
+ ;;
+  esac
+done
+EOF
 
+cat >>$CONFIG_STATUS <<\EOF
 
-exit 0
+{ (exit 0); exit 0; }
 EOF
 chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+ac_clean_files=$ac_clean_files_save
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || { (exit 1); exit 1; }
+fi