Merge lp:~noskcaj/ubuntu/wily/gnome-online-miners/merge into lp:ubuntu/wily/gnome-online-miners

[Jackson Doak]

Merge from debian

[Logan Rosen (logan)]

Uploaded. Thanks!

review: Approve

=== modified file 'NEWS'
--- NEWS	2015-03-20 10:28:22 +0000
+++ NEWS	2015-05-27 08:42:08 +0000
@@ -1,3 +1,19 @@
+Overview of changes in 3.14.3
+=============================
+
+* Bugs fixed:
+ 748253 gdata: Treat the GDataEntry:id as an opaque string
+
+
+Overview of changes in 3.14.2
+=============================
+
+* Add build options to enable/disable each miner (747847)
+
+* Bugs fixed:
+ 740421 gdata: Skip PicasaWeb videos
+
+
 Overview of changes in 3.14.1
 =============================
 

=== modified file 'aclocal.m4'
--- aclocal.m4	2015-03-20 10:28:22 +0000
+++ aclocal.m4	2015-05-27 08:42:08 +0000
@@ -21,50 +21,51 @@
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
 # ===========================================================================
-#         http://autoconf-archive.cryp.to/ax_check_enable_debug.html
+#   http://www.gnu.org/software/autoconf-archive/ax_check_enable_debug.html
 # ===========================================================================
 #
 # SYNOPSIS
 #
-#   Check for the presence of an --enable-debug option to configure and
-#   allow/avoid compiled debugging flags appropriately.
-#
-#   AX_CHECK_ENABLE_DEBUG([enable by default=yes/info/profile/no],
-#                         [ENABLE DEBUG VARIABLES …],
-#                         [DISABLE DEBUG VARIABLES NDEBUG …])
+#   AX_CHECK_ENABLE_DEBUG([enable by default=yes/info/profile/no], [ENABLE DEBUG VARIABLES ...], [DISABLE DEBUG VARIABLES NDEBUG ...], [IS-RELEASE])
 #
 # DESCRIPTION
 #
-#   Check for the presence of an --enable-debug option to configure, with the
-#   specified default value used when the option is not present.  Return the
-#   value in the variable $ax_enable_debug.
+#   Check for the presence of an --enable-debug option to configure, with
+#   the specified default value used when the option is not present.  Return
+#   the value in the variable $ax_enable_debug.
 #
-#   Specifying 'yes' adds '-g -O0' to the compilation flags for all languages.
-#   Specifying 'info' adds '-g' to the compilation flags.  Specifying 'profile'
-#   adds '-g -pg' to the compilation flags and '-pg' to the linking flags.
-#   Otherwise, nothing is added.
+#   Specifying 'yes' adds '-g -O0' to the compilation flags for all
+#   languages. Specifying 'info' adds '-g' to the compilation flags.
+#   Specifying 'profile' adds '-g -pg' to the compilation flags and '-pg' to
+#   the linking flags. Otherwise, nothing is added.
 #
 #   Define the variables listed in the second argument if debug is enabled,
 #   defaulting to no variables.  Defines the variables listed in the third
 #   argument if debug is disabled, defaulting to NDEBUG.  All lists of
 #   variables should be space-separated.
 #
-#   If debug is not enabled, ensure AC_PROG_* will not add debugging flags.
+#   If debug is not enabled, ensure AC_PROG_* will not add debugging flags.
 #   Should be invoked prior to any AC_PROG_* compiler checks.
 #
-# LAST MODIFICATION
-#
-#   2014-05-12
-#
-# COPYLEFT
+#   IS-RELEASE can be used to change the default to 'no' when making a
+#   release.  Set IS-RELEASE to 'yes' or 'no' as appropriate. By default, it
+#   uses the value of $ax_is_release, so if you are using the AX_IS_RELEASE
+#   macro, there is no need to pass this parameter.
+#
+#     AX_IS_RELEASE([git-directory])
+#     AX_CHECK_ENABLE_DEBUG()
+#
+# LICENSE
 #
 #   Copyright (c) 2011 Rhys Ulerich <[e-mail]>
-#   Copyright © 2014 Philip Withnall <[e-mail]>
+#   Copyright (c) 2014, 2015 Philip Withnall <[e-mail]>
 #
 #   Copying and distribution of this file, with or without modification, are
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+#serial 5
+
 AC_DEFUN([AX_CHECK_ENABLE_DEBUG],[
     AC_BEFORE([$0],[AC_PROG_CC])dnl
     AC_BEFORE([$0],[AC_PROG_CXX])dnl
@@ -73,64 +74,74 @@
 
     AC_MSG_CHECKING(whether to enable debugging)
 
-    m4_define(ax_enable_debug_default,[m4_tolower(m4_normalize(ifelse([$1],,[no],[$1])))])
+    ax_enable_debug_default=m4_tolower(m4_normalize(ifelse([$1],,[no],[$1])))
+    ax_enable_debug_is_release=m4_tolower(m4_normalize(ifelse([$4],,
+                                                              [$ax_is_release],
+                                                              [$4])))
+
+    # If this is a release, override the default.
+    AS_IF([test "$ax_enable_debug_is_release" = "yes"],
+      [ax_enable_debug_default="no"])
+
     m4_define(ax_enable_debug_vars,[m4_normalize(ifelse([$2],,,[$2]))])
     m4_define(ax_disable_debug_vars,[m4_normalize(ifelse([$3],,[NDEBUG],[$3]))])
 
     AC_ARG_ENABLE(debug,
-        [AS_HELP_STRING([--enable-debug]@<:@=ax_enable_debug_default@:>@,[compile with debugging; one of yes/info/profile/no])],
-        [],enable_debug=ax_enable_debug_default)
-    if test "x$enable_debug" = "xyes" || test "x$enable_debug" = "x"; then
-        AC_MSG_RESULT(yes)
-        CFLAGS="${CFLAGS} -g -O0"
-        CXXFLAGS="${CXXFLAGS} -g -O0"
-        FFLAGS="${FFLAGS} -g -O0"
-        FCFLAGS="${FCFLAGS} -g -O0"
-        OBJCFLAGS="${OBJCFLAGS} -g -O0"
-
-        dnl Define various variables if debugging is enabled.
-        m4_map_args_w(ax_enable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is enabled])])
-    else
-        if test "x$enable_debug" = "xinfo"; then
-            AC_MSG_RESULT(info)
-            CFLAGS="${CFLAGS} -g"
-            CXXFLAGS="${CXXFLAGS} -g"
-            FFLAGS="${FFLAGS} -g"
-            FCFLAGS="${FCFLAGS} -g"
-            OBJCFLAGS="${OBJCFLAGS} -g"
-        elif test "x$enable_debug" = "xprofile"; then
-            AC_MSG_RESULT(profile)
-            CFLAGS="${CFLAGS} -g -pg"
-            CXXFLAGS="${CXXFLAGS} -g -pg"
-            FFLAGS="${FFLAGS} -g -pg"
-            FCFLAGS="${FCFLAGS} -g -pg"
-            OBJCFLAGS="${OBJCFLAGS} -g -pg"
-            LDFLAGS="${LDFLAGS} -pg"
-        else
-            AC_MSG_RESULT(no)
-            dnl Ensure AC_PROG_CC/CXX/F77/FC/OBJC will not enable debug flags
-            dnl by setting any unset environment flag variables
-            if test "x${CFLAGS+set}" != "xset"; then
-                CFLAGS=""
-            fi
-            if test "x${CXXFLAGS+set}" != "xset"; then
-                CXXFLAGS=""
-            fi
-            if test "x${FFLAGS+set}" != "xset"; then
-                FFLAGS=""
-            fi
-            if test "x${FCFLAGS+set}" != "xset"; then
-                FCFLAGS=""
-            fi
-            if test "x${OBJCFLAGS+set}" != "xset"; then
-                OBJCFLAGS=""
-            fi
-        fi
-
-        dnl Define various variables if debugging is disabled.
-        dnl assert.h is a NOP if NDEBUG is defined, so define it by default.
-        m4_map_args_w(ax_disable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is disabled])])
-    fi
+	[AS_HELP_STRING([--enable-debug=]@<:@yes/info/profile/no@:>@,[compile with debugging])],
+	[],enable_debug=$ax_enable_debug_default)
+
+    # empty mean debug yes
+    AS_IF([test "x$enable_debug" = "x"],
+      [enable_debug="yes"])
+
+    # case of debug
+    AS_CASE([$enable_debug],
+      [yes],[
+	AC_MSG_RESULT(yes)
+	CFLAGS="${CFLAGS} -g -O0"
+	CXXFLAGS="${CXXFLAGS} -g -O0"
+	FFLAGS="${FFLAGS} -g -O0"
+	FCFLAGS="${FCFLAGS} -g -O0"
+	OBJCFLAGS="${OBJCFLAGS} -g -O0"
+      ],
+      [info],[
+	AC_MSG_RESULT(info)
+	CFLAGS="${CFLAGS} -g"
+	CXXFLAGS="${CXXFLAGS} -g"
+	FFLAGS="${FFLAGS} -g"
+	FCFLAGS="${FCFLAGS} -g"
+	OBJCFLAGS="${OBJCFLAGS} -g"
+      ],
+      [profile],[
+	AC_MSG_RESULT(profile)
+	CFLAGS="${CFLAGS} -g -pg"
+	CXXFLAGS="${CXXFLAGS} -g -pg"
+	FFLAGS="${FFLAGS} -g -pg"
+	FCFLAGS="${FCFLAGS} -g -pg"
+	OBJCFLAGS="${OBJCFLAGS} -g -pg"
+	LDFLAGS="${LDFLAGS} -pg"
+      ],
+      [
+	AC_MSG_RESULT(no)
+	dnl Ensure AC_PROG_CC/CXX/F77/FC/OBJC will not enable debug flags
+	dnl by setting any unset environment flag variables
+	AS_IF([test "x${CFLAGS+set}" != "xset"],
+	  [CFLAGS=""])
+	AS_IF([test "x${CXXFLAGS+set}" != "xset"],
+	  [CXXFLAGS=""])
+	AS_IF([test "x${FFLAGS+set}" != "xset"],
+	  [FFLAGS=""])
+	AS_IF([test "x${FCFLAGS+set}" != "xset"],
+	  [FCFLAGS=""])
+	AS_IF([test "x${OBJCFLAGS+set}" != "xset"],
+	  [OBJCFLAGS=""])
+      ])
+
+    dnl Define various variables if debugging is disabled.
+    dnl assert.h is a NOP if NDEBUG is defined, so define it by default.
+    AS_IF([test "x$enable_debug" = "xyes"],
+      [m4_map_args_w(ax_enable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is enabled])])],
+      [m4_map_args_w(ax_disable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is disabled])])])
     ax_enable_debug=$enable_debug
 ])
 

