[PATCH] detect apr-bin folder on Windows when integrated in httpd/src

[Stefan]

Hi,

the attached patch adds detction of the bin-directory location inside
httpd, which is the default location for apr binaries, if apr is
integrated in httpd/srclib rather than a stand alone project.

The patch would apply to trunk and 1.9.

Regards,
Stefan


Index: build/generator/gen_win_dependencies.py
===================================================================
--- build/generator/gen_win_dependencies.py	(revision 1746362)
+++ build/generator/gen_win_dependencies.py	(working copy)
@@ -400,6 +400,10 @@
         debug_dll_dir = debug_lib_dir
       else:
         dll_dir = os.path.join(self.apr_path, 'bin')
+        if not os.path.isdir(dll_dir):
+          # try http binary default directory
+          if self.httpd_path:
+            dll_dir = os.path.join(self.httpd_path, 'bin')
         debug_dll_dir = None
 
     extra_bin = []

smime.p7s
Description: S/MIME Cryptographic Signature