[Asterisk-cvs] asterisk Makefile,1.209,1.210 loader.c,1.51,1.52

[kpfleming]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv21394

Modified Files:
	Makefile loader.c 
Log Message:
use a more generic means to decide whether we need to provide poll/dlfcn functionality (issue #5297)


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -d -r1.209 -r1.210
--- Makefile	26 Sep 2005 02:08:06 -0000	1.209
+++ Makefile	26 Sep 2005 17:17:56 -0000	1.210
@@ -301,6 +301,16 @@
 	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 @@
   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

Index: loader.c
===================================================================
RCS file: /usr/cvsroot/asterisk/loader.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- loader.c	14 Sep 2005 20:46:49 -0000	1.51
+++ loader.c	26 Sep 2005 17:17:56 -0000	1.52
@@ -43,7 +43,7 @@
 #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>