6:45 a.m.
libvirt.c calls curl_global_init() if WITH_CURL is defined and thus it
should be linked with libcurl. This fixes link failure in case neither
xenapi nor esx driver is enabled (they are the only users of libcurl).
---
src/Makefile.am | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 070a089..f6162df 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -792,9 +792,11 @@ noinst_LTLIBRARIES += libvirt_driver.la
libvirt_la_BUILT_LIBADD += libvirt_driver.la
libvirt_driver_la_SOURCES = $(DRIVER_SOURCES)
-libvirt_driver_la_CFLAGS = $(NUMACTL_CFLAGS) $(GNUTLS_CFLAGS) \
+libvirt_driver_la_CFLAGS = \
+ $(NUMACTL_CFLAGS) $(GNUTLS_CFLAGS) $(CURL_CFLAGS) \
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
-libvirt_driver_la_LIBADD = $(NUMACTL_LIBS) $(GNUTLS_LIBS) $(DLOPEN_LIBS)
+libvirt_driver_la_LIBADD = \
+ $(NUMACTL_LIBS) $(GNUTLS_LIBS) $(CURL_LIBS) $(DLOPEN_LIBS)
USED_SYM_FILES = $(srcdir)/libvirt_private.syms
--
1.8.1.2
7:41 p.m.
On Fri, Feb 01, 2013 at 01:45:19PM +0100, Jiri Denemark wrote:
libvirt.c calls curl_global_init() if WITH_CURL is defined and thus
it
should be linked with libcurl. This fixes link failure in case neither
xenapi nor esx driver is enabled (they are the only users of libcurl).
In the case we link with libcurl just because user wants it. How about
not exposing --with-curl but define WITH_CURL when needs to(xenapi or
esx driver is enabled, or both)?
--
Regards,
Hu Tao
4:27 a.m.
On Mon, Feb 04, 2013 at 09:41:58 +0800, Hu Tao wrote:
On Fri, Feb 01, 2013 at 01:45:19PM +0100, Jiri Denemark wrote:
> libvirt.c calls curl_global_init() if WITH_CURL is defined and thus it
> should be linked with libcurl. This fixes link failure in case neither
> xenapi nor esx driver is enabled (they are the only users of libcurl).
In the case we link with libcurl just because user wants it. How about
not exposing --with-curl but define WITH_CURL when needs to(xenapi or
esx driver is enabled, or both)?
Yes, that would be the ideal solution. But this fix is correct even in
that case, no matter why WITH_CURL is defined if it is defined,
libvirt.c calls to libcurl and thus needs to link with it. Anyway, the
goal of the recent rewrite of our configure.ac by Daniel was to check
for all libraries we might need and then check what drivers we may
enable based on the libraries we have. I think removing libraries than
no driver wants might be in the long term goals but I'm not quite sure
about that.
Jirka
4:51 a.m.
On Mon, Feb 04, 2013 at 11:27:30AM +0100, Jiri Denemark wrote:
On Mon, Feb 04, 2013 at 09:41:58 +0800, Hu Tao wrote:
> On Fri, Feb 01, 2013 at 01:45:19PM +0100, Jiri Denemark wrote:
> > libvirt.c calls curl_global_init() if WITH_CURL is defined and thus it
> > should be linked with libcurl. This fixes link failure in case neither
> > xenapi nor esx driver is enabled (they are the only users of libcurl).
>
> In the case we link with libcurl just because user wants it. How about
> not exposing --with-curl but define WITH_CURL when needs to(xenapi or
> esx driver is enabled, or both)?
Yes, that would be the ideal solution. But this fix is correct even in
that case, no matter why WITH_CURL is defined if it is defined,
libvirt.c calls to libcurl and thus needs to link with it. Anyway, the
goal of the recent rewrite of our configure.ac by Daniel was to check
for all libraries we might need and then check what drivers we may
enable based on the libraries we have. I think removing libraries than
no driver wants might be in the long term goals but I'm not quite sure
about that.
The intent is that everything defaults to "check" - so we always
want to check each library, and if the libraries are present then
enable the hypervisor driver. The edge cases is that if you have
explicitly set one hypervisor driver to 'no', then we still are
checking libraries, since we want to avoid putting info about
hypervisors into the library checks.
So
--without-esx
would still leave curl enabled, but
--without-curl
would disable curl and esx. IMHO this is an acceptable tradeoff,
since this is an edge case, and there's still a way to deal with
it if desired.
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
5:23 a.m.
On Fri, Feb 01, 2013 at 01:45:19PM +0100, Jiri Denemark wrote:
libvirt.c calls curl_global_init() if WITH_CURL is defined and thus
it
should be linked with libcurl. This fixes link failure in case neither
xenapi nor esx driver is enabled (they are the only users of libcurl).
---
src/Makefile.am | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 070a089..f6162df 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -792,9 +792,11 @@ noinst_LTLIBRARIES += libvirt_driver.la
libvirt_la_BUILT_LIBADD += libvirt_driver.la
libvirt_driver_la_SOURCES = $(DRIVER_SOURCES)
-libvirt_driver_la_CFLAGS = $(NUMACTL_CFLAGS) $(GNUTLS_CFLAGS) \
+libvirt_driver_la_CFLAGS = \
+ $(NUMACTL_CFLAGS) $(GNUTLS_CFLAGS) $(CURL_CFLAGS) \
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
-libvirt_driver_la_LIBADD = $(NUMACTL_LIBS) $(GNUTLS_LIBS) $(DLOPEN_LIBS)
+libvirt_driver_la_LIBADD = \
+ $(NUMACTL_LIBS) $(GNUTLS_LIBS) $(CURL_LIBS) $(DLOPEN_LIBS)
USED_SYM_FILES = $(srcdir)/libvirt_private.syms
ACK
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
4:43 a.m.
On Mon, Feb 04, 2013 at 11:23:50 +0000, Daniel P. Berrange wrote:
On Fri, Feb 01, 2013 at 01:45:19PM +0100, Jiri Denemark wrote:
> libvirt.c calls curl_global_init() if WITH_CURL is defined and thus it
> should be linked with libcurl. This fixes link failure in case neither
> xenapi nor esx driver is enabled (they are the only users of libcurl).
> ---
ACK
Pushed, thanks.
Jirka
4311
days inactive
4315
days old
5 comments
3 participants
participants (3)
-
Daniel P. Berrange -
Hu Tao -
Jiri Denemark