--- old/gettext-0.10.39/configure.in	Tue Jul 24 15:27:00 2001
+++ gnu/gettext-0.10.39/configure.in	Mon Sep  3 22:13:24 2001
@@ -64,7 +64,7 @@
   AC_DEFINE(HAVE_PARSE_PRINTF_FORMAT, 1,
     [Define if you have the parse_printf_format() function.])
 else
-  LIBOBJS="$LIBOBJS printf-prs.o"
+  LIBOBJS="$LIBOBJS printf-prs.$OBJEXT"
 fi
 
 AM_FUNC_ERROR_AT_LINE
--- old/gettext-0.10.39/intl/config.charset	Tue Jul  3 13:27:58 2001
+++ gnu/gettext-0.10.39/intl/config.charset	Sat Sep  1 22:36:06 2001
@@ -274,7 +274,7 @@
 	# BeOS has a single locale, and it has UTF-8 encoding.
 	echo "* UTF-8"
 	;;
-    msdosdjgpp*)
+    msdosdjgpp* | os2*)
 	# DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
 	# localcharset.c falls back to using the full locale name
 	# from the environment variables.
--- old/gettext-0.10.39/intl/dcigettext.c	Thu Jun 14 15:42:24 2001
+++ gnu/gettext-0.10.39/intl/dcigettext.c	Sat Sep 15 16:58:14 2001
@@ -56,6 +56,14 @@
 #include <stddef.h>
 #include <stdlib.h>
 
+#ifdef __EMX__
+# define INCL_WINCOUNTRY
+# include<os2.h>
+# ifdef __EMX_DEBUG__
+#  include<stdio.h>
+# endif
+#endif
+
 #include <string.h>
 #if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
@@ -394,6 +402,88 @@
     }
 #endif
 
+
+#ifdef __EMX__
+static unsigned
+  _nl_os2_translate(unsigned incharset, const char *inbuf, unsigned outcharset,
+                    size_t outleft, char *outbuf)
+{
+  const char *input = inbuf;
+  char *output = outbuf;
+  size_t inleft = strlen(inbuf);
+  size_t len;
+  char buf[inleft + 1];
+
+  if (outleft < inleft + 1) return 0; /* outbuf definitely too small */
+
+  outleft -= 1; /* outleft is physical size of outbuf excluding trailing '\0' */
+
+  if (incharset == 0 || outcharset == 0 || incharset == outcharset) {
+    /* - if incharset is 0 then there is an error in cp_table (loadmsgcat.c)
+         but it's to late to correct it
+       - if outcharset is 0 then either we could not determine which codepage
+         has to be used (running in DOS-mode) or we have no direct keyboard
+         access (i.e. running within XFree or detached). In both cases
+         we don't want to change the charsets
+       - if incharset == outcharset then nothing to do */
+    strcpy(outbuf, inbuf);
+    return 1;
+  }
+
+  while(inbuf[0] != '\0') {
+    if (outleft < inleft) return 0; /* not enough memory */
+
+    else if(inbuf[0] == '\n' || inbuf[0] == '\r') {
+      /* WinCpTranslateString cannot handle line feeds properly */
+      *outbuf++ = *inbuf++;
+      outleft--;
+      inleft--;
+    }
+
+    else { /* process the next line */
+      {
+        register char *p = buf;
+        register const char *q = inbuf;
+
+        /* copy the next line into buf */
+        while(q[0] != '\0' && q[0] != '\n' && q[0] != '\r') {
+          *p++ = *q++; /* copy character */
+        }
+        *p = '\0';
+
+        len = p - buf; /* len = strlen(p) */
+      }
+
+      /* WinCpTranslateString() requires length of outbuf excluding the trailing '\0'! */
+      if (WinCpTranslateString(0, incharset, buf, outcharset, outleft, outbuf) == 0) {
+        if (len * 5 < outleft) {
+          /* we have really enough memory. Either the codepage is invalid or
+             there are problems with double byte character sets */
+          /* to make sure we don't replace any '\n' or '\r' in a 16 bit charset
+             we're using output and input instead of outbuf and inbuf */
+          strcpy(output, input);
+          return 1;
+        }
+
+        return 0; /* not enough memory */
+      }
+
+      /* all right, string has been converted */
+      inbuf += len;
+      inleft -= len;
+      len = strlen(outbuf);
+      outbuf += len; /* now: outbuf[0] == '\0' */
+      outleft -= len;
+    }
+  } /* while(...) */
+
+  outbuf[0] = '\0'; /* trailing '\0' */
+
+  return 1;
+}
+#endif /* __EMX__ */
+
+
 /* Look up MSGID in the DOMAINNAME message catalog for the current
    CATEGORY locale and, if PLURAL is nonzero, search over string
    depending on the plural form determined by N.  */
@@ -765,7 +855,7 @@
 	    + W (domain->must_swap, domain->trans_tab[act].offset));
   resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1;
 
