aboutsummaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorBrent Cook <busterb@gmail.com>2022-02-27 06:05:41 -0600
committerBrent Cook <busterb@gmail.com>2022-02-27 06:05:41 -0600
commit56bf8d4f4191184470b1f15815b9b8de1eab1b8e (patch)
tree22dbb8d87ed29fcb80ec4d53e54430c94c3d73d6 /m4
parent2336a535c6fabfa3222d36b15008335cc236d8ac (diff)
downloadportable-56bf8d4f4191184470b1f15815b9b8de1eab1b8e.tar.gz
portable-56bf8d4f4191184470b1f15815b9b8de1eab1b8e.tar.bz2
portable-56bf8d4f4191184470b1f15815b9b8de1eab1b8e.zip
update autotool macro deprecations
fix latest round of autotool complaints
Diffstat (limited to 'm4')
-rw-r--r--m4/check-hardening-options.m426
1 files changed, 10 insertions, 16 deletions
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], [
4 AC_MSG_CHECKING([if $saved_CC supports "$1"]) 4 AC_MSG_CHECKING([if $saved_CC supports "$1"])
5 old_cflags="$CFLAGS" 5 old_cflags="$CFLAGS"
6 CFLAGS="$1 -Wall -Werror" 6 CFLAGS="$1 -Wall -Werror"
7 AC_TRY_LINK([ 7 AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[printf("Hello")]])],
8 #include <stdio.h> 8 [AC_MSG_RESULT([yes])
9 ],
10 [printf("Hello")],
11 AC_MSG_RESULT([yes])
12 CFLAGS=$old_cflags 9 CFLAGS=$old_cflags
13 HARDEN_CFLAGS="$HARDEN_CFLAGS $1", 10 HARDEN_CFLAGS="$HARDEN_CFLAGS $1"],
14 AC_MSG_RESULT([no]) 11 [AC_MSG_RESULT([no])
15 CFLAGS=$old_cflags 12 CFLAGS=$old_cflags
16 [$2]) 13 [$2]])
17]) 14])
18 15
19AC_DEFUN([CHECK_LDFLAG], [ 16AC_DEFUN([CHECK_LDFLAG], [
@@ -21,16 +18,13 @@ AC_DEFUN([CHECK_LDFLAG], [
21 AC_MSG_CHECKING([if $saved_LD supports "$1"]) 18 AC_MSG_CHECKING([if $saved_LD supports "$1"])
22 old_ldflags="$LDFLAGS" 19 old_ldflags="$LDFLAGS"
23 LDFLAGS="$1 -Wall -Werror" 20 LDFLAGS="$1 -Wall -Werror"
24 AC_TRY_LINK([ 21 AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[printf("Hello")]])],
25 #include <stdio.h> 22 [AC_MSG_RESULT([yes])
26 ],
27 [printf("Hello")],
28 AC_MSG_RESULT([yes])
29 LDFLAGS=$old_ldflags 23 LDFLAGS=$old_ldflags
30 HARDEN_LDFLAGS="$HARDEN_LDFLAGS $1", 24 HARDEN_LDFLAGS="$HARDEN_LDFLAGS $1"],
31 AC_MSG_RESULT([no]) 25 [AC_MSG_RESULT([no])
32 LDFLAGS=$old_ldflags 26 LDFLAGS=$old_ldflags
33 [$2]) 27 [$2]])
34]) 28])
35 29
36AC_DEFUN([DISABLE_AS_EXECUTABLE_STACK], [ 30AC_DEFUN([DISABLE_AS_EXECUTABLE_STACK], [