+2013-08-09 Pádraig Brady <P@draigBrady.com>
+
+ bootstrap: support checksum utils having -c but not --status
+ * build-aux/bootstrap: Only look for sha1sum if updating po files.
+ Add sha1 to the list of supported checksum utils since it's now
+ supported through adjustments below.
+ (update_po_files): Remove the use of --status
+ in a way that will suppress all error messages, but since this is
+ only used to minimize updates, it shouldn't cause an issue.
+ Exit early if there is a problem updating the po file checksums.
+ (find_tool): Remove the check for --version support as this
+ is optional as per commit 86186b17. Don't even check for the
+ presence of the command as if that is needed, it's supported
+ through configuring prerequisites in bootstrap.conf.
+ Prompt that when a tool isn't found, one can define an environment
+ variable to add to the hardcoded search list.
+
2013-08-05 Jim Meyering <meyering@fb.com>
regex: port to non-glibc/lock-using systems
#! /bin/sh
# Print a version string.
-scriptversion=2013-07-03.20; # UTC
+scriptversion=2013-08-09.15; # UTC
# Bootstrap this package from checked-out sources.
find_tool_names=$@
eval "find_tool_res=\$$find_tool_envvar"
if test x"$find_tool_res" = x; then
- for i
- do
+ for i; do
if ($i --version </dev/null) >/dev/null 2>&1; then
- find_tool_res=$i
- break
+ find_tool_res=$i
+ break
fi
done
- else
- find_tool_error_prefix="\$$find_tool_envvar: "
fi
- test x"$find_tool_res" != x \
- || die "one of these is required: $find_tool_names"
- ($find_tool_res --version </dev/null) >/dev/null 2>&1 \
- || die "${find_tool_error_prefix}cannot run $find_tool_res --version"
+ if test x"$find_tool_res" = x; then
+ warn_ "one of these is required: $find_tool_names;"
+ die "alternatively set $find_tool_envvar to a compatible tool"
+ fi
eval "$find_tool_envvar=\$find_tool_res"
eval "export $find_tool_envvar"
}
-# Find sha1sum, named gsha1sum on MacPorts, and shasum on Mac OS X 10.6.
-find_tool SHA1SUM sha1sum gsha1sum shasum
-
# Override the default configuration, if necessary.
# Make sure that bootstrap.conf is sourced from the current directory
# if we were invoked as "sh bootstrap".
if [ "$req_ver" = "-" ]; then
# Merely require app to exist; not all prereq apps are well-behaved
# so we have to rely on $? rather than get_version.
- $app --version >/dev/null 2>&1
+ $app --version >/dev/null 2>&1 </dev/null
if [ 126 -le $? ]; then
warn_ "Error: '$app' not found"
ret=1
# can't depend on column -t
}
+# Find sha1sum, named gsha1sum on MacPorts, shasum on Mac OS X 10.6.
+# Also find the compatible sha1 utility on the BSDs
+if test x"$SKIP_PO" = x; then
+ find_tool SHA1SUM sha1sum gsha1sum shasum sha1
+fi
+
use_libtool=0
# We'd like to use grep -E, to see if any of LT_INIT,
# AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
cksum_file="$ref_po_dir/$po.s1"
if ! test -f "$cksum_file" ||
! test -f "$po_dir/$po.po" ||
- ! $SHA1SUM -c --status "$cksum_file" \
- < "$new_po" > /dev/null; then
+ ! $SHA1SUM -c "$cksum_file" < "$new_po" > /dev/null 2>&1; then
echo "$me: updated $po_dir/$po.po..."
cp "$new_po" "$po_dir/$po.po" \
- && $SHA1SUM < "$new_po" > "$cksum_file"
+ && $SHA1SUM < "$new_po" > "$cksum_file" || return
fi
done
}