[Pspp-cvs] pspp src/ui/terminal/msg-ui.c src/ui/terminal/C...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 08/05/16 05:27:50

Modified files:
        src/ui/terminal: msg-ui.c ChangeLog 
        src/ui/gui     : automake.mk ChangeLog 
        doc            : automake.mk ChangeLog 
        .              : Smake ChangeLog 

Log message:
        * Smake (GNULIB_MODULES): Don't depend on memmem module, because
        PSPP does not use memmem any longer.  Use
        unilbrk/ulc-width-linebreaks module instead of the linebreak
        module, because the latter was split up into multiple modules and
        that's the one we actually need.
        
        * automake.mk: Make install-data-hook depend on yelp-check if the
        GUI is configured.
        
        * automake.mk: Rename install-data-hook to yelp-check and mark it
        phony.  This avoids an automake warning for duplicate
        install-data-hook commands in doc/automake.mk and this file
        (automake does not understand double-colon rules, since they are
        not in POSIX).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/msg-ui.c?cvsroot=pspp&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/ChangeLog?cvsroot=pspp&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/automake.mk?cvsroot=pspp&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.127&r2=1.128
http://cvs.savannah.gnu.org/viewcvs/pspp/doc/automake.mk?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/doc/ChangeLog?cvsroot=pspp&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/pspp/Smake?cvsroot=pspp&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/pspp/ChangeLog?cvsroot=pspp&r1=1.101&r2=1.102

Patches:
Index: src/ui/terminal/msg-ui.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/terminal/msg-ui.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/ui/terminal/msg-ui.c    19 Jan 2008 06:58:07 -0000      1.18
+++ src/ui/terminal/msg-ui.c    16 May 2008 05:27:47 -0000      1.19
@@ -18,7 +18,7 @@
 
 #include "msg-ui.h"
 
-#include "linebreak.h"
+#include "unilbrk.h"
 #include "localcharset.h"
 
 #include <libpspp/msg-locator.h>
@@ -224,7 +224,7 @@
   /* Break into lines. */
   if (indent > width / 3)
     indent = width / 3;
-  mbs_width_linebreaks (string, length,
+  ulc_width_linebreaks (string, length,
                         width - indent, -indent, 0,
                         NULL, locale_charset (), breaks);
 

Index: src/ui/terminal/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/terminal/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- src/ui/terminal/ChangeLog   3 Nov 2007 22:02:21 -0000       1.33
+++ src/ui/terminal/ChangeLog   16 May 2008 05:27:47 -0000      1.34
@@ -1,3 +1,9 @@
+2008-05-15  Ben Pfaff  <address@hidden>
+
+       * Use unilbrk.h instead of linebreak.h and ulc_width_linebreaks
+       instead of mbs_width_linebreaks for compatibility with latest
+       gnulib.
+
 2007-11-03  Ben Pfaff  <address@hidden>
 
        Allow output files to overwrite input files (bug #21280).

Index: src/ui/gui/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/gui/automake.mk,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- src/ui/gui/automake.mk      9 May 2008 07:06:37 -0000       1.54
+++ src/ui/gui/automake.mk      16 May 2008 05:27:48 -0000      1.55
@@ -195,7 +195,7 @@
        src/ui/gui/window-manager.c \
        src/ui/gui/window-manager.h
 
-install-data-hook::
+yelp-check:
        @if ! yelp --version > /dev/null 2>&1 ; then \
                echo    ; \
                echo '    The Yelp document viewer does not seem to be 
installed on the system.' ; \
@@ -204,3 +204,4 @@
                echo '    Yelp is available from the GNOME project.  
ftp://ftp.gnome.org/pub/gnome/sources/yelp' ; \
                echo ; \
        fi
+.PHONY: yelp-check

Index: src/ui/gui/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- src/ui/gui/ChangeLog        9 May 2008 07:06:37 -0000       1.127
+++ src/ui/gui/ChangeLog        16 May 2008 05:27:48 -0000      1.128
@@ -1,3 +1,11 @@
+2008-05-15  Ben Pfaff  <address@hidden>
+
+       * automake.mk: Rename install-data-hook to yelp-check and mark it
+       phony.  This avoids an automake warning for duplicate
+       install-data-hook commands in doc/automake.mk and this file
+       (automake does not understand double-colon rules, since they are
+       not in POSIX).
+
 2008-05-09  John Darrington <address@hidden>
 
        * automake.mk: On make install, warn about the non-existance of yelp.

Index: doc/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/doc/automake.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- doc/automake.mk     9 May 2008 07:06:36 -0000       1.7
+++ doc/automake.mk     16 May 2008 05:27:48 -0000      1.8
@@ -46,7 +46,12 @@
 
 # It seems that recent versions of yelp, upon which the gui relies to display 
the reference
 # manual, are broken.  It only works on compressed info files.  So we must 
compress them.
-install-data-hook::
+if WITHGUI
+YELP_CHECK = yelp-check
+else
+YELP_CHECK =
+endif
+install-data-hook:: $(YELP_CHECK)
        for ifile in $(DESTDIR)$(infodir)/pspp.info-[0-9] \
                $(DESTDIR)$(infodir)/pspp.info  ; do \
          gzip -f $$ifile ; \

Index: doc/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/doc/ChangeLog,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- doc/ChangeLog       9 May 2008 07:06:35 -0000       1.56
+++ doc/ChangeLog       16 May 2008 05:27:49 -0000      1.57
@@ -1,3 +1,8 @@
+2008-05-15  Ben Pfaff  <address@hidden>
+
+       * automake.mk: Make install-data-hook depend on yelp-check if the
+       GUI is configured.
+
 2008-05-08 John Darrington <address@hidden>
 
        * automake.mk: Compress the info files, because later

Index: Smake
===================================================================
RCS file: /cvsroot/pspp/pspp/Smake,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- Smake       18 Mar 2008 09:02:19 -0000      1.67
+++ Smake       16 May 2008 05:27:49 -0000      1.68
@@ -30,13 +30,11 @@
        isfinite \
        intprops \
        inttostr \
-       linebreak \
        localcharset \
         mbchar \
        memcasecmp \
        memchr \
        memcmp \
-       memmem \
        memmove \
        mempcpy \
        memset \
@@ -67,6 +65,7 @@
        tempname \
        tmpfile \
        trunc \
+       unilbrk/ulc-width-linebreaks \
        unistd \
        unlocked-io \
        vasprintf-posix \

Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/ChangeLog,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- ChangeLog   9 May 2008 06:35:33 -0000       1.101
+++ ChangeLog   16 May 2008 05:27:49 -0000      1.102
@@ -1,3 +1,11 @@
+2008-05-15  Ben Pfaff  <address@hidden>
+
+       * Smake (GNULIB_MODULES): Don't depend on memmem module, because
+       PSPP does not use memmem any longer.  Use
+       unilbrk/ulc-width-linebreaks module instead of the linebreak
+       module, because the latter was split up into multiple modules and
+       that's the one we actually need.
+
 2008-05-09  John Darrington <address@hidden>
 
        * INSTALL: For obscure reasons gettext 0.17 requires that