stas 2003/09/12 11:11:04
Modified: lib/Apache Build.pm
. Changes
Log:
Make sure that the static mod_perl library is built after the dynamic
(a requirement on win32)
Revision Changes Path
1.146 +5 -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.145
retrieving revision 1.146
diff -u -u -r1.145 -r1.146
--- Build.pm 6 Sep 2003 01:10:18 -0000 1.145
+++ Build.pm 12 Sep 2003 18:11:04 -0000 1.146
@@ -1280,7 +1280,11 @@
my @libs;
for my $type (map { uc } keys %libs) {
- push @libs, $self->{"MODPERL_LIB_$type"} if $self->{"MP_USE_$type"};
+ next unless $self->{"MP_USE_$type"};
+ # on win32 mod_perl.lib must come after mod_perl.so
+ $type eq 'STATIC'
+ ? push @libs, $self->{"MODPERL_LIB_$type"}
+ : unshift @libs, $self->{"MODPERL_LIB_$type"};
}
print $fh $self->canon_make_attr('lib', "@libs");
1.216 +3 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -u -r1.215 -r1.216
--- Changes 9 Sep 2003 18:12:01 -0000 1.215
+++ Changes 12 Sep 2003 18:11:04 -0000 1.216
@@ -12,6 +12,9 @@
=item 1.99_10-dev
+Make sure that the static mod_perl library is built after the dynamic
+(a requirement on win32) [Steve Hay <[EMAIL PROTECTED]>]
+
Apache::Status now generates HTML 4.01 Strict (and in many cases, also
ISO-HTML) compliant output. Also add a simple CSS to make the reports
look nicer. [Ville Skytt� <[EMAIL PROTECTED]>]
