From e6515ff5183df02b654b40daf8082a2fc3873f8f Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.im>
Date: Thu, 19 Feb 2015 17:01:35 +0100
Subject: [PATCH] configure: move LDFLAGS to LLDP_LDFLAGS

---
 configure.ac           | 6 ++++--
 src/Makefile.am        | 1 +
 src/client/Makefile.am | 1 +
 src/daemon/Makefile.am | 4 +++-
 src/lib/Makefile.am    | 3 ++-
 tests/Makefile.am      | 1 +
 6 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1f9bdb76..9b22e860 100644
--- a/configure.ac
+++ b/configure.ac
@@ -278,8 +278,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])
+AC_SUBST([LLDP_LDFLAGS], [$LDFLAGS])
 CFLAGS=
-CPPFLAGS
+CPPFLAGS=
+LDFLAGS=
 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"])
@@ -302,7 +304,7 @@ cat <<EOF
   OS.............: $os
   Prefix.........: $prefix
   C Compiler.....: $CC $LLDP_CFLAGS $LLDP_CPPFLAGS
-  Linker.........: $LD $LDFLAGS $LIBS
+  Linker.........: $LD $LLDP_LDFLAGS $LIBS
   Libevent.......: $libevent
   Readline.......: ${ax_cv_lib_readline}
  Optional features:
diff --git a/src/Makefile.am b/src/Makefile.am
index a6bcd538..63e3c1f2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,6 @@
 AM_CFLAGS = -I $(top_srcdir)/include $(LLDP_CFLAGS)
 AM_CPPFLAGS = $(LLDP_CPPFLAGS)
+AM_LDFLAGS = $(LLDP_LDFLAGS)
 
 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 555a46db..8fbb155b 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -1,5 +1,6 @@
 AM_CFLAGS = -I $(top_srcdir)/include $(LLDP_CFLAGS)
 AM_CPPFLAGS = $(LLDP_CPPFLAGS)
+AM_LDFLAGS = $(LLDP_LDFLAGS)
 
 sbin_PROGRAMS = lldpcli
 man_MANS = lldpcli.8
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index a36ad547..df5649ac 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -1,5 +1,6 @@
 AM_CFLAGS = -I $(top_srcdir)/include $(LLDP_CFLAGS)
 AM_CPPFLAGS = $(LLDP_CPPFLAGS)
+AM_LDFLAGS = $(LLDP_LDFLAGS)
 BUILT_SOURCES =
 CLEANFILES =
 
@@ -75,7 +76,8 @@ liblldpd_la_SOURCES += \
 	interfaces-bsd.c \
 	dmi-osx.c \
 	priv-bsd.c
-liblldpd_la_LDFLAGS  = -framework Foundation
+liblldpd_la_LDFLAGS  = $(AM_LDFLAGS)
+liblldpd_la_LDFLAGS += -framework Foundation
 liblldpd_la_LDFLAGS += -framework CoreFoundation -framework IOKit
 liblldpd_la_LDFLAGS += -framework IOKit
 endif
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 79af6a95..edc9797f 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,5 +1,6 @@
 AM_CFLAGS = -I $(top_srcdir)/include $(LLDP_CFLAGS)
 AM_CPPFLAGS = $(LLDP_CPPFLAGS)
+AM_LDFLAGS = $(LLDP_LDFLAGS)
 
 lib_LTLIBRARIES = liblldpctl.la
 include_HEADERS = lldpctl.h
@@ -9,7 +10,7 @@ libfixedpoint_la_SOURCES = fixedpoint.h fixedpoint.c
 
 liblldpctl_la_SOURCES = lldpctl.h private.h errors.c connection.c atom.c atom-private.c
 liblldpctl_la_LIBADD  = $(top_builddir)/src/libcommon-daemon-lib.la libfixedpoint.la
-liblldpctl_la_LDFLAGS = -export-symbols-regex '^lldpctl_' -version-info 8:0:4
+liblldpctl_la_LDFLAGS = $(AM_LDFLAGS) -export-symbols-regex '^lldpctl_' -version-info 8:0:4
 
 # -version-info format is `current`:`revision`:`age`. For more details, see:
 #   http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 86d759fc..4d305186 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,6 @@
 AM_CFLAGS = -I $(top_srcdir)/include $(LLDP_CFLAGS)
 AM_CPPFLAGS = $(LLDP_CPPFLAGS)
+AM_LDFLAGS = $(LLDP_LDFLAGS)
 
 if HAVE_CHECK
 
-- 
2.47.2