comparison: test/make/configure.vm
test/make/configure.vm
- changeset 68
- c997c0978665
- parent 67
- e43d30273f74
- child 71
- b8d06f7b617c
equal
deleted
inserted
replaced
| 67:e43d30273f74 | 68:c997c0978665 |
|---|---|
| 474 #foreach( $dependency in $feature.dependencies ) | 474 #foreach( $dependency in $feature.dependencies ) |
| 475 # check dependency | 475 # check dependency |
| 476 if dependency_error_$dependency ; then | 476 if dependency_error_$dependency ; then |
| 477 # "auto" features can fail and are just disabled in this case | 477 # "auto" features can fail and are just disabled in this case |
| 478 if [ "$${feature.getVarName()}" = "auto" ]; then | 478 if [ "$${feature.getVarName()}" = "auto" ]; then |
| 479 unset ${feature.getVarName()} | 479 DISABLE_${feature.getVarName()}=1 |
| 480 else | 480 else |
| 481 DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED ${dependency} " | 481 DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED ${dependency} " |
| 482 ERROR=1 | 482 ERROR=1 |
| 483 fi | 483 fi |
| 484 fi | 484 fi |
| 485 #end | 485 #end |
| 486 if [ -n "$DISABLE_${feature.getVarName()}" ]; then | |
| 487 unset ${feature.getVarName()} | |
| 488 fi | |
| 486 fi | 489 fi |
| 487 #end | 490 #end |
| 488 | 491 |
| 489 #foreach( $opt in $target.options ) | 492 #foreach( $opt in $target.options ) |
| 490 # Option: --${opt.argument} | 493 # Option: --${opt.argument} |
