From: Jarkko Hietaniemi <jhi@iki.fi> Date: Fri, 28 Apr 2000 20:42:14 +0000 (+0000) Subject: Regen Configure. X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7cedd6f8560b8c7374da63bb4d16475819d6c25e;p=p5sagit%2Fp5-mst-13.2.git Regen Configure. p4raw-id: //depot/cfgperl@6006 --- diff --git a/Configure b/Configure index a271f8c..83a685d 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 Mon Apr 24 23:59:43 EET DST 2000 [metaconfig 3.0 PL70] +# Generated on Fri Apr 28 23:33:15 EET DST 2000 [metaconfig 3.0 PL70] # (with additional metaconfig patches by perlbug@perl.com) cat >/tmp/c1$$ <<EOF @@ -5254,6 +5254,108 @@ echo "Your system uses $freetype free(), it would seem." >&4 $rm -f malloc.[co] $cat <<EOM +After $package is installed, you may wish to install various +add-on modules and utilities. Typically, these add-ons will +be installed under $prefix with the rest +of this package. However, you may wish to install such add-ons +elsewhere under a different prefix. + +If you do not wish to put everything under a single prefix, that's +ok. You will be prompted for the individual locations; this siteprefix +is only used to suggest the defaults. + +The default should be fine for most people. + +EOM +fn=d~+ +rp='Installation prefix to use for add-on modules and utilities?' +: XXX Here might be another good place for an installstyle setting. +case "$siteprefix" in +'') dflt=$prefix ;; +*) dflt=$siteprefix ;; +esac +. ./getfile +: XXX Prefixit unit does not yet support siteprefix and vendorprefix +oldsiteprefix='' +case "$siteprefix" in +'') ;; +*) case "$ans" in + "$prefix") ;; + *) oldsiteprefix="$prefix";; + esac + ;; +esac +siteprefix="$ans" +siteprefixexp="$ansexp" + +: determine where site specific libraries go. +: Usual default is /usr/local/lib/perl5/site_perl/$version +: The default "style" setting is made in installstyle.U +: XXX No longer works with Prefixit stuff. +prog=`echo $package | $sed 's/-*[0-9.]*$//'` +case "$sitelib" in +'') case "$installstyle" in + *lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;; + *) dflt=$siteprefix/lib/site_$prog/$version ;; + esac + ;; +*) dflt="$sitelib" + ;; +esac +$cat <<EOM + +The installation process will create a directory for +site-specific extensions and modules. Most users find it convenient +to place all site-specific files in this directory rather than in the +main distribution directory. + +EOM +fn=d~+ +rp='Pathname for the site-specific library files?' +. ./getfile +sitelib="$ans" +sitelibexp="$ansexp" +sitelib_stem=`echo "$sitelibexp" | sed "s,/$version$,,"` +: Change installation prefix, if necessary. +if $test X"$prefix" != X"$installprefix"; then + installsitelib=`echo $sitelibexp | $sed "s#^$prefix#$installprefix#"` +else + installsitelib="$sitelibexp" +fi + +: determine where site specific architecture-dependent libraries go. +: sitelib default is /usr/local/lib/perl5/site_perl/$version +: sitearch default is /usr/local/lib/perl5/site_perl/$version/$archname +: sitelib may have an optional trailing /share. +case "$sitearch" in +'') dflt=`echo $sitelib | $sed 's,/share$,,'` + dflt="$dflt/$archname" + ;; +*) dflt="$sitearch" + ;; +esac +set sitearch sitearch none +eval $prefixit +$cat <<EOM + +The installation process will also create a directory for +architecture-dependent site-specific extensions and modules. + +EOM +fn=d~+ +rp='Pathname for the site-specific architecture-dependent library files?' +. ./getfile +sitearch="$ans" +sitearchexp="$ansexp" +: Change installation prefix, if necessary. +if $test X"$prefix" != X"$installprefix"; then + installsitearch=`echo $sitearchexp | sed "s#^$prefix#$installprefix#"` +else + installsitearch="$sitearchexp" +fi + +$cat <<EOM + The installation process will also create a directory for vendor-supplied add-ons. Vendors who supply perl with their system may find it convenient to place all vendor-supplied files in this @@ -5490,77 +5592,6 @@ case "$perl5" in *) echo "Using $perl5." ;; esac -$cat <<EOM - -After $package is installed, you may wish to install various -add-on modules and utilities. Typically, these add-ons will -be installed under $prefix with the rest -of this package. However, you may wish to install such add-ons -elsewhere under a different prefix. - -If you do not wish to put everything under a single prefix, that's -ok. You will be prompted for the individual locations; this siteprefix -is only used to suggest the defaults. - -The default should be fine for most people. - -EOM -fn=d~+ -rp='Installation prefix to use for add-on modules and utilities?' -: XXX Here might be another good place for an installstyle setting. -case "$siteprefix" in -'') dflt=$prefix ;; -*) dflt=$siteprefix ;; -esac -. ./getfile -: XXX Prefixit unit does not yet support siteprefix and vendorprefix -oldsiteprefix='' -case "$siteprefix" in -'') ;; -*) case "$ans" in - "$prefix") ;; - *) oldsiteprefix="$prefix";; - esac - ;; -esac -siteprefix="$ans" -siteprefixexp="$ansexp" - -: determine where site specific libraries go. -: Usual default is /usr/local/lib/perl5/site_perl/$version -: The default "style" setting is made in installstyle.U -: XXX No longer works with Prefixit stuff. -prog=`echo $package | $sed 's/-*[0-9.]*$//'` -case "$sitelib" in -'') case "$installstyle" in - *lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;; - *) dflt=$siteprefix/lib/site_$prog/$version ;; - esac - ;; -*) dflt="$sitelib" - ;; -esac -$cat <<EOM - -The installation process will create a directory for -site-specific extensions and modules. Most users find it convenient -to place all site-specific files in this directory rather than in the -main distribution directory. - -EOM -fn=d~+ -rp='Pathname for the site-specific library files?' -. ./getfile -sitelib="$ans" -sitelibexp="$ansexp" -sitelib_stem=`echo "$sitelibexp" | sed "s,/$version$,,"` -: Change installation prefix, if necessary. -if $test X"$prefix" != X"$installprefix"; then - installsitelib=`echo $sitelibexp | $sed "s#^$prefix#$installprefix#"` -else - installsitelib="$sitelibexp" -fi - : Determine list of previous versions to include in @INC $cat > getverlist <<EOPL #!$perl5 -w @@ -7190,37 +7221,6 @@ else installscript="$scriptdirexp" fi -: determine where site specific architecture-dependent libraries go. -: sitelib default is /usr/local/lib/perl5/site_perl/$version -: sitearch default is /usr/local/lib/perl5/site_perl/$version/$archname -: sitelib may have an optional trailing /share. -case "$sitearch" in -'') dflt=`echo $sitelib | $sed 's,/share$,,'` - dflt="$dflt/$archname" - ;; -*) dflt="$sitearch" - ;; -esac -set sitearch sitearch none -eval $prefixit -$cat <<EOM - -The installation process will also create a directory for -architecture-dependent site-specific extensions and modules. - -EOM -fn=d~+ -rp='Pathname for the site-specific architecture-dependent library files?' -. ./getfile -sitearch="$ans" -sitearchexp="$ansexp" -: Change installation prefix, if necessary. -if $test X"$prefix" != X"$installprefix"; then - installsitearch=`echo $sitearchexp | sed "s#^$prefix#$installprefix#"` -else - installsitearch="$sitearchexp" -fi - : determine where add-on public executables go case "$sitebin" in '') dflt=$siteprefix/bin ;; diff --git a/Porting/config.sh b/Porting/config.sh index 15d7893..ec7b131 100644 --- a/Porting/config.sh +++ b/Porting/config.sh @@ -8,7 +8,7 @@ # Package name : perl5 # Source directory : . -# Configuration time: Tue Apr 25 00:14:34 EET DST 2000 +# Configuration time: Fri Apr 28 23:34:47 EET DST 2000 # Configured by : jhi # Target system : osf1 alpha.hut.fi v4.0 878 alpha @@ -59,7 +59,7 @@ ccflags='-pthread -std -DLANGUAGE_C' ccsymbols='__alpha=1 __LANGUAGE_C__=1 __osf__=1 __unix__=1 _LONGLONG=1 _SYSTYPE_BSD=1 SYSTYPE_BSD=1 unix=1' cf_by='jhi' cf_email='yourname@yourhost.yourplace.com' -cf_time='Tue Apr 25 00:14:34 EET DST 2000' +cf_time='Fri Apr 28 23:34:47 EET DST 2000' charsize='1' chgrp='' chmod='' diff --git a/Porting/config_H b/Porting/config_H index 8657341..46184ef 100644 --- a/Porting/config_H +++ b/Porting/config_H @@ -17,7 +17,7 @@ /* * Package name : perl5 * Source directory : . - * Configuration time: Tue Apr 25 00:14:34 EET DST 2000 + * Configuration time: Fri Apr 28 23:34:47 EET DST 2000 * Configured by : jhi * Target system : osf1 alpha.hut.fi v4.0 878 alpha */ @@ -2495,16 +2495,6 @@ */ #define INSTALL_USR_BIN_PERL /**/ -/* PERL_OTHERLIBDIRS: - * This variable contains a colon-separated set of paths for the perl - * binary to search for additional library files or modules. - * These directories will be tacked to the end of @INC. - * Perl will automatically search below each path for version- - * and architecture-specific directories. See PERL_INC_VERSION_LIST - * for more details. - */ -/*#define PERL_OTHERLIBDIRS " " / **/ - /* PERL_PRIfldbl: * This symbol, if defined, contains the string used by stdio to * format long doubles (format 'f') for output. @@ -2602,6 +2592,16 @@ #define Netdb_name_t const char * /**/ #define Netdb_net_t int /**/ +/* PERL_OTHERLIBDIRS: + * This variable contains a colon-separated set of paths for the perl + * binary to search for additional library files or modules. + * These directories will be tacked to the end of @INC. + * Perl will automatically search below each path for version- + * and architecture-specific directories. See PERL_INC_VERSION_LIST + * for more details. + */ +/*#define PERL_OTHERLIBDIRS " " / **/ + /* IVTYPE: * This symbol defines the C type used for Perl's IV. */ diff --git a/config_h.SH b/config_h.SH index cc35077..5bb7ddd 100644 --- a/config_h.SH +++ b/config_h.SH @@ -2606,6 +2606,16 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un- #define Netdb_name_t $netdb_name_type /**/ #define Netdb_net_t $netdb_net_type /**/ +/* PERL_OTHERLIBDIRS: + * This variable contains a colon-separated set of paths for the perl + * binary to search for additional library files or modules. + * These directories will be tacked to the end of @INC. + * Perl will automatically search below each path for version- + * and architecture-specific directories. See PERL_INC_VERSION_LIST + * for more details. + */ +#$d_perl_otherlibdirs PERL_OTHERLIBDIRS "$otherlibdirs" /**/ + /* IVTYPE: * This symbol defines the C type used for Perl's IV. */ @@ -2732,16 +2742,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un- */ #define Pid_t $pidtype /* PID type */ -/* PERL_OTHERLIBDIRS: - * This variable contains a colon-separated set of paths for the perl - * binary to search for additional library files or modules. - * These directories will be tacked to the end of @INC. - * Perl will automatically search below each path for version- - * and architecture-specific directories. See PERL_INC_VERSION_LIST - * for more details. - */ -#$d_perl_otherlibdirs PERL_OTHERLIBDIRS "$otherlibdirs" /**/ - /* PRIVLIB: * This symbol contains the name of the private library for this package. * The library is private in the sense that it needn't be in anyone's