dougm 01/10/20 21:47:47
Modified: lib/Apache Build.pm
Log:
link in apache libraries for win32 and point at modperl.def
Revision Changes Path
1.59 +19 -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.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- Build.pm 2001/10/21 03:11:24 1.58
+++ Build.pm 2001/10/21 04:47:47 1.59
@@ -735,6 +735,7 @@
$(MODPERL_LIBNAME).$(MODPERL_DLEXT): $(MODPERL_PIC_OBJS)
$(MODPERL_RM_F) $@
$(MODPERL_LD) $(MODPERL_LDDLFLAGS) \
+ $(MODPERL_AP_LIBS) \
$(MODPERL_PIC_OBJS) $(MODPERL_LDOPTS) \
EOF
}
@@ -749,7 +750,8 @@
sub dynamic_link_MSWin32 {
my $self = shift;
- return $self->dynamic_link_header_default . <<'EOF';
+ return $self->dynamic_link_header_default .
+ "-def:$self->{cwd}/xs/modperl.def" . <<'EOF';
-out:$@
EOF
}
@@ -761,6 +763,20 @@
$link->($self);
}
+sub apache_libs_MSWin32 {
+ my $self = shift;
+ my $prefix = $self->apxs(-q => 'PREFIX');
+ my @libs = map { "$prefix/lib/lib$_.lib" } qw(apr aprutil httpd);
+ "@libs";
+}
+
+sub apache_libs {
+ my $self = shift;
+ my $libs = \&{"apache_libs_$^O"};
+ return "" unless defined &$libs;
+ $libs->($self);
+}
+
sub write_src_makefile {
my $self = shift;
my $code = ModPerl::Code->new;
@@ -773,6 +789,8 @@
print $fh noedit_warning_hash();
$self->make_tools($fh);
+
+ print $fh $self->canon_make_attr('ap_libs', $self->apache_libs);
print $fh $self->canon_make_attr('libname', $self->{MP_LIBNAME});
print $fh $self->canon_make_attr('dlext', 'so'); #always use .so
