From: Brian Aker <brian@tangent.org>
Date: Sun, 15 Jul 2012 01:07:39 +0000 (-0700)
Subject: Switch assert to being disabled by default
X-Git-Tag: 1.0.10~3^2~1
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Flibmemcached;a=commitdiff_plain;h=200c86aa00265dbc1c6ae8dfe4fb5d77480e4dbe

Switch assert to being disabled by default
---

diff --git a/ChangeLog b/ChangeLog
index d3b338d3..76edf62a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1.0.10
+* --disable-assert has been removed from configure, and --enable-assert has been added in its place.
+
+
 1.0.9 Wed Jul  4 22:46:19 EDT 2012
 * Faster close on socket.
 * Instance allocation is now seperated from server interface. This should allow for a better preservation of ABI compliance from now on.
diff --git a/bootstrap.sh b/bootstrap.sh
index e1c39ec8..9818b5b4 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -4,5 +4,5 @@ if test -f configure; then make clean; make merge-clean; make distclean; fi;
 
 rm -r -f autom4te.cache
 ./config/autorun.sh
-./configure
+./configure --disable-assert=no
 make
diff --git a/m4/pandora_header_assert.m4 b/m4/pandora_header_assert.m4
index 2fdf9d4c..f72f2d5e 100644
--- a/m4/pandora_header_assert.m4
+++ b/m4/pandora_header_assert.m4
@@ -11,10 +11,10 @@ AC_DEFUN([PANDORA_HEADER_ASSERT],
   AC_CHECK_HEADERS(assert.h)
   AC_MSG_CHECKING([whether to enable assertions])
   AC_ARG_ENABLE([assert],
-    [AS_HELP_STRING([--disable-assert],
-       [Turn off assertions])],
-    [ac_cv_assert="no"],
-    [ac_cv_assert="yes"])
+    [AS_HELP_STRING([--enable-assert],
+       [Turn on assertions])],
+    [ac_cv_assert="yes"],
+    [ac_cv_assert="no"])
   AC_MSG_RESULT([$ac_cv_assert])
 
   AS_IF([test "$ac_cv_assert" = "no"],