comparison: src/test/resources/golden-sample/configure2
src/test/resources/golden-sample/configure2
- changeset 68
- c997c0978665
- parent 67
- e43d30273f74
- child 71
- b8d06f7b617c
equal
deleted
inserted
replaced
| 67:e43d30273f74 | 68:c997c0978665 |
|---|---|
| 558 if [ -n "$FEATURE_DB" ]; then | 558 if [ -n "$FEATURE_DB" ]; then |
| 559 # check dependency | 559 # check dependency |
| 560 if dependency_error_sqlite ; then | 560 if dependency_error_sqlite ; then |
| 561 # "auto" features can fail and are just disabled in this case | 561 # "auto" features can fail and are just disabled in this case |
| 562 if [ "$FEATURE_DB" = "auto" ]; then | 562 if [ "$FEATURE_DB" = "auto" ]; then |
| 563 unset FEATURE_DB | 563 DISABLE_FEATURE_DB=1 |
| 564 else | 564 else |
| 565 DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED sqlite " | 565 DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED sqlite " |
| 566 ERROR=1 | 566 ERROR=1 |
| 567 fi | 567 fi |
| 568 fi | |
| 569 if [ -n "$DISABLE_FEATURE_DB" ]; then | |
| 570 unset FEATURE_DB | |
| 568 fi | 571 fi |
| 569 fi | 572 fi |
| 570 if [ -n "$FEATURE_GUI" ]; then | 573 if [ -n "$FEATURE_GUI" ]; then |
| 571 # check dependency | 574 # check dependency |
| 572 if dependency_error_gtk3 ; then | 575 if dependency_error_gtk3 ; then |
| 573 # "auto" features can fail and are just disabled in this case | 576 # "auto" features can fail and are just disabled in this case |
| 574 if [ "$FEATURE_GUI" = "auto" ]; then | 577 if [ "$FEATURE_GUI" = "auto" ]; then |
| 575 unset FEATURE_GUI | 578 DISABLE_FEATURE_GUI=1 |
| 576 else | 579 else |
| 577 DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED gtk3 " | 580 DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED gtk3 " |
| 578 ERROR=1 | 581 ERROR=1 |
| 579 fi | 582 fi |
| 583 fi | |
| 584 if [ -n "$DISABLE_FEATURE_GUI" ]; then | |
| 585 unset FEATURE_GUI | |
| 580 fi | 586 fi |
| 581 fi | 587 fi |
| 582 | 588 |
| 583 # Option: --toolkit | 589 # Option: --toolkit |
| 584 if [ -z $OPT_TOOLKIT ]; then | 590 if [ -z $OPT_TOOLKIT ]; then |
