A wild guess at what is needed to get win32 compiling again after

the move of util_uri to apr-util.

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

diff --git a/Apache.dsw b/Apache.dsw
index 5966b163ce3466bd0af0dbde4554b4fe6e33a024..a6b7e0ce283b5670eb08b0e61e6f808a5cba398e 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -135,6 +135,9 @@ Package=<4>
     Project_Dep_Name apr
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name gen_uri_delims
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name xml
     End Project Dependency
 }}}
@@ -171,7 +174,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "gen_uri_delims"=".\server\gen_uri_delims.dsp" - Package Owner=<4>
+Project: "gen_uri_delims"=".\srclib\apr-util\uri\gen_uri_delims.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -243,6 +246,9 @@ Package=<4>
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name gen_uri_delims
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name xml
     End Project Dependency
 }}}
@@ -272,9 +278,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name gen_test_char
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name gen_uri_delims
-    End Project Dependency
 }}}
 
 ###############################################################################

diff --git a/Apache.mak b/Apache.mak
index 99b77870533ffa29a422ec3f1f1382b1894efe2f..a1b98e92bd7c4d3929f746bde16a46bede96e5af 100644 (file)
--- a/Apache.mak
+++ b/Apache.mak
@@ -338,9 +338,9 @@ DEP_CPP_MAIN_=\
        ".\include\util_cfgtree.h"\
        ".\include\util_charset.h"\
        ".\include\util_ebcdic.h"\
-       ".\include\util_uri.h"\
        ".\os\win32\os.h"\
        ".\srclib\apr-util\include\apr_hooks.h"\
+       ".\srclib\apr-util\include\apr_uri.h"\
        ".\srclib\apr-util\include\apu.h"\
        ".\srclib\apr\include\apr.h"\
        ".\srclib\apr\include\apr_errno.h"\