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

[thirdparty/squid.git] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 3f14fdeb808481649f613a3b5bc77c478a4d1677..bf0cea53824caa96866794844b328dcc6d2a256b 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,4 +1,12 @@
 #!/bin/sh
+#
+## 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.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
+#
 # Used to setup the configure.ac, autoheader and Makefile.in's if configure
 # has not been generated. This script is only needed for developers when
 # configure has not been run, or if a Makefile.am in a non-configured directory
@@ -42,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
@@ -54,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)
@@ -64,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
 }
@@ -77,20 +85,6 @@ bootstrap_libtoolize() {
     ltdl="--ltdl"
 
     bootstrap $tool $ltdl --force --copy --automake
-
-    # customize generated libltdl, if any
-    if test -d libltdl
-    then
-        src=libltdl
-
-        # do not bundle with the huge standard license text
-        rm -f $src/COPYING.LIB
-        makefile=$src/Makefile.in
-        sed 's/COPYING.LIB/ /g' $makefile > $makefile.new;
-        chmod u+w $makefile
-        mv $makefile.new $makefile
-        chmod u-w $makefile
-    fi
 }
 
 # On MAC OS X, GNU libtool is named 'glibtool':
@@ -123,7 +117,7 @@ echo "libtool  ($ltversion) : ${LIBTOOL_BIN}${ltver}"
 echo "libtool path : $ltpath"
 
 for dir in \
-       "" 
+       ""
 do
     if [ -z "$dir" ] || [ -d $dir ]; then
        if (
@@ -156,7 +150,9 @@ do
 done
 
 # Make a copy of SPONSORS we can package
-sed -e 's/@Squid-[0-9\.]*://' <SPONSORS.list > SPONSORS || (rm -f SPONSORS && exit 1)
+if test -f SPONSORS.list; then
+  sed -e 's/@Squid-[0-9\.]*://' <SPONSORS.list > SPONSORS || (rm -f SPONSORS && exit 1)
+fi
 
 # Fixup autoconf recursion using --silent/--quiet option
 # autoconf should inherit this option whe recursing into subdirectories