fixup another take to see if this runs better for cross-compiled winbagder/if_nametoindex

1 files changed, 20 insertions, 6 deletions

diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4
index adbc970f3..84f6ffcb2 100644
--- a/m4/curl-functions.m4
+++ b/m4/curl-functions.m4
@@ -563,6 +563,23 @@ curl_includes_bsdsocket="\
     [], [], [      $curl_includes_bsdsocket])
 ])
 
+dnl CURL_INCLUDES_NETIF
+dnl -------------------------------------------------
+dnl Set up variable with list of headers that must be
+dnl included when net/if.h is to be included.
+
+AC_DEFUN([CURL_INCLUDES_NETIF], [
+curl_includes_netif="\
+/* includes start */
+#ifdef HAVE_NET_IF_H
+#  include <net/if.h>
+#endif
+/* includes end */"
+  AC_CHECK_HEADERS(
+    net/if.h,
+    [], [], [$curl_includes_netif])
+])
+
 
 dnl CURL_PREPROCESS_CALLCONV
 dnl -------------------------------------------------
@@ -3118,9 +3135,8 @@ dnl HAVE_IF_NAMETOINDEX will be defined.
 
 AC_DEFUN([CURL_CHECK_FUNC_IF_NAMETOINDEX], [
   AC_REQUIRE([CURL_INCLUDES_WINSOCK2])dnl
-  AC_REQUIRE([CURL_INCLUDES_UNISTD])dnl
+  AC_REQUIRE([CURL_INCLUDES_NETIF])dnl
   AC_REQUIRE([CURL_PREPROCESS_CALLCONV])dnl
-  AC_REQUIRE([CURL_INCLUDES_BSDSOCKET])dnl
   #
   tst_links_if_nametoindex="unknown"
   tst_proto_if_nametoindex="unknown"
@@ -3149,8 +3165,7 @@ AC_DEFUN([CURL_CHECK_FUNC_IF_NAMETOINDEX], [
     AC_MSG_CHECKING([if if_nametoindex is prototyped])
     AC_EGREP_CPP([if_nametoindex],[
       $curl_includes_winsock2
-      $curl_includes_bsdsocket
-      #include <net/if.h>
+      $curl_includes_netif
     ],[
       AC_MSG_RESULT([yes])
       tst_proto_if_nametoindex="yes"
@@ -3165,8 +3180,7 @@ AC_DEFUN([CURL_CHECK_FUNC_IF_NAMETOINDEX], [
     AC_COMPILE_IFELSE([
       AC_LANG_PROGRAM([[
         $curl_includes_winsock2
-        $curl_includes_bsdsocket
-        #include <net/if.h>
+        $curl_includes_netif
       ]],[[
         if(0 != if_nametoindex(""))
           return 1;