iproute2: detect iptables modules dir in configure.

Try to automatically detect iptables modules directory.

Make the configure script look for iptables modules.
This also makes it possible to specify it on the
command line while building via "make IPT_LIB_DIR=/foo/bar".

Signed-off-by: Andreas Henriksson <andreas@fatal.se>

diff --git a/configure b/configure
index 92a0b484d3539e3ad1365e845029d627449d6e6b..600fa96cefc56a40ddf6122852469586e5ac49bb 100755 (executable)
--- a/configure
+++ b/configure
@@ -3,6 +3,8 @@
 #
 INCLUDE=${1:-"$PWD/include"}
 
+TABLES=
+
 check_atm()
 {
 cat >/tmp/atmtest.c <<EOF
@@ -139,9 +141,28 @@ check_ipt()
        if ! grep TC_CONFIG_XT Config > /dev/null
        then
                echo "using iptables"
+               TABLES="iptables"
+       else
+               TABLES="xtables"
        fi
 }
 
+check_ipt_lib_dir()
+{
+       IPT_LIB_DIR=""
+       for dir in /lib /usr/lib /usr/local/lib
+       do
+               for file in $dir/$TABLES/lib*t_*so ; do
+                       if [ -f $file ]; then
+                               echo $dir/$TABLES
+                               echo "IPT_LIB_DIR:=$dir/$TABLES" >> Config
+                               return
+                       fi
+               done
+       done
+       echo "not found!"
+}
+
 echo "# Generated config based on" $INCLUDE >Config
 
 echo "TC schedulers"
@@ -155,3 +176,5 @@ check_xt_old
 check_xt_old_internal_h
 check_ipt
 
+echo -n "iptables modules directory: "
+check_ipt_lib_dir

diff --git a/tc/Makefile b/tc/Makefile
index 0b5d7d3e2f03d707b6abb4cf8cebb519b4d34d37..805c1087a0318bea1722dc452fb2abbc6807829d 100644 (file)
--- a/tc/Makefile
+++ b/tc/Makefile
@@ -77,6 +77,9 @@ TCLIB += tc_estimator.o
 TCLIB += tc_stab.o
 
 CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PROB
+ifneq ($(IPT_LIB_DIR),)
+       CFLAGS += -DIPT_LIB_DIR=\"$(IPT_LIB_DIR)\"
+endif
 
 TCSO :=
 ifeq ($(TC_CONFIG_ATM),y)