cvs commit: modperl-2.0/lib/ModPerl BuildOptions.pm

2003-02-20 Thread randyk
randyk  2003/02/19 21:19:14

  Modified:lib/ModPerl BuildOptions.pm
  Log:
  Reviewed by: stas
  
  Revision  ChangesPath
  1.17  +7 -0  modperl-2.0/lib/ModPerl/BuildOptions.pm
  
  Index: BuildOptions.pm
  ===
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/BuildOptions.pm,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- BuildOptions.pm   21 May 2002 16:48:29 -  1.16
  +++ BuildOptions.pm   20 Feb 2003 05:19:14 -  1.17
  @@ -3,6 +3,7 @@
   use strict;
   use warnings;
   
  +use Apache::Build ();
   my $param_qr = qr([\s=]+);
   
   use constant VERBOSE = 1;
  @@ -66,6 +67,12 @@
   if($key eq 'MP_APXS') {
   $val = File::Spec-canonpath(File::Spec-rel2abs($val));
   }
  +
  + # MP_AP_PREFIX may not contain spaces
  + if ($key eq 'MP_AP_PREFIX'  Apache::Build::WIN32()) {
  +require Win32;
  + $val = Win32::GetShortPathName($val);
  + }
   
   if ($self-{$key}) {
   $self-{$key} .= ' ';
  
  
  



cvs commit: modperl Makefile.PL

2003-02-20 Thread randyk
randyk  2003/02/20 08:34:35

  Modified:.Makefile.PL
  Log:
  Reviewed by:  stas
  
  Enable PERL_SECTIONS for Win32
  
  Revision  ChangesPath
  1.207 +2 -1  modperl/Makefile.PL
  
  Index: Makefile.PL
  ===
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.206
  retrieving revision 1.207
  diff -u -r1.206 -r1.207
  --- Makefile.PL   20 Feb 2003 16:28:35 -  1.206
  +++ Makefile.PL   20 Feb 2003 16:34:35 -  1.207
  @@ -792,7 +792,8 @@
(need 1.2.0 or higher);
   }
   
  -$PERL_SECTIONS = $PERL_SSI = 0 if $Is_Win32;
  +#$PERL_SECTIONS = $PERL_SSI = 0 if $Is_Win32;
  +$PERL_SSI = 0 if $Is_Win32;
   unless ($Is_Win32) {
 for (qw(PERL_SECTIONS PERL_SSI), keys %experimental) {
$k = $_;
  
  
  



cvs commit: modperl Makefile.PL

2003-02-20 Thread randyk
randyk  2003/02/20 08:42:46

  Modified:.Makefile.PL
  Log:
  Reviewed by:  stas
  
  Use Perl's touch(), in case a system touch() isn't available.
  
  Revision  ChangesPath
  1.208 +5 -1  modperl/Makefile.PL
  
  Index: Makefile.PL
  ===
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.207
  retrieving revision 1.208
  diff -u -r1.207 -r1.208
  --- Makefile.PL   20 Feb 2003 16:34:35 -  1.207
  +++ Makefile.PL   20 Feb 2003 16:42:46 -  1.208
  @@ -1602,7 +1602,11 @@
my $to = '$(INST_ARCHLIB)/' . auto/Apache/include/$_;
unless ($self-{PM}-{$from}) {
$self-{PM}-{$from} = $to;
  - system $Config{touch} $from;
  +#system $Config{touch} $from;
  + my @args = ($Config{perlpath}, '-MExtUtils::Command', 
  + '-e', 'touch', $from);
  + system(@args) == 0
  + or die system @args failed: $?;
}
   }