From c7d1f961c36096cea81368cbbc717eb44d30572d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 8 Oct 2001 03:41:23 +0000
Subject: [PATCH] INSTALL: 	move the bootstrap comment to where people are
 more likely to notice it bootstrap: 	hopefully put the auto*/libtool
 commands in the right order configure.ac: 	make enable/disable help
 messages less confusing

---
 INSTALL      | 5 +++--
 bootstrap    | 2 +-
 configure.ac | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/INSTALL b/INSTALL
index e8739327b..81f44a7bf 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,3 @@
-NOTE: for building from cvs or a cvs snapshot, run ./bootstrap first.
-
 Basic Installation
 ==================
 
@@ -33,6 +31,9 @@ The simplest way to compile this package is:
      `sh ./configure' instead to prevent `csh' from trying to execute
      `configure' itself.
 
+     NOTE: for building from cvs or a cvs snapshot, run ./bootstrap
+	 first.
+
      Running `configure' takes awhile.  While running, it prints some
      messages telling which features it is checking for.
 
diff --git a/bootstrap b/bootstrap
index 0efe86d8e..f65e2aa5c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -44,4 +44,4 @@ else
 	exit 1
 fi
 
-libtoolize --automake && aclocal && automake --add-missing && autoheader && autoconf
+aclocal && autoheader && libtoolize --automake && automake --add-missing && autoconf
diff --git a/configure.ac b/configure.ac
index fa89f7dda..c40af716b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -509,7 +509,7 @@ fi
 
 dnl Check for XFree86-VidMode support
 AC_ARG_ENABLE(vidmode,
-[  --enable-vidmode        use XFree86 VidMode extension, if available],
+[  --disable-vidmode       don't use XFree86 VidMode extension],
 	HAVE_VIDMODE=$enable_vidmode, HAVE_VIDMODE=auto)
 if test "x$HAVE_VIDMODE" != xno; then
 	save_CPPFLAGS="$CPPFLAGS"
@@ -528,7 +528,7 @@ AC_SUBST(VIDMODE_LIBS)
 
 dnl Check for DGA support
 AC_ARG_ENABLE(dga,
-[  --enable-dga            use XFree86 DGA extension, if available],
+[  --disable-dga           don't use XFree86 DGA extension],
 HAVE_DGA=$enable_dga, HAVE_DGA=auto)
 if test "x$HAVE_DGA" != xno; then
 	save_CPPFLAGS="$CPPFLAGS"