[rygel] build: Fix linking of LMS against unistring
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] build: Fix linking of LMS against unistring
- Date: Sun, 17 Jan 2016 21:32:53 +0000 (UTC)
commit b93914add9857fd0b4bc262cc5e9dd7609fbd387
Author: Jens Georg <mail jensge org>
Date: Sun Apr 19 00:26:43 2015 +0200
build: Fix linking of LMS against unistring
Signed-off-by: Jens Georg <mail jensge org>
configure.ac | 12 ++++++++++++
src/plugins/lms/Makefile.am | 3 ++-
src/plugins/media-export/Makefile.am | 3 ++-
3 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a5b5951..8855d72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,6 +164,18 @@ PKG_CHECK_MODULES([TEST_DEPS],
TEST_DEPS_VALAFLAGS="$RYGEL_COMMON_MODULES_VALAFLAGS --pkg gio-2.0 --pkg gssdp-1.0 --pkg libsoup-2.4 --pkg
libxml-2.0 --pkg gmodule-2.0"
AC_SUBST([TEST_DEPS_VALAFLAGS])
+
+AC_CHECK_HEADER([unistr.h],
+ AC_CHECK_LIB([unistring],
+ [u8_strcoll],
+ [have_unistring=yes],[have_unistring=no]))
+AS_IF([test "x$have_unistring" = "xyes"],
+ [
+ AC_DEFINE([HAVE_UNISTRING],[1],[Use libunistring for collation])
+ UNISTRING_LIBS="-lunistring"
+ AC_SUBST([UNISTRING_LIBS])
+])
+
########################################################
## Examples
########################################################
diff --git a/src/plugins/lms/Makefile.am b/src/plugins/lms/Makefile.am
index f96a2ab..c7cf886 100644
--- a/src/plugins/lms/Makefile.am
+++ b/src/plugins/lms/Makefile.am
@@ -38,7 +38,8 @@ librygel_lms_la_CFLAGS = \
librygel_lms_la_LIBADD = \
$(RYGEL_PLUGIN_LMS_DEPS_LIBS) \
- $(RYGEL_COMMON_LIBRYGEL_SERVER_LIBS)
+ $(RYGEL_COMMON_LIBRYGEL_SERVER_LIBS) \
+ $(UNISTRING_LIBS)
librygel_lms_la_LDFLAGS = \
$(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/plugins/media-export/Makefile.am b/src/plugins/media-export/Makefile.am
index 257a080..6c92272 100644
--- a/src/plugins/media-export/Makefile.am
+++ b/src/plugins/media-export/Makefile.am
@@ -84,7 +84,8 @@ librygel_media_export_la_CFLAGS = \
librygel_media_export_la_LIBADD = \
$(RYGEL_PLUGIN_MEDIA_EXPORT_DEPS_LIBS) \
$(RYGEL_COMMON_LIBRYGEL_SERVER_LIBS) \
- $(RYGEL_COMMON_LIBRYGEL_DB_LIBS)
+ $(RYGEL_COMMON_LIBRYGEL_DB_LIBS) \
+ $(UNISTRING_LIBS)
librygel_media_export_la_LDFLAGS = \
$(RYGEL_PLUGIN_LINKER_FLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]