[svn-commits] russell: trunk r280743 - in /trunk: ./ addons/ addons/mp3/ contrib/scripts/

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Aug  3 13:50:14 2010
New Revision: 280743

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=280743
Log:
Merged revisions 280742 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r280742 | russell | 2010-08-03 13:48:45 -0500 (Tue, 03 Aug 2010) | 4 lines
  
  Remove the MP3 decoder source code and replace it with a small shell script.
  
  Review: https://reviewboard.asterisk.org/r/836/
........

Added:
    trunk/contrib/scripts/get_mp3_source.sh
      - copied unchanged from r280742, branches/1.8/contrib/scripts/get_mp3_source.sh
Removed:
    trunk/addons/mp3/
Modified:
    trunk/   (props changed)
    trunk/addons/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/addons/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/Makefile?view=diff&rev=280743&r1=280742&r2=280743
==============================================================================
--- trunk/addons/Makefile (original)
+++ trunk/addons/Makefile Tue Aug  3 13:50:14 2010
@@ -34,12 +34,32 @@
             format_mp3 \
             res_config_mysql
 
-all: _all
+all: check_mp3 _all
+
+check_mp3:
+ifeq ($(filter format_mp3,$(MENUSELECT_ADDONS)),)
+	@if [ ! -f mp3/Makefile ] ; then \
+		echo ; \
+		echo "**************************************************************" ; \
+		echo "***                                                        ***" ; \
+		echo "***   --->  READ THIS OR YOUR BUILD WILL FAIL  <---        ***" ; \
+		echo "***                                                        ***" ; \
+		echo "*** format_mp3 has been selected to be installed, but the  ***" ; \
+		echo "*** mp3 decoder library has not yet been downloaded into   ***" ; \
+		echo "*** the source tree.  To do so, please run the following   ***" ; \
+		echo "*** command:                                               ***" ; \
+		echo "***                                                        ***" ; \
+		echo "***          $$ contrib/scripts/get_mp3_source.sh           ***" ; \
+		echo "***                                                        ***" ; \
+		echo "**************************************************************" ; \
+		echo ; \
+	fi
+endif
 
 include $(ASTTOPDIR)/Makefile.moddir_rules
 
 clean::
-	$(MAKE) -C mp3 clean
+	if [ -f mp3/Makefile ] ; then $(MAKE) -C mp3 clean ; fi
 	rm -f $(addprefix ooh323c/src/,$(H323OBJS))
 
 $(if $(filter format_mp3,$(EMBEDDED_MODS)),modules.link,format_mp3.so): mp3/common.o mp3/dct64_i386.o mp3/decode_ntom.o mp3/layer3.o mp3/tabinit.o mp3/interface.o
@@ -49,3 +69,5 @@
 $(if $(filter chan_ooh323,$(EMBEDDED_MODS)),modules.link,chan_ooh323.so): _ASTCFLAGS+=$(H323CFLAGS)
 $(if $(filter chan_ooh323,$(EMBEDDED_MODS)),modules.link,chan_ooh323.so): $(addprefix ooh323c/src/,$(H323OBJS)) chan_ooh323.o ooh323cDriver.o
 $(addprefix ooh323c/src/,$(H323OBJS)) chan_ooh323.o ooh323cDriver.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,chan_ooh323)
+
+.PHONY: check_mp3