From 3fc42e1a4e9cb1082f560bc58b9bb08c6a99555b Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Wed, 21 Jan 2009 07:37:59 +0000
Subject: [PATCH] Mac client: fix bug in build script so that curl-7.19.2
 actually does build with c-ares 1.6.0.  Fixes #830.

svn path=/trunk/boinc/; revision=16964
---
 checkin_notes          |  7 +++++++
 mac_build/buildcurl.sh | 10 +++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index bc0fdc3e8b..0ce5d2288b 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -519,3 +519,10 @@ David  20 Jan 2009
         sched_plan.cpp.h
         sched_send.cpp
         server_types.h
+
+Charlie Jan 20 2009
+    - Mac client: fix bug in build script so that curl-7.19.2 actually 
+        does build with c-ares 1.6.0.  Fixes #830.
+    
+     mac_build/
+        buildcurl.sh
diff --git a/mac_build/buildcurl.sh b/mac_build/buildcurl.sh
index b7dd00da77..b662480d30 100644
--- a/mac_build/buildcurl.sh
+++ b/mac_build/buildcurl.sh
@@ -24,7 +24,7 @@
 # use in building BOINC.
 #
 # by Charlie Fenton 7/21/06
-# Updated 12/17/08
+# Updated 1/20/09
 #
 ## In Terminal, CD to the curl-7.19.2 directory.
 ##     cd [path]/curl-7.19.2/
@@ -83,10 +83,10 @@ fi
 export PATH=/usr/local/bin:$PATH
 
 CURL_DIR=`pwd`
-# curl configure and make expect a path to _installed_ c-ares-1.5.3
+# curl configure and make expect a path to _installed_ c-ares-1.6.0
 # so temporarily install c-ares at a path that does not contain spaces.
-cd ../c-ares-1.5.3
-sudo make install 
+cd ../c-ares-1.6.0
+make install 
 cd "${CURL_DIR}"
 
 export SDKROOT="/Developer/SDKs/MacOSX10.3.9.sdk"
@@ -199,7 +199,7 @@ lipo -create lib/.libs/libcurl_i386.a lib/.libs/libcurl_x86_64.a lib/.libs/libcu
 if [  $? -ne 0 ]; then return 1; fi
 
 # Delete temporarily installed c-ares.
-sudo rm -Rf /tmp/installed-c-ares/
+rm -Rf /tmp/installed-c-ares/
 
 rm -f include/curl/curlbuild.h