diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2009-09-06 00:14:47 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2009-09-06 00:14:47 +0000 |
| commit | 3738a675ec636a23e3292bd75818803a672706c5 (patch) | |
| tree | c5ed189f511f7b78aae7fc98000ed32685d67c4d /cpp/sdo/samples | |
| parent | f6fe45a18af190404294956afbb0a782cf02e940 (diff) | |
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
Diffstat (limited to 'cpp/sdo/samples')
| -rw-r--r-- | cpp/sdo/samples/Makefile.am | 2 | ||||
| -rwxr-xr-x | cpp/sdo/samples/build.sh | 9 | ||||
| -rw-r--r-- | cpp/sdo/samples/configure.ac | 20 |
3 files changed, 21 insertions, 10 deletions
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 ]) |