glpk, libmicrohttpd, m4: build fixes

Author: bgilbert

subprojects/packagefiles/glpk/examples/meson.build

@@ -6,6 +6,7 @@ glpsol = executable(
   include_directories: inc,
   dependencies: [glpk_dep, libm_dep],
   install: true,
+  override_options: override_opts,
 )
 
 test(

subprojects/packagefiles/glpk/meson.build

@@ -3,8 +3,11 @@ project(
   'c',
   license: 'GPL-3.0-or-later',
   version: '5.0',
+  meson_version: '>=0.50.0',
 )
 
+override_opts = ['c_std=c89']
+
 cc = meson.get_compiler('c')
 
 deps = []

subprojects/packagefiles/glpk/meson.options renamed to subprojects/packagefiles/glpk/meson_options.txt

@@ -221,6 +221,7 @@ glpk = library(
   vs_module_defs: 'glpk.def',
   dependencies: deps,
   install: true,
+  override_options: override_opts,
 )
 
 install_headers('glpk.h')

subprojects/packagefiles/glpk/src/meson.build

@@ -2,6 +2,7 @@ project(
   'libmicrohttpd',
   'c',
   version: '0.9.77',
+  license: 'LGPL-2.1-or-later OR GPL-2.0-or-later WITH eCos-exception-2.0',
   meson_version: '>=0.49.0',
   default_options: ['warning_level=1'],
 )

subprojects/packagefiles/libmicrohttpd/meson.build

@@ -904,13 +904,13 @@ cdata.set_quoted('SYSCMD_SHELL', syscmd_shell)
 cdata.set_quoted('VERSION', '1.4.19')
 
 if (cc.get_define(
-  'O_BINARY',
+    'O_BINARY',
   prefix: '#include<fcntl.h>',
-) == '')
+  ) == '')
   if (cc.get_define(
-    '_O_BINARY',
+      '_O_BINARY',
     prefix: '#include<fcntl.h>',
-  ) != '')
+    ) != '')
     cdata.set('O_BINARY', '_O_BINARY')
     cdata.set('O_TEXT', '_O_TEXT')
   else
@@ -2149,6 +2149,7 @@ m4_lib = static_library(
   m4lib_src,
   m4_lib_nononnull_h,
   c_args: libm4_c_args,
+  override_options: override_opts,
 )
 if host_machine.system() == 'windows'
   m4_dep = declare_dependency(

subprojects/packagefiles/m4/lib/meson.build

@@ -3,11 +3,11 @@ project(
   'c',
   version: '1.4.19',
   license: 'GPL-3.0-or-later',
-  default_options: ['c_std=c11'],
-  meson_version: '>= 0.59.0',  # required for executable(..., win_subsystem: ...)
+  meson_version: '>= 0.56.0',
 )
 
-message('updates to the directory work')
+override_opts = ['c_std=c11']
+
 subdir('lib')
 subdir('src')
 if get_option('enable_tests')

subprojects/packagefiles/m4/meson.build

@@ -24,4 +24,6 @@ m4 = executable(
   nononnull_h,
   dependencies: m4_dep,
   install: true,
+  override_options: override_opts,
 )
+meson.override_find_program('m4', m4)