merge trunk

unix/Makefile.in

@@ -342,7 +342,7 @@ UNIX_OBJS = tclUnixChan.o tclUnixEvent.o tclUnixFCmd.o \
 	tclUnixTime.o tclUnixInit.o tclUnixThrd.o \
 	tclUnixCompat.o
 
-NOTIFY_OBJS = tclUnixNotfy.o
+NOTIFY_OBJS = @NOTIFIER_IMPL@
 
 MAC_OSX_OBJS = tclMacOSXBundle.o tclMacOSXFCmd.o tclMacOSXNotify.o
 
@@ -556,7 +556,7 @@ UNIX_SRCS = \
 	$(UNIX_DIR)/tclUnixCompat.c
 
 NOTIFY_SRCS = \
-	$(UNIX_DIR)/tclUnixNotfy.c
+	$(UNIX_DIR)/tclUnixNotfy.c $(UNIX_DIR)/tclUnixPoll.c
 
 DL_SRCS = \
 	$(UNIX_DIR)/tclLoadAix.c \
@@ -1521,6 +1521,9 @@ tclUnixNotfy.o: $(UNIX_DIR)/tclUnixNotfy.c
 tclUnixPipe.o: $(UNIX_DIR)/tclUnixPipe.c
 	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclUnixPipe.c
 
+tclUnixPoll.o: $(UNIX_DIR)/tclUnixPoll.c
+	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclUnixPoll.c
+
 tclUnixSock.o: $(UNIX_DIR)/tclUnixSock.c
 	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclUnixSock.c
 

unix/configure.in

@@ -273,6 +273,11 @@ SC_SERIAL_PORT
 #	special flag.
 #--------------------------------------------------------------------
 
+NOTIFIER_IMPL=tclUnixNotfy.o
+AC_ARG_ENABLE(poll,[AS_HELP_STRING([--enable-poll],
+	[use poll() system call for notifier instead of select()])], [
+    NOTIFIER_IMPL=tclUnixPoll.o])
+
 AC_CACHE_CHECK([for fd_set in sys/types], tcl_cv_type_fd_set, [
     AC_TRY_COMPILE([#include <sys/types.h>],[fd_set readMask, writeMask;],
 	tcl_cv_type_fd_set=yes, tcl_cv_type_fd_set=no)])
@@ -976,6 +981,8 @@ AC_SUBST(EXTRA_TCLSH_LIBS)
 AC_SUBST(DLTEST_LD)
 AC_SUBST(DLTEST_SUFFIX)
 
+AC_SUBST(NOTIFIER_IMPL)
+
 dnl	Disable the automake-friendly normalization of LIBOBJS
 dnl	performed by autoconf 2.53 and later.  It's not correct for us.
 define([_AC_LIBOBJS_NORMALIZE],[])