=== modified file 'configure'
--- configure	2015-03-20 10:28:22 +0000
+++ configure	2015-05-27 08:42:08 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GNOME Online Miners 3.14.1.
+# Generated by GNU Autoconf 2.69 for GNOME Online Miners 3.14.3.
 #
 # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-online-miners>.
 #
@@ -591,8 +591,8 @@
 # Identity of this package.
 PACKAGE_NAME='GNOME Online Miners'
 PACKAGE_TARNAME='gnome-online-miners'
-PACKAGE_VERSION='3.14.1'
-PACKAGE_STRING='GNOME Online Miners 3.14.1'
+PACKAGE_VERSION='3.14.3'
+PACKAGE_STRING='GNOME Online Miners 3.14.3'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-online-miners'
 PACKAGE_URL='https://wiki.gnome.org/Projects/GnomeOnlineMiners'
 
@@ -637,22 +637,34 @@
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+BUILD_WINDOWS_LIVE_FALSE
+BUILD_WINDOWS_LIVE_TRUE
 ZAPOJIT_LIBS
 ZAPOJIT_CFLAGS
+BUILD_OWNCLOUD_FALSE
+BUILD_OWNCLOUD_TRUE
+BUILD_MEDIA_SERVER_FALSE
+BUILD_MEDIA_SERVER_TRUE
+BUILD_GOOGLE_FALSE
+BUILD_GOOGLE_TRUE
+GDATA_LIBS
+GDATA_CFLAGS
+BUILD_FLICKR_FALSE
+BUILD_FLICKR_TRUE
+GRILO_LIBS
+GRILO_CFLAGS
+BUILD_FACEBOOK_FALSE
+BUILD_FACEBOOK_TRUE
+GFBGRAPH_LIBS
+GFBGRAPH_CFLAGS
 TRACKER_LIBS
 TRACKER_CFLAGS
-GRILO_LIBS
-GRILO_CFLAGS
 GOA_LIBS
 GOA_CFLAGS
 GIO_LIBS
 GIO_CFLAGS
 GLIB_LIBS
 GLIB_CFLAGS
-GFBGRAPH_LIBS
-GFBGRAPH_CFLAGS
-GDATA_LIBS
-GDATA_CFLAGS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
@@ -789,6 +801,12 @@
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
+enable_facebook
+enable_flickr
+enable_google
+enable_media_server
+enable_owncloud
+enable_windows_live
 '
       ac_precious_vars='build_alias
 host_alias
@@ -802,20 +820,20 @@
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
-GDATA_CFLAGS
-GDATA_LIBS
-GFBGRAPH_CFLAGS
-GFBGRAPH_LIBS
 GLIB_CFLAGS
 GLIB_LIBS
 GIO_CFLAGS
 GIO_LIBS
 GOA_CFLAGS
 GOA_LIBS
+TRACKER_CFLAGS
+TRACKER_LIBS
+GFBGRAPH_CFLAGS
+GFBGRAPH_LIBS
 GRILO_CFLAGS
 GRILO_LIBS
-TRACKER_CFLAGS
-TRACKER_LIBS
+GDATA_CFLAGS
+GDATA_LIBS
 ZAPOJIT_CFLAGS
 ZAPOJIT_LIBS'
 
@@ -1358,7 +1376,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNOME Online Miners 3.14.1 to adapt to many kinds of systems.
+\`configure' configures GNOME Online Miners 3.14.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1429,7 +1447,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNOME Online Miners 3.14.1:";;
+     short | recursive ) echo "Configuration of GNOME Online Miners 3.14.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1449,12 +1467,19 @@
   --enable-compile-warnings=[no/minimum/yes/maximum/error]
                           Turn on compiler warnings
   --enable-iso-c          Try to warn if code is not ISO C
-  --enable-debug[=no]     compile with debugging; one of yes/info/profile/no
+  --enable-debug=[yes/info/profile/no]
+                          compile with debugging
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-facebook       Enable Facebook miner
+  --enable-flickr         Enable Flickr miner
+  --enable-google         Enable Google miner
+  --enable-media-server   Enable media server miner
+  --enable-owncloud       Enable ownCloud miner
+  --enable-windows-live   Enable Windows Live miner
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1479,26 +1504,26 @@
               directories to add to pkg-config's search path
   PKG_CONFIG_LIBDIR
               path overriding pkg-config's built-in search path
-  GDATA_CFLAGS
-              C compiler flags for GDATA, overriding pkg-config
-  GDATA_LIBS  linker flags for GDATA, overriding pkg-config
-  GFBGRAPH_CFLAGS
-              C compiler flags for GFBGRAPH, overriding pkg-config
-  GFBGRAPH_LIBS
-              linker flags for GFBGRAPH, overriding pkg-config
   GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
   GLIB_LIBS   linker flags for GLIB, overriding pkg-config
   GIO_CFLAGS  C compiler flags for GIO, overriding pkg-config
   GIO_LIBS    linker flags for GIO, overriding pkg-config
   GOA_CFLAGS  C compiler flags for GOA, overriding pkg-config
   GOA_LIBS    linker flags for GOA, overriding pkg-config
-  GRILO_CFLAGS
-              C compiler flags for GRILO, overriding pkg-config
-  GRILO_LIBS  linker flags for GRILO, overriding pkg-config
   TRACKER_CFLAGS
               C compiler flags for TRACKER, overriding pkg-config
   TRACKER_LIBS
               linker flags for TRACKER, overriding pkg-config
+  GFBGRAPH_CFLAGS
+              C compiler flags for GFBGRAPH, overriding pkg-config
+  GFBGRAPH_LIBS
+              linker flags for GFBGRAPH, overriding pkg-config
+  GRILO_CFLAGS
+              C compiler flags for GRILO, overriding pkg-config
+  GRILO_LIBS  linker flags for GRILO, overriding pkg-config
+  GDATA_CFLAGS
+              C compiler flags for GDATA, overriding pkg-config
+  GDATA_LIBS  linker flags for GDATA, overriding pkg-config
   ZAPOJIT_CFLAGS
               C compiler flags for ZAPOJIT, overriding pkg-config
   ZAPOJIT_LIBS
@@ -1571,7 +1596,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GNOME Online Miners configure 3.14.1
+GNOME Online Miners configure 3.14.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1849,7 +1874,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNOME Online Miners $as_me 3.14.1, which was
+It was created by GNOME Online Miners $as_me 3.14.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2720,7 +2745,7 @@
 
 # Define the identity of the package.
  PACKAGE='gnome-online-miners'
- VERSION='3.14.1'
+ VERSION='3.14.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4618,6 +4643,13 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable debugging" >&5
 $as_echo_n "checking whether to enable debugging... " >&6; }
 
+    ax_enable_debug_default=no
+    ax_enable_debug_is_release=$ax_is_release
+
+    # If this is a release, override the default.
+    if test "$ax_enable_debug_is_release" = "yes"; then :
+  ax_enable_debug_default="no"
+fi
 
 
 
@@ -4626,63 +4658,79 @@
 if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug;
 else
-  enable_debug=no
-fi
-
-    if test "x$enable_debug" = "xyes" || test "x$enable_debug" = "x"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+  enable_debug=$ax_enable_debug_default
+fi
+
+
+    # empty mean debug yes
+    if test "x$enable_debug" = "x"; then :
+  enable_debug="yes"
+fi
+
+    # case of debug
+    case $enable_debug in #(
+  yes) :
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        CFLAGS="${CFLAGS} -g -O0"
-        CXXFLAGS="${CXXFLAGS} -g -O0"
-        FFLAGS="${FFLAGS} -g -O0"
-        FCFLAGS="${FCFLAGS} -g -O0"
-        OBJCFLAGS="${OBJCFLAGS} -g -O0"
-
-
-$as_echo "#define GNOME_ENABLE_DEBUG /**/" >>confdefs.h
-
-    else
-        if test "x$enable_debug" = "xinfo"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: info" >&5
+	CFLAGS="${CFLAGS} -g -O0"
+	CXXFLAGS="${CXXFLAGS} -g -O0"
+	FFLAGS="${FFLAGS} -g -O0"
+	FCFLAGS="${FCFLAGS} -g -O0"
+	OBJCFLAGS="${OBJCFLAGS} -g -O0"
+       ;; #(
+  info) :
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: info" >&5
 $as_echo "info" >&6; }
-            CFLAGS="${CFLAGS} -g"
-            CXXFLAGS="${CXXFLAGS} -g"
-            FFLAGS="${FFLAGS} -g"
-            FCFLAGS="${FCFLAGS} -g"
-            OBJCFLAGS="${OBJCFLAGS} -g"
-        elif test "x$enable_debug" = "xprofile"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: profile" >&5
+	CFLAGS="${CFLAGS} -g"
+	CXXFLAGS="${CXXFLAGS} -g"
+	FFLAGS="${FFLAGS} -g"
+	FCFLAGS="${FCFLAGS} -g"
+	OBJCFLAGS="${OBJCFLAGS} -g"
+       ;; #(
+  profile) :
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: profile" >&5
 $as_echo "profile" >&6; }
-            CFLAGS="${CFLAGS} -g -pg"
-            CXXFLAGS="${CXXFLAGS} -g -pg"
-            FFLAGS="${FFLAGS} -g -pg"
-            FCFLAGS="${FCFLAGS} -g -pg"
-            OBJCFLAGS="${OBJCFLAGS} -g -pg"
-            LDFLAGS="${LDFLAGS} -pg"
-        else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	CFLAGS="${CFLAGS} -g -pg"
+	CXXFLAGS="${CXXFLAGS} -g -pg"
+	FFLAGS="${FFLAGS} -g -pg"
+	FCFLAGS="${FCFLAGS} -g -pg"
+	OBJCFLAGS="${OBJCFLAGS} -g -pg"
+	LDFLAGS="${LDFLAGS} -pg"
+       ;; #(
+  *) :
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-                                    if test "x${CFLAGS+set}" != "xset"; then
-                CFLAGS=""
-            fi
-            if test "x${CXXFLAGS+set}" != "xset"; then
-                CXXFLAGS=""
-            fi
-            if test "x${FFLAGS+set}" != "xset"; then
-                FFLAGS=""
-            fi
-            if test "x${FCFLAGS+set}" != "xset"; then
-                FCFLAGS=""
-            fi
-            if test "x${OBJCFLAGS+set}" != "xset"; then
-                OBJCFLAGS=""
-            fi
-        fi
-
+			if test "x${CFLAGS+set}" != "xset"; then :
+  CFLAGS=""
+fi
+	if test "x${CXXFLAGS+set}" != "xset"; then :
+  CXXFLAGS=""
+fi
+	if test "x${FFLAGS+set}" != "xset"; then :
+  FFLAGS=""
+fi
+	if test "x${FCFLAGS+set}" != "xset"; then :
+  FCFLAGS=""
+fi
+	if test "x${OBJCFLAGS+set}" != "xset"; then :
+  OBJCFLAGS=""
+fi
+       ;;
+esac
+
+            if test "x$enable_debug" = "xyes"; then :
+
+$as_echo "#define GNOME_ENABLE_DEBUG /**/" >>confdefs.h
+
+else
 
 $as_echo "#define NDEBUG /**/" >>confdefs.h
 
-    fi
+fi
     ax_enable_debug=$enable_debug
 
 
@@ -12034,188 +12082,6 @@
 fi
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDATA" >&5
-$as_echo_n "checking for GDATA... " >&6; }
-
-if test -n "$GDATA_CFLAGS"; then
-    pkg_cv_GDATA_CFLAGS="$GDATA_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgdata >= \$GDATA_MIN_VERSION\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libgdata >= $GDATA_MIN_VERSION") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GDATA_CFLAGS=`$PKG_CONFIG --cflags "libgdata >= $GDATA_MIN_VERSION" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$GDATA_LIBS"; then
-    pkg_cv_GDATA_LIBS="$GDATA_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgdata >= \$GDATA_MIN_VERSION\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libgdata >= $GDATA_MIN_VERSION") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GDATA_LIBS=`$PKG_CONFIG --libs "libgdata >= $GDATA_MIN_VERSION" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        GDATA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgdata >= $GDATA_MIN_VERSION" 2>&1`
-        else
-	        GDATA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgdata >= $GDATA_MIN_VERSION" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GDATA_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (libgdata >= $GDATA_MIN_VERSION) were not met:
-
-$GDATA_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GDATA_CFLAGS
-and GDATA_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GDATA_CFLAGS
-and GDATA_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	GDATA_CFLAGS=$pkg_cv_GDATA_CFLAGS
-	GDATA_LIBS=$pkg_cv_GDATA_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GFBGRAPH" >&5
-$as_echo_n "checking for GFBGRAPH... " >&6; }
-
-if test -n "$GFBGRAPH_CFLAGS"; then
-    pkg_cv_GFBGRAPH_CFLAGS="$GFBGRAPH_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgfbgraph-0.2 >= \$GFBGRAPH_MIN_VERSION\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libgfbgraph-0.2 >= $GFBGRAPH_MIN_VERSION") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GFBGRAPH_CFLAGS=`$PKG_CONFIG --cflags "libgfbgraph-0.2 >= $GFBGRAPH_MIN_VERSION" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$GFBGRAPH_LIBS"; then
-    pkg_cv_GFBGRAPH_LIBS="$GFBGRAPH_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgfbgraph-0.2 >= \$GFBGRAPH_MIN_VERSION\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libgfbgraph-0.2 >= $GFBGRAPH_MIN_VERSION") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GFBGRAPH_LIBS=`$PKG_CONFIG --libs "libgfbgraph-0.2 >= $GFBGRAPH_MIN_VERSION" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        GFBGRAPH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgfbgraph-0.2 >= $GFBGRAPH_MIN_VERSION" 2>&1`
-        else
-	        GFBGRAPH_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgfbgraph-0.2 >= $GFBGRAPH_MIN_VERSION" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GFBGRAPH_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (libgfbgraph-0.2 >= $GFBGRAPH_MIN_VERSION) were not met:
-
-$GFBGRAPH_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GFBGRAPH_CFLAGS
-and GFBGRAPH_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GFBGRAPH_CFLAGS
-and GFBGRAPH_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	GFBGRAPH_CFLAGS=$pkg_cv_GFBGRAPH_CFLAGS
-	GFBGRAPH_LIBS=$pkg_cv_GFBGRAPH_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
 $as_echo_n "checking for GLIB... " >&6; }
 
