Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@perl.apache.org
Date: 21 Sep 2004 06:51:10 -0000
Message-ID: <20040921065110.91501.qmail@minotaur.apache.org>
From: gozer@apache.org
To: modperl-2.0-cvs@apache.org
Subject: cvs commit: modperl-2.0/lib/Apache Build.pm

gozer       2004/09/20 23:51:10

  Modified:    .        Changes
               lib/Apache Build.pm
  Log:
  In the static build, run make in httpd's srclib/ early to have
  generated files present at mod_perl configure time
  
  Revision  Changes    Path
  1.492     +3 -0      modperl-2.0/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Changes,v
  retrieving revision 1.491
  retrieving revision 1.492
  diff -u -r1.491 -r1.492
  --- Changes	21 Sep 2004 06:43:53 -0000	1.491
  +++ Changes	21 Sep 2004 06:51:10 -0000	1.492
  @@ -12,6 +12,9 @@
   
   =item 1.99_17-dev
   
  +In the static build, run make in httpd's srclib/ early to have
  +generated files present at mod_perl configure time [Gozer]
  +
   When searching for ap(r|u)-config in httpd's source tree, search
   into srclib/apr-util as well as srclib/apr [Gozer]
   
  
  
  
  1.182     +7 -0      modperl-2.0/lib/Apache/Build.pm
  
  Index: Build.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
  retrieving revision 1.181
  retrieving revision 1.182
  diff -u -r1.181 -r1.182
  --- Build.pm	21 Sep 2004 06:43:53 -0000	1.181
  +++ Build.pm	21 Sep 2004 06:51:10 -0000	1.182
  @@ -285,6 +285,13 @@
       my $cmd = qq(./configure $self->{MP_AP_CONFIGURE});
       debug "Running $cmd";
       system("$cd && $cmd") == 0 or die "httpd: $cmd failed";
  +
  +    # Got to build in srclib/* early to have generated files present.
  +    my $srclib = File::Spec->catfile($self->{MP_AP_PREFIX}, 'srclib');
  +    $cd = qq(cd $srclib);
  +    $cmd = qq(make);
  +    debug "Building srclib in $srclib";
  +    system("$cd && $cmd") == 0 or die "srclib: $cmd failed";
   }
   
   #--- Perl Config stuff ---