dougm 01/10/21 18:38:06
Modified: lib/Apache Build.pm
lib/ModPerl MM.pm
Log:
win32 .xs - > .dll's need to link against libmodperl.lib
Revision Changes Path
1.68 +13 -0 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.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- Build.pm 2001/10/22 01:34:57 1.67
+++ Build.pm 2001/10/22 01:38:06 1.68
@@ -801,6 +801,19 @@
$libs->($self);
}
+sub modperl_libs_MSWin32 {
+ my $self = shift;
+ #XXX: install/use libmodperl.lib for 3rd party xs modules
+ "$self->{cwd}/src/modules/perl/libmodperl.lib";
+}
+
+sub modperl_libs {
+ my $self = shift;
+ my $libs = \&{"modperl_libs_$^O"};
+ return "" unless defined &$libs;
+ $libs->($self);
+}
+
sub write_src_makefile {
my $self = shift;
my $code = ModPerl::Code->new;
1.14 +1 -1 modperl-2.0/lib/ModPerl/MM.pm
Index: MM.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/MM.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- MM.pm 2001/10/22 00:10:13 1.13
+++ MM.pm 2001/10/22 01:38:06 1.14
@@ -63,7 +63,7 @@
}
}
- my $libs = $build->apache_libs;
+ my $libs = join ' ', $build->apache_libs, $build->modperl_libs;
my $ccflags = $build->perl_ccopts . $build->ap_ccopts;
my @opts = (
