X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fassert.m4;h=b5b90c0df66365f0580555fb3e99a800510cf709;hb=4d319c3618a4668216195af1400afa8fb0549d6e;hp=8ab60b1bdf49178eb6b3b81956cea08ebdebeb8b;hpb=ee76465ad82c04707c78ff3ed723358217c9e34f;p=gnulib.git

diff --git a/m4/assert.m4 b/m4/assert.m4
index 8ab60b1bd..b5b90c0df 100644
--- a/m4/assert.m4
+++ b/m4/assert.m4
@@ -1,13 +1,24 @@
-#serial 3
-dnl based on code from Eleftherios Gkioulekas
+#serial 7
+
+# Copyright (C) 1998-1999, 2001, 2004, 2008-2010 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-AC_DEFUN([jm_ASSERT],
+dnl based on code from Eleftherios Gkioulekas
+dnl Autoconf 2.60 provides AC_HEADER_ASSERT for the same purpose, but
+dnl it has broken semantics for --enable-assert until 2.64.
+AC_DEFUN([gl_ASSERT],
 [
-  AC_MSG_CHECKING(whether to enable assertions)
-  AC_ARG_ENABLE(assert,
-	[  --disable-assert        turn off assertions],
-	[ AC_MSG_RESULT(no)
-	  AC_DEFINE(NDEBUG,1,[Define to 1 if assertions should be disabled.]) ],
-	[ AC_MSG_RESULT(yes) ]
-               )
+  AC_MSG_CHECKING([whether to enable assertions])
+  AC_ARG_ENABLE([assert],
+    [AS_HELP_STRING([--disable-assert], [turn off assertions])],
+    [AS_IF([test "x$enableval" = xno],
+      [AC_DEFINE([NDEBUG], [1],
+        [Define to 1 if assertions should be disabled.])],
+      [test "x$enableval" != xyes],
+      [AC_MSG_WARN([invalid argument supplied to --enable-assert])
+      enable_assert=yes])],
+    [enable_assert=yes])
+  AC_MSG_RESULT([$enable_assert])
 ])