summaryrefslogtreecommitdiff
path: root/meson.build
Commit message (Collapse)AuthorAgeFilesLines
* build: meson: Remove unnecessary auxiliary variableIñigo Martínez2018-12-201-4/+2
| | | | | | | | The variable containing the list of compiler arguments to be checked can be removed without any harm to readibility. The variable has been removed by appending directly to the list of common compiler arguments, those that are supported.
* build: meson: Add trailing commasIñigo Martínez2018-12-201-10/+10
| | | | | | | Add missing trailing commas that avoids getting noise when another file/parameter is added and eases reviewing changes[0]. [0] https://gitlab.gnome.org/GNOME/dconf/merge_requests/11#note_291585
* build: meson: Use variables present in pkg-config filesIñigo Martínez2018-12-201-17/+6
| | | | | | | | | | | | | | | | | | | Although some paths related to DBus and PolicyKit are present in their pkg-config files, those paths might not be writable for the user. To solve this issue, some build options are present that can be used to choose a different location. However, usually these paths are relative to some other variables such as `prefix`, `datadir`, etc. Using the `define_variable` option the relative path can be change to point to a directory under prefix. These paths are now using relative paths based on the installation `prefix` and their related options have been removed as they are unnecessary now. Only `dbus_conf_dir` option has been left because it must be modified depending on the distribution[0]. [0] contrib/fedora/rpm/NetworkManager.spec
* build: meson: Remove polkit_dir optionIñigo Martínez2018-12-201-3/+1
| | | | | | | | | | | | meson is able to get variables defined in pkg-config files such as directory paths. PolicyKit defines in its pkg-config file the path to the directory where `policy` files are present. This removes the `polkit_dir` option to ease the move to start using those variables. The `polkit` variable has also been converted to boolean. Fedora spec script has also been updated accordingly.
* meson: correct libaudit not found messageSoapux2018-12-131-1/+1
| | | | | | libaudit support is disabled with 'no' instead of 'false' https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/63
* doc,all: fix spelling of Open vSwitch (instead of OpenVSwitch)Thomas Haller2018-11-281-2/+2
| | | | | | Also affects documentation and translated strings. Reported-by: Flavio Leitner <fbl@redhat.com>
* build: add configure check for having memfd_create() APIThomas Haller2018-10-251-0/+1
|
* build: meson: fix install scriptBeniamino Galvani2018-09-281-1/+1
| | | | | | Fix directory paths and modes. Fixes: 98b4a19a536ddb9f75611deaa272ae5661c5df4d
* build: meson: fix generation of api docsBeniamino Galvani2018-09-281-0/+1
| | | | | | | | | | We need to copy all introspection files to the same directory when building the documentation. Note that we only require Meson 0.44, but for the documentation at least 0.46 is needed because of a new functionality of gnome.gdbus_codegen(). In this way we can still build on Travis CI (without documentation).
* build: meson: ifcfg-rh plugin should not enable ibftBeniamino Galvani2018-09-281-1/+1
| | | | This is not the case with autotools.
* build: autodetect ebpf supportBeniamino Galvani2018-09-191-0/+13
|
* build: meson: GTK documentation requires introspectionBeniamino Galvani2018-09-191-3/+2
|
* build: meson: check vapi prerequisites and allow autodetectionBeniamino Galvani2018-09-191-4/+21
| | | | | | | | Turn the vapi option into a combo that allows autodetection and check whether all prerequisites are satisfied (including introspection support) when vapi is explicitly enabled. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/28
* build: meson: support $DESTDIR in installation scriptBeniamino Galvani2018-09-191-1/+1
| | | | | | | Adapt the meson post-installation script to handle the $DESTDIR variable supplied by user to specify the installation target directory. While at it, convert the script to shell because it seems simpler to me.
* build: drop unused SBINDIRLubomir Rintel2018-09-181-1/+0
|
* release: bump version to 1.15.1-dev after 1.14.0 release1.15.1-devThomas Haller2018-09-141-1/+1
|\ | | | | | | | | | | | | | | | | | | After 1.14.0 is released, merge it back into master so that 1.14.0 is part of the history of master. That means, $ git log --first-parent master will also traverse 1.14.0 and 1.14-rc*. Also bump the micro version to 1.15.1-dev to indicate that this is after 1.14.0 is out.
| * build: rename DNSSEC_TRIGGER_SCRIPT to DNSSEC_TRIGGER_PATHBeniamino Galvani2018-09-131-3/+3
| | | | | | | | | | Rename the define for consistency, since the configure option is named 'dnssec-trigger'.
| * build: print both pppd path and plugins path in configure summaryBeniamino Galvani2018-09-131-1/+1
| | | | | | | | | | | | Reported-by: Michael Biebl <biebl@debian.org> https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/25
| * build: meson: fix NMSTATEDIR pathBeniamino Galvani2018-09-131-1/+1
| | | | | | | | Reported-by: Michael Biebl <biebl@debian.org>
| * build: meson: uniform handling of rc managersBeniamino Galvani2018-09-131-39/+32
| | | | | | | | Handle all rc managers paths through the same code.
| * build: meson: uniform handling of dhcp client pathsBeniamino Galvani2018-09-131-64/+31
| | | | | | | | Handle all dhcp client paths through the same code.
| * build: move paths of dhcp clients from config-extra.h to config.hBeniamino Galvani2018-09-131-9/+0
| | | | | | | | | | | | | | | | Some path variable like $(bindir), $(datadir), etc. are special for autotools and must be handled separately through config-extra.h. But dhcp path variables are just normal variables defined through the configure script and should go into config.h.
| * build: remove check on dhcpcd version numberBeniamino Galvani2018-09-131-19/+0
| | | | | | | | | | dhcpcd version 6, the first supporting IPv6, was released more than 5 years ago. Remove all checks on version number and IPv6 support.
| * build: remove check on dhclient versionBeniamino Galvani2018-09-131-5/+0
| | | | | | | | | | | | | | dhclient 4.0 was released more than 10 years ago. I think it is reasonable to expect that nobody is using an older version today. https://source.isc.org/cgi-bin/gitweb.cgi?p=dhcp.git;a=shortlog;h=refs/tags/v4_0_0
| * build: meson: fix pppd pathBeniamino Galvani2018-09-131-5/+8
| | | | | | | | Allow specifying a non-existent path.
| * build: meson: fix setting iptables/dnsmasq/dnssec-trigger pathsBeniamino Galvani2018-09-131-13/+28
| | | | | | | | | | | | | | | | | | | | Handle the iptables, dnsmasq and dnssec-trigger paths in the same way through common code. The path set by user must be accepted as is, even if does not exist, because this is a requirement for cross-compilation. When user does not specify a path, search a predefined set of paths and fall back to an hardcoded one.
| * meson: Use libexecdir for dnssec-trigger-script fallbackJan Alexander Steffens (heftig)2018-09-121-1/+5
| | | | | | | | Use an `if` to keep line length down.
| * release: bump version to 1.15.0 (development)1.15.0-devThomas Haller2018-09-081-1/+1
| |
* | release: bump version to 1.14.01.14.0Thomas Haller2018-09-141-1/+1
| |
* | build: rename DNSSEC_TRIGGER_SCRIPT to DNSSEC_TRIGGER_PATHBeniamino Galvani2018-09-131-3/+3
| | | | | | | | | | | | | | Rename the define for consistency, since the configure option is named 'dnssec-trigger'. (cherry picked from commit 8e776955ee53b80536f017d2c5bbfc7c9a7b0f10)
* | build: print both pppd path and plugins path in configure summaryBeniamino Galvani2018-09-131-1/+1
| | | | | | | | | | | | | | Reported-by: Michael Biebl <biebl@debian.org> https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/25 (cherry picked from commit ff837b2686cf8f88bbdb95b2ddd8efd7fc9f809e)
* | build: meson: fix NMSTATEDIR pathBeniamino Galvani2018-09-131-1/+1
| | | | | | | | | | Reported-by: Michael Biebl <biebl@debian.org> (cherry picked from commit 8c77ca1a6dc87c70c7c61e442accf7fdd2f5d063)
* | build: meson: uniform handling of rc managersBeniamino Galvani2018-09-131-39/+32
| | | | | | | | | | | | Handle all rc managers paths through the same code. (cherry picked from commit 2fd7559819c2de392d6964cacc0032d2066d0d6e)
* | build: meson: uniform handling of dhcp client pathsBeniamino Galvani2018-09-131-64/+31
| | | | | | | | | | | | Handle all dhcp client paths through the same code. (cherry picked from commit 36b0e46146ec7f67acb365e83e306d781f198d1c)
* | build: move paths of dhcp clients from config-extra.h to config.hBeniamino Galvani2018-09-131-9/+0
| | | | | | | | | | | | | | | | | | | | Some path variable like $(bindir), $(datadir), etc. are special for autotools and must be handled separately through config-extra.h. But dhcp path variables are just normal variables defined through the configure script and should go into config.h. (cherry picked from commit 087c367d626a4c5b58dae5bc11670f3ab34b0e44)
* | build: remove check on dhcpcd version numberBeniamino Galvani2018-09-131-19/+0
| | | | | | | | | | | | | | dhcpcd version 6, the first supporting IPv6, was released more than 5 years ago. Remove all checks on version number and IPv6 support. (cherry picked from commit e0c49d7341a0329e2c40e25fee5d3ce249f5ebe6)
* | build: remove check on dhclient versionBeniamino Galvani2018-09-131-5/+0
| | | | | | | | | | | | | | | | dhclient 4.0 was released more than 10 years ago. I think it is reasonable to expect that nobody is using an older version today. https://source.isc.org/cgi-bin/gitweb.cgi?p=dhcp.git;a=shortlog;h=refs/tags/v4_0_0 (cherry picked from commit 9e61ea70402b5d8140de512bdcf84252fcb0d11c)
* | build: meson: fix pppd pathBeniamino Galvani2018-09-131-5/+8
| | | | | | | | | | | | Allow specifying a non-existent path. (cherry picked from commit 794e499ab8b8825d9794d7c2e320b10909fc3ba3)
* | build: meson: fix setting iptables/dnsmasq/dnssec-trigger pathsBeniamino Galvani2018-09-131-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | Handle the iptables, dnsmasq and dnssec-trigger paths in the same way through common code. The path set by user must be accepted as is, even if does not exist, because this is a requirement for cross-compilation. When user does not specify a path, search a predefined set of paths and fall back to an hardcoded one. (cherry picked from commit 220dea0948a22dfbdddb91ed76a23ae20d2c5810)
* | meson: Use libexecdir for dnssec-trigger-script fallbackJan Alexander Steffens (heftig)2018-09-131-1/+5
|/ | | | | | Use an `if` to keep line length down. (cherry picked from commit 5b042b16ca19931df887709570b13a4dada374ba)
* release: bump version to 1.13.90 (1.14-rc1)1.14-rc1Thomas Haller2018-09-081-1/+1
|
* build: enable building both crypto backends for testsThomas Haller2018-09-041-4/+9
| | | | | | | | | | | | If the library is available, let's at least compile both crypto backends. That is helpful when developing on crypto backends, so that one does not have to configure the build twice. With autotools, the build is only run during `make check`. Not for meson, but that is generally the case with our meson setup, that it also builds tests during the regular build step.
* build/meson: fix build options for suspend-resumeThomas Haller2018-08-271-20/+30
| | | | | | suspend-resume must be selectable, out of for possible options. We can do auto-detection based on present libraries, but it shall be selectable. Like it is with autotools.
* build: cleanup build defines for session-trackingThomas Haller2018-08-271-23/+22
| | | | | | | | | | | | | - always define the SESSION_TRACKING_* defines to replace "#ifdef" with "#if". - drop defining the consolekit database path CKDB_PATH in config.h. The path was not customizable via configure/meson. - fix meson build to enable consolekit support for session tracking without also enabling logind/elogind session tracking. logind/elogind is mutually exclusive, but consolekit session tracking goes together just fine.
* build: fix meson build with -Dppp=falseBeniamino Galvani2018-08-151-1/+3
| | | | | | | | meson.build:897:15: ERROR: Unknown variable "pppd_plugin_dir". Fixes: a75ab799e4f6b9c5d6f298ad7c1899ae21726a48 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/7
* release: bump version to 1.13.3 (development)1.13.3-devThomas Haller2018-08-131-1/+1
|
* release: bump version to 1.13.2 (development)1.13.2-devLubomir Rintel2018-07-251-1/+1
|
* build: create "config-extra.h" header instead of passing directory variables ↵Thomas Haller2018-07-171-5/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | via CFLAGS 1) the command line gets shorter. I frequently run `make V=1` to see the command line arguments for the compiler, and there is a lot of noise. 2) define each of these variables at one place. This makes it easy to verify that for all compilation units, a particular define has the same value. Previously that was not obvious or even not the case (see commit e5d1a71396e107d1909744d26ad401f206c0c915 and commit d63cf1ef2faba57595112a82e962b9643cce4718). The point is to avoid redundancy. 3) not all compilation units need all defines. In fact, most modules would only need a few of these defines. We aimed to pass the necessary minium of defines to each compilation unit, but that was non-obvious to get right and often we set a define that wasn't used. See for example "src_settings_plugins_ibft_cppflags" which needlessly had "-DSYSCONFDIR". This question is now entirely avoided by just defining all variables in a header. We don't care to find the minimum, because every component gets anyway all defines from the header. 4) this also avoids the situation, where a module that previously did not use a particular define gets modified to require it. Previously, that would have required to identify the missing define, and add it to the CFLAGS of the complation unit. Since every compilation now includes "config-extra.h", all defines are available everywhere. 5) the fact that each define is now available in all compilation units could be perceived as a downside. But it isn't, because these defines should have a unique name and one specific value. Defining the same name with different values, or refer to the same value by different names is a bug, not a desirable feature. Since these defines should be unique accross the entire tree, there is no problem in providing them to every compilation unit. 6) the reason why we generate "config-extra.h" this way, instead of using AC_DEFINE() in configure.ac, is due to the particular handling of autoconf for directory variables. See [1]. With meson, it would be trivial to put them into "config.h.meson". While that is not easy with autoconf, the "config-extra.h" workaround seems still preferable to me. [1] https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Installation-Directory-Variables.html
* meson: define PPPD_PATH variableJan Tojnar2018-07-091-0/+2
| | | | | | | configure.ac defines it just like it defines other PATH variables for use with nm_utils_find_helper. Meson for some reason did not. https://bugzilla.gnome.org/show_bug.cgi?id=796752
* release: bump version to 1.13.1-dev after 1.12.0 release1.13.1-devThomas Haller2018-06-291-2/+2
|\ | | | | | | | | | | | | | | | | | | After 1.12.0 is released, merge it back into master so that 1.12.0 is part of the history of master. That means, $ git log --first-parent master will also traverse 1.12.0 and 1.12-rc*. Also bump the micro version to 1.13.1-dev to indicate that this is after 1.12.0 is out.