Don't complain about missing options in the first-use case.

diff --git a/ChangeLog b/ChangeLog
index ea16ae0579d2f9aee4a5ef800bb6ca3658d8c6c9..c24e6b503e4b42ec47fc0f1db4c635cc24a231a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-01  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (import): In the first-use case, provide defaults.
+
 2005-09-01  Bruno Haible  <bruno@clisp.org>
 
        * gnulib-tool (func_import): Remove the .tmp files.

diff --git a/gnulib-tool b/gnulib-tool
index b464dd3bd4c786a4e9453431f09e3fd92adb4e2a..a6358631223b13b18e225bc5725f92777ad566da 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2005-09-01 12:18:03 $'
+cvsdatestamp='$Date: 2005-09-01 12:28:32 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -1518,7 +1518,10 @@ case $mode in
       if test $m4dirs_count = 0; then
         # First use of gnulib in a package.
         # Any number of additional modules can be given.
+        test -n "$supplied_libname" || supplied_libname=true
+        test -n "$sourcebase" || sourcebase="lib"
         m4base="m4"
+        test -n "$macro_prefix" || macro_prefix="gl"
         func_import "$*"
       else
         if test $m4dirs_count = 1; then