summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-08-16 18:03:44 +0100
committerPaul Jakma <paul@quagga.net>2008-08-22 19:56:25 +0100
commitcadfb2cd81528fc6f85af24dbf0ff3fd0ff63e6b (patch)
tree9b21ab9fe0e4836dc1ea11e0571f4f4ba458d94d
parent4cde931e2d5a83708cf55e63eae7b629e8e4296a (diff)
[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>
-rwxr-xr-xconfigure.ac17
1 files changed, 9 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index e3a09968..87ec96c4 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)