integrate cfgperl changes into mainline

p4raw-id: //depot/perl@5570

3 files changed, 81 insertions, 25 deletions

diff --git a/vos/config.def b/vos/config.def
index 7ef644dfe9..34f57709e4 100644
--- a/vos/config.def
+++ b/vos/config.def
@@ -112,7 +112,7 @@ $d_htonl='define'
 $d_iconv='undef'
 $d_index='undef'
 $d_inetaton='undef'
-$d_int64t='undef'
+$d_int64_t='undef'
 $d_isascii='define'
 $d_killpg='undef'
 $d_lchown='undef'
@@ -134,6 +134,9 @@ $d_memcpy='define'
 $d_memmove='define'
 $d_memset='define'
 $d_mkdir='define'
+$d_mkdtemp='undef'
+$d_mkstemp='undef'
+$d_mkstemps='undef'
 $d_mkfifo='define'
 $d_mktime='define'
 $d_mmap='undef'
@@ -257,6 +260,7 @@ $d_umask='define'
 $d_uname='define'
 $d_union_semun='undef'
 $d_ustat='undef'
+$d_vendorarch='define'
 $d_vendorlib='define'
 $d_vfork='undef'
 $d_void_closedir='undef'
@@ -330,6 +334,8 @@ $i_sysaccess='undef'
 $i_sysdir='undef'
 $i_sysfile='undef'
 $i_sysioctl='define'
+$i_syslog='undef'
+$i_sysmode='undef'
 $i_sysmount='undef'
 $i_sysndir='undef'
 $i_sysparam='undef'
@@ -345,6 +351,7 @@ $i_systimes='define'
 $i_systypes='define'
 $i_sysuio='undef'
 $i_sysun='undef'
+$i_sysutsname='define'
 $i_sysvfs='undef'
 $i_syswait='define'
 $i_termio='undef'
@@ -357,7 +364,7 @@ $i_values='define'
 $i_varargs='undef'
 $i_vfork='undef'
 $Id='$Id'
-$inc_version_list_init=''
+$inc_version_list_init='0'
 $installusrbinperl='undef'
 $intsize='4'
 $ivdformat='"d"'
@@ -406,6 +413,7 @@ $sitearch=''
 $sitearchexp=''
 $sitelib='/system/ported/perl/lib/site/5.005'
 $sitelibexp='/system/ported/perl/lib/site/5.005'
+$sitelib_stem='/system/ported/perl/lib/site'
 $sizetype='size_t'
 $socksizetype='int'
 $sPRIfldbl='"Lf"'
@@ -436,6 +444,7 @@ $use5005threads='undef'
 $use64bitall='undef'
 $use64bitint='undef'
 $usedl='undef'
+$useithreads='undef'
 $uselargefiles='undef'
 $uselongdouble='define'
 $usemorebits='undef'
@@ -448,6 +457,9 @@ $uvsize='4'
 $uvtype='unsigned int'
 $uvuformat='"u"'
 $uvxformat='"x"'
+$vendorarch=''
+$vendorarchexp=''
+$vendorlib_stem=''
 $vendorlibexp=''
 $voidflags='15'
 $xs_apiversion='5.00563'
diff --git a/vos/config.h b/vos/config.h
index d163593ed0..78e5c693fe 100644
--- a/vos/config.h
+++ b/vos/config.h
@@ -1186,14 +1186,18 @@
  *	This macro surrounds its token with double quotes.
  */
 #if 42 == 1
-#define CAT2(a,b)a/**/b
-#define STRINGIFY(a)"a"
+#  define CAT2(a,b)	a/**/b
+#  define STRINGIFY(a)	"a"
 		/* If you can get stringification with catify, tell me how! */
 #endif
 #if 42 == 42
-#define CAT2(a,b)a ## b
-#define StGiFy(a)# a
-#define STRINGIFY(a)StGiFy(a)
+#  define PeRl_CaTiFy(a, b)	a ## b	
+#  define PeRl_StGiFy(a)	#a
+/* the additional level of indirection enables these macros to be
+ * used as arguments to other macros.  See K&R 2nd ed., page 231. */
+#  define CAT2(a,b)	PeRl_CaTiFy(a,b)
+#  define StGiFy(a)	PeRl_StGiFy(a)
+#  define STRINGIFY(a)	PeRl_StGiFy(a)
 #endif
 #if 42 != 1 && 42 != 42
 #include "Bletch: How does this C preprocessor catenate tokens?"
