[Asterisk-cvs] asterisk ChangeLog, 1.146.2.17, 1.146.2.18 Makefile, 1.226.2.3, 1.226.2.4

[russell]

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

Modified Files:
      Tag: v1-2
	ChangeLog Makefile 
Log Message:
don't hardcode poll.o for Darwin
fix incorrect portion of yesterday's Solaris fixes


Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.146.2.17
retrieving revision 1.146.2.18
diff -u -d -r1.146.2.17 -r1.146.2.18
--- ChangeLog	21 Nov 2005 13:17:32 -0000	1.146.2.17
+++ ChangeLog	21 Nov 2005 13:23:53 -0000	1.146.2.18
@@ -1,5 +1,8 @@
 2005-11-21  Russell Bryant  <russell at 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 at digium.com>

Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.226.2.3
retrieving revision 1.226.2.4
diff -u -d -r1.226.2.3 -r1.226.2.4
--- Makefile	21 Nov 2005 02:44:06 -0000	1.226.2.3
+++ Makefile	21 Nov 2005 13:23:53 -0000	1.226.2.4
@@ -363,8 +363,6 @@
   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