Author: stevehay Date: Wed Jul 3 08:01:59 2019 New Revision: 1862451 URL: http://svn.apache.org/viewvc?rev=1862451&view=rev Log: Fixes for recent perls in which '.' is no longer in @INC by default
Modified: perl/apxs/trunk/Configure.pl perl/apxs/trunk/apr_win32.pl perl/apxs/trunk/apu_win32.pl perl/apxs/trunk/apxs_win32.pl Modified: perl/apxs/trunk/Configure.pl URL: http://svn.apache.org/viewvc/perl/apxs/trunk/Configure.pl?rev=1862451&r1=1862450&r2=1862451&view=diff ============================================================================== --- perl/apxs/trunk/Configure.pl (original) +++ perl/apxs/trunk/Configure.pl Wed Jul 3 08:01:59 2019 @@ -7,7 +7,7 @@ use Config; use ExtUtils::MakeMaker; use File::Basename; use File::Spec::Functions; -require 'util.pl'; +require './util.pl'; BEGIN { die 'This script is intended for Win32' unless $^O =~ /Win32/i; @@ -28,7 +28,7 @@ push @ARGV, "--with-apache-prog=$prognam for my $file (qw(apxs_win32.pl apr_win32.pl apu_win32.pl) ) { push @ARGV, "--with-apache2=$apache"; - unless (my $return = do $file) { + unless (my $return = do "./$file") { die "Cannot parse $file: $@" if $@; die "Cannot do $file: $!" unless defined $return; die "Cannot run $file" unless $return; Modified: perl/apxs/trunk/apr_win32.pl URL: http://svn.apache.org/viewvc/perl/apxs/trunk/apr_win32.pl?rev=1862451&r1=1862450&r2=1862451&view=diff ============================================================================== --- perl/apxs/trunk/apr_win32.pl (original) +++ perl/apxs/trunk/apr_win32.pl Wed Jul 3 08:01:59 2019 @@ -6,7 +6,7 @@ use Getopt::Long; require Win32; use ExtUtils::MakeMaker; use File::Spec::Functions qw(catfile catdir); -require 'util.pl'; +require './util.pl'; BEGIN { die 'This script is intended for Win32' unless $^O =~ /Win32/i; Modified: perl/apxs/trunk/apu_win32.pl URL: http://svn.apache.org/viewvc/perl/apxs/trunk/apu_win32.pl?rev=1862451&r1=1862450&r2=1862451&view=diff ============================================================================== --- perl/apxs/trunk/apu_win32.pl (original) +++ perl/apxs/trunk/apu_win32.pl Wed Jul 3 08:01:59 2019 @@ -6,7 +6,7 @@ require Win32; use ExtUtils::MakeMaker; use File::Spec::Functions qw(catfile catdir); use warnings; -require 'util.pl'; +require './util.pl'; BEGIN { die 'This script is intended for Win32' unless $^O =~ /Win32/i; Modified: perl/apxs/trunk/apxs_win32.pl URL: http://svn.apache.org/viewvc/perl/apxs/trunk/apxs_win32.pl?rev=1862451&r1=1862450&r2=1862451&view=diff ============================================================================== --- perl/apxs/trunk/apxs_win32.pl (original) +++ perl/apxs/trunk/apxs_win32.pl Wed Jul 3 08:01:59 2019 @@ -6,7 +6,7 @@ require Win32; use Config; use ExtUtils::MakeMaker; use File::Spec::Functions; -require 'util.pl'; +require './util.pl'; my ($apache, $help, $progname); GetOptions( 'with-apache2=s' => \$apache, 'with-apache-prog=s' => \$progname,