commit 6209ae91100e282f0957937e008524c3b2c4121f Author: Frédéric Lécaille Date: Thu Feb 7 09:07:31 2019 +0100 Disable wrong tests run by configure. Also fix a compilation issue with tc (add -lxtables LDFLAGS). diff --git a/configure b/configure index 744d628..47d1dac 100755 --- a/configure +++ b/configure @@ -381,51 +381,60 @@ quiet_config >> $CONFIG check_toolchain -echo "TC schedulers" - -echo -n " ATM " -check_atm - -check_xtables -if ! grep -q TC_CONFIG_NO_XT $CONFIG -then - echo -n " IPT " - check_xt - check_xt_old - check_xt_old_internal_h - check_ipt - - echo -n " IPSET " - check_ipset -fi +echo "TC_CONFIG_XT:=y" >>$CONFIG +echo "TC_CONFIG_IPSET:=n" >>$CONFIG +echo "TC_CONFIG_ATM:=n" >>$CONFIG +echo "TC_CONFIG_ELF:=n" >>$CONFIG +echo "IP_CONFIG_SETNS:=y" >>$CONFIG +echo "IP_CONFIG_XT:=y" >>$CONFIG +echo "IPT_LIB_DIR:=\"${FLXROOTDIR}/lib\"" >>$CONFIG +echo "CFLAGS += -DHAVE_SETNS -DNEED_STRLCPY" >>$CONFIG + +#echo "TC schedulers" + +#echo -n " ATM " +#check_atm + +#check_xtables +#if ! grep -q TC_CONFIG_NO_XT $CONFIG +#then +# echo -n " IPT " +# check_xt +# check_xt_old +# check_xt_old_internal_h +# check_ipt +# +# echo -n " IPSET " +# check_ipset +#fi -echo -if ! grep -q TC_CONFIG_NO_XT $CONFIG -then - echo -n "iptables modules directory: " - check_ipt_lib_dir -fi +#echo +#if ! grep -q TC_CONFIG_NO_XT $CONFIG +#then +# echo -n "iptables modules directory: " +# check_ipt_lib_dir +#fi -echo -n "libc has setns: " -check_setns +#echo -n "libc has setns: " +#check_setns -echo -n "SELinux support: " -check_selinux +#echo -n "SELinux support: " +#check_selinux -echo -n "ELF support: " -check_elf +#echo -n "ELF support: " +#check_elf -echo -n "libmnl support: " -check_mnl +#echo -n "libmnl support: " +#check_mnl -echo -n "Berkeley DB: " -check_berkeley_db +#echo -n "Berkeley DB: " +#check_berkeley_db -echo -n "need for strlcpy: " -check_strlcpy +#echo -n "need for strlcpy: " +#check_strlcpy -echo -n "libcap support: " -check_cap +#echo -n "libcap support: " +#check_cap echo >> $CONFIG echo "%.o: %.c" >> $CONFIG diff --git a/tc/Makefile b/tc/Makefile index 5a1a7ff..66ca2e2 100644 --- a/tc/Makefile +++ b/tc/Makefile @@ -170,7 +170,7 @@ em_ipset.o: CFLAGS += $$($(PKG_CONFIG) xtables --cflags) em_ipt.o: CFLAGS += $$($(PKG_CONFIG) xtables --cflags) ifeq ($(TC_CONFIG_XT),y) - LDFLAGS += $$($(PKG_CONFIG) xtables --libs) + LDLIBS += -lxtables endif %.yacc.c: %.y