X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=configure.ac;h=a08ec11385c6a227d2e3ea811591ff92366f8023;hp=f4dc11729e32faaf60ae4dfa7c1326def86ee0ea;hb=eb75a494900f763d9daca6a9bab5a8f01ffe552f;hpb=f17fda39ab4c00d560e524e1003cc5de4ab134d4

diff --git a/configure.ac b/configure.ac
index f4dc1172..a08ec113 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,11 +128,11 @@ AC_CHECK_FUNCS([ \
 ])
 
 MINGW32=no
-DEFAULT_ENABLE_DEBUGINFO=yes
+DEFAULT_ENABLE_DEBUG_INFO=yes
 AS_CASE([$host_os],
   [solaris*|darwin*],
     [
-	DEFAULT_ENABLE_DEBUGINFO=no
+	DEFAULT_ENABLE_DEBUG_INFO=no
     ],
   [mingw*],
     [
@@ -250,24 +250,26 @@ else
 
 fi
 
-# Set default enable state for debug info
-AS_IF([test "x$DEFAULT_ENABLE_DEBUGINFO" = xyes], [enable_debuginfo=yes], [enable_debuginfo=no])
+# Set default enable state for debug info.
+# The _enable_debug_info variable is prepended with an underscore to
+# avoid clashing with the one generated by AC_ARG_ENABLE.
+AS_IF([test "x$DEFAULT_ENABLE_DEBUG_INFO" = xyes], [_enable_debug_info=yes], [_enable_debug_info=no])
 
-# Optional debuginfo feature
+# Optional debug info 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])], [])
+[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_debug_info=yes], [_enable_debug_info=no])], [])
 
-AM_CONDITIONAL([ENABLE_DEBUGINFO], [test "x$enable_debuginfo" = xyes])
-AS_IF([test "x$enable_debuginfo" = xyes], [
+AM_CONDITIONAL([ENABLE_DEBUG_INFO], [test "x$_enable_debug_info" = xyes])
+AS_IF([test "x$_enable_debug_info" = xyes], [
 	    # Check if libelf and libdw are present
-	    AC_CHECK_LIB([elf], [elf_version], [], [AC_MSG_ERROR(Missing libelf (from elfutils >= 0.154) which is required by debug-info. You can disable this feature using --disable-debug-info.)])
-	    AC_CHECK_LIB([dw], [dwarf_begin], [], [AC_MSG_ERROR(Missing libdw (from elfutils >= 0.154) which is required by debug-info. You can disable this feature using --disable-debug-info.)])
-	    AX_LIB_ELFUTILS([0], [154], [], [AC_MSG_ERROR(elfutils >= 0.154 is required to use the debug-info feature. You can disable this feature using --disable-debug-info.)])
-            AC_DEFINE([ENABLE_DEBUGINFO], [1], [Define to 1 if you enable the 'debug-info' feature])
+	    AC_CHECK_LIB([elf], [elf_version], [], [AC_MSG_ERROR(Missing libelf (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)])
+	    AC_CHECK_LIB([dw], [dwarf_begin], [], [AC_MSG_ERROR(Missing libdw (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)])
+	    AX_LIB_ELFUTILS([0], [154], [], [AC_MSG_ERROR(elfutils >= 0.154 is required to use the debug info feature. You can disable this feature using --disable-debug-info.)])
+            AC_DEFINE([ENABLE_DEBUG_INFO], [1], [Define to 1 if you enable the 'debug info' feature])
 ], [])
 
 PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.0.0])
@@ -372,8 +374,8 @@ PPRINT_PROP_BOOL([Python bindings], $value)
 test "x$enable_python_bindings_doc" = "xyes" && value=1 || value=0
 PPRINT_PROP_BOOL([Python bindings doc], $value)
 
-# debug-info enabled/disabled
-test "x$enable_debuginfo" = "xyes" && value=1 || value=0
+# debug info enabled/disabled
+test "x$_enable_debug_info" = "xyes" && value=1 || value=0
 PPRINT_PROP_BOOL([Debug information output], $value)