Merge Trond

diff --git a/ChangeLog b/ChangeLog
index 70cddaff32d3d2a5611c2e5df5ff676b12492b87..a972319da5ac2e425337c349758243155a8cc3f1 100644 (file)
--- 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 b6bd84a8f18b5c00912d18765a6e3d3b66cf1b93..7dd1a41d3b89ddc339d4cbf446d276efff4787ed 100644 (file)
--- 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 c0e457e715dbbc963ff7222d9131fd7a403dd018..0916bb69e51a4e802f7fac6be8d4cf0ddaaa9079 100644 (file)
--- 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 991942e8ec2e8b5f3b92423ae5e632a87ea1ad57..8dde96e7e0d31385891cac59f37a218550b617f2 100644 (file)
--- 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)