Integrate:

[ 22334]
Removed pm_apiversion and xs_apiversion as requested by
the pumpkin. Chainsaw was still in perfect working order.
p4raw-link: @22334 on //depot/perl: e67cea9b6f4e5e16535851ce33a456c282242f0d

p4raw-id: //depot/maint-5.8/perl@22628
p4raw-integrated: from //depot/perl@22627 'copy in' uconfig.h
	uconfig.sh (@20646..) Cross/config.sh-arm-linux (@21985..)
	'merge in' NetWare/config.wc plan9/config_sh.sample (@19607..)
	plan9/config_h.sample (@19608..) win32/config.vc64
	wince/config_H.ce (@19899..) wince/config.ce (@20031..)
	Porting/Glossary (@20419..) win32/config.bc win32/config.gc
	win32/config.vc (@21881..)
p4raw-edited: from //depot/perl@22334 'edit in' config_h.SH (@21957..)
	Configure (@22314..) NetWare/config_H.wc Porting/config.sh
	Porting/config_H plan9/config.plan9 win32/config_H.bc
	win32/config_H.gc win32/config_H.vc win32/config_H.vc64
	(@22318..)
p4raw-integrated: from //depot/perl@22334 'merge in' configure.com
	(@22173..) epoc/config.sh (@22318..)

26 files changed, 10 insertions, 452 deletions

diff --git a/Configure b/Configure
index f39c1015b6..c391004f84 100755
--- a/Configure
+++ b/Configure
@@ -20,8 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Thu Feb 26 10:02:07 MET 2004 [metaconfig 3.0 PL70]
-# But forked for maint because maint must keep the APIVERSION macros
+# Generated on Wed Feb 18 12:49:17 MET 2004 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
@@ -1175,8 +1174,6 @@ vendorscriptexp=''
 versiononly=''
 defvoidused=''
 voidflags=''
-pm_apiversion=''
-xs_apiversion=''
 yacc=''
 yaccflags=''
 CONFIG=''
@@ -18668,12 +18665,6 @@ rp="What is the type of process ids on this system?"
 set pid_t pidtype int stdio.h sys/types.h
 eval $typedef_ask
 
-: Find earliest binary compatible site_perl subdirectory perl can use.
-xs_apiversion=$version # The current site_perl version.
-: Find earliest pure perl site_perl subdirectory perl can use.
-: The versioned directories started at 5.005.
-pm_apiversion='5.005'
-
 : see if ar generates random libraries by itself
 echo " "
 echo "Checking how to generate random libraries on your machine..." >&4
@@ -21235,7 +21226,6 @@ pg='$pg'
 phostname='$phostname'
 pidtype='$pidtype'
 plibpth='$plibpth'
-pm_apiversion='$pm_apiversion'
 pmake='$pmake'
 pr='$pr'
 prefix='$prefix'
@@ -21437,7 +21427,6 @@ versiononly='$versiononly'
 vi='$vi'
 voidflags='$voidflags'
 xlibpth='$xlibpth'
-xs_apiversion='$xs_apiversion'
 yacc='$yacc'
 yaccflags='$yaccflags'
 zcat='$zcat'
diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux
index 64ffc74a47..551f80f518 100644
--- a/Cross/config.sh-arm-linux
+++ b/Cross/config.sh-arm-linux
@@ -804,7 +804,6 @@ pg='pg'
 phostname='hostname'
 pidtype='pid_t'
 plibpth=''
-pm_apiversion='5.005'
 pmake=''
 pr=''
 prefix='/usr'
@@ -1006,7 +1005,6 @@ versiononly='undef'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
-xs_apiversion='5.8.3'
 yacc='yacc'
 yaccflags=''
 zcat=''
diff --git a/NetWare/config.wc b/NetWare/config.wc
index afbdfd9178..745c6b5f21 100644
--- a/NetWare/config.wc
+++ b/NetWare/config.wc
@@ -732,7 +732,6 @@ pg=''
 phostname='hostname'
 pidtype='int'
 plibpth=''
-pm_apiversion='5.005'
 pmake=''
 pr=''
 prefix='~INST_TOP~'
@@ -908,7 +907,6 @@ version='~VERSION~'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
-xs_apiversion='5.6.0'
 zcat=''
 zip='zip'
 PERL_REVISION='~PERL_REVISION~'
diff --git a/NetWare/config_H.wc b/NetWare/config_H.wc
index c2e0c2e635..a9d047f683 100644
--- a/NetWare/config_H.wc
+++ b/NetWare/config_H.wc
@@ -3298,41 +3298,6 @@
 #define M_VOID			/* Xenix strikes again */
 #endif
 
