Formatting cleanups in macro comments.

2010-03-06 Thread Ralf Wildenhues
A trivial cleanup for maint.  Found by inspecting the quickfix list
generated by

  for f in `git ls-files`
  do
awk '{ len[NR] = length($0) }
 /*/  len[NR-1] != 0 {
   if (len[NR-1] != len[NR])
 print FILENAME : NR : $0
 }' $f
  done

Cheers,
Ralf

Formatting cleanups in macro comments.

* automake.in, lib/Automake/Channels.pm,
lib/Automake/FileUtils.pm, lib/Automake/Options.pm,
lib/Automake/Variable.pm, lib/Automake/XFile.pm,
m4/options.m4, m4/substnot.m4: Fix macro comment format.

diff --git a/automake.in b/automake.in
index 8692d61..503c221 100755
--- a/automake.in
+++ b/automake.in
@@ -6468,7 +6468,7 @@ sub define_variable ($$$)
 
 
 # define_files_variable ($VAR, \...@basename, $EXTENSION, $WHERE)
-# ---
+# 
 # Define the $VAR which content is the list of file names composed of
 # a @BASENAME and the $EXTENSION.
 sub define_files_variable ($...@$$)
@@ -6606,7 +6606,7 @@ sub define_per_target_linker_variable ($$)
 
 
 # check_trailing_slash ($WHERE, $LINE)
-# --
+# -
 # Return 1 iff $LINE ends with a slash.
 # Might modify $LINE.
 sub check_trailing_slash ($\$)
@@ -8017,7 +8017,7 @@ sub require_conf_file_with_macro ($$$@)
 
 
 # require_build_directory ($DIRECTORY)
-# 
+# -
 # Emit rules to create $DIRECTORY if needed, and return
 # the file that any target requiring this directory should be made
 # dependent upon.
diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm
index e94819e..223d8d2 100644
--- a/lib/Automake/Channels.pm
+++ b/lib/Automake/Channels.pm
@@ -1,4 +1,5 @@
-# Copyright (C) 2002, 2004, 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 2006, 2008, 2010 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
@@ -427,7 +428,7 @@ sub _format_message ($$%)
 }
 
 # _enqueue ($QUEUE, $KEY, $UNIQ_SCOPE, $TO_FILTER, $MSG, $FILE)
-# 
+# -
 # Push message on a queue, to be processed by another thread.
 sub _enqueue ($$)
 {
diff --git a/lib/Automake/FileUtils.pm b/lib/Automake/FileUtils.pm
index 203c7de..e39750d 100644
--- a/lib/Automake/FileUtils.pm
+++ b/lib/Automake/FileUtils.pm
@@ -1,4 +1,5 @@
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, 
Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2010 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
@@ -93,7 +94,7 @@ if absent, otherwise exit with error.
 
 # $FILE_NAME
 # find_file ($FILE_NAME, @INCLUDE)
-# ---
+# 
 sub find_file ($@)
 {
   use File::Spec;
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index cacc7d2..9543aa5 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -1,4 +1,5 @@
-# Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009  Free Software Foundation, 
Inc.
+# Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010 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
@@ -234,7 +235,7 @@ Return 1 on error, 0 otherwise.
 
 # $BOOL
 # _process_option_list (\%OPTIONS, $WHERE, @OPTIONS)
-# -
+# --
 # Process a list of options.  Return 1 on error, 0 otherwise.
 # \%OPTIONS is the hash to fill with options data, $WHERE is
 # the location where @OPTIONS occurred.
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index f0c867f..8a5b568 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -1,4 +1,5 @@
-# Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009  Free Software Foundation, 
Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 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
@@ -1515,7 +1516,7 @@ sub _hash_values (@)
 }
 # ($VARNAME, $GENERATED)
 # _gen_varname ($BASE, @DEFINITIONS)
-# -
+# --
 # Return a variable name starting with $BASE, that will be
 # used to store definitions @DEFINITIONS.
 # 

hello uses fdl.texi, not gpl.texi

2010-03-06 Thread Karl Berry
Some time ago I changed hello.texi to not @cinlude gpl.texi any more.
May as well fix the example in the Automake manual.  Diff below.

--- /tmp/ORIG/automake.texi 2010-02-25 00:22:09.0 -0800
+++ /tmp/automake.texi  2010-03-06 15:15:17.0 -0800
@@ -7743,3 +7743,3 @@
 file.  For instance, in GNU Hello, @file{hello.texi} includes the file
-...@file{gpl.texi}.  You can tell Automake about these dependencies using
+...@file{fdl.texi}.  You can tell Automake about these dependencies using
 the @co...@var{texi}_texinfos} variable.  Here is how GNU Hello does it:
@@ -7750,3 +7750,3 @@
 info_TEXINFOS = hello.texi
-hello_TEXINFOS = gpl.texi
+hello_TEXINFOS = fdl.texi
 @end example

Diff finished at Sat Mar  6 15:15:26




Re: Bug#565663: [PATCH] aclocal: Make missing 'dir' in -Idir a warning instead of a fatal error.

2010-03-06 Thread Ben Pfaff
Ben Pfaff b...@cs.stanford.edu writes:

 +2010-02-27  Ben Pfaff  b...@cs.stanford.edu
 +
 + Make -Idir a warning instead of a fatal error if 'dir' does not
 + exist.
 + * aclocal.in (scan_m4_dirs): Demote fatal error to warning.
 +

I was hoping for some feedback on this proposed patch.
-- 
Ben Pfaff 
http://benpfaff.org