X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fax_assert.m4;h=d13787cd4480c2df4a9d4ec2b2d1a444b1ce986d;hb=0aaa4448e3787c60c7ed87bd75905ca22ccec7a4;hp=7ee26d00287b578f42a11ef9f008cbc5a988b8f3;hpb=5a6dd35a036e60a1e51d2bffbde6b5fb0064e65d;p=m6w6%2Flibmemcached

diff --git a/m4/ax_assert.m4 b/m4/ax_assert.m4
index 7ee26d00..d13787cd 100644
--- a/m4/ax_assert.m4
+++ b/m4/ax_assert.m4
@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_ASSERT
+#   AX_ASSERT()
 #
 # DESCRIPTION
 #
@@ -43,18 +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 4
 
-AC_DEFUN([AX_ASSERT],[
+AC_DEFUN([AX_ASSERT],
+    [AC_PREREQ([2.63])dnl
+    AC_REQUIRE([AX_DEBUG])
     AC_ARG_ENABLE([assert],
       [AS_HELP_STRING([--enable-assert],
-        [Add assert code/turns off optimizations (yes|no) @<:@default=no@:>@])],[
+        [Enable assert, this will be overridden by --enable-debug (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.])
+      ])
+
+    AS_IF([ test "$ax_enable_assert" = "yes" -o "$ax_enable_debug" = "yes" ],[
+      ax_enable_assert="yes"
+      AC_DEFINE(NDEBUG,[1],[Define to 1 to enable assert'ing code.])
       ])
 
     AC_MSG_CHECKING([for assert])