From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 29 Mar 2011 20:31:17 +0000 (+0000)
Subject: Someone misunderstood 'dependency' here; we need not *link* to mod_session,
X-Git-Tag: 2.3.12~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7ece730e9d9ed8ca287021550ffd266ce30b518;p=thirdparty%2Fapache%2Fhttpd.git

Someone misunderstood 'dependency' here; we need not *link* to mod_session,
therefore the build order doesn't matter.

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

diff --git a/Apache.dsw b/Apache.dsw
index 656fabece3b..ed10ddd23cc 100644
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -1050,9 +1050,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_session
-    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/Makefile.win b/Makefile.win
index 6fb035764cf..1d3f025617a 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -350,12 +350,6 @@ _build:
 	cd modules\ldap
 	 $(MAKE) $(MAKEOPT) -f mod_ldap.mak        CFG="mod_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd ..\..
-# build session prior to auth_form
-	cd modules\session
-	 $(MAKE) $(MAKEOPT) -f mod_session.mak        CFG="mod_session - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-	 $(MAKE) $(MAKEOPT) -f mod_session_cookie.mak CFG="mod_session_cookie - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-	 $(MAKE) $(MAKEOPT) -f mod_session_dbd.mak    CFG="mod_session_dbd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-	cd ..\..
 	cd modules\database
 	 $(MAKE) $(MAKEOPT) -f mod_dbd.mak         CFG="mod_dbd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd ..\..
@@ -509,6 +503,11 @@ _build:
 	 $(MAKE) $(MAKEOPT) -f mod_lbmethod_rr.mak CFG="mod_lbmethod_rr - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd ..\..\..
 !ENDIF
+	cd modules\session
+	 $(MAKE) $(MAKEOPT) -f mod_session.mak        CFG="mod_session - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+	 $(MAKE) $(MAKEOPT) -f mod_session_cookie.mak CFG="mod_session_cookie - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+	 $(MAKE) $(MAKEOPT) -f mod_session_dbd.mak    CFG="mod_session_dbd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+	cd ..\..
 	cd modules\slotmem
 	 $(MAKE) $(MAKEOPT) -f mod_slotmem_plain.mak  CFG="mod_slotmem_plain - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_slotmem_shm.mak    CFG="mod_slotmem_shm - Win32 $(LONG)" RECURSE=0 $(CTARGET)