From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 21 Nov 2005 13:21:18 +0000 (+0000)
Subject: don't hardcode poll.o for Darwin
X-Git-Tag: 1.4.0-beta1~3271
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee5bc3ce65c3744a2791917f166b71b163a192bb;p=thirdparty%2Fasterisk.git

don't hardcode poll.o for Darwin
fix incorrect portion of patch from yesterday's Solaris fixes


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

diff --git a/ChangeLog b/ChangeLog
index 18e023df84..8916ffd40c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-11-21  Russell Bryant  <russell@digium.com>
 
+	* Makefile: Don't hard-code that poll functionality needs to be provided on Darwin.
+	* apps/Makefile: Fix incorrect portion of the patch to fix 'make install' on Solaris.
+
 	* channels/chan_iax2.c (iax2_getpeername): Return non-zero to indicate that a peer was found when using realtime (issue #5815)
 
 2005-11-20  Russell Bryant  <russell@digium.com>
diff --git a/Makefile b/Makefile
index 69e57fea41..82d20748f1 100755
--- a/Makefile
+++ b/Makefile
@@ -363,8 +363,6 @@ ifeq ($(OSARCH),Darwin)
   AUDIO_LIBS=-framework CoreAudio
   ASTLINK=-Wl,-dynamic
   SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
-  OBJS+=poll.o
-  ASTCFLAGS+=-DPOLLCOMPAT
 else
 #These are used for all but Darwin
   ASTLINK=-Wl,-E 
diff --git a/apps/Makefile b/apps/Makefile
index 6913ef4cb4..12d5032459 100755
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -59,7 +59,7 @@ CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/us
 endif
 
 CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs)
-ifneq ($(shell if [ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]; then echo "OK" ; fi),)
+ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),)
   ifneq (${CURLLIBS},)
     APPS+=app_curl.so
   endif