cvs commit: httpd-apreq-2/win32 Configure.pl

[randyk]

randyk      2004/07/05 19:17:14

  Modified:    win32    Configure.pl
  Log:
  Submitted by: Markus Wichitill <mawic (at) gmx.de>
  Reviewed by:  randyk
  On Win32, check for apxs in the Apache path found by Configure.pl,
  and if found, don't offer to fetch it.
  
  Revision  Changes    Path
  1.34      +3 -2      httpd-apreq-2/win32/Configure.pl
  
  Index: Configure.pl
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/win32/Configure.pl,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- Configure.pl      24 Jun 2004 04:21:50 -0000      1.33
  +++ Configure.pl      6 Jul 2004 02:17:14 -0000       1.34
  @@ -67,7 +67,8 @@
   
   print $make $_ while (<DATA>);
   
  -my $apxs = which('apxs');
  +my $apxs_trial = catfile $apache, 'bin', 'apxs.bat';
  +my $apxs = (-e $apxs_trial) ? $apxs_trial : which('apxs');
   unless ($apxs) {
       $apxs = fetch_apxs() ? which('apxs') : '';
   }
  @@ -371,7 +372,7 @@
           warn "chdir to $dir failed: $!";
           return;
       };
  -    my @args = ($^X, 'Configure.pl');
  +    my @args = ($^X, 'Configure.pl', "-with-apache2=$apache");
       print "@args\n\n";
       system(@args) == 0 or do {
            warn "system @args failed: $?";