27 files changed, 225 insertions, 350 deletions
diff --git a/Configure b/Configure
index 8e34f0aa26..dce7a06753 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Tue Sep 11 15:19:00 EET DST 2001 [metaconfig 3.0 PL70]
+# Generated on Thu Sep 20 17:20:27 EET DST 2001 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
@@ -427,7 +427,6 @@ d_getsbyport=''
 d_gnulibc=''
 d_hasmntopt=''
 d_htonl=''
-d_iconv=''
 d_inetaton=''
 d_int64_t=''
 d_isascii=''
@@ -680,7 +679,6 @@ i_fp_class=''
 i_gdbm=''
 d_grpasswd=''
 i_grp=''
-i_iconv=''
 i_ieeefp=''
 i_inttypes=''
 i_langinfo=''
@@ -1088,7 +1086,7 @@ defvoidused=15
 libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl'
 libswanted="$libswanted dld ld sun m c cposix posix"
 libswanted="$libswanted ndir dir crypt sec"
-libswanted="$libswanted ucb bsd BSD PW x iconv util"
+libswanted="$libswanted ucb bsd BSD PW x util"
 : We probably want to search /usr/shlib before most other libraries.
 : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
 glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
@@ -10628,10 +10626,6 @@ esac
 set d_htonl
 eval $setvar
 
-: see if iconv exists
-set iconv d_iconv
-eval $inlibc
-
 : index or strchr
 echo " "
 if set index val -f; eval $csym; $val; then
@@ -15827,10 +15821,6 @@ eval $inhdr
 set fp_class.h i_fp_class
 eval $inhdr
 
-: see if this is a iconv.h system
-set iconv.h i_iconv
-eval $inhdr
-
 : see if this is a ieeefp.h system
 set ieeefp.h i_ieeefp
 eval $inhdr
@@ -16867,7 +16857,6 @@ d_gnulibc='$d_gnulibc'
 d_grpasswd='$d_grpasswd'
 d_hasmntopt='$d_hasmntopt'
 d_htonl='$d_htonl'
-d_iconv='$d_iconv'
 d_index='$d_index'
 d_inetaton='$d_inetaton'
 d_int64_t='$d_int64_t'
@@ -17150,7 +17139,6 @@ i_fp='$i_fp'
 i_fp_class='$i_fp_class'
 i_gdbm='$i_gdbm'
 i_grp='$i_grp'
-i_iconv='$i_iconv'
 i_ieeefp='$i_ieeefp'
 i_inttypes='$i_inttypes'
 i_langinfo='$i_langinfo'
diff --git a/NetWare/config.wc b/NetWare/config.wc
index ff6d3c90ee..381ae3efc1 100644
--- a/NetWare/config.wc
+++ b/NetWare/config.wc
@@ -194,7 +194,6 @@ d_gnulibc='undef'
 d_grpasswd='undef'
 d_hasmntopt='undef'
 d_htonl='define'
-d_iconv='undef'
 d_index='undef'
 d_inetaton='undef'
 d_int64_t='undef'
@@ -449,7 +448,6 @@ i_fp='undef'
 i_fp_class='undef'
 i_gdbm='undef'
 i_grp='undef'
-i_iconv='undef'
 i_ieeefp='undef'
 i_inttypes='undef'
 i_langinfo='undef'
diff --git a/NetWare/config_H.wc b/NetWare/config_H.wc
index b0ddd9e0e4..12e9a57a24 100644
--- a/NetWare/config_H.wc
+++ b/NetWare/config_H.wc
@@ -1615,12 +1615,6 @@
 #define HAS_NTOHL		/**/
 #define HAS_NTOHS		/**/
 
-/* HAS_ICONV:
- *	This symbol, if defined, indicates that the iconv routine is
- *	available to do character set conversions.
- */
-/*#define HAS_ICONV		/**/
-
 /* HAS_INT64_T:
  *     This symbol will defined if the C compiler supports int64_t.
  *     Usually the <inttypes.h> needs to be included, but sometimes
@@ -2415,12 +2409,6 @@
 /*#define I_GRP		/**/
 /*#define GRPASSWD	/**/
 
