fix patch, we apparently don't have the exact same Makefile.am

diff --git a/libcurl.patch b/libcurl.patch
index 5cb511f..6568be2 100644 (file)
--- a/libcurl.patch
+++ b/libcurl.patch
@@ -10,18 +10,20 @@ xenapi nor esx driver is enabled (they are the only users of libcurl).
 src/Makefile.am                patch | blob | history
 diff --git a/src/Makefile.am b/src/Makefile.am
 index 070a089..f6162df 100644 (file)
 src/Makefile.am                patch | blob | history
 diff --git a/src/Makefile.am b/src/Makefile.am
 index 070a089..f6162df 100644 (file)

---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -792,9 +792,11 @@ noinst_LTLIBRARIES += libvirt_driver.la
+--- a/src/Makefile.am  2013-02-19 19:24:43.635404112 +0100
++++ b/src/Makefile.am  2013-02-19 19:27:54.487331784 +0100
+@@ -792,9 +792,11 @@

  libvirt_la_BUILT_LIBADD += libvirt_driver.la
  libvirt_driver_la_SOURCES = $(DRIVER_SOURCES)
  
 -libvirt_driver_la_CFLAGS = $(NUMACTL_CFLAGS) $(GNUTLS_CFLAGS) \
  libvirt_la_BUILT_LIBADD += libvirt_driver.la
  libvirt_driver_la_SOURCES = $(DRIVER_SOURCES)
  
 -libvirt_driver_la_CFLAGS = $(NUMACTL_CFLAGS) $(GNUTLS_CFLAGS) \

+-              -I$(top_srcdir)/src/conf $(AM_CFLAGS)
+-libvirt_driver_la_LIBADD = $(NUMACTL_LIBS) $(GNUTLS_LIBS) $(DLOPEN_LIBS)

 +libvirt_driver_la_CFLAGS = \
 +               $(NUMACTL_CFLAGS) $(GNUTLS_CFLAGS) $(CURL_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)
++             -I$(top_srcdir)/src/conf $(AM_CFLAGS)

 +libvirt_driver_la_LIBADD = \
 +               $(NUMACTL_LIBS) $(GNUTLS_LIBS) $(CURL_LIBS) $(DLOPEN_LIBS)
  
  USED_SYM_FILES = $(srcdir)/libvirt_private.syms
 +libvirt_driver_la_LIBADD = \
 +               $(NUMACTL_LIBS) $(GNUTLS_LIBS) $(CURL_LIBS) $(DLOPEN_LIBS)
  
  USED_SYM_FILES = $(srcdir)/libvirt_private.syms

+