disable client prediction by default, add --without-client option to configure

1 files changed, 66 insertions, 46 deletions

diff --git a/configure.in b/configure.in
index 257549e..61b94c7 100644
--- a/configure.in
+++ b/configure.in
@@ -108,61 +108,78 @@ AC_ARG_ENABLE(debug_messages,
 	AC_DEFINE_UNQUOTED(HAVE_DEBUG_MESSAGES, 1, [Defines if debug information is enabled])
 )
 
-AC_CHECK_HEADER(GL/gl.h,
-        HAVE_OPENGL=yes
-        AC_DEFINE(HAVE_OPENGL, 1, [Define this if you have OpenGL]),
-        HAVE_OPENGL=no
-)
+BUILD_CLIENT=no
 
-AC_CHECK_HEADER(GL/glext.h,
-        HAVE_OPENGL_GLEXT=yes
-        AC_DEFINE(HAVE_OPENGL_GLEXT, 1, [Define this if you have OpenGL Extensions]),
-        HAVE_OPENGL_GLEXT=no,
-        [#include <GL/gl.h>]
+AC_ARG_WITH(client,
+	AC_HELP_STRING([--without-client], [build the dedicated server only])
 )
 
+AC_MSG_CHECKING(whether to build client)
 
-GL_LIBS="$HOST_GL_LIBS"
-
-AC_SUBST(GL_LIBS)
-AC_SUBST(GL_CFLAGS)
+if test "x${with_client}" = xno; then
 
-AC_CHECK_HEADER(AL/al.h,
-        HAVE_OPENGL=yes
-        AC_DEFINE(HAVE_OPENAL, 1, [Define this if you have OpenAL]),
-        HAVE_OPENAL=no
-)
+	AC_MSG_RESULT(no)
 
-AL_LIBS="$HOST_AL_LIBS"
-AC_SUBST(AL_LIBS)
-
-AC_MSG_CHECKING([looking for SDL])
-KDE_FIND_PATH(sdl-config, LIBSDL_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
-  AC_MSG_WARN([Could not find libSDL, check http://www.sdl.org])
-])
+else
+	AC_MSG_RESULT(yes)
 
-if test -n "$LIBSDL_CONFIG"; then
-     LIBSDL_LIBS="`$LIBSDL_CONFIG --libs`"
-     LIBSDL_RPATH=
-     for args in $LIBSDL_LIBS; do
-          case $args in
-            -L*)
-               LIBSDL_RPATH="$LIBSDL_RPATH $args"
-               ;;
-          esac
-     done
-     LIBSDL_RPATH=`echo $LIBSDL_RPATH | sed -e "s/-L/-R/g"`
-     LIBSDL_CFLAGS="`$LIBSDL_CONFIG --cflags`"
-
-     AC_DEFINE_UNQUOTED(HAVE_LIBSDL, 1, [Defines if your system has the LIBSDL library])
+	BUILD_CLIENT=yes
+	AC_DEFINE(BUILD_CLIENT, 1, [Define this to build a client])
+
+	AC_CHECK_HEADER(GL/gl.h,
+		HAVE_OPENGL=yes
+		AC_DEFINE(HAVE_OPENGL, 1, [Define this if you have OpenGL]),
+		AC_MSG_WARN([OpenGL include file GL/gl.h not found])
+	)
+	
+	AC_CHECK_HEADER(GL/glext.h,
+		HAVE_OPENGL_GLEXT=yes
+		AC_DEFINE(HAVE_OPENGL_GLEXT, 1, [Define this if you have OpenGL Extensions]),
+		AC_MSG_ERROR([OpenGL include file GL/glext.h not found])
+	)
+	
+	GL_LIBS="$HOST_GL_LIBS"
+	
+	AC_SUBST(GL_LIBS)
+	AC_SUBST(GL_CFLAGS)
+
+	AC_CHECK_HEADER(AL/al.h,
+		HAVE_OPENGL=yes
+		AC_DEFINE(HAVE_OPENAL, 1, [Define this if you have OpenAL]),
+		AC_MSG_ERROR([OpenAL include file AL/al.h not found])
+	)
+	
+	AL_LIBS="$HOST_AL_LIBS"
+	AC_SUBST(AL_LIBS)
+	
+	AC_MSG_CHECKING([looking for SDL])
+	KDE_FIND_PATH(sdl-config, LIBSDL_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
+		AC_MSG_ERROR([SDL not found])
+	])
+	
+	if test -n "$LIBSDL_CONFIG"; then
+	LIBSDL_LIBS="`$LIBSDL_CONFIG --libs`"
+	LIBSDL_RPATH=
+	for args in $LIBSDL_LIBS; do
+		case $args in
+		-L*)
+		LIBSDL_RPATH="$LIBSDL_RPATH $args"
+		;;
+		esac
+	done
+	LIBSDL_RPATH=`echo $LIBSDL_RPATH | sed -e "s/-L/-R/g"`
+	LIBSDL_CFLAGS="`$LIBSDL_CONFIG --cflags`"
+	
+	AC_DEFINE_UNQUOTED(HAVE_LIBSDL, 1, [Defines if your system has the LIBSDL library])
+	fi
+	
+	AC_MSG_RESULT($HAVE_LIBSDL)
+	
+	AC_SUBST(LIBSDL_LIBS)
+	AC_SUBST(LIBSDL_CFLAGS)
+	AC_SUBST(LIBSDL_RPATH)
 fi
 
-AC_MSG_RESULT($HAVE_LIBSDL)
-
-AC_SUBST(LIBSDL_LIBS)
-AC_SUBST(LIBSDL_CFLAGS)
-AC_SUBST(LIBSDL_RPATH)
-
 CXXFLAGS="-pipe $DEBUG_CFLAGS $WARN_CFLAGS $CXXFLAGS"
 AC_SUBST(CXXFLAGS)
 
@@ -195,6 +212,8 @@ AC_DEFINE_UNQUOTED(PACKAGE_LIBDIR, "$PACKAGE_LIBDIR",
 dnl ---------------------------------------------------------------
 dnl    Write makefiles and config.h
 
+AM_CONDITIONAL(BUILD_CLIENT, test "x$BUILD_CLIENT" = xyes)
+
 AC_OUTPUT(Makefile src/Makefile src/audio/Makefile src/auxiliary/Makefile \
 	src/client/Makefile src/core/Makefile src/filesystem/Makefile src/game/Makefile \
 	src/math/Makefile src/model/Makefile src/render/Makefile src/server/Makefile src/sys/Makefile)
@@ -209,6 +228,7 @@ Configuration summary:
 	platform ........... $host
 	flags .............. $CXXFLAGS
 	libraries .......... $HOST_LIBS
+	build client ....... $BUILD_CLIENT
 	opengl ............. $GL_LIBS
 	openal ............. $AL_LIBS