mirror of
https://git.proxmox.com/git/mirror_iproute2
synced 2025-12-08 01:35:20 +00:00
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:
parent
05fb9184f2
commit
44e743e588
11
configure
vendored
11
configure
vendored
@ -3,8 +3,6 @@
|
||||
#
|
||||
INCLUDE=${1:-"$PWD/include"}
|
||||
|
||||
TABLES=
|
||||
|
||||
check_atm()
|
||||
{
|
||||
cat >/tmp/atmtest.c <<EOF
|
||||
@ -141,9 +139,6 @@ check_ipt()
|
||||
if ! grep TC_CONFIG_XT Config > /dev/null
|
||||
then
|
||||
echo "using iptables"
|
||||
TABLES="iptables"
|
||||
else
|
||||
TABLES="xtables"
|
||||
fi
|
||||
}
|
||||
|
||||
@ -152,10 +147,10 @@ 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
|
||||
for file in $dir/{xtables,iptables}/lib*t_*so ; do
|
||||
if [ -f $file ]; then
|
||||
echo $dir/$TABLES
|
||||
echo "IPT_LIB_DIR:=$dir/$TABLES" >> Config
|
||||
echo ${file%/*}
|
||||
echo "IPT_LIB_DIR:=${file%/*}" >> Config
|
||||
return
|
||||
fi
|
||||
done
|
||||
|
||||
Loading…
Reference in New Issue
Block a user