Harmonize spelling of debug-info

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/configure.ac b/configure.ac
index df6ada76f3cd43f35832d042125655e91de4ec81..da651095c2f0d37634daf87321e7b4ae06776937 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -239,8 +239,8 @@ fi
 
 # Optional debuginfo feature (enabled by default)
 AS_IF([test "x$DEFAULT_ENABLE_DEBUGINFO" = xyes],
 
 # Optional debuginfo feature (enabled by default)
 AS_IF([test "x$DEFAULT_ENABLE_DEBUGINFO" = xyes],

-    [AC_ARG_ENABLE([debuginfo], [AC_HELP_STRING([--disable-debuginfo], [disable the debug info feature (default on OS X and Solaris)])], [], [enable_debuginfo=yes])],
-    [AC_ARG_ENABLE([debuginfo], [AC_HELP_STRING([--enable-debuginfo], [enable the debug info feature (default on Linux)])], [], [enable_debuginfo=no])]
+    [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])]

 )
 
 AM_CONDITIONAL([ENABLE_DEBUGINFO], [test "x$enable_debuginfo" = xyes])
 )
 
 AM_CONDITIONAL([ENABLE_DEBUGINFO], [test "x$enable_debuginfo" = xyes])


@@ -248,9 +248,9 @@ AS_IF([test "x$enable_debuginfo" = xyes], [
             AC_CHECK_LIB([elf], [elf_version], [], [])
             AC_CHECK_LIB([dw], [dwarf_begin], [], [])
             AS_IF([test "x$ac_cv_lib_elf_elf_version" = xno || test "x$ac_cv_lib_dw_dwarf_begin" = xno],
             AC_CHECK_LIB([elf], [elf_version], [], [])
             AC_CHECK_LIB([dw], [dwarf_begin], [], [])
             AS_IF([test "x$ac_cv_lib_elf_elf_version" = xno || test "x$ac_cv_lib_dw_dwarf_begin" = xno],

-                        [AC_MSG_ERROR(Missing library from elfutils required for debuginfo. You can disable this feature with --disable-debuginfo.)]
+                        [AC_MSG_ERROR(Missing library from elfutils required for debug-info. You can disable this feature with --disable-debuginfo.)]

             )
             )

-            AC_DEFINE([ENABLE_DEBUGINFO], [1], [Define to 1 if you enable the 'debuginfo' feature])
+            AC_DEFINE([ENABLE_DEBUGINFO], [1], [Define to 1 if you enable the 'debug-info' feature])

 ], [])
 
 pkg_modules="gmodule-2.0 >= 2.0.0"
 ], [])
 
 pkg_modules="gmodule-2.0 >= 2.0.0"

diff --git a/tests/debuginfo-data/README.md b/tests/debuginfo-data/README.md
index 02d6bd34fd28c8431493919f93730c0861434853..88e773116c19fabb469851932fbe01de15525726 100644 (file)
--- a/tests/debuginfo-data/README.md
+++ b/tests/debuginfo-data/README.md
@@ -2,7 +2,7 @@ debuginfo-data
 ==============
 
 This directory contains pre-generated ELF and DWARF files used to test
 ==============
 
 This directory contains pre-generated ELF and DWARF files used to test

-the debuginfo analysis feature, including lookup of DWARF debugging
+the debug-info analysis feature, including lookup of DWARF debugging

 information via build ID and debug link methods, as well as the source
 files used to generate them.
 
 information via build ID and debug link methods, as well as the source
 files used to generate them.