From: Pavel Hrdina Date: Wed, 24 Jun 2020 11:59:07 +0000 (+0200) Subject: meson: drop driver_module configure argument X-Git-Tag: v6.7.0-rc1~599 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4dc88d24ad5b74c16c7cfc6821e9258774b6903;p=thirdparty%2Flibvirt.git meson: drop driver_module configure argument Building without driver_module is not supported anymore so drop the option before switching to meson as we will not introduce it there. Signed-off-by: Pavel Hrdina Reviewed-by: Ján Tomko Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- diff --git a/configure.ac b/configure.ac index 6136ee7922..33bd203e56 100644 --- a/configure.ac +++ b/configure.ac @@ -792,7 +792,6 @@ LIBVIRT_WIN_CHECK_WINDRES dnl Driver-Modules library support -LIBVIRT_ARG_DRIVER_MODULES LIBVIRT_CHECK_DRIVER_MODULES diff --git a/m4/virt-driver-modules.m4 b/m4/virt-driver-modules.m4 index 54b75e0973..f790228388 100644 --- a/m4/virt-driver-modules.m4 +++ b/m4/virt-driver-modules.m4 @@ -17,25 +17,10 @@ dnl License along with this library. If not, see dnl . dnl -AC_DEFUN([LIBVIRT_ARG_DRIVER_MODULES], [ - LIBVIRT_ARG_WITH([DRIVER_MODULES], [build drivers as loadable modules], - [yes]) -]) - AC_DEFUN([LIBVIRT_CHECK_DRIVER_MODULES], [ AC_REQUIRE([LIBVIRT_CHECK_DLOPEN]) - if test "$with_libvirtd" = "no" ; then - with_driver_modules=no - else - if test "$with_driver_modules" = "no"; then - AC_MSG_ERROR([Building without driver modules is not supported anymore]) - fi - - if test "$with_driver_modules" = "check"; then - with_driver_modules=yes - fi - fi + with_driver_modules=$with_libvirtd DRIVER_MODULES_CFLAGS= if test "$with_driver_modules" = "yes"; then