From b79ec69027fd8b65e7eccd78a445b6665e8ad53b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 23 Jul 2009 17:41:21 +0200 Subject: build: combine iptables-multi and iptables-static Changed the Makefile so that: 1. --enable-shared / --disable-shared control the linkage against libdl (and thus the potential to use 3rd party extensions) 2. --enable-static / --disable-static controls whether shipped extensions are built-in or provided as modules iptables-static becomes redundant by this action; iptables-multi now has the feature. Signed-off-by: Jan Engelhardt --- iptables-restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'iptables-restore.c') diff --git a/iptables-restore.c b/iptables-restore.c index 5108fda6..86d63e28 100644 --- a/iptables-restore.c +++ b/iptables-restore.c @@ -140,7 +140,7 @@ main(int argc, char *argv[]) iptables_globals.program_version); exit(1); } -#ifdef NO_SHARED_LIBS +#if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS) init_extensions(); #endif -- cgit v1.2.3