mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 09:26:05 +00:00 
			
		
		
		
	Look for ncursesw as well as ncurses, based on a change from Bert van Hall.
This commit is contained in:
		
							
								
								
									
										29
									
								
								configure.ac
									
									
									
									
									
								
							
							
						
						
									
										29
									
								
								configure.ac
									
									
									
									
									
								
							@@ -164,15 +164,21 @@ fi
 | 
			
		||||
PKG_CHECK_MODULES(
 | 
			
		||||
	LIBNCURSES,
 | 
			
		||||
	ncurses,
 | 
			
		||||
	[
 | 
			
		||||
		AM_CFLAGS="$LIBNCURSES_CFLAGS $AM_CFLAGS"
 | 
			
		||||
		CFLAGS="$AM_CFLAGS $SAVED_CFLAGS"
 | 
			
		||||
		LIBS="$LIBNCURSES_LIBS $LIBS"
 | 
			
		||||
		found_ncurses=yes
 | 
			
		||||
	],
 | 
			
		||||
	found_ncurses=yes,
 | 
			
		||||
	found_ncurses=no
 | 
			
		||||
)
 | 
			
		||||
if test "x$found_ncurses" = xno; then
 | 
			
		||||
	PKG_CHECK_MODULES(
 | 
			
		||||
		LIBNCURSES,
 | 
			
		||||
		ncursesw,
 | 
			
		||||
		found_ncurses=yes,
 | 
			
		||||
		found_ncurses=no
 | 
			
		||||
	)
 | 
			
		||||
fi
 | 
			
		||||
if test "x$found_ncurses" = xyes; then
 | 
			
		||||
	CPPFLAGS="$LIBNCURSES_CFLAGS $CPPFLAGS"
 | 
			
		||||
	LIBS="$LIBNCURSES_LIBS $LIBS"
 | 
			
		||||
else
 | 
			
		||||
	# pkg-config didn't work, try ncurses.
 | 
			
		||||
	AC_CHECK_LIB(
 | 
			
		||||
		ncurses,
 | 
			
		||||
@@ -180,13 +186,14 @@ if test "x$found_ncurses" = xno; then
 | 
			
		||||
		found_ncurses=yes,
 | 
			
		||||
		found_ncurses=no
 | 
			
		||||
	)
 | 
			
		||||
	AC_CHECK_HEADER(
 | 
			
		||||
		ncurses.h,
 | 
			
		||||
		,
 | 
			
		||||
		found_ncurses=no)
 | 
			
		||||
	if test "x$found_ncurses" = xyes; then
 | 
			
		||||
		AC_CHECK_HEADER(
 | 
			
		||||
			ncurses.h,
 | 
			
		||||
			LIBS="$LIBS -lncurses",
 | 
			
		||||
			found_ncurses=no)
 | 
			
		||||
	fi
 | 
			
		||||
fi
 | 
			
		||||
if test "x$found_ncurses" = xyes; then
 | 
			
		||||
	LIBS="$LIBS -lncurses"
 | 
			
		||||
	AC_DEFINE(HAVE_NCURSES_H)
 | 
			
		||||
else
 | 
			
		||||
	# No ncurses, try curses.
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user