Return-Path: Delivered-To: apmail-modperl-cvs-archive@apache.org Received: (qmail 11429 invoked by uid 500); 28 Nov 2002 08:43:34 -0000 Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: dev@perl.apache.org Delivered-To: mailing list modperl-cvs@apache.org Received: (qmail 11418 invoked by uid 500); 28 Nov 2002 08:43:34 -0000 Delivered-To: apmail-modperl-2.0-cvs@apache.org Date: 28 Nov 2002 08:43:33 -0000 Message-ID: <20021128084333.89612.qmail@icarus.apache.org> From: stas@apache.org To: modperl-2.0-cvs@apache.org Subject: cvs commit: modperl-2.0 Changes X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N stas 2002/11/28 00:43:33 Modified: xs/APR/APR Makefile.PL . Changes Log: enable APR.pm's linking for apr 0.9.2 and higher, which uses a new lib naming scheme, such as libapr-0.so.0.9.2, only if apr-config and apu-config scripts exist. Revision Changes Path 1.6 +7 -8 modperl-2.0/xs/APR/APR/Makefile.PL Index: Makefile.PL =================================================================== RCS file: /home/cvs/modperl-2.0/xs/APR/APR/Makefile.PL,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile.PL 26 Nov 2002 17:09:03 -0000 1.5 +++ Makefile.PL 28 Nov 2002 08:43:33 -0000 1.6 @@ -4,16 +4,15 @@ my $prefix = ModPerl::MM::build_config()->apxs(-q => 'PREFIX'); -my $libdir = "$prefix/lib"; - -my @libs = map "-l$_", qw(apr aprutil); +# XXX: this works only with libapr 0.9.2+ (not on win32) +my @libs = grep $_, map { -x $_ && qx{$_ --link-ld} } + map { qx{$prefix/bin/$_-config} } qw(apr apu); +chomp @libs; +my $define = @libs ? '-DMP_HAVE_APR_LIBS' : ''; ModPerl::MM::WriteMakefile( 'NAME' => 'APR', 'VERSION_FROM' => 'APR.pm', -#XXX: no longer works with apr's goofy versioning scheme -#low priority to fix as nobody is using Perl APR bindings -#outside of httpd -# 'LIBS' => ["-L$libdir @libs"], -# 'DEFINE' => '-DMP_HAVE_APR_LIBS', #only if @libs are found + 'LIBS' => \@libs, + 'DEFINE' => $define, ); 1.66 +6 -2 modperl-2.0/Changes Index: Changes =================================================================== RCS file: /home/cvs/modperl-2.0/Changes,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- Changes 26 Nov 2002 17:09:03 -0000 1.65 +++ Changes 28 Nov 2002 08:43:33 -0000 1.66 @@ -10,12 +10,16 @@ =item 1.99_08-dev -temporarily disable APR.pm attempt to link against -lapr and -lapr-util +enable APR.pm's linking for apr 0.9.2 and higher, which uses a new lib +naming scheme, such as libapr-0.so.0.9.2, only if apr-config and +apu-config scripts exist. [Stas Bekman] + +temporarily disable APR.pm's attempt to link against -lapr and -lapr-util define IoTYPE_RDONLY/IoTYPE_WRONLY for perl-5.6.0 so the project compiles again under 5.6.0 [Stas Bekman] -Allow output streaming filters to append data to the end of the stream +allow output streaming filters to append data to the end of the stream [Stas Bekman] fixes to compile with ActivePerl 5.8 beta