.dsw IDE builds were building mod_auth_ldap, while .mak builds were not.

  Corrected, and cleaned up redundant util_ldap dependency.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98346 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Apache.dsw b/Apache.dsw
index 56db834309296c973bb227ba38be2074805f3d24..182d1ed51192232aac9aaa35fb17a2c4ba7ae989 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -227,9 +227,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name mod_auth_ldap
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name util_ldap
-    End Project Dependency
 }}}
 
 ###############################################################################

diff --git a/Makefile.win b/Makefile.win
index c581d492f9955a28213d909ce765329cd4be885b..185327411223742002554ebab789540f650e920c 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -239,6 +239,8 @@ _build:
         $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_mem_cache.mak   CFG="mod_mem_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_disk_cache.mak  CFG="mod_disk_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f util_ldap.mak       CFG="util_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_auth_ldap.mak   CFG="mod_auth_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
        cd modules\filters
 !IF EXIST("srclib\zlib")
@@ -409,6 +411,8 @@ _install:
        copy modules\experimental\$(LONG)\mod_charset_lite.so "$(INSTDIR)\modules" <.y
        copy modules\experimental\$(LONG)\mod_mem_cache.so "$(INSTDIR)\modules" <.y
        copy modules\experimental\$(LONG)\mod_disk_cache.so "$(INSTDIR)\modules" <.y
+       copy modules\experimental\$(LONG)\util_ldap.so "$(INSTDIR)\modules" <.y
+       copy modules\experimental\$(LONG)\mod_auth_ldap.so "$(INSTDIR)\modules" <.y
        copy modules\filters\$(LONG)\mod_ext_filter.so "$(INSTDIR)\modules" <.y
        copy modules\filters\$(LONG)\mod_include.so "$(INSTDIR)\modules" <.y
        copy modules\generators\$(LONG)\mod_asis.so "$(INSTDIR)\modules" <.y
@@ -465,6 +469,8 @@ _install:
        copy modules\experimental\$(LONG)\mod_charset_lite.pdb "$(INSTDIR)\modules" <.y
        copy modules\experimental\$(LONG)\mod_mem_cache.pdb "$(INSTDIR)\modules" <.y
        copy modules\experimental\$(LONG)\mod_disk_cache.pdb "$(INSTDIR)\modules" <.y
+       copy modules\experimental\$(LONG)\util_ldap.pdb "$(INSTDIR)\modules" <.y
+       copy modules\experimental\$(LONG)\mod_auth_ldap.pdb "$(INSTDIR)\modules" <.y
        copy modules\filters\$(LONG)\mod_ext_filter.pdb "$(INSTDIR)\modules" <.y
        copy modules\filters\$(LONG)\mod_include.pdb "$(INSTDIR)\modules" <.y
        copy modules\generators\$(LONG)\mod_asis.pdb "$(INSTDIR)\modules" <.y