zsh-workers
 help / color / mirror / code / Atom feed
From: Oliver Kiddle <opk@zsh.org>
To: Zsh workers <zsh-workers@zsh.org>
Subject: PATCH: fix log/watch on FreeBSD
Date: Sun, 31 Oct 2021 01:19:02 +0200	[thread overview]
Message-ID: <73987-1635635942.764951@M0jS.LK97.eAR2> (raw)

It appears that on FreeBSD, the utmpx log file for current logins is
/var/run/utx.active but our configure script looks for a file names
utmpx. Creating a symlink before compiling appeared to work.

I don't claim to be an autoconf expert but the following patch does at
least allow configure to find it.

Oliver

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 -------------------


                 reply	other threads:[~2021-10-30 23:19 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=73987-1635635942.764951@M0jS.LK97.eAR2 \
    --to=opk@zsh.org \
    --cc=zsh-workers@zsh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).