Move auto-added m4 files to auto-m4/ subdir

ndim · ndim · commit a67c6ef73fd8 · 2024-02-20T06:20:58.000+01:00
Have the autotools place their m4 files into the auto-m4/
subdir to separate them from our own m4 files.

Not using AC_CONFIG_MACRO_DIRS for backwards compatibility.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -248,4 +248,4 @@ backup-avrdude-conf:
 			${DESTDIR}${sysconfdir}/avrdude.conf.bak; \
 	fi
 
-ACLOCAL_AMFLAGS = -I m4 -I build-helpers
+ACLOCAL_AMFLAGS = -I auto-m4 -I build-helpers
diff --git a/src/auto-m4/.gitignore b/src/auto-m4/.gitignore
@@ -0,0 +1,2 @@
+# Ensure creation of empty directory for autotools to place files into
+*
diff --git a/src/configure.ac b/src/configure.ac
@@ -53,7 +53,7 @@ AC_INIT([avrdude],
 AC_CONFIG_SRCDIR([main.c])
 AC_CONFIG_AUX_DIR([auto-aux])
 AC_CONFIG_HEADERS([ac_cfg.h])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIR([auto-m4])
 
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Ensure creation of empty directory for autotools to place files into`
	`2`	`+*`