[asterisk-commits] format mp3: Don't try to build format mp3 if we don't have s... (asterisk[master])

[SVN commits to the Asterisk project]

Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/5719 )

Change subject: format_mp3: Don't try to build format_mp3 if we don't have sources
......................................................................


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
---
M addons/Makefile
1 file changed, 6 insertions(+), 3 deletions(-)

Approvals:
  Mark Michelson: Looks good to me, but someone else must approve
  Jenkins2: Approved for Submit
  Joshua Colp: Looks good to me, approved



diff --git a/addons/Makefile b/addons/Makefile
index d12d0fd..82bbc49 100644
--- a/addons/Makefile
+++ b/addons/Makefile
@@ -32,8 +32,11 @@
             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
 
@@ -43,10 +46,10 @@
 		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 "***                                                        ***" ; \

-- 
To view, visit https://gerrit.asterisk.org/5719
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iebf181d44bb735787fde4b5be863c4d7e2478a30
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Sean Bright <sean.bright at gmail.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson at digium.com>