diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-21 13:23:53 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-21 13:23:53 +0000 |
| commit | 0af4f03271ce1f9c4214766b7331670e97022a0f (patch) | |
| tree | b3af64228d9d40d1930b5413e1e2ca8690767bc0 | |
| parent | 4e22fe6e83e689517fe21bf73a1e65586f48fcc7 (diff) | |
don't hardcode poll.o for Darwin
fix incorrect portion of yesterday's Solaris fixes
git-svn-id: http://svn.digium.com/svn/asterisk/branches/v1-2@7169 f38db490-d61c-443f-a65b-d21fe96a405b
| -rwxr-xr-x | ChangeLog | 3 | ||||
| -rwxr-xr-x | Makefile | 2 | ||||
| -rwxr-xr-x | apps/Makefile | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -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> @@ -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 6913ef4cb..12d503245 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 |