- Fix up the cvs build instructions in the README.

- Add a note about game data locations to README.
- Cleanups in configuration summary output for configure.

README

@@ -4,9 +4,10 @@ README for quake2
 Compiling
 ---------
 
-If you are checking this out from CVS, run ``./bootstrap'' first to set
-up configure.  You will need autoconf 2.50, automake 1.6, libtool 1.4,
-or greater.  Then follow the instructions in INSTALL.
+If you are checking this out from CVS, type ``make'' (or ``gmake'' if your
+make is not GNU Make) first to set up configure.  You will need autoconf
+2.50, automake 1.6, libtool 1.4, or greater.  Then follow the instructions
+in INSTALL.
 
 When specifying locations to arguments like --with-svgalib (i.e. all the
 options that can take a DIR argument as shown by ./configure --help), use
@@ -26,6 +27,9 @@ you get an error that pics/colormap.pcx cannot be found, it means that
 pak0.pak is not in the game data path.  Check what prefix you gave to
 configure, and make sure you have pak0.pak in the right directory.
 
+The configure script will inform you of the directory that Quake2Forge
+thinks your game data will be in.
+
 Save Games
 ----------
 

configure.in

@@ -1,26 +1,20 @@
-dnl stick the revision info into the resulting configure script
-AC_REVISION($Revision$) dnl
 AC_PREREQ(2.50)
 
-AC_INIT(quake2, 0.3, quake2-devel@lists.quakeforge.net)
+AC_INIT(quake2, 0.3.1, quake2-devel@lists.quakeforge.net)
 AC_CONFIG_AUX_DIR(.)
 AC_CONFIG_SRCDIR(src/main.c)
 AM_CONFIG_HEADER(config.h)
 
-dnl get the build and target hosts
 AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-zip])
-
-dnl configure --enable-maintainer-mode gets some extra targets
-AM_MAINTAINER_MODE
-
-dnl set some macros
 AC_DEFINE_UNQUOTED(BUILDHOST, "${target_cpu}-${target_os}", 
 	[Set to the canonical name of the target machine])
 AC_SUBST(PROGRAM)
 AC_SUBST(VERSION)
 
+AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-zip])
+
+AM_MAINTAINER_MODE
+
 dnl ----------------------------------
 dnl Overall configuration success flag
 dnl ----------------------------------
@@ -498,7 +492,6 @@ if test "x$HAVE_SOLARIS" = xyes ; then
 fi
 AM_CONDITIONAL(BUILD_SNDSOLARIS, test "x$BUILD_SNDSOLARIS" = xyes)
 
-	
 dnl -------------------------------------------------------------
 dnl Checks for typedefs, structures, and compiler characteristics
 dnl -------------------------------------------------------------
@@ -794,9 +787,9 @@ AC_MSG_RESULT([
 Quake2Forge $VERSION: Automatic configuration OK.
 
   Configuration summary:
-
     Platform: .......... ${host}
-    Video refreshers: .. ${VID_REFS- none}])
+
+    Dependent libraries:])
 
 AC_MSG_RESULT([      SVGAlib: ......... $HAVE_SVGALIB])
 if test "x${ac_with_svgalib}" = xyes; then
@@ -812,6 +805,7 @@ if test "x${ac_with_svgalib}" = xyes; then
 fi
 
 AC_MSG_RESULT([      X11: ............. $HAVE_X])
+
 AC_MSG_RESULT([      OpenGL: .......... $HAVE_OPENGL])
 if test "x${ac_with_opengl}" = xyes ; then
 	if test "x${HAVE_OPENGL}" != xyes ; then
@@ -826,11 +820,13 @@ if test "x${ac_with_opengl}" = xyes ; then
 fi
 
 AC_MSG_RESULT([      SDL: ............. $HAVE_SDL])
+
 dnl AC_MSG_RESULT([   Framebuffer: ..... $HAVE_FB])
+
 dnl AC_MSG_RESULT([   AAlib: ........... $HAVE_AA])
 
-AC_MSG_RESULT([    Sound drivers: ..... ${SNDDRIVERS- none}])
 AC_MSG_RESULT([      OSS: ............. $HAVE_OSS])
+
 AC_MSG_RESULT([      ALSA: ............ $HAVE_ALSA])
 if test "x${ac_with_alsa}" = xyes ; then
 	if test "x${HAVE_ALSA}" != xyes ; then
@@ -843,6 +839,7 @@ if test "x${ac_with_alsa}" = xyes ; then
 		fi
 	fi
 fi
+
 AC_MSG_RESULT([      libao: ........... $HAVE_AO])
 if test "x${ac_with_ao}" = xyes ; then
 	if test "x${HAVE_AO}" != xyes ; then
@@ -855,9 +852,13 @@ if test "x${ac_with_ao}" = xyes ; then
 		fi
 	fi
 fi
-AC_MSG_RESULT([      solaris: ......... $HAVE_SOLARIS])
+
+AC_MSG_RESULT([      solaris audioio: . $HAVE_SOLARIS])
 
 AC_MSG_RESULT([
+    Video refreshers: .. ${VID_REFS- none}
+    Sound drivers: ..... ${SNDDRIVERS- none}
+
   Installation directories:
 
     Program: ........... $BINDIR