From 196ceeca0473f4e97e85d1402f600f098bc77988 Mon Sep 17 00:00:00 2001
From: "Gary V. Vaughan" <gary@gnu.org>
Date: Wed, 26 Oct 2011 14:33:45 +0700
Subject: [PATCH] syntax-check: fix violations and re-enable
 sc_error_message_uppercase.

* cfg.mk (local-checks-to-fix): Remove
sc_error_message_uppercase from list of disabled checks.
(exclude_file_name_regexp--sc_error_message_uppercase): Don't
match cvsu, which is not our file to edit.
* doc/libtool.texi: Use lowercase error message in example.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---
 bootstrap        | 3 ++-
 cfg.mk           | 6 ++++--
 doc/libtool.texi | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/bootstrap b/bootstrap
index dd757ae08..8776e219d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1934,7 +1934,8 @@ $func_strrow_result
 # Echo program name prefixed message to standard error, and exit.
 func_internal_error ()
 {
-    func_fatal_error "INTERNAL: " ${1+"$@"} "
+    func_fatal_error "\
+INTERNAL: " ${1+"$@"} "
           Please report this bug to \`bug-gnulib@gnu.org'
           in as much detail as possible."
 }
diff --git a/cfg.mk b/cfg.mk
index c39cc51b5..4c50f548d 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -64,7 +64,6 @@ local-checks-to-skip =				\
 	sc_GPL_version				\
 	sc_bindtextdomain			\
 	sc_cast_of_x_alloc_return_value		\
-	sc_error_message_uppercase		\
 	sc_program_name				\
 	sc_unmarked_diagnostics
 
@@ -72,6 +71,9 @@ local-checks-to-skip =				\
 # bindtextdomain: libtool isn't internationalized
 # cast_of_x_alloc_return_value:
 #         We support C++ compilation which does require casting here.
-# error_message_uppercase: we like our error messages
 # program_name: libtool has no programs!
 # unmarked_diagnostics: libtool isn't internationalized
+
+# List syntax-check exempted files.
+exclude_file_name_regexp--sc_error_message_uppercase = \
+  ^$(_build-aux)/cvsu$$
diff --git a/doc/libtool.texi b/doc/libtool.texi
index 20292ab41..d96e66d31 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -4635,7 +4635,7 @@ This function allows you to integrate your own error messages into
 If the allocation of an identifier fails, this function returns -1.
 
 @example
-int myerror = lt_dladderror ("Doh!");
+int myerror = lt_dladderror ("doh!");
 if (myerror < 0)
   perror (lt_dlerror ());
 @end example
-- 
2.47.2