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

[Richard Hughes <rhughes src gnome org>]

commit 30da660dc86626abf6d470c95016d0f29c0dee4b
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            |   24 ++++++++++++++++--------
 src/plugins/Makefile.am |   19 ++++++++++---------
 2 files changed, 26 insertions(+), 17 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9186b9a..b0f52b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,13 +221,20 @@ AS_IF([test "x$enable_shell_extensions" = "xyes"], [
 ])
 AM_CONDITIONAL(HAVE_SHELL_EXTENSIONS, [test "x$enable_shell_extensions" = "xyes"])
 
-# Reviews
-AC_ARG_ENABLE(reviews,
-              [AS_HELP_STRING([--enable-reviews],
-                              [enable reviews [default=yes]])],,
-              enable_reviews=yes)
-AM_CONDITIONAL(HAVE_REVIEWS, [test "x$enable_reviews" = "xyes"])
-AC_DEFINE(HAVE_REVIEWS,1,[Build reviews])
+# Open Desktop Ratings Serice
+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)
+
+# 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
@@ -280,5 +287,6 @@ echo "
         XDG-APP support:           ${have_xdg_app}
         Steam support:             ${enable_steam}
         GNOME Shell ext. support:  ${enable_shell_extensions}
-        Reviews support:           ${enable_reviews}
+        ODRS support:              ${have_odrs}
+        Ubuntu Reviews support:    ${enable_ubuntu_reviews}
 "
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 4e9ed4f..a0f7803 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -65,10 +65,7 @@ endif
 
 if HAVE_XDG_APP
 plugin_LTLIBRARIES += libgs_plugin_xdg_app.la
-if HAVE_REVIEWS
-plugin_LTLIBRARIES += libgs_plugin_odrs.la
-endif # HAVE_REVIEWS
-endif # HAVE_XDG_APP
+endif
 
 if HAVE_LIMBA
 plugin_LTLIBRARIES += libgs_plugin_limba.la
@@ -78,6 +75,10 @@ if HAVE_STEAM
 plugin_LTLIBRARIES += libgs_plugin_steam.la
 endif
 
+if HAVE_ODRS
+plugin_LTLIBRARIES += libgs_plugin_odrs.la
+endif
+
 libgs_plugin_dummy_la_SOURCES = gs-plugin-dummy.c
 libgs_plugin_dummy_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_dummy_la_LDFLAGS = -module -avoid-version
@@ -140,14 +141,14 @@ 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_REVIEWS
+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
 libgs_plugin_odrs_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
-endif # HAVE_REVIEWS
-endif # HAVE_XDG_APP
+endif
 
 if HAVE_STEAM
 libgs_plugin_steam_la_SOURCES = gs-plugin-steam.c
@@ -190,13 +191,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_REVIEWS
+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 # HAVE_REVIEWS
+endif
 
 libgs_plugin_packagekit_la_SOURCES =                   \
        gs-plugin-packagekit.c                          \