[svn-commits] file: trunk r46782 - in /trunk: ./ main/Makefile

[svn-commits at lists.digium.com]

Author: file
Date: Wed Nov  1 12:41:49 2006
New Revision: 46782

URL: http://svn.digium.com/view/asterisk?rev=46782&view=rev
Log:
Merged revisions 46780 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r46780 | file | 2006-11-01 13:39:47 -0500 (Wed, 01 Nov 2006) | 2 lines

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:
    trunk/   (props changed)
    trunk/main/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/main/Makefile?rev=46782&r1=46781&r2=46782&view=diff
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Wed Nov  1 12:41:49 2006
@@ -39,9 +39,14 @@
 
 AST_LIBS += $(SSL_LIB)
 
-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),)