diff options
| author | Oliver Kiddle <opk@zsh.org> | 2021-11-02 21:28:40 +0100 |
|---|---|---|
| committer | Oliver Kiddle <opk@zsh.org> | 2021-11-02 21:28:40 +0100 |
| commit | 2947130f91fe7edf7c79d73ccc0d096800709b3d (patch) | |
| tree | b892a932d7652460abd9fbe3898b8801f2dadf61 | |
| parent | b067ab08d65c7ec9a48f5527076bf0f9b17e622c (diff) | |
| download | zsh-2947130f91fe7edf7c79d73ccc0d096800709b3d.tar.gz zsh-2947130f91fe7edf7c79d73ccc0d096800709b3d.tar.xz zsh-2947130f91fe7edf7c79d73ccc0d096800709b3d.zip | |
49537: fix finding utmpx file on FreeBSD
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | aczsh.m4 | 4 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 3278e7b20..5179555ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2021-11-02 Oliver Kiddle <opk@zsh.org> + + * 49537: aczsh.m4, configure.ac: fix finding utmpx file on FreeBSD + 2021-11-01 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> * 49535: Src/Zle/compcore.c: fix completion of parameter names diff --git a/aczsh.m4 b/aczsh.m4 index c04bf9190..1209ac614 100644 --- a/aczsh.m4 +++ b/aczsh.m4 @@ -544,9 +544,9 @@ dnl AC_DEFUN(zsh_PATH_UTMP, [AC_CACHE_CHECK([for $1 file], [zsh_cv_path_$1], [for dir in /etc /usr/etc /var/adm /usr/adm /var/run /var/log ./conftest; do - zsh_cv_path_$1=${dir}/$1 + m4_foreach([file],[$@],[zsh_cv_path_$1=${dir}/file test -f $zsh_cv_path_$1 && break - zsh_cv_path_$1=no + ])zsh_cv_path_$1=no done ]) AH_TEMPLATE([PATH_]translit($1, [a-z], [A-Z])[_FILE], diff --git a/configure.ac b/configure.ac index dd0d3ffac..297a7482f 100644 --- a/configure.ac +++ b/configure.ac @@ -2108,7 +2108,7 @@ dnl CHECK FOR LOCATION OF {U,W}TMP{,X} FILES dnl ---------------------------------------- zsh_PATH_UTMP(utmp) zsh_PATH_UTMP(wtmp) -zsh_PATH_UTMP(utmpx) +zsh_PATH_UTMP(utmpx,utx.active) zsh_PATH_UTMP(wtmpx) dnl ------------------- |