More fixes to the autoconf build. Fixed Samples and Distros builds.

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

23 files changed, 258 insertions, 470 deletions

diff --git a/cpp/sca/GettingStarted.html b/cpp/sca/GettingStarted.html
index d0f3f2b50b..d41ed95580 100644
--- a/cpp/sca/GettingStarted.html
+++ b/cpp/sca/GettingStarted.html
@@ -226,7 +226,7 @@
   --enable-restbinding    build REST binding extension [default=no]
   --enable-python         build Python component type extension [default=no]
   --enable-ruby           build Ruby component type extension [default=no]</xmp>
-                  A script, <b>build_scanative.sh</b>, is provided that will build and install SCA Native. This script will install to the 
+                  A script, <b>build.sh</b>, is provided that will build and install SCA Native. This script will install to the 
                   location specified by the TUSCANY_SCACPP environment variable if set or into a deploy directory at &lt;tuscany_sca_install_dir&gt;/deploy.
                   This script will check the environment variable settings and will build the extensions whose dependencies are set. For example if RUBY_LIB and 
                   RUBY_HOME are set configure will be called with the --enable-ruby=yes option.
diff --git a/cpp/sca/Makefile.am b/cpp/sca/Makefile.am
index 96a9dc4639..9aa3eca40c 100644
--- a/cpp/sca/Makefile.am
+++ b/cpp/sca/Makefile.am
@@ -20,7 +20,7 @@ DIST_SUBDIRS = runtime doc samples
 datadir=$(prefix)
 
 data_DATA = INSTALL README LICENSE COPYING NOTICE GettingStarted.html
-EXTRA_DIST = LICENSE COPYING INSTALL README NOTICE GettingStarted.html xsd build_scanative.sh
+EXTRA_DIST = LICENSE COPYING INSTALL README NOTICE autogen.sh build.sh builddist.sh configure.sh makebindist.sh GettingStarted.html
 dist-hook:
 	rm -rf `find $(distdir)/ -type d -name .svn`
 	rm -rf `find $(distdir)/ -type d -name .deps`
diff --git a/cpp/sca/build.sh b/cpp/sca/build.sh
index bd2011bb99..c306d2a20d 100755
--- a/cpp/sca/build.sh
+++ b/cpp/sca/build.sh
@@ -17,66 +17,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-TUSCANY_SCACPP_HOME=`pwd`
-
-if [ x$AXIS2C_HOME = x ]; then
-echo "AXIS2C_HOME not set. Not building Axis2C WS binding extensions"
-
-ENABLE_WS=--enable-wsbinding=no
-else
-echo "Using Axis2C installed at $AXIS2C_HOME"
-ENABLE_SCABINDING=--enable-scabinding
-ENABLE_WS=--enable-wsbinding
-fi
-
-if [ x$TUSCANY_SDOCPP = x ]; then
-export TUSCANY_SDOCPP="$TUSCANY_SCACPP_HOME/../sdo/deploy"
-fi
-echo "Using SDO installed at $TUSCANY_SDOCPP"
-
-if [ x$PYTHON_LIB = x ]; then
-echo "PYTHON_LIB not set. Python extension will not be built"
-elif [ x$PYTHON_INCLUDE = x ]; then
-echo "PYTHON_INCLUDE not set. Python extension will not be built"
-elif [ x$PYTHON_VERSION = x ]; then
-echo "PYTHON_VERSION not set. Python extension will not be built"
-else
-echo "Building PYTHON extension with Python $PYTHON_VERSION installed at $PYTHON_LIB, $PYTHON_INCLUDE"
-ENABLE_PYTHON=--enable-python
-fi
-
-if [ x$RUBY_LIB = x ]; then
-echo "RUBY_LIB not set. Ruby extension will not be built"
-elif [ x$RUBY_INCLUDE = x ]; then
-echo "RUBY_INCLUDE not set. Ruby extension will not be built"
-else
-echo "Building Ruby extension with Ruby installed at $RUBY_LIB, $RUBY_INCLUDE"
-ENABLE_RUBY=--enable-ruby
-fi
-
-if [ x$CURL_LIB = x ]; then
-echo "CURL_LIB not set. REST extension will not be built"
-elif [ x$CURL_INCLUDE = x ]; then
-echo "CURL_INCLUDE not set. REST extension will not be built"
-elif [ x$HTTPD_INCLUDE = x ]; then
-echo "HTTPD_INCLUDE not set. REST extension will not be built"
-elif [ x$APR_INCLUDE = x ]; then
-echo "APR_INCLUDE not set. REST extension will not be built"
-else
-echo "Building REST extension using HTTPD from $HTTPD_INCLUDE, APR from $APR_INCLUDE and libCURL from $CURL_LIB"
-ENABLE_REST=--enable-restbinding
-fi
-cd ${TUSCANY_SCACPP_HOME}/samples
-./autogen.sh
-
-cd $TUSCANY_SCACPP_HOME
-./autogen.sh
-
-if [ x$TUSCANY_SCACPP = x ]; then
-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}
-make
+./configure.sh
 make install
 
diff --git a/cpp/sca/builddist.sh b/cpp/sca/builddist.sh
index 54b056c835..737cc9dbf1 100755
--- a/cpp/sca/builddist.sh
+++ b/cpp/sca/builddist.sh
@@ -18,66 +18,6 @@
 #  under the License.
 
 
