summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2008-03-07 12:04:17 -0800
committerDan Nicholson <dbn.lists@gmail.com>2008-03-10 12:36:57 -0700
commitd895a98de3a05cc02c8fa5a2121ae81ca46a7444 (patch)
tree611e77178f804d36d7431465a14de1595cd19598
parentbe8354061e8f55f2118443497959c31c1e3b3fdc (diff)
downloadmesa-demos-d895a98de3a05cc02c8fa5a2121ae81ca46a7444.zip
mesa-demos-d895a98de3a05cc02c8fa5a2121ae81ca46a7444.tar.xz
autoconf: Add autogen.sh from Xorg for easier setup from git
The defacto method to rebuild the autotools and run the generated configure is an autogen.sh script. It is much more discoverable than the custom `make configure' used here. The Makefile targets are still useful for creating tarballs, though. This autogen.sh is copied from Xorg.
-rwxr-xr-xautogen.sh16
-rw-r--r--docs/autoconf.html9
2 files changed, 22 insertions, 3 deletions
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..19e5b55
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,16 @@
+#! /bin/sh
+
+srcdir=`dirname "$0"`
+test -z "$srcdir" && srcdir=.
+
+SRCDIR=`(cd "$srcdir" && pwd)`
+ORIGDIR=`pwd`
+
+if test "x$SRCDIR" != "x$ORIGDIR"; then
+ echo "Mesa cannot be built when srcdir != builddir" 1>&2
+ exit 1
+fi
+
+autoreconf -v --install || exit 1
+
+"$srcdir"/configure "$@"
diff --git a/docs/autoconf.html b/docs/autoconf.html
index 518f5d2..d0f9155 100644
--- a/docs/autoconf.html
+++ b/docs/autoconf.html
@@ -43,9 +43,12 @@ configure script, type:
<p>
To see a short description of all the options, type <code>./configure
--help</code>. If you are using a development snapshot and the configure
-script does not exist, type <code>make configure</code> to generate it
-first. Once you have run <code>./configure</code> and set the options to
-your preference, type:
+script does not exist, type <code>./autogen.sh</code> to generate it
+first. If you know the options you want to pass to
+<code>configure</code>, you can pass them to <code>autogen.sh</code>. It
+will run <code>configure</code> with these options after it is
+generated. Once you have run <code>configure</code> and set the options
+to your preference, type:
</p>
<pre>