@@ -12494,6 +12360,217 @@
 
 
 pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TRACKER" >&5
+$as_echo_n "checking for TRACKER... " >&6; }
+
+if test -n "$TRACKER_CFLAGS"; then
+    pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-miner-1.0 tracker-sparql-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "tracker-miner-1.0 tracker-sparql-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker-miner-1.0 tracker-sparql-1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$TRACKER_LIBS"; then
+    pkg_cv_TRACKER_LIBS="$TRACKER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-miner-1.0 tracker-sparql-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "tracker-miner-1.0 tracker-sparql-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker-miner-1.0 tracker-sparql-1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "tracker-miner-1.0 tracker-sparql-1.0" 2>&1`
+        else
+	        TRACKER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "tracker-miner-1.0 tracker-sparql-1.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$TRACKER_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (tracker-miner-1.0 tracker-sparql-1.0) were not met:
+
+$TRACKER_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables TRACKER_CFLAGS
+and TRACKER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables TRACKER_CFLAGS
+and TRACKER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
+	TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+# Facebook
+# Check whether --enable-facebook was given.
+if test "${enable_facebook+set}" = set; then :
+  enableval=$enable_facebook;
+else
+  enable_facebook=yes
+fi
+
+if test "$enable_facebook" != "no"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GFBGRAPH" >&5
+$as_echo_n "checking for GFBGRAPH... " >&6; }
+
+if test -n "$GFBGRAPH_CFLAGS"; then
+    pkg_cv_GFBGRAPH_CFLAGS="$GFBGRAPH_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgfbgraph-0.2 >= \$GFBGRAPH_MIN_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libgfbgraph-0.2 >= $GFBGRAPH_MIN_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GFBGRAPH_CFLAGS=`$PKG_CONFIG --cflags "libgfbgraph-0.2 >= $GFBGRAPH_MIN_VERSION" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GFBGRAPH_LIBS"; then
+    pkg_cv_GFBGRAPH_LIBS="$GFBGRAPH_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgfbgraph-0.2 >= \$GFBGRAPH_MIN_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libgfbgraph-0.2 >= $GFBGRAPH_MIN_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GFBGRAPH_LIBS=`$PKG_CONFIG --libs "libgfbgraph-0.2 >= $GFBGRAPH_MIN_VERSION" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GFBGRAPH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgfbgraph-0.2 >= $GFBGRAPH_MIN_VERSION" 2>&1`
+        else
+	        GFBGRAPH_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgfbgraph-0.2 >= $GFBGRAPH_MIN_VERSION" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GFBGRAPH_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (libgfbgraph-0.2 >= $GFBGRAPH_MIN_VERSION) were not met:
+
+$GFBGRAPH_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GFBGRAPH_CFLAGS
+and GFBGRAPH_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GFBGRAPH_CFLAGS
+and GFBGRAPH_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	GFBGRAPH_CFLAGS=$pkg_cv_GFBGRAPH_CFLAGS
+	GFBGRAPH_LIBS=$pkg_cv_GFBGRAPH_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+fi
+ if test x$enable_facebook != xno; then
+  BUILD_FACEBOOK_TRUE=
+  BUILD_FACEBOOK_FALSE='#'
+else
+  BUILD_FACEBOOK_TRUE='#'
+  BUILD_FACEBOOK_FALSE=
+fi
+
+
+# Flickr
+# Check whether --enable-flickr was given.
+if test "${enable_flickr+set}" = set; then :
+  enableval=$enable_flickr;
+else
+  enable_flickr=yes
+fi
+
+if test "$enable_flickr" != "no"; then
+
+pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GRILO" >&5
 $as_echo_n "checking for GRILO... " >&6; }
 
@@ -12583,21 +12660,40 @@
 $as_echo "yes" >&6; }
 
 fi
+fi
+ if test x$enable_flickr != xno; then
+  BUILD_FLICKR_TRUE=
+  BUILD_FLICKR_FALSE='#'
+else
+  BUILD_FLICKR_TRUE='#'
+  BUILD_FLICKR_FALSE=
+fi
+
+
+# Google
+# Check whether --enable-google was given.
+if test "${enable_google+set}" = set; then :
+  enableval=$enable_google;
+else
+  enable_google=yes
+fi
+
+if test "$enable_google" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TRACKER" >&5
-$as_echo_n "checking for TRACKER... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDATA" >&5
+$as_echo_n "checking for GDATA... " >&6; }
 
-if test -n "$TRACKER_CFLAGS"; then
-    pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS"
+if test -n "$GDATA_CFLAGS"; then
+    pkg_cv_GDATA_CFLAGS="$GDATA_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-miner-1.0 tracker-sparql-1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "tracker-miner-1.0 tracker-sparql-1.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgdata >= \$GDATA_MIN_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libgdata >= $GDATA_MIN_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker-miner-1.0 tracker-sparql-1.0" 2>/dev/null`
+  pkg_cv_GDATA_CFLAGS=`$PKG_CONFIG --cflags "libgdata >= $GDATA_MIN_VERSION" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12605,16 +12701,16 @@
  else
     pkg_failed=untried
 fi
-if test -n "$TRACKER_LIBS"; then
-    pkg_cv_TRACKER_LIBS="$TRACKER_LIBS"
+if test -n "$GDATA_LIBS"; then
+    pkg_cv_GDATA_LIBS="$GDATA_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-miner-1.0 tracker-sparql-1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "tracker-miner-1.0 tracker-sparql-1.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgdata >= \$GDATA_MIN_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libgdata >= $GDATA_MIN_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker-miner-1.0 tracker-sparql-1.0" 2>/dev/null`
+  pkg_cv_GDATA_LIBS=`$PKG_CONFIG --libs "libgdata >= $GDATA_MIN_VERSION" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12635,22 +12731,22 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "tracker-miner-1.0 tracker-sparql-1.0" 2>&1`
+	        GDATA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgdata >= $GDATA_MIN_VERSION" 2>&1`
         else
