Add S3 features to git-annex version output.

diff --git a/BuildFlags.hs b/BuildFlags.hs
index dfebedb61fce7a38552faf4bca59a339a68be292..da7cd22510d0a219cc3e8e8400f9581e54ede706 100644 (file)
--- a/BuildFlags.hs
+++ b/BuildFlags.hs
@@ -37,6 +37,12 @@ buildFlags = filter (not . null)
 #endif
 #ifdef WITH_S3
        , "S3"
+#if MIN_VERSION_aws(0,10,6)
+               ++ "(multipartupload)"
+#endif
+#if MIN_VERSION_aws(0,13,0)
+               ++ "(storageclasses)"
+#endif
 #else
 #warning Building without S3.
 #endif

diff --git a/debian/changelog b/debian/changelog
index 1ed8e37852c0d3a61c6e9b3d0904977d382eafd8..e12c9a5fea3eaecb90bbf0d8e8df0de92b329474 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-annex (5.20151209) UNRELEASED; urgency=medium
+
+  * Add S3 features to git-annex version output.
+
+ -- Joey Hess <id@joeyh.name>  Thu, 10 Dec 2015 11:39:34 -0400
+
 git-annex (5.20151208) unstable; urgency=medium
 
   * Build with -j1 again to get reproducible build.