cvs commit: modperl-2.0/lib/Apache Build.pm

[stas]

stas        2003/08/12 10:47:52

  Modified:    lib/Apache Build.pm
  Log:
  find apr-config when the source tree is configured interactively
  
  Revision  Changes    Path
  1.132     +5 -1      modperl-2.0/lib/Apache/Build.pm
  
  Index: Build.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
  retrieving revision 1.131
  retrieving revision 1.132
  diff -u -r1.131 -r1.132
  --- Build.pm  11 Aug 2003 20:01:03 -0000      1.131
  +++ Build.pm  12 Aug 2003 17:47:52 -0000      1.132
  @@ -733,6 +733,9 @@
               map $self->apxs(-q => $_), qw(APR_BINDIR BINDIR);
           push @tries, catdir $self->{MP_AP_PREFIX}, "bin"
               if exists $self->{MP_AP_PREFIX} and -d $self->{MP_AP_PREFIX};
  +        # could be the source tree configured interactively
  +        push @tries, catdir $self->{dir}, "srclib", "apr"
  +            if exists $self->{dir} and -d $self->{dir};
   
           for (@tries) {
               my $try = catfile $_, "apr-config";
  @@ -788,8 +791,9 @@
           $self->{apr_includedir} = $incdir;
       }
       else {
  -        die "Can't find apr include/ directory,\n",
  +        error "Can't find apr include/ directory,",
               "use MP_APR_CONFIG=/path/to/apr-config";
  +        exit 1;
       }
   
       $self->{apr_includedir};