From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Sat, 16 Aug 2008 17:03:44 +0000 (+0100)
Subject: [build] Linux netlink doesn't need IF_PROC
X-Git-Tag: frr-2.0-rc1~2382
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=cadfb2cd81528fc6f85af24dbf0ff3fd0ff63e6b;p=mirror%2Ffrr.git

[build] Linux netlink doesn't need IF_PROC

2008-08-16 Stephen Hemminger <stephen.hemminger@vyatta.com>

	* configure.ac: If netlink is available, then that is how the
	initial routes and interfaces should be read, rather than through
	/proc, so don't set IF_PROC.

Signed-off-by: Paul Jakma <paul@quagga.net>
---

diff --git a/configure.ac b/configure.ac
index e3a0996880..87ec96c4fa 100755
--- a/configure.ac
+++ b/configure.ac
@@ -931,14 +931,15 @@ fi
 dnl -----------------------
 dnl check proc file system.
 dnl -----------------------
-if test -r /proc/net/dev; then
-  AC_DEFINE(HAVE_PROC_NET_DEV,,/proc/net/dev)
-  IF_PROC=if_proc.o
-fi
-
-if test -r /proc/net/if_inet6; then
-  AC_DEFINE(HAVE_PROC_NET_IF_INET6,,/proc/net/if_inet6)
-  IF_PROC=if_proc.o
+if test "$netlink" != yes; then
+  if test -r /proc/net/dev; then
+    AC_DEFINE(HAVE_PROC_NET_DEV,,/proc/net/dev)
+    IF_PROC=if_proc.o
+  fi
+  if test -r /proc/net/if_inet6; then
+    AC_DEFINE(HAVE_PROC_NET_IF_INET6,,/proc/net/if_inet6)
+    IF_PROC=if_proc.o
+  fi
 fi
 AC_SUBST(IF_PROC)