From 108c4cfaf3b0fda5daf4bccf2f1ea45d7f3a271d Mon Sep 17 00:00:00 2001 From: Maria Matejka Date: Tue, 24 Oct 2023 12:40:52 +0200 Subject: Autoconf: minor reduction of redundancy Joined BIRD_CHECK_GCC_OPTION and BIRD_ADD_GCC_OPTION. --- aclocal.m4 | 6 ++++++ configure.ac | 3 +-- 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 b2f18c90..0ed4d2d7 100644 --- a/configure.ac +++ b/configure.ac @@ -393,8 +393,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], [ -- cgit v1.2.3