--- a/gnulib-tool	Tue Sep 21 14:22:48 2004 +0000
+++ b/gnulib-tool	Wed Sep 22 15:11:04 2004 +0000
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2004-09-21 14:22:48 $'
+cvsdatestamp='$Date: 2004-09-22 15:11:04 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -54,6 +54,7 @@
        gnulib-tool --extract-autoconf-snippet module
        gnulib-tool --extract-automake-snippet module
        gnulib-tool --extract-include-directive module
+       gnulib-tool --extract-license module
        gnulib-tool --extract-maintainer module
 
 Operation modes:
@@ -72,6 +73,8 @@
       --extract-autoconf-snippet   extract the snippet for configure.ac
       --extract-automake-snippet   extract the snippet for lib/Makefile.am
       --extract-include-directive  extract the #include directive
+      --extract-license            report the license terms of the source files
+                                   under lib/
       --extract-maintainer         report the maintainer(s) inside gnulib
 
 Options:
@@ -285,6 +288,7 @@
     s/^configure\.ac:[ 	]*$//
     s/^Makefile\.am:[ 	]*$//
     s/^Include:[ 	]*$//
+    s/^License:[ 	]*$//
     s/^Maintainer:[ 	]*$//
     tb
     p
@@ -331,6 +335,12 @@
   sed -e 's/^\(["<]\)/#include \1/'
 }
 
+# func_get_license module
+func_get_license ()
+{
+  sed -n -e "/^License$sed_extract_prog" < "$gnulib_dir/modules/$1"
+}
+
 # func_get_maintainer module
 func_get_maintainer ()
 {
@@ -928,6 +938,16 @@
     done
     ;;
 
+  extract-license )
+    for module
+    do
+      func_verify_module
+      if test -n "$module"; then
+        func_get_license "$module"
+      fi
+    done
+    ;;
+
   extract-maintainer )
     for module
     do