summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Magnusson <mikma@users.sourceforge.net>2023-11-26 00:00:07 +0100
committerMikael Magnusson <mikma@users.sourceforge.net>2023-11-26 00:00:07 +0100
commit51adbc5f9c2d702b799ea098f6fd5cc17c05255c (patch)
tree04278d771739f170d9250382ce7e337c778f66f3
parentd4f4eb3b95b7c9443213e94d95bdd0591e0b8814 (diff)
parent108c4cfaf3b0fda5daf4bccf2f1ea45d7f3a271d (diff)
Merge commit '108c4cfa' into wireguard-next-tmp7-1
-rw-r--r--aclocal.m46
-rw-r--r--configure.ac3
2 files changed, 7 insertions, 2 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 1613d680..3fdc446f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -201,6 +201,12 @@ AC_DEFUN([BIRD_ADD_GCC_OPTION],
fi
])
+AC_DEFUN([BIRD_CHECK_AND_ADD_GCC_OPTION],
+[
+ BIRD_CHECK_GCC_OPTION($@)
+ BIRD_ADD_GCC_OPTION($1,$2)
+])
+
# BIRD_CHECK_PROG_FLAVOR_GNU(PROGRAM-PATH, IF-SUCCESS, [IF-FAILURE])
# copied from autoconf internal _AC_PATH_PROG_FLAVOR_GNU
AC_DEFUN([BIRD_CHECK_PROG_FLAVOR_GNU],
diff --git a/configure.ac b/configure.ac
index 2d2dbcf6..65897015 100644
--- a/configure.ac
+++ b/configure.ac
@@ -394,8 +394,7 @@ if test "$enable_debug" = yes ; then
LDFLAGS="$LDFLAGS -rdynamic"
CFLAGS="$CFLAGS -O0 -ggdb -g3"
- BIRD_CHECK_GCC_OPTION([bird_cv_c_option_dwarf4], [-gdwarf-4], [])
- BIRD_ADD_GCC_OPTION([bird_cv_c_option_dwarf4], [-gdwarf-4])
+ BIRD_CHECK_AND_ADD_GCC_OPTION([bird_cv_c_option_dwarf4], [-gdwarf-4], [])
AC_CHECK_HEADER([execinfo.h],
[