X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=configpm;h=86abd6d48701af82c50aca85c853995a2f83f727;hb=7c9e965c652c539b7064f0b192c92dbee8a21bcc;hp=31b416b7a3c11fcd5e005326ce895775f716bfb8;hpb=45c9e83b07a146ad42e19f44b9def27ecbdcd9e2;p=p5sagit%2Fp5-mst-13.2.git diff --git a/configpm b/configpm index 31b416b..86abd6d 100755 --- a/configpm +++ b/configpm @@ -60,7 +60,7 @@ $in_v = 0; while (<>) { next if m:^#!/bin/sh:; - # Catch CONFIGDOTSH=true and PERL_VERSION=n line from Configure. + # Catch PERL_CONFIG_SH=true and PERL_VERSION=n line from Configure. s/^(\w+)=(true|\d+)\s*$/$1='$2'\n/; my ($k,$v) = ($1,$2); # grandfather PATCHLEVEL and SUBVERSION and CONFIG @@ -71,7 +71,7 @@ while (<>) { elsif ($k eq 'PERL_SUBVERSION') { push @v_others, "SUBVERSION='$v'\n"; } - elsif ($k eq 'CONFIGDOTSH') { + elsif ($k eq 'PERL_CONFIG_SH') { push @v_others, "CONFIG='$v'\n"; } } @@ -274,6 +274,7 @@ if ($OS2::is_aout) { $preconfig{$_} = $v eq 'undef' ? undef : $v; } } +$preconfig{d_fork} = undef unless $OS2::can_fork; # Some funny cases can't sub TIEHASH { bless {%preconfig} } ENDOFSET } else { @@ -418,7 +419,7 @@ EOF print CONFIG <