From: Roy Marples <roy@marples.name>
Date: Mon, 19 May 2008 14:45:05 +0000 (+0000)
Subject: Trap some config.h defines if they're in CFLAGS.
X-Git-Tag: v4.0.2~378
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9934ead60e17bf90ebb780812bbe77916d92c942;p=thirdparty%2Fdhcpcd.git

Trap some config.h defines if they're in CFLAGS.
---

diff --git a/config.h b/config.h
index 1dd3e0ad..b2a5e5d2 100644
--- a/config.h
+++ b/config.h
@@ -70,13 +70,22 @@
 # define DBDIR			"/var/db"
 #endif
 
-#define RESOLVFILE		"/etc/resolv.conf"
-#define CONFIGFILE		SYSCONFDIR "/" PACKAGE ".conf"
-#define SCRIPT			SYSCONFDIR "/" PACKAGE ".sh"
-#define DUIDFILE		SYSCONFDIR "/" PACKAGE ".duid"
-#define LEASEFILE		DBDIR "/" PACKAGE "-%s.lease"
-#define PIDFILE			RUNDIR "/" PACKAGE "-%s.pid"
+#ifndef CONFIGFILE
+# define CONFIGFILE		SYSCONFDIR "/" PACKAGE ".conf"
+#endif
+#ifndef SCRIPT
+# define SCRIPT			SYSCONFDIR "/" PACKAGE ".sh"
+#endif
+#ifndef DUIDFILE
+# define DUIDFILE		SYSCONFDIR "/" PACKAGE ".duid"
+#endif
+#ifndef LEASEFILE
+# define LEASEFILE		DBDIR "/" PACKAGE "-%s.lease"
+#endif
+#ifndef PIDFILE
+# define PIDFILE			RUNDIR "/" PACKAGE "-%s.pid"
+#endif
 
-#define UNCONST(a)	((void *)(unsigned long)(const void *)(a))
+#define UNCONST(a)		((void *)(unsigned long)(const void *)(a))
 
 #endif