-/* PERL_XS_APIVERSION:
- *	This variable contains the version of the oldest perl binary
- *	compatible with the present perl.  perl.c:incpush() and
- *	lib/lib.pm will automatically search in c:\\perl\\site\\5.8.0\\lib\\NetWare-x86-multi-thread for older
- *	directories across major versions back to xs_apiversion.
- *	This is only useful if you have a perl library directory tree
- *	structured like the default one.
- *	See INSTALL for how this works.
- *	The versioned site_perl directory was introduced in 5.005,
- *	so that is the lowest possible value.
- *	Since this can depend on compile time options
- *	it is set by Configure.  Other non-default sources
- *	of potential incompatibility, such as multiplicity, threads,
- *	debugging, 64bits, sfio, etc., are not checked for currently,
- *	though in principle we could go snooping around in old
- *	Config.pm files.
- */
-/* PERL_PM_APIVERSION:
- *	This variable contains the version of the oldest perl
- *	compatible with the present perl.  (That is, pure perl modules
- *	written for pm_apiversion will still work for the current
- *	version).  perl.c:incpush() and lib/lib.pm will automatically
- *	search in c:\\perl\\site\\5.8.0\\lib for older directories across major versions
- *	back to pm_apiversion.  This is only useful if you have a perl
- *	library directory tree structured like the default one.  The
- *	versioned site_perl library was introduced in 5.005, so that's
- *	the default setting for this variable.  It's hard to imagine
- *	it changing before Perl6.  It is included here for symmetry
- *	with xs_apiveprsion -- the searching algorithms will
- *	(presumably) be similar.
- *	See the INSTALL file for how this works.
- */
-#define PERL_XS_APIVERSION "5.8.0"
-#define PERL_PM_APIVERSION "5.005"
-
 /* SETUID_SCRIPTS_ARE_SECURE_NOW:
  *	This symbol, if defined, indicates that the bug that prevents
  *	setuid scripts from being secure is not present in this kernel.
diff --git a/Porting/Glossary b/Porting/Glossary
index 0785bd054b..0ec15aff1f 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -3805,21 +3805,6 @@ plibpth (libpth.U):
 	Its value is prepend to libpth. This variable takes care of special
 	machines, like the mips.  Usually, it should be empty.
 
-pm_apiversion (xs_apiversion.U):
-	This variable contains the version of the oldest perl
-	compatible with the present perl.  (That is, pure perl modules
-	written for $pm_apiversion will still work for the current
-	version).  perl.c:incpush() and lib/lib.pm will automatically
-	search in $sitelib for older directories across major versions
-	back to pm_apiversion.  This is only useful if you have a perl
-	library directory tree structured like the default one.  The
-	versioned site_perl library was introduced in 5.005, so that's
-	the default setting for this variable.  It's hard to imagine
-	it changing before Perl6.  It is included here for symmetry
-	with xs_apiveprsion -- the searching algorithms will
-	(presumably) be similar.
-	See the INSTALL file for how this works.
-
 pmake (Loc.U):
 	This variable is defined but not used by Configure.
 	The value is a plain '' and is not useful.
@@ -4882,23 +4867,6 @@ xlibpth (libpth.U):
 	libraries on this platform, for example CPU-specific libraries
 	(on multi-CPU platforms) may be listed here.
 
-xs_apiversion (xs_apiversion.U):
-	This variable contains the version of the oldest perl binary
-	compatible with the present perl.  perl.c:incpush() and
-	lib/lib.pm will automatically search in $sitearch for older
-	directories across major versions back to xs_apiversion.
-	This is only useful if you have a perl library directory tree
-	structured like the default one.
-	See INSTALL for how this works.
-	The versioned site_perl directory was introduced in 5.005,
-	so that is the lowest possible value.
-	Since this can depend on compile time options
-	it is set by Configure.  Other non-default sources
-	of potential incompatibility, such as multiplicity, threads,
-	debugging, 64bits, sfio, etc., are not checked for currently,
-	though in principle we could go snooping around in old
-	Config.pm files.
-
 yacc (yacc.U):
 	This variable holds the name of the compiler compiler we
 	want to use in the Makefile. It can be yacc, byacc, or bison -y.
diff --git a/Porting/config.sh b/Porting/config.sh
index c621cc2b3e..f1d388aad5 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -804,7 +804,6 @@ pg='pg'
 phostname=''
 pidtype='pid_t'
 plibpth=''
-pm_apiversion='5.005'
 pmake=''
 pr=''
 prefix='/opt/perl'
@@ -1006,7 +1005,6 @@ versiononly='undef'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
-xs_apiversion='5.8.3'
 yacc='yacc'
 yaccflags=''
 zcat=''
diff --git a/Porting/config_H b/Porting/config_H
index c7fbd55bcf..c5ab77f30c 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -3382,41 +3382,6 @@
 /*#define	USE_SOCKS		/ **/
 #endif
 
