3 files changed, 12 insertions, 19 deletions

diff --git a/configure.ac b/configure.ac
index fdf72ee..8119508 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-AC_INIT([libressl], m4_esyscmd([tr -d '\n' < VERSION]))
+AC_INIT([libressl], m4_esyscmd(tr -d '\n' < VERSION))
 AC_SUBST([LIBCRYPTO_VERSION], m4_esyscmd([tr -d '\n' < crypto/VERSION]))
 AC_SUBST([LIBSSL_VERSION], m4_esyscmd([tr -d '\n' < ssl/VERSION]))
 AC_SUBST([LIBTLS_VERSION], m4_esyscmd([tr -d '\n' < tls/VERSION]))
@@ -27,7 +27,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 USER_CFLAGS="$CFLAGS"
 
 AC_PROG_CC([cc gcc])
-AC_PROG_CC_STDC
 AM_PROG_CC_C_O
 LT_INIT([pic-only])
 
diff --git a/m4/check-hardening-options.m4 b/m4/check-hardening-options.m4
index c8ab12e..4b5784b 100644
--- a/m4/check-hardening-options.m4
+++ b/m4/check-hardening-options.m4
@@ -4,16 +4,13 @@ AC_DEFUN([CHECK_CFLAG], [
          AC_MSG_CHECKING([if $saved_CC supports "$1"])
          old_cflags="$CFLAGS"
          CFLAGS="$1 -Wall -Werror"
-         AC_TRY_LINK([
-                      #include <stdio.h>
-                      ],
-                     [printf("Hello")],
-                     AC_MSG_RESULT([yes])
+         AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[printf("Hello")]])],
+                     [AC_MSG_RESULT([yes])
                      CFLAGS=$old_cflags
-                     HARDEN_CFLAGS="$HARDEN_CFLAGS $1",
-                     AC_MSG_RESULT([no])
+                     HARDEN_CFLAGS="$HARDEN_CFLAGS $1"],
+                     [AC_MSG_RESULT([no])
                      CFLAGS=$old_cflags
-                     [$2])
+                     [$2]])
 ])
 
 AC_DEFUN([CHECK_LDFLAG], [
@@ -21,16 +18,13 @@ AC_DEFUN([CHECK_LDFLAG], [
          AC_MSG_CHECKING([if $saved_LD supports "$1"])
          old_ldflags="$LDFLAGS"
          LDFLAGS="$1 -Wall -Werror"
-         AC_TRY_LINK([
-                      #include <stdio.h>
-                      ],
-                     [printf("Hello")],
-                     AC_MSG_RESULT([yes])
+         AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[printf("Hello")]])],
+                     [AC_MSG_RESULT([yes])
                      LDFLAGS=$old_ldflags
-                     HARDEN_LDFLAGS="$HARDEN_LDFLAGS $1",
-                     AC_MSG_RESULT([no])
+                     HARDEN_LDFLAGS="$HARDEN_LDFLAGS $1"],
+                     [AC_MSG_RESULT([no])
                      LDFLAGS=$old_ldflags
-                     [$2])
+                     [$2]])
 ])
 
 AC_DEFUN([DISABLE_AS_EXECUTABLE_STACK], [
diff --git a/tap-driver.sh b/tap-driver.sh
index 0ca4903..fea066f 100755
--- a/tap-driver.sh
+++ b/tap-driver.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by