Author: stas Date: Tue Dec 14 17:06:25 2004 New Revision: 111905 URL: http://svn.apache.org/viewcvs?view=rev&rev=111905 Log: fix Makefile.PL arguments parser to support more than one MP_foo option on the same line (including .makepl_args.mod_perl2 file)
Modified: perl/modperl/trunk/Changes perl/modperl/trunk/lib/ModPerl/BuildOptions.pm Modified: perl/modperl/trunk/Changes Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?view=diff&rev=111905&p1=perl/modperl/trunk/Changes&r1=111904&p2=perl/modperl/trunk/Changes&r2=111905 ============================================================================== --- perl/modperl/trunk/Changes (original) +++ perl/modperl/trunk/Changes Tue Dec 14 17:06:25 2004 @@ -12,6 +12,9 @@ =item 1.99_19-dev +fix Makefile.PL arguments parser to support more than one MP_foo +option on the same line (including .makepl_args.mod_perl2 file) [Stas] + fix compilation issues in ModPerl::Util::current_perl_id (on some builds newSVpvf can't be resolved but Perl_newSVpvf works just fine). [Stas, Markus Wichitill <[EMAIL PROTECTED]>] Modified: perl/modperl/trunk/lib/ModPerl/BuildOptions.pm Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/BuildOptions.pm?view=diff&rev=111905&p1=perl/modperl/trunk/lib/ModPerl/BuildOptions.pm&r1=111904&p2=perl/modperl/trunk/lib/ModPerl/BuildOptions.pm&r2=111905 ============================================================================== --- perl/modperl/trunk/lib/ModPerl/BuildOptions.pm (original) +++ perl/modperl/trunk/lib/ModPerl/BuildOptions.pm Tue Dec 14 17:06:25 2004 @@ -75,7 +75,13 @@ my @unknown; my $continue = ""; + my @data = (); for (@$lines) { + # more than one entry on the same line + push @data, split /(?=MP_)/, $_; + } + + for (@data) { #XXX: this "parser" should be more robust chomp; s/^\s+//; s/\s+$//;