-/* PERL_XS_APIVERSION:
- *	This variable contains the version of the oldest perl binary
- *	compatible with the present perl.  perl.c:incpush() and
- *	lib/lib.pm will automatically search in /usr/local/lib/perl5/site_perl/5.8.3/armv4l-linux for older
- *	directories across major versions back to xs_apiversion.
- *	This is only useful if you have a perl library directory tree
- *	structured like the default one.
- *	See INSTALL for how this works.
- *	The versioned site_perl directory was introduced in 5.005,
- *	so that is the lowest possible value.
- *	Since this can depend on compile time options
- *	it is set by Configure.  Other non-default sources
- *	of potential incompatibility, such as multiplicity, threads,
- *	debugging, 64bits, sfio, etc., are not checked for currently,
- *	though in principle we could go snooping around in old
- *	Config.pm files.
- */
-/* PERL_PM_APIVERSION:
- *	This variable contains the version of the oldest perl
- *	compatible with the present perl.  (That is, pure perl modules
- *	written for pm_apiversion will still work for the current
- *	version).  perl.c:incpush() and lib/lib.pm will automatically
- *	search in /usr/local/lib/perl5/site_perl/5.8.3 for older directories across major versions
- *	back to pm_apiversion.  This is only useful if you have a perl
- *	library directory tree structured like the default one.  The
- *	versioned site_perl library was introduced in 5.005, so that's
- *	the default setting for this variable.  It's hard to imagine
- *	it changing before Perl6.  It is included here for symmetry
- *	with xs_apiveprsion -- the searching algorithms will
- *	(presumably) be similar.
- *	See the INSTALL file for how this works.
- */
-#define PERL_XS_APIVERSION "5.8.3"
-#define PERL_PM_APIVERSION "5.005"
-
 /* HAS_DRAND48_PROTO:
  *	This symbol, if defined, indicates that the system provides
  *	a prototype for the drand48() function.  Otherwise, it is up
diff --git a/config_h.SH b/config_h.SH
index 10313d8ffd..18697fb7fb 100644
--- a/config_h.SH
+++ b/config_h.SH
@@ -3411,41 +3411,6 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 #$usesocks	USE_SOCKS		/**/
 #endif
 
-/* PERL_XS_APIVERSION:
- *	This variable contains the version of the oldest perl binary
- *	compatible with the present perl.  perl.c:incpush() and
- *	lib/lib.pm will automatically search in $sitearch for older
- *	directories across major versions back to xs_apiversion.
- *	This is only useful if you have a perl library directory tree
- *	structured like the default one.
- *	See INSTALL for how this works.
- *	The versioned site_perl directory was introduced in 5.005,
- *	so that is the lowest possible value.
- *	Since this can depend on compile time options
- *	it is set by Configure.  Other non-default sources
- *	of potential incompatibility, such as multiplicity, threads,
- *	debugging, 64bits, sfio, etc., are not checked for currently,
- *	though in principle we could go snooping around in old
- *	Config.pm files.
- */
-/* PERL_PM_APIVERSION:
- *	This variable contains the version of the oldest perl
- *	compatible with the present perl.  (That is, pure perl modules
- *	written for pm_apiversion will still work for the current
- *	version).  perl.c:incpush() and lib/lib.pm will automatically
- *	search in $sitelib for older directories across major versions
- *	back to pm_apiversion.  This is only useful if you have a perl
- *	library directory tree structured like the default one.  The
- *	versioned site_perl library was introduced in 5.005, so that's
- *	the default setting for this variable.  It's hard to imagine
- *	it changing before Perl6.  It is included here for symmetry
- *	with xs_apiveprsion -- the searching algorithms will
- *	(presumably) be similar.
- *	See the INSTALL file for how this works.
- */
-#define PERL_XS_APIVERSION "$xs_apiversion"
-#define PERL_PM_APIVERSION "$pm_apiversion"
-
 /* HAS_DRAND48_PROTO:
  *	This symbol, if defined, indicates that the system provides
  *	a prototype for the drand48() function.  Otherwise, it is up
diff --git a/configure.com b/configure.com
index 6180416977..369f8fed47 100644
--- a/configure.com
+++ b/configure.com
@@ -5823,7 +5823,6 @@ $ WC "perl_symbol='" + perl_symbol + "'"  ! VMS specific
 $ WC "perl_verb='" + perl_verb + "'"      ! VMS specific
 $ WC "pgflquota='" + pgflquota + "'"
 $ WC "pidtype='" + pidtype + "'"
-$ WC "pm_apiversion='" + version + "'"
 $ WC "prefix='" + vms_prefix + "'"
 $ WC "prefixexp='" + vms_prefix + ":'"
 $ WC "privlib='" + privlib + "'"
@@ -5954,7 +5953,6 @@ $ WC "vms_cc_type='" + vms_cc_type + "'" ! VMS specific
 $ WC "vms_prefix='" + vms_prefix + "'" ! VMS specific
 $ WC "vms_ver='" + vms_ver + "'" ! VMS specific
 $ WC "voidflags='15'"
-$ WC "xs_apiversion='" + version + "'"
 $ WC "PERL_CONFIG_SH='true'"
 $!
 $! ## The UNIXy POSIXy reentrantey thingys ##
diff --git a/epoc/config.sh b/epoc/config.sh
index 2edacb2bc5..4435a49f8d 100644
--- a/epoc/config.sh
+++ b/epoc/config.sh
@@ -1095,7 +1095,6 @@ mmaptype=''
 revision='5'
 sizesize='4'
 socksizetype='int'
-xs_apiversion='5.005'
 d_getcwd='define'
 i_sysmode='undef'
 d_vendorarch='undef'
diff --git a/perl.h b/perl.h
index f58b8d834e..037aa06971 100644
--- a/perl.h
+++ b/perl.h
@@ -4516,5 +4516,14 @@ extern void moncontrol(int);
 
    so that Configure picks them up. */
 
