X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fax_assert.m4;h=88741293e176246e41f424f0dd92b1eabd72c01e;hb=dbc62573e1a6dc8cbcc97d0898e8615b0916d6ab;hp=7ee26d00287b578f42a11ef9f008cbc5a988b8f3;hpb=66dcfb211cc2ca7dc6630754a6fd68343569e29a;p=awesomized%2Flibmemcached

diff --git a/m4/ax_assert.m4 b/m4/ax_assert.m4
index 7ee26d00..88741293 100644
--- a/m4/ax_assert.m4
+++ b/m4/ax_assert.m4
@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_ASSERT
+#   AX_ASSERT()
 #
 # DESCRIPTION
 #
@@ -43,19 +43,22 @@
 #  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#serial 1
+#serial 6
 
-AC_DEFUN([AX_ASSERT],[
+AC_DEFUN([AX_ASSERT],
+    [AC_PREREQ([2.63])dnl
+    AC_REQUIRE([AX_DEBUG])
+    AC_REQUIRE([AX_VCS_CHECKOUT])
     AC_ARG_ENABLE([assert],
       [AS_HELP_STRING([--enable-assert],
-        [Add assert code/turns off optimizations (yes|no) @<:@default=no@:>@])],[
-      ax_enable_assert=yes
-      dnl enable assert()
-      AC_DEFINE(DASSERT,[1],[Define to 1 to enable assertging code.])
-      ],[
-      ax_enable_assert=no
-      AC_DEFINE(DASSERT,[0],[Define to 1 to enable assertging code.])
-      ])
+        [Enable assert, this will be overridden by --enable-debug (yes|no) @<:@default=no@:>@])],
+      [ax_enable_assert=yes],
+      [ax_enable_assert=no])
+
+    AS_IF([ test "$ax_enable_assert" = "yes" -o "$ax_enable_debug" = "yes" -o "$ac_cv_vcs_checkout" = "yes" ],
+      [ax_enable_assert="yes"],
+      [ax_enable_assert="no"
+      AC_DEFINE(NDEBUG,[1],[Define to 1 to disable assert'ing code.])])
 
     AC_MSG_CHECKING([for assert])
     AC_MSG_RESULT([$ax_enable_assert])