From 3ef0b877f08344aa52367794aa4ec32b12becd6d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timo=20Ter=C3=A4s?= Date: Tue, 29 Jul 2014 09:41:56 +0000 Subject: [PATCH] build: do not assume glibc on linux MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The whole IPv6 stack detection could need refactoring. But this fixes the linux check to not assume glibc. Fixes build against musl c-library. Signed-off-by: Timo Teräs Signed-off-by: David Lamparter --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 3dba3b3577..f1df482b32 100755 --- a/configure.ac +++ b/configure.ac @@ -1204,21 +1204,22 @@ dnl ---------- if test "$zebra_cv_linux_ipv6" = "yes";then AC_MSG_CHECKING(for GNU libc >= 2.1) AC_DEFINE(HAVE_IPV6,1,Linux IPv6) + AC_DEFINE(LINUX_IPV6,1,Linux IPv6 stack) + AC_EGREP_CPP(yes, [ #include #if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 yes #endif], [glibc=yes - AC_DEFINE(LINUX_IPV6,1,Linux IPv6 stack) AC_MSG_RESULT(yes)], AC_MSG_RESULT(no) ) RIPNGD="ripngd" OSPF6D="ospf6d" if test "$glibc" != "yes"; then - INCLUDES="-I/usr/inet6/include" if test x`ls /usr/inet6/lib/libinet6.a 2>/dev/null` != x;then + INCLUDES="-I/usr/inet6/include" LIB_IPV6="-L/usr/inet6/lib -linet6" fi fi -- 2.39.5