]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
build: use DLOPEN_LIBS directly
authorPavel Hrdina <phrdina@redhat.com>
Mon, 4 May 2020 16:00:47 +0000 (18:00 +0200)
committerPavel Hrdina <phrdina@redhat.com>
Fri, 10 Jul 2020 07:39:47 +0000 (09:39 +0200)
There is no need to have DRIVER_MODULES_LIBS as it's used only for
libvirt.so. The other places are using DLOPEN_LIBS directly and dlopen
is required if building with libvirtd.

It's mandatory since <5aec02dc37623bf739d1edd8f2be3e4ad9f94ff5>.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
m4/virt-driver-modules.m4
src/Makefile.am

index 8bf8ecf2b1ee8f2e6d1d5a738c2f04ffb7a90f3a..54b75e097393d08a08ef9ad9463e0fb4816ffd2b 100644 (file)
@@ -38,17 +38,14 @@ AC_DEFUN([LIBVIRT_CHECK_DRIVER_MODULES], [
   fi
 
   DRIVER_MODULES_CFLAGS=
-  DRIVER_MODULES_LIBS=
   if test "$with_driver_modules" = "yes"; then
     if test "$with_dlfcn" != "yes" || test "$with_dlopen" != "yes"; then
       AC_MSG_ERROR([You must have dlfcn.h / dlopen() support to build driver modules])
     fi
 
     DRIVER_MODULES_LDFLAGS="-export-dynamic"
-    DRIVER_MODULES_LIBS="$DLOPEN_LIBS"
   fi
   AC_SUBST([DRIVER_MODULES_LDFLAGS])
-  AC_SUBST([DRIVER_MODULES_LIBS])
 ])
 
 AC_DEFUN([LIBVIRT_RESULT_DRIVER_MODULES], [
index 12dd6b80e1e247afc9907afde15d1ba0fdcc73a9..447cff8165921825a4a894b0342dc12593f1dbb7 100644 (file)
@@ -439,7 +439,7 @@ libvirt_la_LDFLAGS += -Wl,-flat_namespace
 endif WITH_MACOS
 libvirt_la_LDFLAGS += $(NULL)
 libvirt_la_LIBADD += \
-                   $(DRIVER_MODULES_LIBS)
+                   $(DLOPEN_LIBS)
 libvirt_la_CFLAGS = -DIN_LIBVIRT $(AM_CFLAGS)
 # Because we specify libvirt_la_DEPENDENCIES for $(LIBVIRT_SYMBOL_FILE), we
 # lose automake's automatic dependencies on an appropriate subset of