From 7cee973016866f1aa8dc40e218cbd7fe2e200acc Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Thu, 7 Oct 2021 09:21:31 +0200
Subject: Meson: Get Xgandalf via wrap

---
 INSTALL.md                | 8 +++++++-
 libcrystfel/meson.build   | 4 +++-
 subprojects/xgandalf.wrap | 8 ++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 subprojects/xgandalf.wrap

diff --git a/INSTALL.md b/INSTALL.md
index df4aeccd..7e1be821 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -77,12 +77,18 @@ algorithm.  Provided that FFTW is available, you will also have access to the
 `asdf` algorithm.  The more of the following are additionally installed, the
 better your experience will be:
 
-* [XGandalf](https://stash.desy.de/users/gevorkov/repos/xgandalf)
+* [XGandalf](https://stash.desy.de/users/gevorkov/repos/xgandalf) \[\*\]
 * [PinkIndexer](https://stash.desy.de/users/gevorkov/repos/pinkindexer)
 * [Mosflm](https://www.mrc-lmb.cam.ac.uk/mosflm/mosflm/)
 * [DirAx](http://www.crystal.chem.uu.nl/distr/dirax/)
 * [XDS](http://xds.mpimf-heidelberg.mpg.de/)
 
+As above, if you compile using Meson, dependencies marked with \[\*\] above
+will be downloaded and compiled automatically if they are not available on the
+system.  If you don't want this, add option `--wrap-mode=nofallback` when
+invoking Meson.  See the Meson manual for other possibilities, such as using
+locally-provided files instead of downloading them.
+
 The indexing engines have their own installation instructions.  Mosflm, DirAx
 and XDS can be installed at any time before or after installing CrystFEL, but
 XGandalf and PinkIndexer need to be installed in advance.  If you install them
diff --git a/libcrystfel/meson.build b/libcrystfel/meson.build
index 65a30f6a..5c8a0652 100644
--- a/libcrystfel/meson.build
+++ b/libcrystfel/meson.build
@@ -17,7 +17,9 @@ if ncursesdep.found()
   conf_data.set10('HAVE_CURSES', 1)
 endif
 
-xgandalfdep = dependency('xgandalf', required: false)
+xgandalfdep = dependency('xgandalf',
+                         required: false,
+                         fallback: ['xgandalf', 'xgandalf_dep'])
 if xgandalfdep.found()
   conf_data.set10('HAVE_XGANDALF', 1)
 endif
diff --git a/subprojects/xgandalf.wrap b/subprojects/xgandalf.wrap
new file mode 100644
index 00000000..22d9b980
--- /dev/null
+++ b/subprojects/xgandalf.wrap
@@ -0,0 +1,8 @@
+[wrap-git]
+directory = xgandalf
+url = https://gitlab.desy.de/thomas.white/xgandalf.git
+revision = main
+depth = 1
+
+[provide]
+xgandalf = xgandalf_dep
-- 
cgit v1.2.3