-#if defined _LIBC || HAVE_ICONV
+#if defined _LIBC || HAVE_ICONV || defined __EMX__
   if (domain->codeset_cntr
       != (domainbinding != NULL ? domainbinding->codeset_cntr : 0))
     {
@@ -782,8 +872,15 @@
 # else
 #  if HAVE_ICONV
       domain->conv != (iconv_t) -1
-#  endif
-# endif
+#   ifdef __EMX__
+      &&
+#   endif /* __EMX__ */
+#  endif /* HAVE_ICONV */
+#  ifdef __EMX__
+      (_osmode == OS2_MODE && domain->incharset != 0 && domain->outcharset != 0
+       && domain->incharset != domain->outcharset)
+#  endif /* __EMX__ */
+# endif /* NOT _LIBC */
       )
     {
       /* We are supposed to do a conversion.  First allocate an
@@ -859,30 +956,63 @@
 	      inbuf = result;
 # else
 #  if HAVE_ICONV
-	      const char *inptr = (const char *) inbuf;
-	      size_t inleft = resultlen;
-	      char *outptr = (char *) outbuf;
-	      size_t outleft;
-
-	      if (freemem_size < sizeof (size_t))
-		goto resize_freemem;
-
-	      outleft = freemem_size - sizeof (size_t);
-	      if (iconv (domain->conv,
-			 (ICONV_CONST char **) &inptr, &inleft,
-			 &outptr, &outleft)
-		  != (size_t) (-1))
-		{
-		  outbuf = (unsigned char *) outptr;
-		  break;
-		}
-	      if (errno != E2BIG)
-		{
+#   ifdef __EMX__
+              /* for EMX we need this condition because there is an additional
+                 charset conversion mechanism if libiconv fails or is
+                 not available */
+              if (domain->conv != (iconv_t) -1) {
+#   endif
+                const char *inptr = (const char *) inbuf;
+                size_t inleft = resultlen;
+                char *outptr = (char *) outbuf;
+                size_t outleft;
+
+                if (freemem_size < sizeof (size_t))
+                  goto resize_freemem;
+
+                outleft = freemem_size - sizeof (size_t);
+                if (iconv (domain->conv,
+                           (ICONV_CONST char **) &inptr, &inleft,
+                           &outptr, &outleft)
+                    != (size_t) (-1))
+                {
+                  outbuf = (unsigned char *) outptr;
+                  break;
+                }
+                if (errno != E2BIG)
+                {
 		  __libc_lock_unlock (lock);
 		  goto converted;
 		}
-#  endif
-# endif
+#   ifdef __EMX__
+              }
+              else
+#   endif
+#  endif /* HAVE_ICONV */
+
+#  ifdef __EMX__
+              {
+                if (_osmode == OS2_MODE) {
+                  size_t outleft;
+
+                  if (freemem_size < sizeof (size_t))
+                    goto resize_freemem;
+
+                  outleft = freemem_size - sizeof(size_t);
+
+                  if (_nl_os2_translate(domain->incharset, inbuf,
+                                        domain->outcharset, outleft, outbuf) == 0) {
+                    goto resize_freemem; /* not enough memory for this string */
+                  }
+                  else { /* success */
+                    outbuf += strlen(outbuf) + 1; /* including trailing '\0' */
+                    break;
+                  }
+                }
+              }
+#  endif /* __EMX__ */
+
+# endif /* NOT _LIBC */
 
 	    resize_freemem:
 	      /* We must allocate a new buffer or resize the old one.  */
--- old/gettext-0.10.39/intl/gettextP.h	Mon Apr  9 20:53:30 2001
+++ gnu/gettext-0.10.39/intl/gettextP.h	Tue Sep  4 00:32:02 2001
@@ -132,6 +132,9 @@
 #ifdef _LIBC
   __gconv_t conv;
 #else
+# ifdef __EMX__
+  int incharset, outcharset; /* OS/2 codepages */
+# endif
 # if HAVE_ICONV
   iconv_t conv;
 # endif
--- old/gettext-0.10.39/intl/loadmsgcat.c	Thu Apr 19 13:31:40 2001
+++ gnu/gettext-0.10.39/intl/loadmsgcat.c	Sat Oct  6 19:39:38 2001
@@ -126,10 +126,59 @@
 # define O_BINARY 0
 #endif
 
+#ifdef __EMX__
+struct os2_codepage {
+  const char *charset;
+  int codepage;
+};
+
+/* note: we could also read this data from $ULSPATH/CODEPAGE/UCSTBL.LST, but
+         a static data table is faster */
+static struct os2_codepage cp_table[] = {
+  { "ISO-8859-1",   819 },
+  { "ISO-8859-2",   912 },
+  { "ISO-8859-7",   813 },
+  { "ISO-8859-8",   916 },
+  { "ISO-8859-9",   920 },
+  { "ISO-8859-15",    0 }, /* unknown */
+  { "UTF-8",       1208 },
+  { "SJIS",         943 },
+  { "EUC-KR",       970 },
+  { "KOI8-R",       878 },
+  { "BIG5",           0 }  /* unknown */
+};
+
+
+/* charset will be transformed into a codepage number. If an error
+   occurrs 0 is returned */
+static int
+_nl_os2_codepage(const char *charset)
+{
+  if (charset == NULL || charset[0] == '\0') return 0; /* error */
+
+  if (toupper(charset[0]) == 'C' && toupper(charset[1]) == 'P') {
+    /* trivial charset name like "cp850" */
+    return atoi(charset + 2); /* returns 0 on error */
+  }
+  else {
+    /* no trivial charset name like "cp850" */
+    size_t i;
+    for(i = 0; i < sizeof(cp_table) / sizeof(struct os2_codepage); i++) {
+      if (strcasecmp(charset, cp_table[i].charset) == 0)
+        return cp_table[i].codepage; /* we have the codepage */
+    }
+  }
+
+  return 0;
+}
+#endif /* __EMX__ */
+
+
 /* We need a sign, whether a new catalog was loaded, which can be associated
    with all translations.  This is important if the translations are
    cached by one of GCC's features.  */
 int _nl_msg_cat_cntr;
+extern int _nl_msg_cat_cntr;
 
 #if (defined __GNUC__ && !defined __APPLE_CC__) \
     || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
@@ -225,6 +274,10 @@
 # if HAVE_ICONV
   domain->conv = (iconv_t) -1;
 # endif
+# ifdef __EMX__
+  domain->incharset = 0;
+  domain->outcharset = 0;
+# endif
 #endif
   domain->conv_tab = NULL;
 
@@ -233,7 +286,7 @@
 
   if (nullentry != NULL)
     {
-#if defined _LIBC || HAVE_ICONV
+#if defined _LIBC || HAVE_ICONV || defined __EMX__
       const char *charsetstr;
 
       charsetstr = strstr (nullentry, "charset=");
@@ -269,9 +322,11 @@
 # ifdef _LIBC
 		  outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string;
 # else
-#  if HAVE_ICONV
+#  if HAVE_ICONV || defined __EMX__
 		  extern const char *locale_charset (void);
-		  outcharset = locale_charset ();
+                  outcharset = locale_charset ();
+                  /* EMX: outcharset may be "" if we don't know the current code page
+                     or if we don't want to use it */
 #  endif
 # endif
 		}
@@ -287,26 +342,52 @@
 	    domain->conv = (__gconv_t) -1;
 # else
 #  if HAVE_ICONV
-	  /* When using GNU libiconv, we want to use transliteration.  */
+#   ifdef __EMX__
+          {
+            const char *save_outcharset = outcharset;
+#   endif
+            /* When using GNU libiconv, we want to use transliteration.  */
 #   if _LIBICONV_VERSION >= 0x0105
-	  len = strlen (outcharset);
-	  {
-	    char *tmp = (char *) alloca (len + 10 + 1);
-	    memcpy (tmp, outcharset, len);
-	    memcpy (tmp + len, "//TRANSLIT", 10 + 1);
-	    outcharset = tmp;
-	  }
+            len = strlen (outcharset);
+            {
+              char *tmp = (char *) alloca (len + 10 + 1);
+              memcpy (tmp, outcharset, len);
+              memcpy (tmp + len, "//TRANSLIT", 10 + 1);
+              outcharset = tmp;
+            }
 #   endif
-	  domain->conv = iconv_open (outcharset, charset);
+            domain->conv = iconv_open (outcharset, charset);
 #   if _LIBICONV_VERSION >= 0x0105
-	  freea (outcharset);
+            freea (outcharset);
 #   endif
-#  endif
-# endif
+#   ifdef __EMX__
+            /* if iconv_open() failed restore outcharset because the second
+               charset translation mechanism does not support transliteration */
+            if (domain->conv == (iconv_t) -1)
+              outcharset = save_outcharset;
+          }
+#   endif
+#  endif /* HAVE_ICONV */
+
+#  ifdef __EMX__
+          /* Initialize the second character translation method if libiconv
+             failed or was not available */
+          if (
+#   if HAVE_ICONV
+              domain->conv == (iconv_t) -1 &&
+#   endif
+              _osmode == OS2_MODE) {
+            domain->incharset = _nl_os2_codepage(charset);
+            domain->outcharset = _nl_os2_codepage(outcharset);
+            /* if outcharset == "" either we don't know the current charset
+               or we don't want to use it */
+          }
+#  endif /* __EMX__ */
+# endif /* NOT _LIBC */
 
 	  freea (charset);
 	}
-#endif /* _LIBC || HAVE_ICONV */
+#endif /* _LIBC || HAVE_ICONV || __EMX__ */
     }
 
   return nullentry;
@@ -329,6 +410,10 @@
   if (domain->conv != (iconv_t) -1)
     iconv_close (domain->conv);
 # endif
+# ifdef __EMX__
+  domain->incharset = 0;
+  domain->outcharset = 0;
+# endif
 #endif
 }
 
@@ -368,6 +453,33 @@
 
   /* Try to open the addressed file.  */
   fd = open (domain_file->filename, O_RDONLY | O_BINARY);
+
+#ifdef __EMX__
+  if (fd == -1) {
+# if !defined _LIBC
+#   define _nl_default_dirname _nl_default_dirname__
+# endif
+    extern const char _nl_default_dirname[]; /* from dcigettext.c */
+    extern char* _os2_unixroot_gettext(const char*); /* from localealias.c */
+    char *new_file_name = _os2_unixroot_gettext(domain_file->filename);
+    if (new_file_name) fd = open (new_file_name, O_RDONLY | O_BINARY);
+    else fd = -1;
+
+    if (fd != -1) { /* the second file exists, we have to change some internal structures */
+      /* first: change domainbinding->dirname */
+      char *p = _os2_unixroot_gettext(domainbinding->dirname); /* get new dir */
+      if (domainbinding->dirname != _nl_default_dirname)
+        free(domainbinding->dirname); /* sic! */
+      domainbinding->dirname = p;
+
+      /* second: change domain_file->filename */
+      p = _os2_unixroot_gettext(domain_file->filename);
+      free((char*) domain_file->filename); /* sic! */
+      domain_file->filename = 0;
+    }
+  }
+#endif /* __EMX__ */
+
   if (fd == -1)
     return;
 
--- old/gettext-0.10.39/intl/localcharset.c	Mon Apr 30 12:11:28 2001
+++ gnu/gettext-0.10.39/intl/localcharset.c	Sat Oct  6 19:38:08 2001
@@ -55,6 +55,11 @@
 # include <windows.h>
 #endif
 
+#ifdef __EMX__
+# define INCL_KBD
+# include<os2.h>
+#endif
+
 #ifndef DIRECTORY_SEPARATOR
 # define DIRECTORY_SEPARATOR '/'
 #endif
@@ -107,9 +112,27 @@
 	  }
       }
 
+# ifdef __EMX__
+      if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL) {
+        extern char* _os2_unixroot_gettext(const char*); /* from localealias.c */
+        char *old_file_name = file_name;
+        file_name = _os2_unixroot_gettext(file_name); /* get new file name */
+
+        free(old_file_name);
+
+        if (file_name != NULL) fp = fopen (file_name, "r"); /* second try */
+      }
+
+      if (file_name == NULL || fp == NULL)
+        /* Out of memory or file not found, treat it as empty.  */
+        cp = "";
+
+# else /* NOT __EMX__ */
       if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL)
 	/* Out of memory or file not found, treat it as empty.  */
