From 1418a8997ebb53ded0714673e3b334cb24a851ff Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Thu, 4 Apr 2019 13:07:42 +0100 Subject: --existing-conf doesn't take any values in configure script Until now we were (wrongly) assuming that the configure script's `--existsing-conf' option takes a value, while this is not the case. --- configure | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 4f711e6..3177a04 100755 --- a/configure +++ b/configure @@ -128,20 +128,20 @@ while [[ $# -gt 0 ]] do case $1 in # Input parameters. - -b=*|--build-dir=*) build_dir="${1#*=}"; check_v $1 "$build_dir"; shift;; + -b*|--build-dir=*) build_dir="${1#*=}"; check_v $1 "$build_dir"; shift;; -b|--builddir) build_dir="$2"; check_v $1 "$build_dir"; shift;shift;; - -i=*|--inputdir=*) input_dir="${1#*=}"; check_v $1 "$input_dir"; shift;; + -i*|--inputdir=*) input_dir="${1#*=}"; check_v $1 "$input_dir"; shift;; -i|--inputdir) input_dir="$2"; check_v $1 "$input_dir"; shift;shift;; - -s=*|--software-dir=*) software_dir="${1#*=}"; check_v $1 "$software_dir"; shift;; + -s*|--software-dir=*) software_dir="${1#*=}"; check_v $1 "$software_dir"; shift;; -s|--software-dir) software_dir="$2"; check_v $1 "$software_dir"; shift;shift;; - -m=*|--minmapsize=*) minmapsize="${1#*=}"; check_v $1 "$minmapsize"; shift;; + -m*|--minmapsize=*) minmapsize="${1#*=}"; check_v $1 "$minmapsize"; shift;; -m|--minmapsize) minmapsize="$2"; check_v $1 "$minmapsize"; shift;shift;; # Operating mode options. - -j=*|--jobs=*) jobs="${1#*=}"; check_v $1 "$jobs"; shift;; + -j*|--jobs=*) jobs="${1#*=}"; check_v $1 "$jobs"; shift;; -j|--jobs) jobs="$2"; check_v $1 "$jobs"; shift;shift;; - -e=*|--existing-conf=*) existing_conf="${1#*=}"; check_v $1 "$existing_conf"; shift;; - -e|--existing-conf) existing_conf="$2"; check_v $1 "$existing_conf"; shift;shift;; + -e*|--existing-conf=*) on_off_option_error --existing-conf;; + -e|--existing-conf) existing_conf=1; check_v $1 "$existing_conf"; shift;shift;; -?|--help) print_help; exit 0;; # Unrecognized option: -- cgit v1.2.1