Merge tag 'upstream/0.26.0'

Upstream version 0.26.0

1 files changed, 303 insertions, 155 deletions

diff --git a/configure b/configure
index dcbaf56..d410845 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for shotwell 0.25.4.
+# Generated by GNU Autoconf 2.69 for shotwell 0.26.0.
 #
 # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell>.
 #
@@ -650,8 +650,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='shotwell'
 PACKAGE_TARNAME='shotwell'
-PACKAGE_VERSION='0.25.4'
-PACKAGE_STRING='shotwell 0.25.4'
+PACKAGE_VERSION='0.26.0'
+PACKAGE_STRING='shotwell 0.26.0'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell'
 PACKAGE_URL=''
 
@@ -729,12 +729,16 @@ LIBTOOL
 HAVE_EXTRA_PLUGINS_FALSE
 HAVE_EXTRA_PLUGINS_TRUE
 HAVE_EXTRA_PLUGINS
+PUBLISHER_VALAFLAGS
 HAVE_UNITY_FALSE
 HAVE_UNITY_TRUE
 HAVE_UNITY
 UNITY_VALAFLAGS
 UNITY_LIBS
 UNITY_CFLAGS
+AUTHENTICATOR_PACKAGES
+AUTHENTICATOR_LIBS
+AUTHENTICATOR_CFLAGS
 TRANSITIONS_LIBS
 TRANSITIONS_CFLAGS
 PUBLISHING_LIBS
@@ -747,6 +751,12 @@ THUMBNAILER_LIBS
 THUMBNAILER_CFLAGS
 SHOTWELL_LIBS
 SHOTWELL_CFLAGS
+AUTHENTICATOR_UOA_FALSE
+AUTHENTICATOR_UOA_TRUE
+AUTHENTICATOR_GOA_FALSE
+AUTHENTICATOR_GOA_TRUE
+AUTHENTICATOR_SHOTWELL_FALSE
+AUTHENTICATOR_SHOTWELL_TRUE
 VALAFLAGS
 GSETTINGS_RULES
 GLIB_COMPILE_SCHEMAS
@@ -795,6 +805,8 @@ GETTEXT_MACRO_VERSION
 USE_NLS
 SED
 GETTEXT_PACKAGE
+IS_NDEBUG_FALSE
+IS_NDEBUG_TRUE
 GENERATE_CHANGELOG_RULES
 GIT
 MAINT
@@ -895,7 +907,9 @@ enable_rpath
 with_libiconv_prefix
 with_libintl_prefix
 enable_schemas_compile
+with_authenticator
 enable_unity_support
+enable_publishers
 enable_extra_plugins
 enable_shared
 enable_static
@@ -931,6 +945,8 @@ PUBLISHING_CFLAGS
 PUBLISHING_LIBS
 TRANSITIONS_CFLAGS
 TRANSITIONS_LIBS
+AUTHENTICATOR_CFLAGS
+AUTHENTICATOR_LIBS
 UNITY_CFLAGS
 UNITY_LIBS
 LT_SYS_LIBRARY_PATH
@@ -1486,7 +1502,7 @@ if test "$ac_init_help" = "long"; then
   # 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 shotwell 0.25.4 to adapt to many kinds of systems.
