use m4/ autoconf subdirectory

diff --git a/Makefile.am b/Makefile.am
index 172949977132464d57beef95afa80a5c485be8fb..8082bd8e8b857431e7eae880cbb1e4ef5d7786a8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,8 @@ if USE_SCRIPTS
   SUBDIRS += scripts
 endif
 
+ACLOCAL_AMFLAGS = -I m4/config m4/macros m4
+
 EXTRA_DIST = Doxyfile.in CREDITS
 CLEANFILES = apidoc Doxyfile
 

diff --git a/configure.in b/configure.in
index 7d507966e7308a0531537d9c01df0a3bb576d228..514cc5a4fe058ca413125a64a981e8a0d596d446 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,6 +18,7 @@ dnl ===========================
 
 AC_INIT(strongSwan,4.3.5)
 AM_INIT_AUTOMAKE(tar-ustar)
+AC_CONFIG_MACRO_DIR([m4/config])
 AC_SUBST(confdir, '${sysconfdir}')
 PKG_PROG_PKG_CONFIG