diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-10-15 17:13:36 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-10-15 17:13:36 +0200 |
| commit | eeb8e7c8beef83fe8c23bde888a1081fc9e8e3ec (patch) | |
| tree | daca0d83cfe2d071518692475b5b0ca09d3a0d95 /configure.in | |
| parent | 7b9e39724eeecf33dde3b0e4fd9f205480afb977 (diff) | |
| parent | 3cf01bf56e66657da795e43f09fa2499b2381dc9 (diff) | |
Merge branch 'maint'
* maint:
Makefile.am: Add missing files to distribution, improve maintainer-clean
configure.in: Extract API version from zmq.h
Added bin directory to ignore list.
Conflicts:
configure.in
include/zmq.h
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 3c6f1e7..33fdfb4 100644 --- a/configure.in +++ b/configure.in @@ -2,11 +2,13 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) # -# Change the version number below after doing a public release. +# The 0MQ version number is extracted from include/zmq.h using +# the version.sh script. Hence, it should be updated there. # The version in git should reflect the *next* version planned. -# Version must be MAJOR.MINOR.PATCH otherwise things will break. # -AC_INIT([zeromq],[2.1.0],[zeromq-dev@lists.zeromq.org]) +AC_INIT([zeromq], + m4_esyscmd([./version.sh | tr -d '\n']), + [zeromq-dev@lists.zeromq.org]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR(config) |