Merge tag 'upstream/0.26.0'

Upstream version 0.26.0

1 files changed, 100 insertions, 9 deletions

diff --git a/configure.ac b/configure.ac
index ebd74e6..21e87f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,13 +5,13 @@ dnl ***********************************************************************
 dnl Define Versioning Information
 dnl ***********************************************************************
 m4_define([major_version],[0])
-m4_define([minor_version],[25])
-m4_define([micro_version],[4])
+m4_define([minor_version],[26])
+m4_define([micro_version],[0])
 m4_define([package_version],[major_version.minor_version.micro_version])
 m4_define([bug_report_url],[https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell])
 m4_define([api_version],[major_version])
 
-AX_IS_RELEASE([micro-version])
+AX_IS_RELEASE([git-directory])
 
 m4_define([git_version],[m4_esyscmd(git rev-parse HEAD 2>/dev/null)])
 
@@ -50,9 +50,12 @@ AX_GENERATE_CHANGELOG
 dnl ***********************************************************************
 dnl Add extra debugging with --enable-debug and --enable-compile-warnings
 dnl ***********************************************************************
-AX_CHECK_ENABLE_DEBUG([no],[]
-                      [G_DISABLE_ASSERT G_DISABLE_CHECKS G_DISABLE_CAST_CHECKS])
-
+AC_ARG_ENABLE(debug,
+              [AS_HELP_STRING([--enable-debug],[compile with debugging]),
+              [], enable_debug=no])
+enable_debug=${enable_debug-no}
+AS_IF([test "x$enable_debug" = "xyes"],[CFLAGS="${CFLAGS} -g -O0"])
+AM_CONDITIONAL([IS_NDEBUG], [test "x$enable_debug" != "xyes"])
 
 dnl ***********************************************************************
 dnl Internationalization
@@ -81,6 +84,23 @@ VALAFLAGS="-g"
 AC_SUBST([VALAFLAGS])
 
 dnl ***********************************************************************
+dnl Check for authenticator
+dnl ***********************************************************************
+AC_ARG_WITH([authenticator],
+            AS_HELP_STRING([--with-authenticator=@<:@shotwell@:>@]
+                           [Which authentication back-end to use (defaul: shotwell)]),
+                           [with_authenticator=$withval],
+                           [with_authenticator=shotwell])
+AS_IF([test "x$with_authenticator" != "xshotwell"],
+            [AC_MSG_NOTICE([Unknown authenticator $[]with_authenticator, using shotwell])
+             with_authenticator="shotwell"
+            ])
+
+AM_CONDITIONAL([AUTHENTICATOR_SHOTWELL],[test "x$with_authenticator" = "xshotwell"])
+AM_CONDITIONAL([AUTHENTICATOR_GOA],[test "x$with_authenticator" = "xgoa"])
+AM_CONDITIONAL([AUTHENTICATOR_UOA],[test "x$with_authenticator" = "xuoa"])
+
+dnl ***********************************************************************
 dnl Check for required packages
 dnl ***********************************************************************
 PKG_CHECK_MODULES(SHOTWELL, [
@@ -98,10 +118,8 @@ PKG_CHECK_MODULES(SHOTWELL, [
                              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
                             ])
 PKG_CHECK_MODULES(THUMBNAILER, [gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
                                 gstreamer-base-1.0 >= 1.0.0])
@@ -113,11 +131,19 @@ PKG_CHECK_MODULES(IMPORT, [gee-0.8 >= 0.8.5 glib-2.0 gio-2.0 sqlite3])
 
 PKG_CHECK_MODULES(PUBLISHING, [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])
+                               webkit2gtk-4.0 gcr-3 gcr-ui-3 libgdata])
 
 PKG_CHECK_MODULES(TRANSITIONS, [gobject-2.0 cairo gio-2.0 gdk-pixbuf-2.0
                                 gdk-3.0])
 
+AS_IF([test "x$with_authenticator" = "xshotwell"],
+      [
+        PKG_CHECK_MODULES(AUTHENTICATOR, [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])
+        AC_SUBST(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"])
+      ])
+
 dnl ***********************************************************************
 dnl Unity support
 dnl ***********************************************************************
@@ -140,6 +166,69 @@ AC_SUBST([HAVE_UNITY])
 AM_CONDITIONAL([HAVE_UNITY],[test "x$HAVE_UNITY" = "xyes"])
 
 dnl ***********************************************************************
+dnl Publishers
+dnl ***********************************************************************
+
+m4_define(ALL_PUBLISHERS, [facebook, flickr, picasa, piwigo, youtube, gallery3, rajce, tumblr, yandex])
+AC_ARG_ENABLE([publishers],
+            AS_HELP_STRING([--enable-publishers=@<:@list-of-publishers or all@:>@],
+                           [A comma-separated list of publishers from ALL_PUBLISHERS]),
+            [],[enable_publishers="ALL_PUBLISHERS"])
+
+AS_IF([test "$xenable_publishers" = "xall"],
+      [enable_publishers="ALL_PUBLISHERS"],[])
+
+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
+AC_SUBST([PUBLISHER_VALAFLAGS])
+
+
+dnl ***********************************************************************
 dnl Extra publishing plugins
 dnl ***********************************************************************
 AC_ARG_ENABLE([extra-plugins],
@@ -199,4 +288,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 ""