patch, 2 partsmeson: wire up contrib/credential

contrib/credential/meson.build, contrib/credential/wincred/git-credential-wincred.c, contrib/credential/wincred/meson.build, contrib/meson.build, meson_options.txt

diff --git a/contrib/credential/meson.build b/contrib/credential/meson.build
new file mode 100644
index 00000000000..4017ae3fa88
--- /dev/null
+++ b/contrib/credential/meson.build
@@ -0,0 +1,3 @@
+if get_option('credential_wincred')
+  subdir('wincred')
+endif
diff --git a/contrib/credential/wincred/git-credential-wincred.c b/contrib/credential/wincred/git-credential-wincred.c
index 4be0d58cd89..04145b51183 100644
--- a/contrib/credential/wincred/git-credential-wincred.c
+++ b/contrib/credential/wincred/git-credential-wincred.c
@@ -12,7 +12,9 @@
 
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
 
+#ifndef _MSC_VER
 __attribute__((format (printf, 1, 2)))
+#endif
 static void die(const char *err, ...)
 {
 	char msg[4096];
diff --git a/contrib/credential/wincred/meson.build b/contrib/credential/wincred/meson.build
new file mode 100644
index 00000000000..8c59d47174e
--- /dev/null
+++ b/contrib/credential/wincred/meson.build
@@ -0,0 +1 @@
+executable('git-credential-wincred', 'git-credential-wincred.c')
diff --git a/contrib/meson.build b/contrib/meson.build
index d74b64a5181..c414c98d5a7 100644
--- a/contrib/meson.build
+++ b/contrib/meson.build
@@ -1,3 +1,4 @@
 foreach feature : get_option('contrib')
   subdir(feature)
 endforeach
+subdir('credential')
diff --git a/meson_options.txt b/meson_options.txt
index 5c12e9055e6..7554528482a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -29,6 +29,8 @@ option('version', type: 'string', value: '',
 # Features supported by Git.
 option('contrib', type: 'array', value: [ 'completion' ], choices: [ 'completion', 'subtree' ],
   description: 'Contributed features to include.')
+option('credential_wincred', type: 'boolean', value: false,
+  description: 'Build helper git-credential-wincred. Requires Windows SDK.')
 option('curl', type: 'feature', value: 'enabled',
   description: 'Build helpers used to access remotes with the HTTP transport.')
 option('expat', type: 'feature', value: 'enabled',

contrib/credential/libsecret/meson.build, contrib/credential/meson.build, meson_options.txt

diff --git a/contrib/credential/libsecret/meson.build b/contrib/credential/libsecret/meson.build
new file mode 100644
index 00000000000..92349be0ee8
--- /dev/null
+++ b/contrib/credential/libsecret/meson.build
@@ -0,0 +1,3 @@
+glib = dependency('glib-2.0')
+libsecret = dependency('libsecret-1')
+executable('git-credential-libsecret', 'git-credential-libsecret.c', dependencies: [glib, libsecret])
diff --git a/contrib/credential/meson.build b/contrib/credential/meson.build
index 4017ae3fa88..bedc76b96f2 100644
--- a/contrib/credential/meson.build
+++ b/contrib/credential/meson.build
@@ -1,3 +1,6 @@
 if get_option('credential_wincred')
   subdir('wincred')
 endif
+if get_option('credential_libsecret')
+  subdir('libsecret')
+endif
diff --git a/meson_options.txt b/meson_options.txt
index 7554528482a..69e386afc2a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -29,6 +29,8 @@ option('version', type: 'string', value: '',
 # Features supported by Git.
 option('contrib', type: 'array', value: [ 'completion' ], choices: [ 'completion', 'subtree' ],
   description: 'Contributed features to include.')
+option('credential_libsecret', type: 'boolean', value: false,
+  description: 'Build helper git-credential-libsecret. Requires GLib and libsecret.')
 option('credential_wincred', type: 'boolean', value: false,
   description: 'Build helper git-credential-wincred. Requires Windows SDK.')
 option('curl', type: 'feature', value: 'enabled',