diff options
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap | 112 |
1 files changed, 56 insertions, 56 deletions
@@ -233,7 +233,7 @@ func_bootstrap () # Save the current positional parameters to prevent them being # corrupted by calls to `set' in `func_init'. func_quote_for_eval ${1+"$@"} - _G_saved_positional_parameters="$func_quote_for_eval_result" + _G_saved_positional_parameters=$func_quote_for_eval_result # Initialisation. func_init @@ -378,7 +378,7 @@ func_gnulib_tool () # Try not to pick up any stale values from `gnulib-cache.m4'. rm -f "$gnulib_cache" - gnulib_mode="--import" + gnulib_mode=--import # `gnulib_modules' and others are maintained in `bootstrap.conf`: # Use `gnulib --import` to fetch gnulib modules. @@ -404,7 +404,7 @@ func_gnulib_tool () # `gnulib_modules' and others are cached in `gnulib-cache.m4': # Use `gnulib --update' to fetch gnulib modules. - gnulib_mode="--update" + gnulib_mode=--update fi # Add a sensible default libtool option to gnulib_tool_options. @@ -656,8 +656,8 @@ func_autoreconf () $require_macro_dir # aclocal and others put files in here # We ran these manually already, and autoreconf won't exec `:' - save_AUTOPOINT="$AUTOPOINT"; AUTOPOINT=true - save_LIBTOOLIZE="$LIBTOOLIZE"; LIBTOOLIZE=true + save_AUTOPOINT=$AUTOPOINT; AUTOPOINT=true + save_LIBTOOLIZE=$LIBTOOLIZE; LIBTOOLIZE=true _G_autoreconf_options= $opt_copy || func_append _G_autoreconf_options " --symlink" @@ -665,8 +665,8 @@ func_autoreconf () $opt_verbose && func_append _G_autoreconf_options " --verbose" func_show_eval "$AUTORECONF$_G_autoreconf_options --install" 'exit $?' - AUTOPOINT="$save_AUTOPOINT" - LIBTOOLIZE="$save_LIBTOOLIZE" + AUTOPOINT=$save_AUTOPOINT + LIBTOOLIZE=$save_LIBTOOLIZE } @@ -913,7 +913,7 @@ for tool in autoconf libtoolize autopoint; do printf '%s\n' "$buildreq" |func_grep_q '\''^[ ]*'$tool\'' || { func_extract_trace '$m' - _G_version="$func_extract_trace_result" + _G_version=$func_extract_trace_result test -n "$_G_version" && { func_append buildreq "\ '$tool' $_G_version http://www.gnu.org/s/'$b' @@ -973,7 +973,7 @@ func_require_automake_buildreq () test -n "$func_extract_trace_result" && { automake_version=`echo "$func_extract_trace_result" \ |$SED 's|[^0-9]*||; s| .*$||'` - test -n "$automake_version" || automake_version="-" + test -n "$automake_version" || automake_version=- func_append buildreq "\ automake $automake_version http://www.gnu.org/s/automake @@ -1044,7 +1044,7 @@ func_require_build_aux () test -n "$build_aux" || { func_extract_trace AC_CONFIG_AUX_DIR - build_aux="$func_extract_trace_result" + build_aux=$func_extract_trace_result func_check_configuration build_aux \ "AC_CONFIG_AUX_DIR([name of a directory for build scripts])" @@ -1132,7 +1132,7 @@ func_require_dotgitmodules () test true = "$GIT" || { # A gnulib entry in .gitmodules always takes precedence. - _G_path="`$GIT config --file .gitmodules submodule.gnulib.path 2>/dev/null`" + _G_path=`$GIT config --file .gitmodules submodule.gnulib.path 2>/dev/null` test -n "$_G_path" || { $require_vc_ignore_files @@ -1207,7 +1207,7 @@ func_require_gnulib_cache () $require_macro_dir test -n "$gnulib_cache" \ - || gnulib_cache="$macro_dir/gnulib-cache.m4" + || gnulib_cache=$macro_dir/gnulib-cache.m4 func_verbose "found \`$gnulib_cache'" @@ -1258,7 +1258,7 @@ func_require_gnulib_mk () $require_macro_dir func_extract_trace "gl_MAKEFILE_NAME" "$gnulib_cache" - gnulib_mk="$func_extract_trace_result" + gnulib_mk=$func_extract_trace_result test -n "$gnulib_mk" && func_verbose "gnulib_mk='$gnulib_mk'" } @@ -1285,7 +1285,7 @@ func_require_dotgitmodules_parameters () # `--gnulib-srcdir' if possible. test -n "$gnulib_path" \ || test ! -x "$opt_gnulib_srcdir/gnulib-tool" \ - || gnulib_path="$opt_gnulib_srcdir" + || gnulib_path=$opt_gnulib_srcdir } @@ -1383,7 +1383,7 @@ func_require_gnulib_tool () $require_gnulib_path test -n "$gnulib_tool" \ - || gnulib_tool="$gnulib_path/gnulib-tool" + || gnulib_tool=$gnulib_path/gnulib-tool test -x "$gnulib_tool" || { gnulib_tool=true @@ -1445,7 +1445,7 @@ func_require_macro_dir () # Sometimes this is stored in `configure.ac'. test -n "$macro_dir" || { func_extract_trace AC_CONFIG_MACRO_DIR - macro_dir="$func_extract_trace_result" + macro_dir=$func_extract_trace_result } # Otherwise we might find it in `Makefile.am'. @@ -1488,7 +1488,7 @@ func_require_makefile_am () $debug_cmd test -n "$makefile_am" \ - || makefile_am="Makefile.am" + || makefile_am=Makefile.am <"$makefile_am" @@ -1530,13 +1530,13 @@ func_require_package_bugreport () func_extract_trace AC_INIT - save_ifs="$IFS" + save_ifs=$IFS IFS=: set dummy $func_extract_trace_result - IFS="$save_ifs" + IFS=$save_ifs shift - test -n "$package_bugreport" || package_bugreport="$3" + test -n "$package_bugreport" || package_bugreport=$3 func_check_configuration package_bugreport \ "AC_INIT([$package_name], [$package_version], [bug-$package@gnu.org])" func_verbose "package_bugreport='$package_bugreport'" @@ -1556,13 +1556,13 @@ func_require_package_name () func_extract_trace AC_INIT - save_ifs="$IFS" + save_ifs=$IFS IFS=: set dummy $func_extract_trace_result - IFS="$save_ifs" + IFS=$save_ifs shift - test -n "$package_name" || package_name="$1" + test -n "$package_name" || package_name=$1 func_check_configuration package_name \ "AC_INIT([name of your package], [package version number])" func_verbose "package_name='$package_name'" @@ -1586,13 +1586,13 @@ func_require_package_version () func_extract_trace AC_INIT - save_ifs="$IFS" + save_ifs=$IFS IFS=: set dummy $func_extract_trace_result - IFS="$save_ifs" + IFS=$save_ifs shift - test -n "$package_version" || package_version="$2" + test -n "$package_version" || package_version=$2 test -n "$package_version" || { # The embedded echo is to squash whitespace before globbing. case " "`echo $gnulib_modules`" " in @@ -1629,7 +1629,7 @@ func_require_source_base () func_extract_trace "gl_SOURCE_BASE" "$gnulib_cache" - source_base="$func_extract_trace_result" + source_base=$func_extract_trace_result func_verbose "source_base='$source_base'" } @@ -1654,7 +1654,7 @@ func_require_vc_ignore_files () test -d .git && vc_ignore_files=.gitignore test -d CVS && vc_ignore_files="$vc_ignore_files .cvsignore" else - vc_ignore_files="$vc_ignore" + vc_ignore_files=$vc_ignore fi func_verbose "vc_ignore_files='$vc_ignore_files'" @@ -1830,7 +1830,7 @@ func_strrow () { $debug_cmd - func_strrow_linelen="$1"; shift + func_strrow_linelen=$1; shift _G_row= while test $# -gt 0; do @@ -1841,7 +1841,7 @@ func_strrow () done func_strrpad "$_G_row" $func_strrow_linelen " " - func_strrow_result="$func_strrpad_result" + func_strrow_result=$func_strrpad_result } @@ -1878,11 +1878,11 @@ func_strtable () $debug_cmd # Save the indent value, we'll need it for each row we render. - _G_indent="$1"; shift + _G_indent=$1; shift # Collect remaining numeric args into a list for reuse between # members of each row when we call func_strrow later. - _G_widths="$1"; shift + _G_widths=$1; shift while test 0 -lt `expr "$1" : '[1-9][0-9]*$'`; do func_append _G_widths " $1"; shift done @@ -1890,7 +1890,7 @@ func_strtable () # Extract the same number of positional parameters as there are # width elements - we'll do the header rows separately so that # we can insert a divider line. - _G_header="$_G_indent" + _G_header=$_G_indent for _G_width in $_G_widths; do func_append _G_header " $1 $_G_width"; shift done @@ -1914,7 +1914,7 @@ $_G_divider # The remaining rows are zipped between the width values we # unwound earlier just like the header row above. while test $# -gt 0; do - _G_row="$_G_indent" + _G_row=$_G_indent for _G_width in $_G_widths; do func_append _G_row " $1 $_G_width"; shift done @@ -1966,7 +1966,7 @@ func_warning () *) func_internal_error "invalid warning category \`$1'" ;; esac - _G_category="$1" + _G_category=$1 shift case " $opt_warning " in @@ -1984,16 +1984,16 @@ func_show_eval () { $debug_cmd - _G_cmd="$1" - _G_fail_exp="${2-:}" + _G_cmd=$1 + _G_fail_exp=${2-':'} - ${opt_silent-false} || { + ${opt_silent-'false'} || { func_quote_for_eval $_G_cmd eval func_truncate_cmd $func_quote_for_eval_result func_echo "running: $func_truncate_cmd_result" } - ${opt_dry_run-false} || { + ${opt_dry_run-'false'} || { eval "$_G_cmd" _G_status=$? test "$_G_status" -eq 0 || eval "(exit $_G_status); $_G_fail_exp" @@ -2016,7 +2016,7 @@ func_truncate_cmd () set dummy "$@"; shift while test $# -gt 0; do - _G_opt="$1"; shift + _G_opt=$1; shift test -n "$func_truncate_cmd_result" \ && func_append func_truncate_cmd_result ' ' @@ -2075,8 +2075,8 @@ func_sort_ver () # sort -V is not generally available { $debug_cmd - ver1="$1" - ver2="$2" + ver1=$1 + ver2=$2 # Split on '.' and compare each component. i=1 @@ -2157,9 +2157,9 @@ func_check_versions () func_check_versions_result=: while test $# -gt 0; do - _G_app="$1"; shift - _G_reqver="$1"; shift - _G_url="$1"; shift + _G_app=$1; shift + _G_reqver=$1; shift + _G_url=$1; shift # Honor $APP variables ($TAR, $AUTOCONF, etc.) _G_appvar=`echo $_G_app |tr '[a-z]' '[A-Z]'` @@ -2232,7 +2232,7 @@ func_update_po_files () # Mirror *.po files into this dir. # Usually contains *.s1 checksum files. - _G_ref_po_dir="$_G_po_dir/.reference" + _G_ref_po_dir=$_G_po_dir/.reference test -d $_G_ref_po_dir || mkdir $_G_ref_po_dir || return func_download_po_files $_G_ref_po_dir $_G_domain \ @@ -2246,8 +2246,8 @@ func_update_po_files () test "$_G_langs" = '*' && _G_langs=x for _G_po in $_G_langs; do case $_G_po in x) continue;; esac - _G_new_po="$_G_ref_po_dir/$_G_po.po" - _G_cksum_file="$_G_ref_po_dir/$_G_po.s1" + _G_new_po=$_G_ref_po_dir/$_G_po.po + _G_cksum_file=$_G_ref_po_dir/$_G_po.s1 if ! test -f "$_G_cksum_file" || ! test -f "$_G_po_dir/$_G_po.po" || ! $SHA1SUM -c --status "$_G_cksum_file" \ @@ -2327,17 +2327,17 @@ bootstrap_options_prep () warning_func=func_error # Option defaults: - opt_copy=${copy-false} + opt_copy=${copy-'false'} opt_dry_run=false opt_force=false - opt_gnulib_srcdir="$GNULIB_SRCDIR" + opt_gnulib_srcdir=$GNULIB_SRCDIR opt_skip_git=false opt_skip_po=false opt_warning= # Pass back the list of options we consumed. func_quote_for_eval ${1+"$@"} - bootstrap_options_prep_result="$func_quote_for_eval_result" + bootstrap_options_prep_result=$func_quote_for_eval_result } func_add_hook func_options_prep bootstrap_options_prep @@ -2352,7 +2352,7 @@ bootstrap_parse_options () # Perform our own loop to consume as many options as possible in # each iteration. while test $# -gt 0; do - _G_opt="$1" + _G_opt=$1 shift case $_G_opt in --dry-run|--dryrun|-n) @@ -2362,7 +2362,7 @@ bootstrap_parse_options () --gnulib-srcdir) test $# = 0 && func_missing_arg $_G_opt && break - opt_gnulib_srcdir="$1" + opt_gnulib_srcdir=$1 shift ;; @@ -2415,7 +2415,7 @@ bootstrap_parse_options () # save modified positional parameters for caller func_quote_for_eval ${1+"$@"} - bootstrap_parse_options_result="$func_quote_for_eval_result" + bootstrap_parse_options_result=$func_quote_for_eval_result } func_add_hook func_parse_options bootstrap_parse_options @@ -2429,7 +2429,7 @@ bootstrap_validate_options () $debug_cmd # Display all warnings if -W was not given. - test -n "$opt_warning" || opt_warning="$warning_categories" + test -n "$opt_warning" || opt_warning=$warning_categories # Validate options. test $# -gt 0 \ @@ -2437,7 +2437,7 @@ bootstrap_validate_options () # Pass back the list of unconsumed options left. func_quote_for_eval ${1+"$@"} - bootstrap_validate_options_result="$func_quote_for_eval_result" + bootstrap_validate_options_result=$func_quote_for_eval_result } |