Change automated build to build curl from source instead of using the deb libcurl package as it's back-level on Ubuntu 9.04. Adjust INSTALL instructions as well.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@928231 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 24 insertions, 5 deletions

diff --git a/sca-cpp/trunk/INSTALL b/sca-cpp/trunk/INSTALL
index 3bddb8570c..cb4745ce9e 100644
--- a/sca-cpp/trunk/INSTALL
+++ b/sca-cpp/trunk/INSTALL
@@ -135,7 +135,7 @@ dependencies installed under $HOME:
 
 ./configure --prefix=$HOME/tuscany-sca-cpp-bin \
 --with-apr=$HOME/httpd-2.2.13-bin --with-httpd=$HOME/httpd-2.2.13-bin \
---with-libcurl=/usr --with-libxml2=/usr \
+--with-libcurl=$HOME/curl-7.19.5-bin --with-libxml2=/usr \
 --with-js-include=/usr/include/xulrunner-1.9.1.8/unstable \
 --with-js-lib=/usr/lib/xulrunner-1.9.1.8 \
 --enable-threads \
@@ -144,7 +144,7 @@ dependencies installed under $HOME:
 --enable-webservice --with-axis2c=$HOME/axis2c-1.6.0-bin \
 --enable-queue --with-qpidc=$HOME/qpidc-0.6-bin \
 --enable-chat --with-libstrophe=$HOME/libstrophe \
---with-vysper=$HOME/vysper-1.0.0 \
+--with-vysper=$HOME/vysper-0.5 \
 --enable-maintainer-mode
 
 
@@ -195,6 +195,11 @@ Apache Qpid/C++:
 make
 make install
 
+CURL
+./configure --prefix=$HOME/qpid-7.19.5-bin
+make
+make install
+
 Libstrophe:
 git clone git://code.stanziq.com/libstrophe
 cd libstrophe
diff --git a/sca-cpp/trunk/README b/sca-cpp/trunk/README
index a01821f2e4..23536ec47a 100644
--- a/sca-cpp/trunk/README
+++ b/sca-cpp/trunk/README
@@ -50,6 +50,8 @@ Here's a rough guide to the Tuscany SCA source tree:
  |   |-- test                 Integration tests
  |   |
  |   |-- samples              Sample Applications
+ |   |
+ |   |-- ubuntu               Automated install on Ubuntu 9.10
  |
  |-- branches                 Topic and release branches
  |
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-bin-image b/sca-cpp/trunk/ubuntu/ubuntu-bin-image
index 3e8546a275..7159817c61 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-bin-image
+++ b/sca-cpp/trunk/ubuntu/ubuntu-bin-image
@@ -59,7 +59,7 @@ sudo apt-get -y install openjdk-6-jdk
 if [ "$?" != "0" ]; then
     exit $?
 fi
-sudo apt-get -y install libcurl4-openssl-dev xulrunner-dev
+sudo apt-get -y install xulrunner-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install b/sca-cpp/trunk/ubuntu/ubuntu-install
index 64712959f9..fea93e1a9e 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-install
+++ b/sca-cpp/trunk/ubuntu/ubuntu-install
@@ -125,8 +125,20 @@ if [ "$?" != "0" ]; then
     exit $?
 fi
 
+# Build Libcurl
+curl -o curl-7.19.5.tar.gz http://curl.haxx.se/download/curl-7.19.5.tar.gz
+tar xzf curl-7.19.5.tar.gz
+cd curl-7.19.5
+./configure --prefix=$build/curl-7.19.5-bin
+make
+make install
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+cd $build
+
 # Build Tuscany SCA
-sudo apt-get -y install libcurl4-openssl-dev xulrunner-dev
+sudo apt-get -y install xulrunner-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
@@ -134,7 +146,7 @@ git clone git://git.apache.org/tuscany-sca-cpp
 cd tuscany-sca-cpp
 cp etc/git-exclude .git/info/exclude
 ./bootstrap
-./configure --prefix=$build/tuscany-sca-cpp-bin --with-apr=$build/httpd-2.2.15-bin --with-httpd=$build/httpd-2.2.15-bin --enable-threads --enable-python --enable-java --with-java=/usr/lib/jvm/java-6-openjdk --enable-webservice --with-axis2c=$build/axis2c-1.6.0-bin --enable-queue --with-qpidc=$build/qpidc-0.6-bin --enable-chat --with-libstrophe=$build/libstrophe --with-vysper=$build/vysper-0.5
+./configure --prefix=$build/tuscany-sca-cpp-bin --with-libcurl=$build/curl-7.19.5-bin --with-apr=$build/httpd-2.2.15-bin --with-httpd=$build/httpd-2.2.15-bin --enable-threads --enable-python --enable-java --with-java=/usr/lib/jvm/java-6-openjdk --enable-webservice --with-axis2c=$build/axis2c-1.6.0-bin --enable-queue --with-qpidc=$build/qpidc-0.6-bin --enable-chat --with-libstrophe=$build/libstrophe --with-vysper=$build/vysper-0.5
 make
 make install
 if [ "$?" != "0" ]; then