Use test program to make sure netem is correct type.

(Logical change 1.57)

diff --git a/ChangeLog b/ChangeLog
index 4d33355a419de44898ab1d3ac36e0b69769a6f90..fc90c6a44e02140d5c9b84d78d548ed69f9f7334 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-30  Stephen Hemminger  <shemminger@osdl.org>
+
+       * Change configure script to make sure netem is the correct
+         version. I changed the structure def. a couple of times before
+         settling on the final API
+
 2004-07-07  Stephen Hemminger  <shemminger@osdl.org>
 
        * Fix if_ether.h to fix arpd build

diff --git a/configure b/configure
index a805702ac8c9de6139959f95c95ffd7552ba42f5..ea91719b2e7f102d51bf2146713873d944c4b211 100644 (file)
--- a/configure
+++ b/configure
@@ -14,13 +14,23 @@ then
 fi
 
 echo -n " netem scheduler... "
-if grep -q 'tc_netem_qopt' $PKT_SCHED
-then
+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 y
 else
     echo n
 fi
+rm -f /tmp/netemtest.c /tmp/netemtest.o
 
 echo -n " ATM...              "
 cat >/tmp/atmtest.c <<EOF
@@ -31,7 +41,7 @@ int main(int argc, char **argv) {
        return 0;
 }
 EOF
-gcc -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 
+gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 
 if [ $? -eq 0 ]
 then
     echo "TC_CONFIG_ATM:=y" >>Config
@@ -39,6 +49,7 @@ then
 else
     echo n
 fi
+rm -f /tmp/atmtest.c /tmp/atmtest
 
 # See if we know about TCP Vegas
 echo "SS"