svn commit: r397010 - /perl/modperl/trunk/build/win32_fetch_apxs

[ra...@apache.org]

Author: randyk
Date: Tue Apr 25 15:59:32 2006
New Revision: 397010

URL: http://svn.apache.org/viewcvs?rev=397010&view=rev
Log:
Recognize on Win32 that the Apache2 binary name has been changed to httpd.exe for Apache/2.2.

Modified:
    perl/modperl/trunk/build/win32_fetch_apxs

Modified: perl/modperl/trunk/build/win32_fetch_apxs
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/build/win32_fetch_apxs?rev=397010&r1=397009&r2=397010&view=diff
==============================================================================
--- perl/modperl/trunk/build/win32_fetch_apxs (original)
+++ perl/modperl/trunk/build/win32_fetch_apxs Tue Apr 25 15:59:32 2006
@@ -59,6 +59,14 @@
 my $ans = prompt('Install apxs now?', 'yes');
 exit 0 unless $ans =~ /^y/i;
 
+my $prog;
+for my $trial(qw(Apache.exe httpd.exe)) {
+    next unless -e File::Spec->catfile($prefix, 'bin', $trial);
+    $prog = $trial;
+    last;
+}
+die "Could not determine the Apache2 binary name" unless $prog;
+
 require LWP::Simple;
 LWP::Simple->import(qw(is_success getstore));
 
@@ -81,7 +89,9 @@
 print "chdir $dir\n";
 chdir $dir or die "chdir to $dir failed: $!";
 
-my @args = ($^X, 'Configure.pl', "--with-apache2=$prefix");
+my @args = ($^X, 'Configure.pl',
+	    "--with-apache2=$prefix",
+	    "--with-apache-prog=$prog");
 print "@args\n";
 system(@args) == 0 or die "system @args failed: $?";