From b46abeb34d775159b9c50618339d8da9fd8c0212 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 3 Feb 2022 07:50:35 +0000 Subject: 3.3-rc. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 26bd1a98..c71a54b0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # configure.ac -AC_INIT([tmux], next-3.4) +AC_INIT([tmux], 3.3-rc) AC_PREREQ([2.60]) AC_CONFIG_AUX_DIR(etc) -- cgit From c7c7e875a0f71451564746a20db8d84c418ad7d5 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 16 Feb 2022 12:26:23 +0000 Subject: No not allow static linking on macOS. --- configure.ac | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 26bd1a98..edda0d6b 100644 --- a/configure.ac +++ b/configure.ac @@ -69,6 +69,11 @@ AC_ARG_ENABLE( AS_HELP_STRING(--enable-static, create a static build) ) if test "x$enable_static" = xyes; then + case "$host_os" in + *darwin*) + AC_MSG_ERROR([static linking is not supported on macOS]) + ;; + esac test "x$PKG_CONFIG" != x && PKG_CONFIG="$PKG_CONFIG --static" AM_LDFLAGS="-static $AM_LDFLAGS" LDFLAGS="$AM_LDFLAGS $SAVED_LDFLAGS" -- cgit From afd9b68d102fc4a7614885267e99299247a031d8 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 8 Mar 2022 11:02:17 +0000 Subject: Add getpeerid compat. --- configure.ac | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index edda0d6b..6ca86ea4 100644 --- a/configure.ac +++ b/configure.ac @@ -160,6 +160,7 @@ AC_REPLACE_FUNCS([ \ freezero \ getdtablecount \ getdtablesize \ + getpeereid \ getline \ getprogname \ memmem \ @@ -169,7 +170,7 @@ AC_REPLACE_FUNCS([ \ strlcat \ strlcpy \ strndup \ - strsep \ + strsep ]) AC_FUNC_STRNLEN @@ -684,6 +685,14 @@ AC_CHECK_DECL( [#include ] ) +# Look for setsockopt(SO_PEERCRED). +AC_CHECK_DECL( + SO_PEERCRED, + AC_DEFINE(HAVE_SO_PEERCRED), + , + [#include ] +) + # Look for fcntl(F_CLOSEM). AC_CHECK_DECL( F_CLOSEM, -- cgit From 04952f15df1bc81d1878833533d344a6b1d1326c Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 8 Mar 2022 11:35:06 +0000 Subject: Use getpeerucred if available (not tested). --- configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 6ca86ea4..e473f141 100644 --- a/configure.ac +++ b/configure.ac @@ -128,6 +128,7 @@ AC_CHECK_HEADERS([ \ sys/dir.h \ sys/ndir.h \ sys/tree.h \ + ucred.h \ util.h \ ]) @@ -146,7 +147,8 @@ AC_CHECK_FUNCS([ \ flock \ prctl \ proc_pidinfo \ - sysconf + getpeerucred \ + sysconf \ ]) # Check for functions with a compatibility implementation. @@ -170,7 +172,7 @@ AC_REPLACE_FUNCS([ \ strlcat \ strlcpy \ strndup \ - strsep + strsep \ ]) AC_FUNC_STRNLEN -- cgit From fc7f1e7acb3539a43df46136e971f770515e0b0d Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Mon, 28 Mar 2022 08:42:13 +0100 Subject: Add support for systemd socket activation (where systemd creates the Unix domain socket for tmux rather than tmux creating it). Build with --enable-systemd. From Julien Moutinho in GitHub issue 3119. --- configure.ac | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index e473f141..276f71c8 100644 --- a/configure.ac +++ b/configure.ac @@ -390,6 +390,31 @@ if test "x$enable_utf8proc" = xyes; then fi AM_CONDITIONAL(HAVE_UTF8PROC, [test "x$enable_utf8proc" = xyes]) +# Check for systemd support. +AC_ARG_ENABLE( + systemd, + AS_HELP_STRING(--enable-systemd, enable systemd integration) +) +if test x"$enable_systemd" = xyes; then + PKG_CHECK_MODULES( + SYSTEMD, + libsystemd, + [ + AM_CPPFLAGS="$SYSTEMD_CFLAGS $AM_CPPFLAGS" + CPPFLAGS="$AM_CPPFLAGS $SAVED_CPPFLAGS" + LIBS="$SYSTEMD_LIBS $LIBS" + found_systemd=yes + ], + found_systemd=no + ) + if test "x$found_systemd" = xyes; then + AC_DEFINE(HAVE_SYSTEMD) + else + AC_MSG_ERROR("systemd not found") + fi +fi +AM_CONDITIONAL(HAVE_SYSTEMD, [test "x$found_systemd" = xyes]) + # Check for b64_ntop. If we have b64_ntop, we assume b64_pton as well. AC_MSG_CHECKING(for b64_ntop) AC_LINK_IFELSE([AC_LANG_PROGRAM( -- cgit From 6e9a9d265e2c5199566e3890e6763a74b558bf80 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 6 Apr 2022 14:26:19 +0100 Subject: Fix version. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 20199515..17a1935d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # configure.ac -AC_INIT([tmux], 3.3-rc) +AC_INIT([tmux], next-3.4) AC_PREREQ([2.60]) AC_CONFIG_AUX_DIR(etc) -- cgit From 3a6d82b7c8d4254fa87959d8cf19b313f5e05480 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 6 Apr 2022 16:39:46 +0100 Subject: Some style nits. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 17a1935d..276f71c8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # configure.ac -AC_INIT([tmux], next-3.4) +AC_INIT([tmux], next-3.4) AC_PREREQ([2.60]) AC_CONFIG_AUX_DIR(etc) -- cgit From ced83792b1b2c982f967ae7f6938fa0bbda12353 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 1 Jun 2022 08:28:32 +0100 Subject: Set version to 3.3. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 276f71c8..542ae67f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # configure.ac -AC_INIT([tmux], next-3.4) +AC_INIT([tmux], 3.3) AC_PREREQ([2.60]) AC_CONFIG_AUX_DIR(etc) -- cgit From b566cd57bfa0d28fcc2e44e5a7b2e88433a5e016 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 1 Jun 2022 08:50:54 +0100 Subject: Now back to 3.4. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 542ae67f..276f71c8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # configure.ac -AC_INIT([tmux], 3.3) +AC_INIT([tmux], next-3.4) AC_PREREQ([2.60]) AC_CONFIG_AUX_DIR(etc) -- cgit