From 6de4e22b7364e2c8c298a70876a695abc661a218 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Wed, 29 May 2019 15:06:56 +0100
Subject: [PATCH] CLIENT_LDFLAGS now uses LDFLAGS.

Closes #1294. Thanks to Lucas Ramage.
---
 .github/lock.yml | 35 +++++++++++++++++++++++++++++++++++
 ChangeLog.txt    |  3 +++
 config.mk        |  2 +-
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 .github/lock.yml

diff --git a/.github/lock.yml b/.github/lock.yml
new file mode 100644
index 0000000000..916ac1f7cb
--- /dev/null
+++ b/.github/lock.yml
@@ -0,0 +1,35 @@
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 90
+
+# Skip issues and pull requests created before a given timestamp. Timestamp must
+# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
+skipCreatedBefore: false
+
+# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
+exemptLabels: []
+
+# Label to add before locking, such as `outdated`. Set to `false` to disable
+lockLabel: false
+
+# Comment to post before locking. Set to `false` to disable
+lockComment: false
+
+# Assign `resolved` as the reason for locking. Set to `false` to disable
+setLockReason: true
+
+# Limit to only `issues` or `pulls`
+only: issues
+
+# Optionally, specify configuration settings just for `issues` or `pulls`
+# issues:
+#   exemptLabels:
+#     - help-wanted
+#   lockLabel: outdated
+
+# pulls:
+#   daysUntilLock: 30
+
+# Repository to extend settings from
+# _extends: repo
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 5be7af28e5..26c8b66f74 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -41,6 +41,9 @@ Documentation:
 - Remove references to Python binding and C++ wrapper in libmosquitto man
   page. Closes #1266.
 
+Build:
+- CLIENT_LDFLAGS now uses LDFLAGS. Closes #1294.
+
 
 1.6.2 - 20190430
 ================
diff --git a/config.mk b/config.mk
index 9c9592a19d..6b9660bc2e 100644
--- a/config.mk
+++ b/config.mk
@@ -143,7 +143,7 @@ BROKER_LDADD:=
 
 CLIENT_CPPFLAGS:=$(CPPFLAGS) -I.. -I../lib
 CLIENT_CFLAGS:=${CFLAGS} -DVERSION="\"${VERSION}\""
-CLIENT_LDFLAGS:=-L../lib
+CLIENT_LDFLAGS:=$(LDFLAGS) -L../lib
 CLIENT_LDADD:=
 
 PASSWD_LDADD:=