-/* I_ICONV:
- *	This symbol, if defined, indicates that <iconv.h> exists and
- *	should be included.
- */
-/*#define	I_ICONV		/**/
-
 /* I_IEEEFP:
  *	This symbol, if defined, indicates that <ieeefp.h> exists and
  *	should be included.
diff --git a/Porting/Glossary b/Porting/Glossary
index 3ffbdcc876..57c05e41ac 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -879,10 +879,6 @@ d_htonl (d_htonl.U):
 	This variable conditionally defines HAS_HTONL if htonl() and its
 	friends are available to do network order byte swapping.
 
-d_iconv (d_iconv.U):
-	This variable conditionally defines the HAS_ICONV symbol, which
-	indicates to the C program that the iconv() routine is available.
-
 d_index (d_strchr.U):
 	This variable conditionally defines HAS_INDEX if index() and
 	rindex() are available for string searching.
@@ -2213,10 +2209,6 @@ i_grp (i_grp.U):
 	This variable conditionally defines the I_GRP symbol, and indicates
 	whether a C program should include <grp.h>.
 
-i_iconv (i_iconv.U):
-	This variable conditionally defines the I_ICONV symbol, and indicates
-	whether a C program should include <iconv.h>.
-
 i_ieeefp (i_ieeefp.U):
 	This variable conditionally defines the I_IEEEFP symbol, and indicates
 	whether a C program should include <ieeefp.h>.
diff --git a/Porting/config.sh b/Porting/config.sh
index e41896da03..44b3b5bf5d 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -8,7 +8,7 @@
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: Tue Sep 11 04:09:55 EET DST 2001
+# Configuration time: Thu Sep 20 17:22:20 EET DST 2001
 # Configured by     : jhi
 # Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
 
@@ -63,7 +63,7 @@ ccsymbols='__alpha=1 __LANGUAGE_C__=1 __osf__=1 __unix__=1 _LONGLONG=1 _SYSTYPE_
 ccversion='V5.6-082'
 cf_by='jhi'
 cf_email='yourname@yourhost.yourplace.com'
-cf_time='Tue Sep 11 04:09:55 EET DST 2001'
+cf_time='Thu Sep 20 17:22:20 EET DST 2001'
 charsize='1'
 chgrp=''
 chmod='chmod'
@@ -216,7 +216,6 @@ d_gnulibc='undef'
 d_grpasswd='define'
 d_hasmntopt='undef'
 d_htonl='define'
-d_iconv='define'
 d_index='undef'
 d_inetaton='define'
 d_int64_t='undef'
@@ -233,7 +232,7 @@ d_locconv='define'
 d_lockf='define'
 d_longdbl='define'
 d_longlong='define'
-d_lseekproto=''
+d_lseekproto='define'
 d_lstat='define'
 d_madvise='define'
 d_mblen='define'
@@ -499,7 +498,6 @@ i_fp='define'
 i_fp_class='define'
 i_gdbm='undef'
 i_grp='define'
-i_iconv='define'
 i_ieeefp='undef'
 i_inttypes='undef'
 i_langinfo='define'
@@ -594,7 +592,7 @@ issymlink='test -h'
 ivdformat='"ld"'
 ivsize='8'
 ivtype='long'
-known_extensions='B ByteLoader Cwd DB_File Data/Dumper Devel/DProf Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call GDBM_File I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 NDBM_File ODBM_File Opcode POSIX PerlIO/Scalar PerlIO/Via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread Time/HiRes XS/Typemap attrs re'
+known_extensions='B ByteLoader Cwd DB_File Data/Dumper Devel/DProf Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call GDBM_File I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 NDBM_File ODBM_File Opcode POSIX PerlIO/Scalar PerlIO/Via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread Time/HiRes XS/Typemap attrs re threads'
 ksh=''
 ld='ld'
 lddlflags='-shared -expect_unresolved "*" -msym -std -s'
@@ -606,12 +604,12 @@ lib_ext='.a'
 libc='/usr/shlib/libc.so'
 libperl='libperl.so'
 libpth='/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /var/shlib'
-libs='-lgdbm -ldbm -ldb -lm -liconv -lutil'
+libs='-lgdbm -ldbm -ldb -lm -lutil'
 libsdirs=' /usr/shlib /usr/ccs/lib'
-libsfiles=' libgdbm.so libdbm.a libdb.so libm.so libiconv.so libutil.a'
-libsfound=' /usr/shlib/libgdbm.so /usr/ccs/lib/libdbm.a /usr/shlib/libdb.so /usr/shlib/libm.so /usr/shlib/libiconv.so /usr/ccs/lib/libutil.a'
+libsfiles=' libgdbm.so libdbm.a libdb.so libm.so libutil.a'
+libsfound=' /usr/shlib/libgdbm.so /usr/ccs/lib/libdbm.a /usr/shlib/libdb.so /usr/shlib/libm.so /usr/ccs/lib/libutil.a'
 libspath=' /usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /var/shlib'
-libswanted='sfio socket bind inet nsl nm gdbm dbm db malloc dld ld sun m cposix posix ndir dir crypt sec ucb BSD x iconv util'
+libswanted='sfio socket bind inet nsl nm gdbm dbm db malloc dld ld sun m cposix posix ndir dir crypt sec ucb BSD x util'
 libswanted_uselargefiles=''
 line=''
 lint=''
@@ -686,9 +684,9 @@ patchlevel='7'
 path_sep=':'
 perl5='perl'
 perl=''
-perl_patchlevel='11978'
+perl_patchlevel='12086'
 perladmin='yourname@yourhost.yourplace.com'
-perllibs='-lm -liconv -lutil'
+perllibs='-lm -lutil'
 perlpath='/opt/perl/bin/perl'
 pg='pg'
 phostname=''
@@ -854,7 +852,7 @@ vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
 version='5.7.2'
-version_patchlevel_string='version 7 subversion 2 patch 11978'
+version_patchlevel_string='version 7 subversion 2 patch 12086'
 versiononly='define'
 vi=''
 voidflags='15'
@@ -884,7 +882,7 @@ PERL_SUBVERSION=2
 PERL_API_REVISION=5
 PERL_API_VERSION=5
 PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=11978
+PERL_PATCHLEVEL=12086
 PERL_CONFIG_SH=true
 # Variables propagated from previous config.sh file.
 pp_sys_cflags='ccflags="$ccflags -DNO_EFF_ONLY_OK"'
diff --git a/Porting/config_H b/Porting/config_H
index 463444710e..583d0a0040 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -17,7 +17,7 @@
 /*
  * Package name      : perl5
  * Source directory  : .
- * Configuration time: Tue Sep 11 04:09:55 EET DST 2001
+ * Configuration time: Thu Sep 20 17:22:20 EET DST 2001
  * Configured by     : jhi
  * Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
  */
@@ -1691,12 +1691,6 @@
 #define HAS_NTOHL		/**/
 #define HAS_NTOHS		/**/
 
-/* HAS_ICONV:
- *	This symbol, if defined, indicates that the iconv routine is
- *	available to do character set conversions.
- */
-#define HAS_ICONV		/**/
-
 /* HAS_INT64_T:
  *     This symbol will defined if the C compiler supports int64_t.
  *     Usually the <inttypes.h> needs to be included, but sometimes
@@ -1782,7 +1776,7 @@
  *	to the program to supply one.  A good guess is
  *		extern off_t lseek(int, off_t, int);
  */
-#	HAS_LSEEK_PROTO	/**/
+#define	HAS_LSEEK_PROTO	/**/
 
 /* HAS_MADVISE:
  *	This symbol, if defined, indicates that the madvise system call is
@@ -2516,12 +2510,6 @@
 #define I_GRP		/**/
 #define GRPASSWD	/**/
 
-/* I_ICONV:
- *	This symbol, if defined, indicates that <iconv.h> exists and
- *	should be included.
- */
-#define	I_ICONV		/**/
-
 /* I_IEEEFP:
  *	This symbol, if defined, indicates that <ieeefp.h> exists and
  *	should be included.
diff --git a/config_h.SH b/config_h.SH
index b39be3bd02..bbc8ef901e 100644
--- a/config_h.SH
+++ b/config_h.SH
@@ -1711,12 +1711,6 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 #$d_htonl HAS_NTOHL		/**/
 #$d_htonl HAS_NTOHS		/**/
 
-/* HAS_ICONV:
- *	This symbol, if defined, indicates that the iconv routine is
- *	available to do character set conversions.
- */
-#$d_iconv HAS_ICONV		/**/
-
 /* HAS_INT64_T:
  *     This symbol will defined if the C compiler supports int64_t.
  *     Usually the <inttypes.h> needs to be included, but sometimes
@@ -2536,12 +2530,6 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 #$i_grp I_GRP		/**/
 #$d_grpasswd GRPASSWD	/**/
 
