Merge branch 'stable'

diff --combined gnulib-tool
index daacb02,792bd49..69ff2a1
--- 1/gnulib-tool
--- 2/gnulib-tool
+++ b/gnulib-tool
@@@ -348,10 -348,22 +348,22 @@@ func_emit_copyright_notice (
                 q
               }' < "$self_abspathname"
    echo "#"
-   echo "# This file is free software, distributed under the terms of the GNU"
-   echo "# General Public License.  As a special exception to the GNU General"
-   echo "# Public License, this file may be distributed as part of a program"
-   echo "# that contains a configuration script generated by Autoconf, under"
+   echo "# This file is free software; you can redistribute it and/or modify"
+   echo "# it under the terms of the GNU General Public License as published by"
+   echo "# the Free Software Foundation; either version 3 of the License, or"
+   echo "# (at your option) any later version."
+   echo "#"
+   echo "# This file is distributed in the hope that it will be useful,"
+   echo "# but WITHOUT ANY WARRANTY; without even the implied warranty of"
+   echo "# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the"
+   echo "# GNU General Public License for more details."
+   echo "#"
+   echo "# You should have received a copy of the GNU General Public License"
+   echo "# along with this file.  If not, see <http://www.gnu.org/licenses/>."
+   echo "#"
+   echo "# As a special exception to the GNU General Public License,"
+   echo "# this file may be distributed as part of a program that"
+   echo "# contains a configuration script generated by Autoconf, under"
    echo "# the same distribution terms as the rest of that program."
    echo "#"
    echo "# Generated by gnulib-tool."
@@@ -443,7 -455,7 +455,7 @@@ func_gnulib_dir (
        * ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;;
      esac
    done
 -  gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`
 +  gnulib_dir=/usr/share/gnulib
  }
  
  # func_tmpdir
@@@ -2718,7 -2730,7 +2730,7 @@@ func_modules_transitive_closure (
                    ;;
                esac
              done
-             if $inc; then
+             if $inc && func_acceptable "$dep"; then
                func_append inmodules " $dep"
                if test "$cond_dependencies" = true; then
                  escaped_dep=`echo "$dep" | sed -e "$sed_escape_dependency"`
@@@ -3840,6 -3852,8 +3852,8 @@@ func_emit_initmacro_done (
  # - local_gnulib_dir  from --local-dir
  # - modcache          true or false, from --cache-modules/--no-cache-modules
  # - sed_replace_build_aux  sed expression that replaces reference to build-aux
+ # - sed_replace_include_guard_prefix
+ #                     sed expression for resolving ${gl_include_guard_prefix}
  # - module            the module name
  # - toplevel          true or false. 'false' means a subordinate use of
  #                     gnulib-tool.
@@@ -3862,6 -3876,7 +3876,7 @@@ func_emit_autoconf_snippet (
      func_get_autoconf_snippet "$module" \
        | sed -e '/^$/d;' -e "s/^/$indentation/" \
              -e "$sed_replace_build_aux" \
+             -e "$sed_replace_include_guard_prefix" \
        | { if $disable_libtool; then
              sed -e 's/\$gl_cond_libtool/false/g' \
                  -e 's/gl_libdeps/gltests_libdeps/g' \
@@@ -3891,6 -3906,8 +3906,8 @@@
  # - local_gnulib_dir  from --local-dir
  # - modcache          true or false, from --cache-modules/--no-cache-modules
  # - sed_replace_build_aux  sed expression that replaces reference to build-aux
+ # - sed_replace_include_guard_prefix
+ #                     sed expression for resolving ${gl_include_guard_prefix}
  # - modules           the list of modules.
  # - verifier          one of func_verify_module, func_verify_nontests_module,
  #                     func_verify_tests_module. It selects the subset of
@@@ -3909,6 -3926,7 +3926,7 @@@ func_emit_autoconf_snippets (
    disable_libtool="$4"
    disable_gettext="$5"
    if test "$cond_dependencies" = true; then
+     for m in $modules; do echo $m; done | LC_ALL=C sort -u > "$tmp"/modules
      # Emit the autoconf code for the unconditional modules.
      for module in $1; do
        eval $verifier
@@@ -3945,12 -3963,14 +3963,14 @@@
            func_emit_autoconf_snippet "      "
            echo "      $shellvar=true"
            deps=`func_get_dependencies $module | sed -e "$sed_dependencies_without_conditions"`
+           # Intersect $deps with the modules list $1.
+           deps=`for m in $deps; do echo $m; done | LC_ALL=C sort -u | LC_ALL=C join - "$tmp"/modules`
            for dep in $deps; do
              if func_cond_module_p "$dep"; then
                func_module_shellfunc_name "$dep"
                func_cond_module_condition "$module" "$dep"
                if test "$condition" != true; then
-                 echo '      if $condition; then'
+                 echo "      if $condition; then"
                  echo "        $shellfunc"
                  echo '      fi'
                else
@@@ -3975,6 -3995,8 +3995,8 @@@
            :
          else
            deps=`func_get_dependencies $module | sed -e "$sed_dependencies_without_conditions"`
+           # Intersect $deps with the modules list $1.
+           deps=`for m in $deps; do echo $m; done | LC_ALL=C sort -u | LC_ALL=C join - "$tmp"/modules`
            for dep in $deps; do
              if func_cond_module_p "$dep"; then
                func_module_shellfunc_name "$dep"
@@@ -5448,7 -5470,16 +5470,16 @@@ s,//*$,/,
        echo "  - mention \"${val}\" in ${var} in ${dir}Makefile.am,"
      fi
    done
-   echo "  - invoke ${macro_prefix}_EARLY in $configure_ac, right after AC_PROG_CC,"
+   if grep '^ *AC_PROG_CC_STDC' "$configure_ac" > /dev/null; then
+     position_early_after=AC_PROG_CC_STDC
+   else
+     if grep '^ *AC_PROG_CC_C99' "$configure_ac" > /dev/null; then
+       position_early_after=AC_PROG_CC_C99
+     else
+       position_early_after=AC_PROG_CC
+     fi
+   fi
+   echo "  - invoke ${macro_prefix}_EARLY in $configure_ac, right after $position_early_after,"
    echo "  - invoke ${macro_prefix}_INIT in $configure_ac."
  }
  
@@@ -6486,6 -6517,9 +6517,9 @@@ s/\([.*$]\)/[\1]/g
      ;;
  
    extract-dependencies )
+     if test -n "$avoidlist"; then
+       func_fatal_error "cannot combine --avoid and --extract-dependencies"
+     fi
      for module
      do
        func_verify_module