Accept GPLed build tool modules when --lgpl is given.

diff --git a/ChangeLog b/ChangeLog
index e8294a001d3715924b9266f20704ae082b8b13eb..b8764bbfd76e89acf55e07aedbdec393630de48c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-12-02  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_import): Accept GPLed build tool modules when
+       --lgpl is given.
+       * modules/csharpcomp-script: New file.
+       * modules/csharpcomp: Depend on it.
+       * modules/javacomp-script: New file.
+       * modules/javacomp: Depend on it.
+       Suggested by Simon Josefsson.
+
 2005-11-29  Paul Eggert  <eggert@cs.ucla.edu>
 
        * modules/savedir (Depends-on): Add openat.

diff --git a/gnulib-tool b/gnulib-tool
index 4df7612d79fd747740adbc7ec2f443f1acc7f43b..5f20206147807b02a1d5373c291adee4cd94a02e 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2005-11-04 18:25:19 $'
+cvsdatestamp='$Date: 2005-12-02 13:37:34 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -938,7 +938,7 @@ func_import ()
     for module in $modules; do
       license=`func_get_license $module`
       case $license in
-        LGPL | 'public domain' | 'unlimited') ;;
+        LGPL | 'GPLed build tool' | 'public domain' | 'unlimited') ;;
         *) func_fatal_error "incompatible license on module $module: $license" ;;
       esac
     done