Cut down on merge conflicts.

diff --git a/ChangeLog b/ChangeLog
index 4d20c93c751f79a0cc66be68f7aa96e7ccfcad7d..5fbed1604d924502373be1e7b4c50f8d78f6d42b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+1.0.18
+
 1.0.17 Tue Apr  2 14:02:01 HST 2013
 * Remove c++ namespace that was being exposed (the API should be plug compatible)..
 * Fix cases where --servers wasn't behaving the same in all clients.

diff --git a/configure.ac b/configure.ac
index a81827a2e256645cab349391f363d017265bafdf..45ee0e7ed2244e5122f866617abbf4c3eccfa283 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,8 @@
 # Use and distribution licensed under the BSD license.  See
 # the COPYING file in this directory for full text.
 
-AC_INIT([libmemcached],[1.0.17],[http://libmemcached.org/])
+m4_include([version.m4])
+AC_INIT([libmemcached],VERSION_NUMBER,[http://libmemcached.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 

diff --git a/version.m4 b/version.m4
new file mode 100644 (file)
index 0000000..759ba24
--- /dev/null
+++ b/version.m4
@@ -0,0 +1 @@
+m4_define([VERSION_NUMBER], [1.0.18])