diff options
author | Thomas Haller <thaller@redhat.com> | 2022-05-16 09:44:49 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2022-05-16 09:44:50 +0200 |
commit | e2476b10634a8c6670bd2fbba5598e80f16c6285 (patch) | |
tree | b516dff71734ded78cf5cc8f119431ed7de12e6a /configure.ac | |
parent | 5704730a6c4e6851d4ba5471ea439502f7b72949 (diff) | |
parent | d9d72c6ea1525524a8e68da83f82055e6484960a (diff) |
release: bump version to 1.39.4 (development)1.39.4-dev
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index 09c69720c3..8e00da68b0 100644 --- a/configure.ac +++ b/configure.ac @@ -7,8 +7,8 @@ dnl - add corresponding NM_VERSION_x_y_z macros in dnl "shared/nm-version-macros.h.in" dnl - update number in meson.build m4_define([nm_major_version], [1]) -m4_define([nm_minor_version], [38]) -m4_define([nm_micro_version], [0]) +m4_define([nm_minor_version], [39]) +m4_define([nm_micro_version], [4]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) @@ -306,11 +306,12 @@ AC_ARG_WITH(udev-dir, [Absolute path of the udev base directory. Set to 'no' not to install the udev rules]), [], [with_udev_dir="yes"]) if test "$with_udev_dir" != 'no'; then - if test "$with_udev_dir" != 'yes' && printf '%s' "$with_udev_dir" | grep -v -q '^/'; then - AC_MSG_ERROR([--with-udev-dir must be an absolute path or 'yes' or 'no'. Instead it is '$with_udev_dir']) - fi - if test "$with_udev_dir" = 'yes'; then - with_udev_dir="\$(prefix)/lib/udev" + if test "$with_udev_dir" = 'yes' -o "$with_udev_dir" = "" ; then + with_udev_dir="\${prefix}/lib/udev" + else + if printf '%s' "$with_udev_dir" | grep -v -q '^/'; then + AC_MSG_ERROR([--with-udev-dir must be an absolute path or 'yes' or 'no'. Instead it is '$with_udev_dir']) + fi fi UDEV_DIR="$with_udev_dir" AC_SUBST(UDEV_DIR) @@ -745,7 +746,6 @@ AC_SUBST(GLIB_MKENUMS) AC_ARG_WITH(dbus-sys-dir, AS_HELP_STRING([--with-dbus-sys-dir=DIR], [where D-BUS system.d directory is])) - if test -n "$with_dbus_sys_dir" ; then DBUS_SYS_DIR="$with_dbus_sys_dir" else @@ -1006,18 +1006,6 @@ fi AC_DEFINE_UNQUOTED(DNSMASQ_PATH, "$DNSMASQ_PATH", [Define to path of dnsmasq binary]) AC_SUBST(DNSMASQ_PATH) -# dnssec-trigger-script path -AC_ARG_WITH(dnssec_trigger, - AS_HELP_STRING([--with-dnssec-trigger=/path/to/dnssec-trigger-script], [path to unbound dnssec-trigger-script])) -if test "x${with_dnssec_trigger}" = x; then - AC_PATH_PROG(DNSSEC_TRIGGER_PATH, dnssec-trigger-script, /usr/libexec/dnssec-trigger-script, - /usr/local/libexec:/usr/local/lib:/usr/local/lib/dnssec-trigger:/usr/libexec:/usr/lib:/usr/lib/dnssec-trigger) -else - DNSSEC_TRIGGER_PATH="$with_dnssec_trigger" -fi -AC_DEFINE_UNQUOTED(DNSSEC_TRIGGER_PATH, "$DNSSEC_TRIGGER_PATH", [Define to path of unbound dnssec-trigger-script]) -AC_SUBST(DNSSEC_TRIGGER_PATH) - # system CA certificates path AC_ARG_WITH(system-ca-path, AS_HELP_STRING([--with-system-ca-path=/path/to/ssl/certs], [path to system CA certificates])) @@ -1374,8 +1362,10 @@ echo " exec_prefix: $exec_prefix" echo " sysconfdir: $sysconfdir" echo " localstatedir: $localstatedir" echo " runstatedir: $runstatedir" +echo " datarootdir: $datarootdir" echo " datadir: $datadir" echo " systemdunitdir: $with_systemdsystemunitdir" +echo " udev-dir: $with_udev_dir" echo " nmbinary: $nmbinary" echo " nmconfdir: $nmconfdir" echo " nmlibdir: $nmlibdir" @@ -1383,6 +1373,7 @@ echo " nmdatadir: $nmdatadir" echo " nmstatedir: $nmstatedir" echo " nmrundir: $nmrundir" echo " system-ca-path: $with_system_ca_path" +echo " dbus-sys-dir: $DBUS_SYS_DIR" echo echo "Platform:" |