-	cp = "";
+        cp = "";
+# endif
+
       else
 	{
 	  /* Parse the file's contents.  */
@@ -120,7 +143,7 @@
 	  size_t res_size = 0;
 	  size_t l1, l2;
 
-	  for (;;)
+          for (;;)
 	    {
 	      c = getc (fp);
 	      if (c == EOF)
@@ -217,6 +240,35 @@
   /* On old systems which lack it, use setlocale or getenv.  */
   const char *locale = NULL;
 
+#  ifdef __EMX__
+  /* Use KbdGetCp() here, if we have the codeset we can return immediatly */
+  static char buf[2 + 10 + 1]; /* static buffer for codepage name */
+
+  /* OS/2 has a function returning the locale's codepage as a number */
+  if (_osmode == OS2_MODE) {
+    USHORT codepage;
+    KBDINFO info;
+    info.cb = sizeof(info); /* to keep OS/2 happy */
+
+    if (KbdGetStatus(&info, 0) == 0 && KbdGetCp(0, &codepage, 0) == 0)
+    {
+      /* we are running in OS/2 mode and we have direct keyboard access and
+         we could get the current codepage */
+      sprintf(buf, "CP%u", (unsigned) codepage);
+      codeset = buf;
+      return codeset;
+    }
+    else {
+      /* If we have no direct keyboard access then we are running within XFree or
+         even detached, it's better not to change the charset */
+      codeset = "";
+      return codeset;
+    }
+  }
+  /* we are running in DOS mode, we will try libiconv if available */
+
+#  endif  /* __EMX__ */
+
   /* But most old systems don't have a complete set of locales.  Some
      (like SunOS 4 or DJGPP) have only the C locale.  Therefore we don't
      use setlocale here; it would return "C" when it doesn't support the
@@ -224,9 +276,11 @@
 #  if HAVE_SETLOCALE && 0
   locale = setlocale (LC_CTYPE, NULL);
 #  endif
+
   if (locale == NULL || locale[0] == '\0')
     {
       locale = getenv ("LC_ALL");
+
       if (locale == NULL || locale[0] == '\0')
 	{
 	  locale = getenv ("LC_CTYPE");
--- old/gettext-0.10.39/intl/localealias.c	Fri Mar  9 13:14:30 2001
+++ gnu/gettext-0.10.39/intl/localealias.c	Sat Oct  6 20:33:02 2001
@@ -123,15 +123,195 @@
 				  const struct alias_map *map2));
 
 
+#ifdef __EMX__
+# ifndef PATH_SEPARATOR
+#  define PATH_SEPARATOR ';'
+# endif
+
+/* result is 0 if dirname is no absolute path, 1 otherwise */
+static int
+_os2_is_abs_path(const char *dirname)
+{
+  int result = 0;
+  if (dirname != NULL && dirname[0] != '\0') {
+    /* if dirname contains a valid drive letter like "c:" */
+    if (((dirname[0] >= 'A' && dirname[0] <= 'Z') || (dirname[0] >= 'a' && dirname[0] <= 'z'))
+        && dirname[1] == ':') dirname += 2; /* remove the drive letter */
+
+    if (dirname[0] == '/' || dirname[0] == '\\') result = 1; /* asbolute path */
+  }
+
+  return result;
+}
+
+
+/* path is assumed to be a list of directories separated by PATH_SEPARATOR.
+   This function determines if the first directory of path is on the
+   drive specified by the environment variable UNIXROOT.
+   If it is the case, NULL is returned, otherwise a new directory name
+   is allocated using the drive letter from UNIXROOT and returned as result.
+   If the first directory is a relative path NULL is returned, too.
+   The new directory name is allocated by malloc().
+   Example (UNIXROOT is set to "e:"):
+     "c:/usr/share" -> "e:/usr/share"
+     "e:/usr/share" -> NULL             (already on the $UNIXROOT drive)
+     "/usr/share"   -> "e:/usr/share"
+     "."            -> NULL             (not an absolute path)
+     "usr/share"    -> NULL             (not an absolute path)
+     "c:usr/share"  -> NULL             (not an absolute path)
+     "c:/usr/share;d:/etc" -> "e:/usr/share" (only the first directory in path is used) */
+char*
+_os2_unixroot_gettext(const char *path)
+{
+  static const char *unixroot = NULL;
+  static int unixroot_init = 0;
+  char *result = NULL;
+
+  if (unixroot_init == 0) {
+    /* get $UNIXROOT only one time */
+    unixroot = getenv("UNIXROOT");
+
+    /* check whether unixroot is valid (must be "x:") */
+    if (unixroot != NULL) {
+      int drive = toupper(unixroot[0]);
+      if (drive < 'A' || drive > 'Z' || unixroot[1] != ':' || unixroot[2] != '\0')
+        unixroot = NULL; /* unixroot not valid */
+    }
+
+    unixroot_init = 1; /* initialized */
+  }
+
+  /* note: if unixroot != NULL then it contains a valid drive letter */
+  if (unixroot != NULL && _os2_is_abs_path(path)) {
+    /* dirname is an absolute path and unixroot is a drive letter, "c:" for example */
+    size_t old_path_len = strlen(path);
+
+    /* end points to the first ';' in path or to NULL */
+    const char *end = strchr(path, PATH_SEPARATOR);
+
+    /* dir_len is the length of the first directory in path */
+    size_t dir_len = (end) ? end - path : old_path_len;
+
+    if (toupper(unixroot[0]) != toupper(path[0]) || path[1] != ':') {
+      /* the first directory of path does not start with the string $UNIXROOT */
+      if (path[1] == ':') {
+        /* if there is a drive letter remove it */
+        dir_len -= 2;
+        path += 2;
+      }
+
+      result = malloc(dir_len + 3);
+      if (result) { /* do nothing if we are out of memory */
+        result[0] = unixroot[0];
+        result[1] = unixroot[1];
+        memcpy(result + 2, path, dir_len);
+        result[dir_len + 2] = '\0';
+      }
+    }
+  }
+  return result;
+}
+
+/* path is assumed to be a list of directories separated by PATH_SEPARATOR.
+   Every directory is processed. _os2_unixroot_gettext() is used to find out whether
+   these directories are on the drive specified by the environment variable
+   UNIXROOT. If this is not the case the same directory on the UNIXROOT drive
+   is added to the end of path. If path is a valid path this function returns a valid path, too.
+   Example ($UNIXROOT is set to "e:"):
+   ".;c:/usr/local;d:/usr/local;d:/etc;e:/etc"
+   -> ".;c:/usr/local;d:/usr/local;d:/etc;e:/etc;e:/usr/local;e:/usr/local;e:/etc" */
+static const char*
+_os2_unixroot_path(const char *path)
+{
+  char *result = NULL;
+  const char *p = path;
+  unsigned dir_count = 1;
+
+  if (path == NULL || path[0] == '\0') return NULL; /* empty path */
+
+  /* save number of path components in dir_count */
+  while(*p) {
+    if (*p++ == PATH_SEPARATOR && *p != '\0' && *p != PATH_SEPARATOR)
+      dir_count += 1;
+  }
+
+  {
+    const char *list[dir_count]; /* list of char pointers */
+    size_t dir_len[dir_count]; /* the according directory length */
+    size_t old_path_len = strlen(path); /* the old path length */
+    size_t total_len;
+    unsigned i = 0;
+
+    if (path[old_path_len - 1] == PATH_SEPARATOR) /* last character is ';' */
+      old_path_len--;
+
+    list[0] = p = path; /* first directory */
+
+    while(*p) {
+    if (*p++ == PATH_SEPARATOR && *p != '\0' && *p != PATH_SEPARATOR)
+      list[++i] = p;
+    }
+    /* now list[i] contains the ith directory of path (no 0-terminated strings!!!) */
+
+    /* determine the total length for the new path */
+    total_len = old_path_len;
+
+    for(i = 0; i < dir_count; i++) {
+      list[i] = _os2_unixroot_gettext(list[i]);
+      if (list[i] != NULL) {
+        dir_len[i] = strlen(list[i]);
+        total_len += dir_len[i] + 1; /* one character for ';' or '\0' */
+      }
+      else dir_len[i] = 0;
+    }
+    /* now list[] contains the according directories on the UNIXROOT drive or NULL
+       total_len contains the total length for the new path */
+    result = malloc(total_len + 1);
+
+    if (result) {
+      /* copy the old path and the new directories into the new path */
+      char *q = result;
+      memcpy(q, path, old_path_len);
+      q += old_path_len;
+
+      for(i = 0; i < dir_count; i++) {
+        if (dir_len[i] != 0) {
+          *q++ = PATH_SEPARATOR;
+          memcpy(q, list[i], dir_len[i]);
+          q += dir_len[i];
+        }
+      }
+
+      *q = '\0'; /* terminating '\0' */
+    }
+
+    for(i = 0; i++; i < dir_count) free((void*) list[i]);
+  }
+
+  return (result) ? (const char*) result : path;
+}
+
+
+#endif /* __EMX__ */
+
+
 const char *
 _nl_expand_alias (name)
     const char *name;
 {
+#ifndef __EMX__
   static const char *locale_alias_path = LOCALE_ALIAS_PATH;
+#else
+  static const char *locale_alias_path = NULL;
+#endif
   struct alias_map *retval;
   const char *result = NULL;
   size_t added;
 
+#ifdef __EMX__
+  if (locale_alias_path == NULL) locale_alias_path = _os2_unixroot_path(LOCALE_ALIAS_PATH);
+#endif
+
 #ifdef _LIBC
   __libc_lock_lock (lock);
 #endif
@@ -207,6 +387,7 @@
 #endif
 
   fp = fopen (full_fname, "r");
+
   freea (full_fname);
   if (fp == NULL)
     return 0;
--- old/gettext-0.10.39/intl/Makefile.in	Tue May 22 17:57:18 2001
+++ gnu/gettext-0.10.39/intl/Makefile.in	Sat Oct  6 21:54:50 2001
@@ -268,7 +268,7 @@
 
 
 mostlyclean:
-	rm -f *.a *.la *.o *.lo core core.*
+	rm -f *.a *.la *.o *.obj *.lo core core.*
 	rm -f libintl.h charset.alias ref-add.sed ref-del.sed
 	rm -f -r .libs _libs
 
--- old/gettext-0.10.39/lib/config.charset	Tue Jul  3 13:27:58 2001
+++ gnu/gettext-0.10.39/lib/config.charset	Sat Sep  1 22:36:06 2001
@@ -274,7 +274,7 @@
 	# BeOS has a single locale, and it has UTF-8 encoding.
 	echo "* UTF-8"
 	;;
-    msdosdjgpp*)
+    msdosdjgpp* | os2*)
 	# DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
 	# localcharset.c falls back to using the full locale name
 	# from the environment variables.
--- old/gettext-0.10.39/m4/libtool.m4	Mon Jun 25 13:09:06 2001
+++ gnu/gettext-0.10.39/m4/libtool.m4	Sat Sep 15 13:25:22 2001
@@ -1602,11 +1602,12 @@
     ;;
 
   os2*)
