cvs commit: modperl-2.0 Makefile.PL

[dougm]

dougm       01/04/20 10:43:04

  Modified:    .        Makefile.PL
  Log:
  need to push tables_dir into @INC when xs is not generated
  
  Revision  Changes    Path
  1.34      +11 -5     modperl-2.0/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- Makefile.PL       2001/04/12 16:03:55     1.33
  +++ Makefile.PL       2001/04/20 17:42:57     1.34
  @@ -73,7 +73,14 @@
           generate_script($_);
       }
   
  -    generate_xs($httpd_version) if $build->{MP_GENERATE_XS};
  +    my $tables_dir = tables_dir($httpd_version);
  +
  +    unshift @INC, $tables_dir;
  +
  +    if ($build->{MP_GENERATE_XS}) {
  +        print "generating XS code using $tables_dir...\n";
  +        generate_xs($httpd_version);
  +    }
   }
   
   sub post_configure {
  @@ -97,7 +104,7 @@
       $build->save;
   }
   
  -sub generate_xs {
  +sub tables_dir {
       my $httpd_version = shift;
   
       my $tables_version = 'current';
  @@ -105,10 +112,9 @@
       #$httpd_version =~ /-dev$/ ? 'current' : $httpd_version;
   
       my $tables_dir = "xs/tables/$tables_version";
  -    unshift @INC, $tables_dir;
  -
  -    print "generating XS code using $tables_dir...\n";
  +}
   
  +sub generate_xs {
       require ModPerl::WrapXS;
   
       my $xs = ModPerl::WrapXS->new;