2011-10-07 Paul Eggert <eggert@cs.ucla.edu>
+ gnulib-tool: don't follow dependencies to avoided modules
+ This fixes a bug that is related to the previous one.
+ * gnulib-tool (func_modules_transitive_closure)
+ (func_emit_autoconf_snippets):
+ Check whether a dependency is acceptable before using it.
+ (--extract-dependencies): Report an error if --avoid is also used,
+ since this combination of options is not yet supported.
+
gnulib-tool: fix typo that broke Emacs on powerpc-apple-darwin9.8.0.
Problem reported by Peter Dyballa in
<http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9696>.
;;
esac
done
+ if $inc; then
+ func_acceptable $dep || inc=false
+ fi
if $inc; then
func_append inmodules " $dep"
if test "$cond_dependencies" = true; then
echo " $shellvar=true"
deps=`func_get_dependencies $module | sed -e "$sed_dependencies_without_conditions"`
for dep in $deps; do
- if func_cond_module_p "$dep"; then
+ if ! func_acceptable $dep; then
+ :
+ elif func_cond_module_p "$dep"; then
func_module_shellfunc_name "$dep"
func_cond_module_condition "$module" "$dep"
if test "$condition" != true; then
else
deps=`func_get_dependencies $module | sed -e "$sed_dependencies_without_conditions"`
for dep in $deps; do
- if func_cond_module_p "$dep"; then
+ if ! func_acceptable $dep; then
+ :
+ elif func_cond_module_p "$dep"; then
func_module_shellfunc_name "$dep"
func_cond_module_condition "$module" "$dep"
if test "$condition" != true; then
;;
extract-dependencies )
+ if test -n "$avoidlist"; then
+ func_fatal_error "cannot combine --avoid and --extract-dependencies"
+ fi
for module
do
func_verify_module