red: fix adaptive spelling

[lisovros/iproute2_canprio.git] / configure

diff --git a/configure b/configure
index 600fa96cefc56a40ddf6122852469586e5ac49bb..09a6987600fb2b8fa9749e146a6a3a67f4ad67a3 100755 (executable)
--- a/configure
+++ b/configure
@@ -3,8 +3,6 @@
 #
 INCLUDE=${1:-"$PWD/include"}
 
-TABLES=
-
 check_atm()
 {
 cat >/tmp/atmtest.c <<EOF
@@ -49,7 +47,7 @@ int main(int argc, char **argv)
 
 EOF
 
-if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1
+if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1
 then
        echo "TC_CONFIG_XT:=y" >>Config
        echo "using xtables"
@@ -65,7 +63,7 @@ then
        return
 fi
 
-#check if we need dont our internal header ..
+#check if we dont need our internal header ..
 cat >/tmp/ipttest.c <<EOF
 #include <xtables.h>
 char *lib_dir;
@@ -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
@@ -163,6 +158,27 @@ check_ipt_lib_dir()
        echo "not found!"
 }
 
+check_setns()
+{
+cat >/tmp/setnstest.c <<EOF
+#include <sched.h>
+int main(int argc, char **argv) 
+{
+       (void)setns(0,0);
+       return 0;
+}
+EOF
+gcc -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c >/dev/null 2>&1
+if [ $? -eq 0 ]
+then
+       echo "IP_CONFIG_SETNS:=y" >>Config
+       echo "yes"
+else
+       echo "no"
+fi
+rm -f /tmp/setnstest.c /tmp/setnstest
+}
+
 echo "# Generated config based on" $INCLUDE >Config
 
 echo "TC schedulers"
@@ -178,3 +194,6 @@ check_ipt
 
 echo -n "iptables modules directory: "
 check_ipt_lib_dir
+
+echo -n "libc has setns: "
+check_setns