2004-01-23 Artem B. Bityuckiy <abitytsky@softminecorp.com>

	* acinclude.m4 (--enable-newlib-iconv): New configuration option.
	(--enable-newlib-builtin-converters): Ditto.
	* configure.in: Add code to set _ICONV_ENABLED flag.
	Set _MB_LEN_MAX to 1 if not mb enabled.
	* configure: Regenerated.
	* aclocal.m4: Ditto.
	* Makefile.in: Ditto.
	* newlib.hin: Add _ICONV_ENABLED flag.
	* libc/Makefile.am: Add support for iconv.
	* libc/configure.in: Ditto.
	* libc/Makefile.in: Regenerated.
	* libc/aclocal.m4: Ditto.
	* libc/configure: Ditto.
	* libc/libc.texinfo: Add iconv documentation.
	* libc/iconv/AUTHORS, libc/iconv/COPYING, libc/iconv/Makefile.am,
	libc/iconv/Makefile.in, libc/iconv/README.ORIGINAL,
	libc/iconv/README.TODO, libc/iconv/charset.aliases,
	libc/iconv/iconv.tex, libc/iconv/ccs/Makefile.am,
	libc/iconv/ccs/Makefile.in, libc/iconv/ccs/README.CCS.SOURCES,
	libc/iconv/ccs/big5.c, libc/iconv/ccs/cns11643_plane1.c,
	libc/iconv/ccs/cns11643_plane14.c, libc/iconv/ccs/cns11643_plane2.c,
	libc/iconv/ccs/cp775.c, libc/iconv/ccs/cp850.c,
	libc/iconv/ccs/cp852.c, libc/iconv/ccs/cp855.c,
	libc/iconv/ccs/cp866.c, libc/iconv/ccs/gb_2312_80.c,
	libc/iconv/ccs/iconv_mktbl, libc/iconv/ccs/iso_8859_1.c,
	libc/iconv/ccs/iso_8859_15.c, libc/iconv/ccs/iso_8859_2.c,
	libc/iconv/ccs/iso_8859_4.c, libc/iconv/ccs/iso_8859_5.c,
	libc/iconv/ccs/jis_x0201.c, libc/iconv/ccs/jis_x0208_1983.c,
	libc/iconv/ccs/jis_x0212_1990.c, libc/iconv/ccs/koi8_r.c,
	libc/iconv/ccs/koi8_u.c, libc/iconv/ccs/ksx1001.c,
	libc/iconv/ccs/shift_jis.c, libc/iconv/ccs/us_ascii.c,
	libc/iconv/ccs/binary/Makefile.am, libc/iconv/ccs/binary/Makefile.in,
	libc/iconv/ccs/binary/big5.cct,
	libc/iconv/ccs/binary/cns11643_plane1.cct,
	libc/iconv/ccs/binary/cns11643_plane14.cct,
	libc/iconv/ccs/binary/cns11643_plane2.cct,
	libc/iconv/ccs/binary/cp775.cct, libc/iconv/ccs/binary/cp850.cct,
	libc/iconv/ccs/binary/cp852.cct, libc/iconv/ccs/binary/cp855.cct,
	libc/iconv/ccs/binary/cp866.cct, libc/iconv/ccs/binary/gb_2312_80.cct,
	libc/iconv/ccs/binary/iso_8859_1.cct,
	libc/iconv/ccs/binary/iso_8859_15.cct,
	libc/iconv/ccs/binary/iso_8859_2.cct,
	libc/iconv/ccs/binary/iso_8859_4.cct,
	libc/iconv/ccs/binary/iso_8859_5.cct,
	libc/iconv/ccs/binary/jis_x0201.cct,
	libc/iconv/ccs/binary/jis_x0208_1983.cct,
	libc/iconv/ccs/binary/jis_x0212_1990.cct,
	libc/iconv/ccs/binary/koi8_r.cct, libc/iconv/ccs/binary/koi8_u.cct,
	libc/iconv/ccs/binary/ksx1001.cct,
	libc/iconv/ccs/binary/shift_jis.cct,
	libc/iconv/ccs/binary/us_ascii.cct,
	libc/iconv/ces/Makefile.am, libc/iconv/ces/Makefile.in,
	libc/iconv/ces/euc-jp.c, libc/iconv/ces/euc-kr.c,
	libc/iconv/ces/euc-tw.c, libc/iconv/ces/gb2312.c,
	libc/iconv/ces/iso-10646-ucs-2.c, libc/iconv/ces/iso-10646-ucs-4.c,
	libc/iconv/ces/ucs-2-internal.c, libc/iconv/ces/ucs-4-internal.c,
	libc/iconv/ces/utf-16.c, libc/iconv/ces/utf-8.c,
	libc/iconv/lib/Makefile.am, libc/iconv/lib/Makefile.in,
	libc/iconv/lib/aliases.c, libc/iconv/lib/bialiasesi.c,
	libc/iconv/lib/biccs.c, libc/iconv/lib/bices.c,
	libc/iconv/lib/ccs.c, libc/iconv/lib/ces.c,
	libc/iconv/lib/ces_euc.c, libc/iconv/lib/ces_iso2022.c,
	libc/iconv/lib/ces_table.c, libc/iconv/lib/converter.c,
	libc/iconv/lib/deps.h, libc/iconv/lib/endian.h,
	libc/iconv/lib/iconv.c, libc/iconv/lib/loaddata.c,
	libc/iconv/lib/local.h, libc/include/iconv.h: New files.
	* libc/sys/linux/include/iconv.h: Ditto.
	* libc/include/sys/_types.h (_iconv_t): Added.
	* doc/aclocal.m4: Regenerated.
	* doc/configure: Ditto.
	* doc/Makefile.in: Ditto.
	* iconvdata/Makefile.in: Ditto.
	* iconvdata/aclocal.m4: Ditto.
	* iconvdata/configure: Ditto.
	* libc/*aclocal.m4: Ditto.
	* libc/*Makefile.in: Ditto.
	* libc/*configure: Ditto.
	* libm/*aclocal.m4: Ditto.
	* libm/*Makefile.in: Ditto.
	* libm/*configure: Ditto.

1 files changed, 34 insertions, 165 deletions

diff --git a/newlib/libc/sys/linux/Makefile.in b/newlib/libc/sys/linux/Makefile.in
index 809ecbcc4..5b548c797 100644
--- a/newlib/libc/sys/linux/Makefile.in
+++ b/newlib/libc/sys/linux/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -100,157 +100,30 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(INCLTDL)
 @ELIX_LEVEL_1_TRUE@argp_dir = 
-@ELIX_LEVEL_1_FALSE@argp_dir = @ELIX_LEVEL_1_FALSE@argp
+@ELIX_LEVEL_1_FALSE@argp_dir = argp
 @ELIX_LEVEL_1_TRUE@ARGP_LIB = 
-@ELIX_LEVEL_1_FALSE@ARGP_LIB = @ELIX_LEVEL_1_FALSE@argp/libargp.la
-
-SUBDIRS = machine \
-	$(argp_dir) \
-	cmath \
-	$(EXTRA_SUBDIRS)\
-	.
-
-SUBLIBS = \
-	$(ARGP_LIB) \
-	cmath/libcmath.la \
-	$(EXTRA_SUBLIBS) \
-	$(LINUX_MACH_LIB)
-
-
-GENERAL_SOURCES = \
-	aio.c \
-	brk.c \
-	calloc.c \
-	callocr.c \
-	cfreer.c \
-	cfspeed.c \
-	clock_getres.c \
-	clock_gettime.c \
-	clock_settime.c \
-	flockfile.c \
-	free.c \
-	freer.c \
-	ftok.c \
-	funlockfile.c \
-	getdate.c \
-	getdate_err.c \
-	gethostname.c \
-	getreent.c \
-	ids.c \
-	inode.c \
-	io.c \
-	ipc.c \
-	linux.c \
-	mallinfor.c \
-	mallocr.c \
-	mallstatsr.c \
-	mmap.c \
-	mq_close.c \
-	mq_getattr.c \
-	mq_notify.c \
-	mq_open.c \
-	mq_receive.c \
-	mq_send.c \
-	mq_setattr.c \
-	mq_unlink.c \
-	msize.c \
-	msizer.c \
-	mstats.c \
-	mtrim.c \
-	mtrimr.c \
-	ntp_gettime.c \
-	pread.c \
-	process.c \
-	prof-freq.c \
-	profile.c \
-	psignal.c \
-	pwrite.c \
-	raise.c \
-	realloc.c \
-	reallocr.c \
-	rename.c \
-	resource.c \
-	sched.c \
-	select.c \
-	seteuid.c \
-	sethostname.c \
-	shm_open.c \
-	shm_unlink.c \
-	sig.c \
-	sigaction.c \
-	sigqueue.c \
-	signal.c \
-	siglongjmp.c \
-	sigset.c \
-	sigwait.c \
-	socket.c \
-	sleep.c \
-	strsignal.c \
-	strverscmp.c \
-	sysconf.c \
-	sysctl.c \
-	systat.c \
-	tcdrain.c \
-	tcsendbrk.c \
-	termios.c \
-	time.c \
-	usleep.c \
-	versionsort.c 
-
-
-ELIX_2_OBJS = \
-	aio64.$(oext) \
-	confstr.$(oext) \
-	ctermid.$(oext) \
-	fclean.$(oext) \
-	fpathconf.$(oext) \
-	fstab.$(oext) \
-	fstatvfs.$(oext) \
-	fstatvfs64.$(oext) \
-	ftw.$(oext) \
-	ftw64.$(oext) \
-	getopt.$(oext) \
-	getopt1.$(oext) \
-	getrlimit64.$(oext) \
-	getwd.$(oext) \
-	io64.$(oext) \
-	malign.$(oext) \
-	malignr.$(oext) \
-	malloptr.$(oext) \
-	mcheck.$(oext) \
-	mntent.$(oext) \
-	mntent_r.$(oext) \
-	pathconf.$(oext) \
-	pread64.$(oext) \
-	pvallocr.$(oext) \
-	pwrite64.$(oext) \
-	readdir64.$(oext) \
-	realpath.$(oext) \
-	scandir64.$(oext) \
-	setrlimit64.$(oext) \
-	statvfs.$(oext) \
-	statvfs64.$(oext) \
-	ttyname_r.$(oext) \
-	utimes.$(oext) \
-	vallocr.$(oext) \
-	versionsort64.$(oext)
-
-
-ELIX_3_OBJS = \
-	system.$(oext) \
-	wait.$(oext)
-
-
-ELIX_4_OBJS = \
-	getlogin.$(oext) \
-	getpwnam.$(oext) \
-	getpwuid.$(oext) \
-	stack.$(oext)
+@ELIX_LEVEL_1_FALSE@ARGP_LIB = argp/libargp.la
+
+SUBDIRS = machine 	$(argp_dir) 	cmath 	$(EXTRA_SUBDIRS) 	.
+
+SUBLIBS =  	$(ARGP_LIB) 	cmath/libcmath.la 	$(EXTRA_SUBLIBS) 	$(LINUX_MACH_LIB)
+
+
+GENERAL_SOURCES =  	aio.c 	brk.c 	calloc.c 	callocr.c 	cfreer.c 	cfspeed.c 	clock_getres.c 	clock_gettime.c 	clock_settime.c 	flockfile.c 	free.c 	freer.c 	ftok.c 	funlockfile.c 	getdate.c 	getdate_err.c 	gethostname.c 	getreent.c 	ids.c 	inode.c 	io.c 	ipc.c 	linux.c 	mallinfor.c 	mallocr.c 	mallstatsr.c 	mmap.c 	mq_close.c 	mq_getattr.c 	mq_notify.c 	mq_open.c 	mq_receive.c 	mq_send.c 	mq_setattr.c 	mq_unlink.c 	msize.c 	msizer.c 	mstats.c 	mtrim.c 	mtrimr.c 	ntp_gettime.c 	pread.c 	process.c 	prof-freq.c 	profile.c 	psignal.c 	pwrite.c 	raise.c 	realloc.c 	reallocr.c 	rename.c 	resource.c 	sched.c 	select.c 	seteuid.c 	sethostname.c 	shm_open.c 	shm_unlink.c 	sig.c 	sigaction.c 	sigqueue.c 	signal.c 	siglongjmp.c 	sigset.c 	sigwait.c 	socket.c 	sleep.c 	strsignal.c 	strverscmp.c 	sysconf.c 	sysctl.c 	systat.c 	tcdrain.c 	tcsendbrk.c 	termios.c 	time.c 	usleep.c 	versionsort.c 
+
+
+ELIX_2_OBJS =  	aio64.$(oext) 	confstr.$(oext) 	ctermid.$(oext) 	fclean.$(oext) 	fpathconf.$(oext) 	fstab.$(oext) 	fstatvfs.$(oext) 	fstatvfs64.$(oext) 	ftw.$(oext) 	ftw64.$(oext) 	getopt.$(oext) 	getopt1.$(oext) 	getrlimit64.$(oext) 	getwd.$(oext) 	io64.$(oext) 	malign.$(oext) 	malignr.$(oext) 	malloptr.$(oext) 	mcheck.$(oext) 	mntent.$(oext) 	mntent_r.$(oext) 	pathconf.$(oext) 	pread64.$(oext) 	pvallocr.$(oext) 	pwrite64.$(oext) 	readdir64.$(oext) 	realpath.$(oext) 	scandir64.$(oext) 	setrlimit64.$(oext) 	statvfs.$(oext) 	statvfs64.$(oext) 	ttyname_r.$(oext) 	utimes.$(oext) 	vallocr.$(oext) 	versionsort64.$(oext)
+
+
+ELIX_3_OBJS =  	system.$(oext) 	wait.$(oext)
+
+
+ELIX_4_OBJS =  	getlogin.$(oext) 	getpwnam.$(oext) 	getpwuid.$(oext) 	stack.$(oext)
 
 @ELIX_LEVEL_1_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@$(ELIX_2_OBJS)
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@$(ELIX_2_OBJS) $(ELIX_3_OBJS)
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@$(ELIX_2_OBJS) $(ELIX_3_OBJS) $(ELIX_4_OBJS)
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = $(ELIX_2_OBJS)
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS)
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS) $(ELIX_4_OBJS)
 
 # This will handle both /usr/src/linux-2.4/include/asm/signal.h (in Red Hat Linux 7.1)
 # and also /usr/src/linux/include/asm/signal.h in older versions of Red Hat Linux
@@ -258,25 +131,21 @@ SIGNAL_H = /usr/src/$(shell ls /usr/src/ | grep ^linux | head -n 1)/include/asm/
 
 liblinux_la_LDFLAGS = -Xcompiler -nostdlib
 
-ADD_OBJS = \
-	malloc.$(oext) \
-	gethostid.$(oext) \
-	sethostid.$(oext) \
-	$(LINUX_MACH_LIB)
+ADD_OBJS =  	malloc.$(oext) 	gethostid.$(oext) 	sethostid.$(oext) 	$(LINUX_MACH_LIB)
 
 
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@liblinux.la
-@USE_LIBTOOL_TRUE@liblinux_la_SOURCES = @USE_LIBTOOL_TRUE@$(GENERAL_SOURCES)
-@USE_LIBTOOL_TRUE@liblinux_la_LIBADD = @USE_LIBTOOL_TRUE@$(ADD_OBJS) $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@liblinux_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(ADD_OBJS) $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@LIBC_COMPILE = @USE_LIBTOOL_TRUE@$(LTCOMPILE)
-@USE_LIBTOOL_FALSE@LIBC_COMPILE = @USE_LIBTOOL_FALSE@$(COMPILE)
-@USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = liblinux.la
+@USE_LIBTOOL_TRUE@liblinux_la_SOURCES = $(GENERAL_SOURCES)
+@USE_LIBTOOL_TRUE@liblinux_la_LIBADD = $(ADD_OBJS) $(LIB_OBJS)
+@USE_LIBTOOL_TRUE@liblinux_la_DEPENDENCIES = $(ADD_OBJS) $(LIB_OBJS)
+@USE_LIBTOOL_TRUE@LIBC_COMPILE = $(LTCOMPILE)
+@USE_LIBTOOL_FALSE@LIBC_COMPILE = $(COMPILE)
+@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(GENERAL_SOURCES)
-@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(ADD_OBJS) $(LIB_OBJS)
-@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(ADD_OBJS) $(LIB_OBJS)
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
+@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(GENERAL_SOURCES)
+@USE_LIBTOOL_FALSE@lib_a_LIBADD = $(ADD_OBJS) $(LIB_OBJS)
+@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(ADD_OBJS) $(LIB_OBJS)
 
 AM_CFLAGS = -I $(srcdir)/../../stdio
 ACLOCAL_AMFLAGS = -I ../../..