From: Diego Elio Pettenò <flameeyes@gmail.com>
Date: Thu, 4 Mar 2010 15:48:10 +0000 (+0100)
Subject: build: vbox: avoid build failure when linking with --no-add-needed
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c7434706a27391bdaf441bef3775d78df92a0f1e;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

build: vbox: avoid build failure when linking with --no-add-needed

With the recent changes to the linking defaults in Fedora 13 (namely
enabling --no-add-needed behaviour by default), we have to pass the
dlopen()-providing libraries directly at the link of the module; use the
same AC_SEARCH_LIBS function as used before to look for it and add it to
the Makefile.
---

diff --git a/configure.ac b/configure.ac
index d5d62eaa1..923d7b8ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -303,6 +303,12 @@ fi
 AM_CONDITIONAL([WITH_OPENVZ], [test "$with_openvz" = "yes"])
 
 if test "x$with_vbox" = "xyes"; then
+    AC_SEARCH_LIBS([dlopen], [dl], [], [AC_MSG_ERROR([Unable to find dlopen()])])
+    case $ac_cv_search_dlopen in
+      no*) DLOPEN_LIBS= ;;
+      *) DLOPEN_LIBS=$ac_cv_search_dlopen ;;
+    esac
+    AC_SUBST([DLOPEN_LIBS])
     AC_DEFINE_UNQUOTED([WITH_VBOX], 1, [whether VirtualBox driver is enabled])
 fi
 AM_CONDITIONAL([WITH_VBOX], [test "$with_vbox" = "yes"])
diff --git a/src/Makefile.am b/src/Makefile.am
index 2051e5d7c..67f8b6d54 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -463,6 +463,7 @@ libvirt_driver_vbox_la_CFLAGS = \
 if WITH_DRIVER_MODULES
 libvirt_driver_vbox_la_LDFLAGS = -module -avoid-version
 endif
+libvirt_driver_vbox_la_LIBADD = $(DLOPEN_LIBS)
 libvirt_driver_vbox_la_SOURCES = $(VBOX_DRIVER_SOURCES)
 endif