Re: [PATCH] meson: fix vstorage driver build

It breaks on using - in VSTORAGE-MOUNT definition with: In file included from ../config.h:19:0, from ../src/util/viraudit.c:22: ./meson-config.h:180:17: error: ISO C99 requires whitespace after the macro name [-Werror] #define VSTORAGE-MOUNT "/usr/bin/vstorage-mount" ^ ./meson-config.h:180:0: error: "VSTORAGE" redefined [-Werror] #define VSTORAGE-MOUNT "/usr/bin/vstorage-mount" ^ ./meson-config.h:178:0: note: this is the location of the previous definition #define VSTORAGE "/usr/bin/vstorage" ^ #define VSTORAGE-MOUNT "/usr/bin/vstorage-mount" --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index b5277b4..aff2565 100644 --- a/meson.build +++ b/meson.build @@ -1974,7 +1974,7 @@ if conf.has('WITH_LIBVIRTD') conf.set('WITH_STORAGE_VSTORAGE', 1) foreach name : ['vstorage', 'vstorage-mount', 'umount'] path = get_variable('@0@ _prog'.format(name.underscorify())).path() - conf.set_quoted(name.to_upper(), path) + conf.set_quoted(name.underscorify().to_upper(), path) endforeach endif endif -- 1.8.3.1