+\`configure' configures shotwell 0.26.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1557,7 +1573,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of shotwell 0.25.4:";;
+     short | recursive ) echo "Configuration of shotwell 0.26.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1570,8 +1586,8 @@ Optional Features:
   --disable-maintainer-mode
                           disable make rules and dependencies not useful (and
                           sometimes confusing) to the casual installer
-  --enable-debug=[yes/info/profile/no]
-                          compile with debugging
+  --enable-debug          compile with debugging,
+              , enable_debug=no
   --disable-nls           do not use Native Language Support
   --enable-dependency-tracking
                           do not reject slow dependency extractors
@@ -1581,6 +1597,9 @@ Optional Features:
   --disable-schemas-compile
                           Disable regeneration of gschemas.compiled on install
   --enable-unity-support  Enable Ubuntu Unity integration
+  --enable-publishers=[list-of-publishers or all]
+                          A comma-separated list of publishers from
+                          facebook, flickr, picasa, piwigo, youtube, gallery3, rajce, tumblr, yandex
   --disable-extra-plugins Enable building and installation of extra publishing
                           plugins
   --enable-shared[=PKGS]  build shared libraries [default=yes]
@@ -1600,6 +1619,9 @@ Optional Packages:
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
   --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
   --without-libintl-prefix     don't search for libintl in includedir and libdir
+  --with-authenticator=[shotwell]
+                           Which authentication back-end to use (defaul: shotwell)
+
   --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-aix-soname=aix|svr4|both
@@ -1646,6 +1668,10 @@ Some influential environment variables:
               C compiler flags for TRANSITIONS, overriding pkg-config
   TRANSITIONS_LIBS
               linker flags for TRANSITIONS, overriding pkg-config
+  AUTHENTICATOR_CFLAGS
+              C compiler flags for AUTHENTICATOR, overriding pkg-config
+  AUTHENTICATOR_LIBS
+              linker flags for AUTHENTICATOR, overriding pkg-config
   UNITY_CFLAGS
               C compiler flags for UNITY, overriding pkg-config
   UNITY_LIBS  linker flags for UNITY, overriding pkg-config
@@ -1720,7 +1746,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-shotwell configure 0.25.4
+shotwell configure 0.26.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1998,7 +2024,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by shotwell $as_me 0.25.4, which was
+It was created by shotwell $as_me 0.26.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2457,14 +2483,14 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 MAJOR_VERSION=0
 
-MINOR_VERSION=25
+MINOR_VERSION=26
 
-MICRO_VERSION=4
+MICRO_VERSION=0
 
 API_VERSION=0
 
 
-GITVER=8d2e927e78abb7699f1e9c8e9fd60119ea01999a
+GITVER=b83a820fc0a3f85f22484f3275adf086ad8e2ca3
 
 
  if test "x$GITVER" != "x"; then
@@ -2962,7 +2988,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='shotwell'
- VERSION='0.25.4'
+ VERSION='0.26.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3279,105 +3305,22 @@ dist-ChangeLog:
 
 
 
-
-
-    { $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
-
-
-
-
-    # Check whether --enable-debug was given.
+# Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug;
-else
-  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"
-       ;; #(
-  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"
-       ;; #(
-  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"
-       ;; #(
-  *) :
-
-	{ $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=""
+enable_debug=${enable_debug-no}
+if test "x$enable_debug" = "xyes"; then :
+  CFLAGS="${CFLAGS} -g -O0"
 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 G_DISABLE_ASSERT /**/" >>confdefs.h
-
-$as_echo "#define G_DISABLE_CHECKS /**/" >>confdefs.h
-
-$as_echo "#define G_DISABLE_CAST_CHECKS /**/" >>confdefs.h
-
+ if test "x$enable_debug" != "xyes"; then
+  IS_NDEBUG_TRUE=
+  IS_NDEBUG_FALSE='#'
 else
-
-$as_echo "#define NDEBUG /**/" >>confdefs.h
-
+  IS_NDEBUG_TRUE='#'
+  IS_NDEBUG_FALSE=
 fi
-    ax_enable_debug=$enable_debug
-
 
 
 GETTEXT_PACKAGE=shotwell
@@ -5904,21 +5847,16 @@ else
 /* end confdefs.h.  */
 
 #include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+$gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
 
 int
 main ()
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
 
   ;
   return 0;
@@ -6671,25 +6609,20 @@ else
 /* end confdefs.h.  */
 
 #include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+$gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
 
 int
 main ()
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
 
   ;
   return 0;
@@ -6708,25 +6641,20 @@ rm -f core conftest.err conftest.$ac_objext \
 /* end confdefs.h.  */
 
 #include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+$gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
 
 int
 main ()
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
 
   ;
   return 0;
@@ -8014,6 +7942,46 @@ VALAFLAGS="-g"
 
 
 
+# Check whether --with-authenticator was given.
+if test "${with_authenticator+set}" = set; then :
+  withval=$with_authenticator; with_authenticator=$withval
+else
+  with_authenticator=shotwell
+fi
+
+if test "x$with_authenticator" != "xshotwell"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Unknown authenticator $with_authenticator, using shotwell" >&5
+$as_echo "$as_me: Unknown authenticator $with_authenticator, using shotwell" >&6;}
+             with_authenticator="shotwell"
+
+fi
+
+ if test "x$with_authenticator" = "xshotwell"; then
+  AUTHENTICATOR_SHOTWELL_TRUE=
+  AUTHENTICATOR_SHOTWELL_FALSE='#'
+else
+  AUTHENTICATOR_SHOTWELL_TRUE='#'
+  AUTHENTICATOR_SHOTWELL_FALSE=
+fi
+
+ if test "x$with_authenticator" = "xgoa"; then
+  AUTHENTICATOR_GOA_TRUE=
+  AUTHENTICATOR_GOA_FALSE='#'
+else
+  AUTHENTICATOR_GOA_TRUE='#'
+  AUTHENTICATOR_GOA_FALSE=
+fi
+
+ if test "x$with_authenticator" = "xuoa"; then
+  AUTHENTICATOR_UOA_TRUE=
+  AUTHENTICATOR_UOA_FALSE='#'
+else
+  AUTHENTICATOR_UOA_TRUE='#'
+  AUTHENTICATOR_UOA_FALSE=
+fi
+
+
+
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHOTWELL" >&5
 $as_echo_n "checking for SHOTWELL... " >&6; }
@@ -8037,10 +8005,8 @@ if test -n "$SHOTWELL_CFLAGS"; then
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
                              libraw >= 0.13.2
-                             libsoup-2.4 >= 2.42.0
                              libxml-2.0 >= 2.6.32
                              sqlite3 >= 3.5.9
-                             webkit2gtk-4.0
                             \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
                              gee-0.8 >= 0.8.5
@@ -8057,10 +8023,8 @@ if test -n "$SHOTWELL_CFLAGS"; then
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
                              libraw >= 0.13.2
-                             libsoup-2.4 >= 2.42.0
                              libxml-2.0 >= 2.6.32
                              sqlite3 >= 3.5.9
-                             webkit2gtk-4.0
                             ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -8080,10 +8044,8 @@ if test -n "$SHOTWELL_CFLAGS"; then
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
                              libraw >= 0.13.2
-                             libsoup-2.4 >= 2.42.0
                              libxml-2.0 >= 2.6.32
                              sqlite3 >= 3.5.9
-                             webkit2gtk-4.0
                             " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -8111,10 +8073,8 @@ if test -n "$SHOTWELL_LIBS"; then
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
                              libraw >= 0.13.2
-                             libsoup-2.4 >= 2.42.0
                              libxml-2.0 >= 2.6.32
                              sqlite3 >= 3.5.9
-                             webkit2gtk-4.0
                             \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
                              gee-0.8 >= 0.8.5
@@ -8131,10 +8091,8 @@ if test -n "$SHOTWELL_LIBS"; then
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
                              libraw >= 0.13.2
-                             libsoup-2.4 >= 2.42.0
                              libxml-2.0 >= 2.6.32
                              sqlite3 >= 3.5.9
-                             webkit2gtk-4.0
                             ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -8154,10 +8112,8 @@ if test -n "$SHOTWELL_LIBS"; then
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
                              libraw >= 0.13.2
-                             libsoup-2.4 >= 2.42.0
                              libxml-2.0 >= 2.6.32
                              sqlite3 >= 3.5.9
-                             webkit2gtk-4.0
                             " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -8194,10 +8150,8 @@ fi
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
                              libraw >= 0.13.2
-                             libsoup-2.4 >= 2.42.0
                              libxml-2.0 >= 2.6.32
                              sqlite3 >= 3.5.9
-                             webkit2gtk-4.0
                             " 2>&1`
         else
 	        SHOTWELL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
