diff options
| -rwxr-xr-x | Configure | 823 | ||||
| -rw-r--r-- | MANIFEST | 15 | ||||
| -rw-r--r-- | Makefile.SH | 4 | ||||
| -rw-r--r-- | os2/diff.configure | 248 |
4 files changed, 444 insertions, 646 deletions
@@ -20,7 +20,7 @@ # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $ # -# Generated on Tue Feb 24 12:36:41 EST 1998 [metaconfig 3.0 PL70] +# Generated on Wed Feb 25 16:44:06 EST 1998 [metaconfig 3.0 PL70] cat >/tmp/c1$$ <<EOF ARGGGHHHH!!!!! @@ -765,7 +765,7 @@ locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" inclwanted='' : Trailing extension. Override this in a hint file, if needed. -_exe='' +_exe='' : Extra object files, if any, needed on this platform. archobjs='' groupstype='' @@ -1431,7 +1431,7 @@ if $contains "^$user\$" ../.config/instruct >/dev/null 2>&1; then fi if $needman; then cat <<EOH - + This installation shell script will examine your system and ask you questions to determine how the perl5 package should be installed. If you get stuck on a question, you may use a ! shell escape to start a subshell or @@ -1783,7 +1783,8 @@ fi if test ! -f config.sh; then $cat <<EOM -First time through, eh? I have some defaults handy for the following systems: +First time through, eh? I have some defaults handy for some systems +that need some extra help getting the Configure answers right: EOM (cd $src/hints; ls -C *.sh) | $sed 's/\.sh/ /g' >&4 @@ -2056,23 +2057,44 @@ EOM esac ;; esac + if $test -f Policy.sh ; then + case "$dflt" in + *Policy*) ;; + none) dflt="Policy" ;; + *) dflt="Policy $dflt" ;; + esac + fi ;; *) dflt=`echo $hintfile | $sed 's/\.sh$//'` ;; esac + if $test -f Policy.sh ; then + $cat <<EOM + +There's also a Policy hint file available, which should make the +site-specific (policy) questions easier to answer. +EOM + + fi + $cat <<EOM You may give one or more space-separated answers, or "none" if appropriate. -If your OS version has no hints, DO NOT give a wrong version -- say "none". +A well-behaved OS will have no hints, so answering "none" or just "Policy" +is a good thing. DO NOT give a wrong version. EOM + rp="Which of these apply, if any?" . UU/myread tans=$ans for file in $tans; do - if $test -f $src/hints/$file.sh; then + if $test X$file = XPolicy -a -f Policy.sh; then + . Policy.sh + $cat Policy.sh >> UU/config.sh + elif $test -f $src/hints/$file.sh; then . $src/hints/$file.sh $cat $src/hints/$file.sh >> UU/config.sh elif $test X$tans = X -o X$tans = Xnone ; then @@ -3027,6 +3049,393 @@ else echo "Could not find manual pages in source form." >&4 fi +: determine where manual pages go +set man1dir man1dir none +eval $prefixit +$cat <<EOM + +$spackage has manual pages available in source form. +EOM +case "$nroff" in +nroff) + echo "However, you don't have nroff, so they're probably useless to you." + case "$man1dir" in + '') man1dir="none";; + esac;; +esac +echo "If you don't want the manual sources installed, answer 'none'." +case "$man1dir" in +' ') dflt=none + ;; +'') + lookpath="$prefixexp/man/man1 $prefixexp/man/l_man/man1" + lookpath="$lookpath $prefixexp/man/p_man/man1" + lookpath="$lookpath $prefixexp/man/u_man/man1" + lookpath="$lookpath $prefixexp/man/man.1" + case "$sysman" in + */?_man*) dflt=`./loc . $prefixexp/l_man/man1 $lookpath` ;; + *) dflt=`./loc . $prefixexp/man/man1 $lookpath` ;; + esac + set dflt + eval $prefixup + ;; +*) dflt="$man1dir" + ;; +esac +echo " " +fn=dn+~ +rp="Where do the main $spackage manual pages (source) go?" +. ./getfile +if $test "X$man1direxp" != "X$ansexp"; then + installman1dir='' +fi +man1dir="$ans" +man1direxp="$ansexp" +case "$man1dir" in +'') man1dir=' ' + installman1dir='';; +esac +if $afs; then + $cat <<EOM + +Since you are running AFS, I need to distinguish the directory in which +manual pages reside from the directory in which they are installed (and from +which they are presumably copied to the former directory by occult means). + +EOM + case "$installman1dir" in + '') dflt=`echo $man1direxp | sed 's#^/afs/#/afs/.#'`;; + *) dflt="$installman1dir";; + esac + fn=de~ + rp='Where will man pages be installed?' + . ./getfile + installman1dir="$ans" +else + installman1dir="$man1direxp" +fi + +: What suffix to use on installed man pages + +case "$man1dir" in +' ') + man1ext='0' + ;; +*) + rp="What suffix should be used for the main $spackage man pages?" + case "$man1ext" in + '') case "$man1dir" in + *1) dflt=1 ;; + *1p) dflt=1p ;; + *1pm) dflt=1pm ;; + *l) dflt=l;; + *n) dflt=n;; + *o) dflt=o;; + *p) dflt=p;; + *C) dflt=C;; + *L) dflt=L;; + *L1) dflt=L1;; + *) dflt=1;; + esac + ;; + *) dflt="$man1ext";; + esac + . ./myread + man1ext="$ans" + ;; +esac + +: see if we can have long filenames +echo " " +rmlist="$rmlist /tmp/cf$$" +$test -d /tmp/cf$$ || mkdir /tmp/cf$$ +first=123456789abcdef +second=/tmp/cf$$/$first +$rm -f $first $second +if (echo hi >$first) 2>/dev/null; then + if $test -f 123456789abcde; then + echo 'You cannot have filenames longer than 14 characters. Sigh.' >&4 + val="$undef" + else + if (echo hi >$second) 2>/dev/null; then + if $test -f /tmp/cf$$/123456789abcde; then + $cat <<'EOM' +That's peculiar... You can have filenames longer than 14 characters, but only +on some of the filesystems. Maybe you are using NFS. Anyway, to avoid problems +I shall consider your system cannot support long filenames at all. +EOM + val="$undef" + else + echo 'You can have filenames longer than 14 characters.' >&4 + val="$define" + fi + else + $cat <<'EOM' +How confusing! Some of your filesystems are sane enough to allow filenames +longer than 14 characters but some others like /tmp can't even think about them. +So, for now on, I shall assume your kernel does not allow them at all. +EOM + val="$undef" + fi + fi +else + $cat <<'EOM' +You can't have filenames longer than 14 chars. You can't even think about them! +EOM + val="$undef" +fi +set d_flexfnam +eval $setvar +$rm -rf /tmp/cf$$ 123456789abcde* + +: determine where library module manual pages go +set man3dir man3dir none +eval $prefixit +$cat <<EOM + +$spackage has manual pages for many of the library modules. +EOM + +case "$nroff" in +nroff) + $cat <<'EOM' +However, you don't have nroff, so they're probably useless to you. +EOM + case "$man3dir" in + '') man3dir="none";; + esac;; +esac + +case "$d_flexfnam" in +undef) + $cat <<'EOM' +However, your system can't handle the long file names like File::Basename.3. +EOM + case "$man3dir" in + '') man3dir="none";; + esac;; +esac + +echo "If you don't want the manual sources installed, answer 'none'." +prog=`echo $package | $sed 's/-*[0-9.]*$//'` +case "$man3dir" in +'') case "$prefix" in + *$prog*) dflt=`echo $man1dir | + $sed -e 's/man1/man3/g' -e 's/man\.1/man\.3/g'` ;; + *) dflt="$privlib/man/man3" ;; + esac + ;; +' ') dflt=none;; +*) dflt="$man3dir" ;; +esac +echo " " + +fn=dn+~ +rp="Where do the $package library man pages (source) go?" +. ./getfile +if test "X$man3direxp" != "X$ansexp"; then + installman3dir='' +fi + +man3dir="$ans" +man3direxp="$ansexp" +case "$man3dir" in +'') man3dir=' ' + installman3dir='';; +esac +if $afs; then + $cat <<EOM + +Since you are running AFS, I need to distinguish the directory in which +manual pages reside from the directory in which they are installed (and from +which they are presumably copied to the former directory by occult means). + +EOM + case "$installman3dir" in + '') dflt=`echo $man3direxp | sed 's#^/afs/#/afs/.#'`;; + *) dflt="$installman3dir";; + esac + fn=de~ + rp='Where will man pages be installed?' + . ./getfile + installman3dir="$ans" +else + installman3dir="$man3direxp" +fi + +: What suffix to use on installed man pages + +case "$man3dir" in +' ') + man3ext='0' + ;; +*) + rp="What suffix should be used for the $package library man pages?" + case "$man3ext" in + '') case "$man3dir" in + *3) dflt=3 ;; + *3p) dflt=3p ;; + *3pm) dflt=3pm ;; + *l) dflt=l;; + *n) dflt=n;; + *o) dflt=o;; + *p) dflt=p;; + *C) dflt=C;; + *L) dflt=L;; + *L3) dflt=L3;; + *) dflt=3;; + esac + ;; + *) dflt="$man3ext";; + esac + . ./myread + man3ext="$ans" + ;; +esac + +: determine where public executable scripts go +set scriptdir scriptdir +eval $prefixit +case "$scriptdir" in +'') + dflt="$bin" + : guess some guesses + $test -d /usr/share/scripts && dflt=/usr/share/scripts + $test -d /usr/share/bin && dflt=/usr/share/bin + $test -d /usr/local/script && dflt=/usr/local/script + $test -d $prefixexp/script && dflt=$prefixexp/script + set dflt + eval $prefixup + ;; +*) dflt="$scriptdir" + ;; +esac +$cat <<EOM + +Some installations have a separate directory just for executable scripts so +that they can mount it across multiple architectures but keep the scripts in +one spot. You might, for example, have a subdirectory of /usr/share for this. +Or you might just lump your scripts in with all your other executables. + +EOM +fn=d~ +rp='Where do you keep publicly executable scripts?' +. ./getfile +if $test "X$ansexp" != "X$scriptdirexp"; then + installscript='' +fi +scriptdir="$ans" +scriptdirexp="$ansexp" +if $afs; then + $cat <<EOM + +Since you are running AFS, I need to distinguish the directory in which +scripts reside from the directory in which they are installed (and from +which they are presumably copied to the former directory by occult means). + +EOM + case "$installscript" in + '') dflt=`echo $scriptdirexp | sed 's#^/afs/#/afs/.#'`;; + *) dflt="$installscript";; + esac + fn=de~ + rp='Where will public scripts be installed?' + . ./getfile + installscript="$ans" +else + installscript="$scriptdirexp" +fi + +: determine where site specific libraries go. +set sitelib sitelib +eval $prefixit +case "$sitelib" in +'') + prog=`echo $package | $sed 's/-*[0-9.]*$//'` + dflt="$privlib/site_$prog" ;; +*) dflt="$sitelib" ;; +esac +$cat <<EOM + +The installation process will also create a directory for +site-specific extensions and modules. Some users find it convenient +to place all local files in this directory rather than in the main +distribution directory. + +EOM +fn=d~+ +rp='Pathname for the site-specific library files?' +. ./getfile +if $test "X$sitelibexp" != "X$ansexp"; then + installsitelib='' +fi +sitelib="$ans" +sitelibexp="$ansexp" +if $afs; then + $cat <<EOM + +Since you are running AFS, I need to distinguish the directory in +which site-specific files reside from the directory in which they are +installed (and from which they are presumably copied to the former +directory by occult means). + +EOM + case "$installsitelib" in + '') dflt=`echo $sitelibexp | sed 's#^/afs/#/afs/.#'`;; + *) dflt="$installsitelib";; + esac + fn=de~ + rp='Where will site-specific files be installed?' + . ./getfile + installsitelib="$ans" +else + installsitelib="$sitelibexp" +fi + +: determine where site specific architecture-dependent libraries go. +xxx=`echo $sitelib/$archname | sed 's!^$prefix!!'` +: xxx is usuually lib/site_perl/archname. +set sitearch sitearch none +eval $prefixit +case "$sitearch" in +'') dflt="$sitelib/$archname" ;; +*) dflt="$sitearch" ;; +esac +$cat <<EOM + +The installation process will also create a directory for +architecture-dependent site-specific extensions and modules. + +EOM +fn=nd~+ +rp='Pathname for the site-specific architecture-dependent library files?' +. ./getfile +if $test "X$sitearchexp" != "X$ansexp"; then + installsitearch='' +fi +sitearch="$ans" +sitearchexp="$ansexp" +if $afs; then + $cat <<EOM + +Since you are running AFS, I need to distinguish the directory in +which site-specific architecture-dependent library files reside from +the directory in which they are installed (and from which they are +presumably copied to the former directory by occult means). + +EOM + case "$installsitearch" in + '') dflt=`echo $sitearchexp | sed 's#^/afs/#/afs/.#'`;; + *) dflt="$installsitearch";; + esac + fn=de~ + rp='Where will site-specific architecture-dependent files be installed?' + . ./getfile + installsitearch="$ans" +else + installsitearch="$sitearchexp" +fi + : see what memory models we can support case "$models" in '') @@ -4867,250 +5276,6 @@ case "$shrpenv" in '') shrpenv="$tmp_shrpenv" ;; esac -: determine where manual pages go -set man1dir man1dir none -eval $prefixit -$cat <<EOM - -$spackage has manual pages available in source form. -EOM -case "$nroff" in -nroff) - echo "However, you don't have nroff, so they're probably useless to you." - case "$man1dir" in - '') man1dir="none";; - esac;; -esac -echo "If you don't want the manual sources installed, answer 'none'." -case "$man1dir" in -' ') dflt=none - ;; -'') - lookpath="$prefixexp/man/man1 $prefixexp/man/l_man/man1" - lookpath="$lookpath $prefixexp/man/p_man/man1" - lookpath="$lookpath $prefixexp/man/u_man/man1" - lookpath="$lookpath $prefixexp/man/man.1" - case "$sysman" in - */?_man*) dflt=`./loc . $prefixexp/l_man/man1 $lookpath` ;; - *) dflt=`./loc . $prefixexp/man/man1 $lookpath` ;; - esac - set dflt - eval $prefixup - ;; -*) dflt="$man1dir" - ;; -esac -echo " " -fn=dn+~ -rp="Where do the main $spackage manual pages (source) go?" -. ./getfile -if $test "X$man1direxp" != "X$ansexp"; then - installman1dir='' -fi -man1dir="$ans" -man1direxp="$ansexp" -case "$man1dir" in -'') man1dir=' ' - installman1dir='';; -esac -if $afs; then - $cat <<EOM - -Since you are running AFS, I need to distinguish the directory in which -manual pages reside from the directory in which they are installed (and from -which they are presumably copied to the former directory by occult means). - -EOM - case "$installman1dir" in - '') dflt=`echo $man1direxp | sed 's#^/afs/#/afs/.#'`;; - *) dflt="$installman1dir";; - esac - fn=de~ - rp='Where will man pages be installed?' - . ./getfile - installman1dir="$ans" -else - installman1dir="$man1direxp" -fi - -: What suffix to use on installed man pages - -case "$man1dir" in -' ') - man1ext='0' - ;; -*) - rp="What suffix should be used for the main $spackage man pages?" - case "$man1ext" in - '') case "$man1dir" in - *1) dflt=1 ;; - *1p) dflt=1p ;; - *1pm) dflt=1pm ;; - *l) dflt=l;; - *n) dflt=n;; - *o) dflt=o;; - *p) dflt=p;; - *C) dflt=C;; - *L) dflt=L;; - *L1) dflt=L1;; - *) dflt=1;; - esac - ;; - *) dflt="$man1ext";; - esac - . ./myread - man1ext="$ans" - ;; -esac - -: see if we can have long filenames -echo " " -rmlist="$rmlist /tmp/cf$$" -$test -d /tmp/cf$$ || mkdir /tmp/cf$$ -first=123456789abcdef -second=/tmp/cf$$/$first -$rm -f $first $second -if (echo hi >$first) 2>/dev/null; then - if $test -f 123456789abcde; then - echo 'You cannot have filenames longer than 14 characters. Sigh.' >&4 - val="$undef" - else - if (echo hi >$second) 2>/dev/null; then - if $test -f /tmp/cf$$/123456789abcde; then - $cat <<'EOM' -That's peculiar... You can have filenames longer than 14 characters, but only -on some of the filesystems. Maybe you are using NFS. Anyway, to avoid problems -I shall consider your system cannot support long filenames at all. -EOM - val="$undef" - else - echo 'You can have filenames longer than 14 characters.' >&4 - val="$define" - fi - else - $cat <<'EOM' -How confusing! Some of your filesystems are sane enough to allow filenames -longer than 14 characters but some others like /tmp can't even think about them. -So, for now on, I shall assume your kernel does not allow them at all. -EOM - val="$undef" - fi - fi -else - $cat <<'EOM' -You can't have filenames longer than 14 chars. You can't even think about them! -EOM - val="$undef" -fi -set d_flexfnam -eval $setvar -$rm -rf /tmp/cf$$ 123456789abcde* - -: determine where library module manual pages go -set man3dir man3dir none -eval $prefixit -$cat <<EOM - -$spackage has manual pages for many of the library modules. -EOM - -case "$nroff" in -nroff) - $cat <<'EOM' -However, you don't have nroff, so they're probably useless to you. -EOM - case "$man3dir" in - '') man3dir="none";; - esac;; -esac - -case "$d_flexfnam" in -undef) - $cat <<'EOM' -However, your system can't handle the long file names like File::Basename.3. -EOM - case "$man3dir" in - '') man3dir="none";; - esac;; -esac - -echo "If you don't want the manual sources installed, answer 'none'." -prog=`echo $package | $sed 's/-*[0-9.]*$//'` -case "$man3dir" in -'') case "$prefix" in - *$prog*) dflt=`echo $man1dir | - $sed -e 's/man1/man3/g' -e 's/man\.1/man\.3/g'` ;; - *) dflt="$privlib/man/man3" ;; - esac - ;; -' ') dflt=none;; -*) dflt="$man3dir" ;; -esac -echo " " - -fn=dn+~ -rp="Where do the $package library man pages (source) go?" -. ./getfile -if test "X$man3direxp" != "X$ansexp"; then - installman3dir='' -fi - -man3dir="$ans" -man3direxp="$ansexp" -case "$man3dir" in -'') man3dir=' ' - installman3dir='';; -esac -if $afs; then - $cat <<EOM - -Since you are running AFS, I need to distinguish the directory in which -manual pages reside from the directory in which they are installed (and from -which they are presumably copied to the former directory by occult means). - -EOM - case "$installman3dir" in - '') dflt=`echo $man3direxp | sed 's#^/afs/#/afs/.#'`;; - *) dflt="$installman3dir";; - esac - fn=de~ - rp='Where will man pages be installed?' - . ./getfile - installman3dir="$ans" -else - installman3dir="$man3direxp" -fi - -: What suffix to use on installed man pages - -case "$man3dir" in -' ') - man3ext='0' - ;; -*) - rp="What suffix should be used for the $package library man pages?" - case "$man3ext" in - '') case "$man3dir" in - *3) dflt=3 ;; - *3p) dflt=3p ;; - *3pm) dflt=3pm ;; - *l) dflt=l;; - *n) dflt=n;; - *o) dflt=o;; - *p) dflt=p;; - *C) dflt=C;; - *L) dflt=L;; - *L3) dflt=L3;; - *) dflt=3;; - esac - ;; - *) dflt="$man3ext";; - esac - . ./myread - man3ext="$ans" - ;; -esac - : see if we have to deal with yellow pages, now NIS. if $test -d /usr/etc/yp || $test -d /etc/yp; then if $test -f /usr/etc/nibindd; then @@ -5473,149 +5638,6 @@ case "$startperl" in *) echo "I'll use $perlpath in \"eval 'exec'\"" ;; esac -: determine where public executable scripts go -set scriptdir scriptdir -eval $prefixit -case "$scriptdir" in -'') - dflt="$bin" - : guess some guesses - $test -d /usr/share/scripts && dflt=/usr/share/scripts - $test -d /usr/share/bin && dflt=/usr/share/bin - $test -d /usr/local/script && dflt=/usr/local/script - $test -d $prefixexp/script && dflt=$prefixexp/script - set dflt - eval $prefixup - ;; -*) dflt="$scriptdir" - ;; -esac -$cat <<EOM - -Some installations have a separate directory just for executable scripts so -that they can mount it across multiple architectures but keep the scripts in -one spot. You might, for example, have a subdirectory of /usr/share for this. -Or you might just lump your scripts in with all your other executables. - -EOM -fn=d~ -rp='Where do you keep publicly executable scripts?' -. ./getfile -if $test "X$ansexp" != "X$scriptdirexp"; then - installscript='' -fi -scriptdir="$ans" -scriptdirexp="$ansexp" -if $afs; then - $cat <<EOM - -Since you are running AFS, I need to distinguish the directory in which -scripts reside from the directory in which they are installed (and from -which they are presumably copied to the former directory by occult means). - -EOM - case "$installscript" in - '') dflt=`echo $scriptdirexp | sed 's#^/afs/#/afs/.#'`;; - *) dflt="$installscript";; - esac - fn=de~ - rp='Where will public scripts be installed?' - . ./getfile - installscript="$ans" -else - installscript="$scriptdirexp" -fi - -: determine where site specific libraries go. -set sitelib sitelib -eval $prefixit -case "$sitelib" in -'') - prog=`echo $package | $sed 's/-*[0-9.]*$//'` - dflt="$privlib/site_$prog" ;; -*) dflt="$sitelib" ;; -esac -$cat <<EOM - -The installation process will also create a directory for -site-specific extensions and modules. Some users find it convenient -to place all local files in this directory rather than in the main -distribution directory. - -EOM -fn=d~+ -rp='Pathname for the site-specific library files?' -. ./getfile -if $test "X$sitelibexp" != "X$ansexp"; then - installsitelib='' -fi -sitelib="$ans" -sitelibexp="$ansexp" -if $afs; then - $cat <<EOM - -Since you are running AFS, I need to distinguish the directory in -which site-specific files reside from the directory in which they are -installed (and from which they are presumably copied to the former -directory by occult means). - -EOM - case "$installsitelib" in - '') dflt=`echo $sitelibexp | sed 's#^/afs/#/afs/.#'`;; - *) dflt="$installsitelib";; - esac - fn=de~ - rp='Where will site-specific files be installed?' - . ./getfile - installsitelib="$ans" -else - installsitelib="$sitelibexp" -fi - -: determine where site specific architecture-dependent libraries go. -xxx=`echo $sitelib/$archname | sed 's!^$prefix!!'` -: xxx is usuually lib/site_perl/archname. -set sitearch sitearch none -eval $prefixit -case "$sitearch" in -'') dflt="$sitelib/$archname" ;; -*) dflt="$sitearch" ;; -esac -$cat <<EOM - -The installation process will also create a directory for -architecture-dependent site-specific extensions and modules. - -EOM -fn=nd~+ -rp='Pathname for the site-specific architecture-dependent library files?' -. ./getfile -if $test "X$sitearchexp" != "X$ansexp"; then - installsitearch='' -fi -sitearch="$ans" -sitearchexp="$ansexp" -if $afs; then - $cat <<EOM - -Since you are running AFS, I need to distinguish the directory in -which site-specific architecture-dependent library files reside from -the directory in which they are installed (and from which they are -presumably copied to the former directory by occult means). - -EOM - case "$installsitearch" in - '') dflt=`echo $sitearchexp | sed 's#^/afs/#/afs/.#'`;; - *) dflt="$installsitearch";; - esac - fn=de~ - rp='Where will site-specific architecture-dependent files be installed?' - . ./getfile - installsitearch="$ans" -else - installsitearch="$sitearchexp" -fi - cat <<EOM Previous version of $package used the standard IO mechanisms as defined @@ -9167,13 +9189,13 @@ $cc $ccflags -c foo.c >/dev/null 2>&1 $ar rc bar$_a bar2$_o bar1$_o >/dev/null 2>&1 if $cc $ccflags $ldflags -o foobar foo$_o bar$_a $libs > /dev/null 2>&1 && ./foobar >/dev/null 2>&1; then - echo "ar appears to generate random libraries itself." + echo "$ar appears to generate random libraries itself." orderlib=false ranlib=":" elif $ar ts bar$_a >/dev/null 2>&1 && $cc $ccflags $ldflags -o foobar foo$_o bar$_a $libs > /dev/null 2>&1 && ./foobar >/dev/null 2>&1; then - echo "a table of contents needs to be added with 'ar ts'." + echo "a table of contents needs to be added with '$ar ts'." orderlib=false ranlib="$ar ts" else @@ -11000,6 +11022,17 @@ else echo "Done." fi +if $test -f Policy.sh; then + $cat <<EOM + +If you compile $package on a different machine or from a different object +directory, copy the Policy.sh file from this object directory to the +new one before you run Configure -- this will help you with most of +the policy defaults. + +EOM +fi + $rm -f kit*isdone ark*isdone $rm -rf UU @@ -4,7 +4,6 @@ Changes5.000 Differences between 4.x and 5.000 Changes5.001 Differences between 5.000 and 5.001 Changes5.002 Differences between 5.001 and 5.002 Changes5.003 Differences between 5.002 and 5.003 -configure.gnu Crude emulation of GNU configure Configure Portability tool Copying The GNU General Public License EXTERN.h Included before foreign .h files @@ -12,9 +11,10 @@ INSTALL Detailed installation instructions INTERN.h Included before domestic .h files MANIFEST This list of files Makefile.SH A script that generates Makefile +Policy_sh.SH Hold site-wide preferences between Configure runs. Porting/Glossary Glossary of config.sh variables -Porting/config_H Sample config.h Porting/config.sh Sample config.sh +Porting/config_H Sample config.h Porting/makerel Release making utility Porting/patchls Flexible patch file listing utility Porting/pumpkin.pod Guidelines and hints for Perl maintainers @@ -42,6 +42,7 @@ cflags.SH A script that emits C compilation flags per file compat3.sym List of symbols for binary-compatibility with 5.003 config_h.SH Produces config.h configpm Produces lib/Config.pm +configure.gnu Crude emulation of GNU configure cop.h Control operator header cv.h Code value header cygwin32/cw32imp.h Cygwin32 port @@ -261,11 +262,11 @@ ext/Socket/Socket.xs Socket extension external subroutines ext/Thread/Makefile.PL Thread extension makefile writer ext/Thread/Notes Thread notes ext/Thread/README Thread README +ext/Thread/Thread.pm Thread extension Perl module +ext/Thread/Thread.xs Thread extension external subroutines ext/Thread/Thread/Queue.pm Thread synchronised queue objects ext/Thread/Thread/Semaphore.pm Thread semaphore objects ext/Thread/Thread/Specific.pm Thread specific data access -ext/Thread/Thread.pm Thread extension Perl module -ext/Thread/Thread.xs Thread extension external subroutines ext/Thread/create.t Test thread creation ext/Thread/die.t Test thread die() ext/Thread/die2.t Test thread die() differently @@ -588,10 +589,10 @@ os2/diff.configure Patches to Configure os2/dl_os2.c Addon for dl_open os2/dlfcn.h Addon for dl_open os2/os2.c Additional code for OS/2 +os2/os2.sym Additional symbols to export os2/os2ish.h Header for OS/2 -os2/perl2cmd.pl Corrects installed binaries under OS/2 os2/os2thread.h pthread-like typedefs -os2/os2.sym Additional symbols to export +os2/perl2cmd.pl Corrects installed binaries under OS/2 patchlevel.h The current patch level of perl perl.c main() perl.h Global declarations @@ -964,8 +965,8 @@ win32/win32.c Win32 port win32/win32.h Win32 port win32/win32iop.h Win32 port win32/win32sck.c Win32 port -win32/win32thread.h Win32 port mapping to threads win32/win32thread.c Win32 functions for threads +win32/win32thread.h Win32 port mapping to threads writemain.SH Generate perlmain.c from miniperlmain.c+extensions x2p/EXTERN.h Same as above x2p/INTERN.h Same as above diff --git a/Makefile.SH b/Makefile.SH index cea0c240f0..ebbdbe97cc 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -448,10 +448,10 @@ s_dummy $(static_ext): miniperl preplibrary $(DYNALOADER) FORCE clean: _tidy _mopup realclean: _cleaner _mopup - @echo "Note that make realclean does not delete config.sh" + @echo "Note that make realclean does not delete config.sh or Policy.sh" clobber: _cleaner _mopup - rm -f config.sh cppstdin + rm -f config.sh cppstdin Policy.sh distclean: clobber diff --git a/os2/diff.configure b/os2/diff.configure index 9f42dc139f..7bdfa6f585 100644 --- a/os2/diff.configure +++ b/os2/diff.configure @@ -1,6 +1,6 @@ ---- Configure.orig Fri Aug 1 23:12:26 1997 -+++ Configure Fri Aug 1 23:20:24 1997 -@@ -1489,7 +1489,7 @@ +--- Configure Wed Feb 25 16:52:55 1998 ++++ Configure.os2 Wed Feb 25 16:52:58 1998 +@@ -1602,7 +1602,7 @@ *) echo "I don't know where '$file' is, and my life depends on it." >&4 echo "Go find a public domain implementation or fix your PATH setting!" >&4 @@ -9,18 +9,7 @@ ;; esac done -@@ -1498,7 +1498,9 @@ - say=offhand - for file in $trylist; do - xxx=`./loc $file $file $pth` -- eval $file=$xxx -+ if test "X$file" != "X$xxx" ; then -+ eval $file=$xxx -+ fi - eval _$file=$xxx - case "$xxx" in - /*) -@@ -3198,7 +3200,7 @@ +@@ -3637,7 +3637,7 @@ exit(0); } EOM @@ -29,20 +18,7 @@ gccversion=`./gccvers` case "$gccversion" in '') echo "You are not using GNU cc." ;; -@@ -3401,6 +3403,12 @@ - *"-l$thislib "*);; - *) dflt="$dflt -l$thislib";; - esac -+ elif xxx=`./loc $thislib.lib X $libpth`; $test -f "$xxx"; then -+ echo "Found -l$thislib." -+ case " $dflt " in -+ *"-l$thislib "*);; -+ *) dflt="$dflt -l$thislib";; -+ esac - else - echo "No -l$thislib." - fi -@@ -3950,7 +3958,7 @@ +@@ -4434,7 +4434,7 @@ esac ;; esac @@ -51,219 +27,7 @@ case "$libs" in '') ;; *) for thislib in $libs; do -@@ -3972,6 +3980,8 @@ - : - elif try=`./loc $thislib X $libpth`; $test -f "$try"; then - : -+ elif try=`./loc $thislib$lib_ext X $libpth`; $test -f "$try"; then -+ : - elif try=`./loc Slib$thislib$lib_ext X $xlibpth`; $test -f "$try"; then - : - else -@@ -4156,6 +4166,10 @@ - eval $xscan;\ - $contains '^fprintf$' libc.list >/dev/null 2>&1; then - eval $xrun -+elif com="$sed -n -e 's/^[-0-9a-f ]*_\(.*\)=.*/\1/p'";\ -+ eval $xscan;\ -+ $contains '^fprintf$' libc.list >/dev/null 2>&1; then -+ eval $xrun - else - nm -p $* 2>/dev/null >libc.tmp - $grep fprintf libc.tmp > libc.ptf -@@ -4166,23 +4180,33 @@ - eval $xrun - else - echo " " -- echo "nm didn't seem to work right. Trying ar instead..." >&4 -+ echo "nm didn't seem to work right. Trying $ar instead..." >&4 - com='' -- if ar t $libc > libc.tmp; then -- for thisname in $libnames; do -- ar t $thisname >>libc.tmp -+ if test "X$osname" = "Xos2"; then ar_opt=tv ; else ar_opt=t ;fi -+ if $ar $ar_opt $libc > libc.tmp; then -+ echo \; > libc.tmp -+ for thisname in $libnames $libc; do -+ $ar $ar_opt $thisname >>libc.tmp -+ if test "X$osname" = "Xos2"; then -+ # Revision 50 of EMX has bug in $ar: -+ emximp -o tmp.imp $thisname \ -+ 2>/dev/null && \ -+ $sed -e 's/^\([_a-zA-Z0-9]*\) .*$/\1/p' \ -+ < tmp.imp >>libc.tmp -+ $rm tmp.imp -+ fi - done -- $sed -e 's/\.o$//' < libc.tmp > libc.list -+ $sed -e 's/\.o$//' -e 's/^ \+//' < libc.tmp | grep -v "^IMPORT#" > libc.list - echo "Ok." >&4 - else -- echo "ar didn't seem to work right." >&4 -+ echo "$ar didn't seem to work right." >&4 - echo "Maybe this is a Cray...trying bld instead..." >&4 - if bld t $libc | $sed -e 's/.*\///' -e 's/\.o:.*$//' > libc.list - then - for thisname in $libnames; do - bld t $libnames | \ - $sed -e 's/.*\///' -e 's/\.o:.*$//' >>libc.list -- ar t $thisname >>libc.tmp -+ $ar t $thisname >>libc.tmp - done - echo "Ok." >&4 - else -@@ -5611,15 +5635,15 @@ - EOCP - : check sys/file.h first, no particular reason here - if $test `./findhdr sys/file.h` && \ -- $cc $cppflags -DI_SYS_FILE access.c -o access >/dev/null 2>&1 ; then -+ $cc $ldflags $cppflags -DI_SYS_FILE access.c -o access >/dev/null 2>&1 ; then - h_sysfile=true; - echo "<sys/file.h> defines the *_OK access constants." >&4 - elif $test `./findhdr fcntl.h` && \ -- $cc $cppflags -DI_FCNTL access.c -o access >/dev/null 2>&1 ; then -+ $cc $ldflags $cppflags -DI_FCNTL access.c -o access >/dev/null 2>&1 ; then - h_fcntl=true; - echo "<fcntl.h> defines the *_OK access constants." >&4 - elif $test `./findhdr unistd.h` && \ -- $cc $cppflags -DI_UNISTD access.c -o access >/dev/null 2>&1 ; then -+ $cc $ldflags $cppflags -DI_UNISTD access.c -o access >/dev/null 2>&1 ; then - echo "<unistd.h> defines the *_OK access constants." >&4 - else - echo "I can't find the four *_OK access constants--I'll use mine." >&4 -@@ -5913,7 +5937,7 @@ - exit(result); - } - EOCP --if $cc -o try $ccflags try.c >/dev/null 2>&1; then -+if $cc -o try $ccflags try.c $ldflags >/dev/null 2>&1; then - ./try - yyy=$? - else -@@ -5994,7 +6018,7 @@ - - } - EOCP --if $cc -o try $ccflags try.c >/dev/null 2>&1; then -+if $cc -o try $ccflags try.c $ldflags >/dev/null 2>&1; then - ./try - castflags=$? - else -@@ -6033,7 +6057,7 @@ - exit((unsigned long)vsprintf(buf,"%s",args) > 10L); - } - EOF -- if $cc $ccflags vprintf.c -o vprintf >/dev/null 2>&1 && ./vprintf; then -+ if $cc $ccflags vprintf.c $ldflags -o vprintf >/dev/null 2>&1 && ./vprintf; then - echo "Your vsprintf() returns (int)." >&4 - val2="$undef" - else -@@ -6381,7 +6405,7 @@ - EOCP - : check sys/file.h first to get FREAD on Sun - if $test `./findhdr sys/file.h` && \ -- $cc $ccflags "-DI_SYS_FILE" -o open3 $ldflags open3.c $libs >/dev/null 2>&1 ; then -+ $cc $ldflags $ccflags "-DI_SYS_FILE" -o open3 $ldflags open3.c $libs >/dev/null 2>&1 ; then - h_sysfile=true; - echo "<sys/file.h> defines the O_* constants..." >&4 - if ./open3; then -@@ -6392,7 +6416,7 @@ - val="$undef" - fi - elif $test `./findhdr fcntl.h` && \ -- $cc $ccflags "-DI_FCNTL" -o open3 $ldflags open3.c $libs >/dev/null 2>&1 ; then -+ $cc $ldflags $ccflags "-DI_FCNTL" -o open3 $ldflags open3.c $libs >/dev/null 2>&1 ; then - h_fcntl=true; - echo "<fcntl.h> defines the O_* constants..." >&4 - if ./open3; then -@@ -6898,7 +6922,7 @@ - y*|true) - usemymalloc='y' - mallocsrc='malloc.c' -- mallocobj='malloc.o' -+ mallocobj="malloc$obj_ext" - d_mymalloc="$define" - case "$libs" in - *-lmalloc*) -@@ -8156,7 +8180,7 @@ - printf("%d\n", (char *)&try.bar - (char *)&try.foo); - } - EOCP -- if $cc $ccflags try.c -o try >/dev/null 2>&1; then -+ if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1; then - dflt=`./try` - else - dflt='8' -@@ -8204,7 +8228,7 @@ - } - EOCP - xxx_prompt=y -- if $cc $ccflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then -+ if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then - dflt=`./try` - case "$dflt" in - [1-4][1-4][1-4][1-4]|12345678|87654321) -@@ -8711,18 +8735,18 @@ - $cc $ccflags -c bar1.c >/dev/null 2>&1 - $cc $ccflags -c bar2.c >/dev/null 2>&1 - $cc $ccflags -c foo.c >/dev/null 2>&1 --ar rc bar$lib_ext bar2.o bar1.o >/dev/null 2>&1 -+$ar rc bar$lib_ext bar2.o bar1.o >/dev/null 2>&1 - if $cc $ccflags $ldflags -o foobar foo.o bar$lib_ext $libs > /dev/null 2>&1 && - ./foobar >/dev/null 2>&1; then -- echo "ar appears to generate random libraries itself." -+ echo "$ar appears to generate random libraries itself." - orderlib=false - ranlib=":" --elif ar ts bar$lib_ext >/dev/null 2>&1 && -+elif $ar ts bar$lib_ext >/dev/null 2>&1 && - $cc $ccflags $ldflags -o foobar foo.o bar$lib_ext $libs > /dev/null 2>&1 && - ./foobar >/dev/null 2>&1; then -- echo "a table of contents needs to be added with 'ar ts'." -+ echo "a table of contents needs to be added with '$ar ts'." - orderlib=false -- ranlib="ar ts" -+ ranlib="$ar ts" - else - case "$ranlib" in - :) ranlib='';; -@@ -8794,7 +8818,7 @@ - '') $echo $n ".$c" - if $cc $ccflags \ - $i_time $i_systime $i_systimek $sysselect $s_timeval $s_timezone \ -- try.c -o try >/dev/null 2>&1 ; then -+ try.c -o try $ldflags >/dev/null 2>&1 ; then - set X $i_time $i_systime $i_systimek $sysselect $s_timeval - shift - flags="$*" -@@ -8863,7 +8887,7 @@ - #endif - } - EOCP --if $cc $ccflags -DTRYBITS fd_set.c -o fd_set >fd_set.out 2>&1 ; then -+if $cc $ccflags $ldflags -DTRYBITS fd_set.c -o fd_set >fd_set.out 2>&1 ; then - d_fds_bits="$define" - d_fd_set="$define" - echo "Well, your system knows about the normal fd_set typedef..." >&4 -@@ -8880,7 +8904,7 @@ - $cat <<'EOM' - Hmm, your compiler has some difficulty with fd_set. Checking further... - EOM -- if $cc $ccflags fd_set.c -o fd_set >fd_set.out 2>&1 ; then -+ if $cc $ccflags $ldflags fd_set.c -o fd_set >fd_set.out 2>&1 ; then - d_fds_bits="$undef" - d_fd_set="$define" - echo "Well, your system has some sort of fd_set available..." >&4 -@@ -9627,7 +9651,7 @@ - else - echo "false" - fi --$rm -f varargs.o -+$rm -f varargs$obj_ext - EOP - chmod +x varargs - -@@ -9954,7 +9978,7 @@ +@@ -10392,7 +10392,7 @@ echo " " echo "Stripping down executable paths..." >&4 for file in $loclist $trylist; do |