diff --git a/debian/rules b/debian/rules index b1cbb17..e658683 100755 --- a/debian/rules +++ b/debian/rules @@ -33,10 +33,8 @@ ifeq ($(DEB_BUILD_ARCH_OS),linux) endif endif -ifeq (,$(filter noipset,$(DEB_BUILD_OPTIONS))) -ifeq ($(DEB_BUILD_ARCH_OS),linux) - COPTS += -DHAVE_IPSET -endif +ifneq (,$(filter noipset,$(DEB_BUILD_OPTIONS))) + COPTS += -DNO_IPSET endif ifneq (,$(filter nodhcp6,$(DEB_BUILD_OPTIONS))) diff --git a/src/config.h b/src/config.h index 9c8e785..e412007 100644 --- a/src/config.h +++ b/src/config.h @@ -135,12 +135,12 @@ RESOLVFILE #define HAVE_TFTP #define HAVE_SCRIPT #define HAVE_AUTH +#define HAVE_IPSET /* #define HAVE_LUASCRIPT */ /* #define HAVE_BROKEN_RTC */ /* #define HAVE_DBUS */ /* #define HAVE_IDN */ /* #define HAVE_CONNTRACK */ -/* #define HAVE_IPSET */ /* Default locations for important system files. */ @@ -327,7 +327,7 @@ HAVE_SOCKADDR_SA_LEN #undef HAVE_AUTH #endif -#ifndef HAVE_LINUX_NETWORK +#if defined(NO_IPSET) || !defined(HAVE_LINUX_NETWORK) #undef HAVE_IPSET #endif