Minor changes to the Autoconf build files. SCA and SDO builds are working again.

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

10 files changed, 15 insertions, 45 deletions

diff --git a/cpp/build.sh b/cpp/build.sh
index 627f0b8e16..da485555d9 100755
--- a/cpp/build.sh
+++ b/cpp/build.sh
@@ -19,31 +19,13 @@
 
 TOPDIR=`pwd`
 
-if [ x$LIBXML2_INCLUDE = x ]; then
-echo "LIBXML2_INCLUDE not set"
-exit;
-fi
-if [ x$LIBXML2_LIB = x ]; then
-echo "LIBXML2_LIB not set"
-exit;
-fi
-
-if [ x$AXIS2C_HOME = x ]; then
-echo "AXIS2C_HOME not set"
-exit;
-fi
-
 # Build SDO
 cd sdo
 ./build.sh
 cd $TOPDIR
 
 # Build SCA
-
-if [ x$TUSCANY_SDOCPP = x ]; then
-  export TUSCANY_SDOCPP=$TOPDIR/sdo/deploy
-fi
-
 cd sca
 ./build.sh
 cd $TOPDIR
+
diff --git a/cpp/sca/Makefile.am b/cpp/sca/Makefile.am
index f0af655186..96a9dc4639 100644
--- a/cpp/sca/Makefile.am
+++ b/cpp/sca/Makefile.am
@@ -15,12 +15,11 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-SUBDIRS = tools runtime doc
-DIST_SUBDIRS = tools runtime doc samples
+SUBDIRS = runtime doc
+DIST_SUBDIRS = runtime doc samples
 datadir=$(prefix)
 
 data_DATA = INSTALL README LICENSE COPYING NOTICE GettingStarted.html
