10 files changed, 59 insertions, 92 deletions
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
                  ])