Skip to content

Commit 7a3418b

Browse files
bhaiblebhaible
committed
Update from gnulib. Move mapping tables into the code.
1 parent e54fc9c commit 7a3418b

22 files changed

+944
-1992
lines changed

‎.gitignore‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
/libcharset/m4/codeset.m4
2323
/libcharset/m4/fcntl-o.m4
2424
/libcharset/m4/glibc21.m4
25-
/libcharset/m4/relocatable-lib.m4
2625
/libcharset/m4/visibility.m4
2726
/srclib/_Noreturn.h
2827
/srclib/Makefile.gnulib
@@ -95,6 +94,7 @@
9594
/srclib/strerror.c
9695
/srclib/string.in.h
9796
/srclib/stripslash.c
97+
/srclib/sys-limits.h
9898
/srclib/sys_stat.in.h
9999
/srclib/sys_time.in.h
100100
/srclib/sys_types.in.h
@@ -369,7 +369,6 @@ autom4te.cache/
369369
# Files generated by "make all check" and erased by "make mostlyclean"
370370
# (see MOSTLYCLEANFILES in Makefile.am and, if present, Makefile.gnulib):
371371
# Erased by Makefile.
372-
/lib/charset.alias
373372
/lib/libcharset.h
374373
/lib/libcharset.so*
375374
/lib/localcharset.h
@@ -382,9 +381,6 @@ autom4te.cache/
382381
/libcharset/lib/*.o.lock
383382
/libcharset/lib/core
384383
/libcharset/lib/*.stackdump
385-
/libcharset/lib/charset.alias
386-
/libcharset/lib/ref-add.sed
387-
/libcharset/lib/ref-del.sed
388384
# Erased by lib/Makefile.
389385
/lib/*.o
390386
/lib/*.lo

‎ChangeLog‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2018-09-22 Bruno Haible <bruno@clisp.org>
2+
3+
Update from gnulib. Move mapping tables into the code.
4+
* autogen.sh: Don't create libcharset/m4/relocatable-lib.m4.
5+
* Makefile.in (mostlyclean, clean, distclean, maintainer-clean): Don't
6+
remove lib/charset.alias.
7+
* tests/check-subst: Don't set CHARSETALIASDIR.
8+
19
2018-05-04 Bruno Haible <bruno@clisp.org>
210

311
Drop special instructions for OSF/1.

‎Makefile.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ check : all force
9696

9797
mostlyclean : force
9898
cd libcharset && $(MAKE) mostlyclean
99-
$(RM) lib/charset.alias lib/libcharset.* lib/localcharset.h
99+
$(RM) lib/libcharset.* lib/localcharset.h
100100
cd lib && $(MAKE) mostlyclean
101101
cd srclib && $(MAKE) mostlyclean
102102
cd src && $(MAKE) mostlyclean
@@ -107,7 +107,7 @@ mostlyclean : force
107107

108108
clean : force
109109
cd libcharset && $(MAKE) clean
110-
$(RM) lib/charset.alias lib/libcharset.* lib/localcharset.h
110+
$(RM) lib/libcharset.* lib/localcharset.h
111111
cd lib && $(MAKE) clean
112112
cd srclib && $(MAKE) clean
113113
cd src && $(MAKE) clean
@@ -118,7 +118,7 @@ clean : force
118118

119119
distclean : force
120120
cd libcharset && if test -f Makefile; then $(MAKE) distclean; fi
121-
$(RM) lib/charset.alias lib/libcharset.* lib/localcharset.h
121+
$(RM) lib/libcharset.* lib/localcharset.h
122122
cd lib && if test -f Makefile; then $(MAKE) distclean; fi
123123
cd srclib && if test -f Makefile; then $(MAKE) distclean; fi
124124
cd src && if test -f Makefile; then $(MAKE) distclean; fi
@@ -132,7 +132,7 @@ distclean : force
132132

133133
maintainer-clean : force
134134
cd libcharset && if test -f Makefile; then $(MAKE) maintainer-clean; fi
135-
$(RM) lib/charset.alias lib/libcharset.* lib/localcharset.h
135+
$(RM) lib/libcharset.* lib/localcharset.h
136136
cd lib && if test -f Makefile; then $(MAKE) maintainer-clean; fi
137137
cd srclib && if test -f Makefile; then $(MAKE) maintainer-clean; fi
138138
cd src && if test -f Makefile; then $(MAKE) maintainer-clean; fi

‎autogen.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ done
7676
for file in config.guess config.libpath config.sub install-sh mkinstalldirs; do
7777
cp -p build-aux/$file libcharset/build-aux/$file || exit $?
7878
done
79-
for file in codeset.m4 fcntl-o.m4 glibc21.m4 relocatable-lib.m4 visibility.m4; do
79+
for file in codeset.m4 fcntl-o.m4 glibc21.m4 visibility.m4; do
8080
cp -p srcm4/$file libcharset/m4/$file || exit $?
8181
done
8282

‎djgpp/fnchange.lst‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,7 @@ libiconv-1.11/libcharset/m4/ChangeLog libiconv-1.11/libchar
107107
libiconv-1.11/libcharset/m4/codeset.m4 libiconv-1.11/libcharset/m4/codeset.m4
108108
libiconv-1.11/libcharset/m4/glibc21.m4 libiconv-1.11/libcharset/m4/glibc21.m4
109109
libiconv-1.11/libcharset/m4/libtool.m4 libiconv-1.11/libcharset/m4/libtool.m4
110-
libiconv-1.11/libcharset/lib/config.charset libiconv-1.11/libcharset/lib/config.charset
111110
libiconv-1.11/libcharset/lib/localcharset.c libiconv-1.11/libcharset/lib/localcharset.c
112-
libiconv-1.11/libcharset/lib/ref-add.sin libiconv-1.11/libcharset/lib/ref-add.sin
113-
libiconv-1.11/libcharset/lib/ref-del.sin libiconv-1.11/libcharset/lib/ref-del.sin
114111
libiconv-1.11/libcharset/lib/ChangeLog libiconv-1.11/libcharset/lib/ChangeLog
115112
libiconv-1.11/libcharset/lib/Makefile.in libiconv-1.11/libcharset/lib/Makefile.in
116113
libiconv-1.11/libcharset/lib/Makefile.msvc libiconv-1.11/libcharset/lib/Makefile.msvc

‎libcharset/ChangeLog‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
2018-09-22 Bruno Haible <bruno@clisp.org>
2+
3+
Update from gnulib. Move mapping tables into the code.
4+
* include/localcharset.h.in: Update from gnulib.
5+
2018-05-19 Bruno Haible <bruno@clisp.org>
6+
* localcharset.h: Update comments for locale encodings found in
7+
FreeBSD 11, NetBSD 7, Solaris 10, Openindiana, HP-UX 11.31,
8+
IRIX 6.5, Minix 3.3. Also for Cygwin 2.9.
9+
2018-05-19 Bruno Haible <bruno@clisp.org>
10+
* localcharset.h: Document the GNU canonical names for character
11+
encodings here.
12+
* Makefile.in (PARENT_IMPORTED_FILES): Remove m4/relocatable-lib.m4.
13+
* INTEGRATE: Removing all text related to config.charset, charset.alias,
14+
ref-add.sin, ref-del.sin.
15+
* README: Update.
16+
* tools/README: Update.
17+
118
2018-01-27 Bruno Haible <bruno@clisp.org>
219

320
Rename some files.

‎libcharset/INTEGRATE‎

Lines changed: 3 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ The preferred way is to use the Gnulib module 'localcharset'.
55
Here are instructions if you don't want to use Gnulib. It's tedious,
66
many small changes to your package:
77

8-
* Copy the lib/ sourcefiles (localcharset.c, config.charset, ref-add.sin,
9-
ref-del.sin) and the include file (include/localcharset.h) into your
10-
package.
8+
* Copy the lib/ source file (localcharset.c) and the include file
9+
(include/localcharset.h) into your package.
1110

1211
* Add the m4/ files (codeset.m4, fcntl_h.m4, glibc21.m4) to your aclocal.m4
1312
file or, if you are using automake, to your m4/ directory.
@@ -25,135 +24,11 @@ many small changes to your package:
2524
* If you are not using automake, add rules to your Makefile.in:
2625

2726
- Augment target "all" by
28-
localcharset.o charset.alias ref-add.sed ref-del.sed
29-
with special rules for the last three:
30-
31-
charset.alias: $(srcdir)/config.charset
32-
$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
33-
mv t-$@ $@
34-
35-
ref-add.sed : $(srcdir)/ref-add.sin
36-
sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-$@
37-
mv t-$@ $@
38-
39-
ref-del.sed : $(srcdir)/ref-del.sin
40-
sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-$@
41-
mv t-$@ $@
42-
43-
- Augment target "install" by
44-
45-
if test @GLIBC21@ = no; then \
46-
case '@host_os@' in \
47-
darwin[56]*) \
48-
need_charset_alias=true ;; \
49-
darwin* | cygwin* | mingw* | pw32* | cegcc*) \
50-
need_charset_alias=false ;; \
51-
*) \
52-
need_charset_alias=true ;; \
53-
esac ; \
54-
else \
55-
need_charset_alias=false ; \
56-
fi ; \
57-
if $$need_charset_alias; then \
58-
$(mkinstalldirs) $(DESTDIR)$(libdir) ; \
59-
fi ; \
60-
if test -f $(DESTDIR)$(libdir)/charset.alias; then \
61-
sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
62-
$(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
63-
rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
64-
else \
65-
if $$need_charset_alias; then \
66-
sed -f ref-add.sed charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
67-
$(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
68-
rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
69-
fi; \
70-
fi
71-
72-
- Augment target "installdirs" by
73-
74-
if test @GLIBC21@ = no; then \
75-
case '@host_os@' in \
76-
darwin[56]*) \
77-
need_charset_alias=true ;; \
78-
darwin* | cygwin* | mingw* | pw32* | cegcc*) \
79-
need_charset_alias=false ;; \
80-
*) \
81-
need_charset_alias=true ;; \
82-
esac ; \
83-
else \
84-
need_charset_alias=false ; \
85-
fi ; \
86-
if $$need_charset_alias; then \
87-
$(mkinstalldirs) $(DESTDIR)$(libdir) ; \
88-
fi ; \
89-
90-
- Augment target "uninstall" by
91-
92-
if test -f $(DESTDIR)$(libdir)/charset.alias; then \
93-
sed -f ref-del.sed $(DESTDIR)$(libdir)/charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
94-
if grep '^# Packages using this file: $$' $(DESTDIR)$(libdir)/t-charset.alias > /dev/null; then \
95-
rm -f $(DESTDIR)$(libdir)/charset.alias; \
96-
else \
97-
$(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
98-
fi; \
99-
rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
100-
fi
101-
102-
- Augment target "clean" by
103-
104-
rm -f charset.alias ref-add.sed ref-del.sed
27+
localcharset.o
10528

10629
* If you are using automake, add rules to your Makefile.am:
10730

10831
- Augment the main *_SOURCES variable by
10932

11033
localcharset.h localcharset.c
11134

112-
- Augment EXTRA_DIST by
113-
114-
config.charset ref-add.sin ref-del.sin
115-
116-
- Augment target "all-local" by
117-
118-
charset.alias ref-add.sed ref-del.sed
119-
120-
- Add the lines:
121-
122-
charset_alias = $(DESTDIR)$(libdir)/charset.alias
123-
charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
124-
install-exec-local: all-local
125-
test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
126-
if test -f $(charset_alias); then \
127-
sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
128-
$(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
129-
rm -f $(charset_tmp) ; \
130-
else \
131-
if test @GLIBC21@ = no; then \
132-
sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
133-
$(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
134-
rm -f $(charset_tmp) ; \
135-
fi ; \
136-
fi
137-
138-
uninstall-local: all-local
139-
if test -f $(charset_alias); then \
140-
sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
141-
if grep '^# Packages using this file: $$' $(charset_tmp) \
142-
> /dev/null; then \
143-
rm -f $(charset_alias); \
144-
else \
145-
$(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
146-
fi; \
147-
rm -f $(charset_tmp); \
148-
fi
149-
150-
charset.alias: config.charset
151-
$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
152-
mv t-$@ $@
153-
154-
SUFFIXES = .sed .sin
155-
.sin.sed:
156-
sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@
157-
mv t-$@ $@
158-
159-
CLEANFILES = charset.alias ref-add.sed ref-del.sed

‎libcharset/Makefile.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ PARENT_IMPORTED_FILES = \
131131
m4/codeset.m4 \
132132
m4/fcntl-o.m4 \
133133
m4/glibc21.m4 \
134-
m4/relocatable-lib.m4 \
135134
m4/visibility.m4
136135
IMPORTED_FILES = \
137136
COPYING.LIB \

‎libcharset/README‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ This library fixes these flaws and provides a function
2525
const char * locale_charset (void);
2626

2727
It determines the current locale's character encoding, and canonicalizes it
28-
into one of the canonical names listed in config.charset. The result must
28+
into one of the canonical names listed in localcharset.h. The result must
2929
not be freed; it is statically allocated. If the canonical name cannot be
3030
determined, the result is a non-canonical name.
3131

‎libcharset/djgpp/fnchange.lst‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@ libcharset-1.1/m4/ChangeLog libcharset-1.1/m4/ChangeLog
3535
libcharset-1.1/m4/codeset.m4 libcharset-1.1/m4/codeset.m4
3636
libcharset-1.1/m4/glibc21.m4 libcharset-1.1/m4/glibc21.m4
3737
libcharset-1.1/m4/libtool.m4 libcharset-1.1/m4/libtool.m4
38-
libcharset-1.1/lib/config.charset libcharset-1.1/lib/config.charset
3938
libcharset-1.1/lib/localcharset.c libcharset-1.1/lib/localcharset.c
40-
libcharset-1.1/lib/ref-add.sin libcharset-1.1/lib/ref-add.sin
41-
libcharset-1.1/lib/ref-del.sin libcharset-1.1/lib/ref-del.sin
4239
libcharset-1.1/lib/ChangeLog libcharset-1.1/lib/ChangeLog
4340
libcharset-1.1/lib/Makefile.in libcharset-1.1/lib/Makefile.in
4441
libcharset-1.1/lib/Makefile.msvc libcharset-1.1/lib/Makefile.msvc

0 commit comments

Comments
 (0)