From: Mathieu Desnoyers Date: Fri, 6 May 2016 17:39:51 +0000 (-0400) Subject: Fix: debug-info feature enable/disable X-Git-Tag: v1.4.0-rc1~8 X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=0e79852463fbc0bede39a5be4bbcca543cbf20a7;ds=sidebyside Fix: debug-info feature enable/disable Explicitly enabling the debug-info feature should not disable the feature. Signed-off-by: Mathieu Desnoyers Signed-off-by: Jérémie Galarneau --- diff --git a/configure.ac b/configure.ac index 87916f0e..a2f82bd9 100644 --- a/configure.ac +++ b/configure.ac @@ -250,11 +250,16 @@ else fi -# Optional debuginfo feature (enabled by default) -AS_IF([test "x$DEFAULT_ENABLE_DEBUGINFO" = xyes], - [AC_ARG_ENABLE([debug-info], [AC_HELP_STRING([--disable-debug-info], [disable the debug-info feature (default on OS X and Solaris)])], [], [enable_debuginfo=yes])], - [AC_ARG_ENABLE([debug-info], [AC_HELP_STRING([--enable-debug-info], [enable the debug-info feature (default on Linux)])], [], [enable_debuginfo=no])] -) +# Set default enable state for debug info +AS_IF([test "x$DEFAULT_ENABLE_DEBUGINFO" = xyes], [enable_debuginfo=yes], [enable_debuginfo=no]) + +# Optional debuginfo feature +# Do _not_ indent the help string below (appears in the configure --help +# output). +AC_ARG_ENABLE([debug-info], +[AC_HELP_STRING([--enable-debug-info], [enable the debug-info feature (default on Linux)])] +[AC_HELP_STRING([--disable-debug-info], [disable the debug-info feature (default on OS X and Solaris)])], + [AS_IF([test "x$enableval" = xyes], [enable_debuginfo=yes], [enable_debuginfo=no])], []) AM_CONDITIONAL([ENABLE_DEBUGINFO], [test "x$enable_debuginfo" = xyes]) AS_IF([test "x$enable_debuginfo" = xyes], [