Merge disorder.userman branch

[disorder] / configure.ac

diff --git a/configure.ac b/configure.ac
index e3e836487d2d638411bb2c23cc0c0e883b59eb24..1de3613ff903daa6601b4a0294fa0b0a51ab4d5e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -455,6 +455,8 @@ if test $want_server = yes; then
   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],[