svn commit: r408811 - /httpd/apreq/trunk/win32/Configure.pl

[ra...@apache.org]

Author: randyk
Date: Mon May 22 18:31:39 2006
New Revision: 408811

URL: http://svn.apache.org/viewvc?rev=408811&view=rev
Log:
For Win32, if installing apxs, determine the name of the httpd binary and pass that to the configure script for apxs.

Modified:
    httpd/apreq/trunk/win32/Configure.pl

Modified: httpd/apreq/trunk/win32/Configure.pl
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/win32/Configure.pl?rev=408811&r1=408810&r2=408811&view=diff
==============================================================================
--- httpd/apreq/trunk/win32/Configure.pl (original)
+++ httpd/apreq/trunk/win32/Configure.pl Mon May 22 18:31:39 2006
@@ -372,7 +372,7 @@
         return;
     }
     print " done!\n";
-    
+
     my $arc = Archive::Tar->new($file, 1);
     $arc->extract($arc->list_files());
     my $dir = 'apxs';
@@ -385,7 +385,18 @@
         warn "chdir to $dir failed: $!";
         return;
     };
-    my @args = ($^X, 'Configure.pl', "-with-apache2=$apache");
+
+    my $prog;
+    for my $trial(qw(Apache.exe httpd.exe)) {
+        next unless -e catfile($apache, 'bin', $trial);
+        $prog = $trial;
+        last;
+    }
+    die "Could not determine the Apache2 binary name" unless $prog;
+
+    my @args = ($^X, 'Configure.pl',
+                "-with-apache2=$apache",
+                "--with-apache-prog=$prog");
     print "@args\n\n";
     system(@args) == 0 or do {
          warn "system @args failed: $?";