Attachment #372078 for bug #453396

Lines 355-361 Link Here

(-)irssi-0.8.15-orig/configure.in (-2 / +5 lines)
355	])	355	])
356	LIBS=$old_libs	356	LIBS=$old_libs
357	else	357	else
358	AC_CHECK_LIB(tinfo, setupterm, [	358	AC_CHECK_LIB(tinfow, setupterm, [
		359	TEXTUI_LIBS="-ltinfow"
		360	want_terminfo=yes
		361	], AC_CHECK_LIB(tinfo, setupterm, [
359	TEXTUI_LIBS="-ltinfo"	362	TEXTUI_LIBS="-ltinfo"
360	want_terminfo=yes	363	want_terminfo=yes
361	], AC_CHECK_LIB(termlib, tgetent, [	364	], AC_CHECK_LIB(termlib, tgetent, [
Lines 367-373 Link Here
367	], [	370	], [
368	AC_ERROR(Terminfo/termcap not found - install ncurses-devel package)	371	AC_ERROR(Terminfo/termcap not found - install ncurses-devel package)
369	want_textui=no	372	want_textui=no
370	])))	373	]))))
371	fi	374	fi
372	AC_SUBST(TEXTUI_LIBS)	375	AC_SUBST(TEXTUI_LIBS)
373		376





	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],[

	  if test x$withval = xno ; then
		search_ncurses=false
	  elif test x$withval != xyes ; then
		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
	)


	    AC_MSG_RESULT(Found ncurses on $1/$2)

	    CURSES_LIBS="$3"
	    AC_CHECK_LIB(ncursesw, initscr, [
	        true;
	    ], [
                CHECKLIBS=`echo "$3"|sed 's/-lncursesw/-lcurses/g'`
		AC_CHECK_LIB(curses, initscr, [
			CURSES_LIBS="$CHECKLIBS"
		],, $CHECKLIBS)

])

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,

Return to bug 453396

Lines 95-100 Link Here

(-)irssi-0.8.15-orig/curses.m4 (-3 / +11 lines)
95		95
96	AC_SUBST(CURSES_LIBS)	96	AC_SUBST(CURSES_LIBS)
97	AC_SUBST(CURSES_INCLUDEDIR)	97	AC_SUBST(CURSES_INCLUDEDIR)
		98	AC_SUBST(NCURSES_LIBS)
98		99
99	AC_ARG_WITH(sco,	100	AC_ARG_WITH(sco,
100	[ --with-sco Use this to turn on SCO-specific code],[	101	[ --with-sco Use this to turn on SCO-specific code],[
Lines 131-137 Link Here
131	if test x$withval = xno ; then	132	if test x$withval = xno ; then
132	search_ncurses=false	133	search_ncurses=false
133	elif test x$withval != xyes ; then	134	elif test x$withval != xyes ; then
134	AC_NCURSES($withval/include, ncurses.h, -L$withval/lib -lncurses, -I$withval/include, "ncurses on $withval/include")	135	NCURSES_LIBS="`$PKG_CONFIG --libs-only-l ncursesw`"
		136	AC_NCURSES($withval/include, ncurses.h, -L$withval/lib "$NCURSES_LIBS", -I$withval/include, "ncurses on $withval/include")
135	fi	137	fi
136	)	138	)
137		139
Lines 210-219 Link Here
210	AC_MSG_RESULT(Found ncurses on $1/$2)	212	AC_MSG_RESULT(Found ncurses on $1/$2)
211		213
212	CURSES_LIBS="$3"	214	CURSES_LIBS="$3"
213	AC_CHECK_LIB(ncurses, initscr, [	215	AC_CHECK_LIB(ncursesw, initscr, [
214	true;	216	true;
215	], [	217	], [
216	CHECKLIBS=`echo "$3"\|sed 's/-lncurses/-lcurses/g'`	218	CHECKLIBS=`echo "$3"\|sed 's/-lncursesw/-lcurses/g'`
217	AC_CHECK_LIB(curses, initscr, [	219	AC_CHECK_LIB(curses, initscr, [
218	CURSES_LIBS="$CHECKLIBS"	220	CURSES_LIBS="$CHECKLIBS"
219	],, $CHECKLIBS)	221	],, $CHECKLIBS)
Lines 230-237 Link Here
230	])	232	])
231		233
232	AC_DEFUN([AC_SEARCH_NCURSES], [	234	AC_DEFUN([AC_SEARCH_NCURSES], [
		235	AC_SUBST(NCURSES_LIBS)
		236	AC_SUBST(NCURSES_INCLUDES)
		237	NCURSES_LIBS=`$PKG_CONFIG --libs-only-l ncursesw`
		238	NCURSES_INCLUDES=`$PKG_CONFIG --cflags-only-I ncursesw`
233	AC_CHECKING("location of ncurses.h file")	239	AC_CHECKING("location of ncurses.h file")
234		240
		241	AC_NCURSES($NCURSES_INCLUDES, ncurses.h, $NCURSES_LIBS,,
		242	[ncurses in $NCURSES_INCLUDES])
235	AC_NCURSES(/usr/include, ncurses.h, -lncurses,,	243	AC_NCURSES(/usr/include, ncurses.h, -lncurses,,
236	[ncurses in /usr/include])	244	[ncurses in /usr/include])
237	AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses, -I/usr/include/ncurses,	245	AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses, -I/usr/include/ncurses,