Merged revisions 46780 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Wed, 1 Nov 2006 18:41:49 +0000 (18:41 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 1 Nov 2006 18:41:49 +0000 (18:41 +0000)
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.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46782 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/Makefile

index 3e631d7..ac543ba 100644 (file)
@@ -39,9 +39,14 @@ OBJS+=say.o
 
 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),)