diff options
author | Einhard Leichtfuß <alguien@respiranto.de> | 2018-12-02 03:24:27 +0100 |
---|---|---|
committer | Einhard Leichtfuß <alguien@respiranto.de> | 2018-12-02 03:24:27 +0100 |
commit | 15dad2f4afaa7cecc2c35fa2867e8aadb31e477c (patch) | |
tree | ac4e743a619aac9a16504e0237c1977561746443 /configure | |
parent | fb20323f9ea34b9edcde372be2f66a20e3b54d6b (diff) |
Simplify configure.ac
- Remove unnecessary AC_SUBST.
- AC_SUBST([default_confdir])
`- Simplify, paricularly get rid of sed.
`- Use local variables.
`- Fix prefix=/ resulting in //'s.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 54 |
1 files changed, 29 insertions, 25 deletions
@@ -1717,70 +1717,74 @@ ac_config_files="$ac_config_files ctct" +# Do not use $(.) notation here, confdir shall allow for shell substitution. -test -z "$confdir" && confdir='${sysconfdir}/$(TARGET)' - +test -z "$confdir" && confdir='${sysconfdir}/${TARGET}' test -z "$bash_completion_dir" \ && bash_completion_dir='${datarootdir}/bash-completion/completions' -if test -z "$default_confdir"; then - # Ugly, but works: - # If $prefix is unset by the user, set it temporarily: - test "$prefix" = NONE && prefix=/usr/local \ - && reset_prefix=true || reset_prefix=false - _confdir="$(echo "$confdir" \ - | sed -E 's/\$(\(TARGET\)|\{TARGET\})/$PACKAGE_NAME/')" - default_confdir="$_confdir" - # Resolve $prefix recursively: - # Vim has problems with '\"' in "doubled" double quotes after '!=': - while test "$default_confdir" \ - != "$(eval "printf '%s\n' \"$default_confdir\"")"; do #" - default_confdir="$(eval "printf '%s\n' \"$default_confdir\"")" #" - done - $reset_prefix && prefix=NONE -fi +# Used in manpage. Needs to be fully expanded. +# Use a function to allow for local variables. +fun() { + if test -z "$default_confdir" + then -test -z "$default_datadir" && default_datadir='$HOME/.ctct' + # If $prefix is unset by the user, set it to autoconf's default value: + test "$prefix" = NONE && local prefix=/usr/local + # Prevent //. + test "$prefix" = / && local prefix='' + local TARGET="$PACKAGE_NAME" + default_confdir="$confdir" -test -z "$default_fallback_editor" && default_fallback_editor=vi + # Resolve $confdir recursively (notably including $prefix): + while + eval "default_confdir_expand=\"$default_confdir\"" + test "$default_confdir" != "$default_confdir_expand" + do + default_confdir="$default_confdir_expand" + done + fi +}; fun +test -z "$default_datadir" && default_datadir='$HOME/.ctct' + + +test -z "$default_fallback_editor" && default_fallback_editor=vi + + test -z "$default_user_config_dir" \ && default_user_config_dir='$HOME/.config/'"$PACKAGE_NAME" - test -z "$default_input_program" \ && default_input_program='cat' - test -z "$default_output_program" \ && default_output_program='cat' - test -z "$default_visual_program" \ && default_visual_program='cat' - test -z "$default_confirm_deletion" \ && default_confirm_deletion=true - test -z "$default_confirm_default_yes" \ && default_confirm_default_yes=false + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure |