SOURCES: util-linux-ng-tinfo.patch (NEW) - new

[arekm]

Author: arekm                        Date: Tue Jun 19 18:47:37 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
-  new

---- Files affected:
SOURCES:
   util-linux-ng-tinfo.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/util-linux-ng-tinfo.patch
diff -u /dev/null SOURCES/util-linux-ng-tinfo.patch:1.1
--- /dev/null	Tue Jun 19 20:47:37 2007
+++ SOURCES/util-linux-ng-tinfo.patch	Tue Jun 19 20:47:31 2007
@@ -0,0 +1,70 @@
+diff --git a/configure.ac b/configure.ac
+index 5655bf0..c05e502 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -121,6 +121,10 @@ AC_ARG_WITH([slang],
+   [], with_slang=no
+ )
+ 
++have_tinfo=no
++AC_CHECK_LIB(tinfo, tgetent, [have_tinfo=yes])
++AM_CONDITIONAL(HAVE_TINFO, test x$have_tinfo = xyes)
++
+ use_slang=no
+ if test x$with_slang = xyes; then
+   AC_CHECK_HEADERS([slcurses.h slang/slcurses.h], [use_slang=yes])
+diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am
+index 3083670..a9ea5ef 100644
+--- a/misc-utils/Makefile.am
++++ b/misc-utils/Makefile.am
+@@ -17,6 +17,9 @@ CLEANFILES = chkdupexe scriptreplay
+ man_MANS = cal.1 chkdupexe.1 ddate.1 logger.1 look.1 mcookie.1 \
+ 	namei.1 script.1 whereis.1 scriptreplay.1
+ 
++if HAVE_TINFO
++cal_LDADD = -ltinfo -lncurses
++else
+ if HAVE_NCURSES
+ cal_LDADD = -lncurses
+ else
+@@ -24,6 +27,7 @@ if HAVE_TERMCAP
+ cal_LDADD = -ltermcap
+ endif
+ endif
++endif
+ 
+ if HAVE_UTIL
+ script_LDADD = -lutil
+@@ -32,8 +36,12 @@ endif
+ if HAVE_NCURSES
+ usrbinexec_PROGRAMS += setterm
+ man_MANS += setterm.1
++if HAVE_TINFO
++setterm_LDADD = -ltinfo
++else
+ setterm_LDADD = -lncurses
+ endif
++endif
+ 
+ if BUILD_KILL
+ bin_PROGRAMS += kill
+diff --git a/text-utils/Makefile.am b/text-utils/Makefile.am
+index 9ec071d..7c9e906 100644
+--- a/text-utils/Makefile.am
++++ b/text-utils/Makefile.am
+@@ -12,9 +12,15 @@ man_MANS = col.1 colcrt.1 colrm.1 column.1 hexdump.1 rev.1 line.1 tailf.1
+ if HAVE_NCURSES
+ bin_PROGRAMS = more
+ usrbinexec_PROGRAMS += ul pg
++if HAVE_TINFO
++more_LDADD = -ltinfo
++pg_LDADD = -ltinfo -lncurses
++ul_LDADD = -ltinfo
++else
+ more_LDADD = -lncurses
+ pg_LDADD = -lncurses
+ ul_LDADD = -lncurses
++endif
+ man_MANS += ul.1 more.1 pg.1
+ else
+ if HAVE_TERMCAP
================================================================