Detect ifaddrs.h header and ifaddrs addr

And don't only disable that for Android

Signed-off-by: Hugo Beauzée-Luyssen <hugo@beauzee.fr>

Author: jbkempf

compat/compat.h

@@ -39,9 +39,6 @@ enum {
 # include <errno.h>
 # include <net/if.h>
 # include <poll.h>
-#ifndef __ANDROID__
-# include <ifaddrs.h>
-#endif
 
 extern struct timeval os_deadline;
 

configure.ac

@@ -245,6 +245,10 @@ AC_LINK_IFELSE([
 
 LIBS=${LIBS_SAVE}
 
+AC_CHECK_MEMBER([struct ifaddrs.ifa_addr],[
+    AC_DEFINE([HAVE_IFADDRS],[1],[Define to 1 if you have ifaddrs.ifa_addr function])],
+    [],[[#include <ifaddrs.h>]])
+
 
 AC_SUBST([LIBSOCKET])
 

src/mdns.c

@@ -49,7 +49,8 @@ struct mdns_svc {
 };
 
 #ifndef _WIN32
-# ifndef __ANDROID__
+# if HAVE_IFADDRS
+#include <ifaddrs.h>
 typedef struct sockaddr_storage multicast_if;
 # else
 typedef void* multicast_if;
@@ -83,7 +84,7 @@ extern void rr_print(const struct rr_entry *);
 extern void rr_free(struct rr_entry *);
 
 #ifndef _WIN32
-#ifndef __ANDROID__
+#if HAVE_IFADDRS
 
 static bool
 mdns_is_interface_valuable(struct ifaddrs* ifa)
@@ -142,8 +143,9 @@ mdns_list_interfaces(multicast_if** pp_intfs, int ai_family)
         **pp_intfs = NULL;
         return 1;
 }
-#endif // __ANDROID__
-#else
+#endif // HAVE_IFADDRS
+
+#else // _WIN32
 
 static bool
 mdns_is_interface_valuable(IP_ADAPTER_ADDRESSES *intf)
@@ -210,7 +212,6 @@ mdns_list_interfaces(multicast_if** pp_intfs, int ai_family)
         }
         return (nb_intf);
 }
-
 #endif
 
 static int
@@ -321,7 +322,7 @@ mdns_init(struct mdns_ctx **p_ctx, const char *addr, unsigned short port)
                     return mdns_destroy(ctx), (MDNS_NETERR);
             }
 
-#ifndef __ANDROID__
+#if HAVE_IFADDRS
             if (setsockopt(ctx->conns[i].sock,
                            ctx->conns[i].family == AF_INET ? IPPROTO_IP : IPPROTO_IPV6,
                            ctx->conns[i].family == AF_INET ? IP_MULTICAST_IF : IPV6_MULTICAST_IF,