Update after gnulib changed.

14 files changed, 73 insertions, 49 deletions

diff --git a/ChangeLog b/ChangeLog
index 63e01fb..73742af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2010-05-16  Bruno Haible  <bruno@clisp.org>
+
+	Update after gnulib changed.
+	* gnulib-local/lib/unicase.in.h.diff: Renamed from
+	gnulib-local/lib/unicase.h.diff.
+	* gnulib-local/lib/uniconv.in.h.diff: Renamed from
+	gnulib-local/lib/uniconv.h.diff.
+	* gnulib-local/lib/unictype.in.h.diff: Renamed from
+	gnulib-local/lib/unictype.h.diff.
+	* gnulib-local/lib/unilbrk.in.h.diff: Renamed from
+	gnulib-local/lib/unilbrk.h.diff.
+	* gnulib-local/lib/uninorm.in.h.diff: Renamed from
+	gnulib-local/lib/uninorm.h.diff.
+	* gnulib-local/lib/unistr.in.h.diff: Renamed from
+	gnulib-local/lib/unistr.h.diff.
+	* gnulib-local/lib/unitypes.in.h.diff: Renamed from
+	gnulib-local/lib/unitypes.h.diff.
+	* gnulib-local/lib/uniwidth.in.h.diff: Renamed from
+	gnulib-local/lib/uniwidth.h.diff.
+	* gnulib-local/Makefile.am (EXTRA_DIST): Update.
+	* gnulib-local/modules/unictype/category-none-tests.diff: Update.
+	* autogen.sh: Update.
+
 2010-05-14  Bruno Haible  <bruno@clisp.org>
 
 	Publicize also the subminor version number.
diff --git a/autogen.sh b/autogen.sh
index e062b33..dc40850 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -420,23 +420,23 @@ if test $skip_gnulib = false; then
     # Change lib/unistr.h to be usable standalone.
     sed -e 's/ifdef GNULIB_[A-Za-z0-9_]*/if 1/' -e 's/defined GNULIB_[A-Za-z0-9_]*/1/g' \
         -e 's/HAVE_INLINE/UNISTRING_HAVE_INLINE/g' \
-        < lib/unistr.h \
-        > lib/unistr.h.tmp \
-    && mv lib/unistr.h.tmp lib/unistr.h
+        < lib/unistr.in.h \
+        > lib/unistr.in.h.tmp \
+    && mv lib/unistr.in.h.tmp lib/unistr.in.h
     # Change lib/unictype.h and lib/uninorm.h for shared libraries on Woe32 systems.
     sed -e 's/extern const uc_general_category_t UC_/extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_/' \
         -e 's/extern const uc_property_t UC_/extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_/' \
-        < lib/unictype.h \
-        > lib/unictype.h.tmp \
-    && mv lib/unictype.h.tmp lib/unictype.h
+        < lib/unictype.in.h \
+        > lib/unictype.in.h.tmp \
+    && mv lib/unictype.in.h.tmp lib/unictype.in.h
     sed -e 's/extern const struct unicode_normalization_form /extern LIBUNISTRING_DLL_VARIABLE const struct unicode_normalization_form /' \
-        < lib/uninorm.h \
-        > lib/uninorm.h.tmp \
-    && mv lib/uninorm.h.tmp lib/uninorm.h
+        < lib/uninorm.in.h \
+        > lib/uninorm.in.h.tmp \
+    && mv lib/uninorm.in.h.tmp lib/uninorm.in.h
     sed -e 's/extern const casing_/extern LIBUNISTRING_DLL_VARIABLE const casing_/' \
-        < lib/unicase.h \
-        > lib/unicase.h.tmp \
-    && mv lib/unicase.h.tmp lib/unicase.h
+        < lib/unicase.in.h \
+        > lib/unicase.in.h.tmp \
+    && mv lib/unicase.in.h.tmp lib/unicase.in.h
     $GNULIB_TOOL --copy-file build-aux/config.guess; chmod a+x build-aux/config.guess
     $GNULIB_TOOL --copy-file build-aux/config.sub;   chmod a+x build-aux/config.sub
     # If we got no texinfo.tex so far, take the snapshot from gnulib.
diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index c415913..d011b8d 100644
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gnulib-local directory of GNU libunistring
-## Copyright (C) 2006-2009 Free Software Foundation, Inc.
+## Copyright (C) 2006-2010 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
@@ -19,12 +19,12 @@
 # Generate this list with
 # find . '(' -name Makefile.am ')' -prune -o -type f '!' '(' -name '*.orig' -or -name '*~' ')' -printf '%P\n' | sort | tr '\012' @ | sed 's/@$/%/;s/@/ \\@/g' | tr @% '\012\012'
 EXTRA_DIST = \
-lib/unicase.h.diff \
-lib/uniconv.h.diff \
-lib/unictype.h.diff \
-lib/unilbrk.h.diff \
-lib/uninorm.h.diff \
-lib/unistr.h.diff \
-lib/unitypes.h.diff \
-lib/uniwidth.h.diff \
+lib/unicase.in.h.diff \
+lib/uniconv.in.h.diff \
+lib/unictype.in.h.diff \
+lib/unilbrk.in.h.diff \
+lib/uninorm.in.h.diff \
+lib/unistr.in.h.diff \
+lib/unitypes.in.h.diff \
+lib/uniwidth.in.h.diff \
 modules/unictype/category-none-tests.diff
diff --git a/gnulib-local/lib/unicase.h.diff b/gnulib-local/lib/unicase.in.h.diff
index 1381770..6fa4261 100644
--- a/gnulib-local/lib/unicase.h.diff
+++ b/gnulib-local/lib/unicase.in.h.diff
@@ -1,5 +1,5 @@
-*** unicase.h.orig	2009-04-05 19:30:26.000000000 +0200
---- unicase.h	2009-04-10 16:21:23.000000000 +0200
+*** unicase.in.h.orig	2009-04-05 19:30:26.000000000 +0200
+--- unicase.in.h	2009-04-10 16:21:23.000000000 +0200
 ***************
 *** 20,26 ****
   #include "unitypes.h"
diff --git a/gnulib-local/lib/uniconv.h.diff b/gnulib-local/lib/uniconv.in.h.diff
index d640323..341caba 100644
--- a/gnulib-local/lib/uniconv.h.diff
+++ b/gnulib-local/lib/uniconv.in.h.diff
@@ -1,5 +1,5 @@
-*** uniconv.h.orig	2009-04-10 23:40:31.000000000 +0200
---- uniconv.h	2009-04-10 23:41:19.000000000 +0200
+*** uniconv.in.h.orig	2009-04-10 23:40:31.000000000 +0200
+--- uniconv.in.h	2009-04-10 23:41:19.000000000 +0200
 ***************
 *** 23,35 ****
   #include "unitypes.h"
diff --git a/gnulib-local/lib/unictype.h.diff b/gnulib-local/lib/unictype.in.h.diff
index 14347bc..cb68885 100644
--- a/gnulib-local/lib/unictype.h.diff
+++ b/gnulib-local/lib/unictype.in.h.diff
@@ -1,5 +1,5 @@
-*** unictype.h.orig	2009-04-05 12:15:57.000000000 +0200
---- unictype.h	2009-04-12 04:31:36.000000000 +0200
+*** unictype.in.h.orig	2009-04-05 12:15:57.000000000 +0200
+--- unictype.in.h	2009-04-12 04:31:36.000000000 +0200
 ***************
 *** 19,26 ****
   
diff --git a/gnulib-local/lib/unilbrk.h.diff b/gnulib-local/lib/unilbrk.in.h.diff
index a5b86c3..9731c8e 100644
--- a/gnulib-local/lib/unilbrk.h.diff
+++ b/gnulib-local/lib/unilbrk.in.h.diff
@@ -1,5 +1,5 @@
-*** unilbrk.h.orig	2008-05-10 14:46:17.000000000 +0200
---- unilbrk.h	2009-04-10 22:39:40.000000000 +0200
+*** unilbrk.in.h.orig	2008-05-10 14:46:17.000000000 +0200
+--- unilbrk.in.h	2009-04-10 22:39:40.000000000 +0200
 ***************
 *** 24,30 ****
   #include "unitypes.h"
diff --git a/gnulib-local/lib/uninorm.h.diff b/gnulib-local/lib/uninorm.in.h.diff
index 89d8995..47f644e 100644
--- a/gnulib-local/lib/uninorm.h.diff
+++ b/gnulib-local/lib/uninorm.in.h.diff
@@ -1,5 +1,5 @@
-*** uninorm.h.orig	2009-04-05 12:38:24.000000000 +0200
---- uninorm.h	2009-04-12 04:31:52.000000000 +0200
+*** uninorm.in.h.orig	2009-04-05 12:38:24.000000000 +0200
+--- uninorm.in.h	2009-04-12 04:31:52.000000000 +0200
 ***************
 *** 18,23 ****
 --- 18,26 ----
