0
0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-11-09 20:58:44 +00:00

Merge commit 'v2.14-25-gb5378447' into mq-merge-step-2

This commit is contained in:
Maria Matejka 2024-01-28 14:53:38 +01:00
commit e728c60be5
2 changed files with 7 additions and 2 deletions

6
aclocal.m4 vendored
View File

@ -201,6 +201,12 @@ AC_DEFUN([BIRD_ADD_GCC_OPTION],
fi 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]) # BIRD_CHECK_PROG_FLAVOR_GNU(PROGRAM-PATH, IF-SUCCESS, [IF-FAILURE])
# copied from autoconf internal _AC_PATH_PROG_FLAVOR_GNU # copied from autoconf internal _AC_PATH_PROG_FLAVOR_GNU
AC_DEFUN([BIRD_CHECK_PROG_FLAVOR_GNU], AC_DEFUN([BIRD_CHECK_PROG_FLAVOR_GNU],

View File

@ -393,8 +393,7 @@ if test "$enable_debug" = yes ; then
LDFLAGS="$LDFLAGS -rdynamic" LDFLAGS="$LDFLAGS -rdynamic"
CFLAGS="$CFLAGS -O0 -ggdb -g3" CFLAGS="$CFLAGS -O0 -ggdb -g3"
BIRD_CHECK_GCC_OPTION([bird_cv_c_option_dwarf4], [-gdwarf-4], []) BIRD_CHECK_AND_ADD_GCC_OPTION([bird_cv_c_option_dwarf4], [-gdwarf-4], [])
BIRD_ADD_GCC_OPTION([bird_cv_c_option_dwarf4], [-gdwarf-4])
AC_CHECK_HEADER([execinfo.h], AC_CHECK_HEADER([execinfo.h],
[ [