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

3 files changed, 17 insertions, 38 deletions

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