From: Peter Eisentraut Date: Fri, 22 Aug 2008 06:51:53 +0000 (+0200) Subject: Format warning and error messages to match GCS. X-Git-Tag: v2.63~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e25b72286f1f3927e467a573b8bc0e48255737da;p=thirdparty%2Fautoconf.git Format warning and error messages to match GCS. * lib/autoconf/general.m4 (_AC_INIT_DIRCHECK) (_AC_INIT_PARSE_ARGS, _AC_CACHE_DUMP): Start warning and error messages with a lowercase letter, end them without punctuation. * lib/autoconf/lang.m4 (AC_NO_EXECUTABLES): Likewise. * lib/autoconf/libs.m4 (AC_PATH_X): Likewise. * lib/autoconf/status.m4 (AC_OUTPUT, _AC_OUTPUT_MAIN_LOOP): Likewise. * tests/fortran.at (GNU Fortran): Likewise. * tests/torture.at (Deep Package): Likewise. Signed-off-by: Ralf Wildenhues --- diff --git a/ChangeLog b/ChangeLog index 99a0e058..6ddc9f55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2008-08-22 Peter Eisentraut (tiny change) + + Format warning and error messages to match GCS. + * lib/autoconf/general.m4 (_AC_INIT_DIRCHECK) + (_AC_INIT_PARSE_ARGS, _AC_CACHE_DUMP): Start warning and error + messages with a lowercase letter, end them without punctuation. + * lib/autoconf/lang.m4 (AC_NO_EXECUTABLES): Likewise. + * lib/autoconf/libs.m4 (AC_PATH_X): Likewise. + * lib/autoconf/status.m4 (AC_OUTPUT, _AC_OUTPUT_MAIN_LOOP): + Likewise. + * tests/fortran.at (GNU Fortran): Likewise. + * tests/torture.at (Deep Package): Likewise. + 2008-08-21 Eric Blake Avoid extra side effects in m4sugar list expansion. diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 265d78bf..c94e0484 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -479,7 +479,7 @@ AC_DEFUN([_AC_INIT_DIRCHECK], ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - AC_MSG_ERROR([Working directory cannot be determined]) + AC_MSG_ERROR([working directory cannot be determined]) test "X$ac_ls_di" = "X$ac_pwd_ls_di" || AC_MSG_ERROR([pwd does not report name of working directory]) @@ -894,8 +894,8 @@ fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) AC_MSG_ERROR([Unrecognized options: $ac_unrecognized_opts]) ;; - *) AC_MSG_WARN( [Unrecognized options: $ac_unrecognized_opts]) ;; + fatal) AC_MSG_ERROR([unrecognized options: $ac_unrecognized_opts]) ;; + *) AC_MSG_WARN( [unrecognized options: $ac_unrecognized_opts]) ;; esac fi @@ -1895,7 +1895,7 @@ m4_define([_AC_CACHE_DUMP], case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) AC_MSG_WARN([Cache variable $ac_var contains a newline.]) ;; + *_cv_*) AC_MSG_WARN([cache variable $ac_var contains a newline]) ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( diff --git a/lib/autoconf/lang.m4 b/lib/autoconf/lang.m4 index f00479ba..c48f1de7 100644 --- a/lib/autoconf/lang.m4 +++ b/lib/autoconf/lang.m4 @@ -1,7 +1,7 @@ # This file is part of Autoconf. -*- Autoconf -*- # Programming languages support. -# Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007 Free Software -# Foundation, Inc. +# Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008 Free +# Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -371,7 +371,7 @@ fi m4_define([AC_LINK_IFELSE], [if test x$ac_no_link = xyes; then - AC_MSG_ERROR([Link tests are not allowed after AC@&t@_NO_EXECUTABLES.]) + AC_MSG_ERROR([link tests are not allowed after AC@&t@_NO_EXECUTABLES]) fi ]m4_defn([AC_LINK_IFELSE])) diff --git a/lib/autoconf/libs.m4 b/lib/autoconf/libs.m4 index a1b8cfe2..4e62040d 100644 --- a/lib/autoconf/libs.m4 +++ b/lib/autoconf/libs.m4 @@ -353,7 +353,7 @@ if test "x$with_x" = xno; then have_x=disabled else case $x_includes,$x_libraries in #( - *\'*) AC_MSG_ERROR([Cannot use X directory names containing ']);; #( + *\'*) AC_MSG_ERROR([cannot use X directory names containing ']);; #( *,NONE | NONE,*) _AC_PATH_X;; #( *) have_x=yes;; esac diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4 index af16f797..d9729a3a 100644 --- a/lib/autoconf/status.m4 +++ b/lib/autoconf/status.m4 @@ -1304,7 +1304,7 @@ fi dnl config.status should not do recursion. AC_PROVIDE_IFELSE([AC_CONFIG_SUBDIRS], [_AC_OUTPUT_SUBDIRS()])dnl if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - AC_MSG_WARN([Unrecognized options: $ac_unrecognized_opts]) + AC_MSG_WARN([unrecognized options: $ac_unrecognized_opts]) fi ])# AC_OUTPUT @@ -1643,7 +1643,7 @@ do esac case $ac_mode$ac_tag in :[[FHL]]*:*);; - :L* | :C*:*) AC_MSG_ERROR([Invalid tag $ac_tag.]);; + :L* | :C*:*) AC_MSG_ERROR([invalid tag $ac_tag]);; :[[FH]]-) ac_tag=-:-;; :[[FH]]*) ac_tag=$ac_tag:$ac_tag.in;; esac diff --git a/tests/fortran.at b/tests/fortran.at index 807724dd..e8faf94f 100644 --- a/tests/fortran.at +++ b/tests/fortran.at @@ -2,7 +2,7 @@ AT_BANNER([Fortran low level compiling/preprocessing macros.]) -# Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2003, 2008 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -71,7 +71,7 @@ AC_FC_FREEFORM([], if test "$ac_compiler_gnu" = yes; then case $FCFLAGS in *-ffree-form*) ;; - *) AC_MSG_ERROR([failed to recognize GNU Fortran's -ffree-form option.]);; + *) AC_MSG_ERROR([failed to recognize GNU Fortran's -ffree-form option]);; esac fi ]]) diff --git a/tests/torture.at b/tests/torture.at index 44fdcd5e..b79ff895 100644 --- a/tests/torture.at +++ b/tests/torture.at @@ -1297,7 +1297,7 @@ AC_ARG_VAR([INNERMOST], [an innermost variable]) AC_CONFIG_HEADERS(config.h:config.hin) AC_DEFINE_UNQUOTED([INNERMOST], [$INNERMOST], [an innermost variable]) if test -n "$innermost_error"; then - AC_MSG_FAILURE([Error in $PACKAGE_NAME]) + AC_MSG_FAILURE([error in $PACKAGE_NAME]) fi AC_OUTPUT ]])