[svn-commits] russell: branch 1.6.0 r117757 - in /branches/1.6.0: ./ build_tools/ main/

[SVN commits to the Digium repositories]

Author: russell
Date: Thu May 22 08:41:31 2008
New Revision: 117757

URL: http://svn.digium.com/view/asterisk?view=rev&rev=117757
Log:
Merged revisions 117756 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r117756 | russell | 2008-05-22 08:40:52 -0500 (Thu, 22 May 2008) | 5 lines

Store build-time options as a string in AST_BUILDOPTS in buildopts.h.  Also,
display this information in the "core show settings" CLI command.  This is
useful if you want to verify that you're running a build with DONT_OPTIMIZE,
DEBUG_THREADS, etc.

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/build_tools/make_buildopts_h
    branches/1.6.0/main/asterisk.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/build_tools/make_buildopts_h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/build_tools/make_buildopts_h?view=diff&rev=117757&r1=117756&r2=117757
==============================================================================
--- branches/1.6.0/build_tools/make_buildopts_h (original)
+++ branches/1.6.0/build_tools/make_buildopts_h Thu May 22 08:41:31 2008
@@ -10,6 +10,11 @@
 TMP=`${GREP} -e ^MENUSELECT_CFLAGS menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'`
 for x in ${TMP}; do
 	echo "#define ${x} 1"
+	if test "x${BUILDOPTS}" != "x" ; then
+		BUILDOPTS="${BUILDOPTS}, ${x}"
+	else
+		BUILDOPTS="${x}"
+	fi
 done
 TMP=`${GREP} -e ^MENUSELECT_BUILD_DEPS menuselect.makeopts | sed 's/MENUSELECT_BUILD_DEPS\=//g'`
 for x in ${TMP}; do
@@ -35,3 +40,5 @@
 esac
 
 echo "#define AST_BUILDOPT_SUM \"${BUILDSUM}\""
+
+echo "#define AST_BUILDOPTS \"${BUILDOPTS}\""

Modified: branches/1.6.0/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/asterisk.c?view=diff&rev=117757&r1=117756&r2=117757
==============================================================================
--- branches/1.6.0/main/asterisk.c (original)
+++ branches/1.6.0/main/asterisk.c Thu May 22 08:41:31 2008
@@ -397,6 +397,7 @@
 	ast_cli(a->fd, "\nPBX Core settings\n");
 	ast_cli(a->fd, "-----------------\n");
 	ast_cli(a->fd, "  Version:                     %s\n", ast_get_version());
+	ast_cli(a->fd, "  Build Options:               %s\n", S_OR(AST_BUILDOPTS, "(none)"));
 	if (option_maxcalls)
 		ast_cli(a->fd, "  Maximum calls:               %d (Current %d)\n", option_maxcalls, ast_active_channels());
 	else