From: shemminger <shemminger>
Date: Tue, 5 Jul 2005 22:11:37 +0000 (+0000)
Subject: Fix build issues
X-Git-Tag: ss-050808~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52d5ac3fcb616d3e1979fb91c12213aa2a5bf75e;p=thirdparty%2Fiproute2.git

Fix build issues
---

diff --git a/ChangeLog b/ChangeLog
index ab4f7a1b4..0d457a70e 100644
--- 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 ac58cd97e..6b1edafd3 100644
--- 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 549bcc3b7..67fe62786 100644
--- 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 5da97b6f8..9d618ffce 100644
--- 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$@ $<