[rygel] build: Drop COLLATION_* variables

[Jens Georg <jensgeorg src gnome org>]

commit 2f76eb7ada9ff664328dcac35bd003dc8d9095bd
Author: Jens Georg <jensg openismus com>
Date:   Mon Mar 18 15:33:49 2013 +0100

    build: Drop COLLATION_* variables

 configure.ac                         |    5 +----
 src/plugins/media-export/Makefile.am |    1 -
 2 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5b1846d..fa2d52e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -295,10 +295,7 @@ then
                                  [have_unistring=yes],[have_unistring=no]))
     if test "x$have_unistring" = "xyes"; then
         AC_DEFINE([HAVE_UNISTRING],[1],[Use libunistring for collation])
-        COLLATION_CFLAGS=
-        COLLATION_LIBS=-lunistring
-        AC_SUBST([COLLATION_CFLAGS])
-        AC_SUBST([COLLATION_LIBS])
+        RYGEL_PLUGIN_MEDIA_EXPORT_DEPS_LIBS="$RYGEL_PLUGIN_MEDIA_EXPORT_DEPS_LIBS -lunistring"
     fi
 fi
 
diff --git a/src/plugins/media-export/Makefile.am b/src/plugins/media-export/Makefile.am
index 0f384a3..298fc02 100644
--- a/src/plugins/media-export/Makefile.am
+++ b/src/plugins/media-export/Makefile.am
@@ -48,7 +48,6 @@ librygel_media_export_la_CFLAGS = \
        -DG_LOG_DOMAIN='"MediaExport"'
 librygel_media_export_la_LIBADD = \
        $(RYGEL_PLUGIN_MEDIA_EXPORT_DEPS_LIBS) \
-       $(COLLATION_LIBS) \
        $(RYGEL_COMMON_LIBRYGEL_SERVER_LIBS)
 
 librygel_media_export_la_LDFLAGS = \