+    if test "$ac_objext" = "obj"; then libext=lib; fi
     hardcode_libdir_flag_spec='-L$libdir'
     hardcode_minus_L=yes
     allow_undefined_flag=unsupported
-    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp -u $libobjs >> $output_objdir/$libname.def~$CC -Zdll $CFLAGS $LDFLAGS -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.$libext $output_objdir/$libname.def'
     ;;
 
   osf3*)
@@ -2096,8 +2097,12 @@
 os2*)
   libname_spec='$name'
   need_lib_prefix=no
-  library_names_spec='$libname.dll $libname.a'
-  dynamic_linker='OS/2 ld.exe'
+  library_names_spec='$libname.dll $libname.$libext'
+  if test "$ac_objext" = "o"; then
+    dynamic_linker='OS/2 ld.exe'
+  else
+    dynamic_linker='OS/2 link386.exe'
+  fi
   shlibpath_var=LIBPATH
   ;;
 
@@ -2435,7 +2440,7 @@
 libext="$libext"
 
 # Executable file suffix (normally "").
-exeext="$exeext"
+exeext="$ac_exeext"
 
 # Additional compiler flags for building library objects.
 pic_flag=$lt_pic_flag
--- old/gettext-0.10.39/m4/progtest.m4	Mon Jun 25 21:02:58 2001
+++ gnu/gettext-0.10.39/m4/progtest.m4	Tue Sep 18 21:46:38 2001
@@ -22,17 +22,17 @@
   ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
   ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  ac_save_IFS=$IFS; IFS="$ac_path_separator"
   for ac_dir in ifelse([$5], , $PATH, [$5]); do
+    IFS=$ac_save_IFS
     test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
+    if $as_executable_p $ac_dir/$ac_word; then
       if [$3]; then
 	ac_cv_path_$1="$ac_dir/$ac_word"
 	break
       fi
     fi
   done
-  IFS="$ac_save_ifs"
 dnl If no 4th arg is given, leave the cache variable unset,
 dnl so AC_PATH_PROGS will keep looking.
 ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
--- old/gettext-0.10.39/src/Makefile.am	Tue Mar 20 15:01:38 2001
+++ gnu/gettext-0.10.39/src/Makefile.am	Tue Sep  4 00:00:10 2001
@@ -64,7 +64,7 @@
 
 BUILT_SOURCES = po-gram-gen.c po-hash-gen.c po-gram-gen.h po-hash-gen.h
 
-po-lex.o: po-gram-gen2.h
+po-lex.$(OBJEXT): po-gram-gen2.h
 po-gram-gen2.h: po-gram-gen.h
 	$(SED) 's/[yY][yY]/po_gram_/g' $(srcdir)/po-gram-gen.h > $@-tmp
 	mv $@-tmp $@
diff -Nur old/gettext-0.10.39/src/Makefile.in gnu/gettext-0.10.39/src/Makefile.in
--- old/gettext-0.10.39/src/Makefile.in	Tue Jul 24 15:27:38 2001
+++ gnu/gettext-0.10.39/src/Makefile.in	Sat Oct  6 20:22:58 2001
@@ -216,6 +216,11 @@
 
 TAR = tar
 GZIP_ENV = --best
+DEP_FILES =  .deps/dir-list.P .deps/gettext.P .deps/message.P \
+.deps/msgcmp.P .deps/msgcomm.P .deps/msgfmt.P .deps/msgmerge.P \
+.deps/msgunfmt.P .deps/ngettext.P .deps/open-po.P .deps/po-gram-gen.P \
+.deps/po-hash-gen.P .deps/po-lex.P .deps/po.P .deps/str-list.P \
+.deps/write-po.P .deps/xget-lex.P .deps/xgettext.P
 SOURCES = $(gettext_SOURCES) $(ngettext_SOURCES) $(msgcmp_SOURCES) $(msgfmt_SOURCES) $(msgmerge_SOURCES) $(msgunfmt_SOURCES) $(xgettext_SOURCES) $(msgcomm_SOURCES)
 OBJECTS = $(gettext_OBJECTS) $(ngettext_OBJECTS) $(msgcmp_OBJECTS) $(msgfmt_OBJECTS) $(msgmerge_OBJECTS) $(msgunfmt_OBJECTS) $(xgettext_OBJECTS) $(msgcomm_OBJECTS)
 
@@ -223,9 +228,9 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .obj .s .y
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits --include-deps src/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnits src/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -255,13 +260,11 @@
 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	done
 
-.c.o:
-	$(COMPILE) -c $<
-
 # FIXME: We should only use cygpath when building on Windows,
 # and only if it is available.
 .c.obj:
-	$(COMPILE) -c `cygpath -w $<`
+	$(COMPILE) -c $<
+#OBJEXT	$(COMPILE) -c `cygpath -w $<`
 
 .s.o:
 	$(COMPILE) -c $<
@@ -280,9 +283,6 @@
 
 maintainer-clean-compile:
 
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
 .s.lo:
 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 
@@ -370,6 +370,11 @@
 subdir = src
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits src/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -380,6 +385,38 @@
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
+
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-am
 dvi-am:
@@ -419,26 +456,27 @@
 maintainer-clean-generic:
 	-test -z "po-gram-genhpo-gram-gencpo-hash-genhpo-hash-genc$(BUILT_SOURCES)" || rm -f po-gram-genh po-gram-genc po-hash-genh po-hash-genc $(BUILT_SOURCES)
 mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags \
+		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
 		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
 clean-am:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
-		clean-generic mostlyclean-am
+		clean-depend clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-binPROGRAMS distclean-compile distclean-libtool \
-		distclean-tags distclean-generic clean-am
+		distclean-tags distclean-depend distclean-generic \
+		clean-am
 	-rm -f libtool
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-binPROGRAMS \
 		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
