[gnome-software/gnome-3-20] Do not make the ODRS plugin depend on xdg-app

[Richard Hughes <rhughes src gnome org>]

commit 7516c7f25d07887f44ab3d19a9dcae949298fccd
Author: Richard Hughes <richard hughsie com>
Date:   Tue Mar 22 09:24:04 2016 +0000

    Do not make the ODRS plugin depend on xdg-app

 configure.ac            |   15 ++++++++++++---
 src/plugins/Makefile.am |    9 ++++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8d3e975..6dde092 100644
--- a/configure.ac
+++ b/configure.ac
@@ -205,8 +205,16 @@ AM_CONDITIONAL(HAVE_LIMBA, test x$enable_limba = xyes)
 AC_ARG_ENABLE(odrs,
               [AS_HELP_STRING([--enable-odrs],
                               [enable ODRS support [default=yes]])],,
-              have_odrs=yes)
-AM_CONDITIONAL(HAVE_ODRS, test "$have_odrs" != no)
+              enable_odrs=yes)
+AM_CONDITIONAL(HAVE_ODRS, test "x$enable_odrs" = "xyes")
+
+# Ubuntu-specific Reviews
+AC_ARG_ENABLE(ubuntu-reviews,
+              [AS_HELP_STRING([--enable-ubuntu-reviews],
+                              [enable Ubuntu reviews [default=no]])],,
+              enable_ubuntu_reviews=no)
+AM_CONDITIONAL(HAVE_UBUNTU_REVIEWS, [test "x$enable_ubuntu_reviews" = "xyes"])
+AC_DEFINE(HAVE_UBUNTU_REVIEWS,1,[Build Ubuntu reviews])
 
 # this refers to the gnome-software plugin API version
 # this is not in any way related to a package or soname version
@@ -257,5 +265,6 @@ echo "
         Firmware support:          ${have_firmware}
         Limba support:             ${have_limba}
         XDG-APP support:           ${have_xdg_app}
-        ODRS support:              ${have_odrs}
+        ODRS support:              ${enable_odrs}
+        Ubuntu Reviews support:    ${enable_ubuntu_reviews}
 "
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index b0e63eb..ad4112a 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -35,7 +35,6 @@ plugin_LTLIBRARIES =                                  \
        libgs_plugin_menu-spec-refine.la                \
        libgs_plugin_fedora_distro_upgrades.la          \
        libgs_plugin_provenance.la                      \
-       libgs_plugin_ubuntu-reviews.la                  \
        libgs_plugin_fedora_tagger_usage.la             \
        libgs_plugin_epiphany.la                        \
        libgs_plugin_icons.la
@@ -52,6 +51,10 @@ plugin_LTLIBRARIES +=                                        \
        libgs_plugin_packagekit.la
 endif
 
+if HAVE_UBUNTU_REVIEWS
+plugin_LTLIBRARIES += libgs_plugin_ubuntu-reviews.la
+endif
+
 if HAVE_FIRMWARE
 plugin_LTLIBRARIES += libgs_plugin_fwupd.la
 endif
@@ -118,7 +121,9 @@ libgs_plugin_xdg_app_la_SOURCES = gs-plugin-xdg-app.c
 libgs_plugin_xdg_app_la_LIBADD = $(GS_PLUGIN_LIBS) $(XDG_APP_LIBS)
 libgs_plugin_xdg_app_la_LDFLAGS = -module -avoid-version
 libgs_plugin_xdg_app_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+endif
 
+if HAVE_ODRS
 libgs_plugin_odrs_la_SOURCES = gs-plugin-odrs.c
 libgs_plugin_odrs_la_LIBADD = $(GS_PLUGIN_LIBS) $(JSON_GLIB_LIBS)
 libgs_plugin_odrs_la_LDFLAGS = -module -avoid-version
@@ -159,11 +164,13 @@ libgs_plugin_hardcoded_blacklist_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_hardcoded_blacklist_la_LDFLAGS = -module -avoid-version
 libgs_plugin_hardcoded_blacklist_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
+if HAVE_UBUNTU_REVIEWS
 libgs_plugin_ubuntu_reviews_la_SOURCES =               \
        gs-plugin-ubuntu-reviews.c
 libgs_plugin_ubuntu_reviews_la_LIBADD = $(GS_PLUGIN_LIBS) $(SOUP_LIBS) $(JSON_GLIB_LIBS) $(SQLITE_LIBS)
 libgs_plugin_ubuntu_reviews_la_LDFLAGS = -module -avoid-version
 libgs_plugin_ubuntu_reviews_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+endif
 
 libgs_plugin_packagekit_la_SOURCES =                   \
        gs-plugin-packagekit.c                          \