From: Bruno Haible <bruno@clisp.org>
Date: Wed, 2 Aug 2006 14:24:33 +0000 (+0000)
Subject: Initial overrides of gnulib for gettext-tools.
X-Git-Tag: 0.16.x-branchpoint~237
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1d7d419235869938d350dd6003a71c078fda0ef;p=thirdparty%2Fgettext.git

Initial overrides of gnulib for gettext-tools.
---

diff --git a/gnulib-local/lib/argmatch.h.diff b/gnulib-local/lib/argmatch.h.diff
new file mode 100644
index 000000000..f47572c4f
--- /dev/null
+++ b/gnulib-local/lib/argmatch.h.diff
@@ -0,0 +1,19 @@
+*** gnulib/lib/argmatch.h	2005-09-23 06:15:13.000000000 +0200
+--- gettext-tools/lib/argmatch.h	2006-07-22 15:57:18.000000000 +0200
+***************
+*** 50,56 ****
+     return.  By default, this is a function that calls ARGMATCH_DIE which
+     in turn defaults to `exit (exit_failure)'.  */
+  typedef void (*argmatch_exit_fn) (void);
+! extern argmatch_exit_fn argmatch_die;
+  
+  /* Report on stderr why argmatch failed.  Report correct values. */
+  
+--- 50,56 ----
+     return.  By default, this is a function that calls ARGMATCH_DIE which
+     in turn defaults to `exit (exit_failure)'.  */
+  typedef void (*argmatch_exit_fn) (void);
+! extern DLL_VARIABLE argmatch_exit_fn argmatch_die;
+  
+  /* Report on stderr why argmatch failed.  Report correct values. */
+  
diff --git a/gnulib-local/lib/error.h.diff b/gnulib-local/lib/error.h.diff
new file mode 100644
index 000000000..069df8d6e
--- /dev/null
+++ b/gnulib-local/lib/error.h.diff
@@ -0,0 +1,33 @@
+*** gnulib/lib/error.h	2005-05-14 08:03:58.000000000 +0200
+--- srclib/error.h	2005-05-20 23:06:02.000000000 +0200
+***************
+*** 50,63 ****
+  /* If NULL, error will flush stdout, then print on stderr the program
+     name, a colon and a space.  Otherwise, error will call this
+     function without parameters instead.  */
+! extern void (*error_print_progname) (void);
+  
+  /* This variable is incremented each time `error' is called.  */
+! extern unsigned int error_message_count;
+  
+  /* Sometimes we want to have at most one error per line.  This
+     variable controls whether this mode is selected or not.  */
+! extern int error_one_per_line;
+  
+  #ifdef	__cplusplus
+  }
+--- 50,63 ----
+  /* If NULL, error will flush stdout, then print on stderr the program
+     name, a colon and a space.  Otherwise, error will call this
+     function without parameters instead.  */
+! extern DLL_VARIABLE void (*error_print_progname) (void);
+  
+  /* This variable is incremented each time `error' is called.  */
+! extern DLL_VARIABLE unsigned int error_message_count;
+  
+  /* Sometimes we want to have at most one error per line.  This
+     variable controls whether this mode is selected or not.  */
+! extern DLL_VARIABLE int error_one_per_line;
+  
+  #ifdef	__cplusplus
+  }
diff --git a/gnulib-local/lib/exitfail.h.diff b/gnulib-local/lib/exitfail.h.diff
new file mode 100644
index 000000000..119c9587c
--- /dev/null
+++ b/gnulib-local/lib/exitfail.h.diff
@@ -0,0 +1,13 @@
+*** gnulib/lib/exitfail.h	2005-05-14 08:03:58.000000000 +0200
+--- gettext-tools/lib/exitfail.h	2006-07-22 16:35:58.000000000 +0200
+***************
+*** 17,20 ****
+     If not, write to the Free Software Foundation,
+     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+  
+! extern int volatile exit_failure;
+--- 17,20 ----
+     If not, write to the Free Software Foundation,
+     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+  
+! extern DLL_VARIABLE int volatile exit_failure;
diff --git a/gnulib-local/lib/fnmatch.c.diff b/gnulib-local/lib/fnmatch.c.diff
new file mode 100644
index 000000000..47ffc447b
--- /dev/null
+++ b/gnulib-local/lib/fnmatch.c.diff
@@ -0,0 +1,23 @@
+*** lib/fnmatch.c.bak	2006-07-11 13:54:17.000000000 +0200
+--- lib/fnmatch.c	2006-07-30 20:23:09.000000000 +0200
+***************
+*** 276,282 ****
+  fnmatch (const char *pattern, const char *string, int flags)
+  {
+  # if HANDLE_MULTIBYTE
+! #  define ALLOCA_LIMIT 2000
+    if (__builtin_expect (MB_CUR_MAX, 1) != 1)
+      {
+        mbstate_t ps;
+--- 276,286 ----
+  fnmatch (const char *pattern, const char *string, int flags)
+  {
+  # if HANDLE_MULTIBYTE
+! #  if HAVE_ALLOCA || defined _LIBC
+! #   define ALLOCA_LIMIT 2000
+! #  else
+! #   define ALLOCA_LIMIT 0
+! #  endif
+    if (__builtin_expect (MB_CUR_MAX, 1) != 1)
+      {
+        mbstate_t ps;
diff --git a/gnulib-local/lib/fnmatch_loop.c.diff b/gnulib-local/lib/fnmatch_loop.c.diff
new file mode 100644
index 000000000..9998d0e1e
--- /dev/null
+++ b/gnulib-local/lib/fnmatch_loop.c.diff
@@ -0,0 +1,281 @@
+*** lib/fnmatch_loop.c.bak	2006-07-11 13:54:17.000000000 +0200
+--- lib/fnmatch_loop.c	2006-07-30 21:03:04.000000000 +0200
+***************
+*** 1003,1022 ****
+    struct patternlist
+    {
+      struct patternlist *next;
+      CHAR str[1];
+    } *list = NULL;
+    struct patternlist **lastp = &list;
+    size_t pattern_len = STRLEN (pattern);
+    const CHAR *p;
+    const CHAR *rs;
+    enum { ALLOCA_LIMIT = 8000 };
+  
+    /* Parse the pattern.  Store the individual parts in the list.  */
+    level = 0;
+    for (startp = p = pattern + 1; ; ++p)
+      if (*p == L_('\0'))
+        /* This is an invalid pattern.  */
+!       return -1;
+      else if (*p == L_('['))
+        {
+  	/* Handle brackets special.  */
+--- 1003,1028 ----
+    struct patternlist
+    {
+      struct patternlist *next;
++     int malloced;
+      CHAR str[1];
+    } *list = NULL;
+    struct patternlist **lastp = &list;
+    size_t pattern_len = STRLEN (pattern);
+    const CHAR *p;
+    const CHAR *rs;
++ #if HAVE_ALLOCA || defined _LIBC
+    enum { ALLOCA_LIMIT = 8000 };
++ #else
++   enum { ALLOCA_LIMIT = 0 };
++ #endif
++   int retval;
+  
+    /* Parse the pattern.  Store the individual parts in the list.  */
+    level = 0;
+    for (startp = p = pattern + 1; ; ++p)
+      if (*p == L_('\0'))
+        /* This is an invalid pattern.  */
+!       goto failed;
+      else if (*p == L_('['))
+        {
+  	/* Handle brackets special.  */
+***************
+*** 1034,1040 ****
+  	while (*p != L_(']'))
+  	  if (*p++ == L_('\0'))
+  	    /* This is no valid pattern.  */
+! 	    return -1;
+        }
+      else if ((*p == L_('?') || *p == L_('*') || *p == L_('+') || *p == L_('@')
+  	      || *p == L_('!')) && p[1] == L_('('))
+--- 1040,1046 ----
+  	while (*p != L_(']'))
+  	  if (*p++ == L_('\0'))
+  	    /* This is no valid pattern.  */
+! 	    goto failed;
+        }
+      else if ((*p == L_('?') || *p == L_('*') || *p == L_('+') || *p == L_('@')
+  	      || *p == L_('!')) && p[1] == L_('('))
+***************
+*** 1057,1067 ****
+  	    plensize = plen * sizeof (CHAR);				      \
+  	    newpsize = offsetof (struct patternlist, str) + plensize;	      \
+  	    if ((size_t) -1 / sizeof (CHAR) < plen			      \
+! 		|| newpsize < offsetof (struct patternlist, str)	      \
+! 		|| ALLOCA_LIMIT <= newpsize)				      \
+! 	      return -1;						      \
+! 	    newp = (struct patternlist *) alloca (newpsize);		      \
+! 	    *((CHAR *) MEMPCPY (newp->str, startp, p - startp)) = L_('\0');    \
+  	    newp->next = NULL;						      \
+  	    *lastp = newp;						      \
+  	    lastp = &newp->next
+--- 1063,1083 ----
+  	    plensize = plen * sizeof (CHAR);				      \
+  	    newpsize = offsetof (struct patternlist, str) + plensize;	      \
+  	    if ((size_t) -1 / sizeof (CHAR) < plen			      \
+! 		|| newpsize < offsetof (struct patternlist, str))	      \
+! 	      goto failed;						      \
+! 	    if (newpsize < ALLOCA_LIMIT)				      \
+! 	      {								      \
+! 		newp = (struct patternlist *) alloca (newpsize);	      \
+! 		newp->malloced = 0;					      \
+! 	      }								      \
+! 	    else							      \
+! 	      {								      \
+! 		newp = (struct patternlist *) malloc (newpsize);	      \
+! 		if (!newp)						      \
+! 		  goto failed;						      \
+! 		newp->malloced = 1;					      \
+! 	      }								      \
+! 	    *((CHAR *) MEMPCPY (newp->str, startp, p - startp)) = L_('\0');   \
+  	    newp->next = NULL;						      \
+  	    *lastp = newp;						      \
+  	    lastp = &newp->next
+***************
+*** 1085,1096 ****
+      {
+      case L_('*'):
+        if (FCT (p, string, string_end, no_leading_period, flags) == 0)
+! 	return 0;
+        /* FALLTHROUGH */
+  
+      case L_('+'):
+        do
+  	{
+  	  for (rs = string; rs <= string_end; ++rs)
+  	    /* First match the prefix with the current pattern with the
+  	       current pattern.  */
+--- 1101,1117 ----
+      {
+      case L_('*'):
+        if (FCT (p, string, string_end, no_leading_period, flags) == 0)
+! 	{
+! 	  retval = 0;
+! 	  goto done;
+! 	}
+        /* FALLTHROUGH */
+  
+      case L_('+'):
+        do
+  	{
++ 	  struct patternlist *next;
++ 
+  	  for (rs = string; rs <= string_end; ++rs)
+  	    /* First match the prefix with the current pattern with the
+  	       current pattern.  */
+***************
+*** 1112,1142 ****
+  				: rs[-1] == '/' && NO_LEADING_PERIOD (flags),
+  				flags & FNM_FILE_NAME
+  				? flags : flags & ~FNM_PERIOD) == 0)))
+! 	      /* It worked.  Signal success.  */
+! 	      return 0;
+  	}
+!       while ((list = list->next) != NULL);
+  
+        /* None of the patterns lead to a match.  */
+        return FNM_NOMATCH;
+  
+      case L_('?'):
+        if (FCT (p, string, string_end, no_leading_period, flags) == 0)
+! 	return 0;
+        /* FALLTHROUGH */
+  
+      case L_('@'):
+        do
+! 	/* I cannot believe it but `strcat' is actually acceptable
+! 	   here.  Match the entire string with the prefix from the
+! 	   pattern list and the rest of the pattern following the
+! 	   pattern list.  */
+! 	if (FCT (STRCAT (list->str, p), string, string_end,
+! 		 no_leading_period,
+! 		 flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD) == 0)
+! 	  /* It worked.  Signal success.  */
+! 	  return 0;
+!       while ((list = list->next) != NULL);
+  
+        /* None of the patterns lead to a match.  */
+        return FNM_NOMATCH;
+--- 1133,1186 ----
+  				: rs[-1] == '/' && NO_LEADING_PERIOD (flags),
+  				flags & FNM_FILE_NAME
+  				? flags : flags & ~FNM_PERIOD) == 0)))
+! 	      {
+! 		/* It worked.  Signal success.  */
+! 		retval = 0;
+! 		goto done;
+! 	      }
+! 
+! 	  next = list->next;
+! 	  if (list->malloced)
+! 	    free (list);
+! 	  list = next;
+  	}
+!       while (list != NULL);
+  
+        /* None of the patterns lead to a match.  */
+        return FNM_NOMATCH;
+  
+      case L_('?'):
+        if (FCT (p, string, string_end, no_leading_period, flags) == 0)
+! 	{
+! 	  retval = 0;
+! 	  goto done;
+! 	}
+        /* FALLTHROUGH */
+  
+      case L_('@'):
+        do
+! 	{
+! 	  struct patternlist *next;
+! 
+! 	  /* I cannot believe it but `strcat' is actually acceptable
+! 	     here.  Match the entire string with the prefix from the
+! 	     pattern list and the rest of the pattern following the
+! 	     pattern list.  */
+! 	  if (FCT (STRCAT (list->str, p), string, string_end,
+! 		   no_leading_period,
+! 		   flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD) == 0)
+! 	    {
+! 	      /* It worked.  Signal success.  */
+! 	      retval = 0;
+! 	      goto done;
+! 	    }
+! 
+! 	  next = list->next;
+! 	  if (list->malloced)
+! 	    free (list);
+! 	  list = next;
+! 	}
+!       while (list != NULL);
+  
+        /* None of the patterns lead to a match.  */
+        return FNM_NOMATCH;
+***************
+*** 1159,1178 ****
+  		       : rs[-1] == '/' && NO_LEADING_PERIOD (flags),
+  		       flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD)
+  		  == 0))
+! 	    /* This is successful.  */
+! 	    return 0;
+  	}
+  
+        /* None of the patterns together with the rest of the pattern
+  	 lead to a match.  */
+!       return FNM_NOMATCH;
+  
+      default:
+        assert (! "Invalid extended matching operator");
+        break;
+      }
+  
+!   return -1;
+  }
+  
+  
+--- 1203,1237 ----
+  		       : rs[-1] == '/' && NO_LEADING_PERIOD (flags),
+  		       flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD)
+  		  == 0))
+! 	    {
+! 	      /* This is successful.  */
+! 	      retval = 0;
+! 	      goto done;
+! 	    }
+  	}
+  
+        /* None of the patterns together with the rest of the pattern
+  	 lead to a match.  */
+!       retval = FNM_NOMATCH;
+!       goto done;
+  
+      default:
+        assert (! "Invalid extended matching operator");
+        break;
+      }
+  
+!  failed:
+!   retval = -1;
+!  done:
+!   while (list != NULL)
+!     {
+!       struct patternlist *next = list->next;
+! 
+!       if (list->malloced)
+! 	free (list);
+!       list = next;
+!     }
+!   return retval;
+  }
+  
+  
diff --git a/gnulib-local/lib/getopt_.h.diff b/gnulib-local/lib/getopt_.h.diff
new file mode 100644
index 000000000..16dc62c76
--- /dev/null
+++ b/gnulib-local/lib/getopt_.h.diff
@@ -0,0 +1,84 @@
+*** gnulib/lib/getopt_.h	2005-09-23 06:15:13.000000000 +0200
+--- gettext-tools/lib/getopt_.h	2006-04-24 03:08:25.000000000 +0200
+***************
+*** 1,5 ****
+  /* Declarations for getopt.
+!    Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2005
+     Free Software Foundation, Inc.
+     This file is part of the GNU C Library.
+  
+--- 1,5 ----
+  /* Declarations for getopt.
+!    Copyright (C) 1989-1994,1996-1999,2001,2003-2006
+     Free Software Foundation, Inc.
+     This file is part of the GNU C Library.
+  
+***************
+*** 23,28 ****
+--- 23,36 ----
+  # define _GETOPT_H 1
+  #endif
+  
++ /* Ensure that DLL_VARIABLE is defined.  Since on OSF/1 4.0 and Irix 6.5
++    <stdlib.h> includes <getopt.h>, and <config.h> is not a prerequisite for
++    using <stdlib.h>, this file can be included without a prior
++    "#include <config.h>".  */
++ #ifdef HAVE_CONFIG_H
++ # include <config.h>
++ #endif
++ 
+  /* Standalone applications should #define __GETOPT_PREFIX to an
+     identifier that prefixes the external functions and variables
+     defined in this header.  When this happens, include the
+***************
+*** 111,117 ****
+     Also, when `ordering' is RETURN_IN_ORDER,
+     each non-option ARGV-element is returned here.  */
+  
+! extern char *optarg;
+  
+  /* Index in ARGV of the next element to be scanned.
+     This is used for communication to and from the caller
+--- 119,125 ----
+     Also, when `ordering' is RETURN_IN_ORDER,
+     each non-option ARGV-element is returned here.  */
+  
+! extern DLL_VARIABLE char *optarg;
+  
+  /* Index in ARGV of the next element to be scanned.
+     This is used for communication to and from the caller
+***************
+*** 125,140 ****
+     Otherwise, `optind' communicates from one call to the next
+     how much of ARGV has been scanned so far.  */
+  
+! extern int optind;
+  
+  /* Callers store zero here to inhibit the error message `getopt' prints
+     for unrecognized options.  */
+  
+! extern int opterr;
+  
+  /* Set to an option character which was unrecognized.  */
+  
+! extern int optopt;
+  
+  #ifndef __need_getopt
+  /* Describe the long-named options requested by the application.
+--- 133,148 ----
+     Otherwise, `optind' communicates from one call to the next
+     how much of ARGV has been scanned so far.  */
+  
+! extern DLL_VARIABLE int optind;
+  
+  /* Callers store zero here to inhibit the error message `getopt' prints
+     for unrecognized options.  */
+  
+! extern DLL_VARIABLE int opterr;
+  
+  /* Set to an option character which was unrecognized.  */
+  
+! extern DLL_VARIABLE int optopt;
+  
+  #ifndef __need_getopt
+  /* Describe the long-named options requested by the application.
diff --git a/gnulib-local/lib/javacomp.c.diff b/gnulib-local/lib/javacomp.c.diff
new file mode 100644
index 000000000..b0ef81508
--- /dev/null
+++ b/gnulib-local/lib/javacomp.c.diff
@@ -0,0 +1,36 @@
+*** gnulib/lib/javacomp.c	2006-07-11 14:08:16.000000000 +0200
+--- gettext-tools/lib/javacomp.c	2006-07-30 13:39:06.000000000 +0200
+***************
+*** 50,56 ****
+  #include "clean-temp.h"
+  #include "error.h"
+  #include "xvasprintf.h"
+! #include "strstr.h"
+  #include "gettext.h"
+  
+  #define _(str) gettext (str)
+--- 50,56 ----
+  #include "clean-temp.h"
+  #include "error.h"
+  #include "xvasprintf.h"
+! #include "c-strstr.h"
+  #include "gettext.h"
+  
+  #define _(str) gettext (str)
+***************
+*** 570,576 ****
+  	  fclose (fp);
+  	  goto failed;
+  	}
+!       envjavac_gcj = (strstr (line, "gcj") != NULL);
+  
+        fclose (fp);
+  
+--- 570,576 ----
+  	  fclose (fp);
+  	  goto failed;
+  	}
+!       envjavac_gcj = (c_strstr (line, "gcj") != NULL);
+  
+        fclose (fp);
+  
diff --git a/gnulib-local/lib/linebreak.c.diff b/gnulib-local/lib/linebreak.c.diff
new file mode 100644
index 000000000..1ca9f85a1
--- /dev/null
+++ b/gnulib-local/lib/linebreak.c.diff
@@ -0,0 +1,111 @@
+*** gnulib/lib/linebreak.c	2006-07-22 17:27:19.000000000 +0200
+--- gettext-tools/lib/linebreak.c	2005-05-21 00:19:09.000000000 +0200
+***************
+*** 30,38 ****
+  
+  #include "utf8-ucs4.h"
+  
+  #include "utf16-ucs4.h"
+  
+- #ifdef unused
+  static inline int
+  u32_mbtouc (unsigned int *puc, const unsigned int *s, size_t n)
+  {
+--- 30,38 ----
+  
+  #include "utf8-ucs4.h"
+  
++ #ifdef unused
+  #include "utf16-ucs4.h"
+  
+  static inline int
+  u32_mbtouc (unsigned int *puc, const unsigned int *s, size_t n)
+  {
+***************
+*** 460,465 ****
+--- 460,467 ----
+  }
+  
+  
++ #ifdef unused
++ 
+  /* Determine number of column positions required for first N units
+     (or fewer if S ends before this) in S.  */
+  
+***************
+*** 533,538 ****
+--- 535,542 ----
+    return width;
+  }
+  
++ #endif
++ 
+  
+  /* Determine the line break points in S, and store the result at p[0..n-1].  */
+  /* We don't support line breaking of complex-context dependent characters
+***************
+*** 741,746 ****
+--- 745,752 ----
+      }
+  }
+  
++ #ifdef unused
++ 
+  void
+  u16_possible_linebreaks (const unsigned short *s, size_t n, const char *encoding, char *p)
+  {
+***************
+*** 961,966 ****
+--- 967,974 ----
+      }
+  }
+  
++ #endif
++ 
+  
+  /* Choose the best line breaks, assuming the uc_width function.
+     Return the column after the end of the string.  */
+***************
+*** 1049,1054 ****
+--- 1057,1064 ----
+    return last_column + piece_width;
+  }
+  
++ #ifdef unused
++ 
+  int
+  u16_width_linebreaks (const unsigned short *s, size_t n,
+                        int width, int start_column, int at_end_columns,
+***************
+*** 1216,1221 ****
+--- 1226,1233 ----
+    return last_column + piece_width;
+  }
+  
++ #endif
++ 
+  
+  #ifdef TEST1
+  
+***************
+*** 1481,1486 ****
+--- 1493,1500 ----
+  
+  #endif /* C_CTYPE_ASCII */
+  
++ #if defined unused || defined TEST2
++ 
+  void
+  mbs_possible_linebreaks (const char *s, size_t n, const char *encoding,
+                           char *p)
+***************
+*** 1574,1579 ****
+--- 1588,1595 ----
+      }
+  }
+  
++ #endif
++ 
+  int
+  mbs_width_linebreaks (const char *s, size_t n,
+                        int width, int start_column, int at_end_columns,
diff --git a/gnulib-local/lib/obstack.h.diff b/gnulib-local/lib/obstack.h.diff
new file mode 100644
index 000000000..c2dc6ae5c
--- /dev/null
+++ b/gnulib-local/lib/obstack.h.diff
@@ -0,0 +1,25 @@
+*** gnulib/lib/obstack.h	2005-10-15 01:23:50.000000000 +0200
+--- gettext-tools/lib/obstack.h	2006-07-22 17:48:51.000000000 +0200
+***************
+*** 193,202 ****
+     more memory.  This can be set to a user defined function which
+     should either abort gracefully or use longjump - but shouldn't
+     return.  The default action is to print a message and abort.  */
+! extern void (*obstack_alloc_failed_handler) (void);
+  
+  /* Exit value used when `print_and_abort' is used.  */
+! extern int obstack_exit_failure;
+  
+  /* Pointer to beginning of object being allocated or to be allocated next.
+     Note that this might not be the final address of the object
+--- 192,201 ----
+     more memory.  This can be set to a user defined function which
+     should either abort gracefully or use longjump - but shouldn't
+     return.  The default action is to print a message and abort.  */
+! extern DLL_VARIABLE void (*obstack_alloc_failed_handler) (void);
+  
+  /* Exit value used when `print_and_abort' is used.  */
+! extern DLL_VARIABLE int obstack_exit_failure;
+  
+  /* Pointer to beginning of object being allocated or to be allocated next.
+     Note that this might not be the final address of the object
diff --git a/gnulib-local/lib/progname.h.diff b/gnulib-local/lib/progname.h.diff
new file mode 100644
index 000000000..37dda97cd
--- /dev/null
+++ b/gnulib-local/lib/progname.h.diff
@@ -0,0 +1,19 @@
+*** gnulib/lib/progname.h	2005-05-14 08:03:58.000000000 +0200
+--- srclib/progname.h	2005-05-20 23:06:02.000000000 +0200
+***************
+*** 30,36 ****
+  
+  
+  /* String containing name the program is called with.  */
+! extern const char *program_name;
+  
+  /* Set program_name, based on argv[0].  */
+  extern void set_program_name (const char *argv0);
+--- 30,36 ----
+  
+  
+  /* String containing name the program is called with.  */
+! extern DLL_VARIABLE const char *program_name;
+  
+  /* Set program_name, based on argv[0].  */
+  extern void set_program_name (const char *argv0);
diff --git a/gnulib-local/lib/strerror.c.diff b/gnulib-local/lib/strerror.c.diff
new file mode 100644
index 000000000..d6bba5edb
--- /dev/null
+++ b/gnulib-local/lib/strerror.c.diff
@@ -0,0 +1,27 @@
+*** gnulib/lib/strerror.c	2005-09-19 19:28:15.000000000 +0200
+--- srclib/strerror.c	2005-10-10 13:00:57.000000000 +0200
+***************
+*** 21,26 ****
+--- 21,28 ----
+  # include <config.h>
+  #endif
+  
++ #if !HAVE_STRERROR
++ 
+  #include <limits.h>
+  
+  /* Don't include <stdio.h>, since it may or may not declare
+***************
+*** 47,49 ****
+--- 49,59 ----
+    else
+      return sys_errlist[n];
+  }
++ 
++ #else
++ 
++ /* This declaration is solely to ensure that after preprocessing
++    this file is never empty.  */
++ typedef int dummy;
++ 
++ #endif
diff --git a/gnulib-local/m4/exitfail.m4.diff b/gnulib-local/m4/exitfail.m4.diff
new file mode 100644
index 000000000..0498dc40e
--- /dev/null
+++ b/gnulib-local/m4/exitfail.m4.diff
@@ -0,0 +1,14 @@
+*** gnulib/m4/exitfail.m4	2005-03-21 23:06:27.000000000 +0100
+--- gettext-tools/m4/exitfail.m4	2005-03-09 00:49:02.000000000 +0100
+***************
+*** 6,14 ****
+  
+  AC_DEFUN([gl_EXITFAIL],
+  [
+-   AC_LIBSOURCES([exitfail.c, exitfail.h])
+-   AC_LIBOBJ([exitfail])
+- 
+    dnl No prerequisites of lib/exitfail.c.
+    :
+  ])
+--- 6,11 ----
diff --git a/gnulib-local/m4/hard-locale.m4.diff b/gnulib-local/m4/hard-locale.m4.diff
new file mode 100644
index 000000000..c48229bee
--- /dev/null
+++ b/gnulib-local/m4/hard-locale.m4.diff
@@ -0,0 +1,17 @@
+*** gnulib/m4/hard-locale.m4	2005-03-21 23:06:27.000000000 +0100
+--- gettext-tools/m4/hard-locale.m4	2005-03-09 00:49:02.000000000 +0100
+***************
+*** 5,12 ****
+  dnl with or without modifications, as long as this notice is preserved.
+  
+  dnl No prerequisites of lib/hard-locale.c.
+! AC_DEFUN([gl_HARD_LOCALE],
+! [
+!   AC_LIBSOURCES([hard-locale.c, hard-locale.h])
+!   AC_LIBOBJ([hard-locale])
+! ])
+--- 5,8 ----
+  dnl with or without modifications, as long as this notice is preserved.
+  
+  dnl No prerequisites of lib/hard-locale.c.
+! AC_DEFUN([gl_HARD_LOCALE], [:])
diff --git a/gnulib-local/m4/pathmax.m4.diff b/gnulib-local/m4/pathmax.m4.diff
new file mode 100644
index 000000000..3200a8fd8
--- /dev/null
+++ b/gnulib-local/m4/pathmax.m4.diff
@@ -0,0 +1,12 @@
+*** m4/pathmax.m4.bak	2005-09-23 06:15:13.000000000 +0200
+--- m4/pathmax.m4	2006-07-30 21:25:06.000000000 +0200
+***************
+*** 6,12 ****
+  
+  AC_DEFUN([gl_PATHMAX],
+  [
+-   AC_LIBSOURCES([pathmax.h])
+  
+    dnl Prerequisites of lib/pathmax.h.
+    AC_CHECK_HEADERS_ONCE(sys/param.h)
+--- 6,11 ----
diff --git a/gnulib-local/m4/quote.m4.diff b/gnulib-local/m4/quote.m4.diff
new file mode 100644
index 000000000..2868df074
--- /dev/null
+++ b/gnulib-local/m4/quote.m4.diff
@@ -0,0 +1,14 @@
+*** gnulib/m4/quote.m4	2005-03-21 23:06:27.000000000 +0100
+--- gettext-tools/m4/quote.m4	2005-03-09 00:49:02.000000000 +0100
+***************
+*** 6,14 ****
+  
+  AC_DEFUN([gl_QUOTE],
+  [
+-   AC_LIBSOURCES([quote.c, quote.h])
+-   AC_LIBOBJ([quote])
+- 
+    dnl Prerequisites of lib/quote.c.
+    dnl (none)
+  ])
+--- 6,11 ----
diff --git a/gnulib-local/m4/quotearg.m4.diff b/gnulib-local/m4/quotearg.m4.diff
new file mode 100644
index 000000000..61d108717
--- /dev/null
+++ b/gnulib-local/m4/quotearg.m4.diff
@@ -0,0 +1,14 @@
+*** gnulib/m4/quotearg.m4	2005-03-21 23:06:27.000000000 +0100
+--- gettext-tools/m4/quotearg.m4	2005-03-09 00:49:02.000000000 +0100
+***************
+*** 6,14 ****
+  
+  AC_DEFUN([gl_QUOTEARG],
+  [
+-   AC_LIBSOURCES([quotearg.c, quotearg.h])
+-   AC_LIBOBJ([quotearg])
+- 
+    dnl Prerequisites of lib/quotearg.c.
+    AC_CHECK_HEADERS_ONCE(wchar.h wctype.h)
+    AC_CHECK_FUNCS_ONCE(iswprint mbsinit)
+--- 6,11 ----
diff --git a/gnulib-local/m4/strdup.m4.diff b/gnulib-local/m4/strdup.m4.diff
new file mode 100644
index 000000000..dafa215ee
--- /dev/null
+++ b/gnulib-local/m4/strdup.m4.diff
@@ -0,0 +1,13 @@
+*** gnulib/m4/strdup.m4	2005-03-21 23:06:27.000000000 +0100
+--- gettext-tools/m4/strdup.m4	2005-03-09 00:49:02.000000000 +0100
+***************
+*** 6,13 ****
+  
+  AC_DEFUN([gl_FUNC_STRDUP],
+  [
+-   AC_LIBSOURCES([strdup.c, strdup.h])
+- 
+    AC_REPLACE_FUNCS(strdup)
+    AC_CHECK_DECLS_ONCE(strdup)
+    gl_PREREQ_STRDUP
+--- 6,11 ----
diff --git a/gnulib-local/m4/unlocked-io.m4.diff b/gnulib-local/m4/unlocked-io.m4.diff
new file mode 100644
index 000000000..ea60faf46
--- /dev/null
+++ b/gnulib-local/m4/unlocked-io.m4.diff
@@ -0,0 +1,13 @@
+*** gnulib/m4/unlocked-io.m4	2006-04-21 00:28:34.000000000 +0200
+--- gettext-tools/m4/unlocked-io.m4	2005-01-20 02:11:33.000000000 +0100
+***************
+*** 17,24 ****
+  
+  AC_DEFUN([gl_FUNC_GLIBC_UNLOCKED_IO],
+  [
+-   AC_LIBSOURCES([unlocked-io.h])
+- 
+    AC_DEFINE([USE_UNLOCKED_IO], 1,
+      [Define to 1 if you want getc etc. to use unlocked I/O if available.
+       Unlocked I/O can improve performance in unithreaded apps,
+--- 16,21 ----
diff --git a/gnulib-local/m4/vasprintf.m4 b/gnulib-local/m4/vasprintf.m4
new file mode 100644
index 000000000..687581a19
--- /dev/null
+++ b/gnulib-local/m4/vasprintf.m4
@@ -0,0 +1,11 @@
+# vasprintf.m4 serial 1
+dnl Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_VASPRINTF],
+[
+  AC_REPLACE_FUNCS(vasprintf)
+  dnl No prerequisites of lib/vasprintf.c.
+])
diff --git a/gnulib-local/modules/backupfile b/gnulib-local/modules/backupfile
new file mode 100644
index 000000000..64906f429
--- /dev/null
+++ b/gnulib-local/modules/backupfile
@@ -0,0 +1,29 @@
+Description:
+Make Emacs style backup file names.
+
+Files:
+lib/backupfile.h
+lib/backupfile.c
+lib/addext.c
+m4/backupfile.m4
+
+Depends-on:
+argmatch
+basename
+unistd
+
+configure.ac:
+gt_PREREQ_BACKUPFILE
+
+Makefile.am:
+lib_SOURCES += backupfile.h backupfile.c addext.c
+
+Include:
+"backupfile.h"
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/basename b/gnulib-local/modules/basename
new file mode 100644
index 000000000..359a1267b
--- /dev/null
+++ b/gnulib-local/modules/basename
@@ -0,0 +1,23 @@
+Description:
+Return the name-within-directory of a file name.
+
+Files:
+lib/basename.h
+lib/basename.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += basename.h basename.c
+
+Include:
+"basename.h"
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/bison-i18n b/gnulib-local/modules/bison-i18n
new file mode 100644
index 000000000..084c2c9b8
--- /dev/null
+++ b/gnulib-local/modules/bison-i18n
@@ -0,0 +1,21 @@
+Description:
+Support for internationalization of bison-generated parsers.
+
+Files:
+m4/bison-i18n.m4
+
+Depends-on:
+
+configure.ac:
+BISON_I18N
+
+Makefile.am:
+
+Include:
+
+License:
+GPLed build tool
+
+Maintainer:
+Bruno Haible, Paul Eggert
+
diff --git a/gnulib-local/modules/c-strstr b/gnulib-local/modules/c-strstr
new file mode 100644
index 000000000..bcc7b77a1
--- /dev/null
+++ b/gnulib-local/modules/c-strstr
@@ -0,0 +1,23 @@
+Description:
+Search for a substring in a string in C locale.
+
+Files:
+lib/c-strstr.h
+lib/c-strstr.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += c-strstr.h c-strstr.c
+
+Include:
+"c-strstr.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/canonicalize b/gnulib-local/modules/canonicalize
new file mode 100644
index 000000000..5df2d9031
--- /dev/null
+++ b/gnulib-local/modules/canonicalize
@@ -0,0 +1,29 @@
+Description:
+Canonical absolute file name.
+
+Files:
+lib/canonicalize.h
+lib/canonicalize.c
+m4/canonicalize.m4
+
+Depends-on:
+alloca-opt
+allocsa
+pathmax
+readlink
+
+configure.ac:
+gl_CANONICALIZE
+
+Makefile.am:
+lib_SOURCES += canonicalize.h
+
+Include:
+"canonicalize.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/closeout b/gnulib-local/modules/closeout
new file mode 100644
index 000000000..0eb9c5c22
--- /dev/null
+++ b/gnulib-local/modules/closeout
@@ -0,0 +1,27 @@
+Description:
+Close standard output and standard error.
+
+Files:
+lib/closeout.h
+lib/closeout.c
+
+Depends-on:
+error
+fwriteerror
+exit
+gettext-h
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += closeout.h closeout.c
+
+Include:
+"closeout.h"
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/error-progname b/gnulib-local/modules/error-progname
new file mode 100644
index 000000000..c6ef307af
--- /dev/null
+++ b/gnulib-local/modules/error-progname
@@ -0,0 +1,24 @@
+Description:
+Use of program name in error-reporting functions.
+
+Files:
+lib/error-progname.h
+lib/error-progname.c
+
+Depends-on:
+progname
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += error-progname.h error-progname.c
+
+Include:
+"error-progname.h"
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/exitfail.diff b/gnulib-local/modules/exitfail.diff
new file mode 100644
index 000000000..e972339d1
--- /dev/null
+++ b/gnulib-local/modules/exitfail.diff
@@ -0,0 +1,12 @@
+*** exitfail.bak	2005-03-21 23:07:25.000000000 +0100
+--- exitfail	2006-07-30 19:55:27.000000000 +0200
+***************
+*** 13,18 ****
+--- 13,19 ----
+  gl_EXITFAIL
+  
+  Makefile.am:
++ lib_SOURCES += exitfail.h exitfail.c
+  
+  Include:
+  "exitfail.h"
diff --git a/gnulib-local/modules/fnmatch.diff b/gnulib-local/modules/fnmatch.diff
new file mode 100644
index 000000000..997dece7a
--- /dev/null
+++ b/gnulib-local/modules/fnmatch.diff
@@ -0,0 +1,19 @@
+*** modules/fnmatch.bak	2005-07-23 00:04:12.000000000 +0200
+--- modules/fnmatch	2006-07-30 20:44:18.000000000 +0200
+***************
+*** 9,15 ****
+  m4/fnmatch.m4
+  
+  Depends-on:
+! alloca
+  stdbool
+  
+  configure.ac:
+--- 9,15 ----
+  m4/fnmatch.m4
+  
+  Depends-on:
+! alloca-opt
+  stdbool
+  
+  configure.ac:
diff --git a/gnulib-local/modules/fstrcmp b/gnulib-local/modules/fstrcmp
new file mode 100644
index 000000000..8e3dc2470
--- /dev/null
+++ b/gnulib-local/modules/fstrcmp
@@ -0,0 +1,26 @@
+Description:
+Fuzzy string comparison.
+
+Files:
+lib/fstrcmp.h
+lib/fstrcmp.c
+
+Depends-on:
+lock
+tls
+xalloc
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += fstrcmp.h fstrcmp.c
+
+Include:
+"fstrcmp.h"
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/gcj b/gnulib-local/modules/gcj
new file mode 100644
index 000000000..00f9b3604
--- /dev/null
+++ b/gnulib-local/modules/gcj
@@ -0,0 +1,21 @@
+Description:
+Check for a Java compiler that creates executables.
+
+Files:
+m4/gcj.m4
+
+Depends-on:
+
+configure.ac:
+gt_GCJ
+
+Makefile.am:
+
+Include:
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/gen-lbrkprop b/gnulib-local/modules/gen-lbrkprop
new file mode 100644
index 000000000..2dad8e439
--- /dev/null
+++ b/gnulib-local/modules/gen-lbrkprop
@@ -0,0 +1,22 @@
+Description:
+Generates lbrkprop.h.
+
+Files:
+lib/gen-lbrkprop.c
+lib/3level.h
+lib/Combining.txt
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+
+Include:
+
+License:
+GPLed build tool
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/getline b/gnulib-local/modules/getline
new file mode 100644
index 000000000..dff62136c
--- /dev/null
+++ b/gnulib-local/modules/getline
@@ -0,0 +1,26 @@
+Description:
+Read a line from a stream.
+
+Files:
+lib/getline.h
+lib/getline.c
+m4/getline.m4
+
+Depends-on:
+getndelim2
+
+configure.ac:
+AM_FUNC_GETLINE
+
+Makefile.am:
+lib_SOURCES += getline.h
+
+Include:
+"getline.h"
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/getndelim2 b/gnulib-local/modules/getndelim2
new file mode 100644
index 000000000..f2dff82fb
--- /dev/null
+++ b/gnulib-local/modules/getndelim2
@@ -0,0 +1,27 @@
+Description:
+Read a line from a stream, stopping at one of 2 delimiters, with bounded
+memory allocation.
+
+Files:
+lib/getndelim2.h
+lib/getndelim2.c
+m4/getndelim2.m4
+
+Depends-on:
+unlocked-io
+
+configure.ac:
+gl_GETNDELIM2
+
+Makefile.am:
+lib_SOURCES += getndelim2.h
+
+Include:
+"getndelim2.h"
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/gettext-tools-misc b/gnulib-local/modules/gettext-tools-misc
new file mode 100644
index 000000000..1314d3908
--- /dev/null
+++ b/gnulib-local/modules/gettext-tools-misc
@@ -0,0 +1,56 @@
+Description:
+
+Files:
+m4/hard-locale.m4
+m4/mbrtowc.m4
+m4/memchr.m4
+m4/restrict.m4
+m4/strdup.m4
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+# Hmm... is this still necessary?
+AM_CPPFLAGS += -I$(top_builddir)/intl -I$(top_srcdir)/intl
+
+# Parametrization of the 'relocatable' module.
+AM_CPPFLAGS += -DDEPENDS_ON_LIBICONV=1 -DDEPENDS_ON_LIBINTL=1
+
+# Need @LTLIBINTL@ because many source files use gettext().
+# Need @LTLIBICONV@ because linebreak.c and iconvstring.c use iconv().
+libgettextlib_la_LDFLAGS = \
+  -release @VERSION@ \
+  @LTLIBINTL@ @LTLIBICONV@ -lc @LTNOUNDEF@
+
+# Tell the mingw or Cygwin linker which symbols to export.
+if WOE32DLL
+libgettextlib_la_SOURCES += ../woe32dll/gettextlib-exports.c
+libgettextlib_la_LDFLAGS += -Wl,--export-all-symbols
+endif
+
+# No need to install libgettextlib.a, except on AIX.
+install-exec-local: install-libLTLIBRARIES install-exec-clean
+install-exec-clean:
+	case "@host_os@" in \
+	  aix*) ;; \
+	  *) $(RM) $(DESTDIR)$(libdir)/libgettextlib.a ;; \
+	esac
+
+# Extra files to be installed.
+
+gettextsrcdir = $(datadir)/gettext
+gettextsrc_DATA = gettext.h
+
+# Where to install javaversion.class.
+pkgdatadir = $(datadir)/gettext
+
+Include:
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/hash b/gnulib-local/modules/hash
new file mode 100644
index 000000000..f8495dab6
--- /dev/null
+++ b/gnulib-local/modules/hash
@@ -0,0 +1,25 @@
+Description:
+Simple hash table with string based keys.
+
+Files:
+lib/hash.h
+lib/hash.c
+
+Depends-on:
+obstack
+xalloc
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += hash.h hash.c
+
+Include:
+"hash.h"
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/iconvstring b/gnulib-local/modules/iconvstring
new file mode 100644
index 000000000..7905b8436
--- /dev/null
+++ b/gnulib-local/modules/iconvstring
@@ -0,0 +1,25 @@
+Description:
+Charset conversion.
+
+Files:
+lib/iconvstring.h
+lib/iconvstring.c
+
+Depends-on:
+iconv
+xalloc
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += iconvstring.h iconvstring.c
+
+Include:
+"iconvstring.h"
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/java b/gnulib-local/modules/java
new file mode 100644
index 000000000..ca1cb0e1c
--- /dev/null
+++ b/gnulib-local/modules/java
@@ -0,0 +1,21 @@
+Description:
+Find user preferences regarding the use of Java.
+
+Files:
+m4/java.m4
+
+Depends-on:
+
+configure.ac:
+gt_JAVA_CHOICE
+
+Makefile.am:
+
+Include:
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/javacomp.diff b/gnulib-local/modules/javacomp.diff
new file mode 100644
index 000000000..77f7e46a0
--- /dev/null
+++ b/gnulib-local/modules/javacomp.diff
@@ -0,0 +1,19 @@
+*** gnulib/modules/javacomp	2006-07-24 21:40:37.000000000 +0200
+--- javacomp	2006-07-30 18:28:25.000000000 +0200
+***************
+*** 25,31 ****
+  clean-temp
+  error
+  xvasprintf
+! strstr
+  gettext-h
+  javacomp-script
+  
+--- 25,31 ----
+  clean-temp
+  error
+  xvasprintf
+! c-strstr
+  gettext-h
+  javacomp-script
+  
diff --git a/gnulib-local/modules/pathmax.diff b/gnulib-local/modules/pathmax.diff
new file mode 100644
index 000000000..bc7e5ed5b
--- /dev/null
+++ b/gnulib-local/modules/pathmax.diff
@@ -0,0 +1,12 @@
+*** modules/pathmax.bak	2005-09-19 19:44:46.000000000 +0200
+--- modules/pathmax	2006-07-30 21:25:20.000000000 +0200
+***************
+*** 11,16 ****
+--- 11,17 ----
+  gl_PATHMAX
+  
+  Makefile.am:
++ lib_SOURCES += pathmax.h
+  
+  Include:
+  "pathmax.h"
diff --git a/gnulib-local/modules/progreloc b/gnulib-local/modules/progreloc
new file mode 100644
index 000000000..eab0d7982
--- /dev/null
+++ b/gnulib-local/modules/progreloc
@@ -0,0 +1,26 @@
+Description:
+Support for relocatable installation.
+
+Files:
+lib/progreloc.c
+
+Depends-on:
+canonicalize
+relocatable
+stdbool
+xreadlink
+
+configure.ac:
+
+Makefile.am:
+AM_CPPFLAGS += -DEXEEXT=\"$(EXEEXT)\"
+lib_SOURCES += progreloc.c
+
+Include:
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/propername b/gnulib-local/modules/propername
new file mode 100644
index 000000000..f4a4293c5
--- /dev/null
+++ b/gnulib-local/modules/propername
@@ -0,0 +1,31 @@
+Description:
+Localization of proper names.
+
+Files:
+lib/propername.h
+lib/propername.c
+
+Depends-on:
+iconv
+localcharset
+c-strcase
+iconvstring
+c-strstr
+strstr
+xalloc
+gettext-h
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += propername.h propername.c
+
+Include:
+"propername.h"
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/quote.diff b/gnulib-local/modules/quote.diff
new file mode 100644
index 000000000..072e25718
--- /dev/null
+++ b/gnulib-local/modules/quote.diff
@@ -0,0 +1,12 @@
+*** quote.bak	2005-03-21 23:07:25.000000000 +0100
+--- quote	2006-07-30 19:56:30.000000000 +0200
+***************
+*** 13,18 ****
+--- 13,19 ----
+  gl_QUOTE
+  
+  Makefile.am:
++ lib_SOURCES += quote.h quote.c
+  
+  Include:
+  "quote.h"
diff --git a/gnulib-local/modules/quotearg.diff b/gnulib-local/modules/quotearg.diff
new file mode 100644
index 000000000..8bfe75be3
--- /dev/null
+++ b/gnulib-local/modules/quotearg.diff
@@ -0,0 +1,12 @@
+*** quotearg.bak	2005-07-06 17:58:47.000000000 +0200
+--- quotearg	2006-07-30 19:56:48.000000000 +0200
+***************
+*** 17,22 ****
+--- 17,23 ----
+  gl_QUOTEARG
+  
+  Makefile.am:
++ lib_SOURCES += quotearg.h quotearg.c
+  
+  Include:
+  "quotearg.h"
diff --git a/gnulib-local/modules/relocatable b/gnulib-local/modules/relocatable
new file mode 100644
index 000000000..57e7ea550
--- /dev/null
+++ b/gnulib-local/modules/relocatable
@@ -0,0 +1,23 @@
+Description:
+Support for relocatable installation.
+
+Files:
+lib/relocatable.h
+lib/relocatable.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += relocatable.h
+
+Include:
+"relocatable.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/relocwrapper b/gnulib-local/modules/relocwrapper
new file mode 100644
index 000000000..c03233ccf
--- /dev/null
+++ b/gnulib-local/modules/relocwrapper
@@ -0,0 +1,30 @@
+Description:
+Support for relocatable installation.
+
+Files:
+lib/relocwrapper.c
+m4/relocatable.m4
+
+Depends-on:
+progname
+progreloc
+relocatable
+setenv
+strerror
+
+configure.ac:
+dnl Use AC_REQUIRE here, because autoconf warns when AC_RELOCATABLE is
+dnl expanded more than once.
+AC_REQUIRE([AC_RELOCATABLE])
+
+Makefile.am:
+EXTRA_DIST += relocwrapper.c
+
+Include:
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/unlocked-io.diff b/gnulib-local/modules/unlocked-io.diff
new file mode 100644
index 000000000..013d576ca
--- /dev/null
+++ b/gnulib-local/modules/unlocked-io.diff
@@ -0,0 +1,12 @@
+*** unlocked-io.bak	2005-03-21 23:07:25.000000000 +0100
+--- unlocked-io	2006-07-30 19:56:58.000000000 +0200
+***************
+*** 12,17 ****
+--- 12,18 ----
+  gl_FUNC_GLIBC_UNLOCKED_IO
+  
+  Makefile.am:
++ lib_SOURCES += unlocked-io.h
+  
+  Include:
+  "unlocked-io.h"
diff --git a/gnulib-local/modules/vasprintf.diff b/gnulib-local/modules/vasprintf.diff
new file mode 100644
index 000000000..9f27a086b
--- /dev/null
+++ b/gnulib-local/modules/vasprintf.diff
@@ -0,0 +1,16 @@
+*** gnulib/modules/vasprintf	2004-09-22 17:11:04.000000000 +0200
+--- vasprintf	2006-07-30 16:33:03.000000000 +0200
+***************
+*** 4,14 ****
+  Files:
+  lib/vasprintf.h
+  lib/vasprintf.c
+- lib/asprintf.c
+  m4/vasprintf.m4
+  
+  Depends-on:
+- vasnprintf
+  
+  configure.ac:
+  gl_FUNC_VASPRINTF
+--- 4,12 ----
diff --git a/gnulib-local/modules/wait-process.diff b/gnulib-local/modules/wait-process.diff
new file mode 100644
index 000000000..b3a535b80
--- /dev/null
+++ b/gnulib-local/modules/wait-process.diff
@@ -0,0 +1,22 @@
+*** gnulib/modules/wait-process	2006-04-24 13:38:06.000000000 +0200
+--- wait-process	2006-07-30 16:45:20.000000000 +0200
+***************
+*** 6,11 ****
+--- 6,12 ----
+  lib/wait-process.c
+  m4/wait-process.m4
+  m4/sig_atomic_t.m4
++ m4/unionwait.m4 
+  
+  Depends-on:
+  fatal-signal
+***************
+*** 18,23 ****
+--- 19,25 ----
+  
+  configure.ac:
+  gl_WAIT_PROCESS
++ gt_UNION_WAIT
+  
+  Makefile.am:
+  lib_SOURCES += wait-process.h wait-process.c
diff --git a/gnulib-local/modules/xalloc b/gnulib-local/modules/xalloc
new file mode 100644
index 000000000..54fa33ca1
--- /dev/null
+++ b/gnulib-local/modules/xalloc
@@ -0,0 +1,23 @@
+Description:
+Memory allocation with out-of-memory checking.
+
+Files:
+lib/xalloc.h
+lib/xmalloc.c
+lib/xstrdup.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += xalloc.h xmalloc.c xstrdup.c
+
+Include:
+"xalloc.h"
+
+License:
+GPL
+
+Maintainer:
+all
diff --git a/gnulib-local/modules/xalloc-die b/gnulib-local/modules/xalloc-die
new file mode 100644
index 000000000..4fe557c26
--- /dev/null
+++ b/gnulib-local/modules/xalloc-die
@@ -0,0 +1,21 @@
+Description:
+Report a memory allocation failure and exit.
+
+Files:
+
+Depends-on:
+xalloc
+
+configure.ac:
+
+Makefile.am:
+
+Include:
+"xalloc.h"
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/xerror b/gnulib-local/modules/xerror
new file mode 100644
index 000000000..4f097f042
--- /dev/null
+++ b/gnulib-local/modules/xerror
@@ -0,0 +1,27 @@
+Description:
+Multiline error-reporting functions.
+
+Files:
+lib/xerror.h
+lib/xerror.c
+
+Depends-on:
+error
+progname
+error-progname
+mbswidth
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += xerror.h xerror.c
+
+Include:
+"xerror.h"
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/xgetcwd b/gnulib-local/modules/xgetcwd
new file mode 100644
index 000000000..583480e70
--- /dev/null
+++ b/gnulib-local/modules/xgetcwd
@@ -0,0 +1,24 @@
+Description:
+
+Files:
+lib/xgetcwd.h
+lib/xgetcwd.c
+
+Depends-on:
+xalloc
+unistd
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += xgetcwd.h xgetcwd.c
+
+Include:
+"xgetcwd.h"
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib-local/modules/xreadlink b/gnulib-local/modules/xreadlink
new file mode 100644
index 000000000..a240cc1b6
--- /dev/null
+++ b/gnulib-local/modules/xreadlink
@@ -0,0 +1,28 @@
+Description:
+Reading symbolic links without size limitation.
+
+Files:
+lib/xreadlink.h
+lib/xreadlink.c
+m4/xreadlink.m4
+
+Depends-on:
+readlink
+ssize_t
+xalloc
+
+configure.ac:
+gl_XREADLINK
+
+Makefile.am:
+lib_SOURCES += xreadlink.h xreadlink.c
+
+Include:
+"xreadlink.h"
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+