[gnome-ostree] 3.6: Rebase xserver autogen patch

[Colin Walters <walters src gnome org>]

commit c324bf3ada30dba4c806f166202704a6cf234b23
Author: Colin Walters <walters verbum org>
Date:   Thu Oct 4 16:43:59 2012 -0400

    3.6: Rebase xserver autogen patch

 gnomeos-3.6.json                   |    2 +-
 patches/xorg-xserver-autogen.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/gnomeos-3.6.json b/gnomeos-3.6.json
index 8641c36..6de531a 100644
--- a/gnomeos-3.6.json
+++ b/gnomeos-3.6.json
@@ -389,7 +389,7 @@
 		 "patches": ["xkeyboard-config-autogen.patch"]},
 
 		{"src": "fd:xorg/xserver",
-		 "patches": ["xorg-autogen.patch"]},
+		 "patches": ["xorg-xserver-autogen.patch"]},
 
 		{"src": "fd:xorg/driver/xf86-input-keyboard",
 		 "patches": ["xorg-autogen.patch"]},
diff --git a/patches/xorg-xserver-autogen.patch b/patches/xorg-xserver-autogen.patch
new file mode 100644
index 0000000..899afdd
--- /dev/null
+++ b/patches/xorg-xserver-autogen.patch
@@ -0,0 +1,31 @@
+From 2e1de5a8e272554d134d9866c8e9362c2be2b0b7 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Wed, 4 Jan 2012 17:37:06 -0500
+Subject: [PATCH] autogen.sh: Honor NOCONFIGURE=1
+
+(Also while we have the patient open, use exec instead of hanging
+ around uselessly in waitpid)
+
+http://people.gnome.org/~walters/docs/build-api.txt
+
+Reviewed-by: Adam Jackson <ajax redhat com>
+Signed-off-by: Colin Walters <walters verbum org>
+---
+ autogen.sh | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index 8b6f58f..dd0731a 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -9,4 +9,6 @@ cd $srcdir
+ autoreconf --force -v --install || exit 1
+ cd $ORIGDIR || exit $?
+ 
+-$srcdir/configure "$@"
++if test -z "$NOCONFIGURE"; then
++    exec $srcdir/configure "$@"
++fi
+-- 
+1.7.11.4
+