proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-08-14 05:16:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

configure: Minor code cleanup

Browse Source 
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
This commit is contained in:
Petr Vorel 2018-12-15 19:00:42 +01:00 committed by Stephen Hemminger
parent fce84d6450
commit 377a09902a
1 changed files with 20 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
configure vendored
View File

@ -32,9 +32,7 @@ int main(int argc, char **argv) {
} }
EOF EOF
$CC -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1 if $CC -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1; then
if [ $? -eq 0 ]
then
echo "TC_CONFIG_ATM:=y" >>$CONFIG echo "TC_CONFIG_ATM:=y" >>$CONFIG
echo yes echo yes
else else
@ -45,8 +43,7 @@ EOF
check_xtables() check_xtables()
{ {
if ! ${PKG_CONFIG} xtables --exists if ! ${PKG_CONFIG} xtables --exists; then
then
echo "TC_CONFIG_NO_XT:=y" >>$CONFIG echo "TC_CONFIG_NO_XT:=y" >>$CONFIG
fi fi
} }
@ -74,8 +71,7 @@ int main(int argc, char **argv)
EOF EOF
if $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL \ if $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL \
$(${PKG_CONFIG} xtables --cflags --libs) -ldl >/dev/null 2>&1 $(${PKG_CONFIG} xtables --cflags --libs) -ldl >/dev/null 2>&1; then
then
echo "TC_CONFIG_XT:=y" >>$CONFIG echo "TC_CONFIG_XT:=y" >>$CONFIG
echo "using xtables" echo "using xtables"
fi fi
@ -85,10 +81,7 @@ EOF
check_xt_old() check_xt_old()
{ {
# bail if previous XT checks has already succeeded. # bail if previous XT checks has already succeeded.
if grep -q TC_CONFIG_XT $CONFIG grep -q TC_CONFIG_XT $CONFIG && return
then
return
fi
#check if we don't need our internal header .. #check if we don't need our internal header ..
cat >$TMPDIR/ipttest.c <<EOF cat >$TMPDIR/ipttest.c <<EOF
@ -112,9 +105,7 @@ int main(int argc, char **argv) {
EOF EOF
$CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 if $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1; then
if [ $? -eq 0 ]
then
echo "TC_CONFIG_XT_OLD:=y" >>$CONFIG echo "TC_CONFIG_XT_OLD:=y" >>$CONFIG
echo "using old xtables (no need for xt-internal.h)" echo "using old xtables (no need for xt-internal.h)"
fi fi
@ -124,10 +115,7 @@ EOF
check_xt_old_internal_h() check_xt_old_internal_h()
{ {
# bail if previous XT checks has already succeeded. # bail if previous XT checks has already succeeded.
if grep -q TC_CONFIG_XT $CONFIG grep -q if grep -q TC_CONFIG_XT $CONFIG && return
then
return
fi
#check if we need our own internal.h #check if we need our own internal.h
cat >$TMPDIR/ipttest.c <<EOF cat >$TMPDIR/ipttest.c <<EOF
@ -151,10 +139,7 @@ int main(int argc, char **argv) {
} }
EOF EOF
$CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 if $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1; then
if [ $? -eq 0 ]
then
echo "using old xtables with xt-internal.h" echo "using old xtables with xt-internal.h"
echo "TC_CONFIG_XT_OLD_H:=y" >>$CONFIG echo "TC_CONFIG_XT_OLD_H:=y" >>$CONFIG
fi fi
@ -163,8 +148,7 @@ EOF
check_ipt() 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"
fi fi
} }
@ -178,8 +162,7 @@ check_ipt_lib_dir()
return return
fi fi
for dir in /lib /usr/lib /usr/local/lib for dir in /lib /usr/lib /usr/local/lib; do
do
for file in "xtables" "iptables"; do for file in "xtables" "iptables"; do
file="$dir/$file/lib*t_*so" file="$dir/$file/lib*t_*so"
if [ -f $file ]; then if [ -f $file ]; then
@ -202,9 +185,7 @@ int main(int argc, char **argv)
return 0; return 0;
} }
EOF EOF
$CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1 if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1; then
if [ $? -eq 0 ]
then
echo "IP_CONFIG_SETNS:=y" >>$CONFIG echo "IP_CONFIG_SETNS:=y" >>$CONFIG
echo "yes" echo "yes"
echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
@ -235,8 +216,7 @@ int main(void)
#endif #endif
EOF EOF
if $CC -I$INCLUDE -o $TMPDIR/ipsettest $TMPDIR/ipsettest.c >/dev/null 2>&1 if $CC -I$INCLUDE -o $TMPDIR/ipsettest $TMPDIR/ipsettest.c >/dev/null 2>&1; then
then
echo "TC_CONFIG_IPSET:=y" >>$CONFIG echo "TC_CONFIG_IPSET:=y" >>$CONFIG
echo "yes" echo "yes"
else else
@ -247,8 +227,7 @@ EOF
check_elf() check_elf()
{ {
if ${PKG_CONFIG} libelf --exists if ${PKG_CONFIG} libelf --exists; then
then
echo "HAVE_ELF:=y" >>$CONFIG echo "HAVE_ELF:=y" >>$CONFIG
echo "yes" echo "yes"
@ -262,8 +241,7 @@ check_elf()
check_selinux() check_selinux()
# SELinux is a compile time option in the ss utility # SELinux is a compile time option in the ss utility
{ {
if ${PKG_CONFIG} libselinux --exists if ${PKG_CONFIG} libselinux --exists; then
then
echo "HAVE_SELINUX:=y" >>$CONFIG echo "HAVE_SELINUX:=y" >>$CONFIG
echo "yes" echo "yes"
@ -276,8 +254,7 @@ check_selinux()
check_mnl() check_mnl()
{ {
if ${PKG_CONFIG} libmnl --exists if ${PKG_CONFIG} libmnl --exists; then
then
echo "HAVE_MNL:=y" >>$CONFIG echo "HAVE_MNL:=y" >>$CONFIG
echo "yes" echo "yes"
@ -299,9 +276,7 @@ int main(int argc, char **argv) {
return 0; return 0;
} }
EOF EOF
$CC -I$INCLUDE -o $TMPDIR/dbtest $TMPDIR/dbtest.c -ldb >/dev/null 2>&1 if $CC -I$INCLUDE -o $TMPDIR/dbtest $TMPDIR/dbtest.c -ldb >/dev/null 2>&1; then
if [ $? -eq 0 ]
then
echo "HAVE_BERKELEY_DB:=y" >>$CONFIG echo "HAVE_BERKELEY_DB:=y" >>$CONFIG
echo "yes" echo "yes"
else else
@ -320,13 +295,10 @@ int main(int argc, char **argv) {
return 0; return 0;
} }
EOF EOF
$CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1 if $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1; then
if [ $? -eq 0 ]
then
echo "no" echo "no"
else else
if ${PKG_CONFIG} libbsd --exists if ${PKG_CONFIG} libbsd --exists; then
then
echo 'CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG echo 'CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
echo "no" echo "no"
@ -340,8 +312,7 @@ EOF
check_cap() check_cap()
{ {
if ${PKG_CONFIG} libcap --exists if ${PKG_CONFIG} libcap --exists; then
then
echo "HAVE_CAP:=y" >>$CONFIG echo "HAVE_CAP:=y" >>$CONFIG
echo "yes" echo "yes"
@ -389,8 +360,7 @@ echo -n " ATM "
check_atm check_atm
check_xtables check_xtables
if ! grep -q TC_CONFIG_NO_XT $CONFIG if ! grep -q TC_CONFIG_NO_XT $CONFIG; then
then
echo -n " IPT " echo -n " IPT "
check_xt check_xt
check_xt_old check_xt_old
@ -402,8 +372,7 @@ then
fi fi
echo echo
if ! grep -q TC_CONFIG_NO_XT $CONFIG if ! grep -q TC_CONFIG_NO_XT $CONFIG; then
then
echo -n "iptables modules directory: " echo -n "iptables modules directory: "
check_ipt_lib_dir check_ipt_lib_dir
fi fi