diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2018-03-18 20:38:49 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2018-05-09 12:59:39 +0200 |
| commit | 6384ad4ee16f31dd103f790bd193c4049d89a6fc (patch) | |
| tree | 6448fdad7c16dca2e8879aab97e250535960e7f4 /configure.ac | |
| parent | 6aac441f1ce9f74ccb9dd2d97d3330be3eec0cef (diff) | |
| download | NetworkManager-6384ad4ee16f31dd103f790bd193c4049d89a6fc.tar.gz | |
build: qualify plugin dir name with a version stringlr/version-dir
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.
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 7ac11e1127..5609f28121 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 |