build: Do not use the configurator for meson

meson does the feature detection itself and we don't have to rely on
the configurator. So don't use it.

To avoid touching the ccan files, we have to rethink our config.h to
libnvme-config.h rename change. Since the ccan files include
'config.h' we have to use the second option to avoid including it into
external include paths. This is moving the config.h file into a
private folder and drop the include path '.'.

Signed-off-by: Daniel Wagner <[email protected]>

Author: dwsuse

ccan/meson.build

@@ -11,19 +11,3 @@ sources += files([
     'ccan/str/debug.c',
     'ccan/str/str.c',
 ])
-
-configurator = executable(
-    'configurator',
-    ['tools/configurator/configurator.c'],
-    c_args: ['-D_GNU_SOURCE'],
-    include_directories: incdir,
-)
-
-config_h = custom_target(
-    'config.h',
-    output:  'config.h',
-    capture: true,
-    command: [configurator, ]
-)
-
-

examples/meson.build

@@ -7,7 +7,7 @@
 #
 executable(
     'telemetry-listen',
-    ['telemetry-listen.c', config_h],
+    ['telemetry-listen.c'],
     link_with: libnvme,
     include_directories: incdir)
 
@@ -19,7 +19,7 @@ executable(
 
 executable(
     'discover-loop',
-    ['discover-loop.c', config_h],
+    ['discover-loop.c'],
     link_with: libnvme,
     include_directories: incdir)
 

libnvme/meson.build

@@ -19,7 +19,7 @@ endif
 if have_python_support
     pymod_swig = custom_target(
         'nvme.py',
-        input:   ['nvme.i', config_h],
+        input:   ['nvme.i'],
         output:  ['nvme.py', 'nvme_wrap.c'],
         command: [swig, '-python', '-py3', '-o', '@OUTPUT1@', '@INPUT0@'],
         install: true,

meson.build

@@ -120,11 +120,6 @@ conf.set10(
     description: 'Is isblank() available?'
 )
 
-configure_file(
-    output: 'libnvme-config.h',
-    configuration: conf
-)
-
 ################################################################################
 substs = configuration_data()
 substs.set('NAME',    meson.project_name())
@@ -138,8 +133,8 @@ configure_file(
 
 ################################################################################
 add_project_arguments(['-fomit-frame-pointer', '-D_GNU_SOURCE',
-                       '-include', 'libnvme-config.h'], language : 'c')
-incdir = include_directories(['.', 'ccan', 'src'])
+                       '-include', 'config.h'], language : 'c')
+incdir = include_directories(['ccan', 'src'])
 
 ################################################################################
 sources = []

src/meson.build

@@ -5,6 +5,11 @@
 #
 # Authors: Martin Belanger <[email protected]>
 #
+configure_file(
+    output: 'config.h',
+    configuration: conf
+)
+
 sources += [
     'nvme/cleanup.c',
     'nvme/fabrics.c',
@@ -14,7 +19,6 @@ sources += [
     'nvme/log.c',
     'nvme/tree.c',
     'nvme/util.c',
-    config_h,
 ]
 
 if conf.get('CONFIG_JSONC')

test/meson.build

@@ -7,7 +7,7 @@
 #
 main = executable(
     'main-test',
-    ['test.c', config_h],
+    ['test.c'],
     dependencies: libuuid,
     link_with: libnvme,
     include_directories: incdir
@@ -22,14 +22,14 @@ cpp = executable(
 
 register = executable(
     'test-register',
-    ['register.c', config_h],
+    ['register.c'],
     link_with: libnvme,
     include_directories: incdir
 )
 
 zns = executable(
     'test-zns',
-    ['zns.c', config_h],
+    ['zns.c'],
     link_with: libnvme,
     include_directories: incdir
 )