From mboxrd@z Thu Jan  1 00:00:00 1970
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org
X-Spam-Level: 
X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY
	autolearn=ham autolearn_force=no version=3.4.4
Received: (qmail 6302 invoked from network); 30 Oct 2021 23:19:17 -0000
Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368)
  by inbox.vuxu.org with ESMTPUTF8; 30 Oct 2021 23:19:17 -0000
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org;
	s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:
	List-Subscribe:List-Help:List-Id:Sender:Message-ID:Date:Content-ID:
	Content-Type:MIME-Version:Subject:To:From:Reply-To:Cc:
	Content-Transfer-Encoding:Content-Description:Resent-Date:Resent-From:
	Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References;
	bh=8VptfHgcVUNdHTAI89Ufzvo4dGNelMIceUo3MUgU1os=; b=Y8OvuMCcJw1nkb0DbVIo90xd+O
	KmsfgdhFDpmsoFgO4ha14otzbyonE9r8u90Hbas59ZN3GL9UstUVNzd6EI7HJdOGlCCrb1ka3m9iE
	8Fu18Jihm5Y50+Inrvi65CTVEjv8KkVHhaYzLWFx9Hn2iM+ll8sWBevxHfcoCu1xu3eZGYRYs2pn+
	WJT5ygMd8cVUkeTERijIaUyHFdQfxvWqTRxzUCJziQfcMhDbOrzyRN8x9JdK2mDf6mpkk5LIGaqmR
	gNQiCcxaFzR+oSxg0aumNhA4EKPdulXGZx8569c4DGaXaAN/3O3ajMZXDbudHxsa3lck0ZtOJomOI
	4kwn3ing==;
Received: from authenticated user by zero.zsh.org with local 
	id 1mgxd7-000Kah-Js; Sat, 30 Oct 2021 23:19:17 +0000
Received: from authenticated user by zero.zsh.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256)
	id 1mgxct-000KIy-P0; Sat, 30 Oct 2021 23:19:03 +0000
Received: from [192.168.178.21] (helo=hydra)
	by mail.kiddle.eu with esmtp(Exim 4.94.2)
	(envelope-from <opk@zsh.org>)
	id 1mgxcs-000JFM-Om
	for zsh-workers@zsh.org; Sun, 31 Oct 2021 01:19:02 +0200
From: Oliver Kiddle <opk@zsh.org>
To: Zsh workers <zsh-workers@zsh.org>
Subject: PATCH: fix log/watch on FreeBSD
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <73986.1635635942.1@hydra>
Date: Sun, 31 Oct 2021 01:19:02 +0200
Message-ID: <73987-1635635942.764951@M0jS.LK97.eAR2>
X-Seq: 49537
Archived-At: <https://zsh.org/workers/49537>
X-Loop: zsh-workers@zsh.org
Errors-To: zsh-workers-owner@zsh.org
Precedence: list
Precedence: bulk
Sender: zsh-workers-request@zsh.org
X-no-archive: yes
List-Id: <zsh-workers.zsh.org>
List-Help: <mailto:sympa@zsh.org?subject=help>
List-Subscribe: <mailto:sympa@zsh.org?subject=subscribe%20zsh-workers>
List-Unsubscribe: <mailto:sympa@zsh.org?subject=unsubscribe%20zsh-workers>
List-Post: <mailto:zsh-workers@zsh.org>
List-Owner: <mailto:zsh-workers-request@zsh.org>
List-Archive: <http://www.zsh.org/sympa/arc/zsh-workers>

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