+/* Source code compatibility cruft:
+   PERL_XS_APIVERSION is not used, and has been superseded by inc_version_list
+   It and PERL_PM_APIVERSION are retained for source compatibility in the
+   5.8.x maintenance branch.
+ */
+
+#define PERL_XS_APIVERSION "5.8.3"
+#define PERL_PM_APIVERSION "5.005"
+
 #endif /* Include guard */
 
diff --git a/plan9/config.plan9 b/plan9/config.plan9
index ef629ff49f..fe98bf4dc0 100644
--- a/plan9/config.plan9
+++ b/plan9/config.plan9
@@ -3729,41 +3729,6 @@
 #define M_VOID			/* Xenix strikes again */
 #endif
 
-/* PERL_XS_APIVERSION:
- *	This variable contains the version of the oldest perl binary
- *	compatible with the present perl.  perl.c:incpush() and
- *	lib/lib.pm will automatically search in /sys/lib/perl/5.8.0/site_perl/386 for older
- *	directories across major versions back to xs_apiversion.
- *	This is only useful if you have a perl library directory tree
- *	structured like the default one.
- *	See INSTALL for how this works.
- *	The versioned site_perl directory was introduced in 5.005,
- *	so that is the lowest possible value.
- *	Since this can depend on compile time options
- *	it is set by Configure.  Other non-default sources
- *	of potential incompatibility, such as multiplicity, threads,
- *	debugging, 64bits, sfio, etc., are not checked for currently,
- *	though in principle we could go snooping around in old
- *	Config.pm files.
- */
-/* PERL_PM_APIVERSION:
- *	This variable contains the version of the oldest perl
- *	compatible with the present perl.  (That is, pure perl modules
- *	written for pm_apiversion will still work for the current
- *	version).  perl.c:incpush() and lib/lib.pm will automatically
- *	search in /sys/lib/perl/5.8.0/site_perl for older directories across major versions
- *	back to pm_apiversion.  This is only useful if you have a perl
- *	library directory tree structured like the default one.  The
- *	versioned site_perl library was introduced in 5.005, so that's
- *	the default setting for this variable.  It's hard to imagine
- *	it changing before Perl6.  It is included here for symmetry
- *	with xs_apiveprsion -- the searching algorithms will
- *	(presumably) be similar.
- *	See the INSTALL file for how this works.
- */
-#define PERL_XS_APIVERSION "5.8.0"
-#define PERL_PM_APIVERSION "5.005"
-
 /* HAS_CRYPT:
  *	This symbol, if defined, indicates that the crypt routine is available
  *	to encrypt passwords and the like.
diff --git a/plan9/config_h.sample b/plan9/config_h.sample
index 8dbae0fae4..7cd24de0df 100644
--- a/plan9/config_h.sample
+++ b/plan9/config_h.sample
@@ -3674,41 +3674,6 @@
 #define M_VOID			/* Xenix strikes again */
 #endif
 
