diff options
| author | Alan Conway <aconway@apache.org> | 2010-03-17 16:33:50 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-03-17 16:33:50 +0000 |
| commit | 0e72fcd72e163c32e84e62f999b007b74b64f086 (patch) | |
| tree | aff58caf4085735c3842c669d351dc5444023264 /cpp/configure.ac | |
| parent | f40cd6f5aa0f7ae54f341a2f82fdece9746eda54 (diff) | |
| download | qpid-python-0e72fcd72e163c32e84e62f999b007b74b64f086.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/configure.ac')
| -rw-r--r-- | cpp/configure.ac | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cpp/configure.ac b/cpp/configure.ac index 1ac3f3397e..997f859aec 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -11,7 +11,12 @@ dnl dnl When updating the name/version number here, also update it in dnl src/qpid/Version.h -AC_INIT([qpidc], [0.7], [dev@qpid.apache.org]) +# Pick up the version from QPID_VERSION.txt in the qpid/cpp source tree. +# NB. You need to re-run bootstrap if the global qpid/QPID_VERSION.txt changes. +AC_INIT([qpidc], + [m4_esyscmd([cat QPID_VERSION.txt | tr -d '\n'])], + [dev@qpid.apache.org]) + AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects]) @@ -233,7 +238,7 @@ fi AM_CONDITIONAL([HAVE_PYTHON_DEVEL], [test -f $PYTHON_INC/Python.h && test -n "$SWIG"]) -specdir=`pwd`/$srcdir/../specs +specdir=`pwd`/$top_srcdir/../specs AMQP_FINAL_XML=$specdir/amqp.0-10-qpid-errata.xml AC_SUBST(AMQP_FINAL_XML) AM_CONDITIONAL([GENERATE], [test -f $AMQP_FINAL_XML]) @@ -532,6 +537,7 @@ AC_CONFIG_FILES([ managementgen/Makefile etc/Makefile src/Makefile + src/qpid/Version.h src/tests/Makefile src/tests/test_env.sh docs/man/Makefile |