2015-06-30 12:40:00

by Alexis Ballier

[permalink] [raw]
Subject: [PATCH] Fix build with experimental enabled but no readline.

btmgmt requires readline. Protect it under if READLINE.
---
Makefile.tools | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile.tools b/Makefile.tools
index 1899fcb..64a3e13 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -249,7 +249,7 @@ if EXPERIMENTAL
noinst_PROGRAMS += tools/bdaddr tools/avinfo tools/avtest \
tools/scotest tools/amptest tools/hwdb \
tools/hcieventmask tools/hcisecfilter \
- tools/btmgmt tools/btinfo tools/btattach \
+ tools/btinfo tools/btattach \
tools/btsnoop tools/btproxy \
tools/btiotest tools/bneptest tools/mcaptest \
tools/cltest tools/oobtest tools/seq2bseq \
@@ -272,9 +272,12 @@ tools_hwdb_LDADD = lib/libbluetooth-internal.la

tools_hcieventmask_LDADD = lib/libbluetooth-internal.la

+if READLINE
+noinst_PROGRAMS += tools/btmgmt
tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c client/display.c
tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la \
-lreadline
+endif

tools_btinfo_SOURCES = tools/btinfo.c monitor/bt.h
tools_btinfo_LDADD = src/libshared-mainloop.la
--
2.4.5



2015-07-29 17:52:27

by Johan Hedberg

[permalink] [raw]
Subject: Re: [PATCH] Fix build with experimental enabled but no readline.

Hi Alexis,

On Tue, Jun 30, 2015, Alexis Ballier wrote:
> btmgmt requires readline. Protect it under if READLINE.
> ---
> Makefile.tools | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)

Applied, however I moved this to the common section for other READLINE
binaries in Makefile.tools.

Johan

2015-07-27 09:46:39

by Alexis Ballier

[permalink] [raw]
Subject: Re: [PATCH] Fix build with experimental enabled but no readline.

[...]

Hi,

Is this the proper ml to send bluez patches ?

Alexis.