From: Brian Aker <brian@gaz>
Date: Sun, 14 Jun 2009 15:24:05 +0000 (-0700)
Subject: Merge Trond
X-Git-Tag: 0.31~17
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=618811a49324bf07ee0d3d435bb3843d3d57fd02;hp=6da3006b68068d3f4928400ab652f8564cb7dca3;p=m6w6%2Flibmemcached

Merge Trond
---

diff --git a/ChangeLog b/ChangeLog
index 70cddaff..a972319d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+  * Added support for memcached_set_memory_allocators().
+  * Fixed bug in configure.ac for have_htoll.
+
 0.30 Sun May 31 17:31:52 PDT 2009
   * Added memcachd_dump command (and framework for memdump tool).
   * Realigned all structures to remove padding (and line up important bits for 64bit caches.
diff --git a/m4/byteorder.m4 b/m4/byteorder.m4
index b6bd84a8..7dd1a41d 100644
--- a/m4/byteorder.m4
+++ b/m4/byteorder.m4
@@ -16,7 +16,7 @@ AC_DEFUN([DETECT_BYTEORDER],
     ])
 
     AC_MSG_RESULT([$have_htoll])
-    AM_CONDITIONAL([BUILD_BYTEORDER],[test "x$have_htoll" == "xno"])
+    AM_CONDITIONAL([BUILD_BYTEORDER],[test "x$have_htoll" = "xno"])
     AC_MSG_CHECKING([byteorder])
     have_htoll="no"
     AC_RUN_IFELSE([
diff --git a/m4/memcached.m4 b/m4/memcached.m4
index c0e457e7..0916bb69 100644
--- a/m4/memcached.m4
+++ b/m4/memcached.m4
@@ -7,14 +7,14 @@ AC_ARG_WITH(memcached,
     MEMC_BINARY="$withval"
   fi
 
-  if test x$withval == xyes
+  if test x$withval = xyes
   then
     MEMC_BINARY=memcached
   fi
 
   # just ignore the user if --without-memcached is passed.. it is
   # only used by make test
-  if test x$withval == xno
+  if test x$withval = xno
   then
     MEMC_BINARY=memcached
   fi
@@ -23,7 +23,7 @@ AC_ARG_WITH(memcached,
    AC_PATH_PROG([MEMC_BINARY], [memcached], "no", [$PATH])
 ])
 
-if test x$MEMC_BINARY == "xno"
+if test x$MEMC_BINARY = "xno"
 then
   AC_MSG_ERROR(["could not find memcached binary"])
 fi
diff --git a/m4/pod2man.m4 b/m4/pod2man.m4
index 991942e8..8dde96e7 100644
--- a/m4/pod2man.m4
+++ b/m4/pod2man.m4
@@ -1,5 +1,5 @@
 AC_PATH_PROG([POD2MAN], [pod2man], "no", [$PATH:/usr/bin:/usr/local/bin:/usr/perl5/bin])
-if test "x$POD2MAN" == "xno"; then
+if test "x$POD2MAN" = "xno"; then
   AC_MSG_ERROR(["Could not find pod2man anywhere in path"])
 fi
 AC_SUBST(POD2MAN)