-/* PERL_XS_APIVERSION:
- *	This variable contains the version of the oldest perl binary
- *	compatible with the present perl.  perl.c:incpush() and
- *	lib/lib.pm will automatically search in /sys/lib/perl/5.8.0/site_perl/386 for older
- *	directories across major versions back to xs_apiversion.
- *	This is only useful if you have a perl library directory tree
- *	structured like the default one.
- *	See INSTALL for how this works.
- *	The versioned site_perl directory was introduced in 5.005,
- *	so that is the lowest possible value.
- *	Since this can depend on compile time options
- *	it is set by Configure.  Other non-default sources
- *	of potential incompatibility, such as multiplicity, threads,
- *	debugging, 64bits, sfio, etc., are not checked for currently,
- *	though in principle we could go snooping around in old
- *	Config.pm files.
- */
-/* PERL_PM_APIVERSION:
- *	This variable contains the version of the oldest perl
- *	compatible with the present perl.  (That is, pure perl modules
- *	written for pm_apiversion will still work for the current
- *	version).  perl.c:incpush() and lib/lib.pm will automatically
- *	search in /sys/lib/perl/5.8.0/site_perl for older directories across major versions
- *	back to pm_apiversion.  This is only useful if you have a perl
- *	library directory tree structured like the default one.  The
- *	versioned site_perl library was introduced in 5.005, so that's
- *	the default setting for this variable.  It's hard to imagine
- *	it changing before Perl6.  It is included here for symmetry
- *	with xs_apiveprsion -- the searching algorithms will
- *	(presumably) be similar.
- *	See the INSTALL file for how this works.
- */
-#define PERL_XS_APIVERSION "5.8.0"
-#define PERL_PM_APIVERSION "5.005"
-
 /* HAS_CRYPT:
  *	This symbol, if defined, indicates that the crypt routine is available
  *	to encrypt passwords and the like.
diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample
index 1f0cb3ec12..9b14b391ec 100644
--- a/plan9/config_sh.sample
+++ b/plan9/config_sh.sample
@@ -784,7 +784,6 @@ pg='pg'
 phostname='uname -n'
 pidtype='pid_t'
 plibpth=''
-pm_apiversion='5.005'
 pmake=''
 pr=''
 prefix='/usr'
@@ -966,7 +965,6 @@ versiononly='undef'
 vi=''
 voidflags='15'
 xlibpth=''
-xs_apiversion='5.8.0'
 yacc='yacc'
 yaccflags=''
 zcat=''
diff --git a/uconfig.h b/uconfig.h
index ae3467b858..aa16a5b80f 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -3357,41 +3357,6 @@
 /*#define	USE_SOCKS		/ **/
 #endif
 
