X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fax_assert.m4;h=25cd625f4d4e6e589e0759e99bba238b9b321d4c;hb=1f3d43109ef752862093f8e4340fcfec1832b3be;hp=7ee26d00287b578f42a11ef9f008cbc5a988b8f3;hpb=7997ff8f76b3df9c1644e96c8096eb42e553f788;p=awesomized%2Flibmemcached

diff --git a/m4/ax_assert.m4 b/m4/ax_assert.m4
index 7ee26d00..25cd625f 100644
--- a/m4/ax_assert.m4
+++ b/m4/ax_assert.m4
@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_ASSERT
+#   AX_ASSERT()
 #
 # DESCRIPTION
 #
@@ -43,18 +43,21 @@
 #  (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 2
 
 AC_DEFUN([AX_ASSERT],[
+    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])