terminfo 0.3.2.5 → 0.3.2.6
raw patch · 3 files changed
+48/−6 lines, 3 files
Files
- configure +42/−1
- configure.ac +5/−4
- terminfo.cabal +1/−1
configure view
@@ -3280,7 +3280,46 @@ TERMINFO_INCLUDES="$CursesIncludes term.h" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setupterm in -lncursesw" >&5+{ $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+else+ ac_check_lib_save_LIBS=$LIBS+LIBS="-ltinfo $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_tinfo_setupterm=yes+else+ ac_cv_lib_tinfo_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_tinfo_setupterm" >&5+$as_echo "$ac_cv_lib_tinfo_setupterm" >&6; }+if test "x$ac_cv_lib_tinfo_setupterm" = xyes; then :+ HaveLibCurses=YES; LibCurses=tinfo+else+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setupterm in -lncursesw" >&5 $as_echo_n "checking for setupterm in -lncursesw... " >&6; } if ${ac_cv_lib_ncursesw_setupterm+:} false; then : $as_echo_n "(cached) " >&6@@ -3398,6 +3437,8 @@ HaveLibCurses=YES; LibCurses=curses else HaveLibCurses=NO; LibCurses=not-installed+fi+ fi fi
configure.ac view
@@ -39,10 +39,11 @@ 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])
terminfo.cabal view
@@ -1,6 +1,6 @@ Name: terminfo Cabal-Version: >=1.4-Version: 0.3.2.5+Version: 0.3.2.6 Category: User Interfaces License: BSD3 License-File: LICENSE