* 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).

diff --git a/ChangeLog b/ChangeLog
index f43019b6501478c51e74361a46baa72b7ed74f27..98f227c6a257105977f4f7c8161e19585f9601cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-15  Ben Pfaff  <blp@gnu.org>
+
+       * 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 <john@darrington.wattle.id.au>
 
        * INSTALL: For obscure reasons gettext 0.17 requires that 

diff --git a/Smake b/Smake
index 02d82f63be64d333b8d52c63a2ce1a0fdaa8dd79..aa05962fb63a502bbfaf5ebbc11bcd48fb1cf4b6 100644 (file)
--- a/Smake
+++ b/Smake
@@ -30,13 +30,11 @@ GNULIB_MODULES = \
        isfinite \
        intprops \
        inttostr \
-       linebreak \
        localcharset \
         mbchar \
        memcasecmp \
        memchr \
        memcmp \
-       memmem \
        memmove \
        mempcpy \
        memset \
@@ -67,6 +65,7 @@ GNULIB_MODULES = \
        tempname \
        tmpfile \
        trunc \
+       unilbrk/ulc-width-linebreaks \
        unistd \
        unlocked-io \
        vasprintf-posix \

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 47944660818ea11d21c0141a2f4a5eda28a3f56c..f1270cf59218e9cbe2b0d92415e39da4127ae651 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-15  Ben Pfaff  <blp@gnu.org>
+
+       * automake.mk: Make install-data-hook depend on yelp-check if the
+       GUI is configured.
+
 2008-05-08 John Darrington <john@darrington.wattle.id.au>
 
        * automake.mk: Compress the info files, because later

diff --git a/doc/automake.mk b/doc/automake.mk
index 84118c198a3b1b2e118c98acab38ec5a8e923117..0ebd8fc56dbf8db410895939e1d398a7a5183df2 100644 (file)
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -46,7 +46,12 @@ doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl
 
 # 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 ; \

diff --git a/src/ui/gui/ChangeLog b/src/ui/gui/ChangeLog
index 25fb4ac52dad1824b0b53e9f5b99850d657f1bee..3cc945cc53f9855a4d1a9158c84cda43b178c420 100644 (file)
--- a/src/ui/gui/ChangeLog
+++ b/src/ui/gui/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-15  Ben Pfaff  <blp@gnu.org>
+
+       * 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 <john@darrington.wattle.id.au>
 
        * automake.mk: On make install, warn about the non-existance of yelp.

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index c784650cce3628ac67670339aff4737a0696d2c3..a405e87a61f27bbe510eb5f13c65b33d1c2a3b6c 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -195,7 +195,7 @@ src_ui_gui_psppire_SOURCES = \
        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 @@ install-data-hook::
                echo '    Yelp is available from the GNOME project.  ftp://ftp.gnome.org/pub/gnome/sources/yelp' ; \
                echo ; \
        fi
+.PHONY: yelp-check

diff --git a/src/ui/terminal/ChangeLog b/src/ui/terminal/ChangeLog
index b4d329da37537be45e6db74d045ba759586eb881..a5ad36d43247dc1f1eb95c536e4e25a632923b67 100644 (file)
--- a/src/ui/terminal/ChangeLog
+++ b/src/ui/terminal/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-15  Ben Pfaff  <blp@gnu.org>
+
+       * 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  <blp@gnu.org>
 
        Allow output files to overwrite input files (bug #21280).

diff --git a/src/ui/terminal/msg-ui.c b/src/ui/terminal/msg-ui.c
index fb0e7557e2e017da38c9b4c41f8715b3122a0ba2..b03efb95e5712456cc5929dd42ab7f61cb75d3c4 100644 (file)
--- a/src/ui/terminal/msg-ui.c
+++ b/src/ui/terminal/msg-ui.c
@@ -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 @@ dump_message (char *msg, unsigned width, unsigned indent,
   /* 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);