diff options
| author | Bruno Haible <bruno@clisp.org> | 2009-04-11 00:08:46 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-04-11 00:08:46 +0200 |
| commit | 79e08e43c1f20228ed88b76ec3d4931ef2107554 (patch) | |
| tree | da693e61e9b26a14a38a8962af267d6e0eb8bd4f | |
| parent | a0a40995a977ea0d7503e1a84bfd451204ac1307 (diff) | |
| download | libunistring-79e08e43c1f20228ed88b76ec3d4931ef2107554.tar.gz | |
Provide an installable iconveh.h replacement.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gnulib-local/lib/uniconv.h.diff | 21 | ||||
| -rw-r--r-- | lib/Makefile.am | 10 |
3 files changed, 34 insertions, 6 deletions
@@ -1,5 +1,14 @@ 2008-04-10 Bruno Haible <bruno@clisp.org> + Provide an installable iconveh.h replacement. + * gnulib-local/lib/uniconv.h.diff: Include unistring-iconveh.h instead + of iconveh.h. Don't include striconveha.h. + * lib/Makefile.am (nodist_include_HEADERS): Add unistring-iconveh.h. + (unistring-iconveh.h): New rule. + (BUILT_SOURCES, MOSTLYCLEANFILES, CLEANFILES): Update accordingly. + +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. diff --git a/gnulib-local/lib/uniconv.h.diff b/gnulib-local/lib/uniconv.h.diff index db6ac3d..37f071d 100644 --- a/gnulib-local/lib/uniconv.h.diff +++ b/gnulib-local/lib/uniconv.h.diff @@ -1,16 +1,25 @@ -*** uniconv.h.orig 2009-03-26 05:18:45.000000000 +0100 ---- uniconv.h 2009-04-10 22:39:33.000000000 +0200 +*** uniconv.h.orig 2009-04-10 23:40:31.000000000 +0200 +--- uniconv.h 2009-04-10 23:41:19.000000000 +0200 *************** -*** 29,35 **** - #include "striconveha.h" +*** 23,35 **** + #include "unitypes.h" + + /* Get enum iconv_ilseq_handler. */ +! #include "iconveh.h" +! +! /* Get uniconv_register_autodetect() declaration. */ +! #include "striconveha.h" /* Get locale_charset() declaration. */ ! #include "localcharset.h" #ifdef __cplusplus ---- 29,35 ---- - #include "striconveha.h" +--- 23,32 ---- + #include "unitypes.h" + + /* Get enum iconv_ilseq_handler. */ +! #include "unistring-iconveh.h" /* Get locale_charset() declaration. */ ! #include "unistring-localcharset.h" diff --git a/lib/Makefile.am b/lib/Makefile.am index 64eca01..eb367d7 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -104,6 +104,16 @@ BUILT_SOURCES += unistring-localcharset.h MOSTLYCLEANFILES += unistring-localcharset.h-t CLEANFILES += unistring-localcharset.h +# iconeh.h is not public, but its contents is documented. +nodist_include_HEADERS += unistring-iconveh.h +unistring-iconveh.h : iconveh.h + rm -f $@-t $@ + cp $(srcdir)/iconveh.h $@-t + mv $@-t $@ +BUILT_SOURCES += unistring-iconveh.h +MOSTLYCLEANFILES += unistring-iconveh.h-t +CLEANFILES += unistring-iconveh.h + # Libtool's library version information for libunistring. # See the libtool documentation, section "Library interface versions". LTV_CURRENT=0 |