-/* PERL_XS_APIVERSION:
- *	This variable contains the version of the oldest perl binary
- *	compatible with the present perl.  perl.c:incpush() and
- *	lib/lib.pm will automatically search in  for older
- *	directories across major versions back to xs_apiversion.
- *	This is only useful if you have a perl library directory tree
- *	structured like the default one.
- *	See INSTALL for how this works.
- *	The versioned site_perl directory was introduced in 5.005,
- *	so that is the lowest possible value.
- *	Since this can depend on compile time options
- *	it is set by Configure.  Other non-default sources
- *	of potential incompatibility, such as multiplicity, threads,
- *	debugging, 64bits, sfio, etc., are not checked for currently,
- *	though in principle we could go snooping around in old
- *	Config.pm files.
- */
-/* PERL_PM_APIVERSION:
- *	This variable contains the version of the oldest perl
- *	compatible with the present perl.  (That is, pure perl modules
- *	written for pm_apiversion will still work for the current
- *	version).  perl.c:incpush() and lib/lib.pm will automatically
- *	search in  for older directories across major versions
- *	back to pm_apiversion.  This is only useful if you have a perl
- *	library directory tree structured like the default one.  The
- *	versioned site_perl library was introduced in 5.005, so that's
- *	the default setting for this variable.  It's hard to imagine
- *	it changing before Perl6.  It is included here for symmetry
- *	with xs_apiveprsion -- the searching algorithms will
- *	(presumably) be similar.
- *	See the INSTALL file for how this works.
- */
-#define PERL_XS_APIVERSION "5.008"
-#define PERL_PM_APIVERSION "5.005"
-
 /* HAS_DRAND48_PROTO:
  *	This symbol, if defined, indicates that the system provides
  *	a prototype for the drand48() function.  Otherwise, it is up
diff --git a/uconfig.sh b/uconfig.sh
index 2060b43912..3fb16b78d1 100755
--- a/uconfig.sh
+++ b/uconfig.sh
@@ -598,7 +598,6 @@ orderlib='false'
 osname='unknown'
 phostname='hostname'
 pidtype=int
-pm_apiversion='5.005'
 privlib='/usr/local/lib/perl5/5.7'
 privlibexp='/usr/local/lib/perl5/5.7'
 procselfexe=''
@@ -707,4 +706,3 @@ uvuformat='"lu"'
 uvxformat='"lx"'
 versiononly='undef'
 voidflags=1
-xs_apiversion='5.008'
diff --git a/win32/config.bc b/win32/config.bc
index 7613756c4d..8f3edcff3c 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -771,7 +771,6 @@ pg=''
 phostname='hostname'
 pidtype='int'
 plibpth=''
-pm_apiversion='5.005'
 pmake=''
 pr=''
 prefix='~INST_TOP~'
@@ -950,7 +949,6 @@ versiononly='undef'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
-xs_apiversion='5.6.0'
 zcat=''
 zip='zip'
 PERL_REVISION='~PERL_REVISION~'
diff --git a/win32/config.gc b/win32/config.gc
index cc332a80e4..8a3cd4733e 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -770,7 +770,6 @@ pg=''
 phostname='hostname'
 pidtype='int'
 plibpth=''
-pm_apiversion='5.005'
 pmake=''
 pr=''
 prefix='~INST_TOP~'
@@ -949,7 +948,6 @@ versiononly='undef'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
-xs_apiversion='5.6.0'
 zcat=''
 zip='zip'
 PERL_REVISION='~PERL_REVISION~'
diff --git a/win32/config.vc b/win32/config.vc
index 25c2f45f71..450c2f8c8d 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -770,7 +770,6 @@ pg=''
 phostname='hostname'
 pidtype='int'
 plibpth=''
-pm_apiversion='5.005'
 pmake=''
 pr=''
 prefix='~INST_TOP~'
@@ -949,7 +948,6 @@ versiononly='undef'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
-xs_apiversion='5.6.0'
 zcat=''
 zip='zip'
 PERL_REVISION='~PERL_REVISION~'
diff --git a/win32/config.vc64 b/win32/config.vc64
index 5bc4261808..c4d2e8f1f0 100644
--- a/win32/config.vc64
+++ b/win32/config.vc64
@@ -770,7 +770,6 @@ pg=''
 phostname='hostname'
 pidtype='int'
 plibpth=''
-pm_apiversion='5.005'
 pmake=''
 pr=''
 prefix='~INST_TOP~'
@@ -949,7 +948,6 @@ versiononly='undef'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
-xs_apiversion='5.6.0'
 zcat=''
 zip='zip'
 PERL_REVISION='~PERL_REVISION~'
diff --git a/win32/config_H.bc b/win32/config_H.bc
index 2164675b00..bee11a1e91 100644
--- a/win32/config_H.bc
+++ b/win32/config_H.bc
@@ -3362,41 +3362,6 @@
 /*#define	USE_SOCKS		/**/
 #endif
 
-/* PERL_XS_APIVERSION:
- *	This variable contains the version of the oldest perl binary
- *	compatible with the present perl.  perl.c:incpush() and
- *	lib/lib.pm will automatically search in c:\\perl\\site\\5.8.3\\lib\\MSWin32-x86-multi-thread for older
- *	directories across major versions back to xs_apiversion.
- *	This is only useful if you have a perl library directory tree
- *	structured like the default one.
- *	See INSTALL for how this works.
- *	The versioned site_perl directory was introduced in 5.005,
- *	so that is the lowest possible value.
- *	Since this can depend on compile time options
- *	it is set by Configure.  Other non-default sources
- *	of potential incompatibility, such as multiplicity, threads,
- *	debugging, 64bits, sfio, etc., are not checked for currently,
- *	though in principle we could go snooping around in old
- *	Config.pm files.
- */
-/* PERL_PM_APIVERSION:
- *	This variable contains the version of the oldest perl
- *	compatible with the present perl.  (That is, pure perl modules
- *	written for pm_apiversion will still work for the current
- *	version).  perl.c:incpush() and lib/lib.pm will automatically
- *	search in c:\\perl\\site\\5.8.3\\lib for older directories across major versions
- *	back to pm_apiversion.  This is only useful if you have a perl
- *	library directory tree structured like the default one.  The
- *	versioned site_perl library was introduced in 5.005, so that's
- *	the default setting for this variable.  It's hard to imagine
- *	it changing before Perl6.  It is included here for symmetry
- *	with xs_apiveprsion -- the searching algorithms will
- *	(presumably) be similar.
- *	See the INSTALL file for how this works.
- */
-#define PERL_XS_APIVERSION "5.6.0"
-#define PERL_PM_APIVERSION "5.005"
-
 /* HAS_DRAND48_PROTO:
  *	This symbol, if defined, indicates that the system provides
  *	a prototype for the drand48() function.  Otherwise, it is up
diff --git a/win32/config_H.gc b/win32/config_H.gc
index e43c1e935c..cdaf89c984 100644
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -3362,41 +3362,6 @@
 /*#define	USE_SOCKS		/**/
 #endif
 
-/* PERL_XS_APIVERSION:
- *	This variable contains the version of the oldest perl binary
- *	compatible with the present perl.  perl.c:incpush() and
- *	lib/lib.pm will automatically search in c:\\perl\\site\\5.8.3\\lib\\MSWin32-x86-multi-thread for older
- *	directories across major versions back to xs_apiversion.
- *	This is only useful if you have a perl library directory tree
- *	structured like the default one.
- *	See INSTALL for how this works.
- *	The versioned site_perl directory was introduced in 5.005,
- *	so that is the lowest possible value.
- *	Since this can depend on compile time options
- *	it is set by Configure.  Other non-default sources
- *	of potential incompatibility, such as multiplicity, threads,
- *	debugging, 64bits, sfio, etc., are not checked for currently,
- *	though in principle we could go snooping around in old
- *	Config.pm files.
- */
-/* PERL_PM_APIVERSION:
- *	This variable contains the version of the oldest perl
- *	compatible with the present perl.  (That is, pure perl modules
- *	written for pm_apiversion will still work for the current
- *	version).  perl.c:incpush() and lib/lib.pm will automatically
- *	search in c:\\perl\\site\\5.8.3\\lib for older directories across major versions
- *	back to pm_apiversion.  This is only useful if you have a perl
- *	library directory tree structured like the default one.  The
- *	versioned site_perl library was introduced in 5.005, so that's
- *	the default setting for this variable.  It's hard to imagine
- *	it changing before Perl6.  It is included here for symmetry
- *	with xs_apiveprsion -- the searching algorithms will
- *	(presumably) be similar.
- *	See the INSTALL file for how this works.
- */
-#define PERL_XS_APIVERSION "5.6.0"
-#define PERL_PM_APIVERSION "5.005"
-
 /* HAS_DRAND48_PROTO:
  *	This symbol, if defined, indicates that the system provides
  *	a prototype for the drand48() function.  Otherwise, it is up
diff --git a/win32/config_H.vc b/win32/config_H.vc
index 3e5f5ce27e..220931ba01 100644
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -3362,41 +3362,6 @@
 /*#define	USE_SOCKS		/**/
 #endif
 
-/* PERL_XS_APIVERSION:
- *	This variable contains the version of the oldest perl binary
- *	compatible with the present perl.  perl.c:incpush() and
- *	lib/lib.pm will automatically search in c:\\perl\\site\\5.8.3\\lib\\MSWin32-x86-multi-thread for older
- *	directories across major versions back to xs_apiversion.
- *	This is only useful if you have a perl library directory tree
- *	structured like the default one.
- *	See INSTALL for how this works.
- *	The versioned site_perl directory was introduced in 5.005,
- *	so that is the lowest possible value.
- *	Since this can depend on compile time options
- *	it is set by Configure.  Other non-default sources
- *	of potential incompatibility, such as multiplicity, threads,
- *	debugging, 64bits, sfio, etc., are not checked for currently,
- *	though in principle we could go snooping around in old
- *	Config.pm files.
- */
-/* PERL_PM_APIVERSION:
- *	This variable contains the version of the oldest perl
- *	compatible with the present perl.  (That is, pure perl modules
- *	written for pm_apiversion will still work for the current
- *	version).  perl.c:incpush() and lib/lib.pm will automatically
- *	search in c:\\perl\\site\\5.8.3\\lib for older directories across major versions
- *	back to pm_apiversion.  This is only useful if you have a perl
- *	library directory tree structured like the default one.  The
- *	versioned site_perl library was introduced in 5.005, so that's
- *	the default setting for this variable.  It's hard to imagine
- *	it changing before Perl6.  It is included here for symmetry
- *	with xs_apiveprsion -- the searching algorithms will
- *	(presumably) be similar.
- *	See the INSTALL file for how this works.
- */
-#define PERL_XS_APIVERSION "5.6.0"
-#define PERL_PM_APIVERSION "5.005"
-
 /* HAS_DRAND48_PROTO:
  *	This symbol, if defined, indicates that the system provides
  *	a prototype for the drand48() function.  Otherwise, it is up
diff --git a/win32/config_H.vc64 b/win32/config_H.vc64
index 4366daf225..c42e90b0b3 100644
--- a/win32/config_H.vc64
+++ b/win32/config_H.vc64
@@ -3371,41 +3371,6 @@
 /*#define	USE_SOCKS		/**/
 #endif
 