-/* I_ICONV:
- *	This symbol, if defined, indicates that <iconv.h> exists and
- *	should be included.
- */
-#$i_iconv	I_ICONV		/**/
-
 /* I_IEEEFP:
  *	This symbol, if defined, indicates that <ieeefp.h> exists and
  *	should be included.
diff --git a/configure.com b/configure.com
index 6d5add8488..14b1973793 100644
--- a/configure.com
+++ b/configure.com
@@ -3920,43 +3920,6 @@ $ tmp = "mkstemps"
 $ GOSUB inlibc
 $ d_mkstemps = tmp
 $!
-$! Check for iconv
-$!
-$ OS
-$ WS "#if defined(__DECC) || defined(__DECCXX)"
-$ WS "#include <stdlib.h>"
-$ WS "#endif"
-$ WS "#include <stdio.h>"
-$ WS "#include <iconv.h>"
-$ WS "int main()"
-$ WS "{"
-$ WS "  iconv_t cd = (iconv_t)0;"
-$ WS "  char *inbuf, *outbuf;"
-$ WS "  size_t inleft, outleft;"
-$ WS "  iconv(cd, &inbuf, &inleft, &outbuf, &outleft);"
-$ WS "  exit(0);"
-$ WS "}"
-$ CS
-$ GOSUB link_ok
-$ IF compile_status .ne. good_compile
-$ THEN
-$   d_iconv="undef"
-$   i_iconv="undef"
-$ ELSE
-$   IF link_status .ne. good_link
-$   THEN
-$     d_iconv="undef"
-$     i_iconv="undef"
-$   ELSE
-$     d_iconv="define"
-$     i_iconv="define"
-$   ENDIF
-$ ENDIF
-$ IF i_iconv .eqs. "define" 
-$ THEN echo4 "<iconv.h> found."
-$ ELSE echo4 "<iconv.h> NOT found."
-$ ENDIF
-$!
 $! Check for mkdtemp
 $!
 $ OS
@@ -5124,7 +5087,6 @@ $ WC "d_gnulibc='undef'"
 $ WC "d_grpasswd='undef'"
 $ WC "d_hasmntopt='undef'"
 $ WC "d_htonl='" + d_htonl + "'"
-$ WC "d_iconv='" + d_iconv +"'"
 $ WC "d_index='" + d_index + "'"
 $ WC "d_inetaton='undef'"
 $ WC "d_int64_t='" + d_int64_t + "'"
@@ -5388,7 +5350,6 @@ $ WC "i_float='define'"
 $ WC "i_fp='undef'"
 $ WC "i_fp_class='undef'"
 $ WC "i_grp='undef'"
-$ WC "i_iconv='" + i_iconv +"'"
 $ WC "i_ieeefp='undef'"
 $ WC "i_inttypes='" + i_inttypes + "'"
 $ WC "i_langinfo='" + i_langinfo + "'"
diff --git a/epoc/config.sh b/epoc/config.sh
index 6e3566924c..42ada756ca 100644
--- a/epoc/config.sh
+++ b/epoc/config.sh
@@ -206,7 +206,6 @@ d_gnulibc='undef'
 d_grpasswd='undef'
 d_hasmntopt='undef'
 d_htonl='define'
-d_iconv='undef'
 d_index='undef'
 d_inetaton='define'
 d_int64_t='undef'
@@ -462,7 +461,6 @@ i_fp='undef'
 i_fp_class='undef'
 i_gdbm='undef'
 i_grp='undef'
-i_iconv='undef'
 i_ieeefp='undef'
 i_inttypes='undef'
 i_langinfo='undef'
@@ -865,7 +863,6 @@ d_munmap='undef'
 d_qgcvt='undef'
 d_socklen_t='undef'
 d_vendorarch=''
-i_iconv='undef'
 i_ieeefp='undef'
 i_sunmath='undef'
 i_syslog='undef'
@@ -994,7 +991,6 @@ d_munmap='undef'
 d_qgcvt='undef'
 d_socklen_t='undef'
 d_vendorarch=''
-i_iconv='undef'
 i_ieeefp='undef'
 i_sunmath='undef'
 i_syslog='undef'
diff --git a/perl.h b/perl.h
index 85a50a44f0..6601c76ec8 100644
--- a/perl.h
+++ b/perl.h
@@ -3881,9 +3881,6 @@ extern void moncontrol(int);
 
    NV_PRESERVES_UV
 
-   HAS_ICONV
-   I_ICONV
-
    HAS_MKSTEMP
    HAS_MKSTEMPS
    HAS_MKDTEMP
diff --git a/pod/perlmodlib.pod b/pod/perlmodlib.pod
index 565c0d15e2..53e491c8a2 100644
--- a/pod/perlmodlib.pod
+++ b/pod/perlmodlib.pod
@@ -132,6 +132,10 @@ Restrict unsafe constructs
 
 Predeclare sub names
 
+=item threads
+
+Perl extension allowing use of interpreter based threads from perl
+
 =item utf8
 
 Enable/disable UTF-8 (or UTF-EBCDIC) in source code
@@ -500,7 +504,7 @@ Methods for OS/2 file specs
 
 =item File::Spec::Unix
 
-Methods used by File::Spec
+File::Spec for Unix, base for other File::Spec modules
 
 =item File::Spec::VMS
 
@@ -566,6 +570,10 @@ Open a process for both reading and writing
 
 Open a process for reading, writing, and error handling
 
+=item Lingua::KO::Hangul::Util
+
+Utility functions for Hangul Syllables
+
 =item Locale::Constants
 
 Constants for Locale codes
@@ -866,6 +874,10 @@ Yet another framework for writing test scripts
 
 Basic utilities for writing tests.
 
+=item Test::Tutorial
+
+A tutorial about writing really basic tests
+
 =item Text::Abbrev
 
 Create an abbreviation table from a list
@@ -890,26 +902,6 @@ Expand and unexpand tabs per the unix expand(1) and unexpand(1)
 
 Line wrapping to form simple paragraphs
 
-=item Thread
-
-Manipulate threads in Perl (EXPERIMENTAL, subject to change)
-
-=item Thread::Queue
-
-Thread-safe queues
-
-=item Thread::Semaphore
-
-Thread-safe semaphores
-
-=item Thread::Signal
-
-Start a thread which runs signal handlers reliably
-
-=item Thread::Specific
-
-Thread-specific keys
-
 =item Tie::Array
 
 Base class for tied arrays
@@ -954,7 +946,15 @@ Internal object used by Time::gmtime and Time::localtime
 
 Base class for ALL classes (blessed references)
 
-=item UnicodeCD
+=item Unicode::Collate
+
+Use UCA (Unicode Collation Algorithm)
+
+=item Unicode::Normalize
+
+Normalized forms of Unicode text
+
+=item Unicode::UCD
 
 Unicode character database
 
diff --git a/pod/perltoc.pod b/pod/perltoc.pod
index 86d50d834b..1b05667daf 100644
--- a/pod/perltoc.pod
+++ b/pod/perltoc.pod
@@ -37,8 +37,8 @@ through to locate the proper section you're looking for.
 
 =back
 
-=head2 perlfaq - frequently asked questions about Perl ($Date: 1999/05/23
-20:38:02 $)
+=head2 perlfaq - frequently asked questions about Perl ($Date: 2001/09/20
+03:03:00 $)
 
 =over 4
 
@@ -833,7 +833,8 @@ b [line] [condition], b subname [condition], b postpone subname
 command, a [line], A, W expr, W, O booloption .., O anyoption? .., O
 option=value .., < ?, < [ command ], << command, > ?, > command, >>
 command, { ?, { [ command ], {{ command, ! number, ! -number, ! pattern, !!
-cmd, H -number, q or ^D, R, |dbcmd, ||dbcmd, command, m expr, man [manpage]
+cmd, @ file, H -number, q or ^D, R, |dbcmd, ||dbcmd, command, m expr, man
+[manpage]
 
 =item Configurable Options
 
@@ -909,7 +910,8 @@ $INPLACE_EDIT, $^I, $^M, $OSNAME, $^O, $PERLDB, $^P, 0x01, 0x02, 0x04,
 0x08, 0x10, 0x20, 0x40, 0x80, 0x100, 0x200, $LAST_REGEXP_CODE_RESULT, $^R,
 $EXCEPTIONS_BEING_CAUGHT, $^S, $BASETIME, $^T, $PERL_VERSION, $^V,
 $WARNING, $^W, ${^WARNING_BITS}, ${^WIDE_SYSTEM_CALLS}, $EXECUTABLE_NAME,
-$^X, $ARGV, @ARGV, @F, @INC, @_, %INC, %ENV, $ENV{expr}, %SIG, $SIG{expr}
+$^X, ARGV, $ARGV, @ARGV, @F, @INC, @_, %INC, %ENV, $ENV{expr}, %SIG,
+$SIG{expr}
 
 =item Error Indicators
 
@@ -2016,6 +2018,8 @@ to enable UTF-8/UTF-EBCDIC in scripts
 
 =item CAVEATS
 
+=item UNICODE REGULAR EXPRESSION SUPPORT LEVEL
+
 =item SEE ALSO
 
 =back
@@ -2206,7 +2210,8 @@ chcp, dataset access, OS/390, z/OS iconv, locales
 
 attributes, attrs, autouse, base, blib, bytes, charnames, constant,
 diagnostics, fields, filetest, integer, less, locale, open, ops, overload,
-re, sigtrap, strict, subs, utf8, vars, warnings, warnings::register
+re, sigtrap, strict, subs, threads, utf8, vars, warnings,
+warnings::register
 
 =item Standard Modules
 
@@ -2230,27 +2235,27 @@ File::Spec::Mac, File::Spec::OS2, File::Spec::Unix, File::Spec::VMS,
 File::Spec::Win32, File::Temp, File::stat, FileCache, FileHandle,
 Filter::Simple, FindBin, Getopt::Long, Getopt::Std, I18N::Collate,
 I18N::LangTags, I18N::LangTags::List, IO, IPC::Open2, IPC::Open3,
-Locale::Constants, Locale::Country, Locale::Currency, Locale::Language,
-Locale::Maketext, Locale::Maketext::TPJ13, Math::BigFloat, Math::BigInt,
-Math::BigInt::Calc, Math::Complex, Math::Trig, Memoize,
-Memoize::AnyDBM_File, Memoize::Expire, Memoize::ExpireFile,
-Memoize::ExpireTest, Memoize::NDBM_File, Memoize::SDBM_File,
-Memoize::Saves, Memoize::Storable, NDBM_File, NEXT, Net::Cmd, Net::Config,
-Net::Domain, Net::FTP, Net::NNTP, Net::Netrc, Net::POP3, Net::Ping,
-Net::SMTP, Net::Time, Net::hostent, Net::libnetFAQ, Net::netent,
-Net::protoent, Net::servent, O, ODBM_File, Opcode, POSIX, PerlIO,
-Pod::Checker, Pod::Find, Pod::Html, Pod::InputObjects, Pod::LaTeX,
+Lingua::KO::Hangul::Util, Locale::Constants, Locale::Country,
+Locale::Currency, Locale::Language, Locale::Maketext,
+Locale::Maketext::TPJ13, Math::BigFloat, Math::BigInt, Math::BigInt::Calc,
+Math::Complex, Math::Trig, Memoize, Memoize::AnyDBM_File, Memoize::Expire,
+Memoize::ExpireFile, Memoize::ExpireTest, Memoize::NDBM_File,
+Memoize::SDBM_File, Memoize::Saves, Memoize::Storable, NDBM_File, NEXT,
+Net::Cmd, Net::Config, Net::Domain, Net::FTP, Net::NNTP, Net::Netrc,
+Net::POP3, Net::Ping, Net::SMTP, Net::Time, Net::hostent, Net::libnetFAQ,
+Net::netent, Net::protoent, Net::servent, O, ODBM_File, Opcode, POSIX,
+PerlIO, Pod::Checker, Pod::Find, Pod::Html, Pod::InputObjects, Pod::LaTeX,
 Pod::Man, Pod::ParseUtils, Pod::Parser, Pod::Plainer, Pod::Select,
 Pod::Text, Pod::Text::Color, Pod::Text::Overstrike, Pod::Text::Termcap,
 Pod::Usage, SDBM_File, Safe, Search::Dict, SelectSaver, SelfLoader, Shell,
 Socket, Storable, Switch, Symbol, Term::ANSIColor, Term::Cap,
 Term::Complete, Term::ReadLine, Test, Test::Harness, Test::More,
-Test::Simple, Text::Abbrev, Text::Balanced, Text::ParseWords,
-Text::Soundex, Text::Tabs, Text::Wrap, Thread, Thread::Queue,
-Thread::Semaphore, Thread::Signal, Thread::Specific, Tie::Array,
+Test::Simple, Test::Tutorial, Text::Abbrev, Text::Balanced,
+Text::ParseWords, Text::Soundex, Text::Tabs, Text::Wrap, Tie::Array,
 Tie::Handle, Tie::Hash, Tie::RefHash, Tie::Scalar, Tie::SubstrHash,
-Time::Local, Time::gmtime, Time::localtime, Time::tm, UNIVERSAL, UnicodeCD,
-User::grent, User::pwent, Win32
+Time::Local, Time::gmtime, Time::localtime, Time::tm, UNIVERSAL,
+Unicode::Collate, Unicode::Normalize, Unicode::UCD, User::grent,
+User::pwent, Win32
 
 =item Extension Modules
 
@@ -2354,8 +2359,8 @@ tarball, Announce to the modules list, Announce to clpa, Fix bugs!
 
 =back
 
-=head2 perlfaq1 - General Questions About Perl ($Revision: 1.23 $, $Date:
-1999/05/23 16:08:30 $)
+=head2 perlfaq1 - General Questions About Perl ($Revision: 1.1 $, $Date:
+2001/09/20 03:03:00 $)
 
 =over 4
 
@@ -2401,8 +2406,8 @@ Scheme, or Tcl?
 
 =back
 
-=head2 perlfaq2 - Obtaining and Learning about Perl ($Revision: 1.32 $,
-$Date: 1999/10/14 18:46:09 $)
+=head2 perlfaq2 - Obtaining and Learning about Perl ($Revision: 1.1 $,
+$Date: 2001/09/20 03:03:00 $)
 
 =over 4
 
@@ -2457,8 +2462,8 @@ References, Tutorials, Task-Oriented, Special Topics
 
 =back
 
-=head2 perlfaq3 - Programming Tools ($Revision: 1.38 $, $Date: 1999/05/23
-16:08:30 $)
+=head2 perlfaq3 - Programming Tools ($Revision: 1.1 $, $Date: 2001/09/20
+03:03:00 $)
 
 =over 4
 
@@ -2542,8 +2547,8 @@ mean?
 
 =back
 
-=head2 perlfaq4 - Data Manipulation ($Revision: 1.49 $, $Date: 1999/05/23
-20:37:49 $)
+=head2 perlfaq4 - Data Manipulation ($Revision: 1.1 $, $Date: 2001/09/20
+03:03:00 $)
 
 =over 4
 
@@ -2752,8 +2757,8 @@ array of hashes or arrays?
 
 =back
 
-=head2 perlfaq5 - Files and Formats ($Revision: 1.38 $, $Date: 1999/05/23
-16:08:30 $)
+=head2 perlfaq5 - Files and Formats ($Revision: 1.1 $, $Date: 2001/09/20
+03:03:00 $)
 
 =over 4
 
@@ -2845,7 +2850,7 @@ protected files?  Isn't this a bug in Perl?
 
 =back
 
-=head2 perlfaq6 - Regexes ($Revision: 1.27 $, $Date: 1999/05/23 16:08:30 $)
+=head2 perlfaq6 - Regexes ($Revision: 1.1 $, $Date: 2001/09/20 03:03:00 $)
 
 =over 4
 
@@ -2911,8 +2916,8 @@ file?
 
 =back
 
-=head2 perlfaq7 - Perl Language Issues ($Revision: 1.28 $, $Date:
-1999/05/23 20:36:18 $)
+=head2 perlfaq7 - Perl Language Issues ($Revision: 1.1 $, $Date: 2001/09/20
+03:03:00 $)
 
 =over 4
 
@@ -2990,8 +2995,8 @@ is in scope?
 
 =back
 
-=head2 perlfaq8 - System Interaction ($Revision: 1.39 $, $Date: 1999/05/23
-18:37:57 $)
+=head2 perlfaq8 - System Interaction ($Revision: 1.1 $, $Date: 2001/09/20
+03:03:00 $)
 
 =over 4
 
@@ -3118,7 +3123,7 @@ search path?
 
 =back
 
-=head2 perlfaq9 - Networking ($Revision: 1.26 $, $Date: 1999/05/23 16:08:30
+=head2 perlfaq9 - Networking ($Revision: 1.1 $, $Date: 2001/09/20 03:03:00
 $)
 
 =over 4
@@ -4119,9 +4124,7 @@ PerlIO_apply_layers(f,mode,layers), PerlIO_binmode(f,ptype,imode,layers),
 
 =item Overloadable regex assertions
 
-=item Unicode case mappings 
-
-=item Unicode regular expression character classes
+=item Unicode
 
 =item use Thread for iThreads
 
@@ -6912,6 +6915,33 @@ method, locked
 
 =back
 
+=head2 threads - Perl extension allowing use of interpreter based threads
+from perl
+
+=over 4
+
+=item SYNOPSIS
+
+=item DESCRIPTION
+
+new, function, LIST, $threads->join, $threads->detach, threads->self,
+$threads->tid
+
+=item TODO
+
+Fix so the return value is returned when you join, Add join_all, Fix memory
+leaks!
+
+=item AUTHOR and COPYRIGHT
+
+=item BUGS
+
+creating a thread from within a thread is unsafe under win32
+
+=item SEE ALSO
+
+=back
+
 =head2 attributes - get/set subroutine or variable attributes
 
 =over 4
@@ -7362,6 +7392,33 @@ C<strict refs>, C<strict vars>, C<strict subs>
 
 =back
 
+=head2 threads - Perl extension allowing use of interpreter based threads
+from perl
+
+=over 4
+
+=item SYNOPSIS
+
+=item DESCRIPTION
+
+new, function, LIST, $threads->join, $threads->detach, threads->self,
+$threads->tid
+
+=item TODO
+
+Fix so the return value is returned when you join, Add join_all, Fix memory
+leaks!
+
+=item AUTHOR and COPYRIGHT
+
+=item BUGS
+
+creating a thread from within a thread is unsafe under win32
+
+=item SEE ALSO
+
+=back
+
 =head2 utf8 - Perl pragma to enable/disable UTF-8 (or UTF-EBCDIC) in source
 code
 
@@ -9672,7 +9729,7 @@ cat
 
 eqtime src dst
 
-rm_f files...
+rm_rf files...
 
 rm_f files...
 
@@ -15394,6 +15451,40 @@ L<Test::Harness>
 
 =back
 
+=head2 Test::Tutorial - A tutorial about writing really basic tests
+
+=over 4
+
+=item DESCRIPTION
+
+=over 4
+
+=item Nuts and bolts of testing.
+
+=item Where to start?
+
+=item Names
+
+=item Test the manual
+
+=item Sometimes the tests are wrong
+
+=item Testing lots of values
+
+=item Informative names
+
+=item Skipping tests
+
+=item Todo tests
+
+=item Testing with taint mode.
+
+=back
+
+=item FOOTNOTES
+
+=back
+
 =head2 Text::Abbrev, abbrev - create an abbreviation table from a list
 
 =over 4
diff --git a/uconfig.h b/uconfig.h
index be964ad77d..d2eeb001fc 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -1687,12 +1687,6 @@
 /*#define HAS_NTOHL		/ **/
 /*#define HAS_NTOHS		/ **/
 
-/* HAS_ICONV:
- *	This symbol, if defined, indicates that the iconv routine is
- *	available to do character set conversions.
- */
-/*#define HAS_ICONV		/ **/
-
 /* HAS_INT64_T:
  *     This symbol will defined if the C compiler supports int64_t.
  *     Usually the <inttypes.h> needs to be included, but sometimes
@@ -2512,12 +2506,6 @@
 /*#define I_GRP		/ **/
 /*#define GRPASSWD	/ **/
 
-/* I_ICONV:
- *	This symbol, if defined, indicates that <iconv.h> exists and
- *	should be included.
- */
-/*#define	I_ICONV		/ **/
-
 /* I_IEEEFP:
  *	This symbol, if defined, indicates that <ieeefp.h> exists and
  *	should be included.
diff --git a/uconfig.sh b/uconfig.sh
index 4e30aedb9e..634f3e7050 100755
--- a/uconfig.sh
+++ b/uconfig.sh
@@ -147,7 +147,6 @@ d_gnulibc='undef'
 d_grpasswd='undef'
 d_hasmntopt='undef'
 d_htonl='undef'
-d_iconv='undef'
 d_index='undef'
 d_inetaton='undef'
 d_int64_t='undef'
@@ -401,7 +400,6 @@ i_fp='undef'
 i_fp_class='undef'
 i_gdbm='undef'
 i_grp='undef'
-i_iconv='undef'
 i_ieeefp='undef'
 i_inttypes='undef'
 i_langinfo='undef'
diff --git a/vos/config.alpha.def b/vos/config.alpha.def
index 5dd17a9e60..961dfbe4c0 100644
--- a/vos/config.alpha.def
+++ b/vos/config.alpha.def
@@ -130,7 +130,6 @@ $d_gnulibc='undef'
 $d_grpasswd='undef'
 $d_hasmntopt='undef'
 $d_htonl='define'
-$d_iconv='undef'
 $d_index='undef'
 $d_inetaton='undef'
 $d_int64_t='undef'
@@ -359,7 +358,6 @@ $i_float='define'
 $i_fp='undef'
 $i_fp_class='undef'
 $i_grp='define'
-$i_iconv='undef'
 $i_ieeefp='undef'
 $i_inttypes='undef'
 $i_langinfo='undef'
diff --git a/vos/config.alpha.h b/vos/config.alpha.h
index b7e221ac99..bb9f668384 100644
--- a/vos/config.alpha.h
+++ b/vos/config.alpha.h
@@ -922,15 +922,6 @@
 #define	_(args) ()
 #endif
 
-/* SH_PATH:
- *	This symbol contains the full pathname to the shell used on this
- *	on this system to execute Bourne shell scripts.  Usually, this will be
- *	/bin/sh, though it's possible that some systems will have /bin/ksh,
- *	/bin/pdksh, /bin/ash, /bin/bash, or even something such as
- *	D:/bin/sh.exe.
- */
-#define SH_PATH "/bin/sh"  /**/
-
 /* INTSIZE:
  *	This symbol contains the value of sizeof(int) so that the C
  *	preprocessor can make decisions based on it.
@@ -1387,24 +1378,6 @@
  */
 /*#define HAS_FPCLASSIFY		/**/
 
