--- a/gnulib-tool	Wed Aug 31 20:51:09 2005 +0000
+++ b/gnulib-tool	Wed Aug 31 20:51:41 2005 +0000
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2005-08-31 20:51:09 $'
+cvsdatestamp='$Date: 2005-08-31 20:51:41 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -1174,47 +1174,47 @@
     # Get settings.
     my_sed_traces='s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,;
       /gl_MODULES[^_]/  {
-        s,^.*gl_MODULES([[   ]*\([^])]*\).*$,ac_modules="\1",; p;
+        s,^.*gl_MODULES([[   ]*\([^])]*\).*$,cached_modules="\1",; p;
       };
       /gl_AVOID[^_]/  {
-        s,^.*gl_AVOID([[   ]*\([^])]*\).*$,ac_avoidlist="\1",; p;
+        s,^.*gl_AVOID([[   ]*\([^])]*\).*$,cached_avoidlist="\1",; p;
       };
       /gl_SOURCE_BASE/   {
-        s,^.*gl_SOURCE_BASE([[         ]*\([^])]*\).*$,ac_sourcebase="\1",; p;
+        s,^.*gl_SOURCE_BASE([[         ]*\([^])]*\).*$,cached_sourcebase="\1",; p;
       };
       /gl_M4_BASE/   {
-        s,^.*gl_M4_BASE([[         ]*\([^])]*\).*$,ac_m4base="\1",; p;
+        s,^.*gl_M4_BASE([[         ]*\([^])]*\).*$,cached_m4base="\1",; p;
       };
       /gl_LIB/   {
-        s,^.*gl_LIB([[         ]*\([^])]*\).*$,ac_libname="\1",; p;
+        s,^.*gl_LIB([[         ]*\([^])]*\).*$,cached_libname="\1",; p;
       };
       /AC_CONFIG_AUX_DIR/  {
         s,^.*AC_CONFIG_AUX_DIR([[         ]*\([^])]*\).*$,ac_auxdir="\1",; p;
       }
       /A[CM]_PROG_LIBTOOL/ { s,^.*$,seen_libtool=:,; p; };
       /LT_INIT/            { s,^.*$,seen_libtool=:,; p; };
-      /gl_LGPL/            { s,^.*$,lgpl=true,; p; };
-      /gl_LIBTOOL/         { s,^.*$,seen_libtool=:,; p; };
+      /gl_LGPL/            { s,^.*$,cached_lgpl=true,; p; };
+      /gl_LIBTOOL/         { s,^.*$,cached_libtool=:,; p; };
       /gl_MACRO_PREFIX/   {
-        s,^.*gl_MACRO_PREFIX([[         ]*\([^])]*\).*$,ac_macro_prefix="\1",; p;
+        s,^.*gl_MACRO_PREFIX([[         ]*\([^])]*\).*$,cached_macro_prefix="\1",; p;
       };
       d;'
     eval `cat $configure_ac | sed "$my_sed_traces"`
 
     # Override libname?
-    if test -z "$supplied_libname" && test -n "$ac_libname"; then
-      libname="$ac_libname"
+    if test -z "$supplied_libname" && test -n "$cached_libname"; then
+      libname="$cached_libname"
     fi
 
     # Set up source base.
-    test -z "$sourcebase" && sourcebase="$ac_sourcebase"
+    test -z "$sourcebase" && sourcebase="$cached_sourcebase"
     test -z "$sourcebase" && sourcebase="lib"
     test -d "$destdir/$sourcebase" \
       || { test -z "$dry_run" && mkdir "$destdir/$sourcebase"; } \
       || func_fatal_error "source base $destdir/$sourcebase doesn't exist"
 
     # Set up m4 base.
-    test -z "$m4base" && m4base="$ac_m4base"
+    test -z "$m4base" && m4base="$cached_m4base"
     test -z "$m4base" && m4base="m4"
     test -d "$destdir/$m4base" \
       || { test -z "$dry_run" && mkdir "$destdir/$m4base"; } \
@@ -1227,24 +1227,29 @@
       || { test -z "$dry_run" && mkdir "$destdir/$auxdir"; } \
       || func_fatal_error "aux directory $destdir/$auxdir doesn't exist"
 
+    # Require LGPL?
+    if test -n "$cached_lgpl"; then
+      lgpl=true
+    fi
+
     # Using libtool?
-    if test -n "$seen_libtool"; then
+    if test -n "$seen_libtool" || test -n "$cached_libtool"; then
       libtool=true
     fi
 
     # Macro prefix
-    test -z "$macro_prefix" && macro_prefix="$ac_macro_prefix"
+    test -z "$macro_prefix" && macro_prefix="$cached_macro_prefix"
     test -z "$macro_prefix" && macro_prefix="gl"
 
     # What modules to extract.
     if test $# = 0; then
-      modules="$ac_modules"
+      modules="$cached_modules"
     else
       modules="$*"
     fi
 
     # Which modules to avoid?
-    avoidlist=`echo $avoidlist $ac_avoidlist`
+    avoidlist=`echo $avoidlist $cached_avoidlist`
 
     func_import "$modules"
     ;;