summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRhys Kidd <rhyskidd@gmail.com>2019-01-21 00:52:13 -0500
committerIlia Mirkin <imirkin@alum.mit.edu>2019-01-21 21:29:55 -0500
commit945f95775a21cbcc721b579f7dc220f1474d1d25 (patch)
tree1ad9d6363c156c97f74f18637742ff5a67d82d71
parent9b60c3bc74c69d607d44c864f60f5fda0b11cd48 (diff)
config: libtoolize: put macros in AC_CONFIG_MACRO_DIR, 'm4'
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>
-rw-r--r--.gitignore5
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac1
-rw-r--r--m4/.gitignore5
4 files changed, 9 insertions, 5 deletions
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