+		maintainer-clean-tags maintainer-clean-depend \
+		maintainer-clean-generic distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -449,15 +487,17 @@
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+distclean-tags clean-tags maintainer-clean-tags distdir \
+mostlyclean-depend distclean-depend clean-depend \
+maintainer-clean-depend info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
 
 
-po-lex.o: po-gram-gen2.h
+po-lex.$(OBJEXT): po-gram-gen2.h
 po-gram-gen2.h: po-gram-gen.h
 	$(SED) 's/[yY][yY]/po_gram_/g' $(srcdir)/po-gram-gen.h > $@-tmp
 	mv $@-tmp $@
diff -Nur old/gettext-0.10.39/tests/Makefile.in gnu/gettext-0.10.39/tests/Makefile.in
--- old/gettext-0.10.39/tests/Makefile.in	Tue Jul 24 15:27:34 2001
+++ gnu/gettext-0.10.39/tests/Makefile.in	Sat Oct  6 20:23:00 2001
@@ -156,6 +156,8 @@
 
 TAR = tar
 GZIP_ENV = --best
+DEP_FILES =  .deps/plural-1-prg.P .deps/setlocale.P .deps/tstgettext.P \
+.deps/tstngettext.P
 SOURCES = $(tstgettext_SOURCES) $(tstngettext_SOURCES) $(cake_SOURCES)
 OBJECTS = $(tstgettext_OBJECTS) $(tstngettext_OBJECTS) $(cake_OBJECTS)
 
@@ -163,20 +165,18 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .obj .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits --include-deps tests/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-.c.o:
-	$(COMPILE) -c $<
-
 # FIXME: We should only use cygpath when building on Windows,
 # and only if it is available.
 .c.obj:
-	$(COMPILE) -c `cygpath -w $<`
+	$(COMPILE) -c $<
+#OBJEXT	$(COMPILE) -c `cygpath -w $<`
 
 .s.o:
 	$(COMPILE) -c $<
@@ -195,9 +195,6 @@
 
 maintainer-clean-compile:
 
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
 .s.lo:
 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 
@@ -260,6 +257,11 @@
 subdir = tests
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits tests/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -270,6 +272,38 @@
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
+
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 check-TESTS: $(TESTS)
 	@failed=0; all=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -333,24 +367,24 @@
 
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-compile mostlyclean-libtool \
-		mostlyclean-tags mostlyclean-generic
+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-compile clean-libtool clean-tags clean-generic \
-		mostlyclean-am
+clean-am:  clean-compile clean-libtool clean-tags clean-depend \
+		clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-compile distclean-libtool distclean-tags \
-		distclean-generic clean-am
+		distclean-depend distclean-generic clean-am
 	-rm -f libtool
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
+		maintainer-clean-tags maintainer-clean-depend \
+		maintainer-clean-generic distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -359,12 +393,14 @@
 .PHONY: mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir check-TESTS \
-info-am info dvi-am dvi check check-am installcheck-am installcheck \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-local all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+distclean-tags clean-tags maintainer-clean-tags distdir \
+mostlyclean-depend distclean-depend clean-depend \
+maintainer-clean-depend check-TESTS info-am info dvi-am dvi check \
+check-am installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-local all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
 
 
 xg-test1.ok.po: $(top_srcdir)/src/xgettext.c $(top_srcdir)/src/msgfmt.c \
--- old/gettext-0.10.39/aclocal.m4	Tue Jul 24 15:27:26 2001
+++ gnu/gettext-0.10.39/aclocal.m4	Sat Oct  6 20:22:34 2001
@@ -1699,11 +1699,12 @@
     ;;
 
   os2*)
+    if test "$ac_objext" = "obj"; then libext=lib; fi
     hardcode_libdir_flag_spec='-L$libdir'
     hardcode_minus_L=yes
     allow_undefined_flag=unsupported
-    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp -u $libobjs >> $output_objdir/$libname.def~$CC -Zdll $CFLAGS $LDFLAGS -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.$libext $output_objdir/$libname.def'
     ;;
 
   osf3*)
@@ -2181,8 +2182,12 @@
 os2*)
   libname_spec='$name'
   need_lib_prefix=no
-  library_names_spec='$libname.dll $libname.a'
-  dynamic_linker='OS/2 ld.exe'
+  library_names_spec='$libname.dll $libname.$libext'
+  if test "$ac_objext" = "o"; then
+    dynamic_linker='OS/2 ld.exe'
+  else
+    dynamic_linker='OS/2 link386.exe'
+  fi
   shlibpath_var=LIBPATH
   ;;
 
@@ -2508,7 +2513,7 @@
 libext="$libext"
 
 # Executable file suffix (normally "").
-exeext="$exeext"
+exeext="$ac_exeext"
 
 # Additional compiler flags for building library objects.
 pic_flag=$lt_pic_flag
@@ -3723,7 +3728,11 @@
               am_cv_lib_error_at_line=yes,
 	      am_cv_lib_error_at_line=no)])
  if test $am_cv_lib_error_at_line = no; then
-   LIBOBJS="$LIBOBJS error.o"
+   if test -n "$OBJEXT"; then
+     LIBOBJS="$LIBOBJS error.$OBJEXT"
+   else
+     LIBOBJS="$LIBOBJS error.o"
+   fi
  fi
  AC_SUBST(LIBOBJS)dnl
 ])
@@ -4150,17 +4159,17 @@
   ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
   ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  ac_save_IFS=$IFS; IFS="$ac_path_separator"
   for ac_dir in ifelse([$5], , $PATH, [$5]); do
+    IFS=$ac_save_IFS
     test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
+    if $as_executable_p $ac_dir/$ac_word; then
       if [$3]; then
 	ac_cv_path_$1="$ac_dir/$ac_word"
 	break
       fi
     fi
   done
-  IFS="$ac_save_ifs"
 dnl If no 4th arg is given, leave the cache variable unset,
 dnl so AC_PATH_PROGS will keep looking.
 ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
diff -Nur old/gettext-0.10.39/config.h.in gnu/gettext-0.10.39/config.h.in
--- old/gettext-0.10.39/config.h.in	Tue Jul 24 14:43:24 2001
+++ gnu/gettext-0.10.39/config.h.in	Sat Oct  6 20:28:10 2001
@@ -15,277 +15,468 @@
 #endif
 
 
-/* Define if using alloca.c.  */
-#undef C_ALLOCA
 
-/* Define to empty if the keyword does not work.  */
-#undef const
+/* Define to the name of the distribution.  */
+#undef PACKAGE
 
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-#undef CRAY_STACKSEG_END
+/* Define to the version of the distribution.  */
+#undef VERSION
 
-/* Define if you have alloca, as a function or macro.  */
-#undef HAVE_ALLOCA
 
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-#undef HAVE_ALLOCA_H
+#include<stdlib.h>
 
-/* Define if you don't have vprintf but do have _doprnt.  */
-#undef HAVE_DOPRNT
+#include<errno.h>
 
-/* Define if you have a working `mmap' system call.  */
-#undef HAVE_MMAP
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+#undef CRAY_STACKSEG_END
 
-/* Define if you have the vprintf function.  */
-#undef HAVE_VPRINTF
+/* Define if using `alloca.c'. */
+#undef C_ALLOCA
 
-/* Define as __inline if that's what the C compiler calls it.  */
-#undef inline
+/* EMX needs _chdir2() */
+#undef EMX_REPLACE_CHDIR
 
-/* Define to `long' if <sys/types.h> doesn't define.  */
-#undef off_t
+/* EMX needs _getcwd2() */
+#undef EMX_REPLACE_GETCWD
 
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-#undef size_t
+/* Define to 1 if translation of program messages to the user's native
+   language is requested. */
+#undef ENABLE_NLS
 
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-#undef STACK_DIRECTION
+/* Define if you have `alloca', as a function or macro. */
+#undef HAVE_ALLOCA
 
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
+/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
+#undef HAVE_ALLOCA_H
 
-/* Define if you have the __argz_count function.  */
-#undef HAVE___ARGZ_COUNT
+/* Define if you have the <argz.h> header file. */
+#undef HAVE_ARGZ_H
 
-/* Define if you have the __argz_next function.  */
-#undef HAVE___ARGZ_NEXT
+/* Define if you have the `chdir' function. */
+#undef HAVE_CHDIR
 
-/* Define if you have the __argz_stringify function.  */
-#undef HAVE___ARGZ_STRINGIFY
+/* Define if you have the `chown' function. */
+#undef HAVE_CHOWN
 
