Author: stevehay Date: Tue Jul 30 07:23:50 2013 New Revision: 1508326 URL: http://svn.apache.org/r1508326 Log: Link against APR generation 1 still with httpd-2.4
Httpd-2.4 is still intended to be compiled with APR-1.x, so this reverts rev. 1222775 (on the trunk) and hence also revs. 1448043 & 1503135 (on this branch) which both worked around breakages caused by that premature switch to APR generation 2. Modified: perl/modperl/branches/httpd24/lib/Apache2/Build.pm perl/modperl/branches/httpd24/xs/APR/APR/Makefile.PL Modified: perl/modperl/branches/httpd24/lib/Apache2/Build.pm URL: http://svn.apache.org/viewvc/perl/modperl/branches/httpd24/lib/Apache2/Build.pm?rev=1508326&r1=1508325&r2=1508326&view=diff ============================================================================== --- perl/modperl/branches/httpd24/lib/Apache2/Build.pm (original) +++ perl/modperl/branches/httpd24/lib/Apache2/Build.pm Tue Jul 30 07:23:50 2013 @@ -1159,18 +1159,7 @@ sub apr_bindir { sub apr_generation { my ($self) = @_; - - my $httpd_v = $self->httpd_version_as_int; - - if ($httpd_v =~ m/2[4-9]\d+/) { - return 2; - } - elsif ($httpd_v =~ m/2[1-3]\d+/) { - return 1; - } - else { - return; - } + return $self->httpd_version_as_int =~ m/2[1-9]\d+/ ? 1 : 0; } # returns an array of apr/apu linking flags (--link-ld --libs) if found @@ -1230,8 +1219,7 @@ sub apru_config_path { $self->{$key} = $self->{$mp_key}; } - my $apr_generation = $self->apr_generation; - my $config = $apr_generation ? "$what-${apr_generation}-config" : "$what-config"; + my $config = $self->apr_generation ? "$what-1-config" : "$what-config"; if (!$self->{$key}) { my @tries = (); Modified: perl/modperl/branches/httpd24/xs/APR/APR/Makefile.PL URL: http://svn.apache.org/viewvc/perl/modperl/branches/httpd24/xs/APR/APR/Makefile.PL?rev=1508326&r1=1508325&r2=1508326&view=diff ============================================================================== --- perl/modperl/branches/httpd24/xs/APR/APR/Makefile.PL (original) +++ perl/modperl/branches/httpd24/xs/APR/APR/Makefile.PL Tue Jul 30 07:23:50 2013 @@ -25,14 +25,12 @@ $libs = delete $args{LIBS} if $args{LIBS my $build = ModPerl::BuildMM::build_config(); -if (WIN32 || CYGWIN) { - $libs .= $build->apache_libs; -} -else { - my @apru_link_flags = $build->apru_link_flags; - $libs .= join ' ', @apru_link_flags if @apru_link_flags; - # FIXME: This should be done automatically somewhere in Apache2::Build - $libs .= qq{ -laprutil-1 }; +my @apru_link_flags = $build->apru_link_flags; +$libs .= join ' ', @apru_link_flags if @apru_link_flags; + +if (WIN32) { + $libs =~ s{/libpath:}{-L}g; + $libs =~ s{(\S+)\.lib}{-l$1}g; } if (BUILD_APREXT) {