perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ran...@apache.org
Subject cvs commit: modperl-2.0/xs/APR/aprext Makefile.PL
Date Mon, 28 Jun 2004 02:10:02 GMT
randyk      2004/06/27 19:10:02

  Modified:    lib/ModPerl Code.pm
               xs/APR/APR Makefile.PL
               xs/APR/aprext Makefile.PL
  Log:
  Reviewed by:	stas
  introduce a sub in ModPerl::Code which generates the names of the
  src/module/perl/*.c files needed for compiling APR/APR::* without
  the need of mod_perl.so, and use this within xs/APR/APR/Makefile.PL
  and xs/APR/aprext/Makefile.PL.
  
  Revision  Changes    Path
  1.124     +7 -0      modperl-2.0/lib/ModPerl/Code.pm
  
  Index: Code.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/Code.pm,v
  retrieving revision 1.123
  retrieving revision 1.124
  diff -u -r1.123 -r1.124
  --- Code.pm	16 Jun 2004 03:55:47 -0000	1.123
  +++ Code.pm	28 Jun 2004 02:10:02 -0000	1.124
  @@ -1085,6 +1085,13 @@
       }
   }
   
  +# src/modules/perl/*.c files needed to build APR/APR::* outside
  +# of mod_perl.so
  +sub src_apr_ext {
  +    return map { "modperl_$_" } (qw(error bucket),
  +                                  map { "common_$_" } qw(util log));
  +}
  +
   1;
   __END__
   
  
  
  
  1.23      +3 -2      modperl-2.0/xs/APR/APR/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/APR/APR/Makefile.PL,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Makefile.PL	26 Jun 2004 19:41:54 -0000	1.22
  +++ Makefile.PL	28 Jun 2004 02:10:02 -0000	1.23
  @@ -3,6 +3,7 @@
   
   use lib qw(../lib);
   use ModPerl::BuildMM ();
  +require ModPerl::Code;
   use Apache::Build ();
   use Config;
   use File::Spec::Functions;
  @@ -62,8 +63,8 @@
   
   # link the following into APR.so so other APR:: modules can be used
   # outside of httpd
  -my @names = map { "modperl_$_" } (qw(error bucket),
  -                                  map { "common_$_" } qw(util log));
  +my @names = ModPerl::Code::src_apr_ext();
  +
   my(@obj, @clean, %src);
   for (@names) {
       push @obj, join '.', $_, 'o';
  
  
  
  1.2       +3 -2      modperl-2.0/xs/APR/aprext/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/APR/aprext/Makefile.PL,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.PL	26 Jun 2004 19:41:54 -0000	1.1
  +++ Makefile.PL	28 Jun 2004 02:10:02 -0000	1.2
  @@ -3,11 +3,12 @@
   
   use lib qw(../lib);
   use ModPerl::BuildMM ();
  +require ModPerl::Code;
   use Apache::Build ();
   
   my $srcdir = '../../../src/modules/perl';
  -my @names = map { "modperl_$_" } (qw(error bucket),
  -                                  map { "common_$_" } qw(util log));
  +my @names = ModPerl::Code::src_apr_ext();
  +
   my(@obj, @clean, %src);
   for (@names) {
       push @obj, join '.', $_, 'o';
  
  
  

Mime
View raw message