Skip to content

D
Dnsmasq
Commit 3ddad246 authored by Simon Kelley's avatar Simon Kelley
Browse files
Options

Compile-in IPSET by default.

parent 6e37ab59
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
debian/rules
View file @ 3ddad246
...@@ -33,10 +33,8 @@ ifeq ($(DEB_BUILD_ARCH_OS),linux) ...@@ -33,10 +33,8 @@ ifeq ($(DEB_BUILD_ARCH_OS),linux)
endif endif
endif endif
ifeq (,$(filter noipset,$(DEB_BUILD_OPTIONS))) ifneq (,$(filter noipset,$(DEB_BUILD_OPTIONS)))
ifeq ($(DEB_BUILD_ARCH_OS),linux) COPTS += -DNO_IPSET
COPTS += -DHAVE_IPSET
endif
endif endif
ifneq (,$(filter nodhcp6,$(DEB_BUILD_OPTIONS))) ifneq (,$(filter nodhcp6,$(DEB_BUILD_OPTIONS)))
......
src/config.h
View file @ 3ddad246
...@@ -135,12 +135,12 @@ RESOLVFILE ...@@ -135,12 +135,12 @@ RESOLVFILE
#define HAVE_TFTP #define HAVE_TFTP
#define HAVE_SCRIPT #define HAVE_SCRIPT
#define HAVE_AUTH #define HAVE_AUTH
#define HAVE_IPSET
/* #define HAVE_LUASCRIPT */ /* #define HAVE_LUASCRIPT */
/* #define HAVE_BROKEN_RTC */ /* #define HAVE_BROKEN_RTC */
/* #define HAVE_DBUS */ /* #define HAVE_DBUS */
/* #define HAVE_IDN */ /* #define HAVE_IDN */
/* #define HAVE_CONNTRACK */ /* #define HAVE_CONNTRACK */
/* #define HAVE_IPSET */
/* Default locations for important system files. */ /* Default locations for important system files. */
...@@ -327,7 +327,7 @@ HAVE_SOCKADDR_SA_LEN ...@@ -327,7 +327,7 @@ HAVE_SOCKADDR_SA_LEN
#undef HAVE_AUTH #undef HAVE_AUTH
#endif #endif
#ifndef HAVE_LINUX_NETWORK #if defined(NO_IPSET) || !defined(HAVE_LINUX_NETWORK)
#undef HAVE_IPSET #undef HAVE_IPSET
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment