about summary refs log tree commit diff
path: root/meson.build
diff options
context:
space:
mode:
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build69
1 files changed, 10 insertions, 59 deletions
diff --git a/meson.build b/meson.build
index 27bcd033..e0e560c6 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project(
 #  - add corresponding NM_VERSION_x_y_z macros in
 #    "shared/nm-version-macros.h.in"
 #  - update number in configure.ac
-  version: '1.18.0',
+  version: '1.19.90',
   license: 'GPL2+',
   default_options: [
     'buildtype=debugoptimized',
@@ -63,28 +63,6 @@ libnm_version = '@0@.@1@.@2@'.format(current - age, age, revision)
 
 libnm_pkgincludedir = join_paths(nm_includedir, libnm_name)
 
-libnm_util_name = 'libnm-util'
-
-current = 9
-revision = 0
-age = 7
-libnm_util_version = '@0@.@1@.@2@'.format(current - age, age, revision)
-
-libnm_glib_name = 'libnm-glib'
-libnm_glib_vpn_name = libnm_glib_name + '-vpn'
-
-current = 13
-revision = 0
-age = 9
-libnm_glib_version = '@0@.@1@.@2@'.format(current - age, age, revision)
-
-libnm_glib_pkgincludedir = join_paths(nm_includedir, libnm_glib_name)
-
-current = 3
-revision = 0
-age = 2
-libnm_glib_vpn_version = '@0@.@1@.@2@'.format(current - age, age, revision)
-
 nm_debug = get_option('buildtype').contains('debug')
 
 cc = meson.get_compiler('c')
@@ -120,9 +98,13 @@ config_h.set10('HAVE_DECL_EXPLICIT_BZERO', cc.has_function('explicit_bzero', pre
 config_h.set10('HAVE_DECL_MEMFD_CREATE', cc.has_function('memfd_create', prefix: '#include <sys/mman.h>'))
 
 # types
-config_h.set('SIZEOF_DEV_T', cc.sizeof('dev_t', prefix: '#include <sys/types.h>'))
-config_h.set('SIZEOF_TIME_T', cc.sizeof('time_t', prefix: '#include <sys/types.h>'))
-config_h.set('SIZEOF_PID_T', cc.sizeof('pid_t', prefix: '#include <sys/types.h>'))
+config_h.set('SIZEOF_PID_T', cc.sizeof('pid_t', prefix : '#include <sys/types.h>'))
+config_h.set('SIZEOF_UID_T', cc.sizeof('uid_t', prefix : '#include <sys/types.h>'))
+config_h.set('SIZEOF_GID_T', cc.sizeof('gid_t', prefix : '#include <sys/types.h>'))
+config_h.set('SIZEOF_DEV_T', cc.sizeof('dev_t', prefix : '#include <sys/types.h>'))
+config_h.set('SIZEOF_INO_T', cc.sizeof('ino_t', prefix : '#include <sys/types.h>'))
+config_h.set('SIZEOF_TIME_T', cc.sizeof('time_t', prefix : '#include <sys/time.h>'))
+config_h.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include <sys/resource.h>'))
 
 if not cc.has_type('pid_t', prefix: '#include <sys/types.h>')
   config_h.set('pid_t', 'int')
@@ -174,6 +156,7 @@ if nm_debug
     '-Wno-missing-field-initializers',
     '-Wno-pragmas',
     '-Wno-sign-compare',
+    '-Wno-unknown-pragmas',
     '-Wno-unused-parameter',
     '-Wparentheses-equality',
     '-Wpointer-arith',
@@ -254,9 +237,6 @@ endif
 
 enable_ifcfg_rh = get_option('ifcfg_rh') or (distro == 'redhat')
 enable_ifupdown = get_option('ifupdown') or (distro == 'debian')
-enable_ibft = get_option('ibft')
-
-config_h.set10('WITH_SETTINGS_PLUGIN_IBFT', enable_ibft)
 
 config_plugins_default = get_option('config_plugins_default')
 if config_plugins_default == ''
@@ -270,10 +250,6 @@ if config_plugins_default == ''
     config_plugins += ['ifupdown']
   endif
 
-  if enable_ibft
-    config_plugins += ['ibft']
-  endif
-
   config_plugins_default = ','.join(config_plugins)
 endif
 config_h.set_quoted('NM_CONFIG_DEFAULT_MAIN_PLUGINS', config_plugins_default)
@@ -281,7 +257,6 @@ config_h.set_quoted('NM_CONFIG_DEFAULT_MAIN_PLUGINS', config_plugins_default)
 config_h.set_quoted('NM_DIST_VERSION', dist_version)
 
 enable_wifi = get_option('wifi')
-config_h.set10('WITH_WIFI', enable_wifi)
 
 enable_iwd = get_option('iwd')
 if enable_iwd
@@ -320,20 +295,6 @@ if enable_introspection
   assert(gir_dep.found(), 'introspection support was requested, but the gobject-introspection library is not available. Use -Dintrospection=false to build without it.')
 endif
 
-enable_libnm_glib = get_option('libnm_glib')
-if enable_libnm_glib
-  dbus_glib_dep = dependency('dbus-glib-1', version: '>= 0.94', required: false)
-  assert(dbus_dep.found() and dbus_glib_dep.found(), 'Configure with -Dlibnm_glib=false if you do not need the legacy libraries')
-endif
-# FIXME: do this better!!!
-have_fake_typelibs = enable_libnm_glib and enable_introspection
-if have_fake_typelibs and gio_unix_dep.version().version_compare('< 2.51.1')
-  warning('cannot build fake typelibs for libnm because glib is too old')
-  have_fake_typelibs=false
-endif
-
-config_h.set10('WITH_FAKE_TYPELIBS', have_fake_typelibs)
-
 udev_dir = get_option('udev_dir')
 install_udev_dir = (udev_dir != 'no')
 
@@ -348,7 +309,6 @@ if install_systemd_unit_dir and systemd_system_unit_dir == ''
   assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
   systemd_system_unit_dir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
 endif
-config_h.set10('HAVE_SYSTEMD', install_systemd_unit_dir)
 
 enable_systemd_journal = get_option('systemd_journal')
 if enable_systemd_journal
@@ -863,11 +823,6 @@ subdir('clients')
 subdir('data')
 subdir('po')
 
-if enable_libnm_glib
-  subdir('libnm-util')
-  subdir('libnm-glib')
-endif
-
 if enable_vapi
   subdir('vapi')
 endif
@@ -905,7 +860,6 @@ config_extra_h.set_quoted('LIBEXECDIR',        nm_libexecdir)
 config_extra_h.set_quoted('LOCALSTATEDIR',     nm_localstatedir)
 config_extra_h.set_quoted('NMCONFDIR',         nm_pkgconfdir)
 config_extra_h.set_quoted('NMLIBDIR',          nm_pkglibdir)
-config_extra_h.set_quoted('NMLIBDIR',          nm_pkglibdir)
 config_extra_h.set_quoted('NMLOCALEDIR',       nm_localedir)
 config_extra_h.set_quoted('NMPLUGINDIR',       nm_plugindir)
 config_extra_h.set_quoted('NMRUNDIR',          nm_pkgrundir)
@@ -914,10 +868,9 @@ config_extra_h.set_quoted('NMVPNDIR',          nm_vpndir)
 config_extra_h.set_quoted('NM_BUILD_BUILDDIR', meson.build_root())
 config_extra_h.set_quoted('NM_BUILD_SRCDIR',   meson.source_root())
 if enable_ppp
-    config_extra_h.set_quoted('PPPD_PLUGIN_DIR',   pppd_plugin_dir)
+    config_extra_h.set_quoted('PPPD_PLUGIN_DIR', pppd_plugin_dir)
 endif
 config_extra_h.set_quoted('PREFIX',            nm_prefix)
-config_extra_h.set_quoted('RUNDIR',            nm_pkgrundir)
 config_extra_h.set_quoted('RUNSTATEDIR',       nm_runstatedir)
 config_extra_h.set_quoted('SYSCONFDIR',        nm_sysconfdir)
 
@@ -978,11 +931,9 @@ output += '  ofono: ' + enable_ofono.to_string() + '\n'
 output += '  concheck: ' + enable_concheck.to_string() + '\n'
 output += '  libteamdctl: ' + enable_teamdctl.to_string() + '\n'
 output += '  ovs: ' + enable_ovs.to_string() + '\n'
-output += '  libnm-glib: ' + enable_libnm_glib.to_string() + '\n'
 output += '  nmcli: ' + enable_nmcli.to_string() + '\n'
 output += '  nmtui: ' + enable_nmtui.to_string() + '\n'
 output += '\nConfiguration_plugins (main.plugins=' + config_plugins_default + ')\n'
-output += '  ibft: ' + enable_ibft.to_string() + '\n'
 output += '  ifcfg-rh: ' + enable_ifcfg_rh.to_string() + '\n'
 output += '  ifupdown: ' + enable_ifupdown.to_string() + '\n'
 output += '\nHandlers for /etc/resolv.conf:\n' + resolv_conf_summary
generated by cgit-pink 1.3.0-6-gf8a5 (git 2.35.1) at 2026-08-27 13:06:09 +0000