Fix build issues

diff --git a/ChangeLog b/ChangeLog
index ab4f7a1b4ed3d1a76da71b896b0b41bbdc6aa27e..0d457a70e5a7d78363b6377318a7e72ccc0763e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-05  Thomas Graf <tgraf@suug.ch>
+
+       * Build check for GNU Bison
+
 2005-06-23  Jamal Hadi Salim <hadi@znyx.com>
 
        * Fix for options process with ipt

diff --git a/Makefile b/Makefile
index ac58cd97e52f2287198599541c21c0683562b6e2..6b1edafd38c2f8b5fa8a7c8688569e2ffb8197cc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,10 +31,17 @@ SUBDIRS=lib ip tc misc netem
 
 LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
 
-all: Config
+all: flex_check Config
        @for i in $(SUBDIRS); \
        do $(MAKE) $(MFLAGS) -C $$i; done
 
+flex_check:
+       @if [ -z "`flex -h | grep '^Usage: flex '`" ]; then \
+               echo "GNU flex required, please install it."; \
+               echo " see http://lex.sourceforge.net"; \
+               exit 1; \
+       fi
+
 Config:
        sh configure $(KERNEL_INCLUDE)
 

diff --git a/misc/ss.c b/misc/ss.c
index 549bcc3b73c200982f4ab3840465821f0d564f2e..67fe627861a4112cb1c6760e3016cf347e1f1b40 100644 (file)
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -1338,6 +1338,7 @@ static void tcp_show_info(const struct nlmsghdr *nlh, struct tcpdiagmsg *r)
                        if (info->tcpi_options & TCPI_OPT_ECN)
                                printf(" ecn");
                }
+
                if (tb[TCPDIAG_CONG])
                        printf("%s", (char *) RTA_DATA(tb[TCPDIAG_CONG]));
 
@@ -1355,7 +1356,7 @@ static void tcp_show_info(const struct nlmsghdr *nlh, struct tcpdiagmsg *r)
                        printf(" cwnd:%d", info->tcpi_snd_cwnd);
                if (info->tcpi_snd_ssthresh < 0xFFFF)
                        printf(" ssthresh:%d", info->tcpi_snd_ssthresh);
-               
+
                rtt = (double) info->tcpi_rtt;
                if (tb[TCPDIAG_VEGASINFO]) {
                        const struct tcpvegas_info *vinfo

diff --git a/tc/Makefile b/tc/Makefile
index 5da97b6f8dfd048b97c56da5b401ef72afd1a0bd..9d618ffcef30d5b658f842aac94e63ac1eaca743 100644 (file)
--- a/tc/Makefile
+++ b/tc/Makefile
@@ -86,4 +86,4 @@ q_atm.so: q_atm.c
        $(YACC) $(YACCFLAGS) -o $@ $<
 
 %.lex.c: %.l
-       $(LEX) $(LEXFLAGS) -o $@ $<
+       $(LEX) $(LEXFLAGS) -o$@ $<