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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2

This commit is contained in:
Stephen Hemminger 2012-12-07 09:04:38 -08:00
parent 8b2f2d777c 8f2550ab5d
commit efa344f35c
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -3,6 +3,7 @@
# #
INCLUDE=${1:-"$PWD/include"} INCLUDE=${1:-"$PWD/include"}
: ${PKG_CONFIG:=pkg-config} : ${PKG_CONFIG:=pkg-config}
: ${CC=gcc}
echo "PKG_CONFIG:=${PKG_CONFIG}" >>Config echo "PKG_CONFIG:=${PKG_CONFIG}" >>Config
# Make a temp directory in build tree. # Make a temp directory in build tree.
@ -19,7 +20,7 @@ int main(int argc, char **argv) {
return 0; return 0;
} }
EOF EOF
gcc -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1 $CC -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
echo "TC_CONFIG_ATM:=y" >>Config echo "TC_CONFIG_ATM:=y" >>Config
@ -53,7 +54,7 @@ int main(int argc, char **argv)
EOF EOF
if gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL $(${PKG_CONFIG} xtables --cflags --libs) -ldl >/dev/null 2>&1 if $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL $(${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"
@ -90,7 +91,7 @@ int main(int argc, char **argv) {
} }
EOF EOF
gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
@ -130,7 +131,7 @@ int main(int argc, char **argv) {
} }
EOF EOF
gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
@ -180,7 +181,7 @@ int main(int argc, char **argv)
return 0; return 0;
} }
EOF EOF
gcc -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1 $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
echo "IP_CONFIG_SETNS:=y" >>Config echo "IP_CONFIG_SETNS:=y" >>Config
@ -212,7 +213,7 @@ int main(void)
#endif #endif
EOF EOF
if gcc -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"

1
etc/iproute2/ematch_map
View File

@ -3,4 +3,5 @@
2 nbyte 2 nbyte
3 u32 3 u32
4 meta 4 meta
7 canid
8 ipset 8 ipset