You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by sb...@apache.org on 2001/06/16 14:35:24 UTC

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

sbekman     01/06/16 05:35:23

  Modified:    lib/ModPerl Config.pm
  Log:
  it's possible that httpd wasn't built yet, yet we want this script to work
  
  Revision  Changes    Path
  1.4       +12 -4     modperl-2.0/lib/ModPerl/Config.pm
  
  Index: Config.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/Config.pm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Config.pm	2001/04/25 03:14:44	1.3
  +++ Config.pm	2001/06/16 12:35:23	1.4
  @@ -13,17 +13,25 @@
   
       $cfg .= "*** using $INC{'Apache/BuildConfig.pm'}\n";
   
  +    # mod_perl opts
       $cfg .= "*** Makefile.PL options:\n";
       $cfg .= join '',
           map {sprintf "    %-20s => %s\n", $_, $build_config->{$_}}
               grep /^MP_/, sort keys %$build_config;
   
  +    my $command = '';
  +
  +    # httpd opts
       my $test_config = Apache::TestConfig->new;
  -    my $httpd = $test_config->{vars}->{httpd};
  -    my $command = "$httpd -V";
  -    $cfg .= "\n\n*** $command\n";
  -    $cfg .= qx{$command};
  +    if (my $httpd = $test_config->{vars}->{httpd}) {
  +        $command = "$httpd -V";
  +        $cfg .= "\n\n*** $command\n";
  +        $cfg .= qx{$command};
  +    } else {
  +        $cfg .= "\n\n*** The httpd binary was not found\n";
  +    }
   
  +    # perl opts
       my $perl = $build_config->{MODPERL_PERLPATH};
       $command = "$perl -V";
       $cfg .= "\n\n*** $command\n";