@@ -1608,7 +1612,7 @@
  *     Usually the <inttypes.h> needs to be included, but sometimes
  *	<sys/types.h> is enough.
  */
-#     HAS_INT64_T               /**/
+/*#define     HAS_INT64_T               /**/
 
 /* HAS_ISASCII:
  *	This manifest constant lets the C program know that isascii 
@@ -1674,21 +1678,21 @@
  *	This symbol, if defined, indicates that the mkdtemp routine is
  *	available to exclusively create a uniquely named temporary directory.
  */
-# HAS_MKDTEMP		/**/
+/*#define HAS_MKDTEMP		/**/
 
 /* HAS_MKSTEMP:
  *	This symbol, if defined, indicates that the mkstemp routine is
  *	available to exclusively create and open a uniquely named
  *	temporary file.
  */
-# HAS_MKSTEMP		/**/
+/*#define HAS_MKSTEMP		/**/
 
 /* HAS_MKSTEMPS:
  *	This symbol, if defined, indicates that the mkstemps routine is
  *	available to excluslvely create and open a uniquely named
  *	(with a suffix) temporary file.
  */
-# HAS_MKSTEMPS		/**/
+/*#define HAS_MKSTEMPS		/**/
 
 /* HAS_MMAP:
  *	This symbol, if defined, indicates that the mmap system call is
@@ -2362,13 +2366,13 @@
  *	This symbol, if defined, indicates that <syslog.h> exists and
  *	should be included.
  */
-#	I_SYSLOG		/**/
+/*#define	I_SYSLOG		/**/
 
 /* I_SYSMODE:
  *	This symbol, if defined, indicates that <sys/mode.h> exists and
  *	should be included.
  */
-#	I_SYSMODE		/**/
+/*#define	I_SYSMODE		/**/
 
 /* I_SYS_MOUNT:
  *	This symbol, if defined, indicates that <sys/mount.h> exists and
@@ -2397,7 +2401,7 @@
  *	This symbol, if defined, indicates that <sys/utsname.h> exists and
  *	should be included.
  */
-#	I_SYSUTSNAME		/**/
+#define	I_SYSUTSNAME		/**/
 
 /* I_SYS_VFS:
  *	This symbol, if defined, indicates that <sys/vfs.h> exists and
@@ -2434,7 +2438,7 @@
  *	for a C initialization string.  See the inc_version_list entry
  *	in Porting/Glossary for more details.
  */
-#define PERL_INC_VERSION_LIST 		/**/
+#define PERL_INC_VERSION_LIST 0		/**/
 
 /* INSTALL_USR_BIN_PERL:
  *	This symbol, if defined, indicates that Perl is to be installed
@@ -2770,8 +2774,8 @@
  *	This symbol contains the ~name expanded version of SITEARCH, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITEARCH ""		/**/
-#define SITEARCH_EXP ""		/**/
+/*#define SITEARCH ""		/**/
+/*#define SITEARCH_EXP ""		/**/
 
 /* SITELIB:
  *	This symbol contains the name of the private library for this package.
@@ -2788,8 +2792,14 @@
  *	This symbol contains the ~name expanded version of SITELIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
+/* SITELIB_STEM:
+ *	This define is SITELIB_EXP with any trailing version-specific component
+ *	removed.  The elements in inc_version_list (inc_version_list.U) can
+ *	be tacked onto this variable to generate a list of directories to search.
+ */
 #define SITELIB "/system/ported/perl/lib/site/5.005"		/**/
 #define SITELIB_EXP "/system/ported/perl/lib/site/5.005"		/**/
+#define SITELIB_STEM "/system/ported/perl/lib/site"		/**/
 
 /* Size_t:
  *	This symbol holds the type used to declare length parameters
@@ -2932,17 +2942,29 @@
  *	be built to use the old draft POSIX threads API.
  */
 /*#define	USE_5005THREADS		/**/
-#	USE_ITHREADS		/**/
+/*#define	USE_ITHREADS		/**/
 #if defined(USE_5005THREADS) && !defined(USE_ITHREADS)
 #define		USE_THREADS		/* until src is revised*/
 #endif
 /*#define	OLD_PTHREADS_API		/**/
 
