Build System: Handle local macros via AC_CONFIG_MACRO_DIRS

According to [1], this is the recommended way of handling local macros.

For some packagers, using the previous way broke autoreconf.

[1]: <https://www.gnu.org/software/automake/manual/html_node/Local-Macros.html>

diff --git a/autogen.sh b/autogen.sh
index 95bc89620d27eb5b2c69d6db746613b47a917ab2..93bd973b53ee76be9e7a16c31d5360dcc7ab12ea 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -78,7 +78,7 @@ parse_options "$@"
 
 cd $TOP_DIR
 
-run_or_die $ACLOCAL -I m4
+run_or_die $ACLOCAL
 run_or_die $AUTOHEADER
 run_or_die $AUTOCONF
 

diff --git a/configure.ac b/configure.ac
index dfebb143953bde74e140e4a9e76b384f284a0f95..36095e2bf7ad011ef0366fd7cd35cc18a524063c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,7 @@ AC_PREREQ([2.69])
 AC_INIT([libmowgli-2],[2.1.3],[https://github.com/atheme/libmowgli-2])
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_HEADER([src/libmowgli/platform/autoconf.h])
+AC_CONFIG_MACRO_DIR([m4])
 
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET