From f011c58c95953586bcf71203bde70fc963af1297 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Fri, 31 Jul 2020 17:18:37 +0200
Subject: Xgandalf/PinkIndexer/FDIP now have pkg-config

---
 libcrystfel/meson.build | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

(limited to 'libcrystfel')

diff --git a/libcrystfel/meson.build b/libcrystfel/meson.build
index f5dc15e4..0736992d 100644
--- a/libcrystfel/meson.build
+++ b/libcrystfel/meson.build
@@ -17,34 +17,20 @@ if ncursesdep.found()
   conf_data.set10('HAVE_CURSES', 1)
 endif
 
-xgandalfdep = cc.find_library('xgandalf', required: false)
-if xgandalfdep.found() and cc.has_function('IndexerPlain_index',
-                                           prefix: '#include <xgandalf/adaptions/crystfel/IndexerPlain.h>',
-                                           dependencies: xgandalfdep)
+xgandalfdep = dependency('xgandalf', required: false)
+if xgandalfdep.found()
   conf_data.set10('HAVE_XGANDALF', 1)
-else
-  xgandalfdep = dependency('', required: false)
 endif
 
-pinkindexerdep = dependency('', required: false)
-#pinkindexerdep = cc.find_library('pinkIndexer', required: false)
-#if pinkindexerdep.found() and cc.has_function('PinkIndexer_indexPattern',
-#                                              prefix: '#include <pinkIndexer/adaptions/crystfel/PinkIndexer.h>',
-#                                              dependencies: pinkindexerdep)
-#  conf_data.set10('HAVE_PINKINDEXER', 1)
-#else
-#  pinkindexerdep = dependency('', required: false)
-#endif
-
-fdipdep = dependency('', required: false)
-#fdipdep = cc.find_library('fastDiffractionImageProcessing', required: false)
-#if fdipdep.found() and cc.has_function('allocatePeakList',
-#                                       prefix: '#include <fastDiffractionImageProcessing/peakList.h>',
-#                                       dependencies: fdipdep)
-#  conf_data.set10('HAVE_FDIP', 1)
-#else
-#  fdipdep = dependency('', required: false)
-#endif
+pinkindexerdep = dependency('pinkIndexer', required: false)
+if pinkindexerdep.found()
+  conf_data.set10('HAVE_PINKINDEXER', 1)
+endif
+
+fdipdep = dependency('fastDiffractionImageProcessing', required: false)
+if fdipdep.found()
+  conf_data.set10('HAVE_FDIP', 1)
+endif
 
 libcrystfel_versionc = vcs_tag(input: 'src/libcrystfel-version.c.in',
                                output: 'libcrystfel-version.c')
-- 
cgit v1.2.3