[Pspp-cvs] pspp ChangeLog configure.ac po/de.po po/en_GB.p...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   08/04/18 23:44:43

Modified files:
        .              : ChangeLog configure.ac 
        po             : de.po en_GB.po 
        src/ui/terminal: automake.mk terminal.c 

Log message:
        Close patch #6492

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/ChangeLog?cvsroot=pspp&r1=1.99&r2=1.100
http://cvs.savannah.gnu.org/viewcvs/pspp/configure.ac?cvsroot=pspp&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/pspp/po/de.po?cvsroot=pspp&r1=1.107&r2=1.108
http://cvs.savannah.gnu.org/viewcvs/pspp/po/en_GB.po?cvsroot=pspp&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/automake.mk?cvsroot=pspp&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/terminal.c?cvsroot=pspp&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/ChangeLog,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- ChangeLog   15 Apr 2008 17:18:30 -0000      1.99
+++ ChangeLog   18 Apr 2008 23:44:42 -0000      1.100
@@ -1,3 +1,7 @@
+2008-04-19  John Darrington <address@hidden>
+
+       * configure.ac : Improve checking of ncurses availability.
+
 2008-04-15  Ben Pfaff  <address@hidden>
 
        * configure.ac: Properly report required version of libglade.

Index: configure.ac
===================================================================
RCS file: /sources/pspp/pspp/configure.ac,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- configure.ac        15 Apr 2008 17:18:31 -0000      1.79
+++ configure.ac        18 Apr 2008 23:44:42 -0000      1.80
@@ -111,8 +111,30 @@
 AC_SEARCH_LIBS([cblas_dsdot], 
[gslcblas],,[PSPP_REQUIRED_PREREQ([libgslcblas])])
 AC_SEARCH_LIBS([gsl_cdf_chisq_Q], [gsl],,[PSPP_REQUIRED_PREREQ([libgsl 
(version 1.4 or later)])])
 
-AC_CHECK_LIB(ncurses, tgetent)
-AC_CHECK_HEADERS(termcap.h)
+dnl Recent versions of GNU ncurses install the curses header files into
+dnl /usr/include/ncurses, and provide a 'ncurses5-config' program which
+dnl enables us to discover where they are. Earlier versions don't have
+dnl this, so we can't rely on it.  So if ncurses5-config is present,
+dnl we'll trust it to find the right information.  Otherwise, we'll
+dnl try to discover it ourselves.
+dnl To confound things further, Cygwin has decided to rename ncurses5-config
+dnl to ncurses8-config !!!
+AC_CHECK_PROGS([NCURSES_CONFIG], [ncurses5-config ncurses8-config])
+if test x"$NCURSES_CONFIG" = x ; then
+  AC_SEARCH_LIBS([tgetent], [ncurses],
+    [curses_available=yes; AC_CHECK_HEADERS([term.h 
curses.h],,[curses_available=no])])
+else
+  curses_available=yes
+  NCURSES_CFLAGS=`$NCURSES_CONFIG --cflags`
+  NCURSES_LIBS=`$NCURSES_CONFIG --libs`
+  AC_SUBST(NCURSES_CFLAGS)
+  AC_SUBST(NCURSES_LIBS)
+fi
+if test x"$curses_available" = x"yes" ; then
+   AC_DEFINE([LIBNCURSES_USABLE], 1,
+     [Define to 1 if the libncurses is both present and usable.])
+fi
+AC_CHECK_HEADERS([termcap.h])
 
 PSPP_READLINE
 

Index: po/de.po
===================================================================
RCS file: /sources/pspp/pspp/po/de.po,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- po/de.po    15 Apr 2008 06:12:53 -0000      1.107
+++ po/de.po    18 Apr 2008 23:44:42 -0000      1.108
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: PSPP 0.4.3\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-04-15 13:59+0800\n"
+"POT-Creation-Date: 2008-04-19 07:19+0800\n"
 "PO-Revision-Date: 2006-07-28 19:32+0800\n"
 "Last-Translator: John Darrington <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"

Index: po/en_GB.po
===================================================================
RCS file: /sources/pspp/pspp/po/en_GB.po,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- po/en_GB.po 15 Apr 2008 06:12:53 -0000      1.123
+++ po/en_GB.po 18 Apr 2008 23:44:42 -0000      1.124
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PSPP 0.4.3\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-04-15 13:59+0800\n"
+"POT-Creation-Date: 2008-04-19 07:19+0800\n"
 "PO-Revision-Date: 2007-09-15 08:29+0800\n"
 "Last-Translator: John Darrington <address@hidden>\n"
 "Language-Team: John Darrington <address@hidden>\n"

Index: src/ui/terminal/automake.mk
===================================================================
RCS file: /sources/pspp/pspp/src/ui/terminal/automake.mk,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- src/ui/terminal/automake.mk 6 Feb 2008 10:33:05 -0000       1.20
+++ src/ui/terminal/automake.mk 18 Apr 2008 23:44:43 -0000      1.21
@@ -13,7 +13,7 @@
        src/ui/terminal/terminal.c \
        src/ui/terminal/terminal.h      
 
-src_ui_terminal_libui_a_CFLAGS = -DINSTALLDIR=\"$(bindir)\"
+src_ui_terminal_libui_a_CFLAGS = -DINSTALLDIR=\"$(bindir)\" $(NCURSES_CFLAGS)
 
 bin_PROGRAMS += src/ui/terminal/pspp
 
@@ -34,6 +34,7 @@
        src/libpspp/libpspp.a \
        $(LIBXML2_LIBS) \
        $(PG_LIBS) \
+       $(NCURSES_LIBS) \
        $(LIBICONV) \
        gl/libgl.la \
        @LIBINTL@ @LIBREADLINE@

Index: src/ui/terminal/terminal.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/terminal/terminal.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/ui/terminal/terminal.c  26 Sep 2007 04:24:08 -0000      1.1
+++ src/ui/terminal/terminal.c  18 Apr 2008 23:44:43 -0000      1.2
@@ -46,7 +46,7 @@
    of this file because curses.h redefines "bool" on some systems
    (e.g. OpenBSD), causing declaration mismatches with functions
    that have parameters or return values of type "bool". */
-#if HAVE_LIBNCURSES
+#if LIBNCURSES_USABLE
 #include <curses.h>
 #include <term.h>
 #endif
@@ -56,7 +56,7 @@
 void
 terminal_check_size (void)
 {
-#if HAVE_LIBNCURSES
+#if LIBNCURSES_USABLE
   if (getenv ("TERM") != NULL)
     {
       char term_buffer [16384];