From dfc99b41654b795d237685c84c13af67127afdce Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Tue, 15 Feb 2011 04:11:47 -0600
Subject: [PATCH] Resolved header conflict between linux/darwin/win32 by moving
 ares and curl headers relevant target subdirectories.

Stemmed around the downloaded archives having differing headers and overwriting eachother.
---
 indra/cmake/CARes.cmake |  2 +-
 indra/cmake/CURL.cmake  |  2 +-
 install.xml             | 32 ++++++++++++++++----------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/indra/cmake/CARes.cmake b/indra/cmake/CARes.cmake
index 8a2dc0156..37e258194 100644
--- a/indra/cmake/CARes.cmake
+++ b/indra/cmake/CARes.cmake
@@ -19,5 +19,5 @@ else (STANDALONE)
     else (WINDOWS)
         set(CARES_LIBRARIES cares)
     endif (WINDOWS)
-    set(CARES_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/ares)
+    set(CARES_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/ares)
 endif (STANDALONE)
diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake
index 6e5fed4d5..3b35f0bae 100644
--- a/indra/cmake/CURL.cmake
+++ b/indra/cmake/CURL.cmake
@@ -15,5 +15,5 @@ else (STANDALONE)
   else (WINDOWS)
     set(CURL_LIBRARIES curl)
   endif (WINDOWS)
-  set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+  set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
 endif (STANDALONE)
diff --git a/install.xml b/install.xml
index c32f718f2..b8de62aaa 100644
--- a/install.xml
+++ b/install.xml
@@ -125,30 +125,30 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>cdb2f5c4a5a1f9ecd75bc1dbdd4db8e9</string>
+            <string>ad736bc1558c37ca6648bc7e72047faa</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-darwin-20100606.tar.bz2</uri>
+            <uri>https://github.com/downloads/Shyotl/SingularityViewer/ares-1.7.1-darwin-20100606.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>91694429e391efeea1de974df26032a2</string>
+            <string>c6953535222475e248d57fa9c2eec5cf</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-linux-20100527.tar.bz2</uri>
+            <uri>https://github.com/downloads/Shyotl/SingularityViewer/ares-1.7.1-linux-20100527.tar.bz2</uri>
           </map>
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>c4242416e0b2e642c0bf062a19a250e4</string>
+            <string>f7cbf2b6e74de4556148663b93ead4d3</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.3.0-linux64-20080909.tar.bz2</uri>
+            <uri>https://github.com/downloads/Shyotl/SingularityViewer/ares-1.3.0-linux64-20080909.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>4b84738eec2e21b0c096d53b79ee2681</string>
+            <string>b06f412608c8fccfc756935c262b03f0</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-windows-20100611a.tar.bz2</uri>
+            <uri>https://github.com/downloads/Shyotl/SingularityViewer/ares-1.7.1-windows-20100611a.tar.bz2</uri>
           </map>
         </map>
       </map>
@@ -240,30 +240,30 @@
 					<key>darwin</key>
 					<map>
 						<key>md5sum</key>
-						<string>752e295ccb17f0dcb7c0167db3ad1e69</string>
+						<string>525f6b18ea5af8fbd691c2ac1769056c</string>
 						<key>url</key>
-						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-darwin-20100606.tar.bz2</uri>
+						<uri>https://github.com/downloads/Shyotl/SingularityViewer/curl-7.20.1-darwin-20100606.tar.bz2</uri>
 					</map>
 					<key>linux</key>
 					<map>
 						<key>md5sum</key>
-						<string>a20e73f2e7d6a032ff25a5161b1b7394</string>
+						<string>6244eec15fb26f9577785625fdb38f78</string>
 						<key>url</key>
-						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-linux-20100527.tar.bz2</uri>
+						<uri>https://github.com/downloads/Shyotl/SingularityViewer/curl-7.20.1-linux-20100527.tar.bz2</uri>
 					</map>
 					<key>linux64</key>
 					<map>
 						<key>md5sum</key>
-						<string>6994192cea7ab2d885a158a3de474273</string>
+						<string>8a28849f4b9d99601dbc8db9d6a2f9ba</string>
 						<key>url</key>
-						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.4a-linux64-20090303.tar.bz2</uri>
+						<uri>https://github.com/downloads/Shyotl/SingularityViewer/curl-7.16.4a-linux64-20090303.tar.bz2</uri>
 					</map>
 					<key>windows</key>
 					<map>
 						<key>md5sum</key>
-						<string>b28856d3d02ee680353ae440561a6579</string>
+						<string>7f73eeff95087369ffebeac8356c7eaa</string>
 						<key>url</key>
-						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-windows-20100611.tar.bz2</uri>
+						<uri>https://github.com/downloads/Shyotl/SingularityViewer/curl-7.20.1-windows-20100611.tar.bz2</uri>
 					</map>
 				</map>
 			</map>