-/* Define if you have the dcgettext function.  */
+/* Define if backslash-a works in C strings. */
+#undef HAVE_C_BACKSLASH_A
+
+/* Define if you have the `dcgettext' function. */
 #undef HAVE_DCGETTEXT
 
-/* Define if you have the feof_unlocked function.  */
+/* Define to 1 if you have the declaration of wcwidth(), and to 0 otherwise.
+   */
+#undef HAVE_DECL_WCWIDTH
+
+/* Define if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define if you don't have `vprintf' but do have `_doprnt.' */
+#undef HAVE_DOPRNT
+
+/* Define if you have the `fchown' function. */
+#undef HAVE_FCHOWN
+
+/* Define if you have the `feof_unlocked' function. */
 #undef HAVE_FEOF_UNLOCKED
 
-/* Define if you have the fgets_unlocked function.  */
+/* Define if you have the `fgets_unlocked' function. */
 #undef HAVE_FGETS_UNLOCKED
 
-/* Define if you have the getcwd function.  */
+/* Define if you have the `getcwd' function. */
 #undef HAVE_GETCWD
 
-/* Define if you have the getdelim function.  */
+/* Define if you have the `getdelim' function. */
 #undef HAVE_GETDELIM
 
-/* Define if you have the getegid function.  */
+/* Define if you have the `getegid' function. */
 #undef HAVE_GETEGID
 
-/* Define if you have the geteuid function.  */
+/* Define if you have the `geteuid' function. */
 #undef HAVE_GETEUID
 
-/* Define if you have the getgid function.  */
+/* Define if you have the `getgid' function. */
 #undef HAVE_GETGID
 
-/* Define if you have the getpagesize function.  */
+/* Define if you have the `getpagesize' function. */
 #undef HAVE_GETPAGESIZE
 
-/* Define if you have the getuid function.  */
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
+
+/* Define if you have the `getuid' function. */
 #undef HAVE_GETUID
 
-/* Define if you have the isascii function.  */
+/* Define if you have the iconv() function. */
+#undef HAVE_ICONV
+
+/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
+   declares uintmax_t. */
+#undef HAVE_INTTYPES_H
+
+/* Define if you have the `isascii' function. */
 #undef HAVE_ISASCII
 
-/* Define if you have the iswcntrl function.  */
+/* Define if you have the `iswcntrl' function. */
 #undef HAVE_ISWCNTRL
 
-/* Define if you have the iswprint function.  */
+/* Define if you have the `iswprint' function. */
 #undef HAVE_ISWPRINT
 
-/* Define if you have the mblen function.  */
+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+#undef HAVE_LANGINFO_CODESET
+
+/* Define if you have the `lchown' function. */
+#undef HAVE_LCHOWN
+
+/* Define if your <locale.h> file defines LC_MESSAGES. */
+#undef HAVE_LC_MESSAGES
+
+/* Define if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
+/* Define if you have the `link' function. */
+#undef HAVE_LINK
+
+/* Define if you have the <locale.h> header file. */
+#undef HAVE_LOCALE_H
+
+/* Define if you have the `lstat' function. */
+#undef HAVE_LSTAT
+
+/* Define if you have the <malloc.h> header file. */
+#undef HAVE_MALLOC_H
+
+/* Define if you have the `mblen' function. */
 #undef HAVE_MBLEN
 
-/* Define if you have the mbsinit function.  */
+/* Define to 1 if mbrtowc and mbstate_t are properly declared. */
+#undef HAVE_MBRTOWC
+
+/* Define if you have the `mbsinit' function. */
 #undef HAVE_MBSINIT
 
-/* Define if you have the memcpy function.  */
+/* Define if you have the `memcpy' function. */
 #undef HAVE_MEMCPY
 
-/* Define if you have the memmove function.  */
+/* Define if you have the `memmove' function. */
 #undef HAVE_MEMMOVE
 
-/* Define if you have the mempcpy function.  */
+/* Define if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define if you have the `mempcpy' function. */
 #undef HAVE_MEMPCPY
 
-/* Define if you have the memset function.  */
+/* Define if you have the `memset' function. */
 #undef HAVE_MEMSET
 
-/* Define if you have the munmap function.  */
+/* Define if you have the `mkfifo' function. */
+#undef HAVE_MKFIFO
+
+/* Define if you have the `mknod' function. */
+#undef HAVE_MKNOD
+
+/* Define if you have a working `mmap' system call. */
+#undef HAVE_MMAP
+
+/* Define if you have the `munmap' function. */
 #undef HAVE_MUNMAP
 
-/* Define if you have the putenv function.  */
+/* Define if you have the <nl_types.h> header file. */
+#undef HAVE_NL_TYPES_H
+
+/* Define if you have the <os2.h> header file. */
+#undef HAVE_OS2_H
+
+/* Define if you have the parse_printf_format() function. */
+#undef HAVE_PARSE_PRINTF_FORMAT
+
+/* Define if system has ptrdiff_t type */
+#undef HAVE_PTRDIFF_T
+
+/* Define if you have the `putenv' function. */
 #undef HAVE_PUTENV
 
-/* Define if you have the setenv function.  */
+/* Define if you have the `readlink' function. */
+#undef HAVE_READLINK
+
+/* Define if you have the `setenv' function. */
 #undef HAVE_SETENV
 
-/* Define if you have the setlocale function.  */
+/* Define if you have the `setlocale' function. */
 #undef HAVE_SETLOCALE
 
-/* Define if you have the stpcpy function.  */
+/* Define if you have the `stat' function. */
+#undef HAVE_STAT
+
+/* Define if you have the <stddef.h> header file. */
+#undef HAVE_STDDEF_H
+
+/* Define if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define if you have the `stpcpy' function. */
 #undef HAVE_STPCPY
 
-/* Define if you have the stpncpy function.  */
+/* Define if you have the `stpncpy' function. */
 #undef HAVE_STPNCPY
 
-/* Define if you have the strcasecmp function.  */
+/* Define if you have the `strcasecmp' function. */
 #undef HAVE_STRCASECMP
 
-/* Define if you have the strchr function.  */
+/* Define if you have the `strchr' function. */
 #undef HAVE_STRCHR
 
-/* Define if you have the strcspn function.  */
+/* Define if you have the `strcspn' function. */
 #undef HAVE_STRCSPN
 
-/* Define if you have the strdup function.  */
+/* Define if you have the `strdup' function. */
 #undef HAVE_STRDUP
 
-/* Define if you have the strerror function.  */
+/* Define if you have the `strerror' function. */
 #undef HAVE_STRERROR
 
-/* Define if you have the strncasecmp function.  */
+/* Define if you have the `stricmp' function. */
+#undef HAVE_STRICMP
+
+/* Define if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define if you have the `strncasecmp' function. */
 #undef HAVE_STRNCASECMP
 
-/* Define if you have the strstr function.  */
+/* Define if you have the `strnicmp' function. */
+#undef HAVE_STRNICMP
+
+/* Define if you have the `strstr' function. */
 #undef HAVE_STRSTR
 
-/* Define if you have the strtoul function.  */
+/* Define if you have the `strtoul' function. */
 #undef HAVE_STRTOUL
 
-/* Define if you have the tsearch function.  */
+/* Define if you have the `symlink' function. */
+#undef HAVE_SYMLINK
+
+/* Define if you have the `sync' function. */
+#undef HAVE_SYNC
+
+/* Define if you have the <sys/nls.h> header file. */
+#undef HAVE_SYS_NLS_H
+
+/* Define if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define if you have the `tsearch' function. */
 #undef HAVE_TSEARCH
 
-/* Define if you have the uname function.  */
+/* Define if you have the `uname' function. */
 #undef HAVE_UNAME
 
-/* Define if you have the vasprintf function.  */
-#undef HAVE_VASPRINTF
+/* Define if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
 
-/* Define if you have the wcwidth function.  */
-#undef HAVE_WCWIDTH
+/* Define if you have the unsigned long long type. */
+#undef HAVE_UNSIGNED_LONG_LONG
 
-/* Define if you have the <argz.h> header file.  */
-#undef HAVE_ARGZ_H
+/* Define if you have the <values.h> header file. */
+#undef HAVE_VALUES_H
 
-/* Define if you have the <dlfcn.h> header file.  */
-#undef HAVE_DLFCN_H
+/* Define if you have the `vasprintf' function. */
+#undef HAVE_VASPRINTF
 
-/* Define if you have the <limits.h> header file.  */
-#undef HAVE_LIMITS_H
+/* Define if you have the `vprintf' function. */
+#undef HAVE_VPRINTF
 
