From 35c2710ff6361f105c6d0a7fb5f5ff48323fb97c Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Fri, 10 Apr 2009 22:57:33 +0200
Subject: Provide an installable localcharset.h replacement.

---
 ChangeLog                        | 11 +++++++++++
 gnulib-local/Makefile.am         |  5 ++++-
 gnulib-local/lib/uniconv.h.diff  | 19 +++++++++++++++++++
 gnulib-local/lib/unilbrk.h.diff  | 19 +++++++++++++++++++
 gnulib-local/lib/uniwidth.h.diff | 19 +++++++++++++++++++
 lib/Makefile.am                  | 10 ++++++++++
 6 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 gnulib-local/lib/uniconv.h.diff
 create mode 100644 gnulib-local/lib/unilbrk.h.diff
 create mode 100644 gnulib-local/lib/uniwidth.h.diff

diff --git a/ChangeLog b/ChangeLog
index 2496e82..66b85bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-04-10  Bruno Haible  <bruno@clisp.org>
+
+	Provide an installable localcharset.h replacement.
+	* gnulib-local/lib/uniconv.h.diff: New file.
+	* gnulib-local/lib/unilbrk.h.diff: New file.
+	* gnulib-local/lib/uniwidth.h.diff: New file.
+	* gnulib-local/Makefile.am (EXTRA_DIST): Add them.
+	* lib/Makefile.am (nodist_include_HEADERS): Add unistring-localcharset.h.
+	(unistring-localcharset.h): New rule.
+	(BUILT_SOURCES, MOSTLYCLEANFILES, CLEANFILES): Update accordingly.
+
 2008-04-10  Bruno Haible  <bruno@clisp.org>
 
 	* INSTALL (Multiple Architectures): Recommend to use
diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index b6a02c1..025c108 100644
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -20,6 +20,9 @@
 # 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/unistr.h.diff \
-lib/unitypes.h.diff
+lib/unitypes.h.diff \
+lib/uniwidth.h.diff
diff --git a/gnulib-local/lib/uniconv.h.diff b/gnulib-local/lib/uniconv.h.diff
new file mode 100644
index 0000000..db6ac3d
--- /dev/null
+++ b/gnulib-local/lib/uniconv.h.diff
@@ -0,0 +1,19 @@
+*** uniconv.h.orig	2009-03-26 05:18:45.000000000 +0100
+--- uniconv.h	2009-04-10 22:39:33.000000000 +0200
+***************
+*** 29,35 ****
+  #include "striconveha.h"
+  
+  /* Get locale_charset() declaration.  */
+! #include "localcharset.h"
+  
+  
+  #ifdef __cplusplus
+--- 29,35 ----
+  #include "striconveha.h"
+  
+  /* Get locale_charset() declaration.  */
+! #include "unistring-localcharset.h"
+  
+  
+  #ifdef __cplusplus
diff --git a/gnulib-local/lib/unilbrk.h.diff b/gnulib-local/lib/unilbrk.h.diff
new file mode 100644
index 0000000..aea376a
--- /dev/null
+++ b/gnulib-local/lib/unilbrk.h.diff
@@ -0,0 +1,19 @@
+*** unilbrk.h.orig	2008-05-10 14:46:17.000000000 +0200
+--- unilbrk.h	2009-04-10 22:39:40.000000000 +0200
+***************
+*** 24,30 ****
+  #include "unitypes.h"
+  
+  /* Get locale_charset() declaration.  */
+! #include "localcharset.h"
+  
+  
+  #ifdef __cplusplus
+--- 24,30 ----
+  #include "unitypes.h"
+  
+  /* Get locale_charset() declaration.  */
+! #include "unistring-localcharset.h"
+  
+  
+  #ifdef __cplusplus
diff --git a/gnulib-local/lib/uniwidth.h.diff b/gnulib-local/lib/uniwidth.h.diff
new file mode 100644
index 0000000..80c9f89
--- /dev/null
+++ b/gnulib-local/lib/uniwidth.h.diff
@@ -0,0 +1,19 @@
+*** uniwidth.h.orig	2007-10-07 17:24:38.000000000 +0200
+--- uniwidth.h	2009-04-10 22:39:46.000000000 +0200
+***************
+*** 23,29 ****
+  #include <stddef.h>
+  
+  /* Get locale_charset() declaration.  */
+! #include "localcharset.h"
+  
+  #ifdef __cplusplus
+  extern "C" {
+--- 23,29 ----
+  #include <stddef.h>
+  
+  /* Get locale_charset() declaration.  */
+! #include "unistring-localcharset.h"
+  
+  #ifdef __cplusplus
+  extern "C" {
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 6292364..64eca01 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -94,6 +94,16 @@ MOSTLYCLEANFILES += unistring-stdint.h-t
 CLEANFILES       += unistring-stdint.h
 EXTRA_DIST       += stdint.mini.h
 
+# localcharset.h is not public, but its contents is documented.
+nodist_include_HEADERS += unistring-localcharset.h
+unistring-localcharset.h : localcharset.h
+	rm -f $@-t $@
+	cp $(srcdir)/localcharset.h $@-t
+	mv $@-t $@
+BUILT_SOURCES    += unistring-localcharset.h
+MOSTLYCLEANFILES += unistring-localcharset.h-t
+CLEANFILES       += unistring-localcharset.h
+
 # Libtool's library version information for libunistring.
 # See the libtool documentation, section "Library interface versions".
 LTV_CURRENT=0
-- 
cgit v1.2.1