-/* HAS_FPCLASSL:
- *	This symbol, if defined, indicates that the fpclassl routine is
- *	available to classify long doubles.  Available for example in IRIX.
- *	The returned values are defined in <ieeefp.h> and are:
- *
- *	FP_SNAN		signaling NaN
- *	FP_QNAN		quiet NaN
- *	FP_NINF		negative infinity
- *	FP_PINF		positive infinity
- *	FP_NDENORM	negative denormalized non-zero
- *	FP_PDENORM	positive denormalized non-zero
- *	FP_NZERO	negative zero
- *	FP_PZERO	positive zero
- *	FP_NNORM	negative normalized non-zero
- *	FP_PNORM	positive normalized non-zero
- */
-/*#define HAS_FPCLASSL		/**/
-
 /* HAS_FPOS64_T:
  *	This symbol will be defined if the C compiler supports fpos64_t.
  */
@@ -1714,12 +1687,6 @@
 #define HAS_NTOHL		/**/
 #define HAS_NTOHS		/**/
 
-/* HAS_ICONV:
- *	This symbol, if defined, indicates that the iconv routine is
- *	available to do character set conversions.
- */
-/*#define HAS_ICONV		/**/
-
 /* HAS_INT64_T:
  *     This symbol will defined if the C compiler supports int64_t.
  *     Usually the <inttypes.h> needs to be included, but sometimes
@@ -2539,12 +2506,6 @@
 #define I_GRP		/**/
 /*#define GRPASSWD	/**/
 
