1.1 --- a/make/configure.vm Fri Jan 05 00:12:11 2024 +0100
1.2 +++ b/make/configure.vm Fri Jan 05 20:35:13 2024 +0100
1.3 @@ -286,10 +286,18 @@
1.4 return 0
1.5 }
1.6
1.7 +print_check_msg()
1.8 +{
1.9 + if [ -z "$1" ]; then
1.10 + shift
1.11 + printf "$@"
1.12 + fi
1.13 +}
1.14 +
1.15 #foreach( $dependency in $namedDependencies )
1.16 dependency_error_${dependency.id}()
1.17 {
1.18 - printf "checking for ${dependency.name}... "
1.19 + print_check_msg "${D}dep_checked_${dependency.id}" "checking for ${dependency.name}... "
1.20 #foreach( $sub in $dependency.subdependencies )
1.21 # dependency $sub.fullName
1.22 while true
1.23 @@ -346,19 +354,18 @@
1.24 $sub.make
1.25 __EOF__
1.26 #end
1.27 - echo yes
1.28 + print_check_msg "${D}dep_checked_${dependency.id}" "yes\n"
1.29 + dep_checked_${dependency.id}=1
1.30 return 1
1.31 done
1.32
1.33 #end
1.34 - echo no
1.35 + print_check_msg "${D}dep_checked_${dependency.id}" "no\n"
1.36 + dep_checked_${dependency.id}=1
1.37 return 0
1.38 }
1.39 #end
1.40
1.41 -
1.42 -
1.43 -
1.44 # start collecting dependency information
1.45 echo > "$TEMP_DIR/flags.mk"
1.46
1.47 @@ -397,13 +404,15 @@
1.48 fi
1.49 #end
1.50 #foreach( $pkg in $dependency.pkgconfig )
1.51 - printf "checking for pkg-config package $pkg.name... "
1.52 + print_check_msg "${D}dep_pkgconfig_checked_${pkg.id}" "checking for pkg-config package $pkg.name... "
1.53 if test_pkg_config "$pkg.name" "$pkg.atleast" "$pkg.exact" "$pkg.max" ; then
1.54 - echo yes
1.55 + print_check_msg "${D}dep_pkgconfig_checked_${pkg.id}" "yes\n"
1.56 + dep_pkgconfig_checked_${pkg.id}=1
1.57 TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags $pkg.name`"
1.58 TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs $pkg.name`"
1.59 else
1.60 - echo no
1.61 + print_check_msg "${D}dep_pkgconfig_checked_${pkg.id}" "no\n"
1.62 + dep_pkgconfig_checked_${pkg.id}=1
1.63 ERROR=1
1.64 break
1.65 fi
1.66 @@ -638,3 +647,4 @@
1.67 rm -Rf "$TEMP_DIR"
1.68
1.69
1.70 +
