[shotwell] Re-add --disable-extra-plugins configure option

[Jens Georg <jensgeorg src gnome org>]

commit 5fd7f10a1282306d2efdad48b5a2f417e0a3ea65
Author: Jens Georg <mail jensge org>
Date:   Sun Aug 14 01:30:01 2016 +0200

    Re-add --disable-extra-plugins configure option
    
    Signed-off-by: Jens Georg <mail jensge org>

 Makefile.am  |    4 ++++
 configure.ac |   20 +++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8bff02c..810ac1c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,7 +128,11 @@ include $(top_srcdir)/thumbnailer.am
 
 # Plugins
 include $(top_srcdir)/publish.am
+
+if HAVE_EXTRA_PLUGINS
 include $(top_srcdir)/publish-extra.am
+endif
+
 include $(top_srcdir)/transition.am
 include $(top_srcdir)/import.am
 
diff --git a/configure.ac b/configure.ac
index 91ec04c..de1e979 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,9 +118,13 @@ PKG_CHECK_MODULES(PUBLISHING, [gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
 PKG_CHECK_MODULES(TRANSITIONS, [gobject-2.0 cairo gio-2.0 gdk-pixbuf-2.0
                                 gdk-3.0])
 
+dnl ***********************************************************************
+dnl Unity support
+dnl ***********************************************************************
 AC_ARG_ENABLE([unity-support],
               AS_HELP_STRING([--enable-unity-support],
-                             [Enable Ubuntu Unity integration]),,
+                             [Enable Ubuntu Unity integration]),
+              [],
               [enable_unity_support=no])
 
 AS_IF([test "x$enable_unity_support" = "xyes"],
@@ -136,6 +140,19 @@ AC_SUBST([HAVE_UNITY])
 AM_CONDITIONAL([HAVE_UNITY],[test "x$HAVE_UNITY" = "xyes"])
 
 dnl ***********************************************************************
+dnl Extra publishing plugins
+dnl ***********************************************************************
+AC_ARG_ENABLE([extra-plugins],
+              AS_HELP_STRING([--disable-extra-plugins],
+                             [Enable building and installation of extra
+                              publishing plugins]),
+              [],[enable_extra_plugins=yes])
+AS_IF([test "x$enable_extra_plugins" = "xyes"],
+      [HAVE_EXTRA_PLUGINS=yes], [HAVE_EXTRA_PLUGINS=no])
+AC_SUBST([HAVE_EXTRA_PLUGINS])
+AM_CONDITIONAL([HAVE_EXTRA_PLUGINS], [text "x$HAVE_EXTRA_PLUGINS" = "xyes"])
+
+dnl ***********************************************************************
 dnl Initialize Libtool
 dnl ***********************************************************************
 LT_PREREQ([2.2])
@@ -181,4 +198,5 @@ echo ""
 echo "  Prefix ............................... : ${prefix}"
 echo "  Libdir ............................... : ${libdir}"
 echo "  Unity support ........................ : ${HAVE_UNITY}"
+echo "  Additional publishing plugins ........ : ${HAVE_EXTRA_PLUGINS}"
 echo ""