assert: honor --enable-assert

* m4/assert.m4 (gl_ASSERT): Synchronize with autoconf 2.64, in
order to honor --enable-assert, rather than treating it as a
synonym for --disable-assert.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 9657e69..c52a8db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-08  William Pursell  <bill.pursell@gmail.com>  (tiny change)
+       and Eric Blake  <ebb9@byu.net>
+
+       assert: honor --enable-assert
+       * m4/assert.m4 (gl_ASSERT): Synchronize with autoconf 2.64, in
+       order to honor --enable-assert, rather than treating it as a
+       synonym for --disable-assert.
+
 2008-12-08  Jim Meyering  <meyering@redhat.com>
 
        * lib/posixtm.c: Remove now-useless declaration of mktime.

diff --git a/m4/assert.m4 b/m4/assert.m4
index bfdc00f..cb61ce8 100644 (file)
--- a/m4/assert.m4
+++ b/m4/assert.m4
@@ -1,19 +1,24 @@
-#serial 5
+#serial 6
 
-# Copyright (C) 1998, 1999, 2001, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2001, 2004, 2008 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.
 
 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=no])],
+    [enable_assert=no])
+  AC_MSG_RESULT([$enable_assert])
 ])