4 files changed, 8 insertions, 6 deletions
diff --git a/sca-cpp/trunk/macos/macos-install b/sca-cpp/trunk/macos/macos-install
index 17fcf18fd5..57d4c96284 100755
--- a/sca-cpp/trunk/macos/macos-install
+++ b/sca-cpp/trunk/macos/macos-install
@@ -136,7 +136,7 @@ fi
 cd $build
 
 # Build libevent
-curl -OL http://www.monkey.org/~provos/libevent-2.0.13-stable.tar.gz
+curl -OL https://github.com/downloads/libevent/libevent/libevent-2.0.13-stable.tar.gz
 tar xzf libevent-2.0.13-stable.tar.gz
 cd libevent-2.0.13-stable
 ./configure --prefix=$build/libevent-2.0.13-stable-bin
@@ -152,7 +152,7 @@ curl -OL http://memcached.googlecode.com/files/memcached-1.4.13.tar.gz
 tar xzf memcached-1.4.13.tar.gz
 cd memcached-1.4.13
 autoreconf --install
-./configure --with-libevent=$build/libevent-2.0.13-stable-bin --prefix=$build/memcached-1.4.13-bin
+./configure --with-libevent=$build/libevent-2.0.13-stable-bin --prefix=$build/memcached-1.4.13-bin CFLAGS="-w"
 make
 make install
 if [ "$?" != "0" ]; then
@@ -304,7 +304,7 @@ cd $build
 curl -OL http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tgz
 tar xzf Python-2.7.3.tgz
 cd Python-2.7.3
-./configure --prefix=$build/python-2.7.3-bin --enable-shared --with-system-expat=$build/expat-2.0.1-bin
+./configure --prefix=$build/python-2.7.3-bin --enable-shared --with-system-expat=$build/expat-2.0.1-bin -enable-unicode=ucs4
 make
 make install
 if [ "$?" != "0" ]; then
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install b/sca-cpp/trunk/ubuntu/ubuntu-install
index af4fa264e3..a2d997c5d4 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-install
+++ b/sca-cpp/trunk/ubuntu/ubuntu-install
@@ -299,7 +299,7 @@ sudo apt-get -y install libssl-dev
 curl -OL http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tgz
 tar xzf Python-2.7.3.tgz
 cd Python-2.7.3
-./configure --prefix=$build/python-2.7.3-bin --enable-shared --with-system-expat=$build/expat-2.0.1-bin
+./configure --prefix=$build/python-2.7.3-bin --enable-shared --with-system-expat=$build/expat-2.0.1-bin -enable-unicode=ucs4
 make
 make install
 if [ "$?" != "0" ]; then
@@ -311,6 +311,8 @@ cd $build
 curl -OL https://dl-ssl.google.com/page-speed/sdk/current/page-speed-sdk.zip
 unzip page-speed-sdk.zip
 cd page-speed-1.9
+curl -OL http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/patches/page-speed-1.9.patch
+patch -p0 <page-speed-1.9.patch
 make builddir=$build/page-speed-1.9-bin CXXFLAGS="-Wno-unused-but-set-variable"
 if [ "$?" != "0" ]; then
     exit $?
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install-all b/sca-cpp/trunk/ubuntu/ubuntu-install-all
index e2c62d0fb0..6f5abd7694 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-install-all
+++ b/sca-cpp/trunk/ubuntu/ubuntu-install-all
@@ -393,7 +393,7 @@ sudo apt-get -y install libssl-dev
 curl -OL http://www.python.org/ftp/python/2.6.6/Python-2.7.3.tgz
 tar xzf Python-2.7.3.tgz
 cd Python-2.7.3
-./configure --prefix=$build/python-2.7.3-bin --enable-shared --with-system-expat=$build/expat-2.0.1-bin
+./configure --prefix=$build/python-2.7.3-bin --enable-shared --with-system-expat=$build/expat-2.0.1-bin -enable-unicode=ucs4
 make
 make install
 if [ "$?" != "0" ]; then
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install-nothreads b/sca-cpp/trunk/ubuntu/ubuntu-install-nothreads
index 64087724af..effdb6417a 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-install-nothreads
+++ b/sca-cpp/trunk/ubuntu/ubuntu-install-nothreads
@@ -299,7 +299,7 @@ sudo apt-get -y install libssl-dev
 curl -OL http://www.python.org/ftp/python/2.6.6/Python-2.7.3.tgz
 tar xzf Python-2.7.3.tgz
 cd Python-2.7.3
-./configure --prefix=$build/python-2.7.3-bin --enable-shared --without-threads --with-system-expat=$build/expat-2.0.1-bin
+./configure --prefix=$build/python-2.7.3-bin --enable-shared --without-threads --with-system-expat=$build/expat-2.0.1-bin -enable-unicode=ucs4
 make
 make install
 if [ "$?" != "0" ]; then