NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-15 01:43:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix typo LIBCURL_{CFLAGS,LIBS} to CURL_{CFLAGS,LIBS}

Browse Source 
Some places missed the conversion from LIBCURL_{CFLAGS,LIBS} to
CURL_{CFLAGS,LIBS}, and a part of curl check was left in
configure.ac instead of m4/virt-curl.m4 by mistake
This commit is contained in:
Daniel P. Berrange 2013-01-14 17:07:26 +00:00
parent c308a9ae15
commit 688b3ecfe9
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -1840,16 +1840,6 @@ if test "$with_xenapi" = "yes" ; then
fi fi
AM_CONDITIONAL([WITH_XENAPI], [test "$with_xenapi" = "yes"]) AM_CONDITIONAL([WITH_XENAPI], [test "$with_xenapi" = "yes"])
# XXX as of libcurl-devel-7.20.1-3.fc13.x86_64, curl ships a version
# of <curl/curl.h> that #defines several wrapper macros around underlying
# functions to add type safety for gcc only. However, these macros
# spuriously trip gcc's -Wlogical-op warning. Avoid the warning by
# disabling the wrappers; even if it removes some type-check safety.
LIBCURL_CFLAGS="-DCURL_DISABLE_TYPECHECK $LIBCURL_CFLAGS"
AC_SUBST([LIBCURL_CFLAGS])
AC_SUBST([LIBCURL_LIBS])
dnl dnl
dnl check for Hyper-V dnl check for Hyper-V

8
m4/virt-curl.m4
View File

@ -19,6 +19,14 @@ dnl
AC_DEFUN([LIBVIRT_CHECK_CURL],[ AC_DEFUN([LIBVIRT_CHECK_CURL],[
LIBVIRT_CHECK_PKG([CURL], [libcurl], [7.18.0]) LIBVIRT_CHECK_PKG([CURL], [libcurl], [7.18.0])
# XXX as of libcurl-devel-7.20.1-3.fc13.x86_64, curl ships a version
# of <curl/curl.h> that #defines several wrapper macros around underlying
# functions to add type safety for gcc only. However, these macros
# spuriously trip gcc's -Wlogical-op warning. Avoid the warning by
# disabling the wrappers; even if it removes some type-check safety.
CURL_CFLAGS="-DCURL_DISABLE_TYPECHECK $CURL_CFLAGS"
AC_SUBST(CURL_CFLAGS)
]) ])
AC_DEFUN([LIBVIRT_RESULT_CURL],[ AC_DEFUN([LIBVIRT_RESULT_CURL],[

8
src/Makefile.am
View File

@ -882,10 +882,10 @@ endif
if WITH_XENAPI if WITH_XENAPI
noinst_LTLIBRARIES += libvirt_driver_xenapi.la noinst_LTLIBRARIES += libvirt_driver_xenapi.la
libvirt_la_BUILT_LIBADD += libvirt_driver_xenapi.la libvirt_la_BUILT_LIBADD += libvirt_driver_xenapi.la
libvirt_driver_xenapi_la_CFLAGS = $(LIBXENSERVER_CFLAGS) $(LIBCURL_CFLAGS) \ libvirt_driver_xenapi_la_CFLAGS = $(LIBXENSERVER_CFLAGS) $(CURL_CFLAGS) \
-I$(top_srcdir)/src/conf $(AM_CFLAGS) -I$(top_srcdir)/src/conf $(AM_CFLAGS)
libvirt_driver_xenapi_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_xenapi_la_LDFLAGS = $(AM_LDFLAGS)
libvirt_driver_xenapi_la_LIBADD = $(LIBXENSERVER_LIBS) $(LIBCURL_LIBS) libvirt_driver_xenapi_la_LIBADD = $(LIBXENSERVER_LIBS) $(CURL_LIBS)
libvirt_driver_xenapi_la_SOURCES = $(XENAPI_DRIVER_SOURCES) libvirt_driver_xenapi_la_SOURCES = $(XENAPI_DRIVER_SOURCES)
endif endif
@ -1029,10 +1029,10 @@ MAINTAINERCLEANFILES += $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP)
if WITH_ESX if WITH_ESX
noinst_LTLIBRARIES += libvirt_driver_esx.la noinst_LTLIBRARIES += libvirt_driver_esx.la
libvirt_la_BUILT_LIBADD += libvirt_driver_esx.la libvirt_la_BUILT_LIBADD += libvirt_driver_esx.la
libvirt_driver_esx_la_CFLAGS = $(LIBCURL_CFLAGS) \ libvirt_driver_esx_la_CFLAGS = $(CURL_CFLAGS) \
-I$(top_srcdir)/src/conf -I$(top_srcdir)/src/vmx $(AM_CFLAGS) -I$(top_srcdir)/src/conf -I$(top_srcdir)/src/vmx $(AM_CFLAGS)
libvirt_driver_esx_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_esx_la_LDFLAGS = $(AM_LDFLAGS)
libvirt_driver_esx_la_LIBADD = $(LIBCURL_LIBS) libvirt_driver_esx_la_LIBADD = $(CURL_LIBS)
libvirt_driver_esx_la_SOURCES = $(ESX_DRIVER_SOURCES) libvirt_driver_esx_la_SOURCES = $(ESX_DRIVER_SOURCES)
libvirt_driver_esx_la_DEPENDENCIES = $(ESX_DRIVER_GENERATED) libvirt_driver_esx_la_DEPENDENCIES = $(ESX_DRIVER_GENERATED)
endif endif