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~73^2~1
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0f41196339521359d69420b8a5feaa02e134da1c;p=qemu-xen-4.3-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 f1d92c1c3..229b536bb 100644
--- a/vl.c
+++ b/vl.c
@@ -131,8 +131,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