-nobase_data_DATA = xsd/*.*
 EXTRA_DIST = LICENSE COPYING INSTALL README NOTICE GettingStarted.html xsd build_scanative.sh
 dist-hook:
 	rm -rf `find $(distdir)/ -type d -name .svn`
diff --git a/cpp/sca/build.sh b/cpp/sca/build.sh
index 1ada1a7330..bd2011bb99 100755
--- a/cpp/sca/build.sh
+++ b/cpp/sca/build.sh
@@ -30,8 +30,7 @@ ENABLE_WS=--enable-wsbinding
 fi
 
 if [ x$TUSCANY_SDOCPP = x ]; then
-echo "TUSCANY_SDOCPP not set"
-exit;
+export TUSCANY_SDOCPP="$TUSCANY_SCACPP_HOME/../sdo/deploy"
 fi
 echo "Using SDO installed at $TUSCANY_SDOCPP"
 
@@ -74,7 +73,7 @@ cd $TUSCANY_SCACPP_HOME
 ./autogen.sh
 
 if [ x$TUSCANY_SCACPP = x ]; then
-export TUSCANY_SCACPP=`pwd`/deploy
+export TUSCANY_SCACPP="$TUSCANY_SCACPP_HOME/deploy"
 fi
 
 ./configure --prefix=${TUSCANY_SCACPP} --enable-static=no  ${ENABLE_WS} ${ENABLE_SCABINDING} ${ENABLE_RUBY} ${ENABLE_PYTHON} ${ENABLE_REST}
diff --git a/cpp/sca/build_scanative.sh b/cpp/sca/build_scanative.sh
index 3197e74884..558b709a15 100755
--- a/cpp/sca/build_scanative.sh
+++ b/cpp/sca/build_scanative.sh
@@ -30,8 +30,7 @@ ENABLE_WS=--enable-wsbinding
 fi
 
 if [ x$TUSCANY_SDOCPP = x ]; then
-echo "TUSCANY_SDOCPP not set"
-exit;
+export TUSCANY_SDOCPP="$TUSCANY_SCACPP_HOME/../sdo/deploy"
 fi
 echo "Using SDO installed at $TUSCANY_SDOCPP"
 
@@ -69,7 +68,7 @@ ENABLE_REST=--enable-restbinding
 fi
 
 if [ x$TUSCANY_SCACPP = x ]; then
-export TUSCANY_SCACPP=`pwd`/deploy
+export TUSCANY_SCACPP="$TUSCANY_SCACPP_HOME/deploy"
 fi
 
 ./configure --prefix=${TUSCANY_SCACPP} --enable-static=no  ${ENABLE_WS} ${ENABLE_SCABINDING} ${ENABLE_RUBY} ${ENABLE_PYTHON} ${ENABLE_REST}
diff --git a/cpp/sca/configure.ac b/cpp/sca/configure.ac
index c1b2992065..efc6fa685a 100644
--- a/cpp/sca/configure.ac
+++ b/cpp/sca/configure.ac
@@ -228,14 +228,14 @@ fi
 AM_CONDITIONAL([WANT_DOXYGEN], [test x$want_doxygen = xtrue])
 
 AC_CONFIG_FILES([Makefile
-                 tools/Makefile
-                 tools/scagen/Makefile
                  runtime/Makefile
                  runtime/core/Makefile
                  runtime/core/src/Makefile
                  runtime/extensions/Makefile
                  runtime/extensions/cpp/Makefile
                  runtime/extensions/cpp/src/Makefile
+                 runtime/extensions/cpp/tools/Makefile
+                 runtime/extensions/cpp/tools/scagen/Makefile
                  runtime/extensions/ws/Makefile
                  runtime/extensions/ws/reference/Makefile
                  runtime/extensions/ws/reference/axis2c/Makefile
diff --git a/cpp/sca/runtime/core/Makefile.am b/cpp/sca/runtime/core/Makefile.am
index 2b9491ec1c..a1aa33b8b8 100644
--- a/cpp/sca/runtime/core/Makefile.am
+++ b/cpp/sca/runtime/core/Makefile.am
@@ -16,3 +16,4 @@
 #  under the License.
 
 SUBDIRS = src
+nobase_data_DATA = xsd/*.*
diff --git a/cpp/sca/runtime/extensions/cpp/Makefile.am b/cpp/sca/runtime/extensions/cpp/Makefile.am
index 7fac33118a..3ef2b728b3 100644
--- a/cpp/sca/runtime/extensions/cpp/Makefile.am
+++ b/cpp/sca/runtime/extensions/cpp/Makefile.am
@@ -15,10 +15,10 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-SUBDIRS = src
+SUBDIRS = src tools
 
 datadir=$(prefix)/extensions/cpp
 
 nobase_data_DATA = xsd/*.xsd
 
-EXTRA_DIST = xsd
\ No newline at end of file
+EXTRA_DIST = xsd
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/Makefile.am b/cpp/sca/runtime/extensions/cpp/tools/scagen/Makefile.am
index 35f72cef08..550e53fbfb 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/Makefile.am
+++ b/cpp/sca/runtime/extensions/cpp/tools/scagen/Makefile.am
@@ -29,7 +29,7 @@ clean:
 	rm -f scagen_build
 	                    
 install-exec-hook:
-	cp bld/scagen.jar $(bindir)
+	cp build/scagen.jar $(bindir)
 	
 	 
     
diff --git a/cpp/sca/tools/Makefile.am b/cpp/sca/tools/Makefile.am
index 3a97f02513..de5c2d1b1e 100644
--- a/cpp/sca/tools/Makefile.am
+++ b/cpp/sca/tools/Makefile.am
@@ -15,11 +15,3 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-if WANT_ALL
-  CPP_TOOLS = scagen
-endif
-if WANT_CPP
-  CPP_TOOLS = scagen
-endif
-
-SUBDIRS = ${CPP_TOOLS}
\ No newline at end of file
diff --git a/cpp/sdo/build.sh b/cpp/sdo/build.sh
index efcf8ecf67..fc1743fea8 100755
--- a/cpp/sdo/build.sh
+++ b/cpp/sdo/build.sh
@@ -19,12 +19,10 @@
 
 
 if [ x$LIBXML2_INCLUDE = x ]; then
-echo "LIBXML2_INCLUDE not set"
-exit;
+export LIBXML2_INCLUDE=/usr/include/libxml2
 fi
 if [ x$LIBXML2_LIB = x ]; then
-echo "LIBXML2_LIB not set"
-exit;
+export LIBXML2_LIB=/usr/lib
 fi
 
 if [ x$AXIS2C_HOME = x ]; then