stas 2003/08/13 15:54:10
Modified: lib/ModPerl BuildOptions.pm
lib/Apache Build.pm
Log:
must expand httpd source dir into a full path
Revision Changes Path
1.21 +8 -4 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- BuildOptions.pm 22 Apr 2003 07:53:21 -0000 1.20
+++ BuildOptions.pm 13 Aug 2003 22:54:10 -0000 1.21
@@ -73,10 +73,14 @@
$val = File::Spec->canonpath(File::Spec->rel2abs($val));
}
- # MP_AP_PREFIX may not contain spaces
- if ($key eq 'MP_AP_PREFIX' && Apache::Build::WIN32()) {
- require Win32;
- $val = Win32::GetShortPathName($val);
+ if ($key eq 'MP_AP_PREFIX') {
+ $val = File::Spec->canonpath(File::Spec->rel2abs($val));
+
+ if (Apache::Build::WIN32()) {
+ # MP_AP_PREFIX may not contain spaces
+ require Win32;
+ $val = Win32::GetShortPathName($val);
+ }
}
if ($self->{$key}) {
1.140 +2 -3 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.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- Build.pm 13 Aug 2003 22:47:50 -0000 1.139
+++ Build.pm 13 Aug 2003 22:54:10 -0000 1.140
@@ -6,7 +6,7 @@
use Config;
use Cwd ();
-use File::Spec::Functions qw(catfile catdir);
+use File::Spec::Functions qw(catfile catdir canonpath rel2abs);
use File::Basename;
use ExtUtils::Embed ();
@@ -686,8 +686,7 @@
# last if -d ($dir = "$_/auto/Apache/include");
# }
# }
-
- return $self->{dir} = $dir;
+ return $self->{dir} = canonpath rel2abs $dir;
}
#--- finding apache *.h files ---
