gdm r5682 - in trunk: . common

[bcameron svn gnome org]

Author: bcameron
Date: Sat Feb  2 18:13:48 2008
New Revision: 5682
URL: http://svn.gnome.org/viewvc/gdm?rev=5682&view=rev

Log:
2008-02-01  Brian Cameron  <brian cameron sun com>

        * configure.ac, common/gdm-address.c use HAVE_SYS_SOCKIO_H
          for sys/sockio.h inclusion.


Modified:
   trunk/ChangeLog
   trunk/common/gdm-address.c
   trunk/configure.ac

Modified: trunk/common/gdm-address.c
==============================================================================
--- trunk/common/gdm-address.c	(original)
+++ trunk/common/gdm-address.c	Sat Feb  2 18:13:48 2008
@@ -27,10 +27,12 @@
 #include <unistd.h>
 #include <stropts.h>
 #include <string.h>
-#ifdef HAS_SYS_SOCKET
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
+#ifdef HAVE_SYS_SOCKIO_H
 #include <sys/sockio.h>
+#endif
 #include <netdb.h>
 #include <sys/ioctl.h>
 #include <net/if.h>

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Feb  2 18:13:48 2008
@@ -261,7 +261,7 @@
 #include <sys/socket.h>
 #endif
 )
-
+AC_CHECK_HEADERS(sys/sockio.h)
 AC_CHECK_FUNCS([setresuid setenv unsetenv clearenv])
 
 dnl checks needed for Darwin compatibility to linux **environ.