-/* I_ICONV:
- *	This symbol, if defined, indicates that <iconv.h> exists and
- *	should be included.
- */
-/*#define	I_ICONV		/**/
-
 /* I_IEEEFP:
  *	This symbol, if defined, indicates that <ieeefp.h> exists and
  *	should be included.
@@ -3344,7 +3305,7 @@
 /*#define	USE_5005THREADS		/**/
 /*#define	USE_ITHREADS		/**/
 #if defined(USE_5005THREADS) && !defined(USE_ITHREADS)
-#define		USE_5005THREADS		/* until src is revised*/
+#define		USE_THREADS		/* until src is revised*/
 #endif
 /*#define	OLD_PTHREADS_API		/**/
 /*#define	USE_REENTRANT_API	/**/
@@ -3470,6 +3431,15 @@
 #define I_STDARG		/**/
 /*#define I_VARARGS	/**/
 
+/* SH_PATH:
+ *	This symbol contains the full pathname to the shell used on this
+ *	on this system to execute Bourne shell scripts.  Usually, this will be
+ *	/bin/sh, though it's possible that some systems will have /bin/ksh,
+ *	/bin/pdksh, /bin/ash, /bin/bash, or even something such as
+ *	D:/bin/sh.exe.
+ */
+#define SH_PATH "/bin/sh"  /**/
+
 /* USE_CROSS_COMPILE:
  *	This symbol, if defined, indicates that Perl is being cross-compiled.
  */
@@ -3498,6 +3468,24 @@
  */
 /*#define	HAS_FLOCK_PROTO	/**/
 
