From: Caio Marcelo de Oliveira Filho <cmarcelo@gmail.com>
Date: Mon, 19 Feb 2018 09:37:19 +0000 (-0800)
Subject: meson: use multiline string syntax (#8214)
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=cf6df4681f466a9716e2ae5a0dfaf9f1b96b6145;p=elogind.git

meson: use multiline string syntax (#8214)

The single quote working with multiple lines is likely to be unintended. With
current versions of meson, it also causes error messages after it to report the
wrong line number. Use the documented syntax instead.

(cherry picked from commit 9e70f2f81821efa4797d89c06d1f04c11e86015e)
---

diff --git a/meson.build b/meson.build
index e11b3ff82..05bbcc67d 100644
--- a/meson.build
+++ b/meson.build
@@ -167,6 +167,8 @@ modprobedir = join_paths(rootprefixdir, 'lib/modprobe.d')
 # systemdstatedir = join_paths(localstatedir, 'lib/systemd')
 # catalogstatedir = join_paths(systemdstatedir, 'catalog')
 # randomseeddir = join_paths(localstatedir, 'lib/systemd')
+# 
+# docdir = get_option('docdir')
 # if docdir == ''
 #         docdir = join_paths(datadir, 'doc/systemd')
 # endif
@@ -410,7 +412,7 @@ foreach arg : ['unused-parameter',
         endif
 endforeach
 
-if cc.compiles('
+if cc.compiles('''
    #include <time.h>
    #include <inttypes.h>
    typedef uint64_t usec_t;
@@ -419,7 +421,7 @@ if cc.compiles('
            struct timespec now;
            return 0;
    }
-', name : '-Werror=shadow with local shadowing')
+''', name : '-Werror=shadow with local shadowing')
         add_project_arguments('-Werror=shadow', language : 'c')
 endif