From 906f673ab4461cc42a49d7a3b290d2cfa2f403e9 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 22 Apr 2016 12:29:33 +0200 Subject: build: don't include the full path to a plugin by default Makes packagers a bit less sad. We always keep the full paths in /etc for compatibility. --- configure.ac | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 8596102..f19bd4b 100644 --- a/configure.ac +++ b/configure.ac @@ -48,6 +48,8 @@ AM_CONDITIONAL(WITH_AUTHDLG, test x"$with_authdlg" != xno) AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-iodine without libnm-glib comatibility])) AM_CONDITIONAL(WITH_LIBNM_GLIB, test x"$with_libnm_glib" != xno) +AC_ARG_ENABLE(absolute-paths, AS_HELP_STRING([--enable-absolute-paths], [Use absolute paths to in .name files. Useful for development. (default is no)])) + GETTEXT_PACKAGE=NetworkManager-iodine AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) @@ -81,6 +83,9 @@ LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2" NM_VPN_SERVICE_DIR=`$PKG_CONFIG pkg-config --define-variable prefix='\${prefix}' --variable vpnservicedir libnm` AC_SUBST(NM_VPN_SERVICE_DIR) +test x"$enable_absolute_paths" = x"yes" && NM_PLUGIN_DIR='$(libdir)/NetworkManager/' +AC_SUBST(NM_PLUGIN_DIR) + NM_COMPILER_WARNINGS AC_CONFIG_FILES([ -- cgit v1.2.3 From 1941852d75827b26142cda627b0c948a27641194 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 22 Apr 2016 12:33:42 +0200 Subject: release: bump version to 1.2.0 NetworkManager-1.2 is now released; good time for a plugin release as well. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index f19bd4b..4109715 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.52) -AC_INIT(NetworkManager-iodine, 1.1.0, agx@sigxcpu.org, NetworkManager-iodine) +AC_INIT(NetworkManager-iodine, 1.2.0, agx@sigxcpu.org, NetworkManager-iodine) AM_INIT_AUTOMAKE([subdir-objects no-dist-gzip dist-xz]) AM_MAINTAINER_MODE -- cgit v1.2.3