[rygel] Revert "build: Fix linking of LMS against unistring"



commit fa26c199d632f4e70361776cc2393f3351629910
Author: Jens Georg <mail jensge org>
Date:   Sun Jan 17 22:35:08 2016 +0100

    Revert "build: Fix linking of LMS against unistring"
    
    This reverts commit b93914add9857fd0b4bc262cc5e9dd7609fbd387.

 configure.ac                         |   12 ------------
 src/plugins/lms/Makefile.am          |    3 +--
 src/plugins/media-export/Makefile.am |    3 +--
 3 files changed, 2 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8855d72..a5b5951 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,18 +164,6 @@ 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 5cdee17..7d62bfd 100644
--- a/src/plugins/lms/Makefile.am
+++ b/src/plugins/lms/Makefile.am
@@ -38,8 +38,7 @@ librygel_lms_la_CFLAGS = \
 librygel_lms_la_LIBADD = \
        $(RYGEL_PLUGIN_LMS_DEPS_LIBS) \
        $(RYGEL_COMMON_LIBRYGEL_SERVER_LIBS) \
-       $(RYGEL_COMMON_LIBRYGEL_DB_LIBS) \
-       $(UNISTRING_LIBS)
+       $(RYGEL_COMMON_LIBRYGEL_DB_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 6c92272..257a080 100644
--- a/src/plugins/media-export/Makefile.am
+++ b/src/plugins/media-export/Makefile.am
@@ -84,8 +84,7 @@ 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) \
-       $(UNISTRING_LIBS)
+       $(RYGEL_COMMON_LIBRYGEL_DB_LIBS)
 
 librygel_media_export_la_LDFLAGS = \
        $(RYGEL_PLUGIN_LINKER_FLAGS)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]