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

Remove configuration options for stuff using our copied header files. 

(Logical change 1.62)
This commit is contained in:
osdl.net!shemminger 2004-08-09 16:35:28 +00:00
parent d7384952fc
commit 4b1bbd9c18
4 changed files with 12 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-08-09 Stephen Hemminger <shemminger@osdl.org>
* Remove configuration for everything that can depend on
extracted kernel headers
* Add kernel headers required to include/linux
2004-08-04 Stephen Hemminger <shemminger@osdl.org>
* Get rid of old tcp_diag module, it is part of kernel.

105
configure vendored
View File

@ -1,46 +1,11 @@
#! /bin/bash
# This is not an autconf generated configure
#
INCLUDE=${1:-"/usr/include"}
INCLUDE=${1:-"$PWD/include"}
echo "# Generated config based on" $INCLUDE >Config
echo -n "TC xfrm "
XFRM=$INCLUDE/linux/xfrm.h
if [ ! -r $XFRM ];
then
echo no
else
echo "IP_CONFIG_XFRM:=y" >>Config
echo yes
fi
echo "TC schedulers"
PKT_SCHED=$INCLUDE/linux/pkt_sched.h
if [ ! -r $PKT_SCHED ];
then
echo " can't find file" $PKT_SCHED
exit 1
fi
echo -n " netem "
cat >/tmp/netemtest.c <<EOF
#include <asm/types.h>
#include <linux/pkt_sched.h>
int main(int argc, char **argv) {
static struct tc_netem_qopt qopt;
exit(qopt.latency | qopt.limit | qopt.loss | qopt.gap | qopt.duplicate | qopt.jitter);
}
EOF
gcc -I$INCLUDE -c /tmp/netemtest.c >/dev/null 2>&1
if [ $? -eq 0 ]
then
echo "TC_CONFIG_NETEM:=y" >>Config
echo yes
else
echo no
fi
rm -f /tmp/netemtest.c /tmp/netemtest.o
echo -n " ATM "
cat >/tmp/atmtest.c <<EOF
@ -61,71 +26,3 @@ else
fi
rm -f /tmp/atmtest.c /tmp/atmtest
echo -n " HTB "
DEF_HTB=`grep '^#define HTB_TC_VER' tc/q_htb.c`
cat >/tmp/htbtest.c <<EOF
#include <stdio.h>
#include <asm/types.h>
#include <linux/pkt_sched.h>
$DEF_HTB
int main(int argc, char **argv) {
if (HTB_TC_VER >>16 != TC_HTB_PROTOVER) {
fprintf(stderr, "different kernel and TC HTB versions\n");
return 1;
}
return 0;
}
EOF
gcc -I$INCLUDE -o /tmp/htbtest /tmp/htbtest.c >/dev/null 2>&1
if [ $? -eq 0 -a /tmp/htbtest ]
then
echo "TC_CONFIG_HTB:=y" >>Config
echo yes
else
echo no
fi
rm -f /tmp/htbtest /tmp/htbtest.c
echo -n " HFSC "
cat >/tmp/hfsctest.c <<EOF
#include <asm/types.h>
#include <linux/pkt_sched.h>
int main(int argc, char **argv) {
static struct tc_hfsc_qopt qopt;
exit(qopt.defcls);
}
EOF
gcc -I$INCLUDE -c /tmp/hfsctest.c >/dev/null 2>&1
if [ $? -eq 0 ]
then
echo "TC_CONFIG_HFSC:=y" >>Config
echo yes
else
echo no
fi
rm -f /tmp/hfsctest.c /tmp/hfsctest.o
# See if we know about TCP Vegas
echo "SS"
echo -n " TCP Vegas "
if grep -q TCPDIAG_VEGASINFO $INCLUDE/linux/tcp_diag.h >/dev/null 2>&1
then
echo "SS_CONFIG_VEGAS:=y" >>Config
echo yes
else
echo no
fi
echo -n " TCP DRS "
if grep -q tcpi_rcv_space $INCLUDE/linux/tcp.h
then
echo "SS_CONFIG_DRS:=y" >>Config
echo yes
else
echo no
fi

11
ip/Makefile
View File

@ -1,14 +1,7 @@
IPOBJ=ip.o ipaddress.o iproute.o iprule.o \
rtm_map.o iptunnel.o ipneigh.o iplink.o \
ipmaddr.o ipmonitor.o ipmroute.o
include ../Config
ifeq ($(IP_CONFIG_XFRM),y)
IPOBJ += ipxfrm.o xfrm_state.o xfrm_policy.o
else
IPOBJ += xfrm_stub.o
endif
ipmaddr.o ipmonitor.o ipmroute.o \
ipxfrm.o xfrm_state.o xfrm_policy.o
RTMONOBJ=rtmon.o

15
tc/Makefile
View File

@ -17,18 +17,9 @@ TCMODULES += q_dsmark.o
TCMODULES += q_gred.o
TCMODULES += f_tcindex.o
TCMODULES += q_ingress.o
ifeq ($(TC_CONFIG_HFSC),y)
TCMODULES += q_hfsc.o
endif
ifeq ($(TC_CONFIG_HTB),y)
TCMODULES += q_htb.o
endif
# deadmen walking
#TCMODULES += q_csz.o
#TCMODULES += q_hpfq.o
TCMODULES += q_netem.o
TCOBJ += $(TCMODULES)
@ -42,10 +33,6 @@ ifeq ($(TC_CONFIG_ATM),y)
TCSO += q_atm.so
endif
ifeq ($(TC_CONFIG_NETEM),y)
TCSO += q_netem.so
endif
LDLIBS += -L. -ltc -lm -ldl
LDFLAGS += -Wl,-export-dynamic