+Tue May 29 15:41:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>

+
+       * TODO: Added a note about requiring C++ compiler because of a
+         possible problem with libtool autoconf macros.
+       * docs/examples/Makefile.am, proxy/Makefile.am, qemud/Makefile.am,
+         src/Makefile.am, tests/Makefile.am: Pass $(WARN_CFLAGS) when
+         linking, so if -fstack-protector is there, gcc will link to
+         the stack protector library.
+       * tests/xencapstest.c: Allow this test to compile when Xen
+         libraries are not enabled.
+

diff --git a/ChangeLog b/ChangeLog
index ba95e9b10d55ead6646f2cff1aca174058037e02..c6d1674a0ebaac8b0624efda47ffe2108c560b1a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Tue May 29 15:41:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
+
+       * TODO: Added a note about requiring C++ compiler because of a
+         possible problem with libtool autoconf macros.
+       * docs/examples/Makefile.am, proxy/Makefile.am, qemud/Makefile.am,
+         src/Makefile.am, tests/Makefile.am: Pass $(WARN_CFLAGS) when
+         linking, so if -fstack-protector is there, gcc will link to
+         the stack protector library.
+       * tests/xencapstest.c: Allow this test to compile when Xen
+         libraries are not enabled.
+
 Tue May 29 15:54:17 CEST 2007 Daniel Veillard <veillard@redhat.com>
 
        * src/virsh.c src/xen_internal.c src/xend_internal.c: memory leaks

diff --git a/TODO b/TODO
index b739d7f3271c7f3227a368e3ead1892cc75dfe8b..828d50d8f72e7772b9df9a3d8adfd0da69238a52 100644 (file)
--- a/TODO
+++ b/TODO
@@ -22,3 +22,8 @@ Cleanup:
 - now that libxml2 is linked in, drop hash.[ch] and get back to libxml2 ones ?
   same for the buffers 
 
+Autoconf:
+- On Debian and other platforms, C++ compiler is required because
+  autoconf macros to detect libtool depend on it.  (This is probably
+  an autoconf or libtool m4 macro bug, and the fact that it happens
+  on Debian is a red herring).

diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am
index 18e1b134ddf7363f13b6122b73474828d35341a6..6da54d6d30d7bf1d94b5396869c58481dd7aab22 100644 (file)
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -2,7 +2,7 @@
 SUBDIRS=python
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include
 DEPS = $(top_builddir)/src/libvirt.la
-LDADDS = @STATIC_BINARIES@ $(top_builddir)/src/libvirt.la 
+LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la 
 
 rebuild: examples.xml index.html
 

diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 17541130d80b4b50f392013d5bf338153e4ed3ea..c32e7b17d4f0ba5672b949b700486aee6d460c80 100644 (file)
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -11,7 +11,7 @@ libvirt_proxy_SOURCES = libvirt_proxy.c @top_srcdir@/src/xend_internal.c \
            @top_srcdir@/src/xen_internal.c @top_srcdir@/src/virterror.c \
            @top_srcdir@/src/sexpr.c @top_srcdir@/src/xml.c \
             @top_srcdir@/src/xs_internal.c
-libvirt_proxy_LDFLAGS =
+libvirt_proxy_LDFLAGS = $(WARN_CFLAGS)
 libvirt_proxy_DEPENDENCIES =
 libvirt_proxy_LDADD =
 

diff --git a/qemud/Makefile.am b/qemud/Makefile.am
index f4daaf4650d483e751c448a9f61a835927eccf8b..d2dbc80caa4daedc6a2448e8efeb11b5102021cd 100644 (file)
--- a/qemud/Makefile.am
+++ b/qemud/Makefile.am
@@ -19,7 +19,7 @@ libvirt_qemud_CFLAGS = \
         $(WARN_CFLAGS) -DLOCAL_STATE_DIR="\"$(localstatedir)\"" \
         -DSYSCONF_DIR="\"$(sysconfdir)\"" \
        -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\""
-libvirt_qemud_LDFLAGS = $(LIBXML_LIBS) $(SYSFS_LIBS)
+libvirt_qemud_LDFLAGS = $(WARN_CFLAGS) $(LIBXML_LIBS) $(SYSFS_LIBS)
 libvirt_qemud_DEPENDENCIES =
 libvirt_qemud_LDADD =
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 7741f242acf3f8182122ad2e1588ca2f173dc09a..bcf42f3610fba87299d65b7c347ca146616961e4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,7 +36,7 @@ libvirt_la_SOURCES =                                          \
 bin_PROGRAMS = virsh
 
 virsh_SOURCES = virsh.c console.c console.h
-virsh_LDFLAGS = $(COVERAGE_LDFLAGS)
+virsh_LDFLAGS = $(WARN_CFLAGS) $(COVERAGE_LDFLAGS)
 virsh_DEPENDENCIES = $(DEPS)
 virsh_LDADD = $(LDADDS) $(VIRSH_LIBS)
 virsh_CFLAGS = $(COVERAGE_CFLAGS)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 77a965e77d68e15c9de700058f43b86d24707e97..35c056c3c9adcd22481022cc976aeb2281918bae 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -25,6 +25,7 @@ INCLUDES = \
 LDADDS = \
        @STATIC_BINARIES@ \
        @LIBXML_LIBS@ \
+        $(WARN_CFLAGS) \
        $(LIBVIRT) \
         $(COVERAGE_LDFLAGS)
 

diff --git a/tests/xencapstest.c b/tests/xencapstest.c
index ecdea0ecf7abdaa4c767bd75453e6d3360370ff8..ab106e7f35afeb602ecbfe11d59a9635c5c158ef 100644 (file)
--- a/tests/xencapstest.c
+++ b/tests/xencapstest.c
@@ -1,4 +1,10 @@
 #include <stdio.h>
+#include <stdlib.h>
+
+#include "config.h"
+
+#ifdef WITH_XEN
+
 #include <string.h>
 
 #include "xml.h"
@@ -197,3 +203,13 @@ main(int argc, char **argv)
 
     exit(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }
+
+#else /* !WITH_XEN */
+
+int
+main (void)
+{
+    exit (EXIT_SUCCESS);
+}
+
+#endif /* !WITH_XEN */