diff options
| author | Guido Günther <agx@sigxcpu.org> | 2016-07-20 17:21:52 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2016-07-20 17:21:52 +0200 |
| commit | 7728e51fc122ff774dd74eb9cd4be7aa015108ff (patch) | |
| tree | 3597b3ace068bfd9ddf086cca760c1dbb041c1ce /configure.ac | |
| parent | ccd4ecb9f9be08744857cd2af4b6ebffe6ec3729 (diff) | |
| parent | 1941852d75827b26142cda627b0c948a27641194 (diff) | |
Merge tag 'v1.2.0' into debian/sid
Release network-manager-iodine 1.2.0
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 8596102..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 @@ -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([ |