The following changes were made after this DIFFS file was generated...
 -> po-hash.gen* and po-gram.gen* were renamed to conform to MS-DOS limits.
 -> configure and config.status were changed so files are generated from a
    MS-DOS compatible .in file (ie x.c is made from x.in instead of x.c.in).
 -> The tests were renamed to fit in MS-DOS filenames.
The next port (0.10.33 most likely) will have a DIFFS file that reflects
 these changes.
----------
diff -r -N gettext-0.10.31/intl/Makefile.in gettext-0.10.31.ori/intl/Makefile.in
28,34c28,29
< # As set by configure -- this probably won't match your system.
< # prefix = @prefix@
< # exec_prefix = @exec_prefix@
< 
< # Sets prefix and exec_prefix to $DJDIR
< sinclude djdir.set
< 
---
> prefix = @prefix@
> exec_prefix = @exec_prefix@
42c37
< aliaspath = $(localedir)\;.
---
> aliaspath = $(localedir):.
56,60c51,52
< DEFS = -DDEFLOCDIR=\"$(localedir)\" -DDEFGNULOCDIR=\"$(gnulocaledir)\" \
<        -DDEFALIASPATH=\"$(aliaspath)\" \
<        -DLOCALEDIR="_locale_dir" -DGNULOCALEDIR="_gnu_locale_dir" \
<        -DLOCALE_ALIAS_PATH="_alias_path" \
<        @DEFS@
---
> DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
> -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@
72,77c64,69
< explodename.c getdirs.c
< OBJECTS = @INTLOBJS@ bindtextdom.o dcgettext.o dgettext.o gettext.o \
< finddomain.o loadmsgcat.o localealias.o textdomain.o l10nflist.o \
< explodename.o getdirs.o
< CATOBJS = cat-compat.o ../po/cat-id-tbl.o
< GETTOBJS = intl-compat.o
---
> explodename.c
> OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \
> finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
> explodename.$lo
> CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo
> GETTOBJS = intl-compat.$lo
97,101d88
< djdir.set:
< 	@echo "Configuring paths to \$$DJDIR ($$DJDIR)..."
< 	@echo "prefix=$$DJDIR"      >  $@
< 	@echo "exec_prefix=$$DJDIR" >> $@
< 
111,112c98,99
< ../po/cat-id-tbl.o: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot
< 	cd ../po && $(MAKE) cat-id-tbl.o
---
> ../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot
> 	cd ../po && $(MAKE) cat-id-tbl.$lo
167,168c154,155
< bindtextdom.o finddomain.o loadmsgcat.o: gettextP.h gettext.h loadinfo.h
< dcgettext.o: gettextP.h gettext.h hash-string.h loadinfo.h
---
> bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
> dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h
diff -r -N gettext-0.10.31/intl/bindtextdom.c gettext-0.10.31.ori/intl/bindtextdom.c
49,50d48
< #include "getdirs.h"
< 
54,56c52
< // The original variable is a macro, so this has to be a macro too
< // extern const char _nl_default_dirname[];
< #define _nl_default_dirname GNULOCALEDIR
---
> extern const char _nl_default_dirname[];
diff -r -N gettext-0.10.31/intl/dcgettext.c gettext-0.10.31.ori/intl/dcgettext.c
23d22
< #include <ctype.h>
150,151d148
< #include "getdirs.h"
< 
160,162c157
< // This doesn't work for my variable GNULOCALEDIR definition -- use a macro.
< // const char _nl_default_dirname[] = GNULOCALEDIR;
< #define _nl_default_dirname GNULOCALEDIR
---
> const char _nl_default_dirname[] = GNULOCALEDIR;
269,277c264
<   else if (binding->dirname[0] == '/'
< #if defined (__DJGPP__)
< 	   || binding->dirname[0] == '\\')
<     dirname = binding->dirname;
<   else if(strlen(binding->dirname) >= 3 && isalpha(binding->dirname[0])
< 	  && binding->dirname[1] == ':' &&
< 	  (binding->dirname[2] == '/' || binding->dirname[2] == '\\')
< #endif
< 	)
---
>   else if (binding->dirname[0] == '/')
diff -r -N gettext-0.10.31/intl/getdirs.c gettext-0.10.31.ori/intl/getdirs.c
1,87d0
< #if defined(DEFLOCDIR) || defined(DEFGNULOCDIR) || defined(DEFALIASPATH)
< 
< #include <stddef.h> // For NULL
< #include <stdio.h>
< #include <stdlib.h> // For malloc
< #include <string.h>
< 
< char* strdup(const char* const); // Not in string.h beacause of POSIX
< 
< static const char* const _dir_suffix   = "/share/locale";
< static const char* const _alias_suffix = ";.";
< 
< #ifdef DEFLOCDIR
< // LOCALEDIR
< char* _locale_dir = NULL;
< 
< void getlocaledir() __attribute__ ((constructor));
< 
< void
< getlocaledir()
< {
< char* s = NULL;
<   if(s = getenv("LOCALEDIR")) _locale_dir = strdup(s);
<   else if(s = getenv("DJDIR")) {
<     _locale_dir = (char*) malloc(strlen(s) + strlen(_dir_suffix) + 2);
<     sprintf(_locale_dir, "%s%s", s, _dir_suffix);
<   } else _locale_dir = DEFLOCDIR;
< }
< #endif
< 
< #ifdef DEFGNULOCDIR
< // GNULOCALEDIR
< char* _gnu_locale_dir = NULL;
< 
< void getgnulocaledir() __attribute__ ((constructor));
< 
< void
< getgnulocaledir()
< {
< char* s = NULL;
<   if(s = getenv("GNULOCALEDIR"))   _gnu_locale_dir = strdup(s);
<   else if(s = getenv("LOCALEDIR")) _gnu_locale_dir = strdup(s);
<   else if(s = getenv("DJDIR")) {
<     _gnu_locale_dir = (char*) malloc(strlen(s) + strlen(_dir_suffix) + 2);
<     sprintf(_gnu_locale_dir, "%s%s", s, _dir_suffix);
<   } else _gnu_locale_dir = DEFGNULOCDIR;
< }
< #endif
< 
< #ifdef DEFALIASPATH
< // LOCALE_ALIAS_PATH
< char* _alias_path = NULL;
< 
< void getaliaspath() __attribute__ ((constructor));
< 
< void
< getaliaspath()
< {
< char *s = NULL, *l = NULL, *gl = NULL, *dj = NULL;
<   if(s = getenv("LOCALE_ALIAS_PATH")) _alias_path = strdup(s);
<   else if(s = getenv("ALIASPATH"))    _alias_path = strdup(s);
<   else {
<     gl = getenv("GNULOCALEDIR");
<     l  = getenv("LOCALEDIR");
<     dj = getenv("DJDIR");
< 
<     if(!gl && !l && !dj) _alias_path = DEFALIASPATH;
<     else {
<       _alias_path = (char*)
< 	malloc((gl ? (strlen(gl) + 1) : 0) + (l ? (strlen(l) + 1) : 0)
< 	       + (dj ? (strlen(dj) + strlen(_dir_suffix)) : 0)
< 	       + (strlen(_alias_suffix)) + 2);
<       sprintf(_alias_path, "%s%s%s%s%s%s%s",
< 	      // GNULOCALEDIR;
< 	      (gl ? gl : ""), ((gl && (l || dj)) ? ";"         : ""),
< 	      // GNULOCALEDIR;LOCALEDIR;
< 	      (l  ? l  : ""), ((l && dj)         ? ";"         : ""),
< 	      // GNULOCALEDIR;LOCALEDIR;DJDIR/share/locale
< 	      (dj ? dj : ""), (dj                ? _dir_suffix : ""),
< 	      // GNULOCALEDIR;LOCALEDIR;DJDIR/share/locale;.
< 	      _alias_suffix);
<     }
<   }
< }
< #endif
< 
< #endif
diff -r -N gettext-0.10.31/intl/getdirs.h gettext-0.10.31.ori/intl/getdirs.h
1,11d0
< #ifdef DEFLOCDIR
< extern char* _locale_dir;
< #endif
< 
< #ifdef DEFGNULOCDIR
< extern char* _gnu_locale_dir;
< #endif
< 
< #ifdef DEFALIASPATH
< extern char* _alias_path;
< #endif
diff -r -N gettext-0.10.31/intl/gettext.c gettext-0.10.31.ori/intl/gettext.c
53,54d52
< # undef gettext__  /* Remove any macro definitions */
< # undef dgettext__ /* Remove any macro definitions */
diff -r -N gettext-0.10.31/intl/intl-compat.c gettext-0.10.31.ori/intl/intl-compat.c
64c64
< Gettext (msgid)
---
> gettext (msgid)
diff -r -N gettext-0.10.31/intl/intlh.inst gettext-0.10.31.ori/intl/intlh.inst
1,124d0
< /* libintl.h -- Message catalogs for internationalization.
< Copyright (C) 1995, 1996 Free Software Foundation, Inc.
< 
< This program is free software; you can redistribute it and/or modify
< it under the terms of the GNU General Public License as published by
< the Free Software Foundation; either version 2, or (at your option)
< any later version.
< 
< This program is distributed in the hope that it will be useful,
< but WITHOUT ANY WARRANTY; without even the implied warranty of
< MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
< GNU General Public License for more details.
< 
< You should have received a copy of the GNU General Public License
< along with this program; if not, write to the Free Software
< Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
< 
< #ifndef _LIBINTL_H
< #define _LIBINTL_H	1
< 
< #include <locale.h>
< 
< 
< #ifndef LC_MESSAGES
< /* This value determines the behaviour of the gettext() and dgettext()
<    function.  But some systems do not have this defined.  Define it
<    to a default value.  */
< # define LC_MESSAGES (-1)
< #endif
< 
< /* We define an additional symbol to signal that we use the GNU
<    implementation of gettext.  */
< #define __USE_GNU_GETTEXT 1
< 
< #ifndef PARAMS
< # if __STDC__
< #  define PARAMS(args) args
< # else
< #  define PARAMS(args) ()
< # endif
< #endif
< 
< #ifdef __cplusplus
< extern "C" {
< #endif
< 
< /* Look up MSGID in the current default message catalog for the current
<    LC_MESSAGES locale.  If not found, returns MSGID itself (the default
<    text).  */
< extern char *gettext__ PARAMS ((const char *__msgid));
< 
< /* Some handy aliases */
< #define Gettext(String)      gettext__(String) // Readable
< #define _(String)            gettext__(String) // Easy
< #define gettext_noop(String)           String  // Readable
< #define N_(String)                     String  // Easy
< 
< /* Look up MSGID in the DOMAINNAME message catalog for the current
<    LC_MESSAGES locale.  */
< extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
< 
< /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
<    locale.  */
< extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
< 				int __category));
< 
< 
< /* Set the current default message catalog to DOMAINNAME.
<    If DOMAINNAME is null, return the current default.
<    If DOMAINNAME is "", reset to the default of "messages".  */
< extern char *textdomain PARAMS ((const char *__domainname));
< 
< /* Specify that the DOMAINNAME message catalog will be found
<    in DIRNAME rather than in the system locale data base.  */
< extern char *bindtextdomain PARAMS ((const char *__domainname,
< 				     const char *__dirname));
< 
< 
< /* Optimized version of the functions above.  */
< #if defined __OPTIMIZED
< /* These must be a macro.  Inlined functions are useless because the
<    `__builtin_constant_p' predicate in dcgettext would always return
<    false.  */
< 
< # define gettext__(msgid) dgettext ((char *) 0, msgid)
< 
< # define dgettext(domainname, msgid)					      \
<   dcgettext (domainname, msgid, LC_MESSAGES)
< 
< # if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
< /* This global variable is defined in loadmsgcat.c.  We need a sign,
<    whether a new catalog was loaded, which can be associated with all
<    translations.  */
< extern int _nl_msg_cat_cntr;
< 
< #  define dcgettext(domainname, msgid, category)			      \
<   (__extension__							      \
<    ({									      \
<      char *__result;							      \
<      if (__builtin_constant_p (msgid))					      \
<        {								      \
< 	 static char *__translation__;					      \
< 	 static int __catalog_counter__;				      \
< 	 if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr)    \
< 	   {								      \
< 	     __translation__ =						      \
< 	       (dcgettext) ((domainname), (msgid), (category));		      \
< 	     __catalog_counter__ = _nl_msg_cat_cntr;			      \
< 	   }								      \
< 	 __result = __translation__;					      \
<        }								      \
<      else								      \
<        __result = (dcgettext) ((domainname), (msgid), (category));	      \
<      __result;								      \
<     }))
< # endif
< #endif /* Optimizing. */
< 
< 
< #ifdef __cplusplus
< }
< #endif
< 
< #endif /* libintl.h */
diff -r -N gettext-0.10.31/intl/intlh.inst.in gettext-0.10.31.ori/intl/intlh.inst.in
23,30d22
< 
< #ifndef LC_MESSAGES
< /* This value determines the behaviour of the gettext() and dgettext()
<    function.  But some systems do not have this defined.  Define it
<    to a default value.  */
< # define LC_MESSAGES (-1)
< #endif
< 
50,56c42
< extern char *gettext__ PARAMS ((const char *__msgid));
< 
< /* Some handy aliases */
< #define Gettext(String)      gettext__(String) // Readable
< #define _(String)            gettext__(String) // Easy
< #define gettext_noop(String)           String  // Readable
< #define N_(String)                     String  // Easy
---
> extern char *gettext PARAMS ((const char *__msgid));
85c71
< # define gettext__(msgid) dgettext ((char *) 0, msgid)
---
> # define gettext(msgid) dgettext ((char *) 0, msgid)
diff -r -N gettext-0.10.31/intl/l10nflist.c gettext-0.10.31.ori/intl/l10nflist.c
75,76d74
< char *stpcpy PARAMS ((char *dest, const char *src));
< 
diff -r -N gettext-0.10.31/intl/libgettext.h gettext-0.10.31.ori/intl/libgettext.h
91,93d90
< /* Default shorthand */
< #define _(Str) gettext__(Str)
< 
97c94
< /* extern char *gettext PARAMS ((const char *__msgid)); */
---
> extern char *gettext PARAMS ((const char *__msgid));
134c131
< #  define gettext__(Msgid)						      \
---
> #  define gettext(Msgid)						      \
157c154
< 	       dcgettext__ ((Domainname), (Msgid), (Category));		      \
---
> 	       dcgettext__ (Domainname, Msgid, Category);		      \
163c160
<        __result = dcgettext__ ((Domainname), (Msgid), (Category));	      \
---
>        __result = dcgettext__ (Domainname, Msgid, Category);		      \
171c168
< # define gettext__(Msgid) (Msgid)
---
> # define gettext(Msgid) (Msgid)
diff -r -N gettext-0.10.31/intl/libintl.h gettext-0.10.31.ori/intl/libintl.h
1,185d0
< /* Message catalogs for internationalization.
<    Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
< 
<    This program is free software; you can redistribute it and/or modify
<    it under the terms of the GNU General Public License as published by
<    the Free Software Foundation; either version 2, or (at your option)
<    any later version.
< 
<    This program is distributed in the hope that it will be useful,
<    but WITHOUT ANY WARRANTY; without even the implied warranty of
<    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<    GNU General Public License for more details.
< 
<    You should have received a copy of the GNU General Public License
<    along with this program; if not, write to the Free Software Foundation,
<    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
< 
< /* Because on some systems (e.g. Solaris) we sometimes have to include
<    the systems libintl.h as well as this file we have more complex
<    include protection above.  But the systems header might perhaps also
<    define _LIBINTL_H and therefore we have to protect the definition here.  */
< 
< #if !defined (_LIBINTL_H) || !defined (_LIBGETTEXT_H)
< #if !defined (_LIBINTL_H)
< # define _LIBINTL_H	1
< #endif
< #define _LIBGETTEXT_H	1
< 
< /* We define an additional symbol to signal that we use the GNU
<    implementation of gettext.  */
< #define __USE_GNU_GETTEXT 1
< 
< #include <sys/types.h>
< 
< #if HAVE_LOCALE_H
< # include <locale.h>
< #endif
< 
< 
< #ifdef __cplusplus
< extern "C" {
< #endif
< 
< /* @@ end of prolog @@ */
< 
< #ifndef PARAMS
< # if __STDC__
< #  define PARAMS(args) args
< # else
< #  define PARAMS(args) ()
< # endif
< #endif
< 
< #ifndef NULL
< # if !defined __cplusplus || defined __GNUC__
< #  define NULL ((void *) 0)
< # else
< #  define NULL (0)
< # endif
< #endif
< 
< #if !HAVE_LC_MESSAGES
< /* This value determines the behaviour of the gettext() and dgettext()
<    function.  But some system does not have this defined.  Define it
<    to a default value.  */
< # define LC_MESSAGES (-1)
< #endif
< 
< 
< /* Declarations for gettext-using-catgets interface.  Derived from
<    Jim Meyering's libintl.h.  */
< struct _msg_ent
< {
<   const char *_msg;
<   int _msg_number;
< };
< 
< 
< #if HAVE_CATGETS
< /* These two variables are defined in the automatically by po-to-tbl.sed
<    generated file `cat-id-tbl.c'.  */
< extern const struct _msg_ent _msg_tbl[];
< extern int _msg_tbl_length;
< #endif
< 
< 
< /* For automatical extraction of messages sometimes no real
<    translation is needed.  Instead the string itself is the result.  */
< #define gettext_noop(Str) (Str)
< 
< /* Default shorthand */
< #define _(Str) gettext__(Str)
< 
< /* Look up MSGID in the current default message catalog for the current
<    LC_MESSAGES locale.  If not found, returns MSGID itself (the default
<    text).  */
< /* extern char *gettext PARAMS ((const char *__msgid)); */
< extern char *gettext__ PARAMS ((const char *__msgid));
< 
< /* Look up MSGID in the DOMAINNAME message catalog for the current
<    LC_MESSAGES locale.  */
< extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
< extern char *dgettext__ PARAMS ((const char *__domainname,
< 				 const char *__msgid));
< 
< /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
<    locale.  */
< extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
< 				int __category));
< extern char *dcgettext__ PARAMS ((const char *__domainname,
< 				  const char *__msgid, int __category));
< 
< 
< /* Set the current default message catalog to DOMAINNAME.
<    If DOMAINNAME is null, return the current default.
<    If DOMAINNAME is "", reset to the default of "messages".  */
< extern char *textdomain PARAMS ((const char *__domainname));
< extern char *textdomain__ PARAMS ((const char *__domainname));
< 
< /* Specify that the DOMAINNAME message catalog will be found
<    in DIRNAME rather than in the system locale data base.  */
< extern char *bindtextdomain PARAMS ((const char *__domainname,
< 				  const char *__dirname));
< extern char *bindtextdomain__ PARAMS ((const char *__domainname,
< 				    const char *__dirname));
< 
< #if ENABLE_NLS
< 
< /* Solaris 2.3 has the gettext function but dcgettext is missing.
<    So we omit this optimization for Solaris 2.3.  BTW, Solaris 2.4
<    has dcgettext.  */
< # if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT)
< 
< #  define gettext__(Msgid)						      \
<      dgettext (NULL, Msgid)
< 
< #  define dgettext(Domainname, Msgid)					      \
<      dcgettext (Domainname, Msgid, LC_MESSAGES)
< 
< #  if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7
< /* This global variable is defined in loadmsgcat.c.  We need a sign,
<    whether a new catalog was loaded, which can be associated with all
<    translations.  */
< extern int _nl_msg_cat_cntr;
< 
< #   define dcgettext(Domainname, Msgid, Category)			      \
<   (__extension__							      \
<    ({									      \
<      char *__result;							      \
<      if (__builtin_constant_p (Msgid))					      \
<        {								      \
< 	 static char *__translation__;					      \
< 	 static int __catalog_counter__;				      \
< 	 if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr)    \
< 	   {								      \
< 	     __translation__ =						      \
< 	       dcgettext__ ((Domainname), (Msgid), (Category));		      \
< 	     __catalog_counter__ = _nl_msg_cat_cntr;			      \
< 	   }								      \
< 	 __result = __translation__;					      \
<        }								      \
<      else								      \
<        __result = dcgettext__ ((Domainname), (Msgid), (Category));	      \
<      __result;								      \
<     }))
< #  endif
< # endif
< 
< #else
< 
< # define gettext__(Msgid) (Msgid)
< # define dgettext(Domainname, Msgid) (Msgid)
< # define dcgettext(Domainname, Msgid, Category) (Msgid)
< # define textdomain(Domainname) while (0) /* nothing */
< # define bindtextdomain(Domainname, Dirname) while (0) /* nothing */
< 
< #endif
< 
< /* @@ begin of epilog @@ */
< 
< #ifdef __cplusplus
< }
< #endif
< 
< #endif
diff -r -N gettext-0.10.31/intl/loadmsgcat.c gettext-0.10.31.ori/intl/loadmsgcat.c
87c87
<   fd = open (domain_file->filename, O_RDONLY|O_BINARY);
---
>   fd = open (domain_file->filename, O_RDONLY);
diff -r -N gettext-0.10.31/intl/localealias.c gettext-0.10.31.ori/intl/localealias.c
23,28d22
< #ifdef MSDOS
< #define PATH_SEPARATOR ';'
< #else
< #define PATH_SEPARATOR ':'
< #endif
< 
81,82d74
< #include "getdirs.h"
< 
152c144
<   static const char *locale_alias_path = NULL;
---
>   static const char *locale_alias_path = LOCALE_ALIAS_PATH;
156d147
<   if(locale_alias_path == NULL) locale_alias_path = LOCALE_ALIAS_PATH;
182c173
< 	  while (locale_alias_path[0] == PATH_SEPARATOR)
---
> 	  while (locale_alias_path[0] == ':')
186,187c177
< 	  while (locale_alias_path[0] != '\0' &&
< 		 locale_alias_path[0] != PATH_SEPARATOR)
---
> 	  while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':')
diff -r -N gettext-0.10.31/intl/version gettext-0.10.31.ori/intl/version
1d0
< GNU gettext library from gettext-0.10.31
diff -r -N gettext-0.10.31/lib/error.c gettext-0.10.31.ori/lib/error.c
46,48c46
< #ifdef ENABLE_NLS
< # include <libintl.h>
< #else
---
> #ifndef _
diff -r -N gettext-0.10.31/lib/xmalloc.c gettext-0.10.31.ori/lib/xmalloc.c
40a41
> # define _(Text) gettext (Text)
41a43
> # define textdomain(Domain)
diff -r -N gettext-0.10.31/libtool gettext-0.10.31.ori/libtool
1,124d0
< #! /bin/sh
< 
< # libtool - Provide generalized library-building support services.
< #
< # Generated automatically by ltconfig - GNU libtool 1.0
< # This program was configured as follows,
< # on host ZastaiCentral:
< #
< # CC="gcc" CFLAGS="-O6 -m486" CPPFLAGS="" \
< # LD="ld" RANLIB="ranlib" LN_S="ln -s" \
< #   ./ltconfig
< #
< # Compiler and other test output produced by ltconfig, useful for
< # debugging ltconfig, is in ./config.log if it exists.
< 
< # The version of ltconfig that generated this script.
< LTCONFIG_VERSION="1.0"
< 
< # Whether or not to build libtool libraries.
< build_libtool_libs=no
< 
< # Whether or not to build old-style libraries.
< build_old_libs=yes
< 
< # The host system.
< host_alias="i486-win95-gnu"
< host="i486-win95-gnu"
< 
< # The archiver.
< AR='ar'
< 
< # The linker used to build libraries.
< LD='ld'
< 
< # Whether we need hard or soft links.
< LN_S='ln -s'
< 
< # How to create reloadable object files.
< reload_flag='-r'
< reload_cmds='$LD$reload_flag -o $output$reload_objs'
< 
< # How to pass a linker flag through the compiler.
< wl='-Wl,'
< 
< # Additional compiler flags for building library objects.
< pic_flag='-fPIC'
< 
< # Compiler flag to prevent dynamic linking.
< link_static_flag='-static'
< 
< # Compiler flag to allow reflexive dlopens.
< export_dynamic_flag=''
< 
< # Pattern to match compiler flags for creating libNAME_p libraries:
< profile_flag_pattern='-pg?'
< 
< # Library versioning type.
< version_type=none
< 
< # List of archive names.  First name is the real one, the rest are links.
< # The last name is the one that the linker finds with -lNAME.
< library_names_spec=''
< 
< # The coded name of the library, if different from the real name.
< soname_spec=''
< 
< # Commands used to build and install an old-style archive.
< RANLIB='ranlib'
< old_archive_cmds='$AR cru $oldlib$oldobjs;$RANLIB $oldlib'
< old_postinstall_cmds='chmod 644 $oldlib;$RANLIB $oldlib'
< 
< # Commands used to build and install a shared archive.
< archive_cmds=''
< postinstall_cmds=''
< 
< # Flag that allows shared libraries with undefined symbols to be built.
< allow_undefined_flag=''
< 
< # Commands used to finish a libtool library installation in a directory.
< finish_cmds=''
< 
< # How to strip a library file.
< striplib=''
< old_striplib=''
< 
< # This is the shared library runtime path variable.
< runpath_var=
< 
< # This is the shared library path variable.
< shlibpath_var=
< 
< # How to hardcode a shared library path into an executable.
< hardcode_action=unsupported
< 
< # Flag to hardcode $libdir into a binary during linking.
< # This must work even if $libdir does not exist.
< hardcode_libdir_flag_spec=''
< 
< # Whether we need a single -rpath flag with a separated argument.
< hardcode_libdir_separator=''
< 
< # Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
< # resulting binary.
< hardcode_direct=no
< 
< # Set to yes if using the -LDIR flag during linking hardcodes DIR into the
< # resulting binary.
< hardcode_minus_L=no
< 
< # Set to yes if using RUNPATH_VAR=DIR during linking hardcodes DIR into the
< # resulting binary.
< hardcode_runpath_var=no
< 
< # Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
< # the resulting binary.
< hardcode_shlibpath_var=unsupported
< 
< # Find the path to this script.
< thisdir=`echo "$0" | sed -e 's%/[^/]*$%%'`
< test "X$0" = "X$thisdir" && thisdir=.
< 
< # Execute the libtool backend.
< . $thisdir/./ltmain.sh
< exit 1
diff -r -N gettext-0.10.31/ltconfig gettext-0.10.31.ori/ltconfig
3,4d2
< # Slightly hacked ltconfig -- ltconfig is the lean mean original machine
< 
45,46c43,44
< can_build_shared=no
< enable_shared=no
---
> can_build_shared=yes
> enable_shared=yes
49c47
< ltmain=./ltmain.sh
---
> ltmain=
51c49
< srcdir=.
---
> srcdir=
54c52
< host=i486-win95-gnu
---
> host=
56,58c54,56
< verify_host=no
< with_gcc=yes
< with_gnu_ld=yes
---
> verify_host=yes
> with_gcc=no
> with_gnu_ld=no
197c195,198
< ac_n=-n ac_c='
---
> 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='
198a200,205
>   else
>     ac_n=-n ac_c= ac_t=
>   fi
> else
>   ac_n= ac_c='\c' ac_t=
> fi
206c213,265
< host_alias=$host
---
> if test "$verify_host" = yes; then
>   # Check for config.guess and config.sub.
>   ac_aux_dir=
>   for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
>     if test -f $ac_dir/config.guess; then
>       ac_aux_dir=$ac_dir
>       break
>     fi
>   done
>   if test -z "$ac_aux_dir"; then
>     echo "$progname: cannot find config.guess in $srcdir $srcdir/.. $srcdir/../.." 1>&2
>     echo "$help" 1>&2
>     exit 1
>   fi
>   ac_config_guess=$ac_aux_dir/config.guess
>   ac_config_sub=$ac_aux_dir/config.sub
> 
>   # Make sure we can run config.sub.
>   if $ac_config_sub sun4 >/dev/null 2>&1; then :
>   else
>     echo "$progname: cannot run $ac_config_sub" 1>&2
>     echo "$help" 1>&2
>     exit 1
>   fi
> 
>   echo $ac_n "checking host system type""... $ac_c" 1>&6
> 
>   host_alias=$host
>   case "$host_alias" in
>   "")
>     if host_alias=`$ac_config_guess`; then :
>     else
>       echo "$progname: cannot guess host type; you must specify one" 1>&2
>       echo "$help" 1>&2
>       exit 1
>     fi ;;
>   esac
>   host=`$ac_config_sub $host_alias`
>   echo "$ac_t""$host" 1>&6
> 
> elif test -z "$host"; then
>   echo "$progname: you must specify a host type if you use \`--no-verify'" 1>&2
>   echo "$help" 1>&2
>   exit 1
> else
>   host_alias=$host
> fi
> 
> # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
> case "$host" in
> *-*-linux-gnu*) ;;
> *-*-linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
> esac
216c275,292
< RANLIB=ranlib
---
> # If RANLIB is not set, then run the test.
> if test "${RANLIB+set}" != "set"; then
>   result=no
> 
>   echo $ac_n "checking for ranlib... $ac_c" 1>&6
>   IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
>   for dir in $PATH; do
>     test -z "$dir" && dir=.
>     if test -f $dir/ranlib; then
>       RANLIB="ranlib"
>       result="ranlib"
>       break
>     fi
>   done
>   IFS="$save_ifs"
> 
>   echo $ac_t "$result" 1>&6
> fi
223,227c299,565
< pic_flag='-fPIC'
< profile_flag_pattern='-pg?'
< wl='-Wl,'
< link_static_flag='-static'
< LN_S="ln -s"
---
> # Check to see if we are using GCC.
> if test "$with_gcc" != yes || test -z "$CC"; then
>   # If CC is not set, then try to find GCC or a usable CC.
>   if test -z "$CC"; then
>     echo $ac_n "checking for gcc... $ac_c" 1>&6
>     IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
>     for dir in $PATH; do
>       IFS="$save_ifs"
>       test -z "$dir" && dir=.
>       if test -f $dir/gcc; then
> 	CC="gcc"
> 	break
>       fi
>     done
>     IFS="$save_ifs"
> 
>     if test -n "$CC"; then
>       echo "$ac_t""$CC" 1>&6
>     else
>       echo "$ac_t""no" 1>&6
>     fi
>   fi
> 
>   # Not "gcc", so try "cc", rejecting "/usr/ucb/cc".
>   if test -z "$CC"; then
>     echo $ac_n "checking for cc... $ac_c" 1>&6
>     IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
>     cc_rejected=no
>     for dir in $PATH; do
>       test -z "$dir" && dir=.
>       if test -f $dir/cc; then
> 	if test "$dir/cc" = "/usr/ucb/cc"; then
> 	  cc_rejected=yes
> 	  continue
> 	fi
> 	CC="cc"
> 	break
>       fi
>     done
>     IFS="$save_ifs"
>     if test $cc_rejected = yes; then
>       # We found a bogon in the path, so make sure we never use it.
>       set dummy $CC
>       shift
>       if test $# -gt 0; then
> 	# We chose a different compiler from the bogus one.
> 	# However, it has the same name, so the bogon will be chosen
> 	# first if we set CC to just the name; use the full file name.
> 	shift
> 	set dummy "$dir/cc" "$@"
> 	shift
> 	CC="$@"
>       fi
>     fi
> 
>     if test -n "$CC"; then
>       echo "$ac_t""$CC" 1>&6
>     else
>       echo "$ac_t""no" 1>&6
>     fi
> 
>     if test -z "$CC"; then
>       echo "$progname: error: no acceptable cc found in \$PATH" 1>&2
>       exit 1
>     fi
>   fi
> 
>   # Now see if the compiler is really GCC.
>   with_gcc=no
>   echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
> 
>   trap "$rm conftest.c; exit 1" 1 2 15
>   $rm conftest.c
>   cat > conftest.c <<EOF
> #ifdef __GNUC__
>   yes;
> #endif
> EOF
>   # LINENUM
>   if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
>     with_gcc=yes
>   fi
>   $rm conftest.c
>   echo $ac_t "$with_gcc" 1>&6
> fi
> 
> # Allow CC to be a program name with arguments.
> set dummy $CC
> compiler="$2"
> 
> echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
> pic_flag=
> profile_flag_pattern=
> special_shlib_compile_flags=
> wl=
> link_static_flag=
> 
> if test "$with_gcc" = yes; then
>   pic_flag='-fPIC'
>   profile_flag_pattern='-pg?'
>   wl='-Wl,'
>   link_static_flag='-static'
> else
>   # PORTME Check for PIC flags for the system compiler.
>   case "$host_os" in
>   aix3* | aix4*)
>     # FIXME All rs/6000 code is PIC, but is there any non-rs/6000 AIX platform?
>     pic_flag=
>     link_static_flag='-bnso -bI:/lib/syscalls.exp'
>     ;;
> 
>   hpux9* | hpux10*)
>     # FIXME is there a better link_static_flag that works with the bundled CC?
>     wl='-Wl,'
>     link_static_flag='${wl}-a ${wl}archive'
>     pic_flag='+Z'
>     ;;
> 
>   irix5* | irix6*)
>     wl='-Wl,'
>     link_static_flag='-non_shared'
>     # PIC (with -KPIC) is the default.
>     pic_flag=
>     ;;
> 
>   osf3* | osf4*)
>     # FIXME - pic_flag is probably required for hppa*-osf* and i860-osf*
>     wl='-Wl,'
>     link_static_flag='-non_shared'
>     ;;
> 
>   sco3.2v5*)
>     pic_flag='-Kpic'
>     link_static_flag='-dn'
>     special_shlib_compile_flags='-belf'
>     ;;
> 
>   solaris2*)
>     pic_flag='-KPIC'
>     link_static_flag='-Bstatic'
>     wl='-Wl,'
>     ;;
> 
>   sunos4*)
>     pic_flag='-PIC'
>     link_static_flag='-Bstatic'
>     wl='-Qoption ld '
>     ;;
> 
>   *)
>     can_build_shared=no
>     ;;
>   esac
> fi
> 
> case "$host_cpu" in
> rs6000 | powerpc | powerpcle)
>   # Yippee! All RS/6000 and PowerPC code is position-independent.
>   pic_flag=
>   ;;
> esac
> 
> if test -n "$pic_flag"; then
>   echo $ac_t "$pic_flag" 1>&6
>   pic_flag=" $pic_flag"
> else
>   echo $ac_t none 1>&6
> fi
> 
> # Check for any special shared library compilation flags.
> if test -n "$special_shlib_compile_flags"; then
>   echo "$progname: warning: \`$CC' requires \`$special_shlib_compile_flags' to build shared libraries" 1>&2
>   if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$special_shlib_compile_flags[ 	]" >/dev/null; then :
>   else
>     echo "$progname: add \`$special_shlib_compile_flags' to the CC or CFLAGS env variable and reconfigure" 1>&2
>     can_build_shared=no
>   fi
> fi
> 
> # See if we are using a broken GCC collect2 program.
> if test "$with_gcc" = yes; then
>   echo $ac_n "checking for broken GCC collect2... $ac_c" 1>&6
> 
>   # FIXME: Run a test here, instead of relying on the canonical system name.
>   case "$host_os" in
>   aix3*)
>     can_build_shared=no
>     echo $ac_t yes 1>&6
>     echo "$progname: to build shared libraries, set the CC env variable to \`xlc' and reconfigure" 1>&2
>     ;;
>   *)
>     echo $ac_t no 1>&6
>     ;;
>   esac
> fi
> 
> echo $ac_n "checking for $compiler option to statically link programs... $ac_c" 1>&6
> if test -n "$link_static_flag"; then
>   echo $ac_t "$link_static_flag" 1>&6
> else
>   echo $ac_t none 1>&6
> fi
> 
> if test -z "$LN_S"; then
>   # Check to see if we can use ln -s, or we need hard links.
>   echo $ac_n "checking whether ln -s works... $ac_c" 1>&6
>   rm -f conftestdata
>   if ln -s X conftestdata 2>/dev/null; then
>     rm -f conftestdata
>     LN_S="ln -s"
>   else
>     LN_S=ln
>   fi
>   if test "$LN_S" = "ln -s"; then
>     echo "$ac_t"yes 1>&6
>   else
>     echo "$ac_t"no 1>&6
>   fi
> fi
> 
> if test "$with_gnu_ld" != yes || test -z "$LD"; then
>   if test -z "$LD"; then
>     if test "$with_gnu_ld" = yes; then
>       echo $ac_n "checking for GNU ld... $ac_c" 1>&6
>     else
>       echo $ac_n "checking for non-GNU ld... $ac_c" 1>&6
>     fi
> 
>     IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
>     for ac_dir in $PATH; do
>       test -z "$ac_dir" && ac_dir=.
>       if test -f "$ac_dir/ld"; then
> 	LD="$ac_dir/ld"
> 	# Check to see if the program is GNU ld.  I'd rather use --version,
> 	# but apparently some GNU ld's only accept -v.
> 	# Break only if it was the GNU/non-GNU ld that we prefer.
> 	if "$LD" -v 2>&1 < /dev/null | egrep '(GNU ld|with BFD)' > /dev/null; then
> 	  test "$with_gnu_ld" = yes && break
> 	else
> 	  test "$with_gnu_ld" != yes && break
> 	fi
>       fi
>     done
>     IFS="$ac_save_ifs"
> 
>     if test -n "$LD"; then
>       echo "$ac_t""$LD" 1>&6
>     else
>       echo "$ac_t""no" 1>&6
>     fi
> 
>     if test -z "$LD"; then
>       echo "$progname: error: no acceptable ld found in \$PATH" 1>&2
>       exit 1
>     fi
>   fi
> 
>   echo $ac_n "checking whether we are using GNU ld... $ac_c" 1>&6
>   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
>   if $LD -v 2>&1 </dev/null | egrep '(GNU ld|with BFD)' > /dev/null; then
>     with_gnu_ld=yes
>   fi
>   echo $ac_t "$with_gnu_ld" 1>&6
> fi
> 
> # See if the linker supports building shared libraries.
> echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6
239,241d576
< ld_shlibs=no
< hardcode_action=unsupported
< can_build_shared=no
242a578,741
> ld_shlibs=yes
> if test "$with_gnu_ld" = yes; then
>   # See if GNU ld supports shared libraries.
> 
>   case "$host_os" in
>   sunos4*)
>     ld_shlibs=yes
>     hardcode_direct=yes
>     hardcode_shlibpath_var=no
>     ;;
> 
>   *)
>     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
>       runpath_var=LD_RUN_PATH
>       hardcode_runpath_var=yes
>       ld_shlibs=yes
>     else
>       ld_shlibs=no
>     fi
>     ;;
>   esac
> 
>   if test "$ld_shlibs" = yes; then
>     archive_cmds='$cc -shared ${wl}-soname $wl$soname -o $lib$libobjs$deplibs'
>     hardcode_libdir_flag_spec='${wl}-rpath $wl$libdir'
>     export_dynamic_flag='${wl}-export-dynamic'
>   fi
> else
>   # PORTME fill in a description of your system's linker (not GNU ld)
>   case "$host_os" in
>   aix3*)
>     allow_undefined_flag=unsupported
>     archive_cmds='/usr/ucb/nm$libobjs | egrep \" [BD] \" | sed \"s/^.* //\" > $lib.exp;$LD -o $objdir/$soname$libobjs -bE:$lib.exp -T512 -H512 -bM:SRE -lc$deplibs;$AR cru $lib $objdir/$soname'
>     # Note: this linker hardcodes the directories in LIBPATH if there
>     # are no directories specified by -L.
>     hardcode_minus_L=yes
>     ;;
> 
>   aix4*)
>     allow_undefined_flag=unsupported
>     archive_cmds='/bin/nm -B$libobjs | egrep \" [BD] \" | sed \"s/^.* //\" > $lib.exp;$cc -o $objdir/$soname$libobjs ${wl}-bE:$lib.exp ${wl}-bM:SRE ${wl}-bnoentry$deplibs;$AR cru $lib $objdir/$soname'
>     hardcode_direct=yes
>     hardcode_minus_L=yes
>     ;;
> 
>   # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
>   # support.  Future versions do this automatically, but an explicit c++rt0.o
>   # doesn't break anything, and helps significantly (at the cost of a little
>   # extra space).
>   freebsd2.2*)
>     archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs /usr/lib/c++rt0.o'
>     hardcode_direct=yes
>     hardcode_minus_L=yes
>     hardcode_shlibpath_var=no
>     ;;
> 
>   # Unfortunately, older versions of FreeBSD 2 don't have this feature.
>   freebsd2*)
>     archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs'
>     hardcode_direct=yes
>     hardcode_minus_L=yes
>     hardcode_shlibpath_var=no
>     ;;
> 
>   # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
>   freebsd3*)
>     archive_cmds='$CC -shared -o $lib$libobjs$deplibs'
>     hardcode_direct=yes
>     hardcode_minusL=yes
>     hardcode_shlibpath_var=no
>     ;;
> 
>   hpux9*)
>     archive_cmds='$rm $objdir/$soname;$LD -b +s +b $install_libdir -o $objdir/$soname$libobjs$deplibs;mv $objdir/$soname $lib'
>     hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
>     hardcode_direct=yes
>     hardcode_minus_L=yes
>     ;;
> 
>   hpux10*)
>     archive_cmds='$LD -b +h $soname +s +b $install_libdir -o $lib$libobjs$deplibs'
>     hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
>     hardcode_direct=yes
>     hardcode_minus_L=yes
>     ;;
> 
>   irix5* | irix6*)
>     archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring$libobjs -lc$deplibs'
>     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
>     ;;
> 
>   netbsd* | openbsd*)
>     # Tested with NetBSD 1.2 ld
>     archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs'
>     hardcode_libdir_flag_spec='-R$libdir'
>     hardcode_direct=yes
>     hardcode_shlibpath_var=no
>     ;;
> 
>   osf3* | osf4*)
>     allow_undefined_flag=' -expect_unresolved'
>     archive_cmds='$LD -shared${allow_undefined_flag} -o $lib -soname $soname -set_version $verstring$libobjs -lc$deplibs'
>     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
>     hardcode_libdir_separator=:
>     ;;
> 
>   sco3.2v5*)
>     archive_cmds='$LD -G -o $lib$libobjs$deplibs'
>     hardcode_direct=yes
>     ;;
> 
>   solaris2*)
>     archive_cmds='$LD -G -z text -h $soname -o $lib$libobjs$deplibs'
>     hardcode_libdir_flag_spec='-R$libdir'
>     hardcode_shlibpath_var=no
>     ;;
> 
>   sunos4*)
>     archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs'
>     hardcode_libdir_flag_spec='-L$libdir'
>     hardcode_direct=yes
>     hardcode_minus_L=yes
>     hardcode_shlibpath_var=no
>     ;;
> 
>   *)
>     ld_shlibs=no
>     can_build_shared=no
>     ;;
>   esac
> fi
> echo $ac_t "$ld_shlibs" 1>&6
> 
> # Check hardcoding attributes.
> echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6
> hardcode_action=
> if test -n "$hardcode_libdir_flag_spec" || \
>    test "$hardcode_runpath_var" = yes; then
> 
>   # We can hardcode non-existant directories.
>   if test "$hardcode_direct" != no && \
>      test "$hardcode_minus_L" != no && \
>      test "$hardcode_shlibpath_var" != no; then
> 
>     # Linking always hardcodes the temporary library directory.
>     hardcode_action=relink
>   else
>     # We can link without hardcoding, and we can hardcode nonexisting dirs.
>     hardcode_action=immediate
>   fi
> elif test "$hardcode_direct" != yes && \
>      test "$hardcode_minus_L" != yes && \
>      test "$hardcode_shlibpath_var" != yes; then
>   # We can't hardcode anything.
>   hardcode_action=unsupported
> else
>   # We can only hardcode existing directories.
>   hardcode_action=relink
> fi
> echo $ac_t "$hardcode_action" 1>&6
> test "$hardcode_action" = unsupported && can_build_shared=no
> 
> 
> reload_flag=
243a743,744
> echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6
> # PORTME Some linker may need a different reload flag.
244a746,747
> echo $ac_t "$reload_flag"
> test -n "$reload_flag" && reload_flag=" $reload_flag"
253c756,865
< dynamic_linker=no
---
> dynamic_linker="$host_os ld.so"
> 
> echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
> case "$host_os" in
> aix3* | aix4*)
>   version_type=linux
>   library_names_spec='$libname.so.$versuffix $libname.a'
>   shlibpath_var=LIBPATH
> 
>   # AIX has no versioning support, so we append a major version to the name.
>   soname_spec='$libname.so.$major'
>   ;;
> 
> freebsd2* | freebsd3*)
>   version_type=sunos
>   library_names_spec='$libname.so.$versuffix $libname.so'
>   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>   shlibpath_var=LD_LIBRARY_PATH
>   ;;
> 
> gnu*)
>   version_type=sunos
>   library_names_spec='$libname.so.$versuffix'
>   shlibpath_var=LD_LIBRARY_PATH
>   ;;
> 
> hpux9* | hpux10*)
>   # Give a soname corresponding to the major version so that dld.sl refuses to
>   # link against other versions.
>   dynamic_linker="$host_os dld.sl"
>   version_type=sunos
>   shlibpath_var=SHLIB_PATH
>   library_names_spec='$libname.sl.$versuffix $libname.sl.$major $libname.sl'
>   soname_spec='$libname.sl.$major'
>   # HP-UX runs *really* slowly unless shared libraries are mode 555.
>   postinstall_cmds='chmod 555 $lib'
>   ;;
> 
> irix5* | irix6*)
>   version_type=osf
>   soname_spec='$libname.so'
>   library_names_spec='$libname.so.$versuffix $libname.so'
>   shlibpath_var=LD_LIBRARY_PATH
>   ;;
> 
> # No shared lib support for Linux oldld, aout, or coff.
> linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
>   dynamic_linker=no
>   ;;
> 
> # This must be Linux ELF.
> linux-gnu*)
>   version_type=linux
>   library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
>   soname_spec='$libname.so.$major'
>   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
>   shlibpath_var=LD_LIBRARY_PATH
> 
>   if test -f /lib/ld.so.1; then
>     dynamic_linker='GNU ld.so'
>   else
>     # Only the GNU ld.so supports shared libraries on MkLinux.
>     case "$host_cpu" in
>     powerpc*) dynamic_linker=no ;;
>     *) dynamic_linker='Linux ld.so' ;;
>     esac
>   fi
>   ;;
> 
> netbsd* | openbsd*)
>   version_type=sunos
>   library_names_spec='$libname.so.$versuffix'
>   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>   shlibpath_var=LD_LIBRARY_PATH
>   ;;
> 
> osf3* | osf4*)
>   version_type=osf
>   soname_spec='$libname.so'
>   library_names_spec='$libname.so.$versuffix $libname.so'
>   shlibpath_var=LD_LIBRARY_PATH
>   ;;
> 
> sco3.2v5*)
>   version_type=osf
>   soname_spec='$libname.so.$major'
>   library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
>   shlibpath_var=LD_LIBRARY_PATH
>   ;;
> 
> solaris2*)
>   version_type=linux
>   library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
>   soname_spec='$libname.so.$major'
>   shlibpath_var=LD_LIBRARY_PATH
>   ;;
> 
> sunos4*)
>   version_type=sunos
>   library_names_spec='$libname.so.$versuffix'
>   finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
>   shlibpath_var=LD_LIBRARY_PATH
>   ;;
> 
> *)
>   dynamic_linker=no
>   ;;
> esac
> echo "$ac_t""$dynamic_linker"
> test "$dynamic_linker" = no && can_build_shared=no
261,262c873,912
< enable_shared=no
< enable_static=yes
---
> #echo $ac_n "checking for static library strip program... $ac_c" 1>&6
> #if test -n "$old_striplib"; then
> #  echo $ac_t "$old_striplib" 1>&6
> #else
> #  echo $ac_t none 1>&6
> #fi
> 
> #if test "$can_build_shared" = yes; then
> #  echo $ac_n "checking for shared library strip program... $ac_c" 1>&6
> #
> #  if test -n "$striplib"; then
> #    echo $ac_t "$striplib" 1>&6
> #  else
> #    echo $ac_t none 1>&6
> #  fi
> #fi
> 
> # Report the consequences.
> echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6
> 
> echo $ac_n "checking whether to build shared libraries... $ac_c" 1>&6
> test "$can_build_shared" = "no" && enable_shared=no
> 
> # On AIX, shared libraries and static libraries use the same namespace.
> case "$host_os" in
> aix*)
>   test "$enable_shared" = yes && enable_static=no
>   if test -n "$RANLIB"; then
>     archive_cmds="$archive_cmds;\$RANLIB \$lib"
>     postinstall_cmds='$RANLIB $lib'
>   fi
>   ;;
> esac
> 
> echo "$ac_t""$enable_shared" 1>&6
> 
> # Make sure either enable_shared or enable_static is yes.
> test "$enable_shared" = yes || enable_static=yes
> 
> echo "checking whether to build static libraries... $enable_static" 1>&6
diff -r -N gettext-0.10.31/ltconfig.ori gettext-0.10.31.ori/ltconfig.ori
1,1064d0
< #! /bin/sh
< 
< # ltconfig - Create a system-specific libtool.
< # When updating this script, search for LINENUM and fix line number refs.
< # Generated automatically from ltconfig.in by configure.
< # Copyright (C) 1996, 1997, Free Software Foundation, Inc.
< # Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
< #
< # This file is free software; you can redistribute it and/or modify it
< # under the terms of the GNU General Public License as published by
< # the Free Software Foundation; either version 2 of the License, or
< # (at your option) any later version.
< #
< # This program is distributed in the hope that it will be useful, but
< # WITHOUT ANY WARRANTY; without even the implied warranty of
< # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
< # General Public License for more details.
< #
< # You should have received a copy of the GNU General Public License
< # along with this program; if not, write to the Free Software
< # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
< #
< # As a special exception to the GNU General Public License, if you
< # distribute this file as part of a program that contains a
< # configuration script generated by Autoconf, you may include it under
< # the same distribution terms that you use for the rest of that program.
< 
< # A lot of this script is taken from autoconf-2.10.
< 
< # The name of this program.
< progname=`echo "$0" | sed 's%^.*/%%'`
< 
< # Constants:
< PROGRAM=ltconfig
< PACKAGE=libtool
< VERSION=1.0
< ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
< rm="rm -f"
< 
< help="Try \`$progname --help' for more information."
< 
< # Global variables:
< can_build_shared=yes
< enable_shared=yes
< # All known linkers require a `.a' archive for static linking.
< enable_static=yes
< ltmain=
< silent=
< srcdir=
< ac_config_guess=
< ac_config_sub=
< host=
< nonopt=
< verify_host=yes
< with_gcc=no
< with_gnu_ld=no
< 
< old_AR="$AR"
< old_CC="$CC"
< old_CFLAGS="$CFLAGS"
< old_CPPFLAGS="$CPPFLAGS"
< old_LD="$LD"
< old_LN_S="$LN_S"
< old_RANLIB="$RANLIB"
< 
< test -z "$AR" && AR=ar
< 
< # Parse the command line options.
< args=
< prev=
< for option
< do
<   case "$option" in
<   -*=*) optarg=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
<   *) optarg= ;;
<   esac
< 
<   # If the previous option needs an argument, assign it.
<   if test -n "$prev"; then
<     eval "$prev=\$option"
<     prev=
<     continue
<   fi
< 
<   case "$option" in
<   --help) cat <<EOM
< Usage: $progname [OPTION]... LTMAIN [HOST]
< 
< Generate a system-specific libtool script.
< 
<     --disable-shared       do not build shared libraries
<     --disable-static       do not build static libraries
<     --help                 display this help and exit
<     --no-verify            do not verify that HOST is a valid host type
<     --quiet                same as \`--silent'
<     --silent               don't print informational messages
<     --srcdir=DIR           find \`config.guess' in DIR
<     --version              output version information and exit
<     --with-gcc             assume that the GNU C compiler will be used
<     --with-gnu-ld          assume that the C compiler uses the GNU linker
< 
< LTMAIN is the \`ltmain.sh' shell script fragment that provides basic libtool
< functionality.
< 
< HOST is the canonical host system name [default=guessed].
< EOM
<   exit 0
<   ;;
< 
<   --disable-shared) enable_shared=no ;;
< 
<   --disable-static) enable_static=no ;;
< 
<   --quiet | --silent) silent=yes ;;
< 
<   --srcdir) prev=srcdir ;;
<   --srcdir=*) srcdir="$optarg" ;;
< 
<   --no-verify) verify_host=no ;;
< 
<   --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION"; exit 0 ;;
< 
<   --with-gcc) with_gcc=yes ;;
<   --with-gnu-ld) with_gnu_ld=yes ;;
< 
<   -*)
<     echo "$progname: unrecognized option \`$option'" 1>&2
<     echo "$help" 1>&2
<     exit 1
<     ;;
< 
<   *)
<     if test -z "$ltmain"; then
<       ltmain="$option"
<     elif test -z "$host"; then
< # FIXME This generates an unnecessary warning for sparc-sun-solaris4.1.3_U1
< #      if test -n "`echo $option| sed 's/[-a-z0-9.]//g'`"; then
< #        echo "$progname: warning \`$option' is not a valid host type" 1>&2
< #      fi
<       host="$option"
<     else
<       echo "$progname: too many arguments" 1>&2
<       echo "$help" 1>&2
<       exit 1
<     fi ;;
<   esac
< done
< 
< if test -z "$ltmain"; then
<   echo "$progname: you must specify a LTMAIN file" 1>&2
<   echo "$help" 1>&2
<   exit 1
< fi
< 
< if test -f "$ltmain"; then :
< else
<   echo "$progname: warning: \`$ltmain' does not exist" 1>&2
< fi
< 
< # Quote any args containing shell metacharacters.
< ltconfig_args=
< for arg
< do
<   case "$arg" in
<   *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
<   ltconfig_args="$ltconfig_args '$arg'" ;;
<   *) ltconfig_args="$ltconfig_args $arg" ;;
<   esac
< done
< 
< # A relevant subset of AC_INIT.
< 
< # 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
< # 5 compiler messages saved in config.log
< # 6 checking for... messages and results
< if test "$silent" = yes; then
<   exec 6>/dev/null
< else
<   exec 6>&1
< fi
< exec 5>>./config.log
< 
< # NLS nuisances.
< # Only set LANG and LC_ALL to C if already set.
< # These must not be set unconditionally because not all systems understand
< # e.g. LANG=C (notably SCO).
< if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
< if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
< 
< 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
< else
<   ac_n= ac_c='\c' ac_t=
< fi
< 
< if test -z "$srcdir"; then
<   # Assume the source directory is the same one as the path to ltmain.sh.
<   srcdir=`echo "$ltmain" | sed 's%/[^/]*$%%'`
<   test "$srcdir" = "$ltmain" && srcdir=.
< fi
< 
< if test "$verify_host" = yes; then
<   # Check for config.guess and config.sub.
<   ac_aux_dir=
<   for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
<     if test -f $ac_dir/config.guess; then
<       ac_aux_dir=$ac_dir
<       break
<     fi
<   done
<   if test -z "$ac_aux_dir"; then
<     echo "$progname: cannot find config.guess in $srcdir $srcdir/.. $srcdir/../.." 1>&2
<     echo "$help" 1>&2
<     exit 1
<   fi
<   ac_config_guess=$ac_aux_dir/config.guess
<   ac_config_sub=$ac_aux_dir/config.sub
< 
<   # Make sure we can run config.sub.
<   if $ac_config_sub sun4 >/dev/null 2>&1; then :
<   else
<     echo "$progname: cannot run $ac_config_sub" 1>&2
<     echo "$help" 1>&2
<     exit 1
<   fi
< 
<   echo $ac_n "checking host system type""... $ac_c" 1>&6
< 
<   host_alias=$host
<   case "$host_alias" in
<   "")
<     if host_alias=`$ac_config_guess`; then :
<     else
<       echo "$progname: cannot guess host type; you must specify one" 1>&2
<       echo "$help" 1>&2
<       exit 1
<     fi ;;
<   esac
<   host=`$ac_config_sub $host_alias`
<   echo "$ac_t""$host" 1>&6
< 
< elif test -z "$host"; then
<   echo "$progname: you must specify a host type if you use \`--no-verify'" 1>&2
<   echo "$help" 1>&2
<   exit 1
< else
<   host_alias=$host
< fi
< 
< # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
< case "$host" in
< *-*-linux-gnu*) ;;
< *-*-linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
< esac
< 
< host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
< host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
< host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
< 
< # Determine commands to create old-style static archives.
< old_archive_cmds='$AR cru $oldlib$oldobjs'
< old_postinstall_cmds='chmod 644 $oldlib'
< 
< # If RANLIB is not set, then run the test.
< if test "${RANLIB+set}" != "set"; then
<   result=no
< 
<   echo $ac_n "checking for ranlib... $ac_c" 1>&6
<   IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
<   for dir in $PATH; do
<     test -z "$dir" && dir=.
<     if test -f $dir/ranlib; then
<       RANLIB="ranlib"
<       result="ranlib"
<       break
<     fi
<   done
<   IFS="$save_ifs"
< 
<   echo $ac_t "$result" 1>&6
< fi
< 
< if test -n "$RANLIB"; then
<   old_archive_cmds="$old_archive_cmds;\$RANLIB \$oldlib"
<   old_postinstall_cmds="$old_postinstall_cmds;\$RANLIB \$oldlib"
< fi
< 
< # Check to see if we are using GCC.
< if test "$with_gcc" != yes || test -z "$CC"; then
<   # If CC is not set, then try to find GCC or a usable CC.
<   if test -z "$CC"; then
<     echo $ac_n "checking for gcc... $ac_c" 1>&6
<     IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
<     for dir in $PATH; do
<       IFS="$save_ifs"
<       test -z "$dir" && dir=.
<       if test -f $dir/gcc; then
< 	CC="gcc"
< 	break
<       fi
<     done
<     IFS="$save_ifs"
< 
<     if test -n "$CC"; then
<       echo "$ac_t""$CC" 1>&6
<     else
<       echo "$ac_t""no" 1>&6
<     fi
<   fi
< 
<   # Not "gcc", so try "cc", rejecting "/usr/ucb/cc".
<   if test -z "$CC"; then
<     echo $ac_n "checking for cc... $ac_c" 1>&6
<     IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
<     cc_rejected=no
<     for dir in $PATH; do
<       test -z "$dir" && dir=.
<       if test -f $dir/cc; then
< 	if test "$dir/cc" = "/usr/ucb/cc"; then
< 	  cc_rejected=yes
< 	  continue
< 	fi
< 	CC="cc"
< 	break
<       fi
<     done
<     IFS="$save_ifs"
<     if test $cc_rejected = yes; then
<       # We found a bogon in the path, so make sure we never use it.
<       set dummy $CC
<       shift
<       if test $# -gt 0; then
< 	# We chose a different compiler from the bogus one.
< 	# However, it has the same name, so the bogon will be chosen
< 	# first if we set CC to just the name; use the full file name.
< 	shift
< 	set dummy "$dir/cc" "$@"
< 	shift
< 	CC="$@"
<       fi
<     fi
< 
<     if test -n "$CC"; then
<       echo "$ac_t""$CC" 1>&6
<     else
<       echo "$ac_t""no" 1>&6
<     fi
< 
<     if test -z "$CC"; then
<       echo "$progname: error: no acceptable cc found in \$PATH" 1>&2
<       exit 1
<     fi
<   fi
< 
<   # Now see if the compiler is really GCC.
<   with_gcc=no
<   echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
< 
<   trap "$rm conftest.c; exit 1" 1 2 15
<   $rm conftest.c
<   cat > conftest.c <<EOF
< #ifdef __GNUC__
<   yes;
< #endif
< EOF
<   # LINENUM
<   if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
<     with_gcc=yes
<   fi
<   $rm conftest.c
<   echo $ac_t "$with_gcc" 1>&6
< fi
< 
< # Allow CC to be a program name with arguments.
< set dummy $CC
< compiler="$2"
< 
< echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
< pic_flag=
< profile_flag_pattern=
< special_shlib_compile_flags=
< wl=
< link_static_flag=
< 
< if test "$with_gcc" = yes; then
<   pic_flag='-fPIC'
<   profile_flag_pattern='-pg?'
<   wl='-Wl,'
<   link_static_flag='-static'
< else
<   # PORTME Check for PIC flags for the system compiler.
<   case "$host_os" in
<   aix3* | aix4*)
<     # FIXME All rs/6000 code is PIC, but is there any non-rs/6000 AIX platform?
<     pic_flag=
<     link_static_flag='-bnso -bI:/lib/syscalls.exp'
<     ;;
< 
<   hpux9* | hpux10*)
<     # FIXME is there a better link_static_flag that works with the bundled CC?
<     wl='-Wl,'
<     link_static_flag='${wl}-a ${wl}archive'
<     pic_flag='+Z'
<     ;;
< 
<   irix5* | irix6*)
<     wl='-Wl,'
<     link_static_flag='-non_shared'
<     # PIC (with -KPIC) is the default.
<     pic_flag=
<     ;;
< 
<   osf3* | osf4*)
<     # FIXME - pic_flag is probably required for hppa*-osf* and i860-osf*
<     wl='-Wl,'
<     link_static_flag='-non_shared'
<     ;;
< 
<   sco3.2v5*)
<     pic_flag='-Kpic'
<     link_static_flag='-dn'
<     special_shlib_compile_flags='-belf'
<     ;;
< 
<   solaris2*)
<     pic_flag='-KPIC'
<     link_static_flag='-Bstatic'
<     wl='-Wl,'
<     ;;
< 
<   sunos4*)
<     pic_flag='-PIC'
<     link_static_flag='-Bstatic'
<     wl='-Qoption ld '
<     ;;
< 
<   *)
<     can_build_shared=no
<     ;;
<   esac
< fi
< 
< case "$host_cpu" in
< rs6000 | powerpc | powerpcle)
<   # Yippee! All RS/6000 and PowerPC code is position-independent.
<   pic_flag=
<   ;;
< esac
< 
< if test -n "$pic_flag"; then
<   echo $ac_t "$pic_flag" 1>&6
<   pic_flag=" $pic_flag"
< else
<   echo $ac_t none 1>&6
< fi
< 
< # Check for any special shared library compilation flags.
< if test -n "$special_shlib_compile_flags"; then
<   echo "$progname: warning: \`$CC' requires \`$special_shlib_compile_flags' to build shared libraries" 1>&2
<   if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$special_shlib_compile_flags[ 	]" >/dev/null; then :
<   else
<     echo "$progname: add \`$special_shlib_compile_flags' to the CC or CFLAGS env variable and reconfigure" 1>&2
<     can_build_shared=no
<   fi
< fi
< 
< # See if we are using a broken GCC collect2 program.
< if test "$with_gcc" = yes; then
<   echo $ac_n "checking for broken GCC collect2... $ac_c" 1>&6
< 
<   # FIXME: Run a test here, instead of relying on the canonical system name.
<   case "$host_os" in
<   aix3*)
<     can_build_shared=no
<     echo $ac_t yes 1>&6
<     echo "$progname: to build shared libraries, set the CC env variable to \`xlc' and reconfigure" 1>&2
<     ;;
<   *)
<     echo $ac_t no 1>&6
<     ;;
<   esac
< fi
< 
< echo $ac_n "checking for $compiler option to statically link programs... $ac_c" 1>&6
< if test -n "$link_static_flag"; then
<   echo $ac_t "$link_static_flag" 1>&6
< else
<   echo $ac_t none 1>&6
< fi
< 
< if test -z "$LN_S"; then
<   # Check to see if we can use ln -s, or we need hard links.
<   echo $ac_n "checking whether ln -s works... $ac_c" 1>&6
<   rm -f conftestdata
<   if ln -s X conftestdata 2>/dev/null; then
<     rm -f conftestdata
<     LN_S="ln -s"
<   else
<     LN_S=ln
<   fi
<   if test "$LN_S" = "ln -s"; then
<     echo "$ac_t"yes 1>&6
<   else
<     echo "$ac_t"no 1>&6
<   fi
< fi
< 
< if test "$with_gnu_ld" != yes || test -z "$LD"; then
<   if test -z "$LD"; then
<     if test "$with_gnu_ld" = yes; then
<       echo $ac_n "checking for GNU ld... $ac_c" 1>&6
<     else
<       echo $ac_n "checking for non-GNU ld... $ac_c" 1>&6
<     fi
< 
<     IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
<     for ac_dir in $PATH; do
<       test -z "$ac_dir" && ac_dir=.
<       if test -f "$ac_dir/ld"; then
< 	LD="$ac_dir/ld"
< 	# Check to see if the program is GNU ld.  I'd rather use --version,
< 	# but apparently some GNU ld's only accept -v.
< 	# Break only if it was the GNU/non-GNU ld that we prefer.
< 	if "$LD" -v 2>&1 < /dev/null | egrep '(GNU ld|with BFD)' > /dev/null; then
< 	  test "$with_gnu_ld" = yes && break
< 	else
< 	  test "$with_gnu_ld" != yes && break
< 	fi
<       fi
<     done
<     IFS="$ac_save_ifs"
< 
<     if test -n "$LD"; then
<       echo "$ac_t""$LD" 1>&6
<     else
<       echo "$ac_t""no" 1>&6
<     fi
< 
<     if test -z "$LD"; then
<       echo "$progname: error: no acceptable ld found in \$PATH" 1>&2
<       exit 1
<     fi
<   fi
< 
<   echo $ac_n "checking whether we are using GNU ld... $ac_c" 1>&6
<   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
<   if $LD -v 2>&1 </dev/null | egrep '(GNU ld|with BFD)' > /dev/null; then
<     with_gnu_ld=yes
<   fi
<   echo $ac_t "$with_gnu_ld" 1>&6
< fi
< 
< # See if the linker supports building shared libraries.
< echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6
< 
< allow_undefined_flag=
< archive_cmds=
< export_dynamic_flag=
< hardcode_libdir_flag_spec=
< hardcode_libdir_separator=
< hardcode_direct=no
< hardcode_minus_L=no
< hardcode_runpath_var=no
< hardcode_shlibpath_var=unsupported
< runpath_var=
< 
< ld_shlibs=yes
< if test "$with_gnu_ld" = yes; then
<   # See if GNU ld supports shared libraries.
< 
<   case "$host_os" in
<   sunos4*)
<     ld_shlibs=yes
<     hardcode_direct=yes
<     hardcode_shlibpath_var=no
<     ;;
< 
<   *)
<     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
<       runpath_var=LD_RUN_PATH
<       hardcode_runpath_var=yes
<       ld_shlibs=yes
<     else
<       ld_shlibs=no
<     fi
<     ;;
<   esac
< 
<   if test "$ld_shlibs" = yes; then
<     archive_cmds='$cc -shared ${wl}-soname $wl$soname -o $lib$libobjs$deplibs'
<     hardcode_libdir_flag_spec='${wl}-rpath $wl$libdir'
<     export_dynamic_flag='${wl}-export-dynamic'
<   fi
< else
<   # PORTME fill in a description of your system's linker (not GNU ld)
<   case "$host_os" in
<   aix3*)
<     allow_undefined_flag=unsupported
<     archive_cmds='/usr/ucb/nm$libobjs | egrep \" [BD] \" | sed \"s/^.* //\" > $lib.exp;$LD -o $objdir/$soname$libobjs -bE:$lib.exp -T512 -H512 -bM:SRE -lc$deplibs;$AR cru $lib $objdir/$soname'
<     # Note: this linker hardcodes the directories in LIBPATH if there
<     # are no directories specified by -L.
<     hardcode_minus_L=yes
<     ;;
< 
<   aix4*)
<     allow_undefined_flag=unsupported
<     archive_cmds='/bin/nm -B$libobjs | egrep \" [BD] \" | sed \"s/^.* //\" > $lib.exp;$cc -o $objdir/$soname$libobjs ${wl}-bE:$lib.exp ${wl}-bM:SRE ${wl}-bnoentry$deplibs;$AR cru $lib $objdir/$soname'
<     hardcode_direct=yes
<     hardcode_minus_L=yes
<     ;;
< 
<   # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
<   # support.  Future versions do this automatically, but an explicit c++rt0.o
<   # doesn't break anything, and helps significantly (at the cost of a little
<   # extra space).
<   freebsd2.2*)
<     archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs /usr/lib/c++rt0.o'
<     hardcode_direct=yes
<     hardcode_minus_L=yes
<     hardcode_shlibpath_var=no
<     ;;
< 
<   # Unfortunately, older versions of FreeBSD 2 don't have this feature.
<   freebsd2*)
<     archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs'
<     hardcode_direct=yes
<     hardcode_minus_L=yes
<     hardcode_shlibpath_var=no
<     ;;
< 
<   # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
<   freebsd3*)
<     archive_cmds='$CC -shared -o $lib$libobjs$deplibs'
<     hardcode_direct=yes
<     hardcode_minusL=yes
<     hardcode_shlibpath_var=no
<     ;;
< 
<   hpux9*)
<     archive_cmds='$rm $objdir/$soname;$LD -b +s +b $install_libdir -o $objdir/$soname$libobjs$deplibs;mv $objdir/$soname $lib'
<     hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
<     hardcode_direct=yes
<     hardcode_minus_L=yes
<     ;;
< 
<   hpux10*)
<     archive_cmds='$LD -b +h $soname +s +b $install_libdir -o $lib$libobjs$deplibs'
<     hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
<     hardcode_direct=yes
<     hardcode_minus_L=yes
<     ;;
< 
<   irix5* | irix6*)
<     archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring$libobjs -lc$deplibs'
<     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
<     ;;
< 
<   netbsd* | openbsd*)
<     # Tested with NetBSD 1.2 ld
<     archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs'
<     hardcode_libdir_flag_spec='-R$libdir'
<     hardcode_direct=yes
<     hardcode_shlibpath_var=no
<     ;;
< 
<   osf3* | osf4*)
<     allow_undefined_flag=' -expect_unresolved'
<     archive_cmds='$LD -shared${allow_undefined_flag} -o $lib -soname $soname -set_version $verstring$libobjs -lc$deplibs'
<     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
<     hardcode_libdir_separator=:
<     ;;
< 
<   sco3.2v5*)
<     archive_cmds='$LD -G -o $lib$libobjs$deplibs'
<     hardcode_direct=yes
<     ;;
< 
<   solaris2*)
<     archive_cmds='$LD -G -z text -h $soname -o $lib$libobjs$deplibs'
<     hardcode_libdir_flag_spec='-R$libdir'
<     hardcode_shlibpath_var=no
<     ;;
< 
<   sunos4*)
<     archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs'
<     hardcode_libdir_flag_spec='-L$libdir'
<     hardcode_direct=yes
<     hardcode_minus_L=yes
<     hardcode_shlibpath_var=no
<     ;;
< 
<   *)
<     ld_shlibs=no
<     can_build_shared=no
<     ;;
<   esac
< fi
< echo $ac_t "$ld_shlibs" 1>&6
< 
< # Check hardcoding attributes.
< echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6
< hardcode_action=
< if test -n "$hardcode_libdir_flag_spec" || \
<    test "$hardcode_runpath_var" = yes; then
< 
<   # We can hardcode non-existant directories.
<   if test "$hardcode_direct" != no && \
<      test "$hardcode_minus_L" != no && \
<      test "$hardcode_shlibpath_var" != no; then
< 
<     # Linking always hardcodes the temporary library directory.
<     hardcode_action=relink
<   else
<     # We can link without hardcoding, and we can hardcode nonexisting dirs.
<     hardcode_action=immediate
<   fi
< elif test "$hardcode_direct" != yes && \
<      test "$hardcode_minus_L" != yes && \
<      test "$hardcode_shlibpath_var" != yes; then
<   # We can't hardcode anything.
<   hardcode_action=unsupported
< else
<   # We can only hardcode existing directories.
<   hardcode_action=relink
< fi
< echo $ac_t "$hardcode_action" 1>&6
< test "$hardcode_action" = unsupported && can_build_shared=no
< 
< 
< reload_flag=
< reload_cmds='$LD$reload_flag -o $output$reload_objs'
< echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6
< # PORTME Some linker may need a different reload flag.
< reload_flag='-r'
< echo $ac_t "$reload_flag"
< test -n "$reload_flag" && reload_flag=" $reload_flag"
< 
< # PORTME Fill in your ld.so characteristics
< library_names_spec=
< soname_spec=
< postinstall_cmds=
< finish_cmds=
< shlibpath_var=
< version_type=none
< dynamic_linker="$host_os ld.so"
< 
< echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
< case "$host_os" in
< aix3* | aix4*)
<   version_type=linux
<   library_names_spec='$libname.so.$versuffix $libname.a'
<   shlibpath_var=LIBPATH
< 
<   # AIX has no versioning support, so we append a major version to the name.
<   soname_spec='$libname.so.$major'
<   ;;
< 
< freebsd2* | freebsd3*)
<   version_type=sunos
<   library_names_spec='$libname.so.$versuffix $libname.so'
<   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
<   shlibpath_var=LD_LIBRARY_PATH
<   ;;
< 
< gnu*)
<   version_type=sunos
<   library_names_spec='$libname.so.$versuffix'
<   shlibpath_var=LD_LIBRARY_PATH
<   ;;
< 
< hpux9* | hpux10*)
<   # Give a soname corresponding to the major version so that dld.sl refuses to
<   # link against other versions.
<   dynamic_linker="$host_os dld.sl"
<   version_type=sunos
<   shlibpath_var=SHLIB_PATH
<   library_names_spec='$libname.sl.$versuffix $libname.sl.$major $libname.sl'
<   soname_spec='$libname.sl.$major'
<   # HP-UX runs *really* slowly unless shared libraries are mode 555.
<   postinstall_cmds='chmod 555 $lib'
<   ;;
< 
< irix5* | irix6*)
<   version_type=osf
<   soname_spec='$libname.so'
<   library_names_spec='$libname.so.$versuffix $libname.so'
<   shlibpath_var=LD_LIBRARY_PATH
<   ;;
< 
< # No shared lib support for Linux oldld, aout, or coff.
< linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
<   dynamic_linker=no
<   ;;
< 
< # This must be Linux ELF.
< linux-gnu*)
<   version_type=linux
<   library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
<   soname_spec='$libname.so.$major'
<   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
<   shlibpath_var=LD_LIBRARY_PATH
< 
<   if test -f /lib/ld.so.1; then
<     dynamic_linker='GNU ld.so'
<   else
<     # Only the GNU ld.so supports shared libraries on MkLinux.
<     case "$host_cpu" in
<     powerpc*) dynamic_linker=no ;;
<     *) dynamic_linker='Linux ld.so' ;;
<     esac
<   fi
<   ;;
< 
< netbsd* | openbsd*)
<   version_type=sunos
<   library_names_spec='$libname.so.$versuffix'
<   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
<   shlibpath_var=LD_LIBRARY_PATH
<   ;;
< 
< osf3* | osf4*)
<   version_type=osf
<   soname_spec='$libname.so'
<   library_names_spec='$libname.so.$versuffix $libname.so'
<   shlibpath_var=LD_LIBRARY_PATH
<   ;;
< 
< sco3.2v5*)
<   version_type=osf
<   soname_spec='$libname.so.$major'
<   library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
<   shlibpath_var=LD_LIBRARY_PATH
<   ;;
< 
< solaris2*)
<   version_type=linux
<   library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
<   soname_spec='$libname.so.$major'
<   shlibpath_var=LD_LIBRARY_PATH
<   ;;
< 
< sunos4*)
<   version_type=sunos
<   library_names_spec='$libname.so.$versuffix'
<   finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
<   shlibpath_var=LD_LIBRARY_PATH
<   ;;
< 
< *)
<   dynamic_linker=no
<   ;;
< esac
< echo "$ac_t""$dynamic_linker"
< test "$dynamic_linker" = no && can_build_shared=no
< 
< # FIXME need to add library stripping features
< # strip -x works for most platforms, though not for static libraries on NetBSD
< # HP-UX requires "-r" for library stripping
< striplib=
< old_striplib=
< 
< #echo $ac_n "checking for static library strip program... $ac_c" 1>&6
< #if test -n "$old_striplib"; then
< #  echo $ac_t "$old_striplib" 1>&6
< #else
< #  echo $ac_t none 1>&6
< #fi
< 
< #if test "$can_build_shared" = yes; then
< #  echo $ac_n "checking for shared library strip program... $ac_c" 1>&6
< #
< #  if test -n "$striplib"; then
< #    echo $ac_t "$striplib" 1>&6
< #  else
< #    echo $ac_t none 1>&6
< #  fi
< #fi
< 
< # Report the consequences.
< echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6
< 
< echo $ac_n "checking whether to build shared libraries... $ac_c" 1>&6
< test "$can_build_shared" = "no" && enable_shared=no
< 
< # On AIX, shared libraries and static libraries use the same namespace.
< case "$host_os" in
< aix*)
<   test "$enable_shared" = yes && enable_static=no
<   if test -n "$RANLIB"; then
<     archive_cmds="$archive_cmds;\$RANLIB \$lib"
<     postinstall_cmds='$RANLIB $lib'
<   fi
<   ;;
< esac
< 
< echo "$ac_t""$enable_shared" 1>&6
< 
< # Make sure either enable_shared or enable_static is yes.
< test "$enable_shared" = yes || enable_static=yes
< 
< echo "checking whether to build static libraries... $enable_static" 1>&6
< 
< ofile=libtool
< trap "$rm $ofile; exit 1" 1 2 15
< echo creating $ofile
< rm -fr $ofile
< cat <<EOF > $ofile
< #! /bin/sh
< 
< # libtool - Provide generalized library-building support services.
< #
< # Generated automatically by $PROGRAM - GNU $PACKAGE $VERSION
< # This program was configured as follows,
< # on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
< #
< # CC="$old_CC" CFLAGS="$old_CFLAGS" CPPFLAGS="$old_CPPFLAGS" \\
< # LD="$old_LD" RANLIB="$old_RANLIB" LN_S="$old_LN_S" \\
< #   $0$ltconfig_args
< #
< # Compiler and other test output produced by $progname, useful for
< # debugging $progname, is in ./config.log if it exists.
< 
< # The version of $progname that generated this script.
< LTCONFIG_VERSION="$VERSION"
< 
< # Whether or not to build libtool libraries.
< build_libtool_libs=$enable_shared
< 
< # Whether or not to build old-style libraries.
< build_old_libs=$enable_static
< 
< # The host system.
< host_alias="$host_alias"
< host="$host"
< 
< # The archiver.
< AR='$AR'
< 
< # The linker used to build libraries.
< LD='$LD'
< 
< # Whether we need hard or soft links.
< LN_S='$LN_S'
< 
< # How to create reloadable object files.
< reload_flag='$reload_flag'
< reload_cmds='$reload_cmds'
< 
< # How to pass a linker flag through the compiler.
< wl='$wl'
< 
< # Additional compiler flags for building library objects.
< pic_flag='$pic_flag'
< 
< # Compiler flag to prevent dynamic linking.
< link_static_flag='$link_static_flag'
< 
< # Compiler flag to allow reflexive dlopens.
< export_dynamic_flag='$export_dynamic_flag'
< 
< # Pattern to match compiler flags for creating libNAME_p libraries:
< profile_flag_pattern='$profile_flag_pattern'
< 
< # Library versioning type.
< version_type=$version_type
< 
< # List of archive names.  First name is the real one, the rest are links.
< # The last name is the one that the linker finds with -lNAME.
< library_names_spec='$library_names_spec'
< 
< # The coded name of the library, if different from the real name.
< soname_spec='$soname_spec'
< 
< # Commands used to build and install an old-style archive.
< RANLIB='$RANLIB'
< old_archive_cmds='$old_archive_cmds'
< old_postinstall_cmds='$old_postinstall_cmds'
< 
< # Commands used to build and install a shared archive.
< archive_cmds='$archive_cmds'
< postinstall_cmds='$postinstall_cmds'
< 
< # Flag that allows shared libraries with undefined symbols to be built.
< allow_undefined_flag='$allow_undefined_flag'
< 
< # Commands used to finish a libtool library installation in a directory.
< finish_cmds='$finish_cmds'
< 
< # How to strip a library file.
< striplib='$striplib'
< old_striplib='$old_striplib'
< 
< # This is the shared library runtime path variable.
< runpath_var=$runpath_var
< 
< # This is the shared library path variable.
< shlibpath_var=$shlibpath_var
< 
< # How to hardcode a shared library path into an executable.
< hardcode_action=$hardcode_action
< 
< # Flag to hardcode \$libdir into a binary during linking.
< # This must work even if \$libdir does not exist.
< hardcode_libdir_flag_spec='$hardcode_libdir_flag_spec'
< 
< # Whether we need a single -rpath flag with a separated argument.
< hardcode_libdir_separator='$hardcode_libdir_separator'
< 
< # Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
< # resulting binary.
< hardcode_direct=$hardcode_direct
< 
< # Set to yes if using the -LDIR flag during linking hardcodes DIR into the
< # resulting binary.
< hardcode_minus_L=$hardcode_minus_L
< 
< # Set to yes if using RUNPATH_VAR=DIR during linking hardcodes DIR into the
< # resulting binary.
< hardcode_runpath_var=$hardcode_runpath_var
< 
< # Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
< # the resulting binary.
< hardcode_shlibpath_var=$hardcode_shlibpath_var
< 
< EOF
< 
< # Detect if we are using a relative or absolute path to ltmain.sh.
< case "$ltmain" in
< /*) cat <<EOF2 >> $ofile
< # Execute the libtool backend.
< . $ltmain
< EOF2
<   ;;
< *) cat <<EOF3 >> $ofile
< # Find the path to this script.
< thisdir=\`echo "\$0" | sed -e 's%/[^/]*\$%%'\`
< test "X\$0" = "X\$thisdir" && thisdir=.
< 
< # Execute the libtool backend.
< . \$thisdir/$ltmain
< EOF3
<   ;;
< esac
< 
< echo 'exit 1' >> $ofile
< 
< chmod +x $ofile
< exit 0
< 
< # Local Variables:
< # mode:shell-script
< # sh-indentation:2
< # End:
diff -r -N gettext-0.10.31/misc/Makefile.in gettext-0.10.31.ori/misc/Makefile.in
171c171
< 	if test "$(EMACS)" != no; then \
---
> 	if test $(EMACS) != no; then \
diff -r -N gettext-0.10.31/misc/gettextize gettext-0.10.31.ori/misc/gettextize
1,236d0
< #! /bin/sh
< #
< # Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
< #
< # This program is free software; you can redistribute it and/or modify
< # it under the terms of the GNU General Public License as published by
< # the Free Software Foundation; either version 2, or (at your option)
< # any later version.
< #
< # This program is distributed in the hope that it will be useful,
< # but WITHOUT ANY WARRANTY; without even the implied warranty of
< # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
< # GNU General Public License for more details.
< #
< # You should have received a copy of the GNU General Public License
< # along with this program; if not, write to the Free Software
< # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
< #
< 
< # This file is meant for authors or maintainers which want to
< # internationalize their package with the help of GNU gettext.  For
< # further information how to use it consult the GNU gettext manual.
< 
< echo=echo
< progname=$0
< force=0
< configstatus=0
< origdir=`pwd`
< usage="\
< Usage: gettextize [OPTION]... [package-dir]
<       --help           print this help and exit
<       --version        print version information and exit
<   -c, --copy           copy files instead of making symlinks
<   -f, --force          force writing of new files even if old exist
< Report bugs to <bug-gnu-utils@prep.ai.mit.edu>."
< package=gettext
< version=0.10.31
< aclocal_version=
< try_ln_s=:
< 
< while test $# -gt 0; do
<   case "$1" in
<     -c | --copy | --c* )
<       shift
<       try_ln_s=false ;;
<     -f | --force | --f* )
<       shift
<       force=1 ;;
<     -r | --run | --r* )
<       shift
<       configstatus=1 ;;
<     --help | --h* )
<       $echo "$usage"; exit 0 ;;
<     --version | --v* )
<       echo "$progname (GNU $package) $version"
<       $echo "Copyright (C) 1996 Free Software Foundation, Inc.
< This is free software; see the source for copying conditions.  There is NO
< warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
<       exit 0 ;;
<     -- )	# Stop option prcessing
<       shift; break ;;
<     -* )
<       $echo "gettextize: unknown option $1"
<       $echo "Try \`gettextize --help' for more information."; exit 1 ;;
<     * )
<       break ;;
<   esac
< done
< 
< if test $# -gt 1; then
<   $echo "$usage"
<   exit 1
< fi
< 
< # Fill in the command line options value.
< if test $# -eq 1; then
<   srcdir=$1
<   if cd $srcdir; then
<     srcdir=`pwd`
<   else
<     $echo "Cannot change directory to \`$srcdir'"
<     exit 1
<   fi
< else
<   srcdir=$origdir
< fi
< 
< # Directory where the sources are stored.
< prefix=G:/Djgpp
< gettext_dir=${prefix}/share/gettext
< 
< test -f configure.in || {
<   $echo "Missing configure.in, please cd to your package first."
<   exit 1
< }
< 
< if test -d intl && test $force -eq 0; then
<   $echo "\
< intl/ subdirectory exists: use option -f if you really want to delete it."
<   exit 1
< fi
< 
< if test -f po/Makefile.in.in && test $force -eq 0; then
<   $echo "\
< po/Makefile.in.in exists: use option -f if you really want to delete it."
<   exit 1
< fi
< 
< if test -f NLS && test $force -eq 0; then
<   $echo "NLS exists: use option -f if you really want to delete it."
<   exit 1
< fi
< 
< rm -fr intl
< mkdir intl || {
<   $echo "failed to create intl/ subdirectory"
<   exit 1;
< }
< 
< test -d po || mkdir po || {
<    $echo "failed to create po/ subdirectory"
<    exit 1
< }
< 
< # For simplicity we changed to the gettext source directory.
< cd $gettext_dir
< 
< # Now copy all files.  Take care for the destination directories.
< for file in *; do
<   case $file in
<     intl | po | demo)
<       ;;
<     *)
<       rm -f $srcdir/$file
<       ($try_ln_s && ln -s $gettext_dir/$file $srcdir/$file) 2>/dev/null ||
<       cp $file $srcdir/$file
<       ;;
<   esac
< done
< 
< # Copy files to intl/ subdirectory.
< cd intl
< for file in *; do
<   rm -f $srcdir/intl/$file
<   ($try_ln_s && ln -s $gettext_dir/intl/$file $srcdir/intl/$file) 2>/dev/null ||
<   cp $file $srcdir/intl/$file
< done
< 
< # Copy files to po/ subdirectory.
< cd ../po
< for file in *; do
<   rm -f $srcdir/po/$file
<   ($try_ln_s && ln -s $gettext_dir/po/$file $srcdir/po/$file) 2>/dev/null ||
<   cp $file $srcdir/po/$file
< done
< 
< 
< # Check whether we can run config.status to produce intl/Makefile.in.
< cd $origdir
< if test -f ./config.status; then
<   if test $configstatus -eq 0; then
<     echo "Shall I run config.status? (y/N)"
<     read ans
<     case "$ans" in
<       y* | Y* | 1* )
< 	configstatus=1 ;;
<       * )
< 	;;
<     esac
<   fi
< 
<   test $configstatus -ne 0 &&
<     (CONFIG_FILES=intl/Makefile CONFIG_HEADERS= ./config.status)
< fi
< 
< merge=no
< OLD_IFS="$IFS"
< IFS="."
< cntr=0
< major=0; minor=0; subminor=0
< for num in $aclocal_version; do
<   case $cntr in
<     0) major=$num;;
<     1) minor=$num;;
<     2) subminor=$num;;
<   esac
<   cntr=`expr $cntr + 1`
< done
< IFS="$OLD_IFS"
< 
< set `sed -e 's/.*Last updated for gettext-\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]\)*.*/\1 \2 \3/p' -e d aclocal.m4` >/dev/null
< 
< 
< if test $# -lt 2 || test $# -gt 3; then
<   merge=yes
< else
<   here_major=$1; here_minor=$2
<   if test $# -eq 2; then
<     here_subminor=0
<   else
<     here_subminor=$3
<   fi
< 
<   if test $major -eq $here_major; then
<     if test $minor -eq $here_minor; then
<       if test $subminor -lt $here_subminor; then
< 	merge=gettext
<       elif test $subminor -gt $here_subminor; then
< 	merge=yes
<       fi
<     else
<       if test $minor -lt $here_minor; then
< 	merge=gettext
<       else
< 	merge=yes
<       fi
<     fi
<   else
<     if test $major -lt $here_major; then
<       merge=gettext
<     else
<       merge=yes
<     fi
<   fi
< fi
< 
< if test "$merge" = "yes"; then
<   $echo "You should update your own \`aclocal.m4' by adding the necessary"
<   $echo "macro packages gettext.m4, lcmessage.m4 and progtest.m4 from"
<   $echo "the directory \`$gettext_dir/demo/aclocal.m4'"
< elif test "$merge" = "gettext"; then
<   $echo "Your \`aclocal.m4' file is newer than the installed gettext"
<   $echo "program.  Consider upgrading to a recent GNU gettext version."
< fi
< 
< exit 0
diff -r -N gettext-0.10.31/misc/po-mode.el gettext-0.10.31.ori/misc/po-mode.el
221c221
<     ("^\\(msgid \\|msgstr \\|domain \\)?\"\\|\"$" . font-lock-keyword-face)
---
>     ("^\\(msgid \\|msgstr \\)?\"\\|\"$" . font-lock-keyword-face)
223,228c223,226
<     ("^#\\([^:,\n].*\\|\\)$" 0 font-lock-comment-face t)
<     ("^#: " (0 font-lock-comment-face)
<      ("\\([^:]+\\):\\([0-9]+\\)" nil nil (1 font-lock-function-name-face)
<       (2 font-lock-reference-face)))
<     ("^#, " (0 font-lock-comment-face)
<      ("\\([^,]+\\)\\(, \\|$\\)" nil nil (1 font-lock-function-name-face)))
---
>     ("^# .*\\|^#[:,]?" . font-lock-comment-face)
>     ("^#:\\(.*\\)" 1 font-lock-reference-face)
>     ;; The following line does not work, and I wonder why.
>     ;;("^#,\\(.*\\)" 1 font-function-name-reference-face)
231a230,243
> ;; Old activator for `font lock'.  Is it still useful?  I don't think so.
> ;;
> ;;(if (boundp 'font-lock-keywords)
> ;;    (put 'po-mode 'font-lock-keywords 'po-font-lock-keywords))
> 
> ;; `hilit19' based hilighting code has been disabled, as most probably
> ;; nobody really needs it (it also generates ugly byte-compiler warnings).
> ;;
> ;;(if (fboundp 'hilit-set-mode-patterns)
> ;;    (hilit-set-mode-patterns 'po-mode
> ;;			     '(("^# .*\\|^#$" nil comment)
> ;;			       ("^#[.,:].*" nil include)
> ;;			       ("^\\(msgid\\|msgstr\\) *\"" nil keyword)
> ;;			       ("^\"\\|\"$" nil keyword))))
322c334
<   (setq font-lock-defaults '(po-font-lock-keywords))
---
>   (setq font-lock-defaults '(po-font-lock-keywords t))
363,364c375
<   (setq po-keywords '(("gettext") ("gettext_noop") ("_") ("N_")
< 		      ("Gettext") ("gettext__") ("dgettext") ("dcgettext")))
---
>   (setq po-keywords '(("gettext") ("gettext_noop") ("_") ("N_")))
1654,1657d1664
< (defvar po-string-overlay (make-overlay 0 0 nil nil 'rear-advance))
< (overlay-put po-string-overlay 'detachable nil)
< (overlay-put po-string-overlay 'face 'region)
< 
1690c1697
< 	(cond ((or (string= mode-name "C") (string= mode-name "C++"))
---
> 	(cond ((string= mode-name "C")
1702,1703d1708
<       (if (and start end) (move-overlay po-string-overlay start end buffer))
< 
1762c1767
<       (setq end (cond ((or (string= mode-name "C") (string= mode-name "C++"))
---
>       (setq end (cond ((string= mode-name "C")
1898,1913d1902
< (defun po-fake-mode ()
<   "Major mode to freely edit .po files. Can only be used while in PO Mode.
< This is really just fundamental-mode with PO Mode-style fontification.
< "
<   (interactive)
<   (if (not (eq major-mode 'po-mode))
<       (error "Not in PO Mode!"))
<   (fundamental-mode)
<   (setq buffer-read-only nil)
<   (setq major-mode 'fake-po-mode)
<   (setq mode-name "Fake PO")
<   (make-local-variable 'font-lock-defaults)
<   (setq font-lock-defaults '(po-font-lock-keywords))
< )
< 
< (provide 'po-mode)
Binary files gettext-0.10.31/misc/po-mode.elc and gettext-0.10.31.ori/misc/po-mode.elc differ
diff -r -N gettext-0.10.31/po/Makefile.in gettext-0.10.31.ori/po/Makefile.in
1,256d0
< # Generated automatically from Makefile.in.in by configure.
< # Makefile for program source directory in GNU NLS utilities package.
< # Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
< #
< # This program is free software; you can redistribute it and/or modify
< # it under the terms of the GNU General Public License as published by
< # the Free Software Foundation; either version 2, or (at your option)
< # any later version.
< #
< # This program is distributed in the hope that it will be useful,
< # but WITHOUT ANY WARRANTY; without even the implied warranty of
< # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
< # GNU General Public License for more details.
< #
< # You should have received a copy of the GNU General Public License
< # along with this program; if not, write to the Free Software
< # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
< 
< PACKAGE = gettext
< VERSION = 0.10.31
< 
< SHELL = /bin/sh
< 
< 
< srcdir = .
< top_srcdir = ..
< 
< prefix = G:/Djgpp
< exec_prefix = G:/Djgpp
< datadir = $(prefix)/share
< localedir = $(datadir)/locale
< gnulocaledir = $(prefix)/share/locale
< gettextsrcdir = $(prefix)/share/gettext/po
< subdir = po
< 
< INSTALL = ../install
< INSTALL_DATA = ${INSTALL} -m 644
< MKINSTALLDIRS = $(top_srcdir)/./mkinstalldirs
< 
< CC = gcc -posix
< GENCAT = 
< GMSGFMT = PATH=../src\;$$PATH msgfmt
< MSGFMT = msgfmt
< XGETTEXT = PATH=../src\;$$PATH xgettext
< MSGMERGE = PATH=../src\;$$PATH msgmerge
< 
< DEFS = -DHAVE_CONFIG_H
< CFLAGS = -O6 -m486
< CPPFLAGS = 
< 
< INCLUDES = -I.. -I$(top_srcdir)/intl
< 
< COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
< 
< SOURCES = cat-id-tbl.c
< POFILES =  de.po es.po fr.po ko.po nl.po no.po no@nynorsk.po pl.po pt.po sl.po sv.po
< GMOFILES =  de.gmo es.gmo fr.gmo ko.gmo nl.gmo no.gmo no@nynorsk.gmo pl.gmo pt.gmo sl.gmo sv.gmo
< DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
< stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
< 
< POTFILES = \
< 
< CATALOGS =  nl.gmo
< CATOBJEXT = .gmo
< INSTOBJEXT = .mo
< 
< .SUFFIXES:
< .SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
< 
< .c.o:
< 	$(COMPILE) $<
< 
< .po.pox:
< 	$(MAKE) $(PACKAGE).pot
< 	$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
< 
< .po.mo:
< 	$(MSGFMT) -o $@ $<
< 
< .po.gmo:
< 	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
< 	  && rm -f $$file && $(GMSGFMT) -o $$file $<
< 
< .po.cat:
< 	sed -f ../intl/po2msg.sed < $< > $*.msg \
< 	  && rm -f $@ && $(GENCAT) $@ $*.msg
< 
< 
< all: all-yes
< 
< all-yes: cat-id-tbl.c $(CATALOGS)
< all-no:
< 
< $(srcdir)/$(PACKAGE).pot: $(POTFILES)
< 	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
< 	  --add-comments --keyword=_ --keyword=N_ \
< 	  --files-from=$(srcdir)/POTFILES.in
< 	rm -f $(srcdir)/$(PACKAGE).pot
< 	mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot
< 
< $(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
< $(srcdir)/stamp-cat-id: $(PACKAGE).pot
< 	rm -f cat-id-tbl.tmp
< 	sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
< 		| sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
< 	if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
< 	  rm cat-id-tbl.tmp; \
< 	else \
< 	  echo cat-id-tbl.c changed; \
< 	  rm -f $(srcdir)/cat-id-tbl.c; \
< 	  mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
< 	fi
< 	cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
< 
< 
< install: install-exec install-data
< install-exec:
< install-data: install-data-yes
< install-data-no: all
< install-data-yes: all
< 	if test -r $(MKINSTALLDIRS); then \
< 	  $(MKINSTALLDIRS) $(datadir); \
< 	else \
< 	  $(top_srcdir)/mkinstalldirs $(datadir); \
< 	fi
< 	@catalogs='$(CATALOGS)'; \
< 	for cat in $$catalogs; do \
< 	  cat=`basename $$cat`; \
< 	  case "$$cat" in \
< 	    *.gmo) destdir=$(gnulocaledir);; \
< 	    *)     destdir=$(localedir);; \
< 	  esac; \
< 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
< 	  dir=$$destdir/$$lang/LC_MESSAGES; \
< 	  if test -r $(MKINSTALLDIRS); then \
< 	    $(MKINSTALLDIRS) $$dir; \
< 	  else \
< 	    $(top_srcdir)/mkinstalldirs $$dir; \
< 	  fi; \
< 	  if test -r $$cat; then \
< 	    $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
< 	    echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
< 	  else \
< 	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
< 	    echo "installing $(srcdir)/$$cat as" \
< 		 "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
< 	  fi; \
< 	  if test -r $$cat.m; then \
< 	    $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
< 	    echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
< 	  else \
< 	    if test -r $(srcdir)/$$cat.m ; then \
< 	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
< 		$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
< 	      echo "installing $(srcdir)/$$cat as" \
< 		   "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
< 	    else \
< 	      true; \
< 	    fi; \
< 	  fi; \
< 	done
< 	if test "$(PACKAGE)" = "gettext"; then \
< 	  if test -r $(MKINSTALLDIRS); then \
< 	    $(MKINSTALLDIRS) $(gettextsrcdir); \
< 	  else \
< 	    $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
< 	  fi; \
< 	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
< 			  $(gettextsrcdir)/Makefile.in.in; \
< 	else \
< 	  : ; \
< 	fi
< 
< # Define this as empty until I found a useful application.
< installcheck:
< 
< uninstall:
< 	catalogs='$(CATALOGS)'; \
< 	for cat in $$catalogs; do \
< 	  cat=`basename $$cat`; \
< 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
< 	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
< 	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
< 	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
< 	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
< 	done
< 	rm -f $(gettextsrcdir)/po-Makefile.in.in
< 
< check: all
< 
< cat-id-tbl.o: ../intl/libgettext.h
< 
< dvi info tags TAGS ID:
< 
< mostlyclean:
< 	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
< 	rm -fr *.o
< 
< clean: mostlyclean
< 
< distclean: clean
< 	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
< 
< maintainer-clean: distclean
< 	@echo "This command is intended for maintainers to use;"
< 	@echo "it deletes files that may require special tools to rebuild."
< 	rm -f $(GMOFILES)
< 
< distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
< dist distdir: update-po $(DISTFILES)
< 	dists="$(DISTFILES)"; \
< 	for file in $$dists; do \
< 	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
< 	    || cp -p $(srcdir)/$$file $(distdir); \
< 	done
< 
< update-po: Makefile
< 	$(MAKE) $(PACKAGE).pot
< 	PATH=`pwd`/../src:$$PATH; \
< 	cd $(srcdir); \
< 	catalogs='$(CATALOGS)'; \
< 	for cat in $$catalogs; do \
< 	  cat=`basename $$cat`; \
< 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
< 	  mv $$lang.po $$lang.old.po; \
< 	  echo "$$lang:"; \
< 	  if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
< 	    rm -f $$lang.old.po; \
< 	  else \
< 	    echo "msgmerge for $$cat failed!"; \
< 	    rm -f $$lang.po; \
< 	    mv $$lang.old.po $$lang.po; \
< 	  fi; \
< 	done
< 
< POTFILES: POTFILES.in
< 	( if test 'x$(srcdir)' != 'x.'; then \
< 	    posrcprefix='$(top_srcdir)/'; \
< 	  else \
< 	    posrcprefix="../"; \
< 	  fi; \
< 	  rm -f $@-t $@ \
< 	    && (sed -e '/^#/d' -e '/^[ 	]*$$/d' \
< 		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in \
< 		| sed -e '$$s/\\$$//') > $@-t \
< 	    && chmod a-w $@-t \
< 	    && mv $@-t $@ )
< 
< Makefile: Makefile.in.in ../config.status POTFILES
< 	cd .. \
< 	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
< 	       $(SHELL) ./config.status
< 
< # Tell versions [3.59,3.63) of GNU make not to export all variables.
< # Otherwise a system limit (for SysV at least) may be exceeded.
< .NOEXPORT:
diff -r -N gettext-0.10.31/po/Makefile.in.in gettext-0.10.31.ori/po/Makefile.in.in
42c42
< GMSGFMT = PATH=../src\;$$PATH @GMSGFMT@
---
> GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
44,45c44,45
< XGETTEXT = PATH=../src\;$$PATH @XGETTEXT@
< MSGMERGE = PATH=../src\;$$PATH msgmerge
---
> XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
> MSGMERGE = PATH=../src:$$PATH msgmerge
diff -r -N gettext-0.10.31/po/cat-id-tbl.c gettext-0.10.31.ori/po/cat-id-tbl.c
0a1,233
> /* Automatically generated by po2tbl.sed from gettext.pot.  */
> 
> #if HAVE_CONFIG_H
> # include <config.h>
> #endif
> 
> #include "libgettext.h"
> 
> const struct _msg_ent _msg_tbl[] = {
>   {"", 1},
>   {"Unknown system error", 2},
>   {"%s: option `%s' is ambiguous\n", 3},
>   {"%s: option `--%s' doesn't allow an argument\n", 4},
>   {"%s: option `%c%s' doesn't allow an argument\n", 5},
>   {"%s: option `%s' requires an argument\n", 6},
>   {"%s: unrecognized option `--%s'\n", 7},
>   {"%s: unrecognized option `%c%s'\n", 8},
>   {"%s: illegal option -- %c\n", 9},
>   {"%s: invalid option -- %c\n", 10},
>   {"%s: option requires an argument -- %c\n", 11},
>   {"%s: option `-W %s' is ambiguous\n", 12},
>   {"%s: option `-W %s' doesn't allow an argument\n", 13},
>   {"Memory exhausted", 14},
>   {"\
> Copyright (C) %s Free Software Foundation, Inc.\n\
> 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", 15},
>   {"Written by %s.\n", 16},
>   {"missing arguments", 17},
>   {"too many arguments", 18},
>   {"Try `%s --help' for more information.\n", 19},
>   {"\
> Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n\
>   -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n\
>   -e                        enable expansion of some escape sequences\n\
>   -E                        (ignored for compatibility)\n\
>   -h, --help                display this help and exit\n\
>   -n                        suppress trailing newline\n\
>   -V, --version             display version information and exit\n\
>   [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n\
>                             to MSGID from TEXTDOMAIN\n", 20},
>   {"\
> \n\
> If the TEXTDOMAIN parameter is not given, the domain is determined from the\n\
> environment variable TEXTDOMAIN.  If the message catalog is not found in the\n\
> regular directory, another location can be specified with the environment\n\
> variable TEXTDOMAINDIR.\n\
> When used with the -s option the program behaves like the `echo' command.\n\
> But it does not simply copy its arguments to stdout.  Instead those messages\n\
> found in the selected catalog are translated.\n\
> Standard search directory: %s\n", 21},
>   {"Report bugs to <bug-gnu-utils@prep.ai.mit.edu>.\n", 22},
>   {"\
> internationalized messages should not contain the `\\%c' escape sequence", 23},
>   {"cannot create output file \"%s\"", 24},
>   {"standard output", 25},
>   {"error while writing \"%s\" file", 26},
>   {"no input files given", 27},
>   {"exactly 2 input files required", 28},
>   {"\
> Usage: %s [OPTION] def.po ref.po\n\
> Mandatory arguments to long options are mandatory for short options too.\n\
>   -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n\
>   -h, --help                  display this help and exit\n\
>   -V, --version               output version information and exit\n\
> \n\
> Compare two Uniforum style .po files to check that both contain the same\n\
> set of msgid strings.  The def.po file is an existing PO file with the\n\
> old translations.  The ref.po file is the last created PO file\n\
> (generally by xgettext).  This is useful for checking that you have\n\
> translated each and every message in your program.  Where an exact match\n\
> cannot be found, fuzzy matching is used to produce better diagnostics.\n", 29},
>   {"this message is used but not defined...", 30},
>   {"...but this definition is similar", 31},
>   {"this message is used but not defined in %s", 32},
>   {"warning: this message is not used", 33},
>   {"duplicate message definition", 34},
>   {"...this is the location of the first definition", 35},
>   {"this message has no definition in the \"%s\" domain", 36},
>   {"no input file given", 37},
>   {"error while opening \"%s\" for writing", 38},
>   {"%d translated messages", 39},
>   {", %d fuzzy translations", 40},
>   {", %d untranslated messages", 41},
>   {"\
> Usage: %s [OPTION] filename.po ...\n\
> Mandatory arguments to long options are mandatory for short options too.\n\
>   -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n\
>   -c, --check                 perform language dependent checks on strings\n\
>   -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n\
>   -f, --use-fuzzy             use fuzzy entries in output\n\
>   -h, --help                  display this help and exit\n\
>       --no-hash               binary file will not include the hash table\n\
>   -o, --output-file=FILE      specify output file name as FILE\n\
>       --statistics            print statistics about translations\n\
>       --strict                enable strict Uniforum mode\n\
>   -v, --verbose               list input file anomalies\n\
>   -V, --version               output version information and exit\n\
> \n\
> Giving the -v option more than once increases the verbosity level.\n\
> \n\
> If input file is -, standard input is read.  If output file is -,\n\
> output is written to standard output.\n", 42},
>   {"while creating hash table", 43},
>   {"%s: warning: no header entry found", 44},
>   {"domain name \"%s\" not suitable as file name", 45},
>   {"domain name \"%s\" not suitable as file name: will use prefix", 46},
>   {"`domain %s' directive ignored", 47},
>   {"empty `msgstr' entry ignored", 48},
>   {"fuzzy `msgstr' entry ignored", 49},
>   {"headerfield `%s' missing in header", 50},
>   {"header field `%s' should start at beginning of line", 51},
>   {"some header fields still have the initial default value", 52},
>   {"field `%s' still has initial default value", 53},
>   {"%s: warning: source file contains fuzzy translation", 54},
>   {"`msgid' and `msgstr' entries do not both begin with '\\n'", 55},
>   {"`msgid' and `msgstr' entries do not both end with '\\n'", 56},
>   {"number of format specifications in `msgid' and `msgstr' does not match", 57},
>   {"format specifications for argument %u are not the same", 58},
>   {"\
> Usage: %s [OPTION] def.po ref.po\n\
> Mandatory arguments to long options are mandatory for short options too.\n\
>   -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n\
>   -e, --no-escape             do not use C escapes in output (default)\n\
>   -E, --escape                use C escapes in output, no extended chars\n\
>       --force-po              write PO file even if empty\n\
>   -h, --help                  display this help and exit\n\
>   -i, --indent                indented output style\n\
>   -o, --output-file=FILE      result will be written to FILE\n\
>       --no-location           suppress '#: filename:line' lines\n\
>       --add-location          preserve '#: filename:line' lines (default)\n\
>       --strict                strict Uniforum output style\n\
>   -v, --verbose               increase verbosity level\n\
>   -V, --version               output version information and exit\n\
>   -w, --width=NUMBER          set output page width\n", 59},
>   {"\
> \n\
> Merges two Uniforum style .po files together.  The def.po file is an\n\
> existing PO file with the old translations which will be taken over to\n\
> the newly created file as long as they still match; comments will be\n\
> preserved, but extract comments and file positions will be discarded.\n\
> The ref.po file is the last created PO file (generally by xgettext), any\n\
> translations or comments in the file will be discarded, however dot\n\
> comments and file positions will be preserved.  Where an exact match\n\
> cannot be found, fuzzy matching is used to produce better results.  The\n\
> results are written to stdout unless an output file is specified.\n", 60},
>   {"\
> %sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete \
> %d.\n", 61},
>   {" done.\n", 62},
>   {"\
> Usage: %s [OPTION] [FILE]...\n\
> Mandatory arguments to long options are mandatory for short options too.\n\
>   -e, --no-escape          do not use C escapes in output (default)\n\
>   -E, --escape             use C escapes in output, no extended chars\n\
>       --force-po           write PO file even if empty\n\
>   -h, --help               display this help and exit\n\
>   -i, --indent             write indented output style\n\
>   -o, --output-file=FILE   write output into FILE instead of standard output\n\
>       --strict             write strict uniforum style\n\
>   -V, --version            output version information and exit\n\
>   -w, --width=NUMBER       set output page width\n", 63},
>   {"\
> \n\
> Convert binary .mo files to Uniforum style .po files.\n\
> Both little-endian and big-endian .mo files are handled.\n\
> If no input file is given or it is -, standard input is read.\n\
> By default the output is written to standard output.\n", 64},
>   {"error while reading \"%s\"", 65},
>   {"file \"%s\" truncated", 66},
>   {"seek \"%s\" offset %ld failed", 67},
>   {"error while opening \"%s\" for reading", 68},
>   {"file \"%s\" is not in GNU .mo format", 69},
>   {"missing `msgstr' section", 70},
>   {"found %d fatal errors", 71},
>   {"too many errors, aborting", 72},
>   {"keyword \"%s\" unknown", 73},
>   {"illegal control sequence", 74},
>   {"end-of-line within string", 75},
>   {"end-of-file within string", 76},
>   {"standard input", 77},
>   {"%s:%d: warning: unterminated character constant", 78},
>   {"%s:%d: warning: unterminated string literal", 79},
>   {"while preparing output", 80},
>   {"%s and %s are mutually exclusive", 81},
>   {"--join-existing cannot be used when output is written to stdout", 82},
>   {"warning: file `%s' extension `%s' is unknown; will try C", 83},
>   {"\
> Usage: %s [OPTION] INPUTFILE ...\n\
> Mandatory arguments to long options are mandatory for short options too.\n\
>   -a, --extract-all              extract all strings\n\
>   -c, --add-comments[=TAG]       place comment block with TAG (or those\n\
>                                  preceding keyword lines) in output file\n\
>   -C, --c++                      shorthand for --language=C++\n\
>       --debug                    more detailed formatstring recognision result\n\
>   -d, --default-domain=NAME      use NAME.po for output (instead of messages.po)\n\
>   -D, --directory=DIRECTORY      add DIRECTORY to list for input files search\n\
>   -e, --no-escape                do not use C escapes in output (default)\n\
>   -E, --escape                   use C escapes in output, no extended chars\n\
>   -f, --files-from=FILE          get list of input files from FILE\n\
>       --force-po                 write PO file even if empty\n\
>       --foreign-user             omit FSF copyright in output for foreign user\n\
>   -F, --sort-by-file             sort output by file location\n", 84},
>   {"\
>   -h, --help                     display this help and exit\n\
>   -i, --indent                   write the .po file using indented style\n\
>   -j, --join-existing            join messages with existing file\n\
>   -k, --keyword[=WORD]           additonal keyword to be looked for (without\n\
>                                  WORD means not to use default keywords)\n\
>   -l, --string-limit=NUMBER      set string length limit to NUMBER instead %u\n\
>   -L, --language=NAME            recognise the specified language (C, C++, PO),\n\
>                                  otherwise is guessed from file extension\n\
>   -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\
>       --no-location              do not write '#: filename:line' lines\n", 85},
>   {"\
>   -n, --add-location             generate '#: filename:line' lines (default)\n\
>       --omit-header              don't write header with `msgid \"\"' entry\n\
>   -o, --output=FILE              write output to specified file\n\
>   -p, --output-dir=DIR           output files will be placed in directory DIR\n\
>   -s, --sort-output              generate sorted output and remove duplicates\n\
>       --strict                   write out strict Uniforum conforming .po file\n\
>   -T, --trigraphs                understand ANSI C trigraphs for input\n\
>   -V, --version                  output version information and exit\n\
>   -w, --width=NUMBER             set output page width\n\
>   -x, --exclude-file=FILE        entries from FILE are not extracted\n\
> \n\
> If INPUTFILE is -, standard input is read.\n", 86},
>   {"this file may not contain domain directives", 87},
>   {"language `%s' unknown", 88},
> };
> 
> int _msg_tbl_length = 88;
diff -r -N gettext-0.10.31/po/gettext.pot gettext-0.10.31.ori/po/gettext.pot
9c9
< "POT-Creation-Date: 1997-09-06 22:45 MET DST\n"
---
> "POT-Creation-Date: 1997-08-15 22:57+0200\n"
17c17
< #: lib/error.c:93
---
> #: lib/error.c:91
80c80
< #: lib/xmalloc.c:80
---
> #: lib/xmalloc.c:82
84,85c84,85
< #: src/gettextp.c:134 src/msgcmp.c:157 src/msgfmt.c:271 src/msgmerge.c:264
< #: src/msgunfmt.c:189 src/xgettext.c:405
---
> #: src/gettextp.c:134 src/msgcmp.c:144 src/msgfmt.c:257 src/msgmerge.c:251
> #: src/msgunfmt.c:175 src/xgettext.c:394
93,94c93,94
< #: src/gettextp.c:139 src/msgcmp.c:162 src/msgfmt.c:276 src/msgmerge.c:269
< #: src/msgunfmt.c:194 src/xgettext.c:410
---
> #: src/gettextp.c:139 src/msgcmp.c:149 src/msgfmt.c:262 src/msgmerge.c:256
> #: src/msgunfmt.c:180 src/xgettext.c:399
107,108c107,108
< #: src/gettextp.c:228 src/msgcmp.c:194 src/msgfmt.c:377 src/msgmerge.c:311
< #: src/msgunfmt.c:224 src/xgettext.c:548
---
> #: src/gettextp.c:228 src/msgcmp.c:181 src/msgfmt.c:361 src/msgmerge.c:298
> #: src/msgunfmt.c:210 src/xgettext.c:532
141,142c141,142
< #: src/gettextp.c:255 src/msgcmp.c:213 src/msgfmt.c:402 src/msgmerge.c:344
< #: src/msgunfmt.c:248 src/xgettext.c:598
---
> #: src/gettextp.c:255 src/msgcmp.c:200 src/msgfmt.c:386 src/msgmerge.c:331
> #: src/msgunfmt.c:234 src/xgettext.c:582
146c146
< #: src/message.c:780
---
> #: src/message.c:784
152c152
< #: src/message.c:1116
---
> #: src/message.c:1115
157c157
< #: src/message.c:1123
---
> #: src/message.c:1122
162c162
< #: src/message.c:1183
---
> #: src/message.c:1182
167c167
< #: src/msgcmp.c:173 src/msgmerge.c:280
---
> #: src/msgcmp.c:160 src/msgmerge.c:267
171c171
< #: src/msgcmp.c:178 src/msgmerge.c:285
---
> #: src/msgcmp.c:165 src/msgmerge.c:272
175c175
< #: src/msgcmp.c:199
---
> #: src/msgcmp.c:186
192c192
< #: src/msgcmp.c:272 src/msgmerge.c:724
---
> #: src/msgcmp.c:259 src/msgmerge.c:711
196c196
< #: src/msgcmp.c:274 src/msgmerge.c:726
---
> #: src/msgcmp.c:261 src/msgmerge.c:713
200c200
< #: src/msgcmp.c:280 src/msgmerge.c:753
---
> #: src/msgcmp.c:267 src/msgmerge.c:740
205c205
< #: src/msgcmp.c:294
---
> #: src/msgcmp.c:281
209c209
< #: src/msgcmp.c:368 src/msgfmt.c:641 src/msgmerge.c:503 src/xgettext.c:1078
---
> #: src/msgcmp.c:355 src/msgfmt.c:625 src/msgmerge.c:490 src/xgettext.c:1061
213c213
< #: src/msgcmp.c:369 src/msgfmt.c:642 src/msgmerge.c:504 src/xgettext.c:1079
---
> #: src/msgcmp.c:356 src/msgfmt.c:626 src/msgmerge.c:491 src/xgettext.c:1062
217c217
< #: src/msgcmp.c:409 src/msgmerge.c:552
---
> #: src/msgcmp.c:396 src/msgmerge.c:539
222c222
< #: src/msgfmt.c:287 src/xgettext.c:421
---
> #: src/msgfmt.c:273 src/xgettext.c:410
226c226
< #: src/msgfmt.c:337
---
> #: src/msgfmt.c:321
231c231
< #: src/msgfmt.c:359
---
> #: src/msgfmt.c:343
236c236
< #: src/msgfmt.c:361
---
> #: src/msgfmt.c:345
241c241
< #: src/msgfmt.c:363
---
> #: src/msgfmt.c:347
246c246
< #: src/msgfmt.c:382
---
> #: src/msgfmt.c:366
269c269
< #: src/msgfmt.c:423
---
> #: src/msgfmt.c:407
273c273
< #: src/msgfmt.c:465
---
> #: src/msgfmt.c:449
278c278
< #: src/msgfmt.c:487
---
> #: src/msgfmt.c:471
283c283
< #: src/msgfmt.c:492
---
> #: src/msgfmt.c:476
290c290
< #: src/msgfmt.c:505
---
> #: src/msgfmt.c:489
295c295
< #: src/msgfmt.c:533
---
> #: src/msgfmt.c:517
299c299
< #: src/msgfmt.c:534
---
> #: src/msgfmt.c:518
303c303
< #: src/msgfmt.c:574
---
> #: src/msgfmt.c:558
308c308
< #: src/msgfmt.c:577
---
> #: src/msgfmt.c:561
313c313
< #: src/msgfmt.c:586
---
> #: src/msgfmt.c:570
317c317
< #: src/msgfmt.c:596
---
> #: src/msgfmt.c:580
322c322
< #: src/msgfmt.c:681
---
> #: src/msgfmt.c:665
327c327
< #: src/msgfmt.c:883
---
> #: src/msgfmt.c:867
331c331
< #: src/msgfmt.c:891
---
> #: src/msgfmt.c:875
335c335
< #: src/msgfmt.c:905
---
> #: src/msgfmt.c:889
339c339
< #: src/msgfmt.c:922
---
> #: src/msgfmt.c:906
344c344
< #: src/msgmerge.c:316
---
> #: src/msgmerge.c:303
364c364
< #: src/msgmerge.c:334
---
> #: src/msgmerge.c:321
379c379
< #: src/msgmerge.c:782
---
> #: src/msgmerge.c:769
386c386
< #: src/msgmerge.c:788
---
> #: src/msgmerge.c:775
390c390
< #: src/msgunfmt.c:229
---
> #: src/msgunfmt.c:215
406c406
< #: src/msgunfmt.c:243
---
> #: src/msgunfmt.c:229
416c416
< #: src/msgunfmt.c:280 src/msgunfmt.c:344 src/po-lex.c:184 src/xget-lex.c:253
---
> #: src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
421c421
< #: src/msgunfmt.c:281 src/msgunfmt.c:345
---
> #: src/msgunfmt.c:267 src/msgunfmt.c:331
426c426
< #: src/msgunfmt.c:312
---
> #: src/msgunfmt.c:298
431,432c431,432
< #: src/msgunfmt.c:372 src/po-lex.c:73 src/xget-lex.c:158 src/xget-lex.c:173
< #: src/xget-lex.c:190 src/xgettext.c:633
---
> #: 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
437c437
< #: src/msgunfmt.c:388
---
> #: src/msgunfmt.c:373
446c446
< #: src/po-lex.c:83
---
> #: src/po-lex.c:84
451c451
< #: src/po-lex.c:128 src/po-lex.c:167
---
> #: src/po-lex.c:129 src/po-lex.c:168
455c455
< #: src/po-lex.c:240
---
> #: src/po-lex.c:241
460c460
< #: src/po-lex.c:331
---
> #: src/po-lex.c:332
464c464
< #: src/po-lex.c:414
---
> #: src/po-lex.c:415
468c468
< #: src/po-lex.c:419
---
> #: src/po-lex.c:420
472c472
< #: src/xget-lex.c:148
---
> #: src/xget-lex.c:150
476c476
< #: src/xget-lex.c:894
---
> #: src/xget-lex.c:892
481c481
< #: src/xget-lex.c:916
---
> #: src/xget-lex.c:914
488c488
< #: src/xgettext.c:351 src/xgettext.c:1264
---
> #: src/xgettext.c:340 src/xgettext.c:1256
492c492
< #: src/xgettext.c:389 src/xgettext.c:393
---
> #: src/xgettext.c:378 src/xgettext.c:382
497c497
< #: src/xgettext.c:397
---
> #: src/xgettext.c:386
501c501
< #: src/xgettext.c:517
---
> #: src/xgettext.c:501
506c506
< #: src/xgettext.c:553
---
> #: src/xgettext.c:537
526c526
< #: src/xgettext.c:571
---
> #: src/xgettext.c:555
542c542
< #: src/xgettext.c:585
---
> #: src/xgettext.c:569
559c559
< #: src/xgettext.c:675 src/xgettext.c:985
---
> #: src/xgettext.c:658 src/xgettext.c:968
563c563
< #: src/xgettext.c:1350
---
> #: src/xgettext.c:1342
diff -r -N gettext-0.10.31/po/nl.po gettext-0.10.31.ori/po/nl.po
7,10c7,10
< "Project-Id-Version: gettext 0.10.31 (DJGPP V2 Port)\n"
< "POT-Creation-Date: 1997-09-06 22:47 CET\n"
< "PO-Revision-Date: 1997-09-06 23:16 MET DST\n"
< "Last-Translator: Tim Van Holder <zastai@hotmail.com>\n"
---
> "Project-Id-Version: gettext 0.10.27\n"
> "POT-Creation-Date: 1997-08-15 22:57+0200\n"
> "PO-Revision-Date: 1997-03-11 22:38 \n"
> "Last-Translator: Erick Branderhorst <Erick.Branderhorst@asml.nl>\n"
23c23
< msgstr "%s: optie `%s' is niet eenduidig\n"
---
> msgstr "%s: optie `%s' is ambiguous\n"
72c72
< msgstr "%s: optie `-W %s' is niet eenduidig\n"
---
> msgstr "%s: optie `-W %s' is dubbelzinnig\n"
100c100
< msgstr "Geschreven door %s.\n"
---
> msgstr ""
108c108
< msgstr "teveel argumenten"
---
> msgstr "te veel argumenten"
133c133
< "  -h, --help                toon hulp-tekst en beindig programma\n"
---
> "  -h, --help                toon hulp-tekst en beindig programma\n"
135c135
< "  -V, --version             toon versie-informatie en beindig programma\n"
---
> "  -V, --version             toon versie-informatie en beindig programma\n"
154,160c154,160
< "door de omgevingsvariabele TEXTDOMAIN. Als de meldingencatalogus niet\n"
< "gevonden wordt in de gebruikelijke folder, kan een andere lokatie worden\n"
< "gespecificeerd met de omgevingsvariabele TEXTDOMAINDIR.\n"
< "Als optie `-s' gegeven is, gedraagt het programma zich als het `echo' commando,\n"
< "maar het kopieert de argumenten niet naar standaard uitvoer. In plaats daarvan\n"
< "worden de in de catalogus gevonden meldingen vertaald.\n"
< "Standaard zoekfolder: %s\n"
---
> "door de omgevings variabele TEXTDOMAIN.  Als de meldingen katalogus niet\n"
> "gevonden is in de gebruikelijke directory, kan een andere lokatie worden\n"
> "gespecificeerd met de omgevings variabele TEXTDOMAINDIR.\n"
> "Als optie `-s' gegeven is, gedraagt het programma zich als het `echo' commando.\n"
> "Maar het kopieert niet de argumenten naar standaard uitvoer.  In plaats daarvan\n"
> "worden de in de katalogus gevonden meldingen vertaald.\n"
> "Standaard zoek directory: %s\n"
165c165
< msgstr "Meld fouten aan <bug-gnu-utils@prep.ai.mit.edu>.\n"
---
> msgstr "Meld fouten via <bug-gnu-utils@prep.ai.mit.edu>.\n"
171c171,172
< msgstr "genternationaliseerde meldingen mogen geen `\\%c' escape sequences bevatten"
---
> msgstr ""
> "genternationaliseerde meldingen mogen geen `\\%c' escape sequences bevatten"
181c182
< msgstr "standaarduitvoer"
---
> msgstr "standaard uitvoer"
224,225c225,226
< "overeenkomst niet gevonden kan worden, zal fuzzy (vage) matching gebruikt\n"
< "worden, om een betere diagnose te verkrijgen.\n"
---
> "overeenkomst niet gevonden kan wrden, zal fuzzy(vage) matching worden gebruikt,\n"
> "ter verkrijging van een betere diagnose.\n"
246c247
< msgstr "dubbele definitie van melding"
---
> msgstr "dubbele melding definitie"
307,308c308,309
< "  -D, --directory=FOLDER     voeg FOLDER toe aan lijst van folders waarin\n"
< "                             invoerbestanden gezocht worden\n"
---
> "  -D, --directory=DIRECTORY  voeg DIRECTORY toe aan lijst van directories\n"
> "                             waarin invoerbestanden gezocht worden\n"
310c311
< "  -h, --help                 toon hulp-tekst en beindig programma\n"
---
> "  -h, --help                 toon hulp-tekst en beindig programma\n"
315,316c316,317
< "  -v, --verbose              laat problemen met het invoerbestand zien\n"
< "  -V, --version              toon versie-informatie en beindig programma\n"
---
> "  -v, --verbose              laat invoerbestand anomalies zien\n"
> "  -V, --version              toon versie-informatie en beindig programma\n"
318c319
< "Het meer dan eens geven van de -v optie verhoogt het aantal gegeven uitleg.\n"
---
> "Het meer dan eens geven van de -v optie verhoogt het verbosity nivo.\n"
320c321
< "Als invoerbestand - is, lees van standaardinvoer. Als uitvoerbestand -\n"
---
> "Als invoerbestand - is, lees standaardinvoer.  Als uitvoerbestand -\n"
325c326
< msgstr "tijdens het aanmaken van de hash-tabel"
---
> msgstr "tijdens aanmaken hash tabel"
330c331
< msgstr "%s: let op: geen bestandhoofding gevonden"
---
> msgstr "%s: let op: geen header ingang gevonden"
348c349
< msgstr "`domein %s' opdracht genegeerd"
---
> msgstr "`domein %s' directive genegeerd"
352c353
< msgstr "lege `msgstr' ingang genegeerd"
---
> msgstr "lege `msgstr' entry genegeerd"
356c357
< msgstr "fuzzy (vage) `msgstr' ingang genegeerd"
---
> msgstr "lege `msgstr' ingang genegeerd"
361c362
< msgstr "hoofdingsveld `%s' ontbreekt in bestandhoofding"
---
> msgstr "header(??)veld `%s' ontbreekt in header(??)"
366c367
< msgstr "hoofdingsveld `%s' moet starten aan het begin van de regel"
---
> msgstr "header(??)veld `%s' moet starten aan het begin van de regel"
370c371,372
< msgstr "sommige hoofdingsvelden hebben nog de oorspronkelijke standaardwaarde"
---
> msgstr ""
> "sommige header(??)velden hebben nog de oorspronkelijke standaard waarde"
375c377
< msgstr "veld `%s' heeft nog de oorspronkelijke standaardwaarde"
---
> msgstr "veld `%s' heeft nog de oorspronkelijke standaard waarde"
380c382
< msgstr "%s: let op: bronbestand bevat fuzzy (vage) vertaling"
---
> msgstr "%s: let op: broncode bevat vage vertaling"
392c394
< msgstr "het aantal formaatspecificaties in `msgid' en `msgstr' is niet gelijk"
---
> msgstr "aantal formaat specificaties in `msgid' en `msgstr' zijn niet gelijk"
397c399
< msgstr "de formaatspecificaties voor argument %u zijn niet hetzelfde"
---
> msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
420c422
< "  -D, --directory=FOLDER      voeg FOLDER toe aan lijst van folders waar\n"
---
> "  -D, --directory=DIRECTORY   voeg DIRECTORY toe aan lijst waar van directories\n"
425,426c427,428
< "  -h, --help                  toon hulp-tekst en beindig programma\n"
< "  -i, --indent                gendenteerde uitvoerstijl\n"
---
> "  -h, --help                  toon hulp-tekst en beindig programma\n"
> "  -i, --indent                gendenteerde uitvoerstijl\n"
431,432c433,434
< "  -v, --verbose               verhoog aantal gegeven uitleg\n"
< "  -V, --version               toon versie-informatie en beindig programma\n"
---
> "  -v, --verbose               verhoog verbosity nivo\n"
> "  -V, --version               toon versie-informatie en beindig programma\n"
454c456
< "Het ref.po bestand is het laatst aangemaakte PO bestand (in het algemeen door\n"
---
> "Het ref.po bestand is het laatst gekreeerd PO bestand (in het algemeen door\n"
456c458
< "gelaten, maar '#.' kommentaar en bestandspositie's ('#:') blijven bewaard.\n"
---
> "gelaten, maar punt kommentaar en bestandspositie's blijven bewaard.\n"
472c474
< msgstr " klaar.\n"
---
> msgstr " done.\n"
491,500c493,503
< "  -e, --no-escape           gebruik geen C escapes in uitvoer (standaard)\n"
< "  -E, --escape              gebruik C escapes in uitvoer, geen extended\n"
< "                            karakters\n"
< "      --force-po            schrijf PO bestand zelfs als het leeg is\n"
< "  -h, --help                laat hulp-tekst zien en beindig programma\n"
< "  -i, --indent              gebruik geindenteerde uitvoer-stijl\n"
< "  -o, --output-file=BESTAND uitvoer gaat naar BESTAND\n"
< "      --strict              gebruik strikte Uniforum-stijl\n"
< "  -V, --version             toon versie-informatie en beindig programma\n"
< "  -w, --width=NUMMER        stel de paginabreedte van de uitvoer in\n"
---
> "  -e, --no-escape          gebruik geen C escapes in uitvoer (standaard)\n"
> "  -E, --escape             gebruik C escapes in uitvoer, geen extended\n"
> "                           karakters\n"
> "      --force-po           schrijf PO bestand zelfs als het leeg is\n"
> "  -h, --help               laat hulp-tekst zien en beindig programma\n"
> "  -i, --indent             gebruik geindenteerde uitvoer-stijl\n"
> "  -o, --output-file=FILE   uitvoer gaat naar BESTAND\n"
> "\n"
> "      --strict             gebruik strikte Uniforum-stijl\n"
> "  -V, --version            toon versie-informatie en beindig programma\n"
> "  -w, --width=NUMMER       stel uitvoer paginabreedte in\n"
513c516
< "Zowel klein-endian als groot-endian .mo bestanden zijn toegestaan.\n"
---
> "Zowel klein-endian en groot-endian .mo bestanden zijn toegestaan.\n"
515c518
< "Standaard wordt de uitvoer geschreven naar standaarduitvoer.\n"
---
> "Standaard wordt de uitvoer gescreven naar standaarduitvoer.\n"
520c523
< msgstr "fout tijdens het lezen van \"%s\""
---
> msgstr "fout tijdens lezen \"%s\""
563c566
< msgstr "illegale controlesekwentie"
---
> msgstr "illegale kontrol sequence"
575c578
< msgstr "standaardinvoer"
---
> msgstr "standaard invoer"
580c583
< msgstr "%s:%d: let op: onbeindigde karakterconstante"
---
> msgstr "%s:%d: let op: niet getermineerde karakter konstante"
585c588
< msgstr "%s:%d: let op: onbeindigde stringconstante"
---
> msgstr "%s:%d: let op: niet getermineerde string literal"
591c594
< msgstr "bij het voorbereiden van de uitvoer"
---
> msgstr "bij voorbereiden uitvoer"
596c599
< msgstr "%s en %s sluiten elkaar uit"
---
> msgstr "%s en %s zijn mutually exclusive"
608c611
< msgstr "let op: bestand `%s' heeft de onbekende extensie `%s'; zal C proberen"
---
> msgstr "let op: bestand `%s' extensie `%s' is onbekend; ga C proberen"
632,633c635,636
< "  -c, --add-comments[=TAG]       plaats een kommentaarblok met TAG (of deze\n"
< "                                 voorafgaand aan sleutelwoordregels) in uitvoer\n"
---
> "  -c, --add-comments[=TAG]       plaats een kommentaar blok met TAG (of deze\n"
> "                                 voorafgaande sleutelwoord regels) in uitvoer\n"
668c671
< "  -L, --language=TAAL            herken de gespecificeerde TAAL (C, C++, PO)\n"
---
> "  -L, --language=NAAM            herken de gespecificeerde TAAL (C, C++, PO)\n"
693,694c696,697
< "  -o, --output=BESTAND           schrijf uitvoer naar opgegeven bestand\n"
< "  -p, --output-dir=DIR           plaats uitvoerbestanden in folder DIR\n"
---
> "  -o, --output=BESTAND           schrijf uitvoer naar gespecificeerd bestand\n"
> "  -p, --output-dir=DIR           plaats uitvoerbestanden in directory DIR\n"
698,700c701,703
< "  -V, --version                  toon hulp-tekst en beindig programma\n"
< "  -w, --width=NUMMER             stel de paginabreedte van de uitvoer in\n"
< "  -x, --exclude-file=BESTAND     ingangen van BESTAND worden niet gextraheerd\n"
---
> "  -V, --version                  toon hulp-tekst en beindig programma\n"
> "  -w, --width=NUMMER             stel pagina uitvoer breedte in\n"
> "  -x, --exclude-file=BESTAND     ingangen van BESTAND worden niet gextraheerd\n"
706c709
< msgstr "dit bestand mag geen 'domain' opdrachten bevatten"
---
> msgstr "dit bestand mag geen domein directives bevatten"
711c714
< msgstr "onbekende taal `%s'"
---
> msgstr "taal `%s' onbekend"
diff -r -N gettext-0.10.31/po/potfiles gettext-0.10.31.ori/po/potfiles
1,13d0
< 	../lib/error.c \
< 	../lib/getopt.c \
< 	../lib/xmalloc.c \
< 	../src/gettextp.c \
< 	../src/message.c \
< 	../src/msgcmp.c \
< 	../src/msgfmt.c \
< 	../src/msgmerge.c \
< 	../src/msgunfmt.c \
< 	../src/po-gram.gen.c \
< 	../src/po-lex.c \
< 	../src/xget-lex.c \
< 	../src/xgettext.c
diff -r -N gettext-0.10.31/src/Makefile.in gettext-0.10.31.ori/src/Makefile.in
13,19c13,14
< 
< # As set by configure -- this probably won't match your system.
< # prefix = @prefix@
< # exec_prefix = @exec_prefix@
< 
< # Sets prefix and exec_prefix to $DJDIR
< sinclude djdir.set
---
> prefix = @prefix@
> exec_prefix = @exec_prefix@
93c88
< bin_PROGRAMS = gettext.exe msgcmp.exe msgfmt.exe msgmerge.exe msgunfmt.exe xgettext.exe msgcomm.exe
---
> bin_PROGRAMS = gettext msgcmp msgfmt msgmerge msgunfmt xgettext msgcomm
106,110c101,102
< DEFS = -DDEFLOCDIR=\"$(localedir)\" -DLOCALEDIR="_locale_dir" @DEFS@
< ifdef UnixText
< DEFS += -DNO_CRLF
< endif
< LDADD = ../lib/libnlsut.a ../intl/libintl.a
---
> DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
> LDADD = ../lib/libnlsut.a ../intl/libintl.$la
139c131
< gettext_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.a
---
> gettext_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.$la
144c136
< msgcmp_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.a
---
> msgcmp_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.$la
149c141
< msgfmt_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.a
---
> msgfmt_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.$la
154c146
< msgmerge_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.a
---
> msgmerge_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.$la
158c150
< msgunfmt_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.a
---
> msgunfmt_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.$la
163c155
< xgettext_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.a
---
> xgettext_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.$la
168c160
< msgcomm_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.a
---
> msgcomm_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.$la
197,200d188
< djdir.set:
< 	@echo "Configuring paths to \$$DJDIR ($$DJDIR)..."
< 	@echo "prefix=$$DJDIR"      >  $@
< 	@echo "exec_prefix=$$DJDIR" >> $@
253c241
< gettext.exe: $(gettext_OBJECTS) $(gettext_DEPENDENCIES)
---
> gettext: $(gettext_OBJECTS) $(gettext_DEPENDENCIES)
257c245
< msgcmp.exe: $(msgcmp_OBJECTS) $(msgcmp_DEPENDENCIES)
---
> msgcmp: $(msgcmp_OBJECTS) $(msgcmp_DEPENDENCIES)
261c249
< msgfmt.exe: $(msgfmt_OBJECTS) $(msgfmt_DEPENDENCIES)
---
> msgfmt: $(msgfmt_OBJECTS) $(msgfmt_DEPENDENCIES)
265c253
< msgmerge.exe: $(msgmerge_OBJECTS) $(msgmerge_DEPENDENCIES)
---
> msgmerge: $(msgmerge_OBJECTS) $(msgmerge_DEPENDENCIES)
269c257
< msgunfmt.exe: $(msgunfmt_OBJECTS) $(msgunfmt_DEPENDENCIES)
---
> msgunfmt: $(msgunfmt_OBJECTS) $(msgunfmt_DEPENDENCIES)
273c261
< xgettext.exe: $(xgettext_OBJECTS) $(xgettext_DEPENDENCIES)
---
> xgettext: $(xgettext_OBJECTS) $(xgettext_DEPENDENCIES)
277c265
< msgcomm.exe: $(msgcomm_OBJECTS) $(msgcomm_DEPENDENCIES)
---
> msgcomm: $(msgcomm_OBJECTS) $(msgcomm_DEPENDENCIES)
diff -r -N gettext-0.10.31/src/gettextp.c gettext-0.10.31.ori/src/gettextp.c
41,45c41
< #include "getdirs.h"
< #undef _POSIX_SOURCE /* so we get _truename and _USE_LFN */
< #include <fcntl.h>
< #include <dir.h>
< #include <sys/stat.h>
---
> #define _(str) gettext (str)
87,96d82
<   char* tmpstr;
< 
<   // Change argv0
<   tmpstr = (char*) xmalloc(300);
<   _truename(argv[0], tmpstr);
<   if(!_USE_LFN) strlwr(tmpstr);
<   free(argv[0]);
<   argv[0] = (char*) malloc(20);
<   fnsplit(tmpstr, NULL, NULL, argv[0], NULL);
<   free(tmpstr);
146c132
<       printf ("%s (GNU %s) %s\n", program_name, PACKAGE, VERSION);
---
>       printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION);
diff -r -N gettext-0.10.31/src/message.c gettext-0.10.31.ori/src/message.c
46a47,50
> /* Our regular abbreviation.  */
> #define _(str) gettext (str)
> 
> 
1107,1108c1111
<       && strcmp (filename, "/dev/stdout") != 0
<       && stricmp (filename, "con") != 0)
---
>       && strcmp (filename, "/dev/stdout") != 0)
1110,1112d1112
< #ifdef NO_CRLF
<       fp = fopen (filename, "wb");
< #else
1114d1113
< #endif
diff -r -N gettext-0.10.31/src/msgcmp.c gettext-0.10.31.ori/src/msgcmp.c
42,46c42,43
< #include "getdirs.h"
< #undef _POSIX_SOURCE /* so we get _truename and _USE_LFN */
< #include <fcntl.h>
< #include <dir.h>
< #include <sys/stat.h>
---
> #define _(str) gettext (str)
> 
102,111d98
<   char* tmpstr;
< 
<   // Change argv0
<   tmpstr = (char*) xmalloc(300);
<   _truename(argv[0], tmpstr);
<   if(!_USE_LFN) strlwr(tmpstr);
<   free(argv[0]);
<   argv[0] = (char*) malloc(20);
<   fnsplit(tmpstr, NULL, NULL, argv[0], NULL);
<   free(tmpstr);
155c142
<       printf ("%s (GNU %s) %s\n", program_name, PACKAGE, VERSION);
---
>       printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION);
diff -r -N gettext-0.10.31/src/msgcomm.c gettext-0.10.31.ori/src/msgcomm.c
53,57c53,56
< #include "getdirs.h"
< #undef _POSIX_SOURCE /* so we get _truename and _USE_LFN */
< #include <fcntl.h>
< #include <dir.h>
< #include <sys/stat.h>
---
> 
> /* A convenience macro.  I don't like writing gettext() every time.  */
> #define _(str) gettext (str)
> 
151,160d149
<   char* tmpstr;
< 
<   // Change argv0
<   tmpstr = (char*) xmalloc(300);
<   _truename(argv[0], tmpstr);
<   if(!_USE_LFN) strlwr(tmpstr);
<   free(argv[0]);
<   argv[0] = (char*) malloc(20);
<   fnsplit(tmpstr, NULL, NULL, argv[0], NULL);
<   free(tmpstr);
294c283
<       printf ("%s (GNU %s) %s\n", program_name, PACKAGE, VERSION);
---
>       printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION);
317,321c306,309
<     if(strcmp(output_file, "-") == 0
<        || strcmp (output_file, "/dev/stdout") == 0
<        || stricmp (output_file, "con") == 0)
<       file_name = "-";
<     else if (output_file[0] == '/' || strcmp(output_dir, ".") == 0)
---
>     if (output_file[0] == '/' ||
>       strcmp(output_dir, ".") == 0 ||
>       strcmp(output_file, "-") == 0
>     )
330,332c318
<   else if(strcmp(default_domain, "-") == 0
< 	  || strcmp (default_domain, "/dev/stdout") == 0
< 	  || stricmp (default_domain, "con") == 0)
---
>   else if (strcmp (default_domain, "-") == 0)
483,485c469
<   if (strcmp (file_name, "-") == 0
<       || strcmp (file_name, "/dev/stdin") == 0
<       || stricmp (file_name, "con") == 0)
---
>   if (strcmp (file_name, "-") == 0)
diff -r -N gettext-0.10.31/src/msgfmt.c gettext-0.10.31.ori/src/msgfmt.c
53,57c53
< #include "getdirs.h"
< #undef _POSIX_SOURCE /* so we get _truename and _USE_LFN */
< #include <fcntl.h>
< #include <dir.h>
< #include <sys/stat.h>
---
> #define _(str) gettext (str)
193,202d188
<   char* tmpstr;
< 
<   // Change argv0
<   tmpstr = (char*) xmalloc(300);
<   _truename(argv[0], tmpstr);
<   if(!_USE_LFN) strlwr(tmpstr);
<   free(argv[0]);
<   argv[0] = (char*) malloc(20);
<   fnsplit(tmpstr, NULL, NULL, argv[0], NULL);
<   free(tmpstr);
269c255
<       printf ("%s (GNU %s) %s\n", program_name, PACKAGE, VERSION);
---
>       printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION);
322,324c308
< 	  if (strcmp (domain->domain_name, "-") == 0
< 	      || strcmp (domain->domain_name, "/dev/stdout") == 0
< 	      || stricmp (domain->domain_name, "con") == 0)
---
> 	  if (strcmp (domain->domain_name, "-") == 0)
333c317
< 	      output_file = fopen (fname, "wb");
---
> 	      output_file = fopen (fname, "w");
diff -r -N gettext-0.10.31/src/msgmerge.c gettext-0.10.31.ori/src/msgmerge.c
45,49c45,46
< #include "getdirs.h"
< #undef _POSIX_SOURCE /* so we get _truename and _USE_LFN */
< #include <fcntl.h>
< #include <dir.h>
< #include <sys/stat.h>
---
> #define _(str) gettext (str)
> 
156,165d152
<   char* tmpstr;
< 
<   // Change argv0
<   tmpstr = (char*) xmalloc(300);
<   _truename(argv[0], tmpstr);
<   if(!_USE_LFN) strlwr(tmpstr);
<   free(argv[0]);
<   argv[0] = (char*) malloc(20);
<   fnsplit(tmpstr, NULL, NULL, argv[0], NULL);
<   free(tmpstr);
262c249
<       printf ("%s (GNU %s) %s\n", program_name, PACKAGE, VERSION);
---
>       printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION);
diff -r -N gettext-0.10.31/src/msgunfmt.c gettext-0.10.31.ori/src/msgunfmt.c
51,55c51
< #include "getdirs.h"
< #undef _POSIX_SOURCE /* so we get _truename and _USE_LFN */
< #include <fcntl.h>
< #include <dir.h>
< #include <sys/stat.h>
---
> #define _(str) gettext (str)
109,118d104
<   char* tmpstr;
< 
<   // Change argv0
<   tmpstr = (char*) xmalloc(300);
<   _truename(argv[0], tmpstr);
<   if(!_USE_LFN) strlwr(tmpstr);
<   free(argv[0]);
<   argv[0] = (char*) malloc(20);
<   fnsplit(tmpstr, NULL, NULL, argv[0], NULL);
<   free(tmpstr);
187c173
<       printf ("%s (GNU %s) %s\n", program_name, PACKAGE, VERSION);
---
>       printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION);
364,365c350
<   if (strcmp (fn, "-") == 0 || strcmp (fn, "/dev/stdin") == 0
<       || stricmp (fn, "con") == 0)
---
>   if (strcmp (fn, "-") == 0 || strcmp (fn, "/dev/stdout") == 0)
diff -r -N gettext-0.10.31/src/open-po.c gettext-0.10.31.ori/src/open-po.c
42a43,44
> #define _(str) gettext (str)
> 
67,68c69
<   if (strcmp (input_name, "-") == 0 || strcmp (input_name, "/dev/stdin") == 0
<       || stricmp (input_name, "con") == 0)
---
>   if (strcmp (input_name, "-") == 0 || strcmp (input_name, "/dev/stdin") == 0)
76,80c77
<   if (*input_name == '/' || *input_name == '\\' ||
<       strlen(input_name) >= 3 && isalpha(*input_name)
<       && input_name[1] == ':' &&
<       (input_name[2] == '/' || input_name[2] == '\\')
<       )
---
>   if (*input_name == '/')
diff -r -N gettext-0.10.31/src/po-gram.gen.c gettext-0.10.31.ori/src/po-gram.gen.c
30a31,32
> #define _(str) gettext (str)
> 
diff -r -N gettext-0.10.31/src/po-lex.c gettext-0.10.31.ori/src/po-lex.c
30a31
> #define _(str) gettext(str)
diff -r -N gettext-0.10.31/src/xget-lex.c gettext-0.10.31.ori/src/xget-lex.c
42a43,45
> #define _(s) gettext(s)
> 
> 
145,146c148
<   if (strcmp (fn, "-") == 0 || strcmp (fn, "/dev/stdin") == 0
<       || stricmp (fn, "con") == 0)
---
>   if (strcmp (fn, "-") == 0)
152,153c154
<   else if (*fn == '/' || *fn == '\\' || strlen(fn) >= 3 && isalpha(*fn)
< 	   && fn[1] == ':' && (fn[2] == '/' || fn[2] == '\\'))
---
>   else if (*fn == '/')
504,506d504
< 	  /* We skip all leading white space, but not EOLs.  */
< 	  if (buflen == 0 && isspace (c) && c != '\n')
< 	    continue;
524c522
<       return ' ';
---
>       return '\n';
1217,1220c1215
< 	      xgettext_lex_keyword ("_");  /* easy alias for gettext */
< 	      xgettext_lex_keyword ("N_"); /* easy alias for gettext_noop */
< 	      xgettext_lex_keyword ("Gettext");
< 	      xgettext_lex_keyword ("gettext__");
---
> 	      xgettext_lex_keyword ("gettext");
1224d1218
< 	      xgettext_lex_keyword ("gettext");
diff -r -N gettext-0.10.31/src/xgettext.c gettext-0.10.31.ori/src/xgettext.c
66,70c66,69
< #include "getdirs.h"
< #undef _POSIX_SOURCE /* so we get _truename and _USE_LFN */
< #include <fcntl.h>
< #include <dir.h>
< #include <sys/stat.h>
---
> 
> /* A convenience macro.  I don't like writing gettext() every time.  */
> #define _(str) gettext (str)
> 
223,232d221
<   char* tmpstr;
< 
<   // Change argv0
<   tmpstr = (char*) xmalloc(300);
<   _truename(argv[0], tmpstr);
<   if(!_USE_LFN) strlwr(tmpstr);
<   free(argv[0]);
<   argv[0] = (char*) malloc(20);
<   fnsplit(tmpstr, NULL, NULL, argv[0], NULL);
<   free(tmpstr);
403c392
<       printf ("%s (GNU %s) %s\n", program_name, PACKAGE, VERSION);
---
>       printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION);
439,443c428,429
<       if(strcmp(output_file, "-") == 0
< 	 || strcmp (output_file, "/dev/stdout") == 0
< 	 || stricmp (output_file, "con") == 0)
< 	file_name = "-";
<       else if (output_file[0] == '/' || strcmp(output_dir, ".") == 0)
---
>       if (output_file[0] == '/' ||
> 	  strcmp(output_dir, ".") == 0 || strcmp(output_file, "-") == 0)
453,455c439
<   else if(strcmp(default_domain, "-") == 0
< 	  || strcmp (default_domain, "/dev/stdout") == 0
< 	  || stricmp (default_domain, "con") == 0)
---
>   else if (strcmp (default_domain, "-") == 0)
625,626c609
<   if (strcmp (file_name, "-") == 0 || strcmp (file_name, "/dev/stdin") == 0
<       || stricmp (file_name, "con") == 0)
---
>   if (strcmp (file_name, "-") == 0)
1228a1212,1213
>   char tz_sign;
>   long tz_min;
1245a1231,1237
>   tz_sign = '+';
>   tz_min = difftm (&local_time, gmtime (&now)) / 60;
>   if (tz_min < 0)
>     {
>       tz_min = -tz_min;
>       tz_sign = '-';
>     }
1249c1241
< POT-Creation-Date: %d-%02d-%02d %02d:%02d %s\n\
---
> POT-Creation-Date: %d-%02d-%02d %02d:%02d%c%02d%02d\n\
1261c1253
< 	    local_time.__tm_zone);
---
> 	    tz_sign, tz_min / 60, tz_min % 60);
diff -r -N gettext-0.10.31/stamp-h gettext-0.10.31.ori/stamp-h
1d0
< timestamp
