commit 39bf9c8214d3073a496a8a1eff91046a8d6fbbdf
author Jan Engelhardt <jengelh@medozas.de> Tue Jan 27 15:59:06 2009 +0100
committer Jan Engelhardt <jengelh@medozas.de> Tue Jan 27 23:14:30 2009 +0100
tree 2dd9a61eb114cdaaa6fe44f895784f112d24ca56
parent 2338efd8f799d8373dc196c797bda9690283b698

libxtables: prefix/order - libdir

Consolidate the libdir variable initialization code into xtables.c.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

iptables-standalone.c

diff --git a/iptables-standalone.c b/iptables-standalone.c
index 3f2432f..c06b286 100644
--- a/iptables-standalone.c
+++ b/iptables-standalone.c
@@ -53,16 +53,7 @@
 	program_name = "iptables";
 	program_version = XTABLES_VERSION;
 
-	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, "
-			        "use XTABLES_LIBDIR.\n");
-	}
-	if (lib_dir == NULL)
-		lib_dir = XTABLES_LIBDIR;
-
+	xtables_init();
 #ifdef NO_SHARED_LIBS
 	init_extensions();
 #endif