+/* PERL_VENDORARCH_EXP:
+ *	This symbol contains the ~name expanded version of PERL_VENDORARCH, to be used
+ *	in programs that are not prepared to deal with ~ expansion at run-time.
+ */
+#define PERL_VENDORARCH_EXP ""		/**/
+
 /* PERL_VENDORLIB_EXP:
  *	This symbol contains the ~name expanded version of VENDORLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
+/* PERL_VENDORLIB_STEM:
+ *	This define is PERL_VENDORLIB_EXP with any trailing version-specific component
+ *	removed.  The elements in inc_version_list (inc_version_list.U) can
+ *	be tacked onto this variable to generate a list of directories to search.
+ */
 #define PERL_VENDORLIB_EXP ""		/**/
+#define PERL_VENDORLIB_STEM ""		/**/
 
 /* VOIDFLAGS:
  *	This symbol indicates how much support of the void type is given by this
diff --git a/vos/config_h.SH_orig b/vos/config_h.SH_orig
index d452aa9fa1..299c931298 100755
--- a/vos/config_h.SH_orig
+++ b/vos/config_h.SH_orig
@@ -1204,14 +1204,18 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  *	This macro surrounds its token with double quotes.
  */
 #if $cpp_stuff == 1
-#define CAT2(a,b)a/**/b
-#define STRINGIFY(a)"a"
+#  define CAT2(a,b)	a/**/b
+#  define STRINGIFY(a)	"a"
 		/* If you can get stringification with catify, tell me how! */
 #endif
 #if $cpp_stuff == 42
-#define CAT2(a,b)a ## b
-#define StGiFy(a)# a
-#define STRINGIFY(a)StGiFy(a)
+#  define PeRl_CaTiFy(a, b)	a ## b	
+#  define PeRl_StGiFy(a)	#a
+/* the additional level of indirection enables these macros to be
+ * used as arguments to other macros.  See K&R 2nd ed., page 231. */
+#  define CAT2(a,b)	PeRl_CaTiFy(a,b)
+#  define StGiFy(a)	PeRl_StGiFy(a)
+#  define STRINGIFY(a)	PeRl_StGiFy(a)
 #endif
 #if $cpp_stuff != 1 && $cpp_stuff != 42
 #include "Bletch: How does this C preprocessor catenate tokens?"
@@ -2788,8 +2792,8 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  *	This symbol contains the ~name expanded version of SITEARCH, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITEARCH "$sitearch"		/**/
-#define SITEARCH_EXP "$sitearchexp"		/**/
+#$d_sitearch SITEARCH "$sitearch"		/**/
+#$d_sitearch SITEARCH_EXP "$sitearchexp"		/**/
 
 /* SITELIB:
  *	This symbol contains the name of the private library for this package.
@@ -2806,8 +2810,14 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  *	This symbol contains the ~name expanded version of SITELIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
+/* SITELIB_STEM:
+ *	This define is SITELIB_EXP with any trailing version-specific component
+ *	removed.  The elements in inc_version_list (inc_version_list.U) can
+ *	be tacked onto this variable to generate a list of directories to search.
+ */
 #define SITELIB "$sitelib"		/**/
 #define SITELIB_EXP "$sitelibexp"		/**/
+#define SITELIB_STEM "$sitelib_stem"		/**/
 
 /* Size_t:
  *	This symbol holds the type used to declare length parameters
@@ -2956,11 +2966,23 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #endif
 #$d_oldpthreads	OLD_PTHREADS_API		/**/
 
+/* PERL_VENDORARCH_EXP:
+ *	This symbol contains the ~name expanded version of PERL_VENDORARCH, to be used
+ *	in programs that are not prepared to deal with ~ expansion at run-time.
+ */
+#$d_vendorarch PERL_VENDORARCH_EXP "$vendorarchexp"		/**/
+
 /* PERL_VENDORLIB_EXP:
  *	This symbol contains the ~name expanded version of VENDORLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
+/* PERL_VENDORLIB_STEM:
+ *	This define is PERL_VENDORLIB_EXP with any trailing version-specific component
+ *	removed.  The elements in inc_version_list (inc_version_list.U) can
+ *	be tacked onto this variable to generate a list of directories to search.
+ */
 #$d_vendorlib PERL_VENDORLIB_EXP "$vendorlibexp"		/**/
+#$d_vendorlib PERL_VENDORLIB_STEM "$vendorlib_stem"		/**/
 
 /* VOIDFLAGS:
  *	This symbol indicates how much support of the void type is given by this