[patch] patch that uses $PKG_CONFIG --libs-only-l ncursesw

irssi-0.8.15-tinfo.patch (text/plain), 2.25 KB, created by Mark Wright on 2014-03-08 12:32:00 UTC

--- irssi-0.8.15-orig/configure.in	2010-04-04 02:19:58.000000000 +1000
+++ irssi-0.8.15/configure.in	2014-03-08 23:25:14.035107761 +1100
@@ -356,6 +356,9 @@
 		LIBS=$old_libs
 	else
 		AC_CHECK_LIB(tinfo, setupterm, [
+		  TEXTUI_LIBS="-ltinfow"
+		  want_terminfo=yes
+		], AC_CHECK_LIB(tinfo, setupterm, [
 		  TEXTUI_LIBS="-ltinfo"
 		  want_terminfo=yes
 		], AC_CHECK_LIB(termlib, tgetent, [
@@ -367,7 +370,7 @@
 		], [
 		  AC_ERROR(Terminfo/termcap not found - install ncurses-devel package)
 		  want_textui=no
-		])))
+		]))))
 	fi
 	AC_SUBST(TEXTUI_LIBS)
 
--- irssi-0.8.15-orig/curses.m4	2010-04-04 02:19:58.000000000 +1000
+++ irssi-0.8.15/curses.m4	2014-03-08 22:57:09.932553918 +1100
@@ -95,6 +95,7 @@
 
 	AC_SUBST(CURSES_LIBS)
 	AC_SUBST(CURSES_INCLUDEDIR)
+	AC_SUBST(NCURSES_LIBS)
 
 	AC_ARG_WITH(sco,
 	  [  --with-sco              Use this to turn on SCO-specific code],[
@@ -131,7 +132,8 @@
 	  if test x$withval = xno ; then
 		search_ncurses=false
 	  elif test x$withval != xyes ; then
-		AC_NCURSES($withval/include, ncurses.h, -L$withval/lib -lncurses, -I$withval/include, "ncurses on $withval/include")
+		NCURSES_LIBS="`$PKG_CONFIG --libs-only-l ncursesw`"
+		AC_NCURSES($withval/include, ncurses.h, -L$withval/lib "$NCURSES_LIBS", -I$withval/include, "ncurses on $withval/include")
 	  fi
 	)
 
@@ -210,10 +212,10 @@
 	    AC_MSG_RESULT(Found ncurses on $1/$2)
 
 	    CURSES_LIBS="$3"
-	    AC_CHECK_LIB(ncurses, initscr, [
+	    AC_CHECK_LIB(ncursesw, initscr, [
 	        true;
 	    ], [
-                CHECKLIBS=`echo "$3"|sed 's/-lncurses/-lcurses/g'`
+                CHECKLIBS=`echo "$3"|sed 's/-lncursesw/-lcurses/g'`
 		AC_CHECK_LIB(curses, initscr, [
 			CURSES_LIBS="$CHECKLIBS"
 		],, $CHECKLIBS)
@@ -230,8 +232,14 @@
 ])
 
 AC_DEFUN([AC_SEARCH_NCURSES], [
+    AC_SUBST(NCURSES_LIBS)
+    AC_SUBST(NCURSES_INCLUDES)
+    NCURSES_LIBS=`$PKG_CONFIG --libs-only-l ncursesw`
+    NCURSES_INCLUDES=`$PKG_CONFIG --cflags-only-I ncursesw`
     AC_CHECKING("location of ncurses.h file")
 
+    AC_NCURSES($NCURSES_INCLUDES, ncurses.h, $NCURSES_LIBS,,
+	       [ncurses in $NCURSES_INCLUDES])
     AC_NCURSES(/usr/include, ncurses.h, -lncurses,,
 	       [ncurses in /usr/include])
     AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses, -I/usr/include/ncurses,