diff --git a/gnulib-local/lib/unistr.h.diff b/gnulib-local/lib/unistr.in.h.diff
index 3e59093..0b31c86 100644
--- a/gnulib-local/lib/unistr.h.diff
+++ b/gnulib-local/lib/unistr.in.h.diff
@@ -1,5 +1,5 @@
-*** unistr.h.orig	2009-12-24 23:21:27.000000000 +0100
---- unistr.h	2009-12-25 02:04:40.000000000 +0100
+*** unistr.in.h.orig	2009-12-24 23:21:27.000000000 +0100
+--- unistr.in.h	2009-12-25 02:04:40.000000000 +0100
 ***************
 *** 20,29 ****
   #include "unitypes.h"
diff --git a/gnulib-local/lib/unitypes.h.diff b/gnulib-local/lib/unitypes.in.h.diff
index 39597ff..f490695 100644
--- a/gnulib-local/lib/unitypes.h.diff
+++ b/gnulib-local/lib/unitypes.in.h.diff
@@ -1,5 +1,5 @@
-*** unitypes.h.orig	2009-04-05 19:30:36.000000000 +0200
---- unitypes.h	2009-04-10 16:22:07.000000000 +0200
+*** unitypes.in.h.orig	2009-04-05 19:30:36.000000000 +0200
+--- unitypes.in.h	2009-04-10 16:22:07.000000000 +0200
 ***************
 *** 18,24 ****
   #define _UNITYPES_H
diff --git a/gnulib-local/lib/uniwidth.h.diff b/gnulib-local/lib/uniwidth.in.h.diff
index 7448d4c..ded6c81 100644
--- a/gnulib-local/lib/uniwidth.h.diff
+++ b/gnulib-local/lib/uniwidth.in.h.diff
@@ -1,5 +1,5 @@
-*** uniwidth.h.orig	2007-10-07 17:24:38.000000000 +0200
---- uniwidth.h	2009-04-10 22:39:46.000000000 +0200
+*** uniwidth.in.h.orig	2007-10-07 17:24:38.000000000 +0200
+--- uniwidth.in.h	2009-04-10 22:39:46.000000000 +0200
 ***************
 *** 23,29 ****
   #include <stddef.h>
diff --git a/gnulib-local/modules/unictype/category-none-tests.diff b/gnulib-local/modules/unictype/category-none-tests.diff
index 4e8b507..c9705ed 100644
--- a/gnulib-local/modules/unictype/category-none-tests.diff
+++ b/gnulib-local/modules/unictype/category-none-tests.diff
@@ -10,5 +10,5 @@
   TESTS += test-categ_none
   check_PROGRAMS += test-categ_none
   test_categ_none_SOURCES = unictype/test-categ_none.c
+  test_categ_none_LDADD = $(LDADD) $(LIBUNISTRING)
 + endif
-  
diff --git a/gnulib-m4/.gitignore b/gnulib-m4/.gitignore
index 29197a4..960b265 100644
--- a/gnulib-m4/.gitignore
+++ b/gnulib-m4/.gitignore
@@ -44,6 +44,7 @@
 /lib-ld.m4
 /lib-link.m4
 /lib-prefix.m4
+/libunistring-base.m4
 /localcharset.m4
 /locale-fr.m4
 /locale-ja.m4
diff --git a/lib/.gitignore b/lib/.gitignore
index 75d8146..7dfff22 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -84,18 +84,18 @@
 /striconveha.h
 /string.in.h
 /strncat.c
-/unicase.h
-/uniconv.h
-/unictype.h
-/unilbrk.h
-/uniname.h
-/uninorm.h
+/unicase.in.h
+/uniconv.in.h
+/unictype.in.h
+/unilbrk.in.h
+/uniname.in.h
+/uninorm.in.h
 /unistd.in.h
-/unistdio.h
-/unistr.h
-/unitypes.h
-/uniwbrk.h
-/uniwidth.h
+/unistdio.in.h
+/unistr.in.h
+/unitypes.in.h
+/uniwbrk.in.h
+/uniwidth.in.h
 /vasnprintf.c
 /verify.h
 /wchar.in.h