aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-11-01 18:39:47 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-11-01 18:39:47 +0000
commitd35f0b326b5827cbd3bdc496c6270d74ff221745 (patch)
tree9fdbb345bfc5cb53c3ef205a15db39d81c05bb1d /main
parent5fb346991034f700986c708d874c516148ada1b0 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.4@46780 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/main/Makefile b/main/Makefile
index a400ebd30..23e4e22f2 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -37,9 +37,14 @@ OBJS+=stdtime/localtime.o
# 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),)