configure: Fix the linux/ipx.h check.

Francois Gouget fgouget at free.fr
Sun Dec 28 03:35:02 CST 2008


---

Nowadays linux/ipx.h needs linux/types.h instead of asm/types.h. This 
caused it to not be detected.


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

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
 
-- 
1.5.6.5




More information about the wine-patches mailing list