@@ -8215,10 +8169,8 @@ fi
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
                              libraw >= 0.13.2
-                             libsoup-2.4 >= 2.42.0
                              libxml-2.0 >= 2.6.32
                              sqlite3 >= 3.5.9
-                             webkit2gtk-4.0
                             " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -8239,10 +8191,8 @@ fi
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
                              libraw >= 0.13.2
-                             libsoup-2.4 >= 2.42.0
                              libxml-2.0 >= 2.6.32
                              sqlite3 >= 3.5.9
-                             webkit2gtk-4.0
                             ) were not met:
 
 $SHOTWELL_PKG_ERRORS
@@ -8580,16 +8530,16 @@ if test -n "$PUBLISHING_CFLAGS"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
                                gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
-                               webkit2gtk-4.0 gcr-3 gcr-ui-3\""; } >&5
+                               webkit2gtk-4.0 gcr-3 gcr-ui-3 libgdata\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
                                gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
-                               webkit2gtk-4.0 gcr-3 gcr-ui-3") 2>&5
+                               webkit2gtk-4.0 gcr-3 gcr-ui-3 libgdata") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PUBLISHING_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
                                gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
-                               webkit2gtk-4.0 gcr-3 gcr-ui-3" 2>/dev/null`
+                               webkit2gtk-4.0 gcr-3 gcr-ui-3 libgdata" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -8603,16 +8553,16 @@ if test -n "$PUBLISHING_LIBS"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
                                gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
