nm: Install the .name file into /usr/lib/NetworkManager/VPN
It's the preferred location for system-provided plugins. A compatible file in /etc is still kept. Also, the compatibility /etc file needs to use a full path due to a bug in GNOME Shell. The full path to a arch-dependent file in a supposedly arch-independent file is a sin and a multilib violation in some distributions. However. some pre-release versions of NetworkManager-1.2 as shipped by distributions require a full path. Let's keep a configure-time option for that.
This commit is contained in:
committed by
Tobias Brunner
parent
49b3d818ea
commit
1cddc4da77
@@ -76,10 +76,17 @@ AC_ARG_WITH(
|
||||
[AC_SUBST(charon, "$withval")],
|
||||
[AC_SUBST(charon, "${libexecdir}/ipsec/charon-nm")]
|
||||
)
|
||||
AC_ARG_ENABLE(
|
||||
[nm-absolute-paths],
|
||||
AS_HELP_STRING([--enable-nm-absolute-paths],[use absolute paths for NM plugins in the .name file])
|
||||
)
|
||||
|
||||
nm_libexecdir=$($PKG_CONFIG --variable=libgnome_serverdir NetworkManager)
|
||||
AC_SUBST(nm_libexecdir)
|
||||
nm_plugindir=$($PKG_CONFIG --variable=plugindir NetworkManager)
|
||||
AC_SUBST(nm_plugindir)
|
||||
test x"$enable_nm_absolute_paths" = x"yes" && nm_plugindir_abs="$(nm_plugindir)/"
|
||||
AC_SUBST(nm_plugindir_abs)
|
||||
|
||||
NM_COMPILER_WARNINGS
|
||||
|
||||
|
||||
Reference in New Issue
Block a user