Failure to connect to a Unix-domain socket could cause a segfault. Fixed.

[u/mdw/putty] / unix / configure.ac

diff --git a/unix/configure.ac b/unix/configure.ac
index 0cbd5ce..5b0c0c9 100644 (file)
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -14,8 +14,7 @@ if test "X$GCC" = Xyes; then
     CFLAGS="$CFLAGS -Wall -Werror"
 fi
 
-AC_CHECK_HEADERS([sys/sockio.h],,,[ ])
-AC_CHECK_HEADERS([utmpx.h],,,[
+AC_CHECK_HEADERS([utmpx.h sys/select.h],,,[
 #include <sys/types.h>
 #include <utmp.h>])
 
@@ -24,7 +23,7 @@ AC_SUBST([all_targets])
 
 AC_SEARCH_LIBS([socket], [xnet])
 
-AC_CHECK_FUNCS([getaddrinfo ptsname setresuid strsignal])
+AC_CHECK_FUNCS([getaddrinfo ptsname setresuid strsignal updwtmpx])
 
 AC_OUTPUT
 
@@ -40,10 +39,13 @@ AH_BOTTOM([
 #ifndef HAVE_STRSIGNAL
 # define HAVE_NO_STRSIGNAL
 #endif
-#ifndef HAVE_UTMPX_H
+#if !defined(HAVE_UTMPX_H) || !defined(HAVE_UPDWTMPX)
 # define OMIT_UTMP
 #endif
 #ifndef HAVE_PTSNAME
 # define BSD_PTYS
 #endif
+#ifndef HAVE_SYS_SELECT_H
+# define HAVE_NO_SYS_SELECT_H
+#endif
 ])