dri2proto: Branch 'master' - 3 commits

[Gaetan Nadon]

 Makefile.am  |    3 ++-
 configure.ac |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit c34ce137fdb21fc9a52bb8d5a0c25e3c5d79e687
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Sun Mar 28 19:25:52 2010 -0400

    config: update AC_PREREQ statement to 2.60
    
    Unrelated to the previous patches, the new value simply reflects
    the reality that the minimum level for autoconf to configure
    all x.org modules is 2.60 dated June 2006.
    
    ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
    
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>

diff --git a/configure.ac b/configure.ac
index c5affe3..5b78d6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
 AC_INIT([DRI2Proto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
commit 1c1456e1517d28ffbd844b00090596c21d9a9d9b
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Sun Mar 28 19:00:30 2010 -0400

    config: remove the pkgconfig pc.in file from EXTRA_DIST
    
    Automake always includes it in the tarball.
    
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>

diff --git a/Makefile.am b/Makefile.am
index 2440162..5990273 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,6 @@ pkgconfig_DATA = dri2proto.pc
 
 dist_doc_DATA = dri2proto.txt
 
-EXTRA_DIST = dri2proto.pc.in
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
commit 70e5dee9a600e67057c55ab9b1b975f20a68682d
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Sun Mar 28 17:35:44 2010 -0400

    config: install and distribute dri2proto.txt
    
    It will now be installed in $docdir in addition
    to being distributed in the tarball.
    
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>

diff --git a/Makefile.am b/Makefile.am
index 153b422..2440162 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,9 @@ dri2_HEADERS = dri2proto.h dri2tokens.h
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dri2proto.pc
 
-EXTRA_DIST = dri2proto.pc.in dri2proto.txt
+dist_doc_DATA = dri2proto.txt
+
+EXTRA_DIST = dri2proto.pc.in
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL