Reintegrate proxy into the core build

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

diff --git a/Apache.dsw b/Apache.dsw
index 32c15722dec634ffe2af07f18fa3b63640b66a73..829e749221a01a317a65cd9857bf5f6739d70da6 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -90,6 +90,18 @@ Package=<4>
     Project_Dep_Name mod_usertrack
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_proxy
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name proxy_connect
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name proxy_ftp
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name proxy_http
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name ab
     End Project Dependency
     Begin Project Dependency
@@ -624,6 +636,99 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_proxy"=".\modules\proxy\mod_proxy.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "proxy_connect"=".\modules\proxy\proxy_connect.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_proxy
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "proxy_ftp"=".\modules\proxy\proxy_ftp.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_proxy
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "proxy_http"=".\modules\proxy\proxy_http.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_proxy
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "pcre"=".\srclib\pcre\pcre.dsp" - Package Owner=<4>
 
 Package=<5>

diff --git a/Makefile.win b/Makefile.win
index 5475d0b479f5b4d3bd8a1e27757f11b0a9a8bed6..ead8512729175529418d54a6d6ba2917a4a9c31a 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -159,9 +159,12 @@ _build:
         $(MAKE) $(MAKEOPT) -f mod_headers.mak CFG="mod_headers - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_usertrack.mak CFG="mod_usertrack - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
-#      cd modules\proxy
-#        $(MAKE) $(MAKEOPT) -f mod_proxy.mak CFG="mod_proxy - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-#       cd ..\..
+       cd modules\proxy
+        $(MAKE) $(MAKEOPT) -f mod_proxy.mak CFG="mod_proxy - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f proxy_connect.mak CFG="proxy_connect - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f proxy_ftp.mak CFG="proxy_ftp - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f proxy_http.mak CFG="proxy_http - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+       cd ..\..
 !IF EXIST("srclib\openssl")
        cd modules\ssl
         $(MAKE) $(MAKEOPT) -f mod_ssl.mak CFG="mod_ssl - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -220,6 +223,10 @@ _build:
                "mod_expires - Win32 $(LONG)"\
                "mod_headers - Win32 $(LONG)"\
                "mod_usertrack - Win32 $(LONG)"\
+               "mod_proxy - Win32 $(LONG)"\
+               "proxy_connect - Win32 $(LONG)"\
+               "proxy_ftp - Win32 $(LONG)"\
+               "proxy_http - Win32 $(LONG)"\
                "ab - Win32 $(LONG)"\
                "htpasswd - Win32 $(LONG)"\
                "htdigest - Win32 $(LONG)"\
@@ -248,7 +255,7 @@ _install:
        -mkdir "$(INSTDIR)\lib"
        -mkdir "$(INSTDIR)\logs"
        -mkdir "$(INSTDIR)\modules"
-#      -mkdir "$(INSTDIR)\proxy"
+       -mkdir "$(INSTDIR)\proxy"
        copy ABOUT_APACHE "$(INSTDIR)\ABOUT_APACHE.txt"
        copy CHANGES "$(INSTDIR)\CHANGES.txt"
        copy INSTALL "$(INSTDIR)\INSTALL.txt"
@@ -284,7 +291,10 @@ _install:
        copy modules\metadata\$(LONG)\mod_expires.so "$(INSTDIR)\modules"
        copy modules\metadata\$(LONG)\mod_headers.so "$(INSTDIR)\modules"
        copy modules\metadata\$(LONG)\mod_usertrack.so "$(INSTDIR)\modules"
-#       copy modules\proxy\$(LONG)\mod_proxy.so "$(INSTDIR)\modules"
+       copy modules\proxy\$(LONG)\mod_proxy.so "$(INSTDIR)\modules"
+       copy modules\proxy\$(LONG)\proxy_connect.so "$(INSTDIR)\modules"
+       copy modules\proxy\$(LONG)\proxy_ftp.so "$(INSTDIR)\modules"
+       copy modules\proxy\$(LONG)\proxy_http.so "$(INSTDIR)\modules"
 !IF EXIST("srclib\openssl")
        -copy modules\ssl\$(LONG)\mod_ssl.so "$(INSTDIR)\modules"
        -copy srclib\openssl\$(SSLBIN)\openssl.exe "$(INSTDIR)\bin"