[commit: terminfo] master: Search for terminfo in libtinfo; fixes GHC #7281. (116d3ee)

Ian Lynagh igloo at earth.li
Fri Jan 11 16:36:39 CET 2013


Repository : ssh://darcs.haskell.org//srv/darcs/packages/terminfo

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/116d3ee6840d52bab69c880d775ae290a20d64bc

>---------------------------------------------------------------

commit 116d3ee6840d52bab69c880d775ae290a20d64bc
Author: Judah Jacobson <judah.jacobson at gmail.com>
Date:   Mon Jan 7 13:34:47 2013 +0000

    Search for terminfo in libtinfo; fixes GHC #7281.
    
    Patch from Paul Johnson.

>---------------------------------------------------------------

 configure.ac |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2e5abd9..82f5015 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,10 +39,11 @@ else
     TERMINFO_INCLUDES="$CursesIncludes term.h"
 fi
 
-AC_CHECK_LIB(ncursesw, setupterm, HaveLibCurses=YES; LibCurses=ncursesw,
-  [AC_CHECK_LIB(ncurses, setupterm, HaveLibCurses=YES; LibCurses=ncurses,
-    [AC_CHECK_LIB(curses, setupterm, HaveLibCurses=YES; LibCurses=curses,
-      HaveLibCurses=NO; LibCurses=not-installed)])])
+AC_CHECK_LIB(tinfo, setupterm, HaveLibCurses=YES; LibCurses=tinfo,
+  [AC_CHECK_LIB(ncursesw, setupterm, HaveLibCurses=YES; LibCurses=ncursesw,
+    [AC_CHECK_LIB(ncurses, setupterm, HaveLibCurses=YES; LibCurses=ncurses,
+      [AC_CHECK_LIB(curses, setupterm, HaveLibCurses=YES; LibCurses=curses,
+        HaveLibCurses=NO; LibCurses=not-installed)])])])
 
 if test "x$HaveLibCurses" = "xNO" ; then
     AC_MSG_FAILURE([curses library not found, so this package cannot be built])





More information about the ghc-commits mailing list