Autotest for netpacket/packet.h, as it is not available on all Linux versions.

Depend AF_PACKET on HAVE_NETPACKET_PACKET_H. Fixes #449157

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 91013a10586731aab8106864a7cda90b6a42eb61..f4c5726440a05cd188a1c3086310d95ef260d0eb 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -179,7 +179,7 @@ Socket methods:
 #undef AF_UNIX
 #endif
 
-#if defined(linux) && defined(AF_PACKET)
+#ifdef HAVE_NETPACKET_PACKET_H
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <netpacket/packet.h>
@@ -476,7 +476,7 @@ typedef struct {
                struct sockaddr_in6 in6;
                struct sockaddr_storage storage;
 #endif
-#if defined(linux) && defined(AF_PACKET)
+#ifdef HAVE_NETPACKET_PACKET_H
                struct sockaddr_ll ll;
 #endif
        } sock_addr;
@@ -715,7 +715,7 @@ makesockaddr(int sockfd, struct sockaddr *addr, int addrlen)
        }
 #endif
 
-#if defined(linux) && defined(AF_PACKET)
+#ifdef HAVE_NETPACKET_PACKET_H
        case AF_PACKET:
        {
                struct sockaddr_ll *a = (struct sockaddr_ll *)addr;
@@ -828,7 +828,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
        }
 #endif
 
-#if defined(linux) && defined(AF_PACKET)
+#ifdef HAVE_NETPACKET_PACKET_H
        case AF_PACKET:
        {
                struct sockaddr_ll* addr;
@@ -901,7 +901,7 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret)
        }
 #endif
 
-#if defined(linux) && defined(AF_PACKET)
+#ifdef HAVE_NETPACKET_PACKET_H
        case AF_PACKET:
        {
                *len_ret = sizeof (struct sockaddr_ll);
@@ -2983,7 +2983,7 @@ init_socket(void)
 #ifdef AF_ROSE
        insint(d, "AF_ROSE", AF_ROSE); /* Amateur Radio X.25 PLP */
 #endif
-#if defined(linux) && defined(AF_PACKET)
+#ifdef HAVE_NETPACKET_PACKET_H
        insint(d, "AF_PACKET", AF_PACKET);
        insint(d, "PF_PACKET", PF_PACKET);
        insint(d, "PACKET_HOST", PACKET_HOST);

diff --git a/configure.in b/configure.in
index 07e9f097e0f0c8c99d2d5034ead13f52556665cf..14d11e8de14b11e624335d619af33762a7dceaa5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -419,7 +419,7 @@ signal.h stdarg.h stddef.h stdlib.h thread.h unistd.h utime.h termios.h \
 sys/audioio.h sys/file.h sys/lock.h sys/modem.h db_185.h db.h \
 sys/param.h sys/poll.h sys/select.h sys/socket.h sys/time.h sys/times.h \
 sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
-ndbm.h db1/ndbm.h gdbm/ndbm.h sys/resource.h)
+ndbm.h db1/ndbm.h gdbm/ndbm.h sys/resource.h netpacket/packet.h)
 AC_HEADER_DIRENT
 
 # checks for typedefs