Skip to content

Commit 601b690

Browse files
committed
auto* changes, update to version 1.0.2
git-svn-id: http://code.sixapart.com/svn/memcached/trunk@21 b0b603af-a30f-0410-a34e-baf09ae79d0b
1 parent 1b53326 commit 601b690

File tree

5 files changed

+15
-5
lines changed

5 files changed

+15
-5
lines changed

ChangeLog

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2003-06-14
2+
* update to version 1.0.2
3+
* autoconf/automake fixes for older versions
4+
* make stats report version number
5+
16
Fri, 13 Jun 2003 10:05:51 -0700 Evan Martin <[email protected]>
27

38
* configure.ac, autogen.sh, Makefile.am: Use autotools.

NEWS

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
http://www.danga.com/memcached/news.bml

autogen.sh

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
#!/bin/sh
2+
#
3+
# This is hacky, because there are so many damn versions
4+
# of autoconf/automake. It works with Debian woody, at least.
5+
#
26

37
echo "aclocal..."
4-
ACLOCAL=${ACLOCAL:-aclocal-1.7}
5-
$ACLOCAL || exit 1
8+
$ACLOCAL || aclocal-1.7 || aclocal-1.5 || exit 1
69

710
echo "autoheader..."
811
AUTOHEADER=${AUTOHEADER:-autoheader}
912
$AUTOHEADER || exit 1
1013

1114
echo "automake..."
1215
AUTOMAKE=${AUTOMAKE:-automake-1.7}
13-
$AUTOMAKE --gnu --add-missing || exit 1
16+
$AUTOMAKE --gnu --add-missing || automake --gnu --add-missing || exit 1
1417

1518
echo "autoconf..."
1619
AUTOCONF=${AUTOCONF:-autoconf}

configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
AC_PREREQ(2.52)
2-
AC_INIT(memcached, 1.0.1, XXXzilla)
2+
AC_INIT(memcached, 1.0.2, [email protected])
33
AC_CONFIG_SRCDIR(memcached.c)
4-
AM_INIT_AUTOMAKE([dist-bzip2])
4+
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
55
AM_CONFIG_HEADER(config.h)
66

77
AC_PROG_CC

memcached.c

+1
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ void process_stat(conn *c, char *command) {
297297

298298
pos += sprintf(pos, "STAT pid %u\r\n", pid);
299299
pos += sprintf(pos, "STAT uptime %lu\r\n", now - stats.started);
300+
pos += sprintf(pos, "STAT version " VERSION "\r\n");
300301
pos += sprintf(pos, "STAT curr_items %u\r\n", stats.curr_items);
301302
pos += sprintf(pos, "STAT total_items %u\r\n", stats.total_items);
302303
pos += sprintf(pos, "STAT bytes %llu\r\n", stats.curr_bytes);

0 commit comments

Comments
 (0)