diff options
| author | David Lamparter <equinox@diac24.net> | 2009-09-16 02:11:00 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2010-02-03 05:18:41 +0100 |
| commit | 48e8684333c45b6dbf32de4dd2434c739aafb2bc (patch) | |
| tree | 5fcc54c81350ee8b51bc4f4f331e4c7b848c764a | |
| parent | 7b7d53572bebde6c8019d724e1df07ccb3f5d71c (diff) | |
| download | quagga-48e8684333c45b6dbf32de4dd2434c739aafb2bc.tar.bz2 quagga-48e8684333c45b6dbf32de4dd2434c739aafb2bc.tar.xz | |
build: fixup autoconf for cross-compiling (to OpenWRT)
MALLOC/REALLOC aren't used properly (no rpl_malloc), remove them
while at it, infer some sane ipforwarding method from the OS value.
(v2 on that, "==" is not a proper operator for standard "test")
| -rwxr-xr-x | configure.ac | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 9c47b5b4..71f1c1bf 100755 --- a/configure.ac +++ b/configure.ac @@ -666,11 +666,9 @@ dnl ---------------------------- AC_FUNC_CHOWN AC_FUNC_FNMATCH AC_FUNC_FORK -AC_FUNC_MALLOC AC_FUNC_MEMCMP AC_FUNC_MKTIME AC_FUNC_STRFTIME -AC_FUNC_REALLOC AC_FUNC_STAT AC_FUNC_SELECT_ARGTYPES AC_FUNC_STRFTIME @@ -970,10 +968,18 @@ dnl ----------------------------- dnl check ipforward detect method dnl ----------------------------- AC_CACHE_CHECK([ipforward method], [quagga_cv_ipforward_method], -[for quagga_cv_ipforward_method in /proc/net/snmp /dev/ip /dev/null; -do - test x`ls $quagga_cv_ipforward_method 2>/dev/null` = x"$quagga_cv_ipforward_method" && break -done +[if test x$cross_compiling = xyes; then + if test x"$opsys" = x"gnu-linux"; then + quagga_cv_ipforward_method=/proc/net/snmp + else + quagga_cv_ipforward_method=/dev/ip + fi +else + for quagga_cv_ipforward_method in /proc/net/snmp /dev/ip /dev/null; + do + test x`ls $quagga_cv_ipforward_method 2>/dev/null` = x"$quagga_cv_ipforward_method" && break + done +fi case $quagga_cv_ipforward_method in "/proc/net/snmp") quagga_cv_ipforward_method="proc";; "/dev/ip") |