terminfo 0.4.1.0 → 0.4.1.1
raw patch · 3 files changed
+50/−8 lines, 3 filesdep ~base
Dependency ranges changed: base
Files
- configure +42/−1
- configure.ac +6/−5
- terminfo.cabal +2/−2
configure view
@@ -2596,7 +2596,46 @@ -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setupterm in -ltinfo" >&5+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setupterm in -ltinfow" >&5+$as_echo_n "checking for setupterm in -ltinfow... " >&6; }+if ${ac_cv_lib_tinfow_setupterm+:} false; then :+ $as_echo_n "(cached) " >&6+else+ ac_check_lib_save_LIBS=$LIBS+LIBS="-ltinfow $LIBS"+cat confdefs.h - <<_ACEOF >conftest.$ac_ext+/* end confdefs.h. */++/* Override any GCC internal prototype to avoid an error.+ Use char because int might match the return type of a GCC+ builtin and then its argument prototype would still apply. */+#ifdef __cplusplus+extern "C"+#endif+char setupterm ();+int+main ()+{+return setupterm ();+ ;+ return 0;+}+_ACEOF+if ac_fn_c_try_link "$LINENO"; then :+ ac_cv_lib_tinfow_setupterm=yes+else+ ac_cv_lib_tinfow_setupterm=no+fi+rm -f core conftest.err conftest.$ac_objext \+ conftest$ac_exeext conftest.$ac_ext+LIBS=$ac_check_lib_save_LIBS+fi+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfow_setupterm" >&5+$as_echo "$ac_cv_lib_tinfow_setupterm" >&6; }+if test "x$ac_cv_lib_tinfow_setupterm" = xyes; then :+ HaveLibCurses=YES; LibCurses=tinfow+else+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setupterm in -ltinfo" >&5 $as_echo_n "checking for setupterm in -ltinfo... " >&6; } if ${ac_cv_lib_tinfo_setupterm+:} false; then : $as_echo_n "(cached) " >&6@@ -2753,6 +2792,8 @@ HaveLibCurses=YES; LibCurses=curses else HaveLibCurses=NO; LibCurses=not-installed+fi+ fi fi
configure.ac view
@@ -18,11 +18,12 @@ [CC=$withval]) AC_PROG_CC() -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)])])])+AC_CHECK_LIB(tinfow, setupterm, HaveLibCurses=YES; LibCurses=tinfow,+ [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])
terminfo.cabal view
@@ -1,6 +1,6 @@ Name: terminfo Cabal-Version: >=1.10-Version: 0.4.1.0+Version: 0.4.1.1 Category: User Interfaces License: BSD3 License-File: LICENSE@@ -29,7 +29,7 @@ other-extensions: CPP, DeriveDataTypeable, FlexibleInstances, ScopedTypeVariables if impl(ghc>=7.3) other-extensions: Safe, Trustworthy- build-depends: base >= 4.3 && < 4.11+ build-depends: base >= 4.3 && < 4.12 ghc-options: -Wall exposed-modules: System.Console.Terminfo