From: Luigi Rizzo <rizzo@icir.org>
Date: Tue, 4 Apr 2006 14:39:22 +0000 (+0000)
Subject: temporarily disconnect ogg_vorbis from the build while i update it
X-Git-Tag: 1.4.0-beta1~2164
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac0395fac3c7c3fabb91f06e721493ad6d9a74b6;p=thirdparty%2Fasterisk.git

temporarily disconnect ogg_vorbis from the build while i update it
(should be a matter of a couple of hours).



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

diff --git a/formats/Makefile b/formats/Makefile
index 8b47f8d2dc..4c857ea3ee 100644
--- a/formats/Makefile
+++ b/formats/Makefile
@@ -20,10 +20,15 @@ MODS:=$(filter-out format_au.so,$(MODS))
 # merged.	format_au.so
 #
 # OGG/Vorbis format
-#
+# (on FreeBSD is in /usr/local/include/...
+
+MODS:=$(filter-out format_ogg_vorbis.so,$(MODS))
+
 ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),)
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/vorbis/codec.h),)
   MODS:=$(filter-out format_ogg_vorbis.so,$(MODS))
 endif
+endif
 
 GSMLIB=../codecs/gsm/lib/libgsm.a