Mercurial > hg > ucx / changeset

     1.1 --- a/configure	Fri Jan 05 00:12:11 2024 +0100
     1.2 +++ b/configure	Fri Jan 05 20:35:13 2024 +0100
     1.3 @@ -256,24 +256,34 @@
     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  dependency_error_coverage()
    1.16  {
    1.17 -    printf "checking for coverage... "
    1.18 +    print_check_msg "$dep_checked_coverage" "checking for coverage... "
    1.19      # dependency coverage
    1.20      while true
    1.21      do
    1.22          TEMP_CFLAGS="$TEMP_CFLAGS \${COVERAGE_CFLAGS}"
    1.23          TEMP_LDFLAGS="$TEMP_LDFLAGS \${COVERAGE_LDFLAGS}"
    1.24 -        echo yes
    1.25 +        print_check_msg "$dep_checked_coverage" "yes\n"
    1.26 +        dep_checked_coverage=1
    1.27          return 1
    1.28      done
    1.29  
    1.30 -    echo no
    1.31 +    print_check_msg "$dep_checked_coverage" "no\n"
    1.32 +    dep_checked_coverage=1
    1.33      return 0
    1.34  }
    1.35  dependency_error_pandoc()
    1.36  {
    1.37 -    printf "checking for pandoc... "
    1.38 +    print_check_msg "$dep_checked_pandoc" "checking for pandoc... "
    1.39      # dependency pandoc
    1.40      while true
    1.41      do
    1.42 @@ -282,16 +292,18 @@
    1.43          else
    1.44              break
    1.45          fi
    1.46 -        echo yes
    1.47 +        print_check_msg "$dep_checked_pandoc" "yes\n"
    1.48 +        dep_checked_pandoc=1
    1.49          return 1
    1.50      done
    1.51  
    1.52 -    echo no
    1.53 +    print_check_msg "$dep_checked_pandoc" "no\n"
    1.54 +    dep_checked_pandoc=1
    1.55      return 0
    1.56  }
    1.57  dependency_error_c()
    1.58  {
    1.59 -    printf "checking for c... "
    1.60 +    print_check_msg "$dep_checked_c" "checking for c... "
    1.61      # dependency c platform="mingw"
    1.62      while true
    1.63      do
    1.64 @@ -309,7 +321,8 @@
    1.65  SHLIB_EXT=.dll
    1.66  
    1.67  __EOF__
    1.68 -        echo yes
    1.69 +        print_check_msg "$dep_checked_c" "yes\n"
    1.70 +        dep_checked_c=1
    1.71          return 1
    1.72      done
    1.73  
    1.74 @@ -330,7 +343,8 @@
    1.75  SHLIB_EXT=.dylib
    1.76  
    1.77  __EOF__
    1.78 -        echo yes
    1.79 +        print_check_msg "$dep_checked_c" "yes\n"
    1.80 +        dep_checked_c=1
    1.81          return 1
    1.82      done
    1.83  
    1.84 @@ -351,16 +365,18 @@
    1.85  SHLIB_EXT=.so
    1.86  
    1.87  __EOF__
    1.88 -        echo yes
    1.89 +        print_check_msg "$dep_checked_c" "yes\n"
    1.90 +        dep_checked_c=1
    1.91          return 1
    1.92      done
    1.93  
    1.94 -    echo no
    1.95 +    print_check_msg "$dep_checked_c" "no\n"
    1.96 +    dep_checked_c=1
    1.97      return 0
    1.98  }
    1.99  dependency_error_file_tools()
   1.100  {
   1.101 -    printf "checking for file-tools... "
   1.102 +    print_check_msg "$dep_checked_file_tools" "checking for file-tools... "
   1.103      # dependency file-tools
   1.104      while true
   1.105      do
   1.106 @@ -374,16 +390,18 @@
   1.107  SYMLINK=/bin/ln -s
   1.108  
   1.109  __EOF__
   1.110 -        echo yes
   1.111 +        print_check_msg "$dep_checked_file_tools" "yes\n"
   1.112 +        dep_checked_file_tools=1
   1.113          return 1
   1.114      done
   1.115  
   1.116 -    echo no
   1.117 +    print_check_msg "$dep_checked_file_tools" "no\n"
   1.118 +    dep_checked_file_tools=1
   1.119      return 0
   1.120  }
   1.121  dependency_error_doxygen()
   1.122  {
   1.123 -    printf "checking for doxygen... "
   1.124 +    print_check_msg "$dep_checked_doxygen" "checking for doxygen... "
   1.125      # dependency doxygen
   1.126      while true
   1.127      do
   1.128 @@ -392,17 +410,16 @@
   1.129          else
   1.130              break
   1.131          fi
   1.132 -        echo yes
   1.133 +        print_check_msg "$dep_checked_doxygen" "yes\n"
   1.134 +        dep_checked_doxygen=1
   1.135          return 1
   1.136      done
   1.137  
   1.138 -    echo no
   1.139 +    print_check_msg "$dep_checked_doxygen" "no\n"
   1.140 +    dep_checked_doxygen=1
   1.141      return 0
   1.142  }
   1.143  
   1.144 -
   1.145 -
   1.146 -
   1.147  # start collecting dependency information
   1.148  echo > "$TEMP_DIR/flags.mk"
   1.149  
   1.150 @@ -684,3 +701,4 @@
   1.151  rm -Rf "$TEMP_DIR"
   1.152  
   1.153  
   1.154 +

     2.1 --- a/make/configure.vm	Fri Jan 05 00:12:11 2024 +0100
     2.2 +++ b/make/configure.vm	Fri Jan 05 20:35:13 2024 +0100
     2.3 @@ -286,10 +286,18 @@
     2.4      return 0
     2.5  }
     2.6  
     2.7 +print_check_msg()
     2.8 +{
     2.9 +    if [ -z "$1" ]; then
    2.10 +        shift
    2.11 +        printf "$@"
    2.12 +    fi
    2.13 +}
    2.14 +
    2.15  #foreach( $dependency in $namedDependencies )
    2.16  dependency_error_${dependency.id}()
    2.17  {
    2.18 -    printf "checking for ${dependency.name}... "
    2.19 +    print_check_msg "${D}dep_checked_${dependency.id}" "checking for ${dependency.name}... "
    2.20      #foreach( $sub in $dependency.subdependencies )
    2.21      # dependency $sub.fullName
    2.22      while true
    2.23 @@ -346,19 +354,18 @@
    2.24  $sub.make
    2.25  __EOF__
    2.26          #end
    2.27 -        echo yes
    2.28 +        print_check_msg "${D}dep_checked_${dependency.id}" "yes\n"
    2.29 +        dep_checked_${dependency.id}=1
    2.30          return 1
    2.31      done
    2.32  
    2.33      #end
    2.34 -    echo no
    2.35 +    print_check_msg "${D}dep_checked_${dependency.id}" "no\n"
    2.36 +    dep_checked_${dependency.id}=1
    2.37      return 0
    2.38  }
    2.39  #end
    2.40  
    2.41 -
    2.42 -
    2.43 -
    2.44  # start collecting dependency information
    2.45  echo > "$TEMP_DIR/flags.mk"
    2.46  
    2.47 @@ -397,13 +404,15 @@
    2.48          fi
    2.49          #end
    2.50          #foreach( $pkg in $dependency.pkgconfig )
    2.51 -        printf "checking for pkg-config package $pkg.name... "
    2.52 +        print_check_msg "${D}dep_pkgconfig_checked_${pkg.id}" "checking for pkg-config package $pkg.name... "
    2.53          if test_pkg_config "$pkg.name" "$pkg.atleast" "$pkg.exact" "$pkg.max" ; then
    2.54 -            echo yes
    2.55 +            print_check_msg "${D}dep_pkgconfig_checked_${pkg.id}" "yes\n"
    2.56 +            dep_pkgconfig_checked_${pkg.id}=1
    2.57              TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags $pkg.name`"
    2.58              TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs $pkg.name`"
    2.59          else
    2.60 -            echo no
    2.61 +            print_check_msg "${D}dep_pkgconfig_checked_${pkg.id}" "no\n"
    2.62 +            dep_pkgconfig_checked_${pkg.id}=1
    2.63              ERROR=1
    2.64              break
    2.65          fi
    2.66 @@ -638,3 +647,4 @@
    2.67  rm -Rf "$TEMP_DIR"
    2.68  
    2.69  
    2.70 +