Force test for -fno-delete-null-pointer-checks to fail

(cherry picked from commit 82ab846f133ea2b237472eb0dd78d000fea19d9d)

diff --git a/aclocal.m4 b/aclocal.m4
index 167140bbebc42ca84baa36022edc5349cf4ef66b..fd128f09635f83f67c69dd88135f93c1d5136775 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
 
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -290,7 +290,7 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -324,7 +324,7 @@ fi])])
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -357,7 +357,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
 ]
 )
 
-# Copyright (C) 2006-2018 Free Software Foundation, Inc.
+# Copyright (C) 2006-2020 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,

diff --git a/configure b/configure
index 7ca5c2346a21e61723227b5fc2db84c026738412..2832065e55948ccf3c868f4f238ede2d50ae4fbe 100755 (executable)
--- a/configure
+++ b/configure
@@ -762,6 +762,7 @@ MAXMINDDB_LIBS
 MAXMINDDB_CFLAGS
 ISC_PLATFORM_NORETURN_POST
 ISC_PLATFORM_NORETURN_PRE
+PYTEST
 expanded_sysconfdir
 PYTHON_INSTALL_LIB
 PYTHON_INSTALL_DIR
@@ -12700,6 +12701,58 @@ case "$INSTALL" in
                ;;
 esac
 
+for ac_prog in pytest-3 pytest pytest-pypy
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PYTEST+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PYTEST in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PYTEST="$PYTEST" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PYTEST="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PYTEST=$ac_cv_path_PYTEST
+if test -n "$PYTEST"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTEST" >&5
+$as_echo "$PYTEST" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$PYTEST" && break
+done
+
+if test -z "$PYTEST"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pytest not found, some system tests will be skipped" >&5
+$as_echo "$as_me: WARNING: pytest not found, some system tests will be skipped" >&2;}
+fi
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -18379,14 +18432,14 @@ else
   :
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-delete-null-pointer-checks" >&5
-$as_echo_n "checking whether C compiler accepts -fno-delete-null-pointer-checks... " >&6; }
-if ${ax_cv_check_cflags___fno_delete_null_pointer_checks+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror -fno-delete-null-pointer-checks" >&5
+$as_echo_n "checking whether C compiler accepts -Werror -fno-delete-null-pointer-checks... " >&6; }
+if ${ax_cv_check_cflags___Werror__fno_delete_null_pointer_checks+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS  -fno-delete-null-pointer-checks"
+  CFLAGS="$CFLAGS  -Werror -fno-delete-null-pointer-checks"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -18399,16 +18452,16 @@ main ()
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags___fno_delete_null_pointer_checks=yes
+  ax_cv_check_cflags___Werror__fno_delete_null_pointer_checks=yes
 else
-  ax_cv_check_cflags___fno_delete_null_pointer_checks=no
+  ax_cv_check_cflags___Werror__fno_delete_null_pointer_checks=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fno_delete_null_pointer_checks" >&5
-$as_echo "$ax_cv_check_cflags___fno_delete_null_pointer_checks" >&6; }
-if test "x$ax_cv_check_cflags___fno_delete_null_pointer_checks" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___Werror__fno_delete_null_pointer_checks" >&5
+$as_echo "$ax_cv_check_cflags___Werror__fno_delete_null_pointer_checks" >&6; }
+if test "x$ax_cv_check_cflags___Werror__fno_delete_null_pointer_checks" = xyes; then :
   STC_CWARNINGS="$STD_CWARNINGS -fno-delete-null-pointer-checks"
 else
   :

diff --git a/configure.ac b/configure.ac
index c921c83aac1a0bef5fd8294697f8aaef7beecbba..23b6eae81c3b94f7735db7f748c9c79e2283e9b1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1359,7 +1359,7 @@ AS_IF([test "$GCC" = "yes"],
 
 AX_CHECK_COMPILE_FLAG([-fno-strict-aliasing],
                      [STD_CWARNINGS="$STD_CWARNINGS -fno-strict-aliasing"])
-AX_CHECK_COMPILE_FLAG([-fno-delete-null-pointer-checks],
+AX_CHECK_COMPILE_FLAG([-Werror -fno-delete-null-pointer-checks],
                      [STC_CWARNINGS="$STD_CWARNINGS -fno-delete-null-pointer-checks"])
 AS_IF([test "$enable_warn_shadow" = "yes"],
       [AX_CHECK_COMPILE_FLAG([-Wshadow],