summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2005-11-11 23:11:44 +0000
committerBrian Cameron <bcameron@src.gnome.org>2005-11-11 23:11:44 +0000
commit4ca74e81e11ef2dcd23a4facdd456c3e9502260f (patch)
treebdb9e56fbdb565b525a77d9422291dc5ff9d3679
parentb97d599eba829a64c6ef1e0533b93fbfe2d4fad6 (diff)
downloadgdm-4ca74e81e11ef2dcd23a4facdd456c3e9502260f.tar.gz
Update check for socklen_t so it includes sys/socket.h. Some platforms
2005-11-11 Brian Cameron <brian.cameron@sun.com> * configure.ac: Update check for socklen_t so it includes sys/socket.h. Some platforms define socklen_t there. Patch provided by dmacks@netspace.org. Fixes bug #320930.
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac12
2 files changed, 18 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 876e132d..45866cc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-11 Brian Cameron <brian.cameron@sun.com>
+
+ * configure.ac: Update check for socklen_t so it
+ includes sys/socket.h. Some platforms define
+ socklen_t there. Patch provided by
+ dmacks@netspace.org. Fixes bug #320930.
+
2005-11-09 Brian Cameron <brian.cameron@sun.com>
* daemon/getvt.c: Oops, fix again.
diff --git a/configure.ac b/configure.ac
index a7d0d356..eb6abd01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,7 +120,17 @@ dnl AC_ARG_PROGRAM
AM_PROG_LIBTOOL
AC_PATH_XTRA
-AC_CHECK_TYPE(socklen_t,size_t)
+
+dnl socklen_t may be declared, but not in a "standard" C header location
+AC_CHECK_HEADERS(sys/socket.h)
+AC_CHECK_TYPE(socklen_t,,
+ AC_DEFINE(socklen_t,size_t,Compatibility type),
+[AC_INCLUDES_DEFAULT]
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+)
+
AC_CHECK_FUNCS([setresuid setenv unsetenv clearenv])
GNOME_COMPILE_WARNINGS