[PATCH intel-gpu-tools 08/10] config: set-up xorg automatic rebuilding rules

Gaetan Nadon memsize at videotron.ca
Tue Jan 3 18:12:24 PST 2012


The current code is a noop. Use the same configuration as all
the other xorg modules. This will change in the future but it is less
confusing when all modules behave the same way.
Note that these rules apply to building from a tarball only.

Restore autogen.sh to be identical in all xorg modules.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 autogen.sh   |   14 ++++++++++----
 configure.ac |    2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 30d679f..904cd67 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,12 @@
 #! /bin/sh
 
-test -n "$srcdir" || srcdir=`dirname "$0"`
-test -n "$srcdir" || srcdir=.
-autoreconf --force --install --verbose "$srcdir"
-test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/configure.ac b/configure.ac
index 8515dca..73a9e29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 
 AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2])
-AM_MAINTAINER_MODE([enable])
+AM_MAINTAINER_MODE
 
 # Initialize libtool
 LT_PREREQ([2.2])
-- 
1.7.5.4



More information about the xorg-devel mailing list