-/* PERL_XS_APIVERSION:
- *	This variable contains the version of the oldest perl binary
- *	compatible with the present perl.  perl.c:incpush() and
- *	lib/lib.pm will automatically search in c:\\perl\\site\\5.8.3\\lib\\MSWin32-x86-multi-thread for older
- *	directories across major versions back to xs_apiversion.
- *	This is only useful if you have a perl library directory tree
- *	structured like the default one.
- *	See INSTALL for how this works.
- *	The versioned site_perl directory was introduced in 5.005,
- *	so that is the lowest possible value.
- *	Since this can depend on compile time options
- *	it is set by Configure.  Other non-default sources
- *	of potential incompatibility, such as multiplicity, threads,
- *	debugging, 64bits, sfio, etc., are not checked for currently,
- *	though in principle we could go snooping around in old
- *	Config.pm files.
- */
-/* PERL_PM_APIVERSION:
- *	This variable contains the version of the oldest perl
- *	compatible with the present perl.  (That is, pure perl modules
- *	written for pm_apiversion will still work for the current
- *	version).  perl.c:incpush() and lib/lib.pm will automatically
- *	search in c:\\perl\\site\\5.8.3\\lib for older directories across major versions
- *	back to pm_apiversion.  This is only useful if you have a perl
- *	library directory tree structured like the default one.  The
- *	versioned site_perl library was introduced in 5.005, so that's
- *	the default setting for this variable.  It's hard to imagine
- *	it changing before Perl6.  It is included here for symmetry
- *	with xs_apiveprsion -- the searching algorithms will
- *	(presumably) be similar.
- *	See the INSTALL file for how this works.
- */
-#define PERL_XS_APIVERSION "5.6.0"
-#define PERL_PM_APIVERSION "5.005"
-
 /* HAS_DRAND48_PROTO:
  *	This symbol, if defined, indicates that the system provides
  *	a prototype for the drand48() function.  Otherwise, it is up
diff --git a/wince/config.ce b/wince/config.ce
index e4f1ea8726..c10b24ba5b 100644
--- a/wince/config.ce
+++ b/wince/config.ce
@@ -724,7 +724,6 @@ pg=''
 phostname='hostname'
 pidtype='int'
 plibpth=''
-pm_apiversion='5.005'
 pmake=''
 pr=''
 prefix='~INST_TOP~'
@@ -901,7 +900,6 @@ versiononly='undef'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
-xs_apiversion='5.6.0'
 zcat=''
 zip='zip'
 PERL_REVISION='~PERL_REVISION~'
diff --git a/wince/config_H.ce b/wince/config_H.ce
index 086135b5fe..471aed0460 100644
--- a/wince/config_H.ce
+++ b/wince/config_H.ce
@@ -3605,41 +3605,6 @@
 #define M_VOID			/* Xenix strikes again */
 #endif
 
-/* PERL_XS_APIVERSION:
- *	This variable contains the version of the oldest perl binary
- *	compatible with the present perl.  perl.c:incpush() and
- *	lib/lib.pm will automatically search in \\Storage Card\\perl-tests\\bleadperl\\site\\lib for older
- *	directories across major versions back to xs_apiversion.
- *	This is only useful if you have a perl library directory tree
- *	structured like the default one.
- *	See INSTALL for how this works.
- *	The versioned site_perl directory was introduced in 5.005,
- *	so that is the lowest possible value.
- *	Since this can depend on compile time options
- *	it is set by Configure.  Other non-default sources
- *	of potential incompatibility, such as multiplicity, threads,
- *	debugging, 64bits, sfio, etc., are not checked for currently,
- *	though in principle we could go snooping around in old
- *	Config.pm files.
- */
-/* PERL_PM_APIVERSION:
- *	This variable contains the version of the oldest perl
- *	compatible with the present perl.  (That is, pure perl modules
- *	written for pm_apiversion will still work for the current
- *	version).  perl.c:incpush() and lib/lib.pm will automatically
- *	search in \\Storage Card\\perl-tests\\bleadperl\\site\\lib for older directories across major versions
- *	back to pm_apiversion.  This is only useful if you have a perl
- *	library directory tree structured like the default one.  The
- *	versioned site_perl library was introduced in 5.005, so that's
- *	the default setting for this variable.  It's hard to imagine
- *	it changing before Perl6.  It is included here for symmetry
- *	with xs_apiveprsion -- the searching algorithms will
- *	(presumably) be similar.
- *	See the INSTALL file for how this works.
- */
-#define PERL_XS_APIVERSION "5.8.0"
-#define PERL_PM_APIVERSION "5.005"
-
 /* HAS_CRYPT:
  *	This symbol, if defined, indicates that the crypt routine is available
  *	to encrypt passwords and the like.