pre3 changes

[Ben Pfaff]

I had to apply a few changes to put out pre3.  First, a few
gnulib modules have changed:

----------------------------------------------------------------------
diff -u -p -r1.67 Smake
--- Smake       18 Mar 2008 09:02:19 -0000      1.67
+++ Smake       13 May 2008 16:42:57 -0000
@@ -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 -u -p -r1.18 msg-ui.c
--- src/ui/terminal/msg-ui.c    19 Jan 2008 06:58:07 -0000      1.18
+++ src/ui/terminal/msg-ui.c    13 May 2008 16:43:06 -0000
@@ -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,
   /* 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);
 
----------------------------------------------------------------------

Second, automake didn't like having two install-data-hook
targets:

----------------------------------------------------------------------
Index: doc/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/doc/automake.mk,v
retrieving revision 1.7
diff -u -p -r1.7 automake.mk
--- doc/automake.mk     9 May 2008 07:06:36 -0000       1.7
+++ doc/automake.mk     13 May 2008 16:42:57 -0000
@@ -46,7 +46,12 @@ doc/ni.texi: $(top_srcdir)/src/language/
 
 # 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: src/ui/gui/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/gui/automake.mk,v
retrieving revision 1.54
diff -u -p -r1.54 automake.mk
--- src/ui/gui/automake.mk      9 May 2008 07:06:37 -0000       1.54
+++ src/ui/gui/automake.mk      13 May 2008 16:43:06 -0000
@@ -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.' ; \
----------------------------------------------------------------------

I haven't checked these in yet.  Comments?
-- 
"I didn't say it was your fault.
 I said I was going to blame it on you."