X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fax_assert.m4;h=88741293e176246e41f424f0dd92b1eabd72c01e;hb=1e8846493e108861a15f71381747c2b0cebc9ed9;hp=d13787cd4480c2df4a9d4ec2b2d1a444b1ce986d;hpb=0aaa4448e3787c60c7ed87bd75905ca22ccec7a4;p=awesomized%2Flibmemcached

diff --git a/m4/ax_assert.m4 b/m4/ax_assert.m4
index d13787cd..88741293 100644
--- a/m4/ax_assert.m4
+++ b/m4/ax_assert.m4
@@ -43,23 +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 4
+#serial 6
 
 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],
-        [Enable assert, this will be overridden by --enable-debug (yes|no) @<:@default=no@:>@])],[
-      ax_enable_assert=yes
-      ],[
-      ax_enable_assert=no
-      ])
+        [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" ],[
-      ax_enable_assert="yes"
-      AC_DEFINE(NDEBUG,[1],[Define to 1 to enable assert'ing code.])
-      ])
+    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])