From 80d689d055b2169b390a7cd4ca2c01ba871d02a2 Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andreas@fatal.se>
Date: Wed, 2 Dec 2009 16:11:21 +0100
Subject: [PATCH] Keep the old tc/ipt/xt module for compatibility.

Move the file and rename the configure flags.
The file is being kept around for iptables < 1.4.5 compatibility.

Signed-off-by: Andreas Henriksson <andreas@fatal.se>
---
 configure                 |  4 ++--
 tc/Makefile               | 15 ++++++++++-----
 tc/{m_xt.c => m_xt_old.c} |  0
 3 files changed, 12 insertions(+), 7 deletions(-)
 rename tc/{m_xt.c => m_xt_old.c} (100%)

diff --git a/configure b/configure
index df40370a..f3b79b25 100755
--- a/configure
+++ b/configure
@@ -53,7 +53,7 @@ gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
 
 if [ $? -eq 0 ]
 then
-	echo "TC_CONFIG_XT:=y" >>Config
+	echo "TC_CONFIG_XT_OLD:=y" >>Config
 	echo "using xtables seems no need for internal.h"
 else
 	echo "failed test 2"
@@ -86,7 +86,7 @@ gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
 if [ $? -eq 0 ]
 then
 	echo "using xtables instead of iptables (need for internal.h)"
-	echo "TC_CONFIG_XT_H:=y" >>Config
+	echo "TC_CONFIG_XT_OLD_H:=y" >>Config
 
 else
 	echo "failed test 3 using iptables"
diff --git a/tc/Makefile b/tc/Makefile
index 027055cf..f3dd2b76 100644
--- a/tc/Makefile
+++ b/tc/Makefile
@@ -48,12 +48,17 @@ ifeq ($(TC_CONFIG_XT),y)
   TCMODULES += m_xt.o
   LDLIBS += -lxtables
 else
-  ifeq ($(TC_CONFIG_XT_H),y)
-	CFLAGS += -DTC_CONFIG_XT_H
-	TCMODULES += m_xt.o
-	LDLIBS += -lxtables
+  ifeq ($(TC_CONFIG_XT_OLD),y)
+    TCMODULES += m_xt_old.o
+    LDLIBS += -lxtables
   else
-  TCMODULES += m_ipt.o
+    ifeq ($(TC_CONFIG_XT_OLD_H),y)
+	CFLAGS += -DTC_CONFIG_XT_H
+	TCMODULES += m_xt_old.o
+	LDLIBS += -lxtables
+    else
+      TCMODULES += m_ipt.o
+    endif
   endif
 endif
 
diff --git a/tc/m_xt.c b/tc/m_xt_old.c
similarity index 100%
rename from tc/m_xt.c
rename to tc/m_xt_old.c