xf86-video-ati: Branch 'master' - 3 commits

[Michel Dänzer]

 Makefile.am  |    2 ++
 autogen.sh   |    2 +-
 configure.ac |    1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 377c9dc7e51cc8ebd06816b08682a8098a49508a
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Jul 27 15:27:54 2017 +0900

    autogen.sh: Pass -f to autoreconf
    
    To ensure that any existing copies of autotools files will be replaced
    with the current versions.
    
    (Cherry picked from amdgpu commit a47c0093338d80d84e7033ad15d051925d542ca0)
    Acked-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/autogen.sh b/autogen.sh
index a98269f7..49d14c62 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=.
 ORIGDIR=`pwd`
 cd "$srcdir"
 
-autoreconf -v --install || exit 1
+autoreconf -f -v --install || exit 1
 cd "$ORIGDIR" || exit $?
 
 git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
commit bf0a759e3bced3a93bead033a26871cc340bd309
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Jul 27 15:26:23 2017 +0900

    Makefile.am: Set ACLOCAL_AMFLAGS = -I m4
    
    Suggested by one of the tools called by autoreconf.
    
    (Cherry picked from amdgpu commit 842bad4b951296ca25f47b50cb358e502bf30ebb)
    Acked-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/Makefile.am b/Makefile.am
index f0e2c3ce..b8d99f32 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,8 @@
 SUBDIRS = src man conf
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
+ACLOCAL_AMFLAGS = -I m4
+
 .PHONY: ChangeLog INSTALL
 
 INSTALL:
commit e628f604d032d32971a1ca8670469e88939e3de2
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Jul 27 15:24:37 2017 +0900

    Add AC_CONFIG_MACRO_DIRS([m4]) to configure.ac
    
    Suggested by one of the tools called by autoreconf.
    
    (Cherry picked from amdgpu commit 227b399badaad9bbef0be5a776ce008d0d243449)
    Acked-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/configure.ac b/configure.ac
index 700e01a5..c9bc0a95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,7 @@ AC_INIT([xf86-video-ati],
 
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIRS([m4])
 
 AC_CONFIG_AUX_DIR(.)