]>
Commit | Line | Data |
---|---|---|
f92f7747 SP |
1 | --- quagga-0.99.22.4/configure.ac 2013-09-04 21:25:43.000000000 +0200 |
2 | +++ quagga-0.99.22.4.new/configure.ac 2014-05-02 18:39:27.281182113 +0200 | |
3 | @@ -1050,45 +1050,15 @@ | |
93a225ee JB |
4 | dnl ----------------------- |
5 | dnl check proc file system. | |
6 | dnl ----------------------- | |
3a0c03bd | 7 | -if test "$netlink" != yes; then |
8 | - if test -r /proc/net/dev; then | |
bf45d010 TP |
9 | AC_DEFINE(HAVE_PROC_NET_DEV,,/proc/net/dev) |
10 | IF_PROC=if_proc.o | |
3a0c03bd | 11 | - fi |
12 | - if test -r /proc/net/if_inet6; then | |
bf45d010 | 13 | AC_DEFINE(HAVE_PROC_NET_IF_INET6,,/proc/net/if_inet6) |
3a0c03bd | 14 | - IF_PROC=if_proc.o |
15 | - fi | |
93a225ee | 16 | -fi |
93a225ee JB |
17 | AC_SUBST(IF_PROC) |
18 | ||
19 | dnl ----------------------------- | |
20 | dnl check ipforward detect method | |
21 | dnl ----------------------------- | |
bf45d010 | 22 | -AC_CACHE_CHECK([ipforward method], [quagga_cv_ipforward_method], |
f92f7747 SP |
23 | -[if test x$cross_compiling = xyes; then |
24 | - if test x"$opsys" = x"gnu-linux"; then | |
25 | - quagga_cv_ipforward_method=/proc/net/snmp | |
26 | - else | |
27 | - quagga_cv_ipforward_method=/dev/ip | |
28 | - fi | |
29 | -else | |
30 | - for quagga_cv_ipforward_method in /proc/net/snmp /dev/ip /dev/null; | |
31 | - do | |
32 | - test x`ls $quagga_cv_ipforward_method 2>/dev/null` = x"$quagga_cv_ipforward_method" && break | |
33 | - done | |
34 | -fi | |
bf45d010 TP |
35 | -case $quagga_cv_ipforward_method in |
36 | - "/proc/net/snmp") quagga_cv_ipforward_method="proc";; | |
93a225ee JB |
37 | - "/dev/ip") |
38 | - case "$host" in | |
bf45d010 TP |
39 | - *-nec-sysv4*) quagga_cv_ipforward_method="ews";; |
40 | - *-freebsd*) quagga_cv_ipforward_method="sysctl";; | |
41 | - *) quagga_cv_ipforward_method="solaris";; | |
93a225ee | 42 | - esac;; |
bf45d010 | 43 | - *) quagga_cv_ipforward_method="sysctl";; |
93a225ee | 44 | -esac]) |
bf45d010 | 45 | -IPFORWARD=ipforward_${quagga_cv_ipforward_method}.o |
93a225ee | 46 | +IPFORWARD=ipforward_proc.o |
93a225ee JB |
47 | AC_SUBST(IPFORWARD) |
48 | ||
49 | AC_CHECK_FUNCS(getaddrinfo, [have_getaddrinfo=yes], [have_getaddrinfo=no]) |