From c24b58e2ee8691870736959deb252c225b205b4d Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Tue, 16 Apr 2013 11:33:53 +0100
Subject: Generate tmux.1 using mdoc2man.awk on Solaris, issue brought up and
 changes tested by Dagobert Michelsen.

---
 configure.ac | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index f00937f0..b4f76f5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -416,6 +416,10 @@ else
 	AC_MSG_RESULT(no)
 fi
 
+# Man page defaults to mdoc.
+MANFORMAT=mdoc
+AC_SUBST(MANFORMAT)
+
 # Figure out the platform for osdep-*.c and forkpty-*.c.
 AC_MSG_CHECKING(platform)
 case "$host_os" in
@@ -455,6 +459,7 @@ case "$host_os" in
 	*solaris*)
 		AC_MSG_RESULT(sunos)
 		PLATFORM=sunos
+		MANFORMAT=man
 		;;
 	*hpux*)
 		AC_MSG_RESULT(hpux)
-- 
cgit 


From 792e2856c9774cca262929f81b9adbbac0fa1d13 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Mon, 22 Apr 2013 09:44:15 +0100
Subject: Add compat for cfmakeraw, from Dagobert Michelsen.

---
 configure.ac | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index b4f76f5f..80cf1266 100644
--- a/configure.ac
+++ b/configure.ac
@@ -313,6 +313,13 @@ if test "x$found_strnvis" = xyes; then
 fi
 AM_CONDITIONAL(NO_VIS, [test "x$found_strnvis" = xno])
 
+# Look for cfmakeraw, compat/cfmakeraw.c used if missing.
+AC_CHECK_FUNC(cfmakeraw, found_cfmakeraw=yes, found_cfmakeraw=no)
+if test "x$found_cfmakeraw" = xyes; then
+	AC_DEFINE(HAVE_CFMAKERAW)
+fi
+AM_CONDITIONAL(NO_CFMAKERAW, [test "x$found_cfmakeraw" = xno])
+
 # Look for getopt. glibc's getopt does not enforce argument order and the ways
 # of making it do so are stupid, so just use our own instead.
 AC_CHECK_FUNC(getopt, found_getopt=yes, found_getopt=no)
@@ -345,6 +352,7 @@ AC_CHECK_FUNCS(
 		dirfd \
 		setproctitle \
 		sysconf \
+		cfmakeraw \
 	]
 )
 
-- 
cgit 


From 4f3c31a6b63f4489bfc672b510036fd8d9491595 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Wed, 24 Apr 2013 10:57:03 +0100
Subject: Use sysconfdir for the location of global tmux.conf (but default it
 to /etc), based on changes from Dagobert Michelsen.

---
 configure.ac | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 80cf1266..590b9db0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,9 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_INSTALL
 
+# Default tmux.conf goes in /etc not ${prefix}/etc.
+test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
+
 # Check for various headers. Alternatives included from compat.h.
 AC_CHECK_HEADERS(
 	[ \
-- 
cgit