Fixups for the c_std-options

Also removed an arg that is not allowed in muon and ignored by meson

meson.build

@@ -81,8 +81,12 @@ endif
 
 if cc.has_argument('--std=gnu99')
   add_project_arguments('--std=gnu99', language: ['c', 'cpp'])
+  lang_opt = ['c_std=gnu99']
 elif cc.has_argument('--std=c99')
   add_project_arguments('--std=c99', language: ['c', 'cpp'])
+  lang_opt = ['c_std=c99']
+else
+  lang_opt = []
 endif
 
 # Sanitize correct usage of rz_strf()
@@ -175,15 +179,15 @@ cmake_package_relative_path = run_command(py3_exe, cmake_package_prefix_dir_py,
 subproject_clean_error_msg = 'Subprojects are not updated. Please run `git clean -dxff subprojects/` to delete all local subprojects directories. If you want to compile against current subprojects then set option `subprojects_check=false`.'
 
 # handle capstone dependency
-capstone_dep = dependency('capstone', version: '>=4.0.2', required: get_option('use_sys_capstone'), static: is_static_build)
+capstone_dep = dependency('capstone', version: '>=4.0.2', required: get_option('use_sys_capstone'), static: is_static_build, default_options: lang_opt)
 if not capstone_dep.found()
   capstone_version = get_option('use_capstone_version')
   if fs.is_file('subprojects/capstone-' + capstone_version + '.wrap')
     r = run_command(py3_exe, check_meson_subproject_py, 'capstone-' + capstone_version, check: false)
     if r.returncode() == 1 and get_option('subprojects_check')
       error(subproject_clean_error_msg)
     endif
-    capstone_proj = subproject('capstone-' + capstone_version, default_options: ['default_library=static'])
+    capstone_proj = subproject('capstone-' + capstone_version, default_options: ['default_library=static'] + lang_opt)
   else
     error('Wrong capstone version selected. Please use one of the supported versions.')
   endif
@@ -355,7 +359,7 @@ foreach it : ccs
   have_pthread = it_th.found() and it_machine.system() != 'windows'
   if it_machine.system() == 'sunos'
     # workaround for Solaris until https://github.com/mesonbuild/meson/issues/4328 is fixed
-    it_mth = declare_dependency(link_args: '-lm', native: it_native)
+    it_mth = declare_dependency(link_args: '-lm')
   else
     it_mth = it_cc.find_library('m', required: false, static: is_static_build)
   endif
@@ -631,13 +635,13 @@ if r.returncode() == 1 and get_option('subprojects_check')
   error(subproject_clean_error_msg)
 endif
 
-libzip_dep = dependency('libzip', required: get_option('use_sys_libzip'), static: is_static_build)
+libzip_dep = dependency('libzip', required: get_option('use_sys_libzip'), static: is_static_build, default_options: lang_opt)
 if not libzip_dep.found()
   libzip_proj = subproject('libzip', default_options: [
     'default_library=static',
     'static_runtime=@0@'.format(is_static_build),
     'use_sys_openssl=@0@'.format(get_option('use_sys_libzip_openssl')),
-  ])
+  ] + lang_opt)
   libzip_dep = libzip_proj.get_variable('libzip_dep')
 endif
 

subprojects/rzar/meson.build

@@ -1,16 +1,21 @@
 project('rzar', 'c',
   license: 'LGPL-3.0-only',
   meson_version: '>=0.55.0',
-  default_options: [
-    'c_std=c99',
-  ]
 )
 
 # handle ar dependency
 ar_files = [
   'ar.c'
 ]
 
+cc = meson.get_compiler('c')
+
+if cc.has_argument('--std=gnu99')
+  add_project_arguments('--std=gnu99', language: ['c', 'cpp'])
+elif cc.has_argument('--std=c99')
+  add_project_arguments('--std=c99', language: ['c', 'cpp'])
+endif
+
 rz_util_dep = dependency('rz_util')
 ar_inc = [include_directories(['.'])]
 

subprojects/rzwinkd/meson.build

@@ -1,9 +1,6 @@
 project('rzwinkd', 'c',
   license: 'LGPL-3.0-only',
   meson_version: '>=0.55.0',
-  default_options: [
-    'c_std=c99',
-  ]
 )
 
 cc = meson.get_compiler('c')
@@ -16,6 +13,12 @@ winkd_files = [
   'winkd.c',
 ]
 
+if cc.has_argument('--std=gnu99')
+  add_project_arguments('--std=gnu99', language: ['c', 'cpp'])
+elif cc.has_argument('--std=c99')
+  add_project_arguments('--std=c99', language: ['c', 'cpp'])
+endif
+
 winkd_inc = [include_directories('.')]
 
 rz_util_dep = dependency('rz_util')