Mon Nov 26 11:49:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>

* src/bridge.c, src/bridge.h, src/qemu_conf.c, src/qemu_conf.h,
	  src/qemu_driver.c, src/qemu_driver.h, src/test.c: Disable more
	  of qemu if configured --without-qemu.

ChangeLog

@@ -1,3 +1,9 @@
+Mon Nov 26 11:49:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
+
+	* src/bridge.c, src/bridge.h, src/qemu_conf.c, src/qemu_conf.h,
+	  src/qemu_driver.c, src/qemu_driver.h, src/test.c: Disable more
+	  of qemu if configured --without-qemu.
+
 Mon Nov 26 11:47:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
 
 	* src/remote_internal.c: Miscellaneous header file fixes for

src/bridge.c

@@ -21,6 +21,8 @@
 
 #include <config.h>
 
+#ifdef WITH_QEMU
+
 #include "bridge.h"
 
 #include <stdlib.h>
@@ -767,6 +769,8 @@ brSetEnableSTP(brControl *ctl ATTRIBUTE_UNUSED,
     return retval;
 }
 
+#endif /* WITH_QEMU */
+
 /*
  * Local variables:
  *  indent-tabs-mode: nil

src/bridge.h

@@ -22,6 +22,10 @@
 #ifndef __QEMUD_BRIDGE_H__
 #define __QEMUD_BRIDGE_H__
 
+#include "config.h"
+
+#ifdef WITH_QEMU
+
 #include <net/if.h>
 #include <netinet/in.h>
 
@@ -97,6 +101,8 @@ int     brGetEnableSTP          (brControl *ctl,
                                  const char *bridge,
                                  int *enable);
 
+#endif /* WITH_QEMU */
+
 #endif /* __QEMUD_BRIDGE_H__ */
 
 /*

src/qemu_conf.c

@@ -21,7 +21,9 @@
  * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
-#include <config.h>
+#include "config.h"
+
+#ifdef WITH_QEMU
 
 #include <dirent.h>
 #include <string.h>
@@ -3264,6 +3266,7 @@ int qemudDeleteConfig(virConnectPtr conn,
     return 0;
 }
 
+#endif /* WITH_QEMU */
 
 /*
  * Local variables:

src/qemu_conf.h

@@ -24,6 +24,10 @@
 #ifndef __QEMUD_CONF_H
 #define __QEMUD_CONF_H
 
+#include "config.h"
+
+#ifdef WITH_QEMU
+
 #include "internal.h"
 #include "bridge.h"
 #include "iptables.h"
@@ -429,7 +433,9 @@ struct qemu_arch_info {
 };
 extern struct qemu_arch_info qemudArchs[];
 
-#endif
+#endif /* WITH_QEMU */
+
+#endif /* __QEMUD_CONF_H */
 
 /*
  * Local variables:

src/qemu_driver.c

@@ -21,7 +21,9 @@
  * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
-#include <config.h>
+#include "config.h"
+
+#ifdef WITH_QEMU
 
 #define _GNU_SOURCE /* for asprintf */
 
@@ -2922,6 +2924,8 @@ int qemudRegister(void) {
     return 0;
 }
 
+#endif /* WITH_QEMU */
+
 /*
  * Local variables:
  *  indent-tabs-mode: nil

src/qemu_driver.h

@@ -25,12 +25,17 @@
 #ifndef QEMUD_DRIVER_H
 #define QEMUD_DRIVER_H
 
+#include "config.h"
+
+#ifdef WITH_QEMU
+
 #include "internal.h"
 
 int qemudRegister(void);
 
-#endif
+#endif /* WITH_QEMU */
 
+#endif /* QEMUD_DRIVER_H */
 
 /*
  * Local variables:

src/test.c

@@ -21,6 +21,8 @@
  * Daniel Berrange <berrange@redhat.com>
  */
 
+#include "config.h"
+
 #ifdef WITH_TEST
 
 #define _GNU_SOURCE /* for asprintf */