randyk 2002/12/21 00:03:25
Modified: t TEST.win32
Log:
search in another location for Apache.exe, and check version
Revision Changes Path
1.2 +12 -4 httpd-apreq/t/TEST.win32
Index: TEST.win32
===================================================================
RCS file: /home/cvs/httpd-apreq/t/TEST.win32,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TEST.win32 8 Dec 2002 05:25:51 -0000 1.1
+++ TEST.win32 21 Dec 2002 08:03:25 -0000 1.2
@@ -1,5 +1,5 @@
#AUTHOR: Peter Tillemans <[EMAIL PROTECTED]>
-# adapated for libapreq by Randy Kobes <[EMAIL PROTECTED]>
+# adapated for libapreq by Randy Kobes <[EMAIL PROTECTED]>
use strict;
use Cwd;
@@ -13,8 +13,12 @@
my $fullapache;
SEARCH: {
for my $drive ('C'..'G') {
- for my $p ("program files/apache", "apache") {
- last SEARCH if -e ($fullapache = "$drive:/$p/apache.exe");
+ for my $p ('Apache', 'Program Files/Apache',
+ 'Program Files/Apache Group/Apache') {
+ if (-e "$drive:/$p/Apache.exe") {
+ $fullapache = "$drive:/$p/Apache.exe";
+ last SEARCH;
+ }
}
}
}
@@ -22,10 +26,14 @@
unless (-e $fullapache) {
require ExtUtils::MakeMaker;
ExtUtils::MakeMaker->import('prompt');
- $fullapache = prompt("Where is your apache.exe located ?", $fullapache);
+ $fullapache = prompt("Where is your apache.exe located?", $fullapache);
}
die "Can't find apache.exe!" unless -e $fullapache;
+
+my $vers = qx{"$fullapache" -v};
+die qq{"$fullapache" does not appear to be version 1.3}
+ unless $vers =~ m!Apache/1.3!;
my $ap_path = dirname $fullapache;
$ENV{PATH} = join ";", $ap_path, $ENV{PATH};
