Merge branch 'meson' into 'master'

meson: do a build-time check for strlcpy before attempting runtime check

See merge request GNOME/glib!724

meson.build

@@ -1859,9 +1859,11 @@ if host_system != 'windows' and get_option('xattr')
   endif
 endif
 
-# Test if we have strlcpy/strlcat with a compatible implementation:
-# https://bugzilla.gnome.org/show_bug.cgi?id=53933
-if cc_can_run
+# If strlcpy is present (BSD and similar), check that it conforms to the BSD
+# specification. Specifically Solaris 8's strlcpy() does not, see
+# https://bugzilla.gnome.org/show_bug.cgi?id=53933 for further context.
+if cc.has_function('strlcpy')
+  if cc_can_run
     rres = cc.run('''#include <stdlib.h>
                     #include <string.h>
                     int main() {
@@ -1875,8 +1877,9 @@ if cc_can_run
     if rres.compiled() and rres.returncode() == 0
       glib_conf.set('HAVE_STRLCPY', 1)
     endif
-elif meson.get_cross_property('have_strlcpy', false)
+  elif meson.get_cross_property('have_strlcpy', false)
     glib_conf.set('HAVE_STRLCPY', 1)
+  endif
 endif
 
 python = import('python').find_installation('python3')