X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a3d324ced885fef99347c9dbbb945f0bb98137fe..a75b45f604c4e48b0f39be25ce59cd1955e5f9a4:/configure.ac?ds=sidebyside

diff --git a/configure.ac b/configure.ac
index 19f89ed4..ce4b46d5 100644
--- 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"
@@ -189,6 +188,11 @@ 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 ------------------