gnulib-tool: allow more comments

[Bruno Haible]

It can be useful to add comments in the 'Depends-on' section of a module
description. This change lets gnulib-tool recognize these comments.


2011-06-13  Bruno Haible  <address@hidden>

        gnulib-tool: Allow comments in the 'Depends-on' section.
        * doc/gnulib.texi (Module description): Mention comment syntax in the
        Depends-on section.
        * gnulib-tool (func_get_dependencies): Filter out comment lines.

*** doc/gnulib.texi.orig        Mon Jun 13 12:27:11 2011
--- doc/gnulib.texi     Mon Jun 13 12:25:16 2011
***************
*** 406,411 ****
--- 406,413 ----
  strtoull   [test $ac_cv_func_strtoumax = no]
  @end smallexample
  
+ Lines starting with @code{#} are recognized as comments and are ignored.
+ 
  @item configure.ac-early
  This field contains @file{configure.ac} stuff (Autoconf macro invocations and
  shell statements) that are logically placed early in the @file{configure.ac}
*** gnulib-tool.orig    Mon Jun 13 12:27:11 2011
--- gnulib-tool Mon Jun 13 12:20:09 2011
***************
*** 2096,2119 ****
        ;;
    esac
    # Then the explicit dependencies listed in the module description.
!   if ! $modcache; then
!     func_lookup_file "modules/$1"
!     sed -n -e "/^Depends-on$sed_extract_prog" < "$lookedup_file"
!   else
!     func_cache_lookup_module "$1"
!     # Output the field's value, including the final newline (if any).
!     if $have_associative; then
!       if eval 'test -n "${modcache_dependson[$1]+set}"'; then
!         eval 'echo "${modcache_dependson[$1]}"'
!       fi
      else
!       eval "field_set=\"\$${cachevar}_dependson_set\""
!       if test -n "$field_set"; then
!         eval "field_value=\"\$${cachevar}_dependson\""
!         echo "${field_value}"
        fi
      fi
!   fi
  }
  
  # func_get_autoconf_early_snippet module
--- 2096,2121 ----
        ;;
    esac
    # Then the explicit dependencies listed in the module description.
!   { if ! $modcache; then
!       func_lookup_file "modules/$1"
!       sed -n -e "/^Depends-on$sed_extract_prog" < "$lookedup_file"
      else
!       func_cache_lookup_module "$1"
!       # Output the field's value, including the final newline (if any).
!       if $have_associative; then
!         if eval 'test -n "${modcache_dependson[$1]+set}"'; then
!           eval 'echo "${modcache_dependson[$1]}"'
!         fi
!       else
!         eval "field_set=\"\$${cachevar}_dependson_set\""
!         if test -n "$field_set"; then
!           eval "field_value=\"\$${cachevar}_dependson\""
!           echo "${field_value}"
!         fi
        fi
      fi
!   } \
!   | sed -e '/^#/d'
  }
  
  # func_get_autoconf_early_snippet module
-- 
In memoriam Anna Göldi <http://en.wikipedia.org/wiki/Anna_Göldi>