Kaydet (Commit) c7cacf63 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Rename --enable-sal-info to --enable-sal-log

Change-Id: I896c9ac1c941b85d052fbefb902c4341664881d4
üst 8133dc3d
...@@ -165,7 +165,7 @@ export ENABLE_RANDR=@ENABLE_RANDR@ ...@@ -165,7 +165,7 @@ export ENABLE_RANDR=@ENABLE_RANDR@
export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@ export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@
export ENABLE_REPORTBUILDER=@ENABLE_REPORTBUILDER@ export ENABLE_REPORTBUILDER=@ENABLE_REPORTBUILDER@
export ENABLE_RUNTIME_OPTIMIZATIONS=@ENABLE_RUNTIME_OPTIMIZATIONS@ export ENABLE_RUNTIME_OPTIMIZATIONS=@ENABLE_RUNTIME_OPTIMIZATIONS@
export ENABLE_SAL_INFO=@ENABLE_SAL_INFO@ export ENABLE_SAL_LOG=@ENABLE_SAL_LOG@
export ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@ export ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@
export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@ export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@
export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@ export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@
......
...@@ -1015,8 +1015,8 @@ AC_ARG_ENABLE(debug, ...@@ -1015,8 +1015,8 @@ AC_ARG_ENABLE(debug,
[Include debugging information, disable compiler optimization and inlining plus [Include debugging information, disable compiler optimization and inlining plus
extra debugging code like assertions. Extra large build! (enables -g compiler flag).])) extra debugging code like assertions. Extra large build! (enables -g compiler flag).]))
AC_ARG_ENABLE(sal-info, AC_ARG_ENABLE(sal-log,
AS_HELP_STRING([--enable-sal-info], AS_HELP_STRING([--enable-sal-log],
[Make SAL_INFO and SAL_WARN calls do something even in a non-debug build.])) [Make SAL_INFO and SAL_WARN calls do something even in a non-debug build.]))
AC_ARG_ENABLE(selective-debuginfo, AC_ARG_ENABLE(selective-debuginfo,
...@@ -3805,10 +3805,10 @@ AC_SUBST(ENABLE_DEBUG) ...@@ -3805,10 +3805,10 @@ AC_SUBST(ENABLE_DEBUG)
AC_SUBST(ANDROID_DEBUGGABLE) AC_SUBST(ANDROID_DEBUGGABLE)
AC_SUBST(ANDROID_INSTALL_LOCATION) AC_SUBST(ANDROID_INSTALL_LOCATION)
if test "$enable_sal_info" = yes; then if test "$enable_sal_log" = yes; then
ENABLE_SAL_INFO=TRUE ENABLE_SAL_LOG=TRUE
fi fi
AC_SUBST(ENABLE_SAL_INFO) AC_SUBST(ENABLE_SAL_LOG)
dnl Selective debuginfo dnl Selective debuginfo
ENABLE_DEBUGINFO_FOR= ENABLE_DEBUGINFO_FOR=
......
...@@ -239,7 +239,7 @@ gb_GLOBALDEFS += -DNDEBUG \ ...@@ -239,7 +239,7 @@ gb_GLOBALDEFS += -DNDEBUG \
endif endif
ifeq ($(ENABLE_SAL_INFO),TRUE) ifeq ($(ENABLE_SAL_LOG),TRUE)
gb_GLOBALDEFS += -DSAL_LOG_INFO \ gb_GLOBALDEFS += -DSAL_LOG_INFO \
-DSAL_LOG_WARN \ -DSAL_LOG_WARN \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment