Use func_get_license.

diff --git a/ChangeLog b/ChangeLog
index 66fd4c17982d4a104bfb9b3cf0cb626e428d99a6..b6e17f2283fa955df44dfa2207431c2da5492b60 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,8 @@
 
        * gnulib-tool: Untabify. Initialize supplied_libname.
        (func_usage): More homogenous output.
-       (func_import): New function, extracted from big case statement.
+       (func_import): New function, extracted from big case statement. Use
+       func_get_license.
 
 2004-10-11  Bruno Haible  <bruno@clisp.org>
 

diff --git a/gnulib-tool b/gnulib-tool
index 6064c31e360e591e49979f34dc7359b51a4811a3..ef24fa75c64b84a54eeba05ad4caf590ea73c262 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2004-10-15 15:28:43 $'
+cvsdatestamp='$Date: 2004-10-15 15:32:25 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -397,7 +397,7 @@ func_import ()
   # If --lgpl, check the license of modules are compatible.
   if test -n "$lgpl"; then
     for module in $modules; do
-      license=`sed -n -e "/^License$sed_extract_prog" < "$gnulib_dir/modules/$module"`
+      license=`func_get_license $module`
       if test $license != LGPL; then
         func_fatal_error "incompatible license on module \`$module\`: $license"
       fi