diff --git a/aclocal.m4 b/aclocal.m4
index cc45b54a..ffe67706 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -237,6 +237,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 fc2ba940..465f729e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -401,8 +401,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],
     [