[EMAIL PROTECTED] wrote:
geoff 2004/09/03 06:02:39
Modified: lib/Apache Build.pm
Log:
polish build in cases where apr, apr-util, and httpd all live in
separate directories.
Submitted by: Joe Orton
+1
Revision Changes Path
1.173 +2 -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.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- Build.pm 25 Aug 2004 17:20:00 -0000 1.172
+++ Build.pm 3 Sep 2004 13:02:39 -0000 1.173
@@ -975,6 +975,7 @@
my $key = "${what}_config_path"; # apr_config_path
my $mp_key = "MP_" . uc($what) . "_CONFIG"; # MP_APR_CONFIG
+ my $bindir = uc($what) . "_BINDIR"; # APR_BINDIR
return $self->{$key} if $self->{$key} and -x $self->{$key};
@@ -993,7 +994,7 @@
}
else {
push @tries, grep length,
- map $self->apxs(-q => $_), qw(APR_BINDIR BINDIR);
+ map $self->apxs(-q => $_), $bindir, "BINDIR";
push @tries, catdir $self->{MP_AP_PREFIX}, "bin"
if exists $self->{MP_AP_PREFIX} and -d $self->{MP_AP_PREFIX};
}
--
__________________________________________________________________
Stas Bekman JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/ mod_perl Guide ---> http://perl.apache.org
mailto:[EMAIL PROTECTED] http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org http://ticketmaster.com
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
