From 59348aa18206b9d15d46ed8d78f811b611f6405b Mon Sep 17 00:00:00 2001
From: Sean Bright <sean.bright@gmail.com>
Date: Thu, 25 May 2017 12:10:00 -0400
Subject: [PATCH] format_mp3: Don't try to build format_mp3 if we don't have
sources
ASTERISK-23951 #close
Reported by: Tzafrir Cohen
Change-Id: Iebf181d44bb735787fde4b5be863c4d7e2478a30
---
addons/Makefile | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/addons/Makefile b/addons/Makefile
index d12d0fd3b2..82bbc49a11 100644
--- a/addons/Makefile
+++ b/addons/Makefile
@@ -32,9 +32,12 @@ ALL_C_MODS:=app_mysql \
cdr_mysql \
chan_mobile \
chan_ooh323 \
- format_mp3 \
res_config_mysql
+ifneq ($(wildcard mp3/Makefile),)
+ ALL_C_MODS += format_mp3
+endif
+
all: check_mp3 _all
check_mp3:
@@ -43,10 +46,10 @@ ifeq ($(filter format_mp3,$(MENUSELECT_ADDONS)),)
echo ; \
echo "**************************************************************" ; \
echo "*** ***" ; \
- echo "*** ---> READ THIS OR YOUR BUILD WILL FAIL <--- ***" ; \
+ echo "*** ---> IMPORTANT INFORMATION ABOUT format_mp3 <--- ***" ; \
echo "*** ***" ; \
echo "*** format_mp3 has been selected to be installed, but the ***" ; \
- echo "*** mp3 decoder library has not yet been downloaded into ***" ; \
+ echo "*** MP3 decoder library has not yet been downloaded into ***" ; \
echo "*** the source tree. To do so, please run the following ***" ; \
echo "*** command: ***" ; \
echo "*** ***" ; \
--
GitLab