From 127ea40ae7ae9a549212a52e0175beb33b25f627 Mon Sep 17 00:00:00 2001 From: Simon Kelley Date: Sat, 11 Feb 2012 22:14:52 +0000 Subject: [PATCH] Don't build DHCPv6 by default, except when build Debian package. --- debian/rules | 8 ++++---- src/config.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/rules b/debian/rules index 6416ba9..08a9b1c 100755 --- a/debian/rules +++ b/debian/rules @@ -33,6 +33,10 @@ ifeq ($(DEB_BUILD_ARCH_OS),linux) endif endif +ifeq (,$(filter nodhcp6,$(DEB_BUILD_OPTIONS))) + COPTS += -DHAVE_DHCP6 +endif + ifneq (,$(filter noipv6,$(DEB_BUILD_OPTIONS))) COPTS += -DNO_IPV6 endif @@ -45,10 +49,6 @@ ifneq (,$(filter nodhcp,$(DEB_BUILD_OPTIONS))) COPTS += -DNO_DHCP endif -ifneq (,$(filter nodhcp6,$(DEB_BUILD_OPTIONS))) - COPTS += -DNO_DHCP6 -endif - ifneq (,$(filter noscript,$(DEB_BUILD_OPTIONS))) COPTS += -DNO_SCRIPT endif diff --git a/src/config.h b/src/config.h index 63e7488..ecf1c42 100644 --- a/src/config.h +++ b/src/config.h @@ -116,7 +116,7 @@ RESOLVFILE has no library dependencies other than libc */ #define HAVE_DHCP -#define HAVE_DHCP6 +/* #define HAVE_DHCP6 */ #define HAVE_TFTP #define HAVE_SCRIPT /* #define HAVE_LUASCRIPT */