summaryrefslogtreecommitdiff
path: root/qpid/cpp/bootstrap
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2010-03-17 16:33:50 +0000
committerAlan Conway <aconway@apache.org>2010-03-17 16:33:50 +0000
commitf9910e9a26fe2c5c12f32187fdb3525ceb9cd873 (patch)
tree9aee34c9ca7b7017e8a4ca4d6333b7d126337aef /qpid/cpp/bootstrap
parent0438dd333140c25e840a00d0ec225e379f48c5a1 (diff)
downloadqpid-python-f9910e9a26fe2c5c12f32187fdb3525ceb9cd873.tar.gz
C++ automake build picks up version number from qpid/QPID_VERSION.txt.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@924359 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/bootstrap')
-rwxr-xr-xqpid/cpp/bootstrap7
1 files changed, 5 insertions, 2 deletions
diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap
index 5f33fec63f..925344acf7 100755
--- a/qpid/cpp/bootstrap
+++ b/qpid/cpp/bootstrap
@@ -1,5 +1,8 @@
#!/bin/sh
-set -e
+
+# Copy the global QPID_VERSION.txt file into the source tree.
+cp ../QPID_VERSION.txt .
+
aclocal -I m4
autoheader
libtoolize --automake
@@ -15,10 +18,10 @@ cat > src/managementgen.mk <<EOF
\$(mgen_cmd)
EOF
-
automake
autoconf
+# Optionally do the build as well.
if [ "$1" = "-build" -o "$1" = "--build" ] ; then
shift
./configure "$@"