Tests modules are under GPL now.

diff --git a/ChangeLog b/ChangeLog
index 2e845d29ad20bf1a3be85e01733576c578445cee..25b69a41ea09b7164564fce627876826ebb56a50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-17  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_get_license): Revert last patch. Instead, let
+       the license default to GPL.
+       (func_create_testdir): Don't complain if a module is LGPL and its
+       tests module depends on GPLed modules.
+
 2007-01-17  Bruno Haible  <bruno@clisp.org>
 
        * lib/gettimeofday.c (gettimeofday): Add code for the case

diff --git a/gnulib-tool b/gnulib-tool
index bac9bd9e0f495e586a8f75f3cbfcec1a6c978aaf..7fe55f08e567fed9bcf8ab98a2893ded961cc62e 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2007-01-14 23:00:12 $'
+cvsdatestamp='$Date: 2007-01-17 23:46:34 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 nl='
@@ -1020,10 +1020,11 @@ func_get_include_directive ()
 # - local_gnulib_dir  from --local-dir
 func_get_license ()
 {
-  # ${module}-tests always implicitly has the same license as ${module}.
-  sed_drop_tests_suffix='s/-tests$//'
-  func_lookup_file "modules/"`echo "$1" | sed -e "$sed_drop_tests_suffix"`
-  sed -n -e "/^License$sed_extract_prog" < "$lookedup_file"
+  func_lookup_file "modules/$1"
+  { sed -n -e "/^License$sed_extract_prog" < "$lookedup_file"
+    # The default is GPL.
+    echo "GPL"
+  } | sed -e 's,^ *$,,' | sed -e 1q
 }
 
 # func_get_maintainer module
@@ -2276,6 +2277,11 @@ func_create_testdir ()
   # Check that the license of every module is consistent with the license of
   # its dependencies.
   saved_modules="$modules"
+  saved_inctests="$inctests"
+  # When computing transitive closures, don't consider $module to depend on
+  # $module-tests. Need this becauses tests are implicitly GPL and may depend
+  # on GPL modules - therefore we don't want a warning in this case.
+  inctests=""
   for requested_module in $saved_modules; do
     requested_license=`func_get_license "$requested_module"`
     if test "$requested_license" != GPL; then
@@ -2296,6 +2302,7 @@ func_create_testdir ()
     fi
   done
   modules="$saved_modules"
+  inctests="$saved_inctests"
 
   # Subdirectory names.
   sourcebase=gllib