From e01aeb55e7727ae31ecfb6b4f2c229918659b4ba Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.im>
Date: Sun, 13 Dec 2015 08:57:05 +0100
Subject: [PATCH] build: make use of libbsd work even if a user override CFLAGS

`make CFLAGS=...` should work as expected.
---
 configure.ac | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9743404e..f4c0a64a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,10 +131,14 @@ AC_FUNC_REALLOC
 AC_FUNC_FORK
 
 # Some functions can be in libbsd
-PKG_CHECK_MODULES([libbsd], [libbsd-overlay], [
-  CFLAGS="$CFLAGS $libbsd_CFLAGS"
-  LIBS="$LIBS $libbsd_LIBS"
-], [])
+PKG_CHECK_MODULES([libbsd], [libbsd-overlay], [], [:])
+_save_CFLAGS="$CFLAGS"
+_save_LIBS="$LIBS"
+CFLAGS="$CFLAGS $libbsd_CFLAGS"
+LIBS="$LIBS $libbsd_LIBS"
+LLDP_CFLAGS="$LLDP_CFLAGS $libbsd_CFLAGS"
+LLDP_LDFLAGS="$LLDP_LDFLAGS $libbsd_LIBS"
+
 # setproctitle may have an _init function
 AC_REPLACE_FUNCS([setproctitle])
 AC_CHECK_FUNCS([setproctitle_init])
@@ -159,6 +163,9 @@ AC_SEARCH_LIBS([res_init], resolv bind,
                [Define to indicate that res_init() exists]))
 m4_popdef([AC_LANG_CALL(C)])
 
+CFLAGS="$_save_CFLAGS"
+LIBS="$_save_LIBS"
+
 AC_CACHE_SAVE
 
 ## Unit tests wich check
-- 
2.47.2