[svn-commits] file: branch 1.4 r46780 - /branches/1.4/main/Makefile

[svn-commits at lists.digium.com]

Author: file
Date: Wed Nov  1 12:39:47 2006
New Revision: 46780

URL: http://svn.digium.com/view/asterisk?rev=46780&view=rev
Log:
Force poll() emulation for Darwin to always be on. It's too broken to consider being used. This resolves the console issue OSX users have been seeing. I would have liked to autoconf this but I haven't been able to come up with a test case that works. Que sera.

Modified:
    branches/1.4/main/Makefile

Modified: branches/1.4/main/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/Makefile?rev=46780&r1=46779&r2=46780&view=diff
==============================================================================
--- branches/1.4/main/Makefile (original)
+++ branches/1.4/main/Makefile Wed Nov  1 12:39:47 2006
@@ -37,9 +37,14 @@
 # by a module.
 OBJS+=say.o
 
-ifeq ($(wildcard /usr/include/sys/poll.h),)
+ifneq ($(findstring darwin,$(OSARCH)),)
   OBJS+=poll.o
   ASTCFLAGS+=-DPOLLCOMPAT
+else
+  ifeq ($(wildcard /usr/include/sys/poll.h),)
+    OBJS+=poll.o
+    ASTCFLAGS+=-DPOLLCOMPAT
+  endif
 endif
 
 ifeq ($(wildcard /usr/include/dlfcn.h),)