summaryrefslogtreecommitdiff
path: root/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
commit64baebd627ff462a756b68039ce215af62edb53d (patch)
treeaff58caf4085735c3842c669d351dc5444023264 /cpp/bootstrap
parentcbe5f38be402c29c35cc679a0a152830a5e5c392 (diff)
downloadqpid-python-64baebd627ff462a756b68039ce215af62edb53d.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/qpid@924359 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/bootstrap')
-rwxr-xr-xcpp/bootstrap7
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/bootstrap b/cpp/bootstrap
index 5f33fec63f..925344acf7 100755
--- a/cpp/bootstrap
+++ b/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 "$@"