configure broken

Gerald Pfeifer pfeifer at dbai.tuwien.ac.at
Mon Jul 22 01:59:47 CDT 2002


The following patch has broken configure

  revision 1.320
  date: 2002/07/19 03:16:51;  author: julliard;  state: Exp;  lines: +210 -80
  Gregg Mattinson <gm138242 at scot.canada.sun.com>
   - X11/extensions/shape.h requires X11/Xutil.h.
   - X11/XKBlib.h requires X11/Xlib.h.
   - net/if.h requires sys/socket.h.
   - netinet/ip.h requires sys/socket.h and sys/in_systm.h.
   - resolv.h requires sys/socket.h.

which now fails to properly set HAVE_NET_IF_H on FreeBSD 4.6, even though
there we *do* have /usr/include/sys/socket.h.

This is, because on BSD one must not #include <sys/socket.h> without
having #included <sys/types.h> before. Something like the following
should fix this problem:

Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.61
diff -u -3 -p -r1.61 configure.ac
--- configure.ac	20 Jul 2002 20:17:13 -0000	1.61
+++ configure.ac	22 Jul 2002 06:58:49 -0000
@@ -983,7 +983,10 @@ AC_HEADER_STAT()

 dnl *** Check for net/if.h
 AC_CHECK_HEADERS(net/if.h,,,
-    [#if HAVE_SYS_SOCKET_H
+    [#if HAVE_SYS_TYPES_H
+     # include <sys/types.h>
+     #endif
+     #if HAVE_SYS_SOCKET_H
      # include <sys/socket.h>
      #endif])


Gerald




More information about the wine-devel mailing list