diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2018-03-18 20:38:49 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2018-05-14 16:05:12 +0200 |
| commit | 320422e4cf47e6ea36023294fa926f8c8c99d127 (patch) | |
| tree | fa98f095bf4b57592e141b1a984ad7b52104648a /configure.ac | |
| parent | bade13129bac52698d3add3658f39316e1a45f3f (diff) | |
| download | NetworkManager-320422e4cf47e6ea36023294fa926f8c8c99d127.tar.gz | |
build: qualify plugin dir name with a version string
This makes package updates more robust, avoiding in-place replaces of
the plugins.
Previously, if an upgrade transaction was terminated, NetworkManager
library could end up being of a different version than the plugins.
If the user was unfortunate enough to connect using a connection that
required a plugin (say, Wi-Fi), he would be left without a network
connection making it somewhat inconvenient to recover from the botched
upgrade.
This makes the whole situation a little bit less sad.
The VPN plugins are kept where they always have been -- the path is not
qualified with a version number.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 8c0014316a..8adef88731 100644 --- a/configure.ac +++ b/configure.ac @@ -183,10 +183,9 @@ dnl AC_ARG_WITH(dist-version, AS_HELP_STRING([--with-dist-version=<NM-distribution-version>], [Define the NM''s distribution version string]), - ac_distver=$withval, ac_distver="") -if ! test x"$ac_distver" = x""; then - AC_DEFINE_UNQUOTED(NM_DIST_VERSION, "$ac_distver", [Define the distribution version string]) -fi + ac_distver=$withval, ac_distver=$NM_VERSION) +AC_DEFINE_UNQUOTED(NM_DIST_VERSION, "$ac_distver", [Define the distribution version string]) +AC_SUBST(NM_DIST_VERSION, "$ac_distver") AC_ARG_ENABLE(wifi, AS_HELP_STRING([--enable-wifi], [enable Wi-Fi support])) if test "${enable_wifi}" != "no"; then |