Tue, 28 Oct 2025 22:03:06 +0100
fix that dependencies for tools are always checked
| configure | file | annotate | diff | comparison | revisions | |
| make/project.xml | file | annotate | diff | comparison | revisions |
--- a/configure Tue Oct 14 17:09:27 2025 +0200 +++ b/configure Tue Oct 28 22:03:06 2025 +0100 @@ -624,21 +624,39 @@ TEMP_CXXFLAGS= TEMP_LDFLAGS= -if dependency_error_toolkit; then - DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED toolkit " - ERROR=1 -fi -if dependency_error_gtk3; then - DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED gtk3 " - ERROR=1 -fi -if dependency_error_ucx; then - DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED ucx " - ERROR=1 -fi # Features if [ -n "$FEATURE_TOOLS" ]; then + # check dependency + if dependency_error_toolkit ; then + # "auto" features can fail and are just disabled in this case + if [ "$FEATURE_TOOLS" = "auto" ]; then + DISABLE_FEATURE_TOOLS=1 + else + DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED toolkit " + ERROR=1 + fi + fi + # check dependency + if dependency_error_gtk3 ; then + # "auto" features can fail and are just disabled in this case + if [ "$FEATURE_TOOLS" = "auto" ]; then + DISABLE_FEATURE_TOOLS=1 + else + DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED gtk3 " + ERROR=1 + fi + fi + # check dependency + if dependency_error_ucx ; then + # "auto" features can fail and are just disabled in this case + if [ "$FEATURE_TOOLS" = "auto" ]; then + DISABLE_FEATURE_TOOLS=1 + else + DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED ucx " + ERROR=1 + fi + fi if [ -n "$DISABLE_FEATURE_TOOLS" ]; then unset FEATURE_TOOLS fi
--- a/make/project.xml Tue Oct 14 17:09:27 2025 +0200 +++ b/make/project.xml Tue Oct 28 22:03:06 2025 +0100 @@ -63,8 +63,8 @@ <disabled> <make>NO_TOOLS=1</make> </disabled> + <dependencies>toolkit,gtk3,ucx</dependencies> </feature> - <dependencies>toolkit,gtk3,ucx</dependencies> </target> </project>