Try using -man instead of -mandoc in test-manpages on OpenBSD

[nmh] / configure.ac

diff --git a/configure.ac b/configure.ac
index 02c0a14133d478d0d3c66f454afc0ae91cb76658..ce4b46d561f5b5d9e24999ecbf3bfa02651499ff 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -94,14 +94,13 @@ dnl We want these before the checks,
 dnl so the checks can modify their values.
 test -z "$CFLAGS" && CFLAGS= auto_cflags=1
 
-AC_PROG_CC(cc gcc)
+AC_PROG_CC([cc gcc])
 AM_PROG_CC_C_O
 
 dnl Use -v and some other options with SunStudio cc.
-case `${CC} -V 2>&1` in
-  cc:\ Sun\ C*) CFLAGS="${CFLAGS:+$CFLAGS }-v -errtags=yes"
-                CFLAGS="${CFLAGS} -erroff=E_STATEMENT_NOT_REACHED" ;;
-esac
+AS_CASE([`${CC} -V 2>&1`],
+       [cc:\ Sun\ C*], [CFLAGS="${CFLAGS:+$CFLAGS }-v -errtags=yes"
+                        CFLAGS="${CFLAGS} -erroff=E_STATEMENT_NOT_REACHED"])
 
 AC_CACHE_CHECK([whether compiler supports -Wextra], [nmh_cv_has_wextra],
 [nmh_saved_cflags="$CFLAGS"
@@ -158,8 +157,6 @@ if test -n "$auto_cflags"; then
     else
       test -z "$CFLAGS" && CFLAGS=-O  || CFLAGS="$CFLAGS -O"
     fi
-    AC_DEFINE([NDEBUG], [1],
-              [Define to disable run-time debugging and asserts.])
   fi
 fi
 
@@ -191,6 +188,13 @@ else
   fi
 fi
 
+dnl This hack turns off assertions by default, assuming
+dnl that configure still uses this shell variable.  Without
+dnl it, AC_HEADER_ASSERT enables assertions by default.
+test -z "$enable_assert"  &&  enable_assert=no
+
+AC_HEADER_ASSERT
+
 dnl ------------------
 dnl CHECK FOR PROGRAMS
 dnl ------------------
@@ -585,10 +589,10 @@ dnl 2.5.35-37 that cause signed/unsigned mismatch,
 dnl http://sourceforge.net/p/flex/bugs/140/
 AS_IF([test "$LEX" = flex],
       [AS_CASE([`$LEX -V`],
-               [flex\ 2.5.35], [[LFLAGS=\
-'; printf "%s\n" '\''1,$$s/(size_t) \(num_to_read\)/\1/'\'' w q | ed -s $@']],
-               [flex\ 2.5.3@<:@67@:>@], [[LFLAGS=\
-'; printf "%s\n" '\''1,$$s/\(  \)int i;/\1yy_size_t i;/'\'' w q | ed -s $@']])
+               [flex\ 2.5.35], [LFLAGS=\
+'; printf "%s\n" '\''1,$$s/(size_t) \(num_to_read\)/\1/'\'' w q | ed -s $@'],
+               [flex\ 2.5.3@<:@67@:>@], [LFLAGS=\
+'; printf "%s\n" '\''1,$$s/\(  \)int i;/\1yy_size_t i;/'\'' w q | ed -s $@'])
        AC_SUBST([LFLAGS])])
 
 dnl --------------