diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-08 00:12:21 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-08 00:12:21 +0000 |
commit | d26d4447c40e0ccd0cb970f0a35033f21c89ffa3 (patch) | |
tree | 9d18f6b4c9f5e69975f4fdb6bf5c60eacf9935b4 /channels | |
parent | 553fd5fc1da69b56dfde64e825fe7184b553d571 (diff) |
issue #5634 and a little ChangeLog cleanup
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7003 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rwxr-xr-x | channels/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/Makefile b/channels/Makefile index 55f50b30f..2bf956cde 100755 --- a/channels/Makefile +++ b/channels/Makefile @@ -104,6 +104,7 @@ ifneq ($(wildcard alsa-monitor.h),) ALSA_SRC+=alsa-monitor.h endif +ifndef WITHOUT_ZAPTEL ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) ifeq (${OSARCH},NetBSD) SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib @@ -114,6 +115,7 @@ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard CFLAGS+=-DIAX_TRUNKING CHANNEL_LIBS+=chan_zap.so endif +endif # WITHOUT_ZAPTEL ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),) CHANNEL_LIBS+=chan_vpb.so |