Revert "No need to use m4"

This reverts commit 9e63cb10f869e9f7127f98a45917267072974a7b.

diff --git a/Makefile.am b/Makefile.am
index 5158746f97520ba577a859fb651ee15baf8d8383..4370355c34b88fb149ddf7d296bfc265bbb622cb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AM_MAKEFLAGS = --no-print-directory
 AUTOMAKE_OPTIONS = color-tests
 
@@ -102,4 +102,4 @@ SED_PROCESS = \
                < $< > $@
 
 nitsi: nitsi.in Makefile
-       $(SED_PROCESS)
+       $(SED_PROCESS)
\ No newline at end of file

diff --git a/configure.ac b/configure.ac
index f53e47d6fa74407705ee4b69a6e5f9cb34e364c0..279309bf538dd54021732a6571a4bace8020f557 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,7 @@ AC_INIT([nitsi],
        [nitsi],
        [https://git.ipfire.org/pub/git/people/jschlag/nitsi.git])
 
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 
 AC_PREFIX_DEFAULT([/usr])
@@ -62,4 +63,4 @@ AC_MSG_RESULT([
        sysconfdir:             ${sysconfdir}
 
        Generate man-pages:     ${have_manpages}
-])
+])
\ No newline at end of file