diff options
| author | Joshua Colp <jcolp@digium.com> | 2006-11-01 18:41:49 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2006-11-01 18:41:49 +0000 |
| commit | 9335b4bc1c8b91733fcca99f8b0a3071a2fef35e (patch) | |
| tree | 1ae776f4883719b9bd5db5c38a652cebb4ce5d26 /main/Makefile | |
| parent | 4ffc38835891febe6810e5de84ab3c6b5c693ded (diff) | |
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.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46782 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/Makefile')
| -rw-r--r-- | main/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/main/Makefile b/main/Makefile index 3e631d769..ac543baa3 100644 --- a/main/Makefile +++ b/main/Makefile @@ -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),) |