+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.
+
This commit is contained in:
Richard W.M. Jones 2007-05-29 14:44:15 +00:00
parent c3e814684a
commit 0832c58c0a
8 changed files with 37 additions and 4 deletions

View File

@ -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> 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 * src/virsh.c src/xen_internal.c src/xend_internal.c: memory leaks

5
TODO
View File

@ -22,3 +22,8 @@ Cleanup:
- now that libxml2 is linked in, drop hash.[ch] and get back to libxml2 ones ? - now that libxml2 is linked in, drop hash.[ch] and get back to libxml2 ones ?
same for the buffers 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).

View File

@ -2,7 +2,7 @@
SUBDIRS=python SUBDIRS=python
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include
DEPS = $(top_builddir)/src/libvirt.la 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 rebuild: examples.xml index.html

View File

@ -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/xen_internal.c @top_srcdir@/src/virterror.c \
@top_srcdir@/src/sexpr.c @top_srcdir@/src/xml.c \ @top_srcdir@/src/sexpr.c @top_srcdir@/src/xml.c \
@top_srcdir@/src/xs_internal.c @top_srcdir@/src/xs_internal.c
libvirt_proxy_LDFLAGS = libvirt_proxy_LDFLAGS = $(WARN_CFLAGS)
libvirt_proxy_DEPENDENCIES = libvirt_proxy_DEPENDENCIES =
libvirt_proxy_LDADD = libvirt_proxy_LDADD =

View File

@ -19,7 +19,7 @@ libvirt_qemud_CFLAGS = \
$(WARN_CFLAGS) -DLOCAL_STATE_DIR="\"$(localstatedir)\"" \ $(WARN_CFLAGS) -DLOCAL_STATE_DIR="\"$(localstatedir)\"" \
-DSYSCONF_DIR="\"$(sysconfdir)\"" \ -DSYSCONF_DIR="\"$(sysconfdir)\"" \
-DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" -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_DEPENDENCIES =
libvirt_qemud_LDADD = libvirt_qemud_LDADD =

View File

@ -36,7 +36,7 @@ libvirt_la_SOURCES = \
bin_PROGRAMS = virsh bin_PROGRAMS = virsh
virsh_SOURCES = virsh.c console.c console.h virsh_SOURCES = virsh.c console.c console.h
virsh_LDFLAGS = $(COVERAGE_LDFLAGS) virsh_LDFLAGS = $(WARN_CFLAGS) $(COVERAGE_LDFLAGS)
virsh_DEPENDENCIES = $(DEPS) virsh_DEPENDENCIES = $(DEPS)
virsh_LDADD = $(LDADDS) $(VIRSH_LIBS) virsh_LDADD = $(LDADDS) $(VIRSH_LIBS)
virsh_CFLAGS = $(COVERAGE_CFLAGS) virsh_CFLAGS = $(COVERAGE_CFLAGS)

View File

@ -25,6 +25,7 @@ INCLUDES = \
LDADDS = \ LDADDS = \
@STATIC_BINARIES@ \ @STATIC_BINARIES@ \
@LIBXML_LIBS@ \ @LIBXML_LIBS@ \
$(WARN_CFLAGS) \
$(LIBVIRT) \ $(LIBVIRT) \
$(COVERAGE_LDFLAGS) $(COVERAGE_LDFLAGS)

View File

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