summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 6 insertions, 4 deletions
diff --git a/configure b/configure
index 8bcaf0e..e02b652 100755
--- a/configure
+++ b/configure
@@ -257,6 +257,9 @@ while [ $# -ne 0 ]; do
--with-*) set_tool "$1" "$2" && shift || shift 2;;
--force) FORCE=1; shift;;
--help|-h) do_help; exit 0;;
+ # Skip, auto-stuff compatibility
+ --build=*|--host=*|--infodir=*|--datadir=*|--sysconfdir=*|--localstatedir=*) shift;;
+ --build|--host|--infodir|--datadir|--sysconfdir|--localstatedir) shift 2;;
*) printf "Unrecognised option: '${1}'\n"; do_help; exit 1;;
esac
done
@@ -380,11 +383,10 @@ has_or_abort lib="${ncurses_libs}" \
# If this version is n hg clone, try to get the revision number
# If we can't get the revision number, use date
+printf "Computing version string... "
case "${VERSION}" in
*+hg|hg)
- has_or_abort prog=hg
- printf "Computing version string... "
- REVISION="$( hg id -n 2>/dev/null )"
+ REVISION="$( hg id -n 2>/dev/null || true )"
case "${REVISION}" in
"")
VERSION="${VERSION}_unknown@$( date +%Y%m%d.%H%M%S )";;
@@ -397,7 +399,7 @@ case "${VERSION}" in
VERSION="$( printf "${VERSION}\n" |"${sed}" -r -e 's|/+|_|g;' )"
;;
esac
-echo "${VERSION}"
+printf "${VERSION}\n"
#---------------------------------------------------------------------
# Compute and check install paths