perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: modperl-2.0/lib/ModPerl MM.pm BuildOptions.pm
Date Sat, 03 Mar 2001 23:11:02 GMT
dougm       01/03/03 15:11:02

  Modified:    lib/ModPerl MM.pm BuildOptions.pm
  Log:
  allow MP_XS_GLUE_DIR option to hook in third-party auto-generated xs modules
  
  Revision  Changes    Path
  1.6       +9 -1      modperl-2.0/lib/ModPerl/MM.pm
  
  Index: MM.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/MM.pm,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MM.pm	2001/02/08 19:20:28	1.5
  +++ MM.pm	2001/03/03 23:11:01	1.6
  @@ -54,7 +54,15 @@
   sub WriteMakefile {
       my $build = build_config();
       my_import();
  -    my @opts = (INC => $build->inc, CCFLAGS => $build->ap_ccopts);
  +
  +    my $inc = $build->inc;
  +    if (my $glue_inc = $build->{MP_XS_GLUE_DIR}) {
  +	for (split /\s+/, $glue_inc) {
  +	    $inc .= " -I$_";
  +	}
  +    }
  +
  +    my @opts = (INC => $inc, CCFLAGS => $build->ap_ccopts);
   
       my @typemaps;
       my $pwd = Cwd::fastcwd();
  
  
  
  1.4       +1 -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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BuildOptions.pm	2001/01/04 05:57:39	1.3
  +++ BuildOptions.pm	2001/03/03 23:11:01	1.4
  @@ -145,3 +145,4 @@
   OPTIONS_FILE	Read options from given file
   DYNAMIC		Build Apache::*.xs as dynamic extensions
   APXS            Path to apxs
  +XS_GLUE_DIR     Directories containing extension glue
  
  
  

Mime
View raw message