gnulib-tool incorrectly handles library names with dashes

[Sergey Poznyakoff]

Hello,

When converting library names to Makefile variables, gnulib-tool
forgets to convert dashes. The following patch fixes it. It also fixes
unneeded duplication of --avoid options, notable in `# Reproduce by:'
headers in generated Makefile.ams.

No objections?

Regards,
Sergey

2007-07-05  Sergey Poznyakoff  <address@hidden>

        * gnulib-tool (func_dest_tmpfilename)
        (func_create_testdir): Translate `-' in file names to `_' in
        variable names.
        (func_import): Avoid duplication of --avoid statements
        

Index: gnulib-tool
===================================================================
RCS file: /cvsroot/gnulib/gnulib/gnulib-tool,v
retrieving revision 1.245
diff -p -u -r1.245 gnulib-tool
--- gnulib-tool 1 Jul 2007 13:01:40 -0000       1.245
+++ gnulib-tool 5 Jul 2007 08:43:15 -0000
@@ -1864,7 +1864,7 @@ func_import ()
   specified_modules="$cached_specified_modules $1"
   # Append the cached and the specified avoidlist. This is probably better
   # than dropping the cached one when --avoid is specified at least once.
-  avoidlist=`echo $cached_avoidlist $avoidlist`
+  avoidlist=`echo $cached_avoidlist $avoidlist | tr ' ' '\n' | sort | uniq | 
tr '\n' ' '`
   # The sourcebase defaults to the cached one.
   if test -z "$sourcebase"; then
     sourcebase="$cached_sourcebase"
@@ -2390,7 +2390,7 @@ func_import ()
     # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is
     # created using libtool, because libtool already handles the dependencies.
     if test "$libtool" != true; then
-      libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z' 'A-Z'`
+      libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z-' 'A-Z_'`
       echo "  ${libname_upper}_LIBDEPS=\"\$gl_libdeps\""
       echo "  AC_SUBST([${libname_upper}_LIBDEPS])"
       echo "  ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\""
@@ -2839,7 +2839,7 @@ func_create_testdir ()
      # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is
      # created using libtool, because libtool already handles the dependencies.
      if test "$libtool" != true; then
-       libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z' 'A-Z'`
+       libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z-' 'A-Z_'`
        echo "  ${libname_upper}_LIBDEPS=\"\$gl_libdeps\""
        echo "  AC_SUBST([${libname_upper}_LIBDEPS])"
        echo "  ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\""
@@ -2950,7 +2950,7 @@ func_create_testdir ()
    # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is
    # created using libtool, because libtool already handles the dependencies.
    if test "$libtool" != true; then
-     libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z' 'A-Z'`
+     libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z-' 'A-Z_'`
      echo "  ${libname_upper}_LIBDEPS=\"\$gl_libdeps\""
      echo "  AC_SUBST([${libname_upper}_LIBDEPS])"
      echo "  ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\""