Francois Gouget : configure: Fix the linux/ipx.h check.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: da1a35297254f08bf33f4b449000352adbf9476f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=da1a35297254f08bf33f4b4490...

Author: Francois Gouget 
Date:   Sun Dec 28 10:35:02 2008 +0100

configure: Fix the linux/ipx.h check.

---

configure            |    5 +++++
 configure.ac         |    4 ++++
 dlls/ws2_32/socket.c |    3 +++
 include/config.h.in  |    3 +++
 4 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index 6381aed..d0ea3a3 100755
--- a/configure
+++ b/configure
@@ -7444,6 +7444,7 @@ done

+
 for ac_header in \
    AudioUnit/AudioUnit.h \
    Carbon/Carbon.h \
@@ -7484,6 +7485,7 @@ for ac_header in \
    linux/major.h \
    linux/param.h \
    linux/serial.h \
+	linux/types.h \
    linux/ucdrom.h \
    mach/mach.h \
    mach/machine.h \
@@ -8063,6 +8065,9 @@ cat >>conftest.$ac_ext <<_ACEOF
      #ifdef HAVE_SYS_SOCKET_H
      # include <sys/socket.h>
      #endif
+     #ifdef HAVE_LINUX_TYPES_H
+     # include <linux/types.h>
+     #endif

#include <$ac_header>
 _ACEOF
diff --git a/configure.ac b/configure.ac
index df0eb63..5d7dd5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -282,6 +282,7 @@ AC_CHECK_HEADERS(\
    linux/major.h \
    linux/param.h \
    linux/serial.h \
+	linux/types.h \
    linux/ucdrom.h \
    mach/mach.h \
    mach/machine.h \
@@ -432,6 +433,9 @@ AC_CHECK_HEADERS([linux/ipx.h],,,
      #endif
      #ifdef HAVE_SYS_SOCKET_H
      # include <sys/socket.h>
+     #endif
+     #ifdef HAVE_LINUX_TYPES_H
+     # include <linux/types.h>
      #endif])

AC_CHECK_HEADERS([resolv.h],,,
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index b1aea8e..e44b2e3 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -103,6 +103,9 @@
 # ifdef HAVE_ASM_TYPES_H
 #  include <asm/types.h>
 # endif
+# ifdef HAVE_LINUX_TYPES_H
+#  include <linux/types.h>
+# endif
 # include <linux/ipx.h>
 # define HAVE_IPX
 #endif
diff --git a/include/config.h.in b/include/config.h.in
index b72a6bb..69c1fee 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -393,6 +393,9 @@
 /* Define to 1 if you have the <linux/serial.h> header file. */
 #undef HAVE_LINUX_SERIAL_H

+/* Define to 1 if you have the <linux/types.h> header file. */
+#undef HAVE_LINUX_TYPES_H
+
 /* Define to 1 if you have the <linux/ucdrom.h> header file. */
 #undef HAVE_LINUX_UCDROM_H