-                               webkit2gtk-4.0 gcr-3 gcr-ui-3\""; } >&5
+                               webkit2gtk-4.0 gcr-3 gcr-ui-3 libgdata\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
                                gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
-                               webkit2gtk-4.0 gcr-3 gcr-ui-3") 2>&5
+                               webkit2gtk-4.0 gcr-3 gcr-ui-3 libgdata") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PUBLISHING_LIBS=`$PKG_CONFIG --libs "gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
                                gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
-                               webkit2gtk-4.0 gcr-3 gcr-ui-3" 2>/dev/null`
+                               webkit2gtk-4.0 gcr-3 gcr-ui-3 libgdata" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -8635,18 +8585,18 @@ fi
         if test $_pkg_short_errors_supported = yes; then
 	        PUBLISHING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
                                gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
-                               webkit2gtk-4.0 gcr-3 gcr-ui-3" 2>&1`
+                               webkit2gtk-4.0 gcr-3 gcr-ui-3 libgdata" 2>&1`
         else
 	        PUBLISHING_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
                                gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
-                               webkit2gtk-4.0 gcr-3 gcr-ui-3" 2>&1`
+                               webkit2gtk-4.0 gcr-3 gcr-ui-3 libgdata" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$PUBLISHING_PKG_ERRORS" >&5
 
 	as_fn_error $? "Package requirements (gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
                                gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
-                               webkit2gtk-4.0 gcr-3 gcr-ui-3) were not met:
+                               webkit2gtk-4.0 gcr-3 gcr-ui-3 libgdata) were not met:
 
 $PUBLISHING_PKG_ERRORS
 
@@ -8780,6 +8730,122 @@ $as_echo "yes" >&6; }
 
 fi
 
+if test "x$with_authenticator" = "xshotwell"; then :
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AUTHENTICATOR" >&5
+$as_echo_n "checking for AUTHENTICATOR... " >&6; }
+
+if test -n "$AUTHENTICATOR_CFLAGS"; then
+    pkg_cv_AUTHENTICATOR_CFLAGS="$AUTHENTICATOR_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 glib-2.0 libsoup-2.4
+                                          webkit2gtk-4.0 gee-0.8 gtk+-3.0
+                                          libxml-2.0 json-glib-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gobject-2.0 glib-2.0 libsoup-2.4
+                                          webkit2gtk-4.0 gee-0.8 gtk+-3.0
+                                          libxml-2.0 json-glib-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_AUTHENTICATOR_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 glib-2.0 libsoup-2.4
+                                          webkit2gtk-4.0 gee-0.8 gtk+-3.0
+                                          libxml-2.0 json-glib-1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$AUTHENTICATOR_LIBS"; then
+    pkg_cv_AUTHENTICATOR_LIBS="$AUTHENTICATOR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 glib-2.0 libsoup-2.4
+                                          webkit2gtk-4.0 gee-0.8 gtk+-3.0
+                                          libxml-2.0 json-glib-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gobject-2.0 glib-2.0 libsoup-2.4
+                                          webkit2gtk-4.0 gee-0.8 gtk+-3.0
+                                          libxml-2.0 json-glib-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_AUTHENTICATOR_LIBS=`$PKG_CONFIG --libs "gobject-2.0 glib-2.0 libsoup-2.4
+                                          webkit2gtk-4.0 gee-0.8 gtk+-3.0
+                                          libxml-2.0 json-glib-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
+	        AUTHENTICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gobject-2.0 glib-2.0 libsoup-2.4
+                                          webkit2gtk-4.0 gee-0.8 gtk+-3.0
+                                          libxml-2.0 json-glib-1.0" 2>&1`
+        else
+	        AUTHENTICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gobject-2.0 glib-2.0 libsoup-2.4
+                                          webkit2gtk-4.0 gee-0.8 gtk+-3.0
+                                          libxml-2.0 json-glib-1.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$AUTHENTICATOR_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (gobject-2.0 glib-2.0 libsoup-2.4
+                                          webkit2gtk-4.0 gee-0.8 gtk+-3.0
+                                          libxml-2.0 json-glib-1.0) were not met:
+
+$AUTHENTICATOR_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 AUTHENTICATOR_CFLAGS
+and AUTHENTICATOR_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 AUTHENTICATOR_CFLAGS
+and AUTHENTICATOR_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
+	AUTHENTICATOR_CFLAGS=$pkg_cv_AUTHENTICATOR_CFLAGS
+	AUTHENTICATOR_LIBS=$pkg_cv_AUTHENTICATOR_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+        AUTHENTICATOR_PACKAGES="--pkg webkit2gtk-4.0 --pkg gtk+-3.0 --pkg libsoup-2.4 --pkg gee-0.8 --pkg libxml-2.0 --pkg json-glib-1.0"
+
+
+fi
+
 # Check whether --enable-unity-support was given.
 if test "${enable_unity_support+set}" = set; then :
   enableval=$enable_unity_support;
