auto* changes, update to version 1.0.2

git-svn-id: http://code.sixapart.com/svn/memcached/trunk@21 b0b603af-a30f-0410-a34e-baf09ae79d0b
couchbase · Jun 14, 2003 · 601b690 · 601b690
1 parent 1b53326
commit 601b690
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-14
+	* update to version 1.0.2
+	* autoconf/automake fixes for older versions
+	* make stats report version number
+
 Fri, 13 Jun 2003 10:05:51 -0700  Evan Martin  <martine@danga.com>
 
 	* configure.ac, autogen.sh, Makefile.am:  Use autotools.

diff --git a/NEWS b/NEWS
@@ -0,0 +1 @@
+http://www.danga.com/memcached/news.bml
diff --git a/autogen.sh b/autogen.sh
@@ -1,16 +1,19 @@
 #!/bin/sh
+#
+# This is hacky, because there are so many damn versions
+# of autoconf/automake.  It works with Debian woody, at least.
+# 
 
 echo "aclocal..."
-ACLOCAL=${ACLOCAL:-aclocal-1.7}
-$ACLOCAL || exit 1
+$ACLOCAL || aclocal-1.7 || aclocal-1.5 || exit 1
 
 echo "autoheader..."
 AUTOHEADER=${AUTOHEADER:-autoheader}
 $AUTOHEADER || exit 1
 
 echo "automake..."
 AUTOMAKE=${AUTOMAKE:-automake-1.7}
-$AUTOMAKE --gnu --add-missing || exit 1
+$AUTOMAKE --gnu --add-missing || automake --gnu --add-missing || exit 1
 
 echo "autoconf..."
 AUTOCONF=${AUTOCONF:-autoconf}

diff --git a/configure.ac b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.52)
-AC_INIT(memcached, 1.0.1, XXXzilla)
+AC_INIT(memcached, 1.0.2, brad@danga.com)
 AC_CONFIG_SRCDIR(memcached.c)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC

diff --git a/memcached.c b/memcached.c
@@ -297,6 +297,7 @@ void process_stat(conn *c, char *command) {
 
         pos += sprintf(pos, "STAT pid %u\r\n", pid);
         pos += sprintf(pos, "STAT uptime %lu\r\n", now - stats.started);
+        pos += sprintf(pos, "STAT version " VERSION "\r\n");
         pos += sprintf(pos, "STAT curr_items %u\r\n", stats.curr_items);
         pos += sprintf(pos, "STAT total_items %u\r\n", stats.total_items);
         pos += sprintf(pos, "STAT bytes %llu\r\n", stats.curr_bytes);