Bug 5360: FwdState::noteDestinationsEnd() assertion "err" (#1767)

[thirdparty/squid.git] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 07d74ea452468008371cf5a34917299332970eba..bf0cea53824caa96866794844b328dcc6d2a256b 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-## Copyright (C) 1996-2020 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2023 The Squid Software Foundation and contributors
 ##
 ## Squid software is distributed under GPLv2+ license and includes
 ## contributions from numerous individuals and organizations.
@@ -50,7 +50,7 @@ find_variant()
   done
   if [ "x$found" = "xNOT_FOUND" ]; then
     echo "WARNING: Cannot find $tool version $versions" >&2
-    echo "Trying `$tool --version | head -1`" >&2
+    echo "Trying `$tool --version 2>&1 | head -1`" >&2
     found=""
   fi
   echo $found
@@ -62,7 +62,7 @@ find_path()
   path=`which $tool`
   if test $? -gt 0 ; then
     # path for $tool not found. Not defining, and hoping for the best
-    echo 
+    echo
     return
   fi
   echo $(dirname $path)
@@ -72,9 +72,9 @@ bootstrap() {
   if "$@"; then
     true # Everything OK
   else
-    echo "$1 failed"
+    echo "$1 failed" >&2
     echo "Autotool bootstrapping failed. You will need to investigate and correct" ;
-    echo "before you can develop on this source tree" 
+    echo "before you can develop on this source tree"
     exit 1
   fi
 }
@@ -117,7 +117,7 @@ echo "libtool  ($ltversion) : ${LIBTOOL_BIN}${ltver}"
 echo "libtool path : $ltpath"
 
 for dir in \
-       "" 
+       ""
 do
     if [ -z "$dir" ] || [ -d $dir ]; then
        if (