integrate cfgperl changes into mainline

[p5sagit/p5-mst-13.2.git] / vos / config_h.SH_orig

diff --git a/vos/config_h.SH_orig b/vos/config_h.SH_orig
index ad136f2..299c931 100755 (executable)
--- 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?"
@@ -1676,6 +1680,12 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #define LONGLONGSIZE $longlongsize             /**/
 #endif
 
+/* HAS_MADVISE:
+ *     This symbol, if defined, indicates that the madvise system call is
+ *     available to map a file into memory.
+ */
+#$d_madvise HAS_MADVISE                /**/
+
 /* HAS_MEMCHR:
  *     This symbol, if defined, indicates that the memchr routine is available
  *     to locate characters within a C string.
@@ -2364,6 +2374,12 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$i_socks      I_SOCKS         /**/
 
+/* I_SUNMATH:
+ *     This symbol, if defined, indicates that <sunmath.h> exists and
+ *     should be included.
+ */
+#$i_sunmath    I_SUNMATH               /**/
+
 /* I_SYSLOG:
  *     This symbol, if defined, indicates that <syslog.h> exists and
  *     should be included.
@@ -2776,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.
@@ -2794,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
@@ -2944,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
@@ -3016,6 +3050,12 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$d_getfsstat HAS_GETFSSTAT            /**/
 
+/* I_IEEEFP:
+ *     This symbol, if defined, indicates that <ieeefp.h> exists and
+ *     should be included.
+ */
+#$i_ieeefp     I_IEEEFP                /**/
+
 /* HAS_LSEEK_PROTO:
  *     This symbol, if defined, indicates that the system provides
  *     a prototype for the lseek() function.  Otherwise, it is up