From 4fc6b34d1c14cc61f553ca59264d0909656933f3 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 17 Jan 2013 09:22:05 +0100
Subject: fontconfig libxcb mesa xkbcomp git update 17 jan 2013

fontconfig: 671bcb34e23ed03b1f564af35560db81f8b12b96
libxcb: 0dd8f8d26a758bc385e79d9239bf6ef2e3d7bf13
mesa: 56c01d81094795286828ecb83713e043695e905a
xkbcomp: ed1b90216e59e6b3ac6ac5fd2faca8e056c76caa
---
 xkbcomp/autogen.sh   | 5 +++--
 xkbcomp/configure.ac | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'xkbcomp')

diff --git a/xkbcomp/autogen.sh b/xkbcomp/autogen.sh
index e81f98910..fc34bd55c 100644
--- a/xkbcomp/autogen.sh
+++ b/xkbcomp/autogen.sh
@@ -9,5 +9,6 @@ cd $srcdir
 autoreconf -v --install || exit 1
 cd $ORIGDIR || exit $?
 
-$srcdir/configure --enable-maintainer-mode "$@"
-
+if test -z "$NOCONFIGURE"; then
+    $srcdir/configure "$@"
+fi
diff --git a/xkbcomp/configure.ac b/xkbcomp/configure.ac
index f9175b649..81ec27b2f 100644
--- a/xkbcomp/configure.ac
+++ b/xkbcomp/configure.ac
@@ -24,7 +24,6 @@ AC_PREREQ([2.60])
 AC_INIT([xkbcomp], [1.2.4],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xkbcomp])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
 
 # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
 m4_ifndef([XORG_MACROS_VERSION],
-- 
cgit v1.2.3