+/* HAS_FPCLASSL:
+ *	This symbol, if defined, indicates that the fpclassl routine is
+ *	available to classify long doubles.  Available for example in IRIX.
+ *	The returned values are defined in <ieeefp.h> and are:
+ *
+ *	FP_SNAN		signaling NaN
+ *	FP_QNAN		quiet NaN
+ *	FP_NINF		negative infinity
+ *	FP_PINF		positive infinity
+ *	FP_NDENORM	negative denormalized non-zero
+ *	FP_PDENORM	positive denormalized non-zero
+ *	FP_NZERO	negative zero
+ *	FP_PZERO	positive zero
+ *	FP_NNORM	negative normalized non-zero
+ *	FP_PNORM	positive normalized non-zero
+ */
+/*#define HAS_FPCLASSL		/**/
+
 /* HAS_NL_LANGINFO:
  *	This symbol, if defined, indicates that the nl_langinfo routine is
  *	available to return local data.  You will also need <langinfo.h>
diff --git a/vos/config.ga.def b/vos/config.ga.def
index ab92d19a59..de617ac407 100644
--- a/vos/config.ga.def
+++ b/vos/config.ga.def
@@ -130,7 +130,6 @@ $d_gnulibc='undef'
 $d_grpasswd='undef'
 $d_hasmntopt='undef'
 $d_htonl='define'
-$d_iconv='undef'
 $d_index='undef'
 $d_inetaton='undef'
 $d_int64_t='undef'
@@ -359,7 +358,6 @@ $i_float='define'
 $i_fp='undef'
 $i_fp_class='undef'
 $i_grp='define'
-$i_iconv='undef'
 $i_ieeefp='undef'
 $i_inttypes='undef'
 $i_langinfo='undef'
diff --git a/vos/config.ga.h b/vos/config.ga.h
index 930420519c..a3e952da23 100644
--- a/vos/config.ga.h
+++ b/vos/config.ga.h
@@ -922,15 +922,6 @@
 #define	_(args) ()
 #endif
 
-/* SH_PATH:
- *	This symbol contains the full pathname to the shell used on this
- *	on this system to execute Bourne shell scripts.  Usually, this will be
- *	/bin/sh, though it's possible that some systems will have /bin/ksh,
- *	/bin/pdksh, /bin/ash, /bin/bash, or even something such as
- *	D:/bin/sh.exe.
- */
-#define SH_PATH "/system/gnu_library/bin/bash.pm"  /**/
-
 /* INTSIZE:
  *	This symbol contains the value of sizeof(int) so that the C
  *	preprocessor can make decisions based on it.
@@ -1387,24 +1378,6 @@
  */
 /*#define HAS_FPCLASSIFY		/**/
 
-/* HAS_FPCLASSL:
- *	This symbol, if defined, indicates that the fpclassl routine is
- *	available to classify long doubles.  Available for example in IRIX.
- *	The returned values are defined in <ieeefp.h> and are:
- *
- *	FP_SNAN		signaling NaN
- *	FP_QNAN		quiet NaN
- *	FP_NINF		negative infinity
- *	FP_PINF		positive infinity
- *	FP_NDENORM	negative denormalized non-zero
- *	FP_PDENORM	positive denormalized non-zero
- *	FP_NZERO	negative zero
- *	FP_PZERO	positive zero
- *	FP_NNORM	negative normalized non-zero
- *	FP_PNORM	positive normalized non-zero
- */
-/*#define HAS_FPCLASSL		/**/
-
 /* HAS_FPOS64_T:
  *	This symbol will be defined if the C compiler supports fpos64_t.
  */
@@ -1714,12 +1687,6 @@
 #define HAS_NTOHL		/**/
 #define HAS_NTOHS		/**/
 
-/* HAS_ICONV:
- *	This symbol, if defined, indicates that the iconv routine is
- *	available to do character set conversions.
- */
-/*#define HAS_ICONV		/**/
-
 /* HAS_INT64_T:
  *     This symbol will defined if the C compiler supports int64_t.
  *     Usually the <inttypes.h> needs to be included, but sometimes
@@ -2539,12 +2506,6 @@
 #define I_GRP		/**/
 /*#define GRPASSWD	/**/
 
-/* I_ICONV:
- *	This symbol, if defined, indicates that <iconv.h> exists and
- *	should be included.
- */
-/*#define	I_ICONV		/**/
-
 /* I_IEEEFP:
  *	This symbol, if defined, indicates that <ieeefp.h> exists and
  *	should be included.
@@ -3344,7 +3305,7 @@
 /*#define	USE_5005THREADS		/**/
 /*#define	USE_ITHREADS		/**/
 #if defined(USE_5005THREADS) && !defined(USE_ITHREADS)
-#define		USE_5005THREADS		/* until src is revised*/
+#define		USE_THREADS		/* until src is revised*/
 #endif
 /*#define	OLD_PTHREADS_API		/**/
 /*#define	USE_REENTRANT_API	/**/
@@ -3470,6 +3431,15 @@
 #define I_STDARG		/**/
 /*#define I_VARARGS	/**/
 
+/* SH_PATH:
+ *	This symbol contains the full pathname to the shell used on this
+ *	on this system to execute Bourne shell scripts.  Usually, this will be
+ *	/bin/sh, though it's possible that some systems will have /bin/ksh,
+ *	/bin/pdksh, /bin/ash, /bin/bash, or even something such as
+ *	D:/bin/sh.exe.
+ */
+#define SH_PATH "/system/gnu_library/bin/bash.pm"  /**/
+
 /* USE_CROSS_COMPILE:
  *	This symbol, if defined, indicates that Perl is being cross-compiled.
  */
@@ -3498,6 +3468,24 @@
  */
 /*#define	HAS_FLOCK_PROTO	/**/
 
+/* HAS_FPCLASSL:
+ *	This symbol, if defined, indicates that the fpclassl routine is
+ *	available to classify long doubles.  Available for example in IRIX.
+ *	The returned values are defined in <ieeefp.h> and are:
+ *
+ *	FP_SNAN		signaling NaN
+ *	FP_QNAN		quiet NaN
+ *	FP_NINF		negative infinity
+ *	FP_PINF		positive infinity
+ *	FP_NDENORM	negative denormalized non-zero
+ *	FP_PDENORM	positive denormalized non-zero
+ *	FP_NZERO	negative zero
+ *	FP_PZERO	positive zero
+ *	FP_NNORM	negative normalized non-zero
+ *	FP_PNORM	positive normalized non-zero
+ */
+/*#define HAS_FPCLASSL		/**/
+
 /* HAS_NL_LANGINFO:
  *	This symbol, if defined, indicates that the nl_langinfo routine is
  *	available to return local data.  You will also need <langinfo.h>
diff --git a/win32/config.bc b/win32/config.bc
index fd795a05b6..8d5c2afe97 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -200,7 +200,6 @@ d_gnulibc='undef'
 d_grpasswd='undef'
 d_hasmntopt='undef'
 d_htonl='define'
-d_iconv='undef'
 d_index='undef'
 d_inetaton='undef'
 d_int64_t='undef'
@@ -476,7 +475,6 @@ i_fp='undef'
 i_fp_class='undef'
 i_gdbm='undef'
 i_grp='undef'
-i_iconv='undef'
 i_ieeefp='undef'
 i_inttypes='undef'
 i_langinfo='undef'
diff --git a/win32/config.gc b/win32/config.gc
index 1cd02b2c50..58645c24c3 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -200,7 +200,6 @@ d_gnulibc='undef'
 d_grpasswd='undef'
 d_hasmntopt='undef'
 d_htonl='define'
-d_iconv='undef'
 d_index='undef'
 d_inetaton='undef'
 d_int64_t='undef'
@@ -476,7 +475,6 @@ i_fp='undef'
 i_fp_class='undef'
 i_gdbm='undef'
 i_grp='undef'
-i_iconv='undef'
 i_ieeefp='undef'
 i_inttypes='undef'
 i_langinfo='undef'
diff --git a/win32/config.vc b/win32/config.vc
index d946051b06..8e27c859cb 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -200,7 +200,6 @@ d_gnulibc='undef'
 d_grpasswd='undef'
 d_hasmntopt='undef'
 d_htonl='define'
-d_iconv='undef'
 d_index='undef'
 d_inetaton='undef'
 d_int64_t='undef'
@@ -476,7 +475,6 @@ i_fp='undef'
 i_fp_class='undef'
 i_gdbm='undef'
 i_grp='undef'
-i_iconv='undef'
 i_ieeefp='undef'
 i_inttypes='undef'
 i_langinfo='undef'
diff --git a/win32/config_H.bc b/win32/config_H.bc
index b35e4ac00a..7b583d6945 100644
--- a/win32/config_H.bc
+++ b/win32/config_H.bc
@@ -1615,12 +1615,6 @@
 #define HAS_NTOHL		/**/
 #define HAS_NTOHS		/**/
 
