Merge more 3.0 branch changes

diff --combined CHANGES
index 19c04bde17ffb076287ed56798359c944e0c2134,6d92b623a64982a6eb00a674b14abe9b2ddd8f0f..e638f434cdb630b2010b347d9e0d0bfdfbf74696
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,21 -1,10 +1,28 @@@
 +* Changes up to version 3.1
 +
 +** Server
 +
 +The 'gap' directive will no longer work.  It could be restored if there
 +is real demand.
 +
 +*** Random Track Choice
 +
 +This has been completely rewritten to support new features:
 +   - tracks in the recently-played list or in the queue are no longer
 +     eligible for random choice
 +   - there is a new 'weight' track preference allowing for non-uniform
 +     track selection.  See disorder(1) for details.
 +   - there is a new configuration item replay_min defining the minimum
 +     time before a played track can be picked at random.  The default is
 +     8 hours (which matches the earlier behaviour).
 +
+ * Changes up to version 3.0.2
+ 
+ Builds --without-server should work again.
+ 
+ The web interface is a bit more liberal in the cookie value syntax it
+ will accept.
+ 
  * Changes up to version 3.0.1
  
  Debian upgrades from 2.0.x should now work better.

diff --combined configure.ac
index ece08f16f0981ff2d619584af3c3c611f2061910,cd663d1d6b602391fdd726fcf46f9c27f60486f9..2be631f7bf2d340ebd49613cb512be0d940ee59d
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -20,9 -20,9 +20,9 @@@
  # USA
  #
  
 -AC_INIT([disorder], [3.0+fixes], [richard+disorder@sfere.greenend.org.uk])
 +AC_INIT([disorder], [3.0+], [richard+disorder@sfere.greenend.org.uk])
  AC_CONFIG_AUX_DIR([config.aux])
 -AM_INIT_AUTOMAKE(disorder, [3.0+fixes])
 +AM_INIT_AUTOMAKE(disorder, [3.0+])
  AC_CONFIG_SRCDIR([server/disorderd.c])
  AM_CONFIG_HEADER([config.h])
  
@@@ -450,6 -450,8 +450,8 @@@ if test $want_server = yes; the
    fi
  fi
  
+ AM_CONDITIONAL([SERVER], [test x$want_server = xyes])
+ 
  if test "x$GCC" = xyes; then
    # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29478
    AC_CACHE_CHECK([checking for GCC bug 29478],[rjk_cv_pr29478],[