From d627ab691987bc8c76be17917fd4dc2a608ba8ef Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.im>
Date: Thu, 19 Feb 2015 16:52:55 +0100
Subject: [PATCH] configure: move CFLAGS/CPPFLAGS to LLDP_CFLAGS/LLDP_CPPFLAGS

The goal is to avoid the user to override those flags when using `make
CFLAGS=somethingelse`. This is to enable a user to use `make
CFLAGS=-Werror` since this flag cannot be used with `./configure`.
---
 configure.ac           | 6 +++++-
 src/Makefile.am        | 3 ++-
 src/client/Makefile.am | 3 ++-
 src/daemon/Makefile.am | 5 +++--
 src/lib/Makefile.am    | 3 ++-
 tests/Makefile.am      | 3 ++-
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index fe0da6e6..1f9bdb76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -276,6 +276,10 @@ lldp_ARG_ENABLE([oldies], [compatibility with Linux kernel older than 2.6.18], [
 
 #######################
 # Output results
+AC_SUBST([LLDP_CFLAGS], [$CFLAGS])
+AC_SUBST([LLDP_CPPFLAGS], [$CPPFLAGS])
+CFLAGS=
+CPPFLAGS
 AM_CONDITIONAL([HAVE_CHECK], [test x"$have_check" = x"yes"])
 AM_CONDITIONAL([USE_SNMP], [test x"$with_snmp" = x"yes"])
 AM_CONDITIONAL([USE_XML], [test x"$with_xml" = x"yes"])
@@ -297,7 +301,7 @@ cat <<EOF
  $PACKAGE_NAME version $PACKAGE_VERSION
   OS.............: $os
   Prefix.........: $prefix
-  C Compiler.....: $CC $CFLAGS $CPPFLAGS
+  C Compiler.....: $CC $LLDP_CFLAGS $LLDP_CPPFLAGS
   Linker.........: $LD $LDFLAGS $LIBS
   Libevent.......: $libevent
   Readline.......: ${ax_cv_lib_readline}
diff --git a/src/Makefile.am b/src/Makefile.am
index 053f445a..a6bcd538 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,5 @@
-AM_CFLAGS = -I $(top_srcdir)/include
+AM_CFLAGS = -I $(top_srcdir)/include $(LLDP_CFLAGS)
+AM_CPPFLAGS = $(LLDP_CPPFLAGS)
 
 noinst_LTLIBRARIES = libcommon-daemon-lib.la libcommon-daemon-client.la
 include_HEADERS    = lldp-const.h
diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 454bdeb5..555a46db 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -1,4 +1,5 @@
-AM_CFLAGS = -I $(top_srcdir)/include
+AM_CFLAGS = -I $(top_srcdir)/include $(LLDP_CFLAGS)
+AM_CPPFLAGS = $(LLDP_CPPFLAGS)
 
 sbin_PROGRAMS = lldpcli
 man_MANS = lldpcli.8
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 0883ac72..a36ad547 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -1,4 +1,5 @@
-AM_CFLAGS = -I $(top_srcdir)/include
+AM_CFLAGS = -I $(top_srcdir)/include $(LLDP_CFLAGS)
+AM_CPPFLAGS = $(LLDP_CPPFLAGS)
 BUILT_SOURCES =
 CLEANFILES =
 
@@ -22,7 +23,7 @@ liblldpd_la_SOURCES  = \
 	pattern.c \
 	probes.d trace.h
 liblldpd_la_CFLAGS   = $(AM_CFLAGS) @LIBEVENT_CFLAGS@
-liblldpd_la_CPPFLAGS = -DSYSCONFDIR='"$(sysconfdir)"' -DLLDPCLI_PATH='"$(sbindir)/lldpcli"'
+liblldpd_la_CPPFLAGS = $(AM_CPPFLAGS) -DSYSCONFDIR='"$(sysconfdir)"' -DLLDPCLI_PATH='"$(sbindir)/lldpcli"'
 liblldpd_la_LIBADD   = \
 	$(top_builddir)/src/libcommon-daemon-client.la \
 	$(top_builddir)/src/libcommon-daemon-lib.la @LIBEVENT_LIBS@
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index a5b219bb..79af6a95 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,4 +1,5 @@
-AM_CFLAGS = -I $(top_srcdir)/include
+AM_CFLAGS = -I $(top_srcdir)/include $(LLDP_CFLAGS)
+AM_CPPFLAGS = $(LLDP_CPPFLAGS)
 
 lib_LTLIBRARIES = liblldpctl.la
 include_HEADERS = lldpctl.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e0aa299b..86d759fc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,5 @@
-AM_CFLAGS = -I $(top_srcdir)/include
+AM_CFLAGS = -I $(top_srcdir)/include $(LLDP_CFLAGS)
+AM_CPPFLAGS = $(LLDP_CPPFLAGS)
 
 if HAVE_CHECK
 
-- 
2.47.2