-TUSCANY_SCACPP_HOME=`pwd`
-
-if [ x$AXIS2C_HOME = x ]; then
-echo "AXIS2C_HOME not set. Not building Axis2C WS binding extensions"
-
-ENABLE_WS=--enable-wsbinding=no
-else
-echo "Using Axis2C installed at $AXIS2C_HOME"
-ENABLE_SCABINDING=--enable-scabinding
-ENABLE_WS=--enable-wsbinding
-fi
-
-if [ x$TUSCANY_SDOCPP = x ]; then
-echo "TUSCANY_SDOCPP not set"
-exit;
-fi
-echo "Using SDO installed at $TUSCANY_SDOCPP"
-
-if [ x$PYTHON_LIB = x ]; then
-echo "PYTHON_LIB not set. Python extension will not be built"
-elif [ x$PYTHON_INCLUDE = x ]; then
-echo "PYTHON_INCLUDE not set. Python extension will not be built"
-elif [ x$PYTHON_VERSION = x ]; then
-echo "PYTHON_VERSION not set. Python extension will not be built"
-else
-echo "Building PYTHON extension with Python $PYTHON_VERSION installed at $PYTHON_LIB, $PYTHON_INCLUDE"
-ENABLE_PYTHON=--enable-python
-fi
-
-if [ x$RUBY_LIB = x ]; then
-echo "RUBY_LIB not set. Ruby extension will not be built"
-elif [ x$RUBY_INCLUDE = x ]; then
-echo "RUBY_INCLUDE not set. Ruby extension will not be built"
-else
-echo "Building Ruby extension with Ruby installed at $RUBY_LIB, $RUBY_INCLUDE"
-ENABLE_RUBY=--enable-ruby
-fi
-
-if [ x$CURL_LIB = x ]; then
-echo "CURL_LIB not set. REST extension will not be built"
-elif [ x$CURL_INCLUDE = x ]; then
-echo "CURL_INCLUDE not set. REST extension will not be built"
-elif [ x$HTTPD_INCLUDE = x ]; then
-echo "HTTPD_INCLUDE not set. REST extension will not be built"
-elif [ x$APR_INCLUDE = x ]; then
-echo "APR_INCLUDE not set. REST extension will not be built"
-else
-echo "Building REST extension using HTTPD from $HTTPD_INCLUDE, APR from $APR_INCLUDE and libCURL from $CURL_LIB"
-ENABLE_REST=--enable-restbinding
-fi
-
-cd ${TUSCANY_SCACPP_HOME}/samples
-./autogen.sh
-./configure --prefix=${TUSCANY_SCACPP}/samples --enable-static=no ${ENABLE_RUBY} ${ENABLE_PYTHON}
-
-cd $TUSCANY_SCACPP_HOME
-./autogen.sh
-./configure --prefix=${TUSCANY_SCACPP} --enable-static=no  ${ENABLE_WS} ${ENABLE_SCABINDING} ${ENABLE_RUBY} ${ENABLE_PYTHON} ${ENABLE_REST}
-
+./configure.sh
 make bindist
 
-
-
diff --git a/cpp/sca/configure.ac b/cpp/sca/configure.ac
index efc6fa685a..476b531087 100644
--- a/cpp/sca/configure.ac
+++ b/cpp/sca/configure.ac
@@ -18,9 +18,9 @@
 dnl run autogen.sh to generate the configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(tuscany_sca_native, 1.0-incubator-M3)
+AC_INIT(tuscany-sca, 1.0-M3)
 AC_CANONICAL_SYSTEM
-AM_CONFIG_HEADER(tuscany_sca_config.h)
+AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([tar-ustar])
 AC_PREFIX_DEFAULT(/usr/local/tuscany/sca)
 
@@ -67,6 +67,30 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([getcwd putenv strdup])
 # AC_CONFIG_SUBDIRS([samples])
 
