xf86-video-amdgpu: Branch 'master' - 2 commits

[GitLab Mirror]

 .gitignore    |    5 -----
 configure.ac  |    2 +-
 m4/.gitignore |    5 +++++
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 34e851d1f284da5afcfe449f349cf1eb5e962408
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Aug 24 17:18:10 2018 +0200

    Use AC_CONFIG_MACRO_DIR instead of AC_CONFIG_MACRO_DIRS
    
    Older versions of autoconf only supported the former.
    
    (Cherry picked from radeon commit cba8fe4d64819aaa8ba516aa68dbe6d2aa153046)
    Acked-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/configure.ac b/configure.ac
index 1ab5a7a..8671cdf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_INIT([xf86-video-amdgpu],
 
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_MACRO_DIRS([m4])
+AC_CONFIG_MACRO_DIR([m4])
 
 AC_CONFIG_AUX_DIR(.)
 
commit afdfa2a1b6d4b594e0ed345b32279d4a2fd5e188
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Aug 24 17:17:43 2018 +0200

    Add m4 directory
    
    Although normally it only warns about it, under some circumstances,
    aclocal can error out if this directory doesn't exist.
    
    Reported-by: John Lumby <johnlumby at hotmail.com>
    (Cherry picked from radeon commit 7b01c10137aba24c8f61dd9b2a19ea257ad24371)
    Acked-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/.gitignore b/.gitignore
index 38da47d..0397812 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,12 +26,7 @@ INSTALL
 install-sh
 .libs/
 libtool
-libtool.m4
 ltmain.sh
-lt~obsolete.m4
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
 Makefile
 Makefile.in
 mdate-sh
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 0000000..464ba5c
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,5 @@
+libtool.m4
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4