Small build fixes for minicom 2.2

Jakub Bogusz qboosh at pld-linux.org
Wed Oct 25 21:42:35 CEST 2006


Hello,

Here are two small patches:

minicom-tinfo.patch fixes build with libtinfo and ncurses headers
residing in /usr/include/ncurses (libtinfo is part of ncurses built
--with-termlib).

minicom-setlocale.patch fixes NLS. In minicom built with recent gettext
versions HAVE_SETLOCALE is never set (nothing calls
AC_CHECK_FUNC(setlocale)), so #if in intl.h didn't allow to call
setlocale().


-- 
Jakub Bogusz    http://qboosh.cs.net.pl/
-------------- next part --------------
--- minicom-2.2/src/intl.h.orig	2003-03-30 20:55:51.000000000 +0200
+++ minicom-2.2/src/intl.h	2006-10-25 21:19:29.796034250 +0200
@@ -2,8 +2,7 @@
 
 #ifdef HAVE_LOCALE_H
 # include <locale.h>
-#endif
-#if !HAVE_SETLOCALE
+#else
 # define setlocale(Category, Locale) /* empty */
 #endif
 
-------------- next part --------------
--- minicom-2.2/configure.in.orig	2006-10-25 20:16:10.658603000 +0200
+++ minicom-2.2/configure.in	2006-10-25 20:22:45.891303500 +0200
@@ -157,7 +157,7 @@
 
 dnl Checks for header files.
 dnl Do not use <ncurses/termcap.h> unless we're linking with ncurses.
-if test "x$termlib" = xncurses; then
+if test "x$termlib" = xncurses -o "x$termlib" = xtinfo; then
   dnl Use AC_CHECK_HEADERS so the HAVE_*_H symbol gets defined.
   AC_CHECK_HEADERS(ncurses/termcap.h)
 fi
--- minicom-2.2/src/port.h.orig	2005-10-31 11:31:38.000000000 +0100
+++ minicom-2.2/src/port.h	2006-10-25 20:22:26.590097250 +0200
@@ -29,6 +29,8 @@
 #endif
 #ifdef HAVE_TERMCAP_H
 #  include <termcap.h>
+#elif defined(HAVE_NCURSES_TERMCAP_H)
+#  include <ncurses/termcap.h>
 #else
   char *tgetstr(void), *tgoto(void);
   int tgetent(void), tputs(void), tgetnum(void), tgetflag(void);


More information about the minicom-devel mailing list