use a more generic means to decide whether we need to provide poll/dlfcn functionalit...

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

diff --git a/Makefile b/Makefile
index b83a7039ce6b89f0e9a6f2c10e39e6138857e0e5..6dffd8cd411d21f299ff2ce56a317a3cb87868fe 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -301,6 +301,16 @@ OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
        utils.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
        netsock.o slinfactory.o ast_expr2.o ast_expr2f.o
 
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),)
+  OBJS+= poll.o
+  ASTCFLAGS+=-DPOLLCOMPAT
+endif
+
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/dlfcn.h),)
+  OBJS+= dhfcn.o
+  ASTCFLAGS+=-DDLFCNCOMPAT
+endif
+
 ifeq (${OSARCH},Linux)
   LIBS=-ldl -lpthread -lncurses -lm -lresolv  #-lnjamd
 else
@@ -311,7 +321,6 @@ ifeq (${OSARCH},Darwin)
   LIBS+=-lresolv
   ASTCFLAGS+=-D__Darwin__
   AUDIO_LIBS=-framework CoreAudio
-  OBJS+=poll.o dlfcn.o
   ASTLINK=-Wl,-dynamic
   SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
 else

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 4e9d2b39af4707f09557bbeaac98c29792cf83a5..67b32b1b823c655b1997f0d513a1b62b99d952b4 100755 (executable)
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -31,7 +31,7 @@
 
 #include <unistd.h>
 #include <setjmp.h>
-#if defined(__APPLE__)
+#ifdef POLLCOMPAT 
 #include "asterisk/poll-compat.h"
 #else
 #include <sys/poll.h>

diff --git a/include/asterisk/io.h b/include/asterisk/io.h
index a9be35703b92db376e215411c76e5087a20c0679..8bda98a2ba0a60cbbc822ea247935e5102324787 100755 (executable)
--- a/include/asterisk/io.h
+++ b/include/asterisk/io.h
@@ -23,7 +23,7 @@
 #ifndef _ASTERISK_IO_H
 #define _ASTERISK_IO_H
 
-#ifdef __APPLE__
+#ifdef POLLCOMPAT
 #include "asterisk/poll-compat.h"
 #else
 #include <sys/poll.h>          /* For POLL* constants */

diff --git a/loader.c b/loader.c
index 460c548a5cb322bec228ccc8c3d380085dd55c49..0af47a85924a4c0e5150c230c0347b953680e2fa 100755 (executable)
--- a/loader.c
+++ b/loader.c
@@ -43,7 +43,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/enum.h"
 #include "asterisk/rtp.h"
 #include "asterisk/lock.h"
-#ifdef __APPLE__
+#ifdef DLFCNCOMPAT
 #include "asterisk/dlfcn-compat.h"
 #else
 #include <dlfcn.h>