diff --git a/configure.ac b/configure.ac
index c7acffaf..012600ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2582,7 +2582,9 @@ AC_CACHE_CHECK([for supported 'noreturn' keyword], [mhd_cv_decl_noreturn],
   [
     mhd_cv_decl_noreturn="none"
     CFLAGS="${CFLAGS_ac} ${user_CFLAGS} ${errattr_CFLAGS}"
-    for decl_noret in '_Noreturn' '__attribute__((__noreturn__))' '__declspec(noreturn)'
+    MHD_SAVED_ac_c_werror_flag="$ac_c_werror_flag"
+    ac_c_werror_flag=yes
+    for decl_noret in ['[[noreturn]]'] '_Noreturn' '__attribute__((__noreturn__))' '__declspec(noreturn)'
     do
       AC_LINK_IFELSE([AC_LANG_SOURCE(
           [[
@@ -2611,7 +2613,9 @@ int main (int argc, char *const *argv)
       )
       AS_IF([test "x${mhd_cv_decl_noreturn}" != "xnone"], [break])
     done
-   CFLAGS="${CFLAGS_ac} ${user_CFLAGS}"
+    ac_c_werror_flag="$MHD_SAVED_ac_c_werror_flag"
+    AS_UNSET([MHD_SAVED_ac_c_werror_flag])
+    CFLAGS="${CFLAGS_ac} ${user_CFLAGS}"
   ]
 )
 AS_VAR_IF([mhd_cv_decl_noreturn], ["none"],