@@ -8879,6 +8945,70 @@ else
 fi
 
 
+
+
+# Check whether --enable-publishers was given.
+if test "${enable_publishers+set}" = set; then :
+  enableval=$enable_publishers;
+else
+  enable_publishers="facebook, flickr, picasa, piwigo, youtube, gallery3, rajce, tumblr, yandex"
+fi
+
+
+if test "$xenable_publishers" = "xall"; then :
+  enable_publishers="facebook, flickr, picasa, piwigo, youtube, gallery3, rajce, tumblr, yandex"
+fi
+
+save_ifs=$IFS
+IFS=,
+PUBLISHER_VALAFLAGS=""
+ENABLED_PUBLISHERS=""
+for publisher in $enable_publishers; do
+    case $publisher in
+        *facebook*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_FACEBOOK"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS facebook"
+        ;;
+        *flickr*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_FLICKR"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS flickr"
+        ;;
+        *picasa*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_PICASA"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS picasa"
+        ;;
+        *piwigo*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_PIWIGO"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS piwigo"
+        ;;
+        *youtube*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_YOUTUBE"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS youtube"
+        ;;
+        *gallery3*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_GALLERY3"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS gallery3"
+        ;;
+        *rajce*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_RAJCE"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS rajce"
+        ;;
+        *tumblr*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_TUMBLR"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS tumblr"
+        ;;
+        *yandex*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_YANDEX"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS yandex"
+        ;;
+        *)
+        ;;
+    esac
+done
+IFS=$save_ifs
+
+
+
 # Check whether --enable-extra-plugins was given.
 if test "${enable_extra_plugins+set}" = set; then :
   enableval=$enable_extra_plugins;
@@ -17198,6 +17328,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
   as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${IS_NDEBUG_TRUE}" && test -z "${IS_NDEBUG_FALSE}"; then
+  as_fn_error $? "conditional \"IS_NDEBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -17210,6 +17344,18 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${AUTHENTICATOR_SHOTWELL_TRUE}" && test -z "${AUTHENTICATOR_SHOTWELL_FALSE}"; then
+  as_fn_error $? "conditional \"AUTHENTICATOR_SHOTWELL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${AUTHENTICATOR_GOA_TRUE}" && test -z "${AUTHENTICATOR_GOA_FALSE}"; then
+  as_fn_error $? "conditional \"AUTHENTICATOR_GOA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${AUTHENTICATOR_UOA_TRUE}" && test -z "${AUTHENTICATOR_UOA_FALSE}"; then
+  as_fn_error $? "conditional \"AUTHENTICATOR_UOA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_UNITY_TRUE}" && test -z "${HAVE_UNITY_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_UNITY\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -17615,7 +17761,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by shotwell $as_me 0.25.4, which was
+This file was extended by shotwell $as_me 0.26.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17681,7 +17827,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-shotwell config.status 0.25.4
+shotwell config.status 0.26.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -19504,4 +19650,6 @@ echo "  Prefix ............................... : ${prefix}"
 echo "  Libdir ............................... : ${libdir}"
 echo "  Unity support ........................ : ${HAVE_UNITY}"
 echo "  Additional publishing plugins ........ : ${HAVE_EXTRA_PLUGINS}"
+echo "  Authentication library ............... : ${with_authenticator}"
+echo "  Publishers ........................... : ${ENABLED_PUBLISHERS}"
 echo ""