gdm r5680 - in trunk: . common

[bcameron svn gnome org]

Author: bcameron
Date: Sat Feb  2 02:40:44 2008
New Revision: 5680
URL: http://svn.gnome.org/viewvc/gdm?rev=5680&view=rev

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

        * configure.ac:  Make check an optional dependency.
        * common/gdm-address.c: Add needed includes to build on
          Solaris.


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 02:40:44 2008
@@ -25,10 +25,12 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <stropts.h>
 #include <string.h>
 #ifdef HAS_SYS_SOCKET
 #include <sys/socket.h>
 #endif
+#include <sys/sockio.h>
 #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 02:40:44 2008
@@ -142,7 +142,10 @@
 AC_PATH_XTRA
 
 # Unit testing framework
-PKG_CHECK_MODULES(CHECK,[check >= 0.9.4])
+PKG_CHECK_MODULES(CHECK,
+                  [check >= 0.9.4],
+                  have_check=yes,
+                  have_check=no)
 AM_CONDITIONAL([HAVE_CHECK],[test "x$CHECK_CFLAGS" != "x"])
 
 AC_PATH_PROG(GCONFTOOL, gconftool-2)