-/* HAS_ICONV:
- *	This symbol, if defined, indicates that the iconv routine is
- *	available to do character set conversions.
- */
-/*#define HAS_ICONV		/**/
-
 /* HAS_INT64_T:
  *     This symbol will defined if the C compiler supports int64_t.
  *     Usually the <inttypes.h> needs to be included, but sometimes
@@ -2415,12 +2409,6 @@
 /*#define I_GRP		/**/
 /*#define GRPASSWD	/**/
 
-/* I_ICONV:
- *	This symbol, if defined, indicates that <iconv.h> exists and
- *	should be included.
- */
-/*#define	I_ICONV		/**/
-
 /* I_IEEEFP:
  *	This symbol, if defined, indicates that <ieeefp.h> exists and
  *	should be included.
diff --git a/win32/config_H.gc b/win32/config_H.gc
index f06db24076..061acfce71 100644
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -1615,12 +1615,6 @@
 #define HAS_NTOHL		/**/
 #define HAS_NTOHS		/**/
 
-/* HAS_ICONV:
- *	This symbol, if defined, indicates that the iconv routine is
- *	available to do character set conversions.
- */
-/*#define HAS_ICONV		/**/
-
 /* HAS_INT64_T:
  *     This symbol will defined if the C compiler supports int64_t.
  *     Usually the <inttypes.h> needs to be included, but sometimes
@@ -2415,12 +2409,6 @@
 /*#define I_GRP		/**/
 /*#define GRPASSWD	/**/
 
-/* I_ICONV:
- *	This symbol, if defined, indicates that <iconv.h> exists and
- *	should be included.
- */
-/*#define	I_ICONV		/**/
-
 /* I_IEEEFP:
  *	This symbol, if defined, indicates that <ieeefp.h> exists and
  *	should be included.
diff --git a/win32/config_H.vc b/win32/config_H.vc
index deab1204bb..9eb865ad0a 100644
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -1615,12 +1615,6 @@
 #define HAS_NTOHL		/**/
 #define HAS_NTOHS		/**/
 
-/* HAS_ICONV:
- *	This symbol, if defined, indicates that the iconv routine is
- *	available to do character set conversions.
- */
-/*#define HAS_ICONV		/**/
-
 /* HAS_INT64_T:
  *     This symbol will defined if the C compiler supports int64_t.
  *     Usually the <inttypes.h> needs to be included, but sometimes
@@ -2415,12 +2409,6 @@
 /*#define I_GRP		/**/
 /*#define GRPASSWD	/**/
 
-/* I_ICONV:
- *	This symbol, if defined, indicates that <iconv.h> exists and
- *	should be included.
- */
-/*#define	I_ICONV		/**/
-
 /* I_IEEEFP:
  *	This symbol, if defined, indicates that <ieeefp.h> exists and
  *	should be included.
diff --git a/wince/config.ce b/wince/config.ce
index 1b83048f72..57b3ca6bb4 100644
--- a/wince/config.ce
+++ b/wince/config.ce
@@ -192,7 +192,6 @@ d_gnulibc='undef'
 d_grpasswd='undef'
 d_hasmntopt='undef'
 d_htonl='define'
-d_iconv='undef'
 d_index='undef'
 d_inetaton='undef'
 d_int64_t='undef'
@@ -444,7 +443,6 @@ i_fp='undef'
 i_fp_class='undef'
 i_gdbm='undef'
 i_grp='undef'
-i_iconv='undef'
 i_ieeefp='undef'
 i_inttypes='undef'
 i_limits='define'
diff --git a/wince/config.h b/wince/config.h
index 356f77b777..dbb40198f4 100644
--- a/wince/config.h
+++ b/wince/config.h
@@ -1615,12 +1615,6 @@
 #define HAS_NTOHL		/**/
 #define HAS_NTOHS		/**/
 
-/* HAS_ICONV:
- *	This symbol, if defined, indicates that the iconv routine is
- *	available to do character set conversions.
- */
-/*#define HAS_ICONV		/**/
-
 /* HAS_INT64_T:
  *     This symbol will defined if the C compiler supports int64_t.
  *     Usually the <inttypes.h> needs to be included, but sometimes
@@ -2415,12 +2409,6 @@
 /*#define I_GRP		/**/
 /*#define GRPASSWD	/**/
 
-/* I_ICONV:
- *	This symbol, if defined, indicates that <iconv.h> exists and
- *	should be included.
- */
-/*#define	I_ICONV		/**/
-
 /* I_IEEEFP:
  *	This symbol, if defined, indicates that <ieeefp.h> exists and
  *	should be included.
diff --git a/wince/config_H.ce b/wince/config_H.ce
index e39045ff11..622ccda788 100644
--- a/wince/config_H.ce
+++ b/wince/config_H.ce
@@ -1609,12 +1609,6 @@
 #define HAS_NTOHL		/**/
 #define HAS_NTOHS		/**/
 
-/* HAS_ICONV:
- *	This symbol, if defined, indicates that the iconv routine is
- *	available to do character set conversions.
- */
-/*#define HAS_ICONV		/**/
-
 /* HAS_INT64_T:
  *     This symbol will defined if the C compiler supports int64_t.
  *     Usually the <inttypes.h> needs to be included, but sometimes
@@ -2268,12 +2262,6 @@
 /*#define I_GRP		/**/
 /*#define GRPASSWD	/**/
 
-/* I_ICONV:
- *	This symbol, if defined, indicates that <iconv.h> exists and
- *	should be included.
- */
-/*#define	I_ICONV		/**/
-
 /* I_IEEEFP:
  *	This symbol, if defined, indicates that <ieeefp.h> exists and
  *	should be included.