[libvirt PATCH 01/31] build: use DLOPEN_LIBS directly

[Pavel Hrdina]

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.

Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 m4/virt-driver-modules.m4 | 3 ---
 src/Makefile.am           | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/m4/virt-driver-modules.m4 b/m4/virt-driver-modules.m4
index 8bf8ecf2b1e..54b75e09739 100644
--- a/m4/virt-driver-modules.m4
+++ b/m4/virt-driver-modules.m4
@@ -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], [
diff --git a/src/Makefile.am b/src/Makefile.am
index 12dd6b80e1e..447cff81659 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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
-- 
2.26.2