Merge more 3.0 branch changes

[disorder] / configure.ac

diff --git a/configure.ac b/configure.ac
index ece08f16f0981ff2d619584af3c3c611f2061910..2be631f7bf2d340ebd49613cb512be0d940ee59d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -450,6 +450,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],[