jimw 01/01/09 17:03:42
Modified: . Makefile.PL
Cookie Makefile.PL
Request Makefile.PL
c Makefile.PL
Log:
more win32 build touchups from randy
Revision Changes Path
1.10 +6 -5 httpd-apreq/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/httpd-apreq/Makefile.PL,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.PL 2001/01/07 03:31:35 1.9
+++ Makefile.PL 2001/01/10 01:03:41 1.10
@@ -15,7 +15,7 @@
}
use Cwd;
my $cwd = cwd;
- $cwd =~ s !\\!/!g;
+ $cwd =~ s#\\#/#g;
my $root = "$cwd/blib/arch/auto";
use File::Path qw(mkpath);
mkpath $root, 1, 0755 unless -d $root;
@@ -30,11 +30,12 @@
$ENV{MP_INC} = $Apache::MyConfig::Setup{MODPERL_INC};
$ENV{AP_LIB} = $Apache::MyConfig::Setup{APACHE_LIB};
$ENV{MP_LIB} = $Apache::MyConfig::Setup{MODPERL_LIB};
- unless (-d $ENV{MP_INC} and -f "$ENV{MP_LIB}/mod_perl.so") {
- die "Please build mod_perl first";
+ unless (-f "$ENV{MP_LIB}/mod_perl.so") {
+ die "Cannot find mod_perl.so in $ENV{MP_LIB}. Please build mod_perl
first";
}
- unless (-d $ENV{AP_INC} and -f "$ENV{AP_LIB}/ApacheCore.lib") {
- die "Please build Apache first";
+ unless (-f "$ENV{AP_LIB}/ApacheCore.lib") {
+ die "Cannot find ApacheCore.lib in $ENV{AP_LIB}. Please build apache
first
+ .";
}
}
1.4 +1 -0 httpd-apreq/Cookie/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/httpd-apreq/Cookie/Makefile.PL,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.PL 2001/01/07 03:31:35 1.3
+++ Makefile.PL 2001/01/10 01:03:42 1.4
@@ -39,6 +39,7 @@
my @mm_args = @_;
WriteMakefile(
@mm_args,
+ 'TYPEMAPS' => [ "$ENV{MP_INC}/typemap" ],
'INC' => qq{ -I../c -I"$ENV{AP_INC}" -I"$ENV{MP_INC}" },
'LIBS' => qq{ -L"$ENV{MP_LIB}" -lmod_perl -L"$ENV{APREQ_LIB}"
-llibapreq -L"$ENV{AP_LIB}" -lApacheCore },
'OBJECT' => 'Cookie.o',
1.4 +1 -0 httpd-apreq/Request/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/httpd-apreq/Request/Makefile.PL,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.PL 2001/01/07 03:31:35 1.3
+++ Makefile.PL 2001/01/10 01:03:42 1.4
@@ -39,6 +39,7 @@
my @mm_args = @_;
WriteMakefile(
@mm_args,
+ 'TYPEMAPS' => [ "$ENV{MP_INC}/typemap" ],
'INC' => qq{ -I../c -I"$ENV{AP_INC}" -I"$ENV{MP_INC}" },
'LIBS' => qq{ -L"$ENV{MP_LIB}" -lmod_perl -L"$ENV{APREQ_LIB}"
-llibapreq -L"$ENV{AP_LIB}" -lApacheCore },
'OBJECT' => 'Request.o',
1.6 +1 -0 httpd-apreq/c/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/httpd-apreq/c/Makefile.PL,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.PL 2001/01/07 03:31:36 1.5
+++ Makefile.PL 2001/01/10 01:03:42 1.6
@@ -65,6 +65,7 @@
$myVERSION =~ s/(\d\d)(\d\d)$/$1_$2/;
my @objs = qw(apache_request.o apache_cookie.o apache_multipart_buffer.o);
WriteMakefile('NAME' => 'libapreq',
+ 'TYPEMAPS' => [ "$ENV{MP_INC}/typemap" ],
'VERSION' => $myVERSION,
'OBJECT' => "@objs",
'INC' => qq{ -I"$ENV{AP_INC}" -I"$ENV{MP_INC}" },
