Update after gnulib changed.

6 files changed, 10 insertions, 64 deletions

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 1abdeabfe..1e0499bcb 100644
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,12 @@
+2011-06-16  Bruno Haible  <bruno@clisp.org>
+
+	Update after gnulib changed.
+	* m4/quote.m4.diff: Remove file.
+	* m4/quotearg.m4.diff: Remove file.
+	* modules/quote.diff: Remove file.
+	* modules/quotearg.diff: Remove file.
+	* Makefile.am (EXTRA_DIST): Remove them.
+
 2011-06-03  Bruno Haible  <bruno@clisp.org>
 
 	libxml: Detect installed libxml2 versions which don't define xmlFree().
diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index f924ad3aa..cc2628edc 100644
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gnulib-local directory of GNU gettext
-## Copyright (C) 2006-2008, 2010 Free Software Foundation, Inc.
+## Copyright (C) 2006-2008, 2010-2011 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -254,8 +254,6 @@ m4/libglib.m4 \
 m4/libxml.m4 \
 m4/java.m4 \
 m4/moo.m4 \
-m4/quotearg.m4.diff \
-m4/quote.m4.diff \
 m4/termcap.m4 \
 m4/terminfo.m4 \
 m4/term-ostream.m4 \
@@ -282,8 +280,6 @@ modules/memory-ostream \
 modules/moo \
 modules/moo-tests \
 modules/ostream \
-modules/quotearg.diff \
-modules/quote.diff \
 modules/regex.diff \
 modules/styled-ostream \
 modules/termcap \
diff --git a/gnulib-local/m4/quote.m4.diff b/gnulib-local/m4/quote.m4.diff
deleted file mode 100644
index 3d19bcb41..000000000
--- a/gnulib-local/m4/quote.m4.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-*** 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,13 ****
-  
-  AC_DEFUN([gl_QUOTE],
-  [
--   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
deleted file mode 100644
index 691324fb2..000000000
--- a/gnulib-local/m4/quotearg.m4.diff
+++ /dev/null
@@ -1,10 +0,0 @@
-*** 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,10 ****
-  
-  AC_DEFUN([gl_QUOTEARG],
-  [
--   AC_LIBOBJ([quotearg])
-  ])
---- 6,9 ----
diff --git a/gnulib-local/modules/quote.diff b/gnulib-local/modules/quote.diff
deleted file mode 100644
index f81cf8575..000000000
--- a/gnulib-local/modules/quote.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-*** quote.bak	2006-10-12 19:55:25.000000000 +0200
---- quote	2006-10-12 21:55:51.000000000 +0200
-***************
-*** 13,18 ****
-  gl_QUOTE
-  
-  Makefile.am:
-  
-  Include:
-  "quote.h"
---- 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
deleted file mode 100644
index 92d7f5262..000000000
--- a/gnulib-local/modules/quotearg.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-*** quotearg.bak	2006-10-12 19:55:21.000000000 +0200
---- quotearg	2006-10-12 21:55:37.000000000 +0200
-***************
-*** 17,22 ****
-  gl_QUOTEARG
-  
-  Makefile.am:
-  
-  Include:
-  "quotearg.h"
---- 17,23 ----
-  gl_QUOTEARG
-  
-  Makefile.am:
-+ lib_SOURCES += quotearg.h quotearg.c
-  
-  Include:
-  "quotearg.h"