+# Configure TUSCANY_SCACPP and TUSCANY_SDOCPP
+TUSCANY_SCACPP=`echo "$TUSCANY_SCACPP"`
+if test "x$TUSCANY_SCACPP" = "x"; then
+  SCAPWD=`pwd`
+  AC_SUBST([TUSCANY_SCACPP], ["$SCAPWD"])
+fi
+
+TUSCANY_SDOCPP=`echo "$TUSCANY_SDOCPP"`
+if test "x$TUSCANY_SDOCPP" = "x"; then
+  SCAPWD=`pwd`
+  AC_SUBST([TUSCANY_SDOCPP], ["$SCAPWD/../sdo/deploy"])
+fi
+
+# Configure LIBXML2_INCLUDE and LIBXML2_LIB
+LIBXML2_INCLUDE=`echo "$LIBXML2_INCLUDE"`
+if test "x$LIBXML2_INCLUDE" = "x"; then
+  AC_SUBST([LIBXML2_INCLUDE], ["/usr/include/libxml2"])
+fi
+
+LIBXML2_LIB=`echo "$LIBXML2_LIB"`
+if test "x$LIBXML2_LIB" = "x"; then
+  AC_SUBST([LIBXML2_LIB], ["/usr/lib"])
+fi
+
 AC_MSG_CHECKING(whether to build all component type and binding extensions)
 AC_ARG_ENABLE(all-extensions, [AS_HELP_STRING([--enable-all-extensions],[build all runtime extensions [default=no]])],
 [ case "${enableval}" in
diff --git a/cpp/sca/build_scanative.sh b/cpp/sca/configure.sh
index 558b709a15..ca78ad8be0 100755
--- a/cpp/sca/build_scanative.sh
+++ b/cpp/sca/configure.sh
@@ -20,58 +20,61 @@
 TUSCANY_SCACPP_HOME=`pwd`
 
 if [ x$AXIS2C_HOME = x ]; then
-echo "AXIS2C_HOME not set. Not building Axis2C WS binding extensions"
-
-ENABLE_WS=--enable-wsbinding=no
+  echo "AXIS2C_HOME not set. Not building Axis2C WS binding extensions"
+  ENABLE_WS=--enable-wsbinding=no
 else
 echo "Using Axis2C installed at $AXIS2C_HOME"
-ENABLE_SCABINDING=--enable-scabinding
-ENABLE_WS=--enable-wsbinding
+  ENABLE_SCABINDING=--enable-scabinding
+  ENABLE_WS=--enable-wsbinding
 fi
 
 if [ x$TUSCANY_SDOCPP = x ]; then
-export TUSCANY_SDOCPP="$TUSCANY_SCACPP_HOME/../sdo/deploy"
+  export TUSCANY_SDOCPP="$TUSCANY_SCACPP_HOME/../sdo/deploy"
 fi
 echo "Using SDO installed at $TUSCANY_SDOCPP"
 
 if [ x$PYTHON_LIB = x ]; then
-echo "PYTHON_LIB not set. Python extension will not be built"
+  echo "PYTHON_LIB not set. Python extension will not be built"
 elif [ x$PYTHON_INCLUDE = x ]; then
-echo "PYTHON_INCLUDE not set. Python extension will not be built"
+  echo "PYTHON_INCLUDE not set. Python extension will not be built"
 elif [ x$PYTHON_VERSION = x ]; then
-echo "PYTHON_VERSION not set. Python extension will not be built"
+  echo "PYTHON_VERSION not set. Python extension will not be built"
 else
-echo "Building PYTHON extension with Python $PYTHON_VERSION installed at $PYTHON_LIB, $PYTHON_INCLUDE"
-ENABLE_PYTHON=--enable-python
+  echo "Building PYTHON extension with Python $PYTHON_VERSION installed at $PYTHON_LIB, $PYTHON_INCLUDE"
+  ENABLE_PYTHON=--enable-python
 fi
 
 if [ x$RUBY_LIB = x ]; then
-echo "RUBY_LIB not set. Ruby extension will not be built"
+  echo "RUBY_LIB not set. Ruby extension will not be built"
 elif [ x$RUBY_INCLUDE = x ]; then
-echo "RUBY_INCLUDE not set. Ruby extension will not be built"
+  echo "RUBY_INCLUDE not set. Ruby extension will not be built"
 else
-echo "Building Ruby extension with Ruby installed at $RUBY_LIB, $RUBY_INCLUDE"
-ENABLE_RUBY=--enable-ruby
+  echo "Building Ruby extension with Ruby installed at $RUBY_LIB, $RUBY_INCLUDE"
+  ENABLE_RUBY=--enable-ruby
 fi
 
 if [ x$CURL_LIB = x ]; then
-echo "CURL_LIB not set. REST extension will not be built"
+  echo "CURL_LIB not set. REST extension will not be built"
 elif [ x$CURL_INCLUDE = x ]; then
-echo "CURL_INCLUDE not set. REST extension will not be built"
+  echo "CURL_INCLUDE not set. REST extension will not be built"
 elif [ x$HTTPD_INCLUDE = x ]; then
-echo "HTTPD_INCLUDE not set. REST extension will not be built"
+  echo "HTTPD_INCLUDE not set. REST extension will not be built"
 elif [ x$APR_INCLUDE = x ]; then
-echo "APR_INCLUDE not set. REST extension will not be built"
+  echo "APR_INCLUDE not set. REST extension will not be built"
 else
-echo "Building REST extension using HTTPD from $HTTPD_INCLUDE, APR from $APR_INCLUDE and libCURL from $CURL_LIB"
-ENABLE_REST=--enable-restbinding
+  echo "Building REST extension using HTTPD from $HTTPD_INCLUDE, APR from $APR_INCLUDE and libCURL from $CURL_LIB"
+  ENABLE_REST=--enable-restbinding
 fi
 
 if [ x$TUSCANY_SCACPP = x ]; then
-export TUSCANY_SCACPP="$TUSCANY_SCACPP_HOME/deploy"
+  export TUSCANY_SCACPP="$TUSCANY_SCACPP_HOME/deploy"
 fi
 
+./autogen.sh
 ./configure --prefix=${TUSCANY_SCACPP} --enable-static=no  ${ENABLE_WS} ${ENABLE_SCABINDING} ${ENABLE_RUBY} ${ENABLE_PYTHON} ${ENABLE_REST}
-make
-make install
 
+cd ${TUSCANY_SCACPP_HOME}/samples
+./autogen.sh
+./configure --prefix=${TUSCANY_SCACPP} --enable-static=no  ${ENABLE_RUBY} ${ENABLE_PYTHON}
+
+cd $TUSCANY_SCACPP_HOME
diff --git a/cpp/sca/makebindist.sh b/cpp/sca/makebindist.sh
index 37144f4f80..50141f6c59 100755
--- a/cpp/sca/makebindist.sh
+++ b/cpp/sca/makebindist.sh
@@ -19,64 +19,14 @@
 
 TUSCANY_SCACPP_HOME=`pwd`
 
-if [ x$AXIS2C_HOME = x ]; then
-echo "AXIS2C_HOME not set. Not building Axis2C WS binding extensions"
-
-ENABLE_WS=--enable-wsbinding=no
-else
-echo "Using Axis2C installed at $AXIS2C_HOME"
-ENABLE_SCABINDING=--enable-scabinding
-ENABLE_WS=--enable-wsbinding
-fi
-
 if [ x$TUSCANY_SDOCPP = x ]; then
-echo "TUSCANY_SDOCPP not set"
-exit;
-fi
-echo "Using SDO installed at $TUSCANY_SDOCPP"
-
-if [ x$PYTHON_LIB = x ]; then
-echo "PYTHON_LIB not set. Python extension will not be built"
-elif [ x$PYTHON_INCLUDE = x ]; then
-echo "PYTHON_INCLUDE not set. Python extension will not be built"
-elif [ x$PYTHON_VERSION = x ]; then
-echo "PYTHON_VERSION not set. Python extension will not be built"
-else
-echo "Building PYTHON extension with Python $PYTHON_VERSION installed at $PYTHON_LIB, $PYTHON_INCLUDE"
-ENABLE_PYTHON=--enable-python
-fi
-
-if [ x$RUBY_LIB = x ]; then
-echo "RUBY_LIB not set. Ruby extension will not be built"
-elif [ x$RUBY_INCLUDE = x ]; then
-echo "RUBY_INCLUDE not set. Ruby extension will not be built"
-else
-echo "Building Ruby extension with Ruby installed at $RUBY_LIB, $RUBY_INCLUDE"
-ENABLE_RUBY=--enable-ruby
-fi
-
-if [ x$CURL_LIB = x ]; then
-echo "CURL_LIB not set. REST extension will not be built"
-elif [ x$CURL_INCLUDE = x ]; then
-echo "CURL_INCLUDE not set. REST extension will not be built"
-elif [ x$HTTPD_INCLUDE = x ]; then
-echo "HTTPD_INCLUDE not set. REST extension will not be built"
-elif [ x$APR_INCLUDE = x ]; then
-echo "APR_INCLUDE not set. REST extension will not be built"
-else
-echo "Building REST extension using HTTPD from $HTTPD_INCLUDE, APR from $APR_INCLUDE and libCURL from $CURL_LIB"
-ENABLE_REST=--enable-restbinding
+  export TUSCANY_SDOCPP="$TUSCANY_SCACPP_HOME/../../sdo/deploy"
 fi
+./configure.sh
 
-cd $TUSCANY_SCACPP_HOME
-./configure --prefix=${TUSCANY_SCACPP_HOME}/deploy --enable-static=no  ${ENABLE_WS} ${ENABLE_SCABINDING} ${ENABLE_RUBY} ${ENABLE_PYTHON} ${ENABLE_REST}
-make
 make install
 
 cd ${TUSCANY_SCACPP_HOME}/samples
-export TUSCANY_SCACPP=${TUSCANY_SCACPP_HOME}/deploy
-./configure --prefix=${TUSCANY_SCACPP_HOME}/deploy --enable-static=no ${ENABLE_RUBY} ${ENABLE_PYTHON}
-make
 make install
 
 cd ${TUSCANY_SCACPP_HOME}/deploy
diff --git a/cpp/sca/runtime/core/Makefile.am b/cpp/sca/runtime/core/Makefile.am
index a1aa33b8b8..75797d6490 100644
--- a/cpp/sca/runtime/core/Makefile.am
+++ b/cpp/sca/runtime/core/Makefile.am
@@ -17,3 +17,6 @@
 
 SUBDIRS = src
 nobase_data_DATA = xsd/*.*
+
+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 550e53fbfb..adb951318a 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/Makefile.am
+++ b/cpp/sca/runtime/extensions/cpp/tools/scagen/Makefile.am
@@ -26,11 +26,9 @@ scagen_build:
 	touch scagen_build
 	
 clean:
+	rm -rf build
 	rm -f scagen_build
 	                    
 install-exec-hook:
 	cp build/scagen.jar $(bindir)
 	
-	 
-    
-
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/build.xml b/cpp/sca/runtime/extensions/cpp/tools/scagen/build.xml
index 778cf698b5..95418a22a1 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/build.xml
+++ b/cpp/sca/runtime/extensions/cpp/tools/scagen/build.xml
@@ -19,149 +19,133 @@
 -->
 
 
-<project name="org.apache.tuscany.sca.cpp.tools" default="all" basedir="../../../../..">
-
-	<import file="${basedir}/antscripts/system.xml"/>
-	<import file="${basedir}/antscripts/compile-targets.xml"/>
-	
-	<target name="init">
-		<tstamp/>
-		<property name="this.dir"             location="${basedir}/runtime/extensions/cpp/tools/scagen"/>
-		<property name="build.result.folder"  location="${this.dir}/build" />
-		<property name="temp.folder"          location="${this.dir}/tmp" />
-		<property name="junit.jar.folder"     location="${this.dir}/lib" />
-	    <property name="java.src.dir"         location="${this.dir}/src" />
-		<property name="java.docs.dir"        location="${this.dir}/docs/api"/>
-		<property name="tool.name"            value="scagen" />
-		<property name="bin.dir"              location="${tuscanySCA.install.dir}/extensions/cpp/bin" />
-	</target>
-
-	<!-- Add "test" to the depends list below to add auto-testing to the build -->
-	<!-- a junit.jar is needed at ${junit.jar.folder}/junit.jar though         -->
-	<target name="all" depends="init,scagen.jar,tobin">
-	</target>
-	
-	<target name="install" depends="tobin"/>
-
-	<target name="test" depends="init,jars,test.jar">
-		<java classname="org.apache.tuscany.sca.cpp.tools.junit.TestAllCompositesTest">
-			<classpath>
-				<pathelement location="${build.result.folder}/test.jar" />
-				<pathelement location="${junit.jar.folder}/junit.jar" />
-				<pathelement location="${build.result.folder}/scagen.jar" />
-				<pathelement path="${java.class.path}" />
-			</classpath>
-		</java>
-	</target>
-
-	<target name="doc">
-		<javadoc packagenames="org.apache.tuscany.sca.cpp.tools.*"
-			sourcepath="${java.src.dir}"
-			defaultexcludes="yes"
-			destdir="${java.docs.dir}"
-			author="true"
-			version="true"
-			use="true"
-			windowtitle="SCA for C++ Tools">
-		  <doctitle>
-              <![CDATA[<h1>SCA for C++ Tools</h1>]]>
-          </doctitle>
-		  <bottom>
-                <![CDATA[<i>Copyright 2005 The Apache Software Foundation or its licensors, as applicable.</i>]]></bottom>
-          <group title="C++ Parser" packages="org.apache.tuscany.sca.cpp.tools.common" />
-          <group title="SCA Services Generator" packages="org.apache.tuscany.sca.cpp.tools.services" />
-          <link offline="true" href="http://java.sun.com/products/jdk/1.2/docs/api/" packagelistLoc="C:\tmp" />
-        </javadoc>
+<project name="org.apache.tuscany.sca.cpp.tools" default="all" basedir=".">
+
+    <target name="init">
+        <property name="build.result.folder" value="${basedir}/build" />
+        <property name="temp.folder" value="${basedir}/tmp" />
+        <property name="junit.jar.folder" value="${basedir}/lib" />
+        <property name="tool.name" value="scagen" />
+        <property name="bin.dir" value="${basedir}/../../deploy/bin" />
     </target>
 
-    <target name="jars" depends="init, scagen.jar, src.jar">
+    <!-- Add "test" to the depends list below to add auto-testing to the build -->
+    <!-- a junit.jar is needed at ${junit.jar.folder}/junit.jar though         -->
+    <target name="all" depends="init,jars,doc,scripts,zip.all">
     </target>
 
-    <target name="scripts" depends="init">
-        <mkdir dir="${build.result.folder}" />
+    <target name="test" depends="init,jars,test.jar">
+        <java classname="org.apache.tuscany.sca.cpp.tools.junit.TestAllCompositesTest">
+            <classpath>
+                <pathelement location="${build.result.folder}/test.jar" />
+                <pathelement location="${junit.jar.folder}/junit.jar" />
+                <pathelement location="${build.result.folder}/scagen.jar" />
+                <pathelement path="${java.class.path}" />
+            </classpath>
+        </java>
     </target>
 
-    <target name="src.jar" depends="init">
-        <delete dir="${temp.folder}/src.jar.bin" quiet="true"/>
-        <mkdir dir="${temp.folder}/src.jar.bin"/>
-        <!-- Copy necessary resources i.e XSL stylesheets, test input etc for the src jar too -->
-    	<copy todir="${temp.folder}/src.jar.bin" failonerror="true">
-	      <fileset dir="${java.src.dir}" />
-        </copy>
-        <mkdir dir="${build.result.folder}" />
-        <jar jarfile="${build.result.folder}/src.jar" basedir="${temp.folder}/src.jar.bin" />
-        <delete dir="${temp.folder}/test.jar.bin" />
-    </target>
 
-    <target name="test.jar" depends="init, scagen.jar" unless="test.jar" description="Create jar for unit tests: test.jar.">
-        <delete dir="${temp.folder}/test.jar.bin" />
-    	<mkdir dir="${temp.folder}/test.jar.bin" />
-    	<!-- compile the source code -->
-    	<javac srcdir="junit" destdir="${temp.folder}/test.jar.bin" failonerror="true" includeAntRuntime="no">
-	        <src path="junit/" />
-	        <classpath>
-	        	<pathelement path="${junit.jar.folder}/junit.jar" />
-	        	<pathelement path="${build.result.folder}/scagen.jar" />
-	        </classpath>
-    	</javac>
-    	<!-- Copy necessary resources i.e XSL stylesheets, test input etc -->
-    	<copy todir="${temp.folder}/test.jar.bin" failonerror="true">
-    		<fileset dir="junit/" excludes="testoutput/**" />
-    	</copy>
-    	<mkdir dir="${build.result.folder}" />
-    	<jar jarfile="${build.result.folder}/test.jar" basedir="${temp.folder}/test.jar.bin" />
-    	<delete dir="${temp.folder}/test.jar.bin" />
-    </target>
 
-	<target name="scagen.jar" depends="init" unless="scagen.jar" description="Create main jar: scagen.jar">
-		<mkdir dir="${temp.folder}/scagen.jar.bin" />
-		<!-- compile the source code -->
-		<javac srcdir="${java.src.dir}"
-			destdir="${temp.folder}/scagen.jar.bin"
-			failonerror="true"
-			includeAntRuntime="no">
-		  <src path="${java.src.dir}"/>
-		</javac>
-		<!-- Copy necessary resources i.e XSL stylesheets, test input etc -->
-		<copy todir="${temp.folder}/scagen.jar.bin" failonerror="true">
-			<fileset dir="${java.src.dir}" excludes="**/*.java" />
-		</copy>
-
-		<copy todir="${temp.folder}/scagen.jar.bin/META-INF" failonerror="true">
-			<fileset dir="${this.dir}/META-INF/" />
-		</copy>
-
-		<mkdir dir="${build.result.folder}" />
-		<jar jarfile="${build.result.folder}/scagen.jar" basedir="${temp.folder}/scagen.jar.bin">
-			<manifest>
-				<attribute name="Main-Class" value="org.apache.tuscany.sca.cpp.tools.services.Scagen" />
-			</manifest>
-		</jar>
-	</target>
-
-	<target name="tobin" depends="scagen.jar, scripts" description="move the desired stuff to bin">
-		<copy file="${build.result.folder}/scagen.jar" todir="${bin.dir}" />
-        <copy file="${this.dir}/scagen${script.ext}" todir="${bin.dir}" />
-	</target>
+    <target name="doc">
+        <javadoc packagenames="org.apache.tuscany.sca.cpp.tools.*" sourcepath="src" defaultexcludes="yes" destdir="docs/api" author="true" version="true" use="true" windowtitle="SCA for C++ Tools">
+            <doctitle>
+                <![CDATA[<h1>SCA for C++ Tools</h1>]]>
+            </doctitle>
+        <bottom>
+            <![CDATA[<i>Copyright 2005 The Apache Software Foundation or its licensors, as applicable.</i>]]></bottom>
+    <group title="C++ Parser" packages="org.apache.tuscany.sca.cpp.tools.common" />
+    <group title="SCA Services Generator" packages="org.apache.tuscany.sca.cpp.tools.services" />
+    <link offline="true" href="http://java.sun.com/products/jdk/1.2/docs/api/" packagelistLoc="C:\tmp" />
+</javadoc>
+</target>
+
+<target name="jars" depends="init, scagen.jar, src.jar">
+</target>
+
+<target name="scripts" depends="init">
+<mkdir dir="${build.result.folder}" />
+</target>
+
+
+
+<target name="src.jar" depends="init">
+<delete dir="${temp.folder}/src.jar.bin" />
+<mkdir dir="${temp.folder}/src.jar.bin" />
+<!-- Copy necessary resources i.e XSL stylesheets, test input etc
+             for the src jar too
+         -->
+<copy todir="${temp.folder}/src.jar.bin" failonerror="true">
+    <fileset dir="src/" />
+</copy>
+<mkdir dir="${build.result.folder}" />
+<jar jarfile="${build.result.folder}/src.jar" basedir="${temp.folder}/src.jar.bin" />
+<delete dir="${temp.folder}/test.jar.bin" />
+</target>
+
+<target name="test.jar" depends="init, scagen.jar" unless="test.jar" description="Create jar for unit tests: test.jar.">
+<delete dir="${temp.folder}/test.jar.bin" />
+<mkdir dir="${temp.folder}/test.jar.bin" />
+<!-- compile the source code -->
+<javac srcdir="junit" destdir="${temp.folder}/test.jar.bin" failonerror="true" includeAntRuntime="no">
+    <src path="junit/" />
+    <classpath>
+        <pathelement path="${junit.jar.folder}/junit.jar" />
+        <pathelement path="${build.result.folder}/scagen.jar" />
+    </classpath>
+</javac>
+<!-- Copy necessary resources i.e XSL stylesheets, test input etc -->
+<copy todir="${temp.folder}/test.jar.bin" failonerror="true">
+    <fileset dir="junit/" excludes="testoutput/**" />
+</copy>
+<mkdir dir="${build.result.folder}" />
+<jar jarfile="${build.result.folder}/test.jar" basedir="${temp.folder}/test.jar.bin" />
+<delete dir="${temp.folder}/test.jar.bin" />
+</target>
+
+<target name="scagen.jar" depends="init" unless="scagen.jar" description="Create main jar: scagen.jar">
+<delete dir="${temp.folder}/scagen.jar.bin" />
+<mkdir dir="${temp.folder}/scagen.jar.bin" />
+<!-- compile the source code -->
+<javac srcdir="src" destdir="${temp.folder}/scagen.jar.bin" failonerror="true" includeAntRuntime="no">
+    <src path="src/" />
+</javac>
+<!-- Copy necessary resources i.e XSL stylesheets, test input etc -->
+<copy todir="${temp.folder}/scagen.jar.bin" failonerror="true">
+    <fileset dir="src/" excludes="**/*.java" />
+</copy>
+	
+<copy todir="${temp.folder}/scagen.jar.bin/META-INF" failonerror="true">
+    <fileset dir="META-INF/"/>
+</copy>
 	
-	<target name="clean" depends="init" description="Clean of all the files created.">
-		<delete dir="${build.result.folder}" quiet="true"/>
-		<delete dir="${temp.folder}" quiet="true"/>
-		<delete dir="${java.docs.dir}" quiet="true"/>
-        <delete dir="${bin.dir}" file="scagen.jar" quiet="true"/>
-        <delete dir="${bin.dir}" file="scagen${script.ext}" quiet="true"/>
-	</target>
-
-	<target name="zip.all" depends="jars" description="Create a zip containing everything">
-		<delete file="${build.result.folder}/org.apache.tuscany.sca.cpp.tools.zip" />
-		<zip 
-			zipfile="${build.result.folder}/org.apache.tuscany.sca.cpp.tools.zip" 
-			excludes="bin/**,tmp/**,lib/**,junit/testoutput/**" 
-			basedir="." 
-			filesonly="true" 
-			whenempty="skip" 
-			update="false" />
-		<delete dir="${temp.folder}" />
-	</target>
+<mkdir dir="${build.result.folder}" />
+<jar jarfile="${build.result.folder}/scagen.jar" basedir="${temp.folder}/scagen.jar.bin">
+    <manifest>
+        <attribute name="Main-Class" value="org.apache.tuscany.sca.cpp.tools.services.Scagen" />
+    </manifest>
+</jar>
+<delete dir="${temp.folder}/scagen.jar.bin" />
+</target>
+
+<target name="tobin" depends="jars, scripts" description="move the desired stuff to bin">
+    <move file="${build.result.folder}/scagen.jar" todir="${bin.dir}" />
+</target>
+
+    
+
+<target name="clean" depends="init" description="Clean of all the files created.">
+<delete file="${build.result.folder}/test.jar" />
+<delete file="${build.result.folder}/src.jar" />
+<delete file="${build.result.folder}/scagen.jar" />
+<delete file="${build.result.folder}/org.apache.tuscany.sca.cpp.tools.zip" />
+<delete dir="${temp.folder}" />
+</target>
+
+<target name="zip.all" depends="jars" description="Create a zip containing everything">
+<delete file="${build.result.folder}/org.apache.tuscany.sca.cpp.tools.zip" />
+<zip zipfile="${build.result.folder}/org.apache.tuscany.sca.cpp.tools.zip" excludes="bin/**,tmp/**,lib/**,junit/testoutput/**" basedir="." filesonly="true" whenempty="skip" update="false" />
+<delete dir="${temp.folder}" />
+</target>
 
 </project>
diff --git a/cpp/sca/samples/Makefile.am b/cpp/sca/samples/Makefile.am
index 1751686e0e..0fdf524cc1 100644
--- a/cpp/sca/samples/Makefile.am
+++ b/cpp/sca/samples/Makefile.am
@@ -36,4 +36,5 @@ endif
 endif
 SUBDIRS = ${CPP_SAMPLES} ${PYTHON_SAMPLES} ${RUBY_SAMPLES} ${PYTHON_RUBY_SAMPLES}
 
-EXTRA_DIST = GettingStarted.html
+EXTRA_DIST = autogen.sh build.sh GettingStarted.html
+
diff --git a/cpp/sca/samples/build.sh b/cpp/sca/samples/build.sh
index b03a6e4941..c306d2a20d 100755
--- a/cpp/sca/samples/build.sh
+++ b/cpp/sca/samples/build.sh
@@ -17,41 +17,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-
-if [ x$TUSCANY_SCACPP = x ]; then
-echo "TUSCANY_SCACPP not set"
-exit;
-fi
-echo "Using SCA installed at $TUSCANY_SCACPP"
-
-if [ x$TUSCANY_SDOCPP = x ]; then
-echo "TUSCANY_SDOCPP not set"
-exit;
-fi
-echo "Using SDO installed at $TUSCANY_SDOCPP"
-
-
-if [ x$PYTHON_LIB = x ]; then
-echo "PYTHON_LIB not set. Python samples will not be built"
-elif [ x$PYTHON_INCLUDE = x ]; then
-echo "PYTHON_INCLUDE not set. Python samples will not be built"
-elif [ x$PYTHON_VERSION = x ]; then
-echo "PYTHON_VERSION not set. Python samples will not be built"
-else
-echo "Building PYTHON samples with Python $PYTHON_VERSION installed at $PYTHON_LIB, $PYTHON_INCLUDE"
-ENABLE_PYTHON=--enable-python
-fi
-
-if [ x$RUBY_LIB = x ]; then
-echo "RUBY_LIB not set. Ruby samples will not be built"
-elif [ x$RUBY_INCLUDE = x ]; then
-echo "RUBY_INCLUDE not set. Ruby samples will not be built"
-else
-echo "Building Ruby samples with Ruby installed at $RUBY_LIB, $RUBY_INCLUDE"
-ENABLE_RUBY=--enable-ruby
-fi
-
-./configure --prefix=${TUSCANY_SCACPP}/samples --enable-static=no ${ENABLE_RUBY} ${ENABLE_PYTHON}
-make
+./configure.sh
 make install
 
diff --git a/cpp/sca/samples/configure.ac b/cpp/sca/samples/configure.ac
index 6ebc4acb6d..2131e8dcc8 100644
--- a/cpp/sca/samples/configure.ac
+++ b/cpp/sca/samples/configure.ac
@@ -18,7 +18,7 @@
 dnl run autogen.sh to generate the configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(tuscany_sca_samples, 1.0-incubator-M3)
+AC_INIT(tuscany-sca-samples, 1.0-M3)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
@@ -66,6 +66,19 @@ AC_FUNC_STAT
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([getcwd putenv strdup])
 
+# Configure TUSCANY_SCACPP and TUSCANY_SDOCPP
+TUSCANY_SCACPP=`echo "$TUSCANY_SCACPP"`
+if test "x$TUSCANY_SCACPP" = "x"; then
+  SCAPWD=`pwd`
+  AC_SUBST([TUSCANY_SCACPP], ["$SCAPWD/.."])
+fi
+
+TUSCANY_SDOCPP=`echo "$TUSCANY_SDOCPP"`
+if test "x$TUSCANY_SDOCPP" = "x"; then
+  SCAPWD=`pwd`
+  AC_SUBST([TUSCANY_SDOCPP], ["$SCAPWD/../../sdo/deploy"])
+fi
+
 AC_MSG_CHECKING(whether to build all samples)
 AC_ARG_ENABLE(all-samples, [AS_HELP_STRING([--enable-all-samples],[build all samples [default=no]])],
 [ case "${enableval}" in
diff --git a/cpp/sdo/GettingStarted.html b/cpp/sdo/GettingStarted.html
index 18f97d20de..163650dcd2 100644
--- a/cpp/sdo/GettingStarted.html
+++ b/cpp/sdo/GettingStarted.html
@@ -151,7 +151,7 @@
 	              NOTE: If you don't provide a --prefix configure option, it will by default install into
                   /usr/local/tuscany/sdo. Use ./configure --help to see all the available options.<br>
                   To build the sdo_axiom utility library you must specify the --with-axis2c=yes option on the configure command<p>
-                  A script, <b>build_sdocpp.sh</b>, is provided that will build and install SDO for C++. This script will install to the 
+                  A script, <b>build.sh</b>, is provided that will build and install SDO for C++. This script will install to the 
                   location specified by the TUSCANY_SDOCPP environment variable if set or into a deploy directory at &lt;tuscany_sdo_install_dir&gt;/deploy.
                   This script will check for the correct environment variable settings and will only build the sdo_axiom utility 
                   library if AXIS2C_HOME is set.</LI>
diff --git a/cpp/sdo/Makefile.am b/cpp/sdo/Makefile.am
index e1d6a68125..044bd63afd 100644
--- a/cpp/sdo/Makefile.am
+++ b/cpp/sdo/Makefile.am
@@ -20,7 +20,7 @@ DIST_SUBDIRS = runtime samples
 datadir=$(prefix)
 
 data_DATA = INSTALL README LICENSE COPYING NOTICE GettingStarted.html
-EXTRA_DIST = LICENSE COPYING INSTALL README NOTICE build_sdocpp.sh sdotest.sh GettingStarted.html doc
+EXTRA_DIST = LICENSE COPYING INSTALL README NOTICE autogen.sh build.sh builddist.sh configure.sh makebindist.sh sdotest.sh GettingStarted.html doc
 dist-hook:
 	rm -rf `find $(distdir)/ -type d -name .svn`
 	rm -rf `find $(distdir)/ -type d -name .deps`
diff --git a/cpp/sdo/build.sh b/cpp/sdo/build.sh
index fc1743fea8..c306d2a20d 100755
--- a/cpp/sdo/build.sh
+++ b/cpp/sdo/build.sh
@@ -17,33 +17,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-
-if [ x$LIBXML2_INCLUDE = x ]; then
-export LIBXML2_INCLUDE=/usr/include/libxml2
-fi
-if [ x$LIBXML2_LIB = x ]; then
-export LIBXML2_LIB=/usr/lib
-fi
-
-if [ x$AXIS2C_HOME = x ]; then
-echo "AXIS2C_HOME not set. not building SDO Axiom utility"
-
-else
-echo "Using Axis2C installed at $AXIS2C_HOME"
-WITH_AXIS2C=--with-axis2c
-fi
-
-TUSCANY_SDOCPP_HOME=`pwd`
-cd ${TUSCANY_SDOCPP_HOME}/samples
-./autogen.sh
-
-cd $TUSCANY_SDOCPP_HOME
-./autogen.sh
-
-if [ x$TUSCANY_SDOCPP = x ]; then
-export TUSCANY_SDOCPP=`pwd`/deploy
-fi
-
-./configure --prefix=${TUSCANY_SDOCPP} ${WITH_AXIS2C} --enable-static=no
-make
+./configure.sh
 make install
+
diff --git a/cpp/sdo/builddist.sh b/cpp/sdo/builddist.sh
index 928930829d..7bf6b761c7 100755
--- a/cpp/sdo/builddist.sh
+++ b/cpp/sdo/builddist.sh
@@ -17,34 +17,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-TUSCANY_SDOCPP_HOME=`pwd`
-
-if [ x$AXIS2C_HOME = x ]; then
-echo "AXIS2C_HOME not set. not building SDO Axiom utility"
-else
-echo "Using Axis2C installed at $AXIS2C_HOME"
-WITH_AXIS2C=--with-axis2c
-fi
-
-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
-echo "Using libxml2 installed at $LIBXML2_LIB, $LIBXML2_INCLUDE"
-
-cd ${TUSCANY_SDOCPP_HOME}/samples
-./autogen.sh
-./configure --prefix=${TUSCANY_SDOCPP_HOME}/deploy/samples --enable-static=no
-
-cd $TUSCANY_SDOCPP_HOME
-./autogen.sh
-./configure --prefix=${TUSCANY_SDOCPP_HOME}/deploy --enable-static=no ${WITH_AXIS2C} 
-
+./configure.sh
 make bindist
 
-
-
diff --git a/cpp/sdo/configure.ac b/cpp/sdo/configure.ac
index c02bc1ffba..2755395a05 100644
--- a/cpp/sdo/configure.ac
+++ b/cpp/sdo/configure.ac
@@ -18,9 +18,9 @@
 dnl run autogen.sh to generate the configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(tuscany_sdo_cpp, 1.0-incubator-M3)
+AC_INIT(tuscany-sdo, 1.0-M3)
 AC_CANONICAL_SYSTEM
-AM_CONFIG_HEADER(tuscany_sdo_config.h)
+AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([tar-ustar])
 AC_PREFIX_DEFAULT(/usr/local/tuscany/sdo)
 
@@ -64,6 +64,24 @@ AC_FUNC_ERROR_AT_LINE
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([strchr strrchr])
 
+# Configure TUSCANY_SDOCPP
+TUSCANY_SDOCPP=`echo "$TUSCANY_SDOCPP"`
+if test "x$TUSCANY_SDOCPP" = "x"; then
+  SDOPWD=`pwd`
+  AC_SUBST([TUSCANY_SDOCPP], ["$SDOPWD"])
+fi
+
+# Configure LIBXML2_INCLUDE and LIBXML2_LIB
+LIBXML2_INCLUDE=`echo "$LIBXML2_INCLUDE"`
+if test "x$LIBXML2_INCLUDE" = "x"; then
+  AC_SUBST([LIBXML2_INCLUDE], ["/usr/include/libxml2"])
+fi
+
+LIBXML2_LIB=`echo "$LIBXML2_LIB"`
+if test "x$LIBXML2_LIB" = "x"; then
+  AC_SUBST([LIBXML2_LIB], ["/usr/lib"])
+fi
+
 AC_MSG_CHECKING(whether to build SDO Axiom utility)
 AC_ARG_WITH(axis2c, [AS_HELP_STRING([--with-axis2c],[build SDO Axiom utility [default=no]])],
 [ case "${withval}" in
diff --git a/cpp/sdo/build_sdocpp.sh b/cpp/sdo/configure.sh
index 9c6eaae486..01d21cf4b6 100755
--- a/cpp/sdo/build_sdocpp.sh
+++ b/cpp/sdo/configure.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
@@ -35,10 +33,15 @@ echo "Using Axis2C installed at $AXIS2C_HOME"
 WITH_AXIS2C=--with-axis2c
 fi
 
+TUSCANY_SDOCPP_HOME=`pwd`
 if [ x$TUSCANY_SDOCPP = x ]; then
-export TUSCANY_SDOCPP=`pwd`/deploy
+  export TUSCANY_SDOCPP=`pwd`/deploy
 fi
+./autogen.sh
+./configure --prefix=${TUSCANY_SDOCPP} ${WITH_AXIS2C} --enable-static=no
 
+cd ${TUSCANY_SDOCPP_HOME}/samples
+./autogen.sh
 ./configure --prefix=${TUSCANY_SDOCPP} ${WITH_AXIS2C} --enable-static=no
-make
-make install
+
+cd $TUSCANY_SDOCPP_HOME
diff --git a/cpp/sdo/makebindist.sh b/cpp/sdo/makebindist.sh
index fd6c6895ac..e2cbd7cddf 100755
--- a/cpp/sdo/makebindist.sh
+++ b/cpp/sdo/makebindist.sh
@@ -19,26 +19,16 @@
 
 TUSCANY_SDOCPP_HOME=`pwd`
 
-if [ x$AXIS2C_HOME = x ]; then
-echo "AXIS2C_HOME not set. not building SDO Axiom utility"
-else
-echo "Using Axis2C installed at $AXIS2C_HOME"
-WITH_AXIS2C=--with-axis2c
-fi
+./configure.sh
 
-cd ${TUSCANY_SDOCPP_HOME}
-./configure --prefix=${TUSCANY_SDOCPP_HOME}/deploy --enable-static=no ${WITH_AXIS2C} 
-make
 make install
 
 cd ${TUSCANY_SDOCPP_HOME}/samples
-export TUSCANY_SDOCPP=${TUSCANY_SDOCPP_HOME}/deploy
-./configure --prefix=${TUSCANY_SDOCPP_HOME}/deploy --enable-static=no
-make
 make install
 
 cd ${TUSCANY_SDOCPP_HOME}/deploy
 for i in `find . -name "*.la"`
 do
 	rm $i
-done
\ No newline at end of file
+done
+
diff --git a/cpp/sdo/samples/Makefile.am b/cpp/sdo/samples/Makefile.am
index 6f94423236..9f15dcdb1d 100644
--- a/cpp/sdo/samples/Makefile.am
+++ b/cpp/sdo/samples/Makefile.am
@@ -17,4 +17,4 @@
 
 SUBDIRS = misc
 
-EXTRA_DIST = GettingStarted.html build.sh
+EXTRA_DIST = autogen.sh build.sh GettingStarted.html
diff --git a/cpp/sdo/samples/build.sh b/cpp/sdo/samples/build.sh
index 3aba22be31..c306d2a20d 100755
--- a/cpp/sdo/samples/build.sh
+++ b/cpp/sdo/samples/build.sh
@@ -17,13 +17,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-if [ x$TUSCANY_SDOCPP = x ]; then
-echo "TUSCANY_SDOCPP not set"
-exit;
-fi
-echo "Using SDO installed at $TUSCANY_SDOCPP"
-
-./configure --prefix=${TUSCANY_SDOCPP}/samples --enable-static=no
-make
+./configure.sh
 make install
 
diff --git a/cpp/sdo/samples/configure.ac b/cpp/sdo/samples/configure.ac
index a549d0819e..a2b0b9ef87 100644
--- a/cpp/sdo/samples/configure.ac
+++ b/cpp/sdo/samples/configure.ac
@@ -18,7 +18,7 @@
 dnl run autogen.sh to generate the configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(tuscany_sdo_samples, 1.0-incubator-M3)
+AC_INIT(tuscany-sdo-samples, 1.0-M3)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
@@ -48,6 +48,24 @@ else
 fi
 AM_CONDITIONAL([DARWIN], [test x$is_darmin = xtrue])
 
+# Configure TUSCANY_SDOCPP
+TUSCANY_SDOCPP=`echo "$TUSCANY_SDOCPP"`
+if test "x$TUSCANY_SDOCPP" = "x"; then
+  SDOPWD=`pwd`
+  AC_SUBST([TUSCANY_SDOCPP], ["$SDOPWD/.."])
+fi
+
+# Configure LIBXML2_INCLUDE and LIBXML2_LIB
+LIBXML2_INCLUDE=`echo "$LIBXML2_INCLUDE"`
+if test "x$LIBXML2_INCLUDE" = "x"; then
+  AC_SUBST([LIBXML2_INCLUDE], ["/usr/include/libxml2"])
+fi
+
+LIBXML2_LIB=`echo "$LIBXML2_LIB"`
+if test "x$LIBXML2_LIB" = "x"; then
+  AC_SUBST([LIBXML2_LIB], ["/usr/lib"])
+fi
+
 AC_CONFIG_FILES([Makefile
                  misc/Makefile
                  ])