From 50450a0060ff1fe52fa6211ab6fb7f64ef0a1a65 Mon Sep 17 00:00:00 2001 Message-Id: <50450a0060ff1fe52fa6211ab6fb7f64ef0a1a65.1715395157.git.mdw@distorted.org.uk> From: Mark Wooding Date: Mon, 9 Jun 2008 08:35:03 +0100 Subject: [PATCH] Update README* for current situation Organization: Straylight/Edgeware From: Richard Kettlewell --- README | 6 +++--- README.developers | 17 +++++++---------- configure.ac | 4 ++-- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/README b/README index acd06ee..91a7897 100644 --- a/README +++ b/README @@ -34,9 +34,9 @@ Build dependencies: libao 0.8.6 libasound 1.0.13 libFLAC 1.1.2 - GNU C 4.1.2 - GNU Make 3.81 - GNU Sed 4.1.5 + GNU C 4.1.2 } + GNU Make 3.81 } Non-GNU versions will NOT work + GNU Sed 4.1.5 } Python 2.4.4 (optional) GTK+ 2.8.20 (if you want the GTK+ client) GLIB 2.12.4 (if you want the GTK+ client) diff --git a/README.developers b/README.developers index 5a5dd89..e104598 100644 --- a/README.developers +++ b/README.developers @@ -14,6 +14,8 @@ Dependencies: libao-dev libmad0-dev libasound2-dev libdb4.3-dev \ libflac-dev + (Use the bzr from backports, the one in etch is obsolete.) + * On FreeBSD you'll need at least these packages: autotools bash @@ -138,10 +140,7 @@ Web Interface: keep it that way. Clever use of CSS is OK provided it works well on the mainstream browsers. - * I know that the web template syntax is rather nasty. Perhaps it will be - improved in a future version. - - * Update templates/help.html for any changes you make. + * Update templates/help.tmpl for any changes you make. Disobedience: @@ -188,12 +187,10 @@ Code And Patches: (But if your new feature only makes sense on a given platform then obviously its new dependencies don't need to be available elsewhere.) - * GCC is stated as a dependency. In fact the code is mostly standard C, - with C99 initializers, long long and possibly the occasional // comment as - the main departures from C89. Additional GCCisms will be accepted if it's - impractical to avoid them. At least one active user is still using GCC - 2.95, so extensions that only appear in later versions are to be avoided - for the time being. + * GCCisms such as typeof are used; the configure script asks for -std=gnu99 + by default. At least one active user is still using GCC 2.95, so + extensions that only appear in later versions are to be avoided for the + time being. * Please submit patches either using 'diff -u', or by publishing a bzr branch somewhere I can get at it. diff --git a/configure.ac b/configure.ac index 87430a3..d1895dc 100644 --- a/configure.ac +++ b/configure.ac @@ -20,9 +20,9 @@ # USA # -AC_INIT([disorder], [4.0], [richard+disorder@sfere.greenend.org.uk]) +AC_INIT([disorder], [4.0+], [richard+disorder@sfere.greenend.org.uk]) AC_CONFIG_AUX_DIR([config.aux]) -AM_INIT_AUTOMAKE(disorder, [4.0]) +AM_INIT_AUTOMAKE(disorder, [4.0+]) AC_CONFIG_SRCDIR([server/disorderd.c]) AM_CONFIG_HEADER([config.h]) -- [mdw]