-/* Define if you have the <locale.h> header file.  */
-#undef HAVE_LOCALE_H
+/* Define if you have the <wchar.h> header file. */
+#undef HAVE_WCHAR_H
 
-/* Define if you have the <malloc.h> header file.  */
-#undef HAVE_MALLOC_H
+/* Define if you have the <wctype.h> header file. */
+#undef HAVE_WCTYPE_H
 
-/* Define if you have the <nl_types.h> header file.  */
-#undef HAVE_NL_TYPES_H
+/* Define if you have the `wcwidth' function. */
+#undef HAVE_WCWIDTH
 
-/* Define if you have the <stddef.h> header file.  */
-#undef HAVE_STDDEF_H
+/* Define if you have the `_chdir2' function. */
+#undef HAVE__CHDIR2
 
-/* Define if you have the <stdlib.h> header file.  */
-#undef HAVE_STDLIB_H
+/* Define if you have the `_getcwd2' function. */
+#undef HAVE__GETCWD2
 
-/* Define if you have the <string.h> header file.  */
-#undef HAVE_STRING_H
+/* Define if you have the `_nls_init' function. */
+#undef HAVE__NLS_INIT
 
-/* Define if you have the <sys/param.h> header file.  */
-#undef HAVE_SYS_PARAM_H
+/* Define if you have the `_response' function. */
+#undef HAVE__RESPONSE
 
-/* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
+/* Define if you have the `_wildcard' function. */
+#undef HAVE__WILDCARD
 
-/* Define if you have the <values.h> header file.  */
-#undef HAVE_VALUES_H
+/* Define if you have the `__argz_count' function. */
+#undef HAVE___ARGZ_COUNT
 
-/* Define if you have the <wchar.h> header file.  */
-#undef HAVE_WCHAR_H
+/* Define if you have the `__argz_next' function. */
+#undef HAVE___ARGZ_NEXT
 
-/* Define if you have the <wctype.h> header file.  */
-#undef HAVE_WCTYPE_H
+/* Define if you have the `__argz_stringify' function. */
+#undef HAVE___ARGZ_STRINGIFY
+
+/* Define as const if the declaration of iconv() needs const. */
+#undef ICONV_CONST
 
 /* Name of package */
 #undef PACKAGE
 
-/* Version number of package */
-#undef VERSION
+/* Define as const if the declaration of setlocale() needs const. */
+#undef SETLOCALE_CONST
 
-/* Make sure we see all GNU extensions. */
-#undef _GNU_SOURCE
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at run-time.
+        STACK_DIRECTION > 0 => grows toward higher addresses
+        STACK_DIRECTION < 0 => grows toward lower addresses
+        STACK_DIRECTION = 0 => direction of growth unknown */
+#undef STACK_DIRECTION
 
-/* Define to empty if the C compiler doesn't support this keyword. */
-#undef signed
+/* Define if you have the ANSI C header files. */
+#undef STDC_HEADERS
 
-/* Define if backslash-a works in C strings. */
-#undef HAVE_C_BACKSLASH_A
+/* Version number of package */
+#undef VERSION
 
-/* Define if you have the unsigned long long type. */
-#undef HAVE_UNSIGNED_LONG_LONG
+/* If libc does not support chown(), replace it by a dummy function */
+#if !HAVE_CHOWN && !defined chown
+static inline int replace_chown(x,y,z) { errno = EPERM; return -1; }
+#define chown(x,y,z) replace_chown(x,y,z)
+#endif
+
+/* If libc does not support fchown(), replace it by a dummy function */
+#if !HAVE_FCHOWN && !defined fchown
+static inline int replace_fchown(x,y,z) { errno = EPERM; return -1; }
+#define fchown(x,y,z) replace_fchown(x,y,z)
+#endif
+
+/* If libc does not support lchown(), replace it by chown */
+#if !HAVE_LCHOWN && !defined lchown
+static inline int replace_lchown(x,y,z) { errno = EPERM; return -1; }
+#define lchown(x,y,z) replace_lchown(x,y,z)
+#endif
+
+/* If libc does not support link(), replace it by a dummy function */
+#if !HAVE_LINK && !defined link
+static inline int replace_link(x,y) { errno = EPERM; return -1; }
+#define link(x,y) replace_link(x,y)
+#endif
+
+/* If libc does not support lstat(), replace it by stat() (EMX only) */
+#if !HAVE_LSTAT && HAVE_STAT && !defined lstat
+# define lstat(x, y) stat(x, y)
+#endif
+
+/* If libc does not support mkfifo(), replace it by a dummy function */
+#if !HAVE_MKFIFO && !defined mkfifo
+static inline int replace_mkfifo(x,y) { errno = EPERM; return -1; }
+#define mkfifo(x,y) replace_mkfifo(x,y)
+#endif
+
+/* If libc does not support mknod(), replace it by a dummy function */
+#if !HAVE_MKNOD && !defined mknod
+static inline int replace_mknod(x,y,z) { errno = EPERM; return -1; }
+#define mknod(x,y,z) replace_mknod(x,y,z)
+#endif
+
+/* If libc does not support readlink(), replace it by a dummy function */
+#if !HAVE_READLINK && !defined readlink
+static inline int replace_readlink(x,y,z) { errno = EPERM; return -1; }
+#define readlink(x,y,z) replace_readlink(x,y,z)
+#endif
+
+/* Replace strcasecmp() by stricmp() if necessary (EMX only) */
+#if !HAVE_STRCASECMP && HAVE_STRICMP && !defined strcasecmp
+# define strcasecmp(x,y) stricmp(x,y)
+#endif
+
+/* Replace strncasecmp() by strnicmp() if necessary (EMX only) */
+#if !HAVE_STRNCASECMP && HAVE_STRNICMP && !defined strncasecmp
+# define strncasecmp(x,y,z) strnicmp(x,y,z)
+#endif
+
+/* If libc does not support symlink(), replace it by a dummy function */
+#if !HAVE_SYMLINK && !defined symlink
+static inline int replace_symlink(x,y) { errno = EPERM; return -1; }
+#define symlink(x,y) replace_symlink(x,y)
+#endif
+
+/* If libc does not support sync(), replace it by an empty macro */
+#if !HAVE_SYNC && !defined sync
+#define sync() {}
+#endif
 
-/* Define if system has ptrdiff_t type */
-#undef HAVE_PTRDIFF_T
+/* Make sure we see all GNU extensions. */
+#undef _GNU_SOURCE
 
-/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
-   and declares uintmax_t.  */
-#undef HAVE_INTTYPES_H
+#if HAVE__RESPONSE && defined __EMX__
+# define _EMX_RESPONSE(a, b) _response(a, b)
+#else
+# define _EMX_RESPONSE(a, b)
+#endif
+
+#if HAVE__WILDCARD && defined __EMX__
+# define _EMX_WILDCARD(a, b) _wildcard(a, b)
+#else
+# define _EMX_WILDCARD(a,, b)
+#endif
+
+#if HAVE_SYS_NLS_H && HAVE__NLS_INIT
+#include<sys/nls.h>
+# define TOUPPER(x) _nls_toupper(x)
+# define TOLOWER(x) _nls_tolower(x)
+#endif
+
+#if (HAVE__RESPONSE || HAVE__WILDCARD) && !defined initialize_main
+# define initialize_main(pargc, pargv) { \
+_EMX_RESPONSE(pargc, pargv); _EMX_WILDCARD(pargc, pargv); }
+#endif
+
+/* Replace chdir() by _chdir2() if necessary (EMX only) */
+#if defined EMX_REPLACE_CHDIR && !defined chdir
+#define chdir replace_chdir
+static inline int replace_chdir(const char *name) { return _chdir2(name); }
+#endif
 
-/* Define to unsigned long or unsigned long long
-   if <inttypes.h> doesn't define. */
-#undef uintmax_t
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
 
-/* Define to 1 if mbrtowc and mbstate_t are properly declared. */
-#undef HAVE_MBRTOWC
+/* Replace getcwd() by _getcwd2() if necessary (EMX only) */
+#if defined EMX_REPLACE_GETCWD && !defined getcwd
+#define getcwd replace_getcwd
+static inline char* replace_getcwd(char *buffer, size_t size) { return _getcwd2(buffer, size); }
+#endif
 
-/* Define to 1 if you have the declaration of wcwidth(), and to 0 otherwise. */
-#undef HAVE_DECL_WCWIDTH
+/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+   if it is not supported. */
+#undef inline
 
 /* Define to a type if <wchar.h> does not define. */
 #undef mbstate_t
 
