Added CONFIGUREFLAGS option to Smake.

Removed #include valgrind from casefile.c
Updated INSTALL and README.CVS

diff --git a/ChangeLog b/ChangeLog
index c0436ea6ee380fbdc0823072ab01afd3f661efc0..aea4b2fe1d4588f7bebdf650b9f2f3ca3ac032d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May  4 08:49:13 WST 2005 John Darrington <john@darrington.wattle.id.au>
+
+       * README.CVS Smake: Added a CONFIGUREFLAGS variable.
+       * INSTALL: Mentioned build dependencies.
+
 Mon May  2 22:37:39 2005  Ben Pfaff  <blp@gnu.org>
 
        * INSTALL: Mention dependencies.  Thanks to Jaap-Andre de Hoop

diff --git a/INSTALL b/INSTALL
index 1bab01c58da815c9cf504dd12e5e3db61d188f8e..db1decf2a7dd0733c30c7746d07397d04474e24b 100644 (file)
--- 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 244c31b7e49c34ee63916767b79866ea404599fa..b5ff93df8a68db1be2485891a66260234f81501e 100644 (file)
--- 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 0da3f58604db503ce352cd65e1d7d2c7de3adfd6..040b51df8352db7f18a171bdd4e72c97853c9159 100644 (file)
--- 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 7a34172352e08bd42b0f07d481b629addf7f8402..6ab608b5996b7e23388d46b499a30c11b3be7903 100644 (file)
--- 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 <john@darrington.wattle.id.au>\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 36bb152fed0589590c89116efa2dc30efbc1f245..77928bcac9080067b66323e0b6d9ec5cfafca56a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+Wed May  4 08:50:11 WST 2005 John Darrington <john@darrington.wattle.id.au>
+
+       * casefile.c: Removed unnecessary #include <valgrind/valgrind.h>
+
 Tue May  3 19:14:48 WST 2005 John Darrington <john@darrington.wattle.id.au>
 
        * copyleft.c: Updated copyright date.

diff --git a/src/casefile.c b/src/casefile.c
index 04a110c802a4c4e43dee4bd69cdc348feb25283a..f43ec8faa4fb22d7e6a25f2ae536c9521b0a41fa 100644 (file)
--- a/src/casefile.c
+++ b/src/casefile.c
@@ -34,10 +34,6 @@
 #include "settings.h"
 #include "var.h"
 
-#ifdef HAVE_VALGRIND_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
-
 #define IO_BUF_SIZE (8192 / sizeof (union value))
 
 /* A casefile is a sequentially accessible array of immutable