matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Andreas Henriksson 2010-03-11 10:54:31 +00:00 committed by Stephen Hemminger
parent 800b444016
commit 12ddfff76c
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configure vendored
View File

@ -3,6 +3,8 @@
# #
INCLUDE=${1:-"$PWD/include"} INCLUDE=${1:-"$PWD/include"}
TABLES=
check_atm() check_atm()
{ {
cat >/tmp/atmtest.c <<EOF cat >/tmp/atmtest.c <<EOF
@ -139,9 +141,28 @@ check_ipt()
if ! grep TC_CONFIG_XT Config > /dev/null if ! grep TC_CONFIG_XT Config > /dev/null
then then
echo "using iptables" echo "using iptables"
TABLES="iptables"
else
TABLES="xtables"
fi 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 "# Generated config based on" $INCLUDE >Config
echo "TC schedulers" echo "TC schedulers"
@ -155,3 +176,5 @@ check_xt_old
check_xt_old_internal_h check_xt_old_internal_h
check_ipt check_ipt
echo -n "iptables modules directory: "
check_ipt_lib_dir

3
tc/Makefile
View File

@ -77,6 +77,9 @@ TCLIB += tc_estimator.o
TCLIB += tc_stab.o TCLIB += tc_stab.o
CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PROB CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PROB
ifneq ($(IPT_LIB_DIR),)
CFLAGS += -DIPT_LIB_DIR=\"$(IPT_LIB_DIR)\"
endif
TCSO := TCSO :=
ifeq ($(TC_CONFIG_ATM),y) ifeq ($(TC_CONFIG_ATM),y)