-/* Define if you have the parse_printf_format() function. */
-#undef HAVE_PARSE_PRINTF_FORMAT
-
-/* Define as const if the declaration of setlocale() needs const. */
-#undef SETLOCALE_CONST
-
-/* Define if you have the iconv() function. */
-#undef HAVE_ICONV
-
-/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
-
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#undef HAVE_LANGINFO_CODESET
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#undef HAVE_LC_MESSAGES
+/* Define to `long' if <sys/types.h> does not define. */
+#undef off_t
 
-/* Define to 1 if translation of program messages to the user's native language
-   is requested. */
-#undef ENABLE_NLS
+/* Define to empty if the C compiler doesn't support this keyword. */
+#undef signed
 
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#undef HAVE_GETTEXT
+/* Define to `unsigned' if <sys/types.h> does not define. */
+#undef size_t
 
+/* Define to unsigned long or unsigned long long if <inttypes.h> doesn't
+   define. */
+#undef uintmax_t
 
 /* We don't test for the basename function but still want to use the
    version in the libc when compiling for a system using glibc.  */
diff -Nur old/gettext-0.10.39/doc/Makefile.in gnu/gettext-0.10.39/doc/Makefile.in
--- old/gettext-0.10.39/doc/Makefile.in	Tue Jul 24 15:27:40 2001
+++ gnu/gettext-0.10.39/doc/Makefile.in	Sat Oct  6 20:23:00 2001
@@ -158,9 +158,9 @@
 .SUFFIXES:
 .SUFFIXES: .dvi .info .pdf .ps .texi .texinfo .txi
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits --include-deps doc/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnits doc/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -311,6 +311,11 @@
 subdir = doc
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits doc/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff -Nur old/gettext-0.10.39/doc/stamp-vti gnu/gettext-0.10.39/doc/stamp-vti
--- old/gettext-0.10.39/doc/stamp-vti	Tue Jul 24 15:29:04 2001
+++ gnu/gettext-0.10.39/doc/stamp-vti	Tue Sep  4 00:16:50 2001
@@ -1,3 +1,3 @@
-@set UPDATED 24 July 2001
+@set UPDATED 
 @set EDITION 0.10.39
 @set VERSION 0.10.39
diff -Nur old/gettext-0.10.39/doc/version.texi gnu/gettext-0.10.39/doc/version.texi
--- old/gettext-0.10.39/doc/version.texi	Tue Jul 24 15:12:28 2001
+++ gnu/gettext-0.10.39/doc/version.texi	Tue Sep  4 00:16:50 2001
@@ -1,3 +1,3 @@
-@set UPDATED 24 July 2001
+@set UPDATED 
 @set EDITION 0.10.39
 @set VERSION 0.10.39
--- old/gettext-0.10.39/lib/Makefile.in	Tue Jul 24 15:27:38 2001
+++ gnu/gettext-0.10.39/lib/Makefile.in	Sat Oct  6 20:22:58 2001
@@ -150,14 +150,21 @@
 HEADERS =  $(noinst_HEADERS)
 
 DIST_COMMON =  ChangeLog Makefile.am Makefile.in alloca.c error.c \
-error.h memmove.c memset.c printf-prs.c stpcpy.c stpncpy.c strcasecmp.c \
-strcspn.c strncasecmp.c strstr.c strtoul.c vasprintf.c
+error.h memmove.c memset.c stpcpy.c stpncpy.c strcasecmp.c strcspn.c \
+strncasecmp.c strstr.c strtoul.c vasprintf.c
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP_ENV = --best
+DEP_FILES =  .deps/alloca.P .deps/basename.P .deps/c-ctype.P \
+.deps/concatpath.P .deps/error.P .deps/fstrcmp.P .deps/getopt.P \
+.deps/getopt1.P .deps/hash.P .deps/linebreak.P .deps/localcharset.P \
+.deps/mbswidth.P .deps/memmove.P .deps/memset.P .deps/obstack.P \
+.deps/stpcpy.P .deps/stpncpy.P .deps/strcasecmp.P .deps/strcspn.P \
+.deps/strncasecmp.P .deps/strstr.P .deps/strtoul.P .deps/vasprintf.P \
+.deps/xgetcwd.P .deps/xmalloc.P .deps/xstrdup.P
 SOURCES = $(libnlsut_a_SOURCES)
 OBJECTS = $(libnlsut_a_OBJECTS)
 
@@ -165,9 +172,9 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .obj .s .sed .sin
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits --include-deps lib/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnits lib/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -181,13 +188,11 @@
 
 maintainer-clean-noinstLIBRARIES:
 
-.c.o:
-	$(COMPILE) -c $<
-
 # FIXME: We should only use cygpath when building on Windows,
 # and only if it is available.
 .c.obj:
-	$(COMPILE) -c `cygpath -w $<`
+	$(COMPILE) -c $<
+#OBJEXT	$(COMPILE) -c `cygpath -w $<`
 
 .s.o:
 	$(COMPILE) -c $<
@@ -206,9 +211,6 @@
 
 maintainer-clean-compile:
 
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
 .s.lo:
 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 
@@ -264,6 +266,11 @@
 subdir = lib
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits lib/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -274,6 +281,38 @@
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
+
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-am
 dvi-am:
@@ -311,27 +350,27 @@
 
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags \
+		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
 		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
 clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-generic mostlyclean-am
+		clean-depend clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-generic \
-		clean-am
+		distclean-libtool distclean-tags distclean-depend \
+		distclean-generic clean-am
 	-rm -f libtool
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
+		maintainer-clean-tags maintainer-clean-depend \
+		maintainer-clean-generic distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -342,13 +381,14 @@
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck \
-install-exec-local install-exec-am install-exec install-data-am \
-install-data install-am install uninstall-local uninstall-am uninstall \
-all-local all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+distclean-tags clean-tags maintainer-clean-tags distdir \
+mostlyclean-depend distclean-depend clean-depend \
+maintainer-clean-depend info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-local install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-local uninstall-am uninstall all-local all-redirect all-am \
+all installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 # The following is needed in order to install a simple file in $(libdir)
diff -Nur old/gettext-0.10.39/m4/Makefile.in gnu/gettext-0.10.39/m4/Makefile.in
--- old/gettext-0.10.39/m4/Makefile.in	Tue Jul 24 15:27:36 2001
+++ gnu/gettext-0.10.39/m4/Makefile.in	Sat Oct  6 20:23:00 2001
@@ -125,9 +125,9 @@
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits --include-deps m4/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -159,6 +159,11 @@
 subdir = m4
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu m4/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff -Nur old/gettext-0.10.39/Makefile.in gnu/gettext-0.10.39/Makefile.in
--- old/gettext-0.10.39/Makefile.in	Tue Jul 24 15:27:26 2001
+++ gnu/gettext-0.10.39/Makefile.in	Sat Oct  6 20:22:58 2001
@@ -132,9 +132,9 @@
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits --include-deps Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnits Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -329,6 +329,11 @@
 	-rm -rf $(distdir)
 	mkdir $(distdir)
 	-chmod 777 $(distdir)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits Makefile
 	$(mkinstalldirs) $(distdir)/djgpp $(distdir)/os2
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
diff -Nur old/gettext-0.10.39/man/Makefile.in gnu/gettext-0.10.39/man/Makefile.in
--- old/gettext-0.10.39/man/Makefile.in	Tue Jul 24 15:27:36 2001
+++ gnu/gettext-0.10.39/man/Makefile.in	Sat Oct  6 20:23:00 2001
@@ -142,9 +142,9 @@
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits --include-deps man/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnits man/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -196,6 +196,11 @@
 subdir = man
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits man/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff -Nur old/gettext-0.10.39/misc/Makefile.in gnu/gettext-0.10.39/misc/Makefile.in
--- old/gettext-0.10.39/misc/Makefile.in	Thu Jul 26 21:00:28 2001
+++ gnu/gettext-0.10.39/misc/Makefile.in	Sat Oct  6 20:23:00 2001
@@ -130,9 +130,9 @@
 .SUFFIXES:
 .SUFFIXES: .el .elc
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnits --include-deps misc/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnits misc/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -162,7 +162,7 @@
 	@$(NORMAL_INSTALL)
 	@if test -n "$(lispdir)"; then \
 	  $(mkinstalldirs) $(DESTDIR)$(lispdir); \
-	  list='$(lisp_LISP)'; for p in $$list; do \
+	  @list='$(lisp_LISP)'; for p in $$list; do \
 	    if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
 	    echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p"; \
 	    $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p; \
@@ -203,6 +203,11 @@
 subdir = misc
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits misc/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \