xserver: Branch 'master'

[Keith Packard]

 autogen.sh   |    2 +-
 configure.ac |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 4bf3eac5fe20fb203b917a486f69514c55be595a
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Sep 27 17:12:19 2012 -0400

    configure: Stop using AM_MAINTAINER_MODE
    
    All this does is make it so editing configure.ac or Makefile.am doesn't
    rebuild the makefiles.  Which is just stupid.
    
    v2: Remove --enable-maintainer-mode from autogen.sh
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/autogen.sh b/autogen.sh
index 4e8b11b..8b6f58f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,4 +9,4 @@ cd $srcdir
 autoreconf --force -v --install || exit 1
 cd $ORIGDIR || exit $?
 
-$srcdir/configure --enable-maintainer-mode "$@"
+$srcdir/configure "$@"
diff --git a/configure.ac b/configure.ac
index 6ec180c..e686614 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,6 @@ RELEASE_DATE="2012-10-04"
 RELEASE_NAME="Horchata"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
 
 # Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS
 m4_ifndef([XORG_MACROS_VERSION],