Merge branch '3836_with_homedir_yes'

This commit is contained in:
Yury V. Zaytsev 2017-07-15 22:53:28 +02:00
commit eab2556ed8
1 changed files with 12 additions and 0 deletions

View File

@ -367,8 +367,20 @@ AC_ARG_WITH([homedir],
AS_HELP_STRING([--with-homedir],
[Choose any place of user settings relative to home dir, or XDG for respect XDG standards @<:@XDG@:>@]),
[
dnl Unfortunately, there is no way to tell AC_ARG_WITH that the
dnl argument value is required, so we can't differentiate
dnl between `--with-homedir` and `--with-homedir=yes`, because
dnl `with_homedir` is set to `yes` in both cases.
dnl
dnl We opt to set `with_homedir` to `.mc` if the value is `yes`
dnl in order to avoid the surprise for users using
dnl `--with-homedir` w/o any value and then getting mc to store
dnl settings in the `yes` directory.
if test "x$withval" = "xXDG"; then
with_homedir=XDG
elif test "x$withval" = "xyes"; then
with_homedir=.mc
else
with_homedir=$withval
fi