Meson: Replace '1' with 'true' inside conf_data.set10

Use of numbers (rather than booleans) in this routine is deprecated in
recent meson versions.

2 files changed, 21 insertions, 21 deletions

diff --git a/libcrystfel/meson.build b/libcrystfel/meson.build
index 5f6a32e5..780bdb77 100644
--- a/libcrystfel/meson.build
+++ b/libcrystfel/meson.build
@@ -5,7 +5,7 @@ if zlibdep.found()
   if cc.has_function('gzbuffer',
                      prefix: '#include <zlib.h>',
                      dependencies: zlibdep)
-    conf_data.set10('HAVE_GZBUFFER', 1)
+    conf_data.set10('HAVE_GZBUFFER', true)
   endif
 else
   zlibproj = subproject('zlib')
@@ -13,49 +13,49 @@ else
   # Cannot check for gzbuffer in this case, because Zlib won't be built
   # until compile time.  However, we already know that the wrap version is
   # new enough
-  conf_data.set10('HAVE_GZBUFFER', 1)
+  conf_data.set10('HAVE_GZBUFFER', true)
 endif
 
 if zlibdep.found()
-  conf_data.set10('HAVE_ZLIB', 1)
+  conf_data.set10('HAVE_ZLIB', true)
 endif
 
 fftwdep = dependency('fftw3', required: false)
 if fftwdep.found()
-  conf_data.set10('HAVE_FFTW', 1)
+  conf_data.set10('HAVE_FFTW', true)
 endif
 
 xgandalfdep = dependency('xgandalf',
                          required: false,
                          fallback: ['xgandalf', 'xgandalf_dep'])
 if xgandalfdep.found()
-  conf_data.set10('HAVE_XGANDALF', 1)
+  conf_data.set10('HAVE_XGANDALF', true)
 endif
 
 pinkindexerdep = dependency('pinkIndexer',
                             required: false,
                             fallback: ['pinkindexer', 'pinkindexer_dep'])
 if pinkindexerdep.found()
-  conf_data.set10('HAVE_PINKINDEXER', 1)
+  conf_data.set10('HAVE_PINKINDEXER', true)
 endif
 
 fdipdep = dependency('fdip',
                      required: false,
                      fallback: ['fdip', 'fdip_dep'])
 if fdipdep.found()
-  conf_data.set10('HAVE_FDIP', 1)
+  conf_data.set10('HAVE_FDIP', true)
 endif
 
 ccp4dep = dependency('libccp4c',
                      required: false,
                      fallback: ['libccp4c', 'libccp4c_dep'])
 if ccp4dep.found()
-  conf_data.set10('HAVE_LIBCCP4', 1)
+  conf_data.set10('HAVE_LIBCCP4', true)
 endif
 
 msgpackdep = dependency('msgpack', required: false)
 if msgpackdep.found()
-  conf_data.set10('HAVE_MSGPACK', 1)
+  conf_data.set10('HAVE_MSGPACK', true)
 endif
 
 
@@ -68,9 +68,9 @@ libcrystfel_includes = include_directories('src')
 # Find forkpty()
 utildep = cc.find_library('util', required: true)
 if cc.has_function('forkpty', dependencies: utildep, prefix: '#include <pty.h>')
-  conf_data.set10('HAVE_FORKPTY_PTY_H', 1)
+  conf_data.set10('HAVE_FORKPTY_PTY_H', true)
 elif cc.has_function('forkpty', dependencies: utildep, prefix: '#include <util.h>')
-  conf_data.set10('HAVE_FORKPTY_UTIL_H', 1)
+  conf_data.set10('HAVE_FORKPTY_UTIL_H', true)
 else
   error('Couldn\'t find forkpty()')
 endif
diff --git a/meson.build b/meson.build
index d7b04aae..be0f6477 100644
--- a/meson.build
+++ b/meson.build
@@ -24,7 +24,7 @@ pthreaddep = dependency('threads', required: true)
 # Find HDF5 using inbuilt Meson methods.  Requires Meson >= 0.50.0
 hdf5dep = dependency('hdf5', language: 'c', required: get_option('hdf5'))
 if hdf5dep.found()
-  conf_data.set10('HAVE_HDF5', 1)
+  conf_data.set10('HAVE_HDF5', true)
   # Request HDF5 1.10-style API
   add_project_arguments('-DH5_USE_110_API', language: 'c')
   add_project_arguments('-DH5O_GET_INFO_BY_IDX1', language: 'c')
@@ -32,45 +32,45 @@ endif
 
 fftwdep = dependency('fftw3', required: false)
 if fftwdep.found()
-  conf_data.set10('HAVE_FFTW', 1)
+  conf_data.set10('HAVE_FFTW', true)
 endif
 
 gtkdep = dependency('gtk+-3.0', required: false)
 if gtkdep.found()
   add_project_arguments('-Wno-deprecated-declarations', language: 'c')
-  conf_data.set10('HAVE_GTK', 1)
+  conf_data.set10('HAVE_GTK', true)
 endif
 
 gdkdep = dependency('gdk-3.0', required: false)
 if gdkdep.found()
-  conf_data.set10('HAVE_GDK', 1)
+  conf_data.set10('HAVE_GDK', true)
 endif
 
 gdkpixbufdep = dependency('gdk-pixbuf-2.0', required: false)
 if gdkpixbufdep.found()
-  conf_data.set10('HAVE_GDKPIXBUF', 1)
+  conf_data.set10('HAVE_GDKPIXBUF', true)
 endif
 
 cairodep = dependency('cairo', required: false)
 if cairodep.found()
-  conf_data.set10('HAVE_CAIRO', 1)
+  conf_data.set10('HAVE_CAIRO', true)
 endif
 
 opencldep = dependency('OpenCL', required: get_option('opencl'))
 if opencldep.found()
-  conf_data.set10('HAVE_OPENCL', 1)
+  conf_data.set10('HAVE_OPENCL', true)
   if cc.has_header('CL/cl.h', dependencies: opencldep)
-    conf_data.set10('HAVE_CL_CL_H', 1)
+    conf_data.set10('HAVE_CL_CL_H', true)
   endif
 endif
 
 zmqdep = dependency('libzmq', required: false)
 if zmqdep.found()
-  conf_data.set10('HAVE_ZMQ', 1)
+  conf_data.set10('HAVE_ZMQ', true)
 endif
 
 if cc.has_function('clock_gettime', prefix: '#include <time.h>')
-  conf_data.set10('HAVE_CLOCK_GETTIME', 1)
+  conf_data.set10('HAVE_CLOCK_GETTIME', true)
 endif
 
 # ************************ libcrystfel (subdir) ************************