Nouveau Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Rhys Kidd <rhyskidd-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Subject: [PATCH xf86-video-nouveau 07/17] config: libtoolize: put macros in AC_CONFIG_MACRO_DIR, 'm4'
Date: Mon, 21 Jan 2019 00:52:13 -0500	[thread overview]
Message-ID: <20190121055223.7891-8-rhyskidd@gmail.com> (raw)
In-Reply-To: <20190121055223.7891-1-rhyskidd-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

As suggested by one tool called by autoreconf. Necessitates change to:
- configure.ac: Call AC_CONFIG_MACRO_DIR()
- Makefile.am: Set ACLOCAL_AMFLAGS = -I m4
- Create placeholder m4 folders
- Update gitignore files

From the autoconf documentation:

 "Starting from version 2.58, autoconf provide the macro AC_CONFIG_MACRO_DIR
  to declare where additional macro files are to be put and found. The
  argument passed to this macro is commonly m4."
  https://autotools.io/autoconf/macros.html

Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>
---
 .gitignore    | 5 -----
 Makefile.am   | 3 +++
 configure.ac  | 1 +
 m4/.gitignore | 5 +++++
 4 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 m4/.gitignore

diff --git a/.gitignore b/.gitignore
index 10aeed9..f7953e3 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/Makefile.am b/Makefile.am
index 032be8a..05e9ec6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,9 @@
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 AUTOMAKE_OPTIONS = foreign
+
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = src man
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
diff --git a/configure.ac b/configure.ac
index 3b09c01..0323adf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,7 @@ AC_DEFINE_UNQUOTED([NV_DRIVER_DATE],
 
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR(.)
 
 AM_INIT_AUTOMAKE([dist-bzip2])
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
-- 
2.19.1

_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau

  parent reply	other threads:[~2019-01-21  5:52 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-21  5:52 [PATCH xf86-video-nouveau 00/17] autotools configuration cleanups Rhys Kidd
     [not found] ` <20190121055223.7891-1-rhyskidd-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 01/17] config: Fix typo in comment Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 02/17] config, nv: Use xorg-macros PACKAGE_VERSION_{MAJOR, MINOR, PATCHLEVEL} Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 03/17] config: Only check for presence of libdrm package once Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 04/17] config: Rely upon list.h as at least xorg-server 1.8 required Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 05/17] config: remove AC_PROG_CC as it overrides AC_PROG_C_C99 Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 06/17] gitignore: Update to mirror modern X.org drivers Rhys Kidd
2019-01-21  5:52   ` Rhys Kidd [this message]
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 08/17] config: Use XORG_DEFAULT_OPTIONS which replaces six XORG_* macros Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 09/17] config: remove unrequired AC_HEADER_STDC Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 10/17] config: Utilize util-macros 1.8 for additional man page support Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 11/17] config: Use LT_INIT option instead of AC_DISABLE_STATIC Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 12/17] config: Add comments for main statements Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 13/17] config: Remove unrequired AC_SUBST for LIBDRM_NOUVEAU and LIBUDEV Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 14/17] config: remove unused sdkdir=$(pkg-config...) statement Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 15/17] config: Set automake options consistently in one location Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 16/17] config: Complete bug report URL for Xorg DDX nouveau driver Rhys Kidd
2019-01-21  5:52   ` [PATCH xf86-video-nouveau 17/17] config: Suggest upstream to find macros in case they are missing Rhys Kidd
2019-01-22  2:30   ` [PATCH xf86-video-nouveau 00/17] autotools configuration cleanups Ilia Mirkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190121055223.7891-8-rhyskidd@gmail.com \
    --to=rhyskidd-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox