X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fax_assert.m4;h=0fa2b1c9b510041ac56a5721e4ee8a712e5fce54;hb=1be11f8bb8fdf368985d9e1c900b250541dc4791;hp=25cd625f4d4e6e589e0759e99bba238b9b321d4c;hpb=feded1b9d9b6aa51c68fd3d076408a516b1a31aa;p=awesomized%2Flibmemcached

diff --git a/m4/ax_assert.m4 b/m4/ax_assert.m4
index 25cd625f..0fa2b1c9 100644
--- a/m4/ax_assert.m4
+++ b/m4/ax_assert.m4
@@ -43,22 +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 2
+#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],
-        [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=$enableval],
+      [ax_enable_assert=$ac_cv_vcs_checkout])
 
-    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" ],
+      [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])