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

Make iproute2 configure script more flexible 

On Arch Linux, we still install the iptables shared libraries in
/usr/lib/iptables/, even though the main library is installed to
/usr/lib/libxtables.so. This change checks all available locations to
correctly find the iptables library directory.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-07-15 08:52:24 +00:00 committed by Stephen Hemminger
parent 05fb9184f2
commit 44e743e588
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure vendored
View File

@ -3,8 +3,6 @@
# #
INCLUDE=${1:-"$PWD/include"} INCLUDE=${1:-"$PWD/include"}
TABLES=
check_atm() check_atm()
{ {
cat >/tmp/atmtest.c <<EOF cat >/tmp/atmtest.c <<EOF
@ -141,9 +139,6 @@ 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
} }
@ -152,10 +147,10 @@ check_ipt_lib_dir()
IPT_LIB_DIR="" IPT_LIB_DIR=""
for dir in /lib /usr/lib /usr/local/lib for dir in /lib /usr/lib /usr/local/lib
do do
for file in $dir/$TABLES/lib*t_*so ; do for file in $dir/{xtables,iptables}/lib*t_*so ; do
if [ -f $file ]; then if [ -f $file ]; then
echo $dir/$TABLES echo ${file%/*}
echo "IPT_LIB_DIR:=$dir/$TABLES" >> Config echo "IPT_LIB_DIR:=${file%/*}" >> Config
return return
fi fi
done done