More robust inc_version_list from Andy.

p4raw-id: //depot/cfgperl@4820

5 files changed, 33 insertions, 14 deletions

diff --git a/Configure b/Configure
index b561281a66..a9fbfe3fa0 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 Wed Jan 19 19:38:29 EET 2000 [metaconfig 3.0 PL70]
+# Generated on Thu Jan 20 00:42:19 EET 2000 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.com)
 
 cat >/tmp/c1$$ <<EOF
@@ -671,6 +671,7 @@ i_varargs=''
 i_varhdr=''
 i_vfork=''
 inc_version_list=''
+inc_version_list_init=''
 installprefix=''
 installprefixexp=''
 installstyle=''
@@ -5378,9 +5379,7 @@ foreach $d (@candidates) {
 }
 
 if (@inc_version_list) {
-    print '"';
-    print join('", "', @inc_version_list);
-    print '"';
+    print join(' ', @inc_version_list);
 }
 else {
     # Blank space to preserve value for next Configure run.
@@ -5392,9 +5391,10 @@ case "$inc_version_list" in
 '')	if test -x $perl; then
 		dflt=`$perl getverlist`
 	else
-		dflt=''
+		dflt='none'
 	fi
 	;;
+$undef) dflt='none' ;;
 *)  dflt="$inc_version_list" ;;
 esac
 $cat <<'EOM'
@@ -5404,15 +5404,26 @@ can be configured to use modules built and installed with earlier
 versions of perl that were installed under $prefix.  Specify here
 the list of earlier versions that this version of perl should check.
 If Configure detected no earlier versions of perl installed under
-$prefix, then the list will be empty.
+$prefix, then the list will be empty.  Answer 'none' to tell perl
+to not search earlier versions.
 
 The default should almost always be sensible, so if you're not sure,
 just accept the default.
 EOM
 
-rp='list of earlier versions to include in @INC?'
+rp='List of earlier versions to include in @INC?'
 . ./myread
-inc_version_list="$ans"
+case "$ans" in
+[Nn]one) inc_version_list=' ' ;;
+*) inc_version_list="$ans" ;;
+esac
+case "$inc_version_list" in
+''|' ') 
+	inc_version_list_init='""';;
+*)	inc_version_list_init=`echo $inc_version_list |
+		$sed -e 's/^/"/' -e 's/ /","/g' -e 's/$/"/'`
+	;;
+esac
 $rm -f getverlist
 
 : determine whether to install perl also as /usr/bin/perl
@@ -14841,6 +14852,7 @@ i_varhdr='$i_varhdr'
 i_vfork='$i_vfork'
 ignore_versioned_solibs='$ignore_versioned_solibs'
 inc_version_list='$inc_version_list'
+inc_version_list_init='$inc_version_list_init'
 incpath='$incpath'
 inews='$inews'
 installarchlib='$installarchlib'
diff --git a/Porting/Glossary b/Porting/Glossary
index e4028b3e67..995f7f9a95 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -2125,12 +2125,18 @@ ignore_versioned_solibs (libs.U):
 inc_version_list (inc_version_list.U):
 	This variable specifies the list of subdirectories in over
 	which perl.c:incpush() and lib/lib.pm will automatically
-	search when adding directories to @INC.  This is only useful
+	search when adding directories to @INC.  The elements in
+	the list are separated by spaces.  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.
 
+inc_version_list_init (inc_version_list.U):
+	This variable holds the same list as inc_version_list, but
+	each item is enclosed in double quotes and separated by commas, 
+	suitable for use in the PERL_INC_VERSION_LIST initialization.
+
 incpath (usrinc.U):
 	This variable must preceed the normal include path to get hte
 	right one, as in "$incpath/usr/include" or "$incpath/usr/lib".
diff --git a/Porting/config.sh b/Porting/config.sh
index b9b8bd065b..13f2cb994e 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -8,7 +8,7 @@
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: Wed Jan 19 19:31:56 EET 2000
+# Configuration time: Thu Jan 20 00:43:41 EET 2000
 # Configured by     : jhi
 # Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
 
@@ -59,7 +59,7 @@ ccflags='-pthread -std -DLANGUAGE_C'
 ccsymbols='__LANGUAGE_C__=1 _LONGLONG=1 LANGUAGE_C=1 SYSTYPE_BSD=1'
 cf_by='jhi'
 cf_email='yourname@yourhost.yourplace.com'
-cf_time='Wed Jan 19 19:31:56 EET 2000'
+cf_time='Thu Jan 20 00:43:41 EET 2000'
 charsize='1'
 chgrp=''
 chmod=''
@@ -484,6 +484,7 @@ i_varhdr='stdarg.h'
 i_vfork='undef'
 ignore_versioned_solibs=''
 inc_version_list=' '
+inc_version_list_init='""'
 incpath=''
 inews=''
 installarchlib='/opt/perl/lib/5.5.640/alpha-dec_osf-thread-multi'
diff --git a/Porting/config_H b/Porting/config_H
index 92d77723f2..694e81e6ed 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -17,7 +17,7 @@
 /*
  * Package name      : perl5
  * Source directory  : .
- * Configuration time: Wed Jan 19 19:31:56 EET 2000
+ * Configuration time: Thu Jan 20 00:43:41 EET 2000
  * Configured by     : jhi
  * Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
  */
@@ -2312,7 +2312,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 ""		/**/
 
 /* HAS_OFF64_T:
  *	This symbol will be defined if the C compiler supports off64_t.
diff --git a/config_h.SH b/config_h.SH
index 9bbaa9014c..2b45b150f4 100644
--- a/config_h.SH
+++ b/config_h.SH
@@ -2326,7 +2326,7 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  *	for a C initialization string.  See the inc_version_list entry
  *	in Porting/Glossary for more details.
  */
-#define PERL_INC_VERSION_LIST $inc_version_list		/**/
+#define PERL_INC_VERSION_LIST $inc_version_list_init		/**/
 
 /* HAS_OFF64_T:
  *	This symbol will be defined if the C compiler supports off64_t.