From 75d9c9a12d54e0875975158dec8ee84628141fe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Sun, 1 Dec 2019 15:51:57 +0100
Subject: [PATCH] tllist: add git submodule directly under subprojects

Meson now falls back to a system dependency if the subproject isn't
available.
---
 .gitmodules        | 3 +++
 meson.build        | 7 ++++++-
 subprojects/tllist | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 160000 subprojects/tllist

diff --git a/.gitmodules b/.gitmodules
index 0235ef9..1dbfd77 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,3 +2,6 @@
 	path = external/wlr-protocols
 	url = https://github.com/swaywm/wlr-protocols.git
 	branch = master
+[submodule "subprojects/tllist"]
+	path = subprojects/tllist
+	url = https://codeberg.org/dnkl/tllist.git
diff --git a/meson.build b/meson.build
index 0a59f09..2d17375 100644
--- a/meson.build
+++ b/meson.build
@@ -57,7 +57,12 @@ if backend_x11
   install_headers('xcb.h', subdir: 'yambar')
 endif
 
-tllist = subproject('tllist').get_variable('tllist')
+tllist_proj = subproject('tllist', required: false)
+if tllist_proj.found()
+  tllist = tllist_proj.get_variable('tllist')
+else
+  tllist = dependency('tllist')
+endif
 
 subdir('completions')
 subdir('doc')
diff --git a/subprojects/tllist b/subprojects/tllist
new file mode 160000
index 0000000..5054d3d
--- /dev/null
+++ b/subprojects/tllist
@@ -0,0 +1 @@
+Subproject commit 5054d3dbbbd7d76e35f9d0d875e3c7f500fde52b