changeset:   105773:c568b6ac5e89
parent:      105771:6ced540a92bc
parent:      105772:f34dac552ad8
user:        Xavier de Gaye <xdegaye@users.sourceforge.net>
date:        Wed Dec 21 17:30:50 2016 +0100
files:       configure configure.ac
description:
Issue #28538: Merge 3.6.


diff -r 6ced540a92bc -r c568b6ac5e89 configure
--- a/configure	Wed Dec 21 14:08:55 2016 +0200
+++ b/configure	Wed Dec 21 17:30:50 2016 +0100
@@ -12649,13 +12649,25 @@
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-# On Android API level 24 if_nameindex() is available, but the if_nameindex
-# structure is not defined.
+# On Android API level 24 with android-ndk-r13, if_nameindex() is available,
+# but the if_nameindex structure is not defined.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_nameindex" >&5
 $as_echo_n "checking for if_nameindex... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <stdio.h>
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
 #ifdef HAVE_NET_IF_H
 # include <net/if.h>
 #endif
diff -r 6ced540a92bc -r c568b6ac5e89 configure.ac
--- a/configure.ac	Wed Dec 21 14:08:55 2016 +0200
+++ b/configure.ac	Wed Dec 21 17:30:50 2016 +0100
@@ -3738,10 +3738,22 @@
   AC_MSG_RESULT(no)
 ])
 
-# On Android API level 24 if_nameindex() is available, but the if_nameindex
-# structure is not defined.
+# On Android API level 24 with android-ndk-r13, if_nameindex() is available,
+# but the if_nameindex structure is not defined.
 AC_MSG_CHECKING(for if_nameindex)
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#include <stdio.h>
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
 #ifdef HAVE_NET_IF_H
 # include <net/if.h>
 #endif