[lttng-dev] [PATCH] configure.ac: Remove duplicated CMD_DESCR_ROTATE definition

[Jérémie Galarneau]

Merged in master and stable-2.11.

Thanks!
Jérémie

On Mon, May 27, 2019 at 11:52:46AM -0400, Simon Marchi wrote:
> CMD_DESCR_ROTATE is defined twice by configure.  This breaks configuring
> with "-Werror -Wall", as some test programs don't compile due to:
> 
>   configure:16990: gcc -o conftest -Wall -Werror   conftest.c  >&5
>   conftest.c:163: error: "CONFIG_CMD_DESCR_ROTATE" redefined [-Werror]
>    #define CONFIG_CMD_DESCR_ROTATE "Archive a tracing session’s current trace chunk"
> 
>   conftest.c:154: note: this is the location of the previous definition
>    #define CONFIG_CMD_DESCR_ROTATE "Archive a tracing session's current trace chunk"
> 
>   cc1: all warnings being treated as errors
> 
> Signed-off-by: Simon Marchi <simon.marchi at efficios.com>
> ---
>  configure.ac | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 214d58ac8856..e88875856115 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -412,7 +412,6 @@ _AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_STATUS], [Get the status of the current t
>  _AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_STOP], [Stop tracing])
>  _AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_DISABLE_ROTATION], [Unset a rotation schedule])
>  _AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_ENABLE_ROTATION], [Set a rotation schedule])
> -_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_ROTATE], [Archive a tracing session’s current trace chunk])
>  _AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_TRACK], [Track specific system resources])
>  _AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_UNTRACK], [Untrack specific system resources])
>  _AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_VERSION], [Show version information])
> -- 
> 2.21.0
> 
> _______________________________________________
> lttng-dev mailing list
> lttng-dev at lists.lttng.org
> https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev