[PATCH] win32 apache binary dirs changed today

[John K Sterling <st...@covalent.net>]

so if you try to build against the HEAD of apache1.3.15-dev using the
APACHE_SRC flag it can't find ApacheCore.lib
all i did here was add another check, if there is no ApacheCore.lib in
the CoreD/CoreR directory, also check in Debug/Release under the apache
src root.

a better way to do this would be to recognize we are building against
1.3.15 (once its released) and look in the Debug/Release directory in
that case.

this works though, feel free to modify it as necessary.

sterling


Index: Makefile.PL
===================================================================
RCS file: /home/cvspublic/modperl/Makefile.PL,v
retrieving revision 1.173
diff -u -r1.173 Makefile.PL
--- Makefile.PL 2000/12/21 20:00:09 1.173
+++ Makefile.PL 2000/12/21 23:11:23
@@ -2023,6 +2023,15 @@
   $win32_path{APACHE_LIB} = ($win32_args{DEBUG} == 1) ?
     $win32_args{APACHE_SRC} . '/CoreD' :
       $win32_args{APACHE_SRC} . '/CoreR';
+
+  # in apache_1.3.15 Apache.exe and ApacheCore.lib were
+  # moved into Release/Debug directory.... this catches that case
+  unless ( -f "$win32_path{APACHE_LIB}/ApacheCore.lib" ) {
+    $win32_path{APACHE_LIB} = ($win32_args{DEBUG} == 1) ?
+      $win32_args{APACHE_SRC} . '/Debug' :
+        $win32_args{APACHE_SRC} . '/Release';
+  }
+
   die "Cannot find ApacheCore.lib under $win32_path{APACHE_LIB}\n"
     unless -f "$win32_path{APACHE_LIB}/ApacheCore.lib";