From d8ab020b6ace8d3ebb176c9d998dd36d77f0f096 Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net" Date: Sun, 13 Apr 2008 05:25:24 +0000 Subject: [PATCH 05/13] Combine IP{,6}T_LIB_DIR into XTABLES_LIBDIR --- iptables-standalone.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'iptables-standalone.c') diff --git a/iptables-standalone.c b/iptables-standalone.c index 55c7ce9..369adaf 100644 --- a/iptables-standalone.c +++ b/iptables-standalone.c @@ -53,9 +53,14 @@ main(int argc, char *argv[]) program_name = "iptables"; program_version = IPTABLES_VERSION; - lib_dir = getenv("IPTABLES_LIB_DIR"); - if (!lib_dir) - lib_dir = IPT_LIB_DIR; + lib_dir = getenv("XTABLES_LIBDIR"); + if (lib_dir == NULL) { + lib_dir = getenv("IPTABLES_LIB_DIR"); + if (lib_dir != NULL) + fprintf(stderr, "IPTABLES_LIB_DIR is deprecated\n"); + } + if (lib_dir == NULL) + lib_dir = XTABLES_LIBDIR; #ifdef NO_SHARED_LIBS init_extensions(); -- cgit v1.2.3