[svn-commits] mjordan: testsuite/bamboo/trunk r3195 - /bamboo/trunk/bin/build-asterisk-only.sh

[SVN commits to the Digium repositories]

Author: mjordan
Date: Thu Apr 19 14:28:33 2012
New Revision: 3195

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=3195
Log:
Remove the DONT_OPTIMIZE flag

It might be behind a pbx_dundi compiler warning, and isn't really needed yet.

Modified:
    bamboo/trunk/bin/build-asterisk-only.sh

Modified: bamboo/trunk/bin/build-asterisk-only.sh
URL: http://svnview.digium.com/svn/testsuite/bamboo/trunk/bin/build-asterisk-only.sh?view=diff&rev=3195&r1=3194&r2=3195
==============================================================================
--- bamboo/trunk/bin/build-asterisk-only.sh (original)
+++ bamboo/trunk/bin/build-asterisk-only.sh Thu Apr 19 14:28:33 2012
@@ -37,25 +37,35 @@
 ${MAKE} ${BUILDFLAGS} uninstall-all
 ${MAKE} ${BUILDFLAGS} menuselect.makeopts
 
-menuselect/menuselect --enable DONT_OPTIMIZE menuselect.makeopts
 menuselect/menuselect --enable DEBUG_THREADS menuselect.makeopts
 menuselect/menuselect --enable BETTER_BACKTRACES menuselect.makeopts
 menuselect/menuselect --enable TEST_FRAMEWORK menuselect.makeopts
 menuselect/menuselect --enable-category MENUSELECT_TESTS menuselect.makeopts
-menuselect/menuselect --enable-category MENUSELECT_ADDONS menuselect.makeopts
-if test -f addons/mp3/mpg123.h ; then :; else
-	contrib/scripts/get_mp3_source.sh
+if [ -d addons ] ; then
+	menuselect/menuselect --enable-category MENUSELECT_ADDONS menuselect.makeopts
+	if test -f addons/mp3/mpg123.h ; then :; else
+		contrib/scripts/get_mp3_source.sh
+	fi
 fi
-menuselect/menuselect --enable-category MENUSELECT_BRIDGES menuselect.makeopts
-menuselect/menuselect --enable-category MENUSELECT_CEL menuselect.makeopts
+if [ -d bridges ] ; then
+	menuselect/menuselect --enable-category MENUSELECT_BRIDGES menuselect.makeopts
+fi
+if [ -d cel ] ; then
+	menuselect/menuselect --enable-category MENUSELECT_CEL menuselect.makeopts
+fi
 menuselect/menuselect --enable-category MENUSELECT_CDR menuselect.makeopts
 menuselect/menuselect --enable-category MENUSELECT_CHANNELS menuselect.makeopts
 menuselect/menuselect --enable-category MENUSELECT_CODECS menuselect.makeopts
+if [ -f codecs/codec_ilbc.c ] ; then
+	menuselect/menuselect --disable codec_ilbc menuselect.makeopts
+fi
 menuselect/menuselect --enable-category MENUSELECT_FORMATS menuselect.makeopts
 menuselect/menuselect --enable-category MENUSELECT_FUNCS menuselect.makeopts
 menuselect/menuselect --enable-category MENUSELECT_PBX menuselect.makeopts
 menuselect/menuselect --enable-category MENUSELECT_RES menuselect.makeopts
-menuselect/menuselect --enable-category MENUSELECT_UTILS menuselect.makeopts
+if grep -q MENUSELECT_UTILS menuselect.makeopts ; then
+	menuselect/menuselect --enable-category MENUSELECT_UTILS menuselect.makeopts
+fi
 
 if [ "${PLAN}" = "AST-14" ] ; then
 	# If we're building Asterisk 1.4, let make run twice, and ignore failures