* [PATCH v3] build: Fix requiring ell
@ 2018-05-17 10:04 Luiz Augusto von Dentz
0 siblings, 0 replies; 2+ messages in thread
From: Luiz Augusto von Dentz @ 2018-05-17 10:04 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Make sure libshared-ell is only build if ell is available.
---
Makefile.am | 6 ++++--
configure.ac | 5 +++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 322706fad..27b6027d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 \
diff --git a/configure.ac b/configure.ac
index 5132131f2..1599b72c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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}"); 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}" != "no")
AC_ARG_ENABLE(client, AC_HELP_STRING([--disable-client],
[disable command line client]), [enable_client=${enableval}])
--
2.14.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH v3] build: Fix requiring ell
@ 2018-05-17 10:05 Luiz Augusto von Dentz
0 siblings, 0 replies; 2+ messages in thread
From: Luiz Augusto von Dentz @ 2018-05-17 10:05 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Make sure libshared-ell is only build if ell is available.
---
Makefile.am | 6 ++++--
configure.ac | 5 +++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 322706fad..27b6027d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 \
diff --git a/configure.ac b/configure.ac
index 5132131f2..2daf1aaa4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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}])
--
2.14.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-05-17 10:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-17 10:04 [PATCH v3] build: Fix requiring ell Luiz Augusto von Dentz
2018-05-17 10:05 Luiz Augusto von Dentz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.