--- tmux-3.6b/configure.ac
+++ tmux-3.6b/configure.ac
@@ -279,30 +279,30 @@
 # Look for ncurses or curses. Try pkg-config first then directly for the
 # library.
 PKG_CHECK_MODULES(
-	LIBTINFO,
-	tinfo,
+	LIBTINFOW,
+	tinfow,
 	[
-		AM_CPPFLAGS="$LIBTINFO_CFLAGS $AM_CPPFLAGS"
-		CPPFLAGS="$LIBTINFO_CFLAGS $SAVED_CPPFLAGS"
-		LIBS="$LIBTINFO_LIBS $LIBS"
+		AM_CPPFLAGS="$LIBTINFOW_CFLAGS $AM_CPPFLAGS"
+		CPPFLAGS="$LIBTINFOW_CFLAGS $SAVED_CPPFLAGS"
+		LIBS="$LIBTINFOW_LIBS $LIBS"
 		found_ncurses=yes
 	],
 	found_ncurses=no
 )
-if test "x$found_ncurses" = xno; then
+AS_IF([test "x$found_ncurses" = xno], [
 	PKG_CHECK_MODULES(
-		LIBNCURSES,
-		ncurses,
+		LIBTINFO,
+		tinfo,
 		[
-			AM_CPPFLAGS="$LIBNCURSES_CFLAGS $AM_CPPFLAGS"
-			CPPFLAGS="$LIBNCURSES_CFLAGS $SAVED_CPPFLAGS"
-			LIBS="$LIBNCURSES_LIBS $LIBS"
+			AM_CPPFLAGS="$LIBTINFO_CFLAGS $AM_CPPFLAGS"
+			CPPFLAGS="$LIBTINFO_CFLAGS $SAVED_CPPFLAGS"
+			LIBS="$LIBTINFO_LIBS $LIBS"
 			found_ncurses=yes
 		],
 		found_ncurses=no
 	)
-fi
-if test "x$found_ncurses" = xno; then
+])
+AS_IF([test "x$found_ncurses" = xno], [
 	PKG_CHECK_MODULES(
 		LIBNCURSESW,
 		ncursesw,
@@ -314,26 +314,39 @@
 		],
 		found_ncurses=no
 	)
-fi
-if test "x$found_ncurses" = xno; then
+])
+AS_IF([test "x$found_ncurses" = xno], [
+	PKG_CHECK_MODULES(
+		LIBNCURSES,
+		ncurses,
+		[
+			AM_CPPFLAGS="$LIBNCURSES_CFLAGS $AM_CPPFLAGS"
+			CPPFLAGS="$LIBNCURSES_CFLAGS $SAVED_CPPFLAGS"
+			LIBS="$LIBNCURSES_LIBS $LIBS"
+			found_ncurses=yes
+		],
+		found_ncurses=no
+	)
+])
+AS_IF([test "x$found_ncurses" = xno], [
 	AC_SEARCH_LIBS(
 		setupterm,
-		[tinfo terminfo ncurses ncursesw],
+		[tinfow tinfo terminfo ncursesw ncurses],
 		found_ncurses=yes,
 		found_ncurses=no
 	)
-	if test "x$found_ncurses" = xyes; then
+	AS_IF([test "x$found_ncurses" = xyes], [
 		AC_CHECK_HEADER(
 			ncurses.h,
 			LIBS="$LIBS -lncurses",
 			found_ncurses=no
 		)
-	fi
-fi
-if test "x$found_ncurses" = xyes; then
+	])
+])
+AS_IF([test "x$found_ncurses" = xyes], [
 	CPPFLAGS="$CPPFLAGS -DHAVE_NCURSES_H"
 	AC_DEFINE(HAVE_NCURSES_H)
-else
+], [
 	AC_CHECK_LIB(
 		curses,
 		setupterm,
@@ -345,14 +358,14 @@
 		,
 		found_curses=no
 	)
-	if test "x$found_curses" = xyes; then
+	AS_IF([test "x$found_curses" = xyes], [
 		LIBS="$LIBS -lcurses"
 		CPPFLAGS="$CPPFLAGS -DHAVE_CURSES_H"
 		AC_DEFINE(HAVE_CURSES_H)
-	else
+	], [
 		AC_MSG_ERROR("curses not found")
-	fi
-fi
+	])
+])
 AC_CHECK_FUNCS([ \
 	tiparm \
 	tiparm_s \