You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by do...@hyperreal.org on 1998/12/12 00:04:02 UTC

cvs commit: modperl/lib/Apache ExtUtils.pm

dougm       98/12/11 15:04:01

  Modified:    .        Changes ToDo
               lib/Apache ExtUtils.pm
  Log:
  Apache::ExtUtils will complain if it can't determine the
  directive handler prototype (args_how), rather than fail during 'make'
  
  Revision  Changes    Path
  1.225     +3 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.224
  retrieving revision 1.225
  diff -u -r1.224 -r1.225
  --- Changes	1998/12/11 22:44:02	1.224
  +++ Changes	1998/12/11 23:03:59	1.225
  @@ -8,6 +8,9 @@
   
   =item 1.16_03-dev
   
  +Apache::ExtUtils will complain if it can't determine the
  +directive handler prototype (args_how), rather than fail during 'make'
  +
   default --with-layout to `Apache' for 1.3.4, can be overridden with
   APACI_ARGS or APACHE_LAYOUT Makefile.PL attribute
   
  
  
  
  1.129     +2 -2      modperl/ToDo
  
  Index: ToDo
  ===================================================================
  RCS file: /home/cvs/modperl/ToDo,v
  retrieving revision 1.128
  retrieving revision 1.129
  diff -u -r1.128 -r1.129
  --- ToDo	1998/12/11 22:44:03	1.128
  +++ ToDo	1998/12/11 23:04:00	1.129
  @@ -3,6 +3,8 @@
                    (well, close to it anyhow)
   ---------------------------------------------------------------------------
   
  +- turn of strip of httpd in Apache's install.sh
  +
   - -e and setuid problem (Steve Neilsen)
   
   - method handler called when it shouldn't be? (Ken)
  @@ -12,8 +14,6 @@
   - Apache::Status extensions (ix)
   
   - <perl> sections and DirectoryIndex (Eric Cholet)
  -
  -- Apache::ExtUtils error checking
   
   - Perl{Set,Pass}Env tainted, should they not be? (Vivek)
   
  
  
  
  1.14      +11 -1     modperl/lib/Apache/ExtUtils.pm
  
  Index: ExtUtils.pm
  ===================================================================
  RCS file: /home/cvs/modperl/lib/Apache/ExtUtils.pm,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ExtUtils.pm	1998/11/13 21:38:57	1.13
  +++ ExtUtils.pm	1998/12/11 23:04:01	1.14
  @@ -7,6 +7,7 @@
   
   *import = \&Exporter::import;
   @Apache::ExtUtils::EXPORT = qw(command_table);
  +my $errsv = "";
   
   sub command_table {
       my($class, $cmds);
  @@ -23,12 +24,18 @@
   	require "$file.pm"; #so we can see prototypes
       };
       if ($@) {
  +	unless ($@ =~ /Can.t locate /) {
  +	    $errsv = $@;
  +	}
   	require ExtUtils::testlib;
           ExtUtils::testlib->import;
   	require lib;
   	my $lib = "lib";#hmm, lib->import + -w == Unquoted string "lib" ...
   	$lib->import('./lib');
   	eval { require $class };
  +	if ($@ and $@ !~ /Can.t locate /) {
  +	    $errsv ||= $@;
  +	}
       }
       unless (-e "$file.xs.orig") {
           File::Copy::cp("$file.xs", "$file.xs.orig");
  @@ -117,7 +124,10 @@
   	    }
   	}
   	$desc ||= "1-3 value(s) for $name";
  -
  +	unless ($args_how) {
  +	    $errsv ||= $@;
  +	    die "Can't determine prototype for `$sub': $errsv";
  +	}
   	(my $cname = $name) =~ s/\W/_/g;
   	$infos .= cmd_info($cname, $sub, $cmd_data, $args_how);
   	$cmdtab .= <<EOF;