meson: require newest meson and revert m4 patch

This reverts 78b68dcb55.

diff --git a/meson.build b/meson.build
index 06cb3baefc69ec25944be2b4475adc15e1dd1a83..71cc431157cd9e24e96c33edc5e4bb099886d001 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -7,7 +7,7 @@ project('systemd', 'c',
                 'sysconfdir=/etc',
                 'localstatedir=/var',
         ],
-        meson_version : '>= 0.39.1',
+        meson_version : '>= 0.40',
        )
 
 # We need the same data in three different formats, ugh!
@@ -435,7 +435,7 @@ endif
 sed = find_program('sed')
 grep = find_program('grep')
 awk = find_program('awk')
-m4 = find_program('/usr/bin/m4')
+m4 = find_program('m4')
 stat = find_program('stat')
 git = find_program('git', required : false)
 etags = find_program('etags', required : false)