korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-15 00:04:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

build: Fix requiring ell

Browse Source 
Make sure libshared-ell is only build if ell is available.
This commit is contained in:
Luiz Augusto von Dentz 2018-05-16 21:36:07 +03:00
parent e1129bcf88
commit 5852a75d79
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -95,8 +95,7 @@ gdbus_libgdbus_internal_la_SOURCES = gdbus/gdbus.h \
gdbus/mainloop.c gdbus/watch.c \
gdbus/object.c gdbus/client.c gdbus/polkit.c
noinst_LTLIBRARIES += src/libshared-glib.la src/libshared-mainloop.la \
src/libshared-ell.la
noinst_LTLIBRARIES += src/libshared-glib.la src/libshared-mainloop.la
shared_sources = src/shared/io.h src/shared/timeout.h \
src/shared/queue.h src/shared/queue.c \
@ -136,8 +135,11 @@ src_libshared_mainloop_la_SOURCES = $(shared_sources) \
src/shared/timeout-mainloop.c \
src/shared/mainloop.h src/shared/mainloop.c
if ELL
src_libshared_ell_la_SOURCES = $(shared_sources) \
src/shared/io-ell.c
noinst_LTLIBRARIES += src/libshared-ell.la
endif
attrib_sources = attrib/att.h attrib/att-database.h attrib/att.c \
attrib/gatt.h attrib/gatt.c \

5
configure.ac
View File

@ -248,12 +248,13 @@ AC_ARG_ENABLE(btpclient, AC_HELP_STRING([--enable-btpclient],
[enable BTP client]), [enable_btpclient=${enableval}])
AM_CONDITIONAL(BTPCLIENT, test "${enable_btpclient}" = "yes")
if (test "${enable_btpclient}" = "yes"); then
PKG_CHECK_MODULES(ELL, ell >= 0.3, dummy=yes,
if (test "${enable_btpclient}" = "yes" || test "${enable_mesh}" = "yes"); then
PKG_CHECK_MODULES(ELL, ell >= 0.3, enable_ell=yes,
AC_MSG_ERROR(ell library >= 0.3 is required))
AC_SUBST(ELL_CFLAGS)
AC_SUBST(ELL_LIBS)
fi
AM_CONDITIONAL(ELL, test "${enable_ell}" = "yes")
AC_ARG_ENABLE(client, AC_HELP_STRING([--disable-client],
[disable command line client]), [enable_client=${enableval}])