summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2019-05-16 09:21:09 +0000
committerMichael Weiss <dev.primeos@gmail.com>2019-05-16 23:01:21 +0200
commit1cbec29f8e894967394b1d0a66f57260f70ecef9 (patch)
tree1ab75c84675139b99c486be6462d3356f5221fde
parent3b013f271931c3fe771e5a2c591f35d617de90f3 (diff)
downloadiputils-1cbec29f8e894967394b1d0a66f57260f70ecef9.tar.gz
build-sys: Only depend on Meson 0.39 instead of 0.44
The fallback keyword in vcs_tag() is only optional since Meson 0.41 [0]. and e.g. warning() required Meson 0.44 [1]. Meson 0.39 is enough to build iputils with the default configuration but more recent versions might be required for different configurations (we can adjust the requirement when we notice this). Meson should now print warnings like this one, which should help introducing new features that require a more recent version by accident: WARNING: Project targetting '>=0.41' but tried to use feature introduced in '0.44.0': warning [0]: https://mesonbuild.com/Release-notes-for-0-41-0.html [1]: https://mesonbuild.com/Reference-manual.html#warning
-rw-r--r--doc/meson.build2
-rw-r--r--meson.build4
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/meson.build b/doc/meson.build
index 9a007b3..8e1d75b 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -61,7 +61,7 @@ if xsltproc.found()
testrun = run_command([xsltproc, '--nonet', xsl])
if testrun.returncode() != 0
xsltproc_works = false
- warning('xsltproc: cannot process ' + xsl)
+ message('WARNING: xsltproc: cannot process ' + xsl)
endif
endforeach
endif
diff --git a/meson.build b/meson.build
index 95c778a..84e4360 100644
--- a/meson.build
+++ b/meson.build
@@ -3,6 +3,7 @@ project('iputils', 'c',
'c_std=c99',
'warning_level=3',
],
+ meson_version : '>=0.39',
version : 's20190515') # keep in sync with: git describe | awk -F- '{print $1}'
cc = meson.get_compiler('c')
@@ -211,7 +212,8 @@ endforeach
git_version_h = vcs_tag(
input : 'git-version.h.meson',
- output : 'git-version.h'
+ output : 'git-version.h',
+ fallback : meson.project_version()
)
config_h = configure_file(