From 23ba9ad6be346645f38f1dc662d9a2f32f0cc051 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Wed, 4 May 2005 00:56:07 +0000 Subject: [PATCH] Added CONFIGUREFLAGS option to Smake. Removed #include valgrind from casefile.c Updated INSTALL and README.CVS --- ChangeLog | 5 +++++ INSTALL | 7 +++++++ README.CVS | 10 +++++++++- Smake | 2 +- po/en_GB.po | 2 +- src/ChangeLog | 4 ++++ src/casefile.c | 4 ---- 7 files changed, 27 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0436ea6..aea4b2fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed May 4 08:49:13 WST 2005 John Darrington + + * README.CVS Smake: Added a CONFIGUREFLAGS variable. + * INSTALL: Mentioned build dependencies. + Mon May 2 22:37:39 2005 Ben Pfaff * INSTALL: Mention dependencies. Thanks to Jaap-Andre de Hoop diff --git a/INSTALL b/INSTALL index 1bab01c5..db1decf2 100644 --- a/INSTALL +++ b/INSTALL @@ -8,6 +8,13 @@ PSPP has the following library dependencies; graphing features will not work. If you do not have it installed, you must run `configure' with --without-libplot. + * ncurses and GNU readline are optional. They make for a more pleasant + command line interface. + +PSPP also has the following build dependencies: + + * perl 5.6 or later. + Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. diff --git a/README.CVS b/README.CVS index 244c31b7..b5ff93df 100644 --- a/README.CVS +++ b/README.CVS @@ -2,8 +2,16 @@ To build this project from the sources direct from the cvs archive use: make -f Smake +# If you need to pass arguments to configure, use +# make -f Smake CONFIGUREFLAGS="--with-this --without-that" make - and to test it: + + + To test it: + +make check + + For a very thorough test: make distcheck diff --git a/Smake b/Smake index 0da3f586..040b51df 100644 --- a/Smake +++ b/Smake @@ -1,5 +1,5 @@ Makefile po/Makefile.in: Makefile.in configure install-sh config.h.in po/Makefile.in.in po/POTFILES.in - ./configure + ./configure $(CONFIGUREFLAGS) configure: configure.ac aclocal.m4 autoconf diff --git a/po/en_GB.po b/po/en_GB.po index 7a341723..6ab608b5 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,6 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PSPP 0.3.1\n" +"Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" "POT-Creation-Date: 2005-05-03 18:47+0800\n" "PO-Revision-Date: 2004-01-23 13:04+0800\n" "Last-Translator: John Darrington \n" @@ -13,7 +14,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" #: src/aggregate.c:195 diff --git a/src/ChangeLog b/src/ChangeLog index 36bb152f..77928bca 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +Wed May 4 08:50:11 WST 2005 John Darrington + + * casefile.c: Removed unnecessary #include + Tue May 3 19:14:48 WST 2005 John Darrington * copyleft.c: Updated copyright date. diff --git a/src/casefile.c b/src/casefile.c index 04a110c8..f43ec8fa 100644 --- a/src/casefile.c +++ b/src/casefile.c @@ -34,10 +34,6 @@ #include "settings.h" #include "var.h" -#ifdef HAVE_VALGRIND_VALGRIND_H -#include -#endif - #define IO_BUF_SIZE (8192 / sizeof (union value)) /* A casefile is a sequentially accessible array of immutable -- 2.30.2