X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=check-module;h=eaf00fba79570bfdeecbacf442ec49f3cda4d0d2;hb=b48afd89ec9be56156d6e2bebfdf457c778fe5c3;hp=188ecef8492f3031479627d4c93d91606481d119;hpb=bab13bbfea6efb701d7e5746c0dd3b5038f5a5ae;p=gnulib.git

diff --git a/check-module b/check-module
index 188ecef84..eaf00fba7 100755
--- a/check-module
+++ b/check-module
@@ -1,22 +1,20 @@
 #!/usr/bin/perl -w
 # Check a gnulib module.
 
-# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
 
-# This file is free software; you can redistribute it and/or modify it
+# This file is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Read a module description file and derive the set of files
@@ -39,6 +37,7 @@
 
 use strict;
 use Getopt::Long;
+use File::Basename;
 #use Coda;
 
 my $COPYRIGHT_NOTICE = "Copyright (C) 2006 Free Software Foundation, Inc.\n".
@@ -46,7 +45,7 @@ my $COPYRIGHT_NOTICE = "Copyright (C) 2006 Free Software Foundation, Inc.\n".
 "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n".
 "There is NO WARRANTY, to the extent permitted by law.\n";
 
-(my $VERSION = '$Revision: 1.6 $ ') =~ tr/[0-9].//cd;
+(my $VERSION = '$Revision: 1.8 $ ') =~ tr/[0-9].//cd;
 (my $ME = $0) =~ s|.*/||;
 
 use constant ST_INIT => 1;
@@ -98,6 +97,9 @@ sub parse_module_file ($)
 	  elsif ($state eq ST_DEPENDENTS)
 	    {
 	      $dep_set{$line} = 1;
+	      (my $base = $module_file) =~ s,.*/,,;
+	      $line eq $base
+		and die "$ME: module $module_file depends on itself\n";
 	    }
 	}
     }
@@ -157,7 +159,16 @@ sub find_included_lib_files ($)
 
   # Special cases...
   my %special_non_dup = ( 'fnmatch_loop.c' => 1,
-			  'regex.c' => 1, 'at-func.c' => 1 );
+			  'regex.c' => 1, 'at-func.c' => 1,
+			  'vasnprintf.c' => 1
+			);
+  my %dup_include_ok;
+  $dup_include_ok{'vasnprintf.c'}{'isnand-nolibm.h'} = 1;
+  $dup_include_ok{'vasnprintf.c'}{'isnanl-nolibm.h'} = 1;
+  $dup_include_ok{'vasnprintf.c'}{'fpucw.h'} = 1;
+  $dup_include_ok{'gen-uni-tables.c'}{'3level.h'} = 1;
+  $dup_include_ok{'csharpexec.c'}{'classpath.c'} = 1;
+  $dup_include_ok{'csharpexec.c'}{'classpath.h'} = 1;
 
   my %inc;
   open FH, '<', $file
@@ -175,6 +186,7 @@ sub find_included_lib_files ($)
       chomp $line;
       $line =~ s/".*//;
       exists $inc{$line} && ! exists $special_non_dup{$line}
+	  && ! exists $dup_include_ok{basename $file}{$line}
 	and warn "$ME: $file: duplicate inclusion of $line\n";
 
       $inc{$line} = 1;
@@ -204,9 +216,18 @@ my %exempt_header =
    # The use of obstack.h in the hash module is conditional, off by default.
    'lib/hash.c:obstack.h' => 1,
 
-   # The fts-lgpl module doesn't actually use fts-cycle.c and unistd-safer.h.
-   'lib/fts.c:fts-cycle.c' => 1,
-   'lib/fts.c:unistd-safer.h' => 1,
+   # C files in the gc module have conditional includes.
+   'lib/gc-gnulib.c:des.h' => 1,
+   'lib/gc-gnulib.c:arcfour.h' => 1,
+   'lib/gc-gnulib.c:arctwo.h' => 1,
+   'lib/gc-gnulib.c:md2.h' => 1,
+   'lib/gc-gnulib.c:md4.h' => 1,
+   'lib/gc-gnulib.c:md5.h' => 1,
+   'lib/gc-gnulib.c:rijndael.h' => 1,
+   'lib/gc-gnulib.c:sha1.h' => 1,
+   'lib/gc-gnulib.c:rijndael-api-fst.h' => 1,
+   'lib/gc-gnulib.c:hmac.h' => 1,
+   'lib/gc-libgcrypt.c:md2.h' => 1,
   );
 
 sub check_module ($)