aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-05-22 13:40:52 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-05-22 13:40:52 +0000
commitb0a1f90960fa7bedd2363073bc0d3ef81d517257 (patch)
treee4dce16754dc62765c3a74b2f765dbf3cbbe2ff6
parent9f974d96fa03801c0cc9fa0dd8accd079ac1358a (diff)
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. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@117756 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xbuild_tools/make_buildopts_h7
-rw-r--r--main/asterisk.c1
2 files changed, 8 insertions, 0 deletions
diff --git a/build_tools/make_buildopts_h b/build_tools/make_buildopts_h
index 00b3eeded..f721dbca2 100755
--- a/build_tools/make_buildopts_h
+++ b/build_tools/make_buildopts_h
@@ -10,6 +10,11 @@ END
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 @@ SunOS)
esac
echo "#define AST_BUILDOPT_SUM \"${BUILDSUM}\""
+
+echo "#define AST_BUILDOPTS \"${BUILDOPTS}\""
diff --git a/main/asterisk.c b/main/asterisk.c
index 4b67c0410..d28e55665 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -398,6 +398,7 @@ static char *handle_show_settings(struct ast_cli_entry *e, int cmd, struct ast_c
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