diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 78 |
1 files changed, 16 insertions, 62 deletions
diff --git a/configure.ac b/configure.ac index bf1967802f..f866cc8854 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], [18]) -m4_define([nm_micro_version], [0]) +m4_define([nm_minor_version], [19]) +m4_define([nm_micro_version], [1]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) @@ -191,9 +191,6 @@ 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 enable_wifi='yes' - AC_DEFINE(WITH_WIFI, 1, [Define if you have Wi-Fi support]) -else - AC_DEFINE(WITH_WIFI, 0, [Define if you have Wi-Fi support]) fi AM_CONDITIONAL(WITH_WIFI, test "${enable_wifi}" = "yes") @@ -257,34 +254,6 @@ AC_SUBST(GLIB_LIBS) GOBJECT_INTROSPECTION_CHECK([0.9.6]) -AC_ARG_WITH(libnm-glib, - AS_HELP_STRING([--with-libnm-glib], - [build legacy libraries])) -fake_typelibs=no -if test "$with_libnm_glib" == "yes"; then - PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.1 dbus-glib-1 >= 0.94, :, - [AC_MSG_FAILURE([$DBUS_PKG_ERRORS - -Configure with --without-libnm-glib if you do not need the legacy libraries]) - ]) - - if test "${found_introspection}" = "yes"; then - AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources) - if ! test x"$GLIB_COMPILE_RESOURCES" = x""; then - fake_typelibs=yes - fi - fi -else - with_libnm_glib=no -fi -AM_CONDITIONAL(WITH_LEGACY_LIBRARIES, test "$with_libnm_glib" == "yes") -if test "$fake_typelibs" = "yes"; then - AC_DEFINE(WITH_FAKE_TYPELIBS, 1, [Define for libnm to prevent GIR from loading libnm-glib]) -else - AC_DEFINE(WITH_FAKE_TYPELIBS, 0, [Define for libnm to prevent GIR from loading libnm-glib]) -fi -AM_CONDITIONAL(WITH_FAKE_TYPELIBS, test "${fake_typelibs}" = "yes") - PKG_CHECK_MODULES([LIBUDEV], [libudev >= 175]) # Qt4 @@ -330,9 +299,6 @@ AS_IF([test -z "$with_systemdsystemunitdir"], with_systemdsystemunitdir=no) AM_CONDITIONAL(HAVE_SYSTEMD, [test "$with_systemdsystemunitdir" != no]) if test "$with_systemdsystemunitdir" != no; then AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) - AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd support is available]) -else - AC_DEFINE(HAVE_SYSTEMD, 0, [Define if systemd support is available]) fi PKG_CHECK_MODULES(SYSTEMD_200, [systemd >= 200], [have_systemd_200=yes], [have_systemd_200=no]) @@ -527,7 +493,7 @@ esac # eBPF support AC_ARG_WITH(ebpf, - AS_HELP_STRING([--with-ebpf=yes|no|auto], [Build with eBPF support (default: auto)]), + AS_HELP_STRING([--with-ebpf=yes|no|auto], [Build with eBPF support [default=auto]]), [], [with_ebpf=auto]) # 'auto' means 'false' because there are still some issues. if test "$with_ebpf" = "yes" ; then @@ -542,7 +508,7 @@ AM_CONDITIONAL(WITH_EBPF, test "${have_ebpf}" = "yes") # SELinux support AC_ARG_WITH(selinux, - AS_HELP_STRING([--with-selinux=yes|no|auto], [Build with SELinux (default: auto)]), + AS_HELP_STRING([--with-selinux=yes|no|auto], [Build with SELinux [default=auto]]), [], [with_selinux=auto]) if test "$with_selinux" = "yes" -o "$with_selinux" = "auto"; then PKG_CHECK_MODULES(SELINUX, libselinux, [have_selinux=yes], [have_selinux=no]) @@ -559,7 +525,7 @@ else fi # libaudit support -AC_ARG_WITH(libaudit, AS_HELP_STRING([--with-libaudit=yes|yes-disabled-by-default|no|auto], [Build with audit daemon support (default: auto). yes-disabled-by-default enables support, but disables it unless explicitly configured via NetworkManager.conf]),,[with_libaudit=auto]) +AC_ARG_WITH(libaudit, AS_HELP_STRING([--with-libaudit=yes|yes-disabled-by-default|no|auto], [Build with audit daemon support [default=auto]. yes-disabled-by-default enables support, but disables it unless explicitly configured via NetworkManager.conf]),,[with_libaudit=auto]) if test "$with_libaudit" = "yes" -o "$with_libaudit" = "yes-disabled-by-default" -o "$with_libaudit" = "auto"; then PKG_CHECK_MODULES(LIBAUDIT, audit, [have_libaudit=yes], [have_libaudit=no]) if test "$with_libaudit" != "auto" -a "$have_libaudit" = "no"; then @@ -881,15 +847,11 @@ fi AC_ARG_WITH(config-dhcp-default, AS_HELP_STRING([--with-config-dhcp-default=dhclient|dhcpcd|internal], - [Default configuration option for main.dhcp setting, used as fallback if the configuration option is unset]), + [Default configuration option for main.dhcp setting, used as fallback if the configuration option is unset [default=internal]]), [config_dhcp_default="$withval"], [config_dhcp_default=""]) -if test "$config_dhcp_default" = yes -o "$config_dhcp_default" = no; then - config_dhcp_default='' +if test "$config_dhcp_default" = yes -o "$config_dhcp_default" = no -o -z "$config_dhcp_default"; then + config_dhcp_default='internal' fi -test -z "$config_dhcp_default" -a "$with_dhcpcanon" != "no" && config_dhcp_default='dhcpcanon' -test -z "$config_dhcp_default" -a "$with_dhclient" != "no" && config_dhcp_default='dhclient' -test -z "$config_dhcp_default" -a "$with_dhcpcd" != "no" && config_dhcp_default='dhcpcd' -test -z "$config_dhcp_default" && config_dhcp_default='internal' AC_DEFINE_UNQUOTED(NM_CONFIG_DEFAULT_MAIN_DHCP, "$config_dhcp_default", [Default configuration option for main.dhcp setting]) AC_SUBST(NM_CONFIG_DEFAULT_MAIN_DHCP, $config_dhcp_default) @@ -990,7 +952,7 @@ AC_DEFINE_UNQUOTED(SYSTEM_CA_PATH, "$SYSTEM_CA_PATH", [Define to path to system AC_SUBST(SYSTEM_CA_PATH) AC_ARG_WITH(kernel-firmware-dir, - AS_HELP_STRING([--with-kernel-firmware-dir=DIR], [where kernel firmware directory is (default is /lib/firmware)])) + AS_HELP_STRING([--with-kernel-firmware-dir=DIR], [where kernel firmware directory is [default=/lib/firmware]])) if test -n "$with_kernel_firmware_dir" ; then KERNEL_FIRMWARE_DIR="$with_kernel_firmware_dir" else @@ -1077,12 +1039,12 @@ AM_CFLAGS="$AM_CFLAGS $with_cflags" AC_ARG_ENABLE(more-asserts, AS_HELP_STRING([--enable-more-asserts], - [Enable more assertions for debugging (default: auto). Deprecated option. Use --with-more-asserts=level])) + [Enable more assertions for debugging [default=auto]. Deprecated option. Use --with-more-asserts=level])) if test "${enable_more_asserts}" = "yes"; then more_asserts=100 fi AC_ARG_WITH(more-asserts, - AS_HELP_STRING([--with-more-asserts=level], [Enable more assertions for debugging (0 = none, 100 = all, default: auto)]), + AS_HELP_STRING([--with-more-asserts=level], [Enable more assertions for debugging (0 = none, 100 = all) [default=auto]]), [more_asserts=${with_more_asserts}], []) if test "${more_asserts}" = "no"; then @@ -1097,7 +1059,7 @@ if test "${more_asserts}" = ""; then fi AC_DEFINE_UNQUOTED(NM_MORE_ASSERTS, $more_asserts, [Define if more asserts are enabled]) -AC_ARG_ENABLE(more-logging, AS_HELP_STRING([--enable-more-logging], [Enable more debug logging (default: auto)])) +AC_ARG_ENABLE(more-logging, AS_HELP_STRING([--enable-more-logging], [Enable more debug logging [default=auto]])) if test "${enable_more_logging}" = ""; then enable_more_logging=${more_logging_default} fi @@ -1111,7 +1073,7 @@ NM_LTO NM_LD_GC AC_ARG_WITH(address-sanitizer, - AS_HELP_STRING([--with-address-sanitizer=yes|no|exec], [Enable address sanitizer (default: no)])) + AS_HELP_STRING([--with-address-sanitizer=yes|no|exec], [Enable address sanitizer [default=no]])) if test "$with_address_sanitizer" = yes -o "$with_address_sanitizer" = "exec"; then CC_CHECK_FLAGS_APPEND([asan_cflags], [CFLAGS], [-fsanitize=address]) AS_IF([test -z "$asan_cflags"], @@ -1133,7 +1095,7 @@ fi AC_ARG_ENABLE(undefined-sanitizer, AS_HELP_STRING([--enable-undefined-sanitizer], - [Compile with undefined behavior sanitizer (default: no)])) + [Compile with undefined behavior sanitizer [default=no]])) if (test "${enable_undefined_sanitizer}" = "yes"); then CC_CHECK_FLAGS_APPEND([ubsan_cflags], [CFLAGS], [-fsanitize=undefined]) AS_IF([test -z "$ubsan_cflags"], @@ -1179,9 +1141,9 @@ VAPIGEN_CHECK(0.17.1.24) AC_CONFIG_COMMANDS([vapi], [$MKDIR_P vapi]) # Tests, utilities and documentation -AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests=root|yes|no], [Build NetworkManager tests (default: yes)])) +AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests=root|yes|no], [Build NetworkManager tests [default=yes]])) AC_ARG_WITH(valgrind, - AS_HELP_STRING([--with-valgrind=yes|no|path], [Use valgrind to memory-check the tests (default: no)])) + AS_HELP_STRING([--with-valgrind=yes|no|path], [Use valgrind to memory-check the tests [default=no]])) # Fallback to --with-tests AC_ARG_WITH(tests, AS_HELP_STRING([--with-tests], [Build NetworkManager tests (deprecated)])) @@ -1276,17 +1238,10 @@ AC_CONFIG_FILES([ Makefile shared/nm-version-macros.h libnm/libnm.pc -libnm-util/libnm-util.pc -libnm-glib/libnm-glib.pc -libnm-glib/libnm-glib-vpn.pc po/Makefile.in data/org.freedesktop.NetworkManager.policy.in docs/api/Makefile docs/api/version.xml -docs/libnm-glib/Makefile -docs/libnm-glib/version.xml -docs/libnm-util/Makefile -docs/libnm-util/version.xml docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc @@ -1335,7 +1290,6 @@ echo " ofono: $with_ofono" echo " concheck: $enable_concheck" echo " libteamdctl: $enable_teamdctl" echo " ovs: $enable_ovs" -echo " libnm-glib: $with_libnm_glib" echo " nmcli: $build_nmcli" echo " nmtui: $build_nmtui" echo " iwd: $ac_with_iwd" |