build: fix building with -Werror=undef

In the unlikely event you are building with -Werror=undef, several
configure checks fail. Fix those.

Signed-off-by: Ruben Kerkhof <ruben@rubenkerkhof.com>
This commit is contained in:
Ruben Kerkhof 2020-03-10 16:27:50 +01:00
parent e14175b8a1
commit 7cda3a87d1

View file

@ -1026,7 +1026,7 @@ AC_CHECK_HEADERS([net/if_var.h], [], [], [FRR_INCLUDES])
m4_define([FRR_INCLUDES], m4_define([FRR_INCLUDES],
FRR_INCLUDES FRR_INCLUDES
[#if HAVE_NET_IF_VAR_H [#ifdef HAVE_NET_IF_VAR_H
# include <net/if_var.h> # include <net/if_var.h>
#endif #endif
])dnl ])dnl
@ -1061,22 +1061,22 @@ FRR_INCLUDES
[ [
#include <sys/un.h> #include <sys/un.h>
#include <netinet/in_systm.h> #include <netinet/in_systm.h>
#if HAVE_NETINET_IN_VAR_H #ifdef HAVE_NETINET_IN_VAR_H
# include <netinet/in_var.h> # include <netinet/in_var.h>
#endif #endif
#if HAVE_NET_IF_DL_H #ifdef HAVE_NET_IF_DL_H
# include <net/if_dl.h> # include <net/if_dl.h>
#endif #endif
#if HAVE_NET_NETOPT_H #ifdef HAVE_NET_NETOPT_H
# include <net/netopt.h> # include <net/netopt.h>
#endif #endif
#include <net/route.h> #include <net/route.h>
#if HAVE_INET_ND_H #ifdef HAVE_INET_ND_H
# include <inet/nd.h> # include <inet/nd.h>
#endif #endif
#include <arpa/inet.h> #include <arpa/inet.h>
/* Required for IDRP */ /* Required for IDRP */
#if HAVE_NETINET_IP_ICMP_H #ifdef HAVE_NETINET_IP_ICMP_H
# include <netinet/ip_icmp.h> # include <netinet/ip_icmp.h>
#endif #endif
])dnl ])dnl
@ -1401,7 +1401,7 @@ AC_CHECK_HEADERS([linux/mroute.h], [], [],[
m4_define([FRR_INCLUDES], m4_define([FRR_INCLUDES],
FRR_INCLUDES FRR_INCLUDES
[#if HAVE_LINUX_MROUTE_H [#ifdef HAVE_LINUX_MROUTE_H
# include <linux/mroute.h> # include <linux/mroute.h>
#endif #endif
])dnl ])dnl
@ -1415,7 +1415,7 @@ AC_CHECK_HEADERS([netinet/ip_mroute.h], [], [],[
m4_define([FRR_INCLUDES], m4_define([FRR_INCLUDES],
FRR_INCLUDES FRR_INCLUDES
[#if HAVE_NETINET_IP_MROUTE_H [#ifdef HAVE_NETINET_IP_MROUTE_H
# include <netinet/ip_mroute.h> # include <netinet/ip_mroute.h>
#endif #endif
])dnl ])dnl
@ -1528,17 +1528,17 @@ AC_CHECK_HEADERS([netinet6/in6.h netinet/in6_var.h \
m4_define([FRR_INCLUDES],dnl m4_define([FRR_INCLUDES],dnl
FRR_INCLUDES FRR_INCLUDES
[#if HAVE_NETINET6_IN6_H [#ifdef HAVE_NETINET6_IN6_H
#include <netinet6/in6.h> #include <netinet6/in6.h>
#endif #endif
#if HAVE_NETINET_IN6_VAR_H #ifdef HAVE_NETINET_IN6_VAR_H
#include <netinet/in6_var.h> #include <netinet/in6_var.h>
#endif #endif
#include <netinet/icmp6.h> #include <netinet/icmp6.h>
#if HAVE_NETINET6_IN6_VAR_H #ifdef HAVE_NETINET6_IN6_VAR_H
# include <netinet6/in6_var.h> # include <netinet6/in6_var.h>
#endif #endif
#if HAVE_NETINET6_ND6_H #ifdef HAVE_NETINET6_ND6_H
# include <netinet6/nd6.h> # include <netinet6/nd6.h>
#endif #endif
])dnl ])dnl