From 06a34a11908066ab5949d4b36c7fc5b7f44e88bb Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 16 May 2008 05:27:47 +0000 Subject: [PATCH] * 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). --- ChangeLog | 8 ++++++++ Smake | 3 +-- doc/ChangeLog | 5 +++++ doc/automake.mk | 7 ++++++- src/ui/gui/ChangeLog | 8 ++++++++ src/ui/gui/automake.mk | 3 ++- src/ui/terminal/ChangeLog | 6 ++++++ src/ui/terminal/msg-ui.c | 4 ++-- 8 files changed, 38 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f43019b650..98f227c6a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-05-15 Ben Pfaff + + * 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 * INSTALL: For obscure reasons gettext 0.17 requires that diff --git a/Smake b/Smake index 02d82f63be..aa05962fb6 100644 --- 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 4794466081..f1270cf592 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2008-05-15 Ben Pfaff + + * automake.mk: Make install-data-hook depend on yelp-check if the + GUI is configured. + 2008-05-08 John Darrington * automake.mk: Compress the info files, because later diff --git a/doc/automake.mk b/doc/automake.mk index 84118c198a..0ebd8fc56d 100644 --- 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 25fb4ac52d..3cc945cc53 100644 --- a/src/ui/gui/ChangeLog +++ b/src/ui/gui/ChangeLog @@ -1,3 +1,11 @@ +2008-05-15 Ben Pfaff + + * 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 * 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 c784650cce..a405e87a61 100644 --- 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 b4d329da37..a5ad36d432 100644 --- a/src/ui/terminal/ChangeLog +++ b/src/ui/terminal/ChangeLog @@ -1,3 +1,9 @@ +2008-05-15 Ben Pfaff + + * 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 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 fb0e7557e2..b03efb95e5 100644 --- 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 @@ -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); -- 2.30.2