-	        TRACKER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "tracker-miner-1.0 tracker-sparql-1.0" 2>&1`
+	        GDATA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgdata >= $GDATA_MIN_VERSION" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$TRACKER_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (tracker-miner-1.0 tracker-sparql-1.0) were not met:
-
-$TRACKER_PKG_ERRORS
+	echo "$GDATA_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (libgdata >= $GDATA_MIN_VERSION) were not met:
+
+$GDATA_PKG_ERRORS
 
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-Alternatively, you may set the environment variables TRACKER_CFLAGS
-and TRACKER_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables GDATA_CFLAGS
+and GDATA_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -12661,19 +12757,72 @@
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
-Alternatively, you may set the environment variables TRACKER_CFLAGS
-and TRACKER_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables GDATA_CFLAGS
+and GDATA_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
-	TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
+	GDATA_CFLAGS=$pkg_cv_GDATA_CFLAGS
+	GDATA_LIBS=$pkg_cv_GDATA_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 fi
+fi
+ if test x$enable_google != xno; then
+  BUILD_GOOGLE_TRUE=
+  BUILD_GOOGLE_FALSE='#'
+else
+  BUILD_GOOGLE_TRUE='#'
+  BUILD_GOOGLE_FALSE=
+fi
+
+
+# Media Server
+# Check whether --enable-media-server was given.
+if test "${enable_media_server+set}" = set; then :
+  enableval=$enable_media_server;
+else
+  enable_media_server=yes
+fi
+
+ if test x$enable_media_server != xno; then
+  BUILD_MEDIA_SERVER_TRUE=
+  BUILD_MEDIA_SERVER_FALSE='#'
+else
+  BUILD_MEDIA_SERVER_TRUE='#'
+  BUILD_MEDIA_SERVER_FALSE=
+fi
+
+
+# ownCloud
+# Check whether --enable-owncloud was given.
+if test "${enable_owncloud+set}" = set; then :
+  enableval=$enable_owncloud;
+else
+  enable_owncloud=yes
+fi
+
+ if test x$enable_owncloud != xno; then
+  BUILD_OWNCLOUD_TRUE=
+  BUILD_OWNCLOUD_FALSE='#'
+else
+  BUILD_OWNCLOUD_TRUE='#'
+  BUILD_OWNCLOUD_FALSE=
+fi
+
+
+# Windows Live
+# Check whether --enable-windows-live was given.
+if test "${enable_windows_live+set}" = set; then :
+  enableval=$enable_windows_live;
+else
+  enable_windows_live=yes
+fi
+
+if test "$enable_windows_live" != "no"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZAPOJIT" >&5
@@ -12765,6 +12914,15 @@
 $as_echo "yes" >&6; }
 
 fi
+fi
+ if test x$enable_windows_live != xno; then
+  BUILD_WINDOWS_LIVE_TRUE=
+  BUILD_WINDOWS_LIVE_FALSE='#'
+else
+  BUILD_WINDOWS_LIVE_TRUE='#'
+  BUILD_WINDOWS_LIVE_FALSE=
+fi
+
 
 ac_config_files="$ac_config_files Makefile data/Makefile src/Makefile"
 
@@ -12905,6 +13063,30 @@
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${BUILD_FACEBOOK_TRUE}" && test -z "${BUILD_FACEBOOK_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_FACEBOOK\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_FLICKR_TRUE}" && test -z "${BUILD_FLICKR_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_FLICKR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_GOOGLE_TRUE}" && test -z "${BUILD_GOOGLE_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_GOOGLE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_MEDIA_SERVER_TRUE}" && test -z "${BUILD_MEDIA_SERVER_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_MEDIA_SERVER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_OWNCLOUD_TRUE}" && test -z "${BUILD_OWNCLOUD_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_OWNCLOUD\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_WINDOWS_LIVE_TRUE}" && test -z "${BUILD_WINDOWS_LIVE_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_WINDOWS_LIVE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -13302,7 +13484,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GNOME Online Miners $as_me 3.14.1, which was
+This file was extended by GNOME Online Miners $as_me 3.14.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13369,7 +13551,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GNOME Online Miners config.status 3.14.1
+GNOME Online Miners config.status 3.14.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -15137,3 +15319,15 @@
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
+
+echo "
+               gnome-online-miners $VERSION
+             ==============================
+
+            Facebook miner:              ${enable_facebook}
+            Flickr miner:                ${enable_flickr}
+            Google miner:                ${enable_google}
+            Media server miner:          ${enable_media_server}
+            ownCloud miner:              ${enable_owncloud}
+            Windows Live miner:          ${enable_windows_live}
+"

=== modified file 'configure.ac'
--- configure.ac	2015-03-20 10:28:22 +0000
+++ configure.ac	2015-05-27 08:42:08 +0000
@@ -1,5 +1,5 @@
 AC_INIT([GNOME Online Miners],
-        [3.14.1],
+        [3.14.3],
         [https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-online-miners],
         [gnome-online-miners],
         [https://wiki.gnome.org/Projects/GnomeOnlineMiners])
@@ -32,17 +32,55 @@
 
 LT_INIT
 
-PKG_CHECK_MODULES(GDATA, [libgdata >= $GDATA_MIN_VERSION])
-PKG_CHECK_MODULES(GFBGRAPH, [libgfbgraph-0.2 >= $GFBGRAPH_MIN_VERSION])
 PKG_CHECK_MODULES(GLIB, [glib-2.0 >= $GLIB_MIN_VERSION])
 PKG_CHECK_MODULES(GIO, [gio-2.0 gio-unix-2.0])
 
 PKG_CHECK_MODULES(GOA, [goa-1.0 >= $GOA_MIN_VERSION])
 AC_DEFINE([GOA_API_IS_SUBJECT_TO_CHANGE], [], [We are aware that GOA's API can change])
 
-PKG_CHECK_MODULES(GRILO, [grilo-0.2 >= $GRILO_MIN_VERSION])
 PKG_CHECK_MODULES(TRACKER, [tracker-miner-1.0 tracker-sparql-1.0])
-PKG_CHECK_MODULES(ZAPOJIT, [zapojit-0.0 >= $ZAPOJIT_MIN_VERSION])
+
+# Facebook
+AC_ARG_ENABLE([facebook], [AS_HELP_STRING([--enable-facebook], [Enable Facebook miner])], [], [enable_facebook=yes])
+if test "$enable_facebook" != "no"; then
+  PKG_CHECK_MODULES(GFBGRAPH, [libgfbgraph-0.2 >= $GFBGRAPH_MIN_VERSION])
+fi
+AM_CONDITIONAL(BUILD_FACEBOOK, [test x$enable_facebook != xno])
+
+# Flickr
+AC_ARG_ENABLE([flickr], [AS_HELP_STRING([--enable-flickr], [Enable Flickr miner])], [], [enable_flickr=yes])
+if test "$enable_flickr" != "no"; then
+  PKG_CHECK_MODULES(GRILO, [grilo-0.2 >= $GRILO_MIN_VERSION])
+fi
+AM_CONDITIONAL(BUILD_FLICKR, [test x$enable_flickr != xno])
+
+# Google
+AC_ARG_ENABLE([google], [AS_HELP_STRING([--enable-google], [Enable Google miner])], [], [enable_google=yes])
+if test "$enable_google" != "no"; then
+  PKG_CHECK_MODULES(GDATA, [libgdata >= $GDATA_MIN_VERSION])
+fi
+AM_CONDITIONAL(BUILD_GOOGLE, [test x$enable_google != xno])
+
+# Media Server
+AC_ARG_ENABLE([media-server], [AS_HELP_STRING([--enable-media-server],
+                                              [Enable media server miner])],
+                                              [],
+                                              [enable_media_server=yes])
+AM_CONDITIONAL(BUILD_MEDIA_SERVER, [test x$enable_media_server != xno])
+
+# ownCloud
+AC_ARG_ENABLE([owncloud], [AS_HELP_STRING([--enable-owncloud], [Enable ownCloud miner])], [], [enable_owncloud=yes])
+AM_CONDITIONAL(BUILD_OWNCLOUD, [test x$enable_owncloud != xno])
+
+# Windows Live
+AC_ARG_ENABLE([windows-live], [AS_HELP_STRING([--enable-windows-live],
+                                              [Enable Windows Live miner])],
+                                              [],
+                                              [enable_windows_live=yes])
+if test "$enable_windows_live" != "no"; then
+  PKG_CHECK_MODULES(ZAPOJIT, [zapojit-0.0 >= $ZAPOJIT_MIN_VERSION])
+fi
+AM_CONDITIONAL(BUILD_WINDOWS_LIVE, [test x$enable_windows_live != xno])
 
 AC_CONFIG_FILES([
 Makefile
@@ -50,3 +88,15 @@
 src/Makefile
 ])
 AC_OUTPUT
+
+echo "
+               gnome-online-miners $VERSION
+             ==============================
+
+            Facebook miner:              ${enable_facebook}
+            Flickr miner:                ${enable_flickr}
+            Google miner:                ${enable_google}
+            Media server miner:          ${enable_media_server}
+            ownCloud miner:              ${enable_owncloud}
+            Windows Live miner:          ${enable_windows_live}
+"

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-20 10:28:22 +0000
+++ debian/changelog	2015-05-27 08:42:08 +0000
@@ -1,3 +1,16 @@
+gnome-online-miners (3.14.3-1ubuntu1) wily; urgency=medium
+
+  * Merge from debian. Remaining changes:
+    - debian/control.in: Switch dep to grilo-plugins-0.2-extra 
+
+ -- Jackson Doak <[e-mail]>  Wed, 27 May 2015 18:29:04 +1000
+
+gnome-online-miners (3.14.3-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Henriksson <[e-mail]>  Tue, 19 May 2015 18:04:51 +0200
+
 gnome-online-miners (3.14.1-0ubuntu1) vivid; urgency=medium
 
   * New upstream release

=== modified file 'debian/control'
--- debian/control	2015-02-17 21:28:09 +0000
+++ debian/control	2015-05-27 08:42:08 +0000
@@ -5,7 +5,8 @@
 Source: gnome-online-miners
 Section: gnome
 Priority: optional
-Maintainer: Debian GNOME Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: Andreas Henriksson <[e-mail]>, Laurent Bigonville <[e-mail]>
 Build-Depends: autotools-dev,
                debhelper (>= 9),

=== modified file 'debian/control.in'
--- debian/control.in	2015-02-17 21:28:09 +0000
+++ debian/control.in	2015-05-27 08:42:08 +0000
@@ -1,7 +1,8 @@
 Source: gnome-online-miners
 Section: gnome
 Priority: optional
-Maintainer: Debian GNOME Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
 Build-Depends: autotools-dev,
                debhelper (>= 9),

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2014-09-07 11:31:28 +0000
+++ src/Makefile.am	2015-05-27 08:42:08 +0000
@@ -46,12 +46,12 @@
     $(NULL)
 
 libexec_PROGRAMS = \
+    $(NULL)
+
+if BUILD_FACEBOOK
+
+libexec_PROGRAMS += \
     gom-facebook-miner \
-    gom-flickr-miner \
-    gom-gdata-miner \
-    gom-media-server-miner \
-    gom-owncloud-miner \
-    gom-zpj-miner \
     $(NULL)
 
 gom_facebook_miner_SOURCES = \
@@ -80,6 +80,14 @@
     $(TRACKER_LIBS) \
     $(NULL)
 
+endif # BUILD_FACEBOOK
+
+if BUILD_FLICKR
+
+libexec_PROGRAMS += \
+    gom-flickr-miner \
+    $(NULL)
+
 gom_flickr_miner_SOURCES = \
     gom-flickr-miner-main.c \
     gom-flickr-miner.c \
@@ -106,6 +114,14 @@
     $(TRACKER_LIBS) \
     $(NULL)
 
+endif # BUILD_FLICKR
+
+if BUILD_GOOGLE
+
+libexec_PROGRAMS += \
+    gom-gdata-miner \
+    $(NULL)
+
 gom_gdata_miner_SOURCES = \
     gom-gdata-miner-main.c \
     gom-gdata-miner.c \
@@ -132,6 +148,14 @@
     $(TRACKER_LIBS) \
     $(NULL)
 
+endif # BUILD_GOOGLE
+
+if BUILD_MEDIA_SERVER
+
+libexec_PROGRAMS += \
+    gom-media-server-miner \
+    $(NULL)
+
 gom_media_server_miner_built_sources = \
     gom-dleyna-server-manager.c \
     gom-dleyna-server-manager.h \
@@ -173,6 +197,14 @@
     $(TRACKER_LIBS) \
     $(NULL)
 
+endif # BUILD_MEDIA_SERVER
+
+if BUILD_OWNCLOUD
+
+libexec_PROGRAMS += \
+    gom-owncloud-miner \
+    $(NULL)
+
 gom_owncloud_miner_SOURCES = \
     gom-owncloud-miner-main.c \
     gom-owncloud-miner.c \
@@ -197,6 +229,14 @@
     $(TRACKER_LIBS) \
     $(NULL)
 
+endif # BUILD_OWNCLOUD
+
+if BUILD_WINDOWS_LIVE
+
+libexec_PROGRAMS += \
+    gom-zpj-miner \
+    $(NULL)
+
 gom_zpj_miner_SOURCES = \
     gom-zpj-miner-main.c \
     gom-zpj-miner.c \
@@ -223,6 +263,8 @@
     $(ZAPOJIT_LIBS) \
     $(NULL)
 
+endif # BUILD_WINDOWS_LIVE
+
 BUILT_SOURCES = \
     $(libgom_1_0_la_built_sources) \
     $(gom_media_server_miner_built_sources)

=== modified file 'src/Makefile.in'
--- src/Makefile.in	2015-03-20 10:28:22 +0000
+++ src/Makefile.in	2015-05-27 08:42:08 +0000
@@ -79,10 +79,32 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-libexec_PROGRAMS = gom-facebook-miner$(EXEEXT) \
-	gom-flickr-miner$(EXEEXT) gom-gdata-miner$(EXEEXT) \
-	gom-media-server-miner$(EXEEXT) gom-owncloud-miner$(EXEEXT) \
-	gom-zpj-miner$(EXEEXT)
+libexec_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
+	$(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6)
+@BUILD_FACEBOOK_TRUE@am__append_1 = \
+@BUILD_FACEBOOK_TRUE@    gom-facebook-miner \
+@BUILD_FACEBOOK_TRUE@    $(NULL)
+
+@BUILD_FLICKR_TRUE@am__append_2 = \
+@BUILD_FLICKR_TRUE@    gom-flickr-miner \
+@BUILD_FLICKR_TRUE@    $(NULL)
+
+@BUILD_GOOGLE_TRUE@am__append_3 = \
+@BUILD_GOOGLE_TRUE@    gom-gdata-miner \
+@BUILD_GOOGLE_TRUE@    $(NULL)
+
+@BUILD_MEDIA_SERVER_TRUE@am__append_4 = \
+@BUILD_MEDIA_SERVER_TRUE@    gom-media-server-miner \
+@BUILD_MEDIA_SERVER_TRUE@    $(NULL)
+
+@BUILD_OWNCLOUD_TRUE@am__append_5 = \
+@BUILD_OWNCLOUD_TRUE@    gom-owncloud-miner \
+@BUILD_OWNCLOUD_TRUE@    $(NULL)
+
+@BUILD_WINDOWS_LIVE_TRUE@am__append_6 = \
+@BUILD_WINDOWS_LIVE_TRUE@    gom-zpj-miner \
+@BUILD_WINDOWS_LIVE_TRUE@    $(NULL)
+
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/config/depcomp
@@ -145,56 +167,84 @@
 libgom_1_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libgom_1_0_la_LDFLAGS) $(LDFLAGS) -o $@
+@BUILD_FACEBOOK_TRUE@am__EXEEXT_1 = gom-facebook-miner$(EXEEXT)
+@BUILD_FLICKR_TRUE@am__EXEEXT_2 = gom-flickr-miner$(EXEEXT)
+@BUILD_GOOGLE_TRUE@am__EXEEXT_3 = gom-gdata-miner$(EXEEXT)
+@BUILD_MEDIA_SERVER_TRUE@am__EXEEXT_4 =  \
+@BUILD_MEDIA_SERVER_TRUE@	gom-media-server-miner$(EXEEXT)
+@BUILD_OWNCLOUD_TRUE@am__EXEEXT_5 = gom-owncloud-miner$(EXEEXT)
+@BUILD_WINDOWS_LIVE_TRUE@am__EXEEXT_6 = gom-zpj-miner$(EXEEXT)
 PROGRAMS = $(libexec_PROGRAMS)
-am_gom_facebook_miner_OBJECTS =  \
-	gom_facebook_miner-gom-facebook-miner-main.$(OBJEXT) \
-	gom_facebook_miner-gom-facebook-miner.$(OBJEXT)
+am__gom_facebook_miner_SOURCES_DIST = gom-facebook-miner-main.c \
+	gom-facebook-miner.c gom-facebook-miner.h
+@BUILD_FACEBOOK_TRUE@am_gom_facebook_miner_OBJECTS = gom_facebook_miner-gom-facebook-miner-main.$(OBJEXT) \
+@BUILD_FACEBOOK_TRUE@	gom_facebook_miner-gom-facebook-miner.$(OBJEXT)
 gom_facebook_miner_OBJECTS = $(am_gom_facebook_miner_OBJECTS)
-gom_facebook_miner_DEPENDENCIES = libgom-1.0.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am_gom_flickr_miner_OBJECTS =  \
-	gom_flickr_miner-gom-flickr-miner-main.$(OBJEXT) \
-	gom_flickr_miner-gom-flickr-miner.$(OBJEXT)
+@BUILD_FACEBOOK_TRUE@gom_facebook_miner_DEPENDENCIES = libgom-1.0.la \
+@BUILD_FACEBOOK_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_FACEBOOK_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_FACEBOOK_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_FACEBOOK_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_FACEBOOK_TRUE@	$(am__DEPENDENCIES_1)
+am__gom_flickr_miner_SOURCES_DIST = gom-flickr-miner-main.c \
+	gom-flickr-miner.c gom-flickr-miner.h
+@BUILD_FLICKR_TRUE@am_gom_flickr_miner_OBJECTS = gom_flickr_miner-gom-flickr-miner-main.$(OBJEXT) \
+@BUILD_FLICKR_TRUE@	gom_flickr_miner-gom-flickr-miner.$(OBJEXT)
 gom_flickr_miner_OBJECTS = $(am_gom_flickr_miner_OBJECTS)
-gom_flickr_miner_DEPENDENCIES = libgom-1.0.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am_gom_gdata_miner_OBJECTS =  \
-	gom_gdata_miner-gom-gdata-miner-main.$(OBJEXT) \
-	gom_gdata_miner-gom-gdata-miner.$(OBJEXT)
+@BUILD_FLICKR_TRUE@gom_flickr_miner_DEPENDENCIES = libgom-1.0.la \
+@BUILD_FLICKR_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@BUILD_FLICKR_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@BUILD_FLICKR_TRUE@	$(am__DEPENDENCIES_1)
+am__gom_gdata_miner_SOURCES_DIST = gom-gdata-miner-main.c \
+	gom-gdata-miner.c gom-gdata-miner.h
+@BUILD_GOOGLE_TRUE@am_gom_gdata_miner_OBJECTS = gom_gdata_miner-gom-gdata-miner-main.$(OBJEXT) \
+@BUILD_GOOGLE_TRUE@	gom_gdata_miner-gom-gdata-miner.$(OBJEXT)
 gom_gdata_miner_OBJECTS = $(am_gom_gdata_miner_OBJECTS)
-gom_gdata_miner_DEPENDENCIES = libgom-1.0.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am_gom_media_server_miner_OBJECTS =  \
-	gom_media_server_miner-gom-media-server-miner-main.$(OBJEXT) \
-	gom_media_server_miner-gom-media-server-miner.$(OBJEXT) \
-	gom_media_server_miner-gom-dlna-server.$(OBJEXT) \
-	gom_media_server_miner-gom-dlna-servers-manager.$(OBJEXT)
-am__objects_2 =  \
-	gom_media_server_miner-gom-dleyna-server-manager.$(OBJEXT) \
-	gom_media_server_miner-gom-dleyna-server-media-device.$(OBJEXT) \
-	gom_media_server_miner-gom-upnp-media-container2.$(OBJEXT)
-nodist_gom_media_server_miner_OBJECTS = $(am__objects_2)
+@BUILD_GOOGLE_TRUE@gom_gdata_miner_DEPENDENCIES = libgom-1.0.la \
+@BUILD_GOOGLE_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@BUILD_GOOGLE_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@BUILD_GOOGLE_TRUE@	$(am__DEPENDENCIES_1)
+am__gom_media_server_miner_SOURCES_DIST =  \
+	gom-media-server-miner-main.c gom-media-server-miner.c \
+	gom-media-server-miner.h gom-dlna-server.c gom-dlna-server.h \
+	gom-dlna-servers-manager.c gom-dlna-servers-manager.h
+@BUILD_MEDIA_SERVER_TRUE@am_gom_media_server_miner_OBJECTS = gom_media_server_miner-gom-media-server-miner-main.$(OBJEXT) \
+@BUILD_MEDIA_SERVER_TRUE@	gom_media_server_miner-gom-media-server-miner.$(OBJEXT) \
+@BUILD_MEDIA_SERVER_TRUE@	gom_media_server_miner-gom-dlna-server.$(OBJEXT) \
+@BUILD_MEDIA_SERVER_TRUE@	gom_media_server_miner-gom-dlna-servers-manager.$(OBJEXT)
+@BUILD_MEDIA_SERVER_TRUE@am__objects_2 = gom_media_server_miner-gom-dleyna-server-manager.$(OBJEXT) \
+@BUILD_MEDIA_SERVER_TRUE@	gom_media_server_miner-gom-dleyna-server-media-device.$(OBJEXT) \
+@BUILD_MEDIA_SERVER_TRUE@	gom_media_server_miner-gom-upnp-media-container2.$(OBJEXT)
+@BUILD_MEDIA_SERVER_TRUE@nodist_gom_media_server_miner_OBJECTS =  \
+@BUILD_MEDIA_SERVER_TRUE@	$(am__objects_2)
 gom_media_server_miner_OBJECTS = $(am_gom_media_server_miner_OBJECTS) \
 	$(nodist_gom_media_server_miner_OBJECTS)
-gom_media_server_miner_DEPENDENCIES = libgom-1.0.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am_gom_owncloud_miner_OBJECTS =  \
-	gom_owncloud_miner-gom-owncloud-miner-main.$(OBJEXT) \
-	gom_owncloud_miner-gom-owncloud-miner.$(OBJEXT)
+@BUILD_MEDIA_SERVER_TRUE@gom_media_server_miner_DEPENDENCIES =  \
+@BUILD_MEDIA_SERVER_TRUE@	libgom-1.0.la $(am__DEPENDENCIES_1) \
+@BUILD_MEDIA_SERVER_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_MEDIA_SERVER_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_MEDIA_SERVER_TRUE@	$(am__DEPENDENCIES_1)
+am__gom_owncloud_miner_SOURCES_DIST = gom-owncloud-miner-main.c \
+	gom-owncloud-miner.c gom-owncloud-miner.h
+@BUILD_OWNCLOUD_TRUE@am_gom_owncloud_miner_OBJECTS = gom_owncloud_miner-gom-owncloud-miner-main.$(OBJEXT) \
+@BUILD_OWNCLOUD_TRUE@	gom_owncloud_miner-gom-owncloud-miner.$(OBJEXT)
 gom_owncloud_miner_OBJECTS = $(am_gom_owncloud_miner_OBJECTS)
-gom_owncloud_miner_DEPENDENCIES = libgom-1.0.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
-am_gom_zpj_miner_OBJECTS = gom_zpj_miner-gom-zpj-miner-main.$(OBJEXT) \
-	gom_zpj_miner-gom-zpj-miner.$(OBJEXT)
+@BUILD_OWNCLOUD_TRUE@gom_owncloud_miner_DEPENDENCIES = libgom-1.0.la \
+@BUILD_OWNCLOUD_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_OWNCLOUD_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_OWNCLOUD_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_OWNCLOUD_TRUE@	$(am__DEPENDENCIES_1)
+am__gom_zpj_miner_SOURCES_DIST = gom-zpj-miner-main.c gom-zpj-miner.c \
+	gom-zpj-miner.h
+@BUILD_WINDOWS_LIVE_TRUE@am_gom_zpj_miner_OBJECTS = gom_zpj_miner-gom-zpj-miner-main.$(OBJEXT) \
+@BUILD_WINDOWS_LIVE_TRUE@	gom_zpj_miner-gom-zpj-miner.$(OBJEXT)
 gom_zpj_miner_OBJECTS = $(am_gom_zpj_miner_OBJECTS)
-gom_zpj_miner_DEPENDENCIES = libgom-1.0.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+@BUILD_WINDOWS_LIVE_TRUE@gom_zpj_miner_DEPENDENCIES = libgom-1.0.la \
+@BUILD_WINDOWS_LIVE_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_WINDOWS_LIVE_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_WINDOWS_LIVE_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_WINDOWS_LIVE_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_WINDOWS_LIVE_TRUE@	$(am__DEPENDENCIES_1)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -234,10 +284,13 @@
 	$(gom_gdata_miner_SOURCES) $(gom_media_server_miner_SOURCES) \
 	$(nodist_gom_media_server_miner_SOURCES) \
 	$(gom_owncloud_miner_SOURCES) $(gom_zpj_miner_SOURCES)
-DIST_SOURCES = $(libgom_1_0_la_SOURCES) $(gom_facebook_miner_SOURCES) \
-	$(gom_flickr_miner_SOURCES) $(gom_gdata_miner_SOURCES) \
-	$(gom_media_server_miner_SOURCES) \
-	$(gom_owncloud_miner_SOURCES) $(gom_zpj_miner_SOURCES)
+DIST_SOURCES = $(libgom_1_0_la_SOURCES) \
+	$(am__gom_facebook_miner_SOURCES_DIST) \
+	$(am__gom_flickr_miner_SOURCES_DIST) \
+	$(am__gom_gdata_miner_SOURCES_DIST) \
+	$(am__gom_media_server_miner_SOURCES_DIST) \
+	$(am__gom_owncloud_miner_SOURCES_DIST) \
+	$(am__gom_zpj_miner_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -444,173 +497,173 @@
     -avoid-version \
     $(NULL)
 
-gom_facebook_miner_SOURCES = \
-    gom-facebook-miner-main.c \
-    gom-facebook-miner.c \
-    gom-facebook-miner.h \
-    $(NULL)
-
-gom_facebook_miner_CPPFLAGS = \
-    -DG_LOG_DOMAIN=\"Gom\" \
-    -DG_DISABLE_DEPRECATED \
-    -I$(top_srcdir)/src \
-    $(GFBGRAPH_CFLAGS) \
-    $(GIO_CFLAGS) \
-    $(GLIB_CFLAGS) \
-    $(GOA_CFLAGS) \
-    $(TRACKER_CFLAGS) \
-    $(NULL)
-
-gom_facebook_miner_LDADD = \
-    libgom-1.0.la  \
-    $(GFBGRAPH_LIBS) \
-    $(GIO_LIBS) \
-    $(GLIB_LIBS) \
-    $(GOA_LIBS) \
-    $(TRACKER_LIBS) \
-    $(NULL)
-
-gom_flickr_miner_SOURCES = \
-    gom-flickr-miner-main.c \
-    gom-flickr-miner.c \
-    gom-flickr-miner.h \
-    $(NULL)
-
-gom_flickr_miner_CPPFLAGS = \
-    -DG_LOG_DOMAIN=\"Gom\" \
-    -DG_DISABLE_DEPRECATED \
-    -I$(top_srcdir)/src \
-    $(GIO_CFLAGS) \
-    $(GLIB_CFLAGS) \
-    $(GOA_CFLAGS) \
-    $(GRILO_CFLAGS) \
-    $(TRACKER_CFLAGS) \
-    $(NULL)
-
-gom_flickr_miner_LDADD = \
-    libgom-1.0.la  \
-    $(GIO_LIBS) \
-    $(GLIB_LIBS) \
-    $(GOA_LIBS) \
-    $(GRILO_LIBS) \
-    $(TRACKER_LIBS) \
-    $(NULL)
-
-gom_gdata_miner_SOURCES = \
-    gom-gdata-miner-main.c \
-    gom-gdata-miner.c \
-    gom-gdata-miner.h \
-    $(NULL)
-
-gom_gdata_miner_CPPFLAGS = \
-    -DG_LOG_DOMAIN=\"Gom\" \
-    -DG_DISABLE_DEPRECATED \
-    -I$(top_srcdir)/src \
-    $(GDATA_CFLAGS) \
-    $(GIO_CFLAGS) \
-    $(GLIB_CFLAGS) \
-    $(GOA_CFLAGS) \
-    $(TRACKER_CFLAGS) \
-    $(NULL)
-
-gom_gdata_miner_LDADD = \
-    libgom-1.0.la  \
-    $(GDATA_LIBS) \
-    $(GIO_LIBS) \
-    $(GLIB_LIBS) \
-    $(GOA_LIBS) \
-    $(TRACKER_LIBS) \
-    $(NULL)
-
-gom_media_server_miner_built_sources = \
-    gom-dleyna-server-manager.c \
-    gom-dleyna-server-manager.h \
-    gom-dleyna-server-media-device.c \
-    gom-dleyna-server-media-device.h \
-    gom-upnp-media-container2.c \
-    gom-upnp-media-container2.h \
-    $(NULL)
-
-nodist_gom_media_server_miner_SOURCES = \
-    $(gom_media_server_miner_built_sources)
-
-gom_media_server_miner_SOURCES = \
-    gom-media-server-miner-main.c \
-    gom-media-server-miner.c \
-    gom-media-server-miner.h \
-    gom-dlna-server.c \
-    gom-dlna-server.h \
-    gom-dlna-servers-manager.c \
-    gom-dlna-servers-manager.h \
-    $(NULL)
-
-gom_media_server_miner_CPPFLAGS = \
-    -DG_LOG_DOMAIN=\"Gom\" \
-    -DG_DISABLE_DEPRECATED \
-    -I$(top_srcdir)/src \
-    $(GIO_CFLAGS) \
-    $(GLIB_CFLAGS) \
-    $(GOA_CFLAGS) \
-    $(TRACKER_CFLAGS) \
-    $(NULL)
-
-gom_media_server_miner_LDADD = \
-    libgom-1.0.la  \
-    $(GIO_LIBS) \
-    $(GLIB_LIBS) \
-    $(GOA_LIBS) \
-    $(TRACKER_LIBS) \
-    $(NULL)
-
-gom_owncloud_miner_SOURCES = \
-    gom-owncloud-miner-main.c \
-    gom-owncloud-miner.c \
-    gom-owncloud-miner.h \
-    $(NULL)
-
-gom_owncloud_miner_CPPFLAGS = \
-    -DG_LOG_DOMAIN=\"Gom\" \
-    -DG_DISABLE_DEPRECATED \
-    -I$(top_srcdir)/src \
-    $(GIO_CFLAGS) \
-    $(GLIB_CFLAGS) \
-    $(GOA_CFLAGS) \
-    $(TRACKER_CFLAGS) \
-    $(NULL)
-
-gom_owncloud_miner_LDADD = \
-    libgom-1.0.la  \
-    $(GIO_LIBS) \
-    $(GLIB_LIBS) \
-    $(GOA_LIBS) \
-    $(TRACKER_LIBS) \
-    $(NULL)
-
-gom_zpj_miner_SOURCES = \
-    gom-zpj-miner-main.c \
-    gom-zpj-miner.c \
-    gom-zpj-miner.h \
-    $(NULL)
-
-gom_zpj_miner_CPPFLAGS = \
-    -DG_LOG_DOMAIN=\"Gom\" \
-    -DG_DISABLE_DEPRECATED \
-    -I$(top_srcdir)/src \
-    $(GIO_CFLAGS) \
-    $(GLIB_CFLAGS) \
-    $(GOA_CFLAGS) \
-    $(TRACKER_CFLAGS) \
-    $(ZAPOJIT_CFLAGS) \
-    $(NULL)
-
-gom_zpj_miner_LDADD = \
-    libgom-1.0.la  \
-    $(GIO_LIBS) \
-    $(GLIB_LIBS) \
-    $(GOA_LIBS) \
-    $(TRACKER_LIBS) \
-    $(ZAPOJIT_LIBS) \
-    $(NULL)
+@BUILD_FACEBOOK_TRUE@gom_facebook_miner_SOURCES = \
+@BUILD_FACEBOOK_TRUE@    gom-facebook-miner-main.c \
+@BUILD_FACEBOOK_TRUE@    gom-facebook-miner.c \
+@BUILD_FACEBOOK_TRUE@    gom-facebook-miner.h \
+@BUILD_FACEBOOK_TRUE@    $(NULL)
+
+@BUILD_FACEBOOK_TRUE@gom_facebook_miner_CPPFLAGS = \
+@BUILD_FACEBOOK_TRUE@    -DG_LOG_DOMAIN=\"Gom\" \
+@BUILD_FACEBOOK_TRUE@    -DG_DISABLE_DEPRECATED \
+@BUILD_FACEBOOK_TRUE@    -I$(top_srcdir)/src \
+@BUILD_FACEBOOK_TRUE@    $(GFBGRAPH_CFLAGS) \
+@BUILD_FACEBOOK_TRUE@    $(GIO_CFLAGS) \
+@BUILD_FACEBOOK_TRUE@    $(GLIB_CFLAGS) \
+@BUILD_FACEBOOK_TRUE@    $(GOA_CFLAGS) \
+@BUILD_FACEBOOK_TRUE@    $(TRACKER_CFLAGS) \
+@BUILD_FACEBOOK_TRUE@    $(NULL)
+
+@BUILD_FACEBOOK_TRUE@gom_facebook_miner_LDADD = \
+@BUILD_FACEBOOK_TRUE@    libgom-1.0.la  \
+@BUILD_FACEBOOK_TRUE@    $(GFBGRAPH_LIBS) \
+@BUILD_FACEBOOK_TRUE@    $(GIO_LIBS) \
+@BUILD_FACEBOOK_TRUE@    $(GLIB_LIBS) \
+@BUILD_FACEBOOK_TRUE@    $(GOA_LIBS) \
+@BUILD_FACEBOOK_TRUE@    $(TRACKER_LIBS) \
+@BUILD_FACEBOOK_TRUE@    $(NULL)
+
+@BUILD_FLICKR_TRUE@gom_flickr_miner_SOURCES = \
+@BUILD_FLICKR_TRUE@    gom-flickr-miner-main.c \
+@BUILD_FLICKR_TRUE@    gom-flickr-miner.c \
+@BUILD_FLICKR_TRUE@    gom-flickr-miner.h \
+@BUILD_FLICKR_TRUE@    $(NULL)
+
+@BUILD_FLICKR_TRUE@gom_flickr_miner_CPPFLAGS = \
+@BUILD_FLICKR_TRUE@    -DG_LOG_DOMAIN=\"Gom\" \
+@BUILD_FLICKR_TRUE@    -DG_DISABLE_DEPRECATED \
+@BUILD_FLICKR_TRUE@    -I$(top_srcdir)/src \
+@BUILD_FLICKR_TRUE@    $(GIO_CFLAGS) \
+@BUILD_FLICKR_TRUE@    $(GLIB_CFLAGS) \
+@BUILD_FLICKR_TRUE@    $(GOA_CFLAGS) \
+@BUILD_FLICKR_TRUE@    $(GRILO_CFLAGS) \
+@BUILD_FLICKR_TRUE@    $(TRACKER_CFLAGS) \
+@BUILD_FLICKR_TRUE@    $(NULL)
+
+@BUILD_FLICKR_TRUE@gom_flickr_miner_LDADD = \
+@BUILD_FLICKR_TRUE@    libgom-1.0.la  \
+@BUILD_FLICKR_TRUE@    $(GIO_LIBS) \
+@BUILD_FLICKR_TRUE@    $(GLIB_LIBS) \
+@BUILD_FLICKR_TRUE@    $(GOA_LIBS) \
+@BUILD_FLICKR_TRUE@    $(GRILO_LIBS) \
+@BUILD_FLICKR_TRUE@    $(TRACKER_LIBS) \
+@BUILD_FLICKR_TRUE@    $(NULL)
+
+@BUILD_GOOGLE_TRUE@gom_gdata_miner_SOURCES = \
+@BUILD_GOOGLE_TRUE@    gom-gdata-miner-main.c \
+@BUILD_GOOGLE_TRUE@    gom-gdata-miner.c \
+@BUILD_GOOGLE_TRUE@    gom-gdata-miner.h \
+@BUILD_GOOGLE_TRUE@    $(NULL)
+
+@BUILD_GOOGLE_TRUE@gom_gdata_miner_CPPFLAGS = \
+@BUILD_GOOGLE_TRUE@    -DG_LOG_DOMAIN=\"Gom\" \
+@BUILD_GOOGLE_TRUE@    -DG_DISABLE_DEPRECATED \
+@BUILD_GOOGLE_TRUE@    -I$(top_srcdir)/src \
+@BUILD_GOOGLE_TRUE@    $(GDATA_CFLAGS) \
+@BUILD_GOOGLE_TRUE@    $(GIO_CFLAGS) \
+@BUILD_GOOGLE_TRUE@    $(GLIB_CFLAGS) \
+@BUILD_GOOGLE_TRUE@    $(GOA_CFLAGS) \
+@BUILD_GOOGLE_TRUE@    $(TRACKER_CFLAGS) \
+@BUILD_GOOGLE_TRUE@    $(NULL)
+
+@BUILD_GOOGLE_TRUE@gom_gdata_miner_LDADD = \
+@BUILD_GOOGLE_TRUE@    libgom-1.0.la  \
+@BUILD_GOOGLE_TRUE@    $(GDATA_LIBS) \
+@BUILD_GOOGLE_TRUE@    $(GIO_LIBS) \
+@BUILD_GOOGLE_TRUE@    $(GLIB_LIBS) \
+@BUILD_GOOGLE_TRUE@    $(GOA_LIBS) \
+@BUILD_GOOGLE_TRUE@    $(TRACKER_LIBS) \
+@BUILD_GOOGLE_TRUE@    $(NULL)
+
+@BUILD_MEDIA_SERVER_TRUE@gom_media_server_miner_built_sources = \
+@BUILD_MEDIA_SERVER_TRUE@    gom-dleyna-server-manager.c \
+@BUILD_MEDIA_SERVER_TRUE@    gom-dleyna-server-manager.h \
+@BUILD_MEDIA_SERVER_TRUE@    gom-dleyna-server-media-device.c \
+@BUILD_MEDIA_SERVER_TRUE@    gom-dleyna-server-media-device.h \
+@BUILD_MEDIA_SERVER_TRUE@    gom-upnp-media-container2.c \
+@BUILD_MEDIA_SERVER_TRUE@    gom-upnp-media-container2.h \
+@BUILD_MEDIA_SERVER_TRUE@    $(NULL)
+
+@BUILD_MEDIA_SERVER_TRUE@nodist_gom_media_server_miner_SOURCES = \
+@BUILD_MEDIA_SERVER_TRUE@    $(gom_media_server_miner_built_sources)
+
+@BUILD_MEDIA_SERVER_TRUE@gom_media_server_miner_SOURCES = \
+@BUILD_MEDIA_SERVER_TRUE@    gom-media-server-miner-main.c \
+@BUILD_MEDIA_SERVER_TRUE@    gom-media-server-miner.c \
+@BUILD_MEDIA_SERVER_TRUE@    gom-media-server-miner.h \
+@BUILD_MEDIA_SERVER_TRUE@    gom-dlna-server.c \
+@BUILD_MEDIA_SERVER_TRUE@    gom-dlna-server.h \
+@BUILD_MEDIA_SERVER_TRUE@    gom-dlna-servers-manager.c \
+@BUILD_MEDIA_SERVER_TRUE@    gom-dlna-servers-manager.h \
+@BUILD_MEDIA_SERVER_TRUE@    $(NULL)
+
+@BUILD_MEDIA_SERVER_TRUE@gom_media_server_miner_CPPFLAGS = \
+@BUILD_MEDIA_SERVER_TRUE@    -DG_LOG_DOMAIN=\"Gom\" \
+@BUILD_MEDIA_SERVER_TRUE@    -DG_DISABLE_DEPRECATED \
+@BUILD_MEDIA_SERVER_TRUE@    -I$(top_srcdir)/src \
+@BUILD_MEDIA_SERVER_TRUE@    $(GIO_CFLAGS) \
+@BUILD_MEDIA_SERVER_TRUE@    $(GLIB_CFLAGS) \
+@BUILD_MEDIA_SERVER_TRUE@    $(GOA_CFLAGS) \
+@BUILD_MEDIA_SERVER_TRUE@    $(TRACKER_CFLAGS) \
+@BUILD_MEDIA_SERVER_TRUE@    $(NULL)
+
+@BUILD_MEDIA_SERVER_TRUE@gom_media_server_miner_LDADD = \
+@BUILD_MEDIA_SERVER_TRUE@    libgom-1.0.la  \
+@BUILD_MEDIA_SERVER_TRUE@    $(GIO_LIBS) \
+@BUILD_MEDIA_SERVER_TRUE@    $(GLIB_LIBS) \
+@BUILD_MEDIA_SERVER_TRUE@    $(GOA_LIBS) \
+@BUILD_MEDIA_SERVER_TRUE@    $(TRACKER_LIBS) \
+@BUILD_MEDIA_SERVER_TRUE@    $(NULL)
+
+@BUILD_OWNCLOUD_TRUE@gom_owncloud_miner_SOURCES = \
+@BUILD_OWNCLOUD_TRUE@    gom-owncloud-miner-main.c \
+@BUILD_OWNCLOUD_TRUE@    gom-owncloud-miner.c \
+@BUILD_OWNCLOUD_TRUE@    gom-owncloud-miner.h \
+@BUILD_OWNCLOUD_TRUE@    $(NULL)
+
+@BUILD_OWNCLOUD_TRUE@gom_owncloud_miner_CPPFLAGS = \
+@BUILD_OWNCLOUD_TRUE@    -DG_LOG_DOMAIN=\"Gom\" \
+@BUILD_OWNCLOUD_TRUE@    -DG_DISABLE_DEPRECATED \
+@BUILD_OWNCLOUD_TRUE@    -I$(top_srcdir)/src \
+@BUILD_OWNCLOUD_TRUE@    $(GIO_CFLAGS) \
+@BUILD_OWNCLOUD_TRUE@    $(GLIB_CFLAGS) \
+@BUILD_OWNCLOUD_TRUE@    $(GOA_CFLAGS) \
+@BUILD_OWNCLOUD_TRUE@    $(TRACKER_CFLAGS) \
+@BUILD_OWNCLOUD_TRUE@    $(NULL)
+
+@BUILD_OWNCLOUD_TRUE@gom_owncloud_miner_LDADD = \
+@BUILD_OWNCLOUD_TRUE@    libgom-1.0.la  \
+@BUILD_OWNCLOUD_TRUE@    $(GIO_LIBS) \
+@BUILD_OWNCLOUD_TRUE@    $(GLIB_LIBS) \
+@BUILD_OWNCLOUD_TRUE@    $(GOA_LIBS) \
+@BUILD_OWNCLOUD_TRUE@    $(TRACKER_LIBS) \
+@BUILD_OWNCLOUD_TRUE@    $(NULL)
+
+@BUILD_WINDOWS_LIVE_TRUE@gom_zpj_miner_SOURCES = \
+@BUILD_WINDOWS_LIVE_TRUE@    gom-zpj-miner-main.c \
+@BUILD_WINDOWS_LIVE_TRUE@    gom-zpj-miner.c \
+@BUILD_WINDOWS_LIVE_TRUE@    gom-zpj-miner.h \
+@BUILD_WINDOWS_LIVE_TRUE@    $(NULL)
+
+@BUILD_WINDOWS_LIVE_TRUE@gom_zpj_miner_CPPFLAGS = \
+@BUILD_WINDOWS_LIVE_TRUE@    -DG_LOG_DOMAIN=\"Gom\" \
+@BUILD_WINDOWS_LIVE_TRUE@    -DG_DISABLE_DEPRECATED \
+@BUILD_WINDOWS_LIVE_TRUE@    -I$(top_srcdir)/src \
+@BUILD_WINDOWS_LIVE_TRUE@    $(GIO_CFLAGS) \
+@BUILD_WINDOWS_LIVE_TRUE@    $(GLIB_CFLAGS) \
+@BUILD_WINDOWS_LIVE_TRUE@    $(GOA_CFLAGS) \
+@BUILD_WINDOWS_LIVE_TRUE@    $(TRACKER_CFLAGS) \
+@BUILD_WINDOWS_LIVE_TRUE@    $(ZAPOJIT_CFLAGS) \
+@BUILD_WINDOWS_LIVE_TRUE@    $(NULL)
+
+@BUILD_WINDOWS_LIVE_TRUE@gom_zpj_miner_LDADD = \
+@BUILD_WINDOWS_LIVE_TRUE@    libgom-1.0.la  \
+@BUILD_WINDOWS_LIVE_TRUE@    $(GIO_LIBS) \
+@BUILD_WINDOWS_LIVE_TRUE@    $(GLIB_LIBS) \
+@BUILD_WINDOWS_LIVE_TRUE@    $(GOA_LIBS) \
+@BUILD_WINDOWS_LIVE_TRUE@    $(TRACKER_LIBS) \
+@BUILD_WINDOWS_LIVE_TRUE@    $(ZAPOJIT_LIBS) \
+@BUILD_WINDOWS_LIVE_TRUE@    $(NULL)
 
 BUILT_SOURCES = \
     $(libgom_1_0_la_built_sources) \
@@ -1333,7 +1386,7 @@
 	uninstall-libexecPROGRAMS uninstall-pkglibLTLIBRARIES
 
     $(NULL)
-    $(NULL)
+@BUILD_MEDIA_SERVER_TRUE@    $(NULL)
     $(NULL)
 
 gom-dleyna-server-media-device.h gom-dleyna-server-media-device.c: gom-dleyna-server-media-device.xml

=== modified file 'src/gom-gdata-miner.c'
--- src/gom-gdata-miner.c	2015-03-20 10:28:22 +0000
+++ src/gom-gdata-miner.c	2015-05-27 08:42:08 +0000
@@ -1,6 +1,6 @@
 /*
  * GNOME Online Miners - crawls through your online content
- * Copyright (c) 2011, 2012, 2013, 2014 Red Hat, Inc.
+ * Copyright (c) 2011, 2012, 2013, 2014, 2015 Red Hat, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -29,9 +29,12 @@
 #include "gom-gdata-miner.h"
 
 #define MINER_IDENTIFIER "gd:gdata:miner:86ec9bc9-c242-427f-aa19-77b5a2c9b6f0"
-#define STARRED_CATEGORY_TERM "http://schemas.google.com/g/2005/labels#starred"
 #define PARENT_LINK_REL "http://schemas.google.com/docs/2007#parent"
 
+/* used by applications to identify the source of an entry */
+#define PREFIX_DRIVE "google:drive:"
+#define PREFIX_PICASAWEB "google:picasaweb:"
+
 G_DEFINE_TYPE (GomGDataMiner, gom_gdata_miner, GOM_TYPE_MINER)
 
 static gchar *
@@ -81,10 +84,15 @@
       GDataLink *link;
 
       link = gdata_entry_look_up_link (entry, GDATA_LINK_SELF);
-      identifier = g_strdup_printf ("gd:collection:%s", gdata_link_get_uri (link));
+      identifier = g_strdup_printf ("gd:collection:%s%s", PREFIX_DRIVE, gdata_link_get_uri (link));
     }
   else
-    identifier = g_strdup (gdata_entry_get_id (entry));
+    {
+      const gchar *id;
+
+      id = gdata_entry_get_id (entry);
+      identifier = g_strdup_printf ("%s%s", PREFIX_DRIVE, id);
+    }
 
   /* remove from the list of the previous resources */
   g_hash_table_remove (job->previous_resources, identifier);
@@ -168,7 +176,7 @@
 
       parent = l->data;
       parent_resource_id =
-        g_strdup_printf ("gd:collection:%s", gdata_link_get_uri (parent));
+        g_strdup_printf ("gd:collection:%s%s", PREFIX_DRIVE, gdata_link_get_uri (parent));
 
       parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
         (job->connection, job->cancellable, error,
@@ -195,7 +203,7 @@
   for (l = categories; l != NULL; l = l->next)
     {
       category = l->data;
-      if (g_strcmp0 (gdata_category_get_term (category), STARRED_CATEGORY_TERM) == 0)
+      if (g_strcmp0 (gdata_category_get_term (category), GDATA_CATEGORY_SCHEMA_LABELS_STARRED) == 0)
         {
           starred = TRUE;
           break;
@@ -327,9 +335,9 @@
                                  const gchar *parent_resource_urn,
                                  GError **error)
 {
-  GList *media_content;
+  GList *l, *media_contents;
   gchar *resource = NULL, *equipment_resource = NULL;
-  gchar *contact_resource, *date, *identifier;
+  gchar *contact_resource, *date, *identifier = NULL;
   gboolean resource_exists, mtime_changed;
   gint64 new_mtime;
   gint64 timestamp;
@@ -358,7 +366,22 @@
   const gchar *alternate_uri;
 
   id = gdata_entry_get_id (GDATA_ENTRY (photo));
-  identifier = g_strdup_printf ("google:picasaweb:%s", id);
+
+  media_contents = gdata_picasaweb_file_get_contents (photo);
+  for (l = media_contents; l != NULL; l = l->next)
+    {
+      GDataMediaContent *media_content = GDATA_MEDIA_CONTENT (l->data);
+      GDataMediaMedium medium;
+
+      medium = gdata_media_content_get_medium (media_content);
+      if (medium != GDATA_MEDIA_IMAGE)
+        {
+          g_debug ("Skipping %s because medium(%d) is not an image", id, medium);
+          goto out;
+        }
+    }
+
+  identifier = g_strdup_printf ("%s%s", PREFIX_PICASAWEB, id);
 
   /* remove from the list of the previous resources */
   g_hash_table_remove (job->previous_resources, identifier);
@@ -427,8 +450,7 @@
   if (*error != NULL)
     goto out;
 
-  media_content = gdata_picasaweb_file_get_contents (photo);
-  mime = gdata_media_content_get_content_type (GDATA_MEDIA_CONTENT (media_content->data));
+  mime = gdata_media_content_get_content_type (GDATA_MEDIA_CONTENT (media_contents->data));
   gom_tracker_sparql_connection_insert_or_replace_triple
     (job->connection,
      job->cancellable, error,
@@ -637,7 +659,7 @@
   const gchar *alternate_uri;
 
   album_id = gdata_entry_get_id (GDATA_ENTRY (album));
-  identifier = g_strdup_printf ("photos:collection:google:picasaweb:%s", album_id);
+  identifier = g_strdup_printf ("photos:collection:%s%s", PREFIX_PICASAWEB, album_id);
 
   /* remove from the list of the previous resources */
   g_hash_table_remove (job->previous_resources, identifier);
@@ -910,7 +932,7 @@
 
   miner_class->goa_provider_type = "google";
   miner_class->miner_identifier = MINER_IDENTIFIER;
-  miner_class->version = 4;
+  miner_class->version = 5;
 
   miner_class->create_services = create_services;
   miner_class->query = query_gdata;