From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Thu, 12 Jun 2008 15:25:35 +0000 (+0100)
Subject: Do not redefine DEFAULT_NETWORK_{,DOWN_}SCRIPT if already defined eg by some config.h
X-Git-Tag: xen-3.3.0-rc1~75
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b4da1b7b617fa27890b646aaf98fcc0b7879619f;p=qemu-xen-3.4-testing.git

Do not redefine DEFAULT_NETWORK_{,DOWN_}SCRIPT if already defined eg by some config.h
---

diff --git a/vl.c b/vl.c
index ea933dd7..17f501b0 100644
--- a/vl.c
+++ b/vl.c
@@ -133,8 +133,10 @@ int inet_aton(const char *cp, struct in_addr *ia);
 
 #include "exec-all.h"
 
+#ifndef DEFAULT_NETWORK_SCRIPT
 #define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
 #define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
+#endif
 #ifdef __sun__
 #define SMBD_COMMAND "/usr/sfw/sbin/smbd"
 #else