iproute2: detect iptables modules dir in configure.
Subsystems (2)
PATCH 1/1 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".
---
Possibly the ifndef check in include/iptables.h should be turned into an #error to force the person building to manually specify it instead of just silently using a probably incorrect path.
configure +23 -0
@@ -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
tc/Makefile +3 -0
@@ -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)
PATCH v2 1/1 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".
---
Possibly the ifndef check in include/iptables.h should be turned into an #error to force the person building to manually specify it instead of just silently using a probably incorrect path.
This is version 2 of the patch,
in v1 the escaping of the "'s in tc/Makefile was forgotten.
configure +23 -0
@@ -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
tc/Makefile +3 -0
@@ -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)
On tor, 2010-03-11 at 20:07 +0100, Andreas Henriksson wrote:
[...]
tc/Makefile TCLIB += tc_estimator.o · line 83
Quoted 10 lines
tc/Makefile +3
-0@@ -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
Sorry, I missed to escape the "'s above. I'll send a v2 in a few seconds.
Signature · 2 lines
Regards, Andreas Henriksson