perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@locus.apache.org
Subject cvs commit: modperl/lib/Apache src.pm
Date Fri, 03 Mar 2000 23:37:05 GMT
dougm       00/03/03 15:37:04

  Modified:    .        Makefile.PL Changes
               lib/Apache src.pm
  Log:
  mod_perl.exp is now installed
  
  Revision  Changes    Path
  1.142     +1 -1      modperl/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.141
  retrieving revision 1.142
  diff -u -r1.141 -r1.142
  --- Makefile.PL	2000/03/03 06:27:06	1.141
  +++ Makefile.PL	2000/03/03 23:37:01	1.142
  @@ -1405,7 +1405,7 @@
   	finddepth(\&wanted, $ap_src);
       }
       $self->{PM}{"Apache/typemap"} = '$(INST_ARCHLIB)/' . "auto/Apache/typemap";
  -
  +    $self->{PM}{"apaci/mod_perl.exp"} = '$(INST_ARCHLIB)/' . "auto/Apache/mod_perl.exp";
       for (qw(ap_config_auto.h)) {
   	my $from = "$ap_inc/$_";
   	my $to = '$(INST_ARCHLIB)/' . "auto/Apache/include/$_";
  
  
  
  1.390     +2 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.389
  retrieving revision 1.390
  diff -u -r1.389 -r1.390
  --- Changes	2000/03/03 22:20:17	1.389
  +++ Changes	2000/03/03 23:37:01	1.390
  @@ -10,6 +10,8 @@
   
   =item 1.21_01-dev
   
  +mod_perl.exp is now installed
  +
   aix tweaks for building with apxs
   [Jens-Uwe Mager <jum@helios.de>]
   
  
  
  
  1.18      +16 -6     modperl/lib/Apache/src.pm
  
  Index: src.pm
  ===================================================================
  RCS file: /home/cvs/modperl/lib/Apache/src.pm,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- src.pm	2000/03/03 20:42:02	1.17
  +++ src.pm	2000/03/03 23:37:03	1.18
  @@ -192,16 +192,26 @@
       return $version;
   }
   
  -sub typemaps {
  -    my $typemaps = [];
  -    
  +sub find_in_inc {
  +    my $name = shift;
       for (@INC) {
   	my $file;
  -	if (-e ($file = "$_/auto/Apache/typemap")) {
  -	    push @$typemaps, $file;
  -	    last;
  +	if (-e ($file = "$_/auto/Apache/$name")) {
  +	    return $file;
   	}
       }
  +}
  +
  +#XXX
  +#do similar for mod_perl.exp and httpd.exp
  +
  +sub typemaps {
  +    my $typemaps = [];
  +    
  +    if (my $file = find_in_inc("typemap")) {
  +	push @$typemaps, $file;
  +    }
  +
       if(IS_MOD_PERL_BUILD) {
   	push @$typemaps, "../Apache/typemap";
       }
  
  
  

Mime
View raw message