[patch] mcabber-1.1.0-tinfow.patch

mcabber-1.1.0-tinfow.patch (text/plain), 3.78 KB, created by Sergei Trofimovich (RETIRED) on 2019-11-13 08:57:46 UTC

--- a/configure.ac
+++ b/configure.ac
@@ -100,13 +100,14 @@ AC_CHECK_FUNC(initscr,,
     AC_CHECK_LIB($cf_ncurses, initscr,
         [LIBS="$LIBS -l$cf_ncurses"
 
-         AC_CHECK_LIB(tinfo, tgetent, [LIBS="$LIBS -ltinfo"])
 
          if test "$cf_ncurses" = ncursesw; then
+            AC_CHECK_LIB(tinfow, tgetent, [LIBS="$LIBS -ltinfow"])
             AC_CHECK_HEADERS([ncursesw/ncurses.h ncursesw/panel.h],,
                  [AC_CHECK_HEADERS([ncurses.h panel.h],,
                                    AC_MSG_ERROR([Missing header file]))])
          else
+             AC_CHECK_LIB(tinfo, tgetent, [LIBS="$LIBS -ltinfo"])
              AC_CHECK_HEADERS([ncurses/ncurses.h ncurses/panel.h],,
                  [AC_CHECK_HEADERS([ncurses.h panel.h],,
                                    AC_MSG_ERROR([Missing header file]))])
--- a/configure
+++ b/configure
@@ -14148,13 +14148,15 @@ $as_echo "$ac_res" >&6; }
 if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
   LIBS="$LIBS -l$cf_ncurses"
 
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfo" >&5
-$as_echo_n "checking for tgetent in -ltinfo... " >&6; }
-if ${ac_cv_lib_tinfo_tgetent+:} false; then :
+
+         if test "$cf_ncurses" = ncursesw; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfow" >&5
+$as_echo_n "checking for tgetent in -ltinfow... " >&6; }
+if ${ac_cv_lib_tinfow_tgetent+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltinfo  $LIBS"
+LIBS="-ltinfow  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14174,22 +14176,20 @@ return tgetent ();
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_tinfo_tgetent=yes
+  ac_cv_lib_tinfow_tgetent=yes
 else
-  ac_cv_lib_tinfo_tgetent=no
+  ac_cv_lib_tinfow_tgetent=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_tgetent" >&5
-$as_echo "$ac_cv_lib_tinfo_tgetent" >&6; }
-if test "x$ac_cv_lib_tinfo_tgetent" = xyes; then :
-  LIBS="$LIBS -ltinfo"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfow_tgetent" >&5
+$as_echo "$ac_cv_lib_tinfow_tgetent" >&6; }
+if test "x$ac_cv_lib_tinfow_tgetent" = xyes; then :
+  LIBS="$LIBS -ltinfow"
 fi
 
-
-         if test "$cf_ncurses" = ncursesw; then
             for ac_header in ncursesw/ncurses.h ncursesw/panel.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -14220,6 +14220,46 @@ fi
 done
 
          else
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfo" >&5
+$as_echo_n "checking for tgetent in -ltinfo... " >&6; }
+if ${ac_cv_lib_tinfo_tgetent+:} 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 tgetent ();
+int
+main ()
+{
+return tgetent ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_tinfo_tgetent=yes
+else
+  ac_cv_lib_tinfo_tgetent=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_tgetent" >&5
+$as_echo "$ac_cv_lib_tinfo_tgetent" >&6; }
+if test "x$ac_cv_lib_tinfo_tgetent" = xyes; then :
+  LIBS="$LIBS -ltinfo"
+fi
+
              for ac_header in ncurses/ncurses.h ncurses/panel.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`