Use m4/ macro directory

Keep the relevant m4 macros in-tree.

diff --git a/Makefile.am b/Makefile.am
index 2509206..a61200f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,3 +34,4 @@ DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = NetworkManager.pc
 
+ACLOCAL_AMFLAGS = -I m4

diff --git a/configure.ac b/configure.ac
index 48c931a..c47a7bc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,9 @@ AC_INIT(NetworkManager, 0.7.995, dcbw@redhat.com, NetworkManager)
 AM_INIT_AUTOMAKE([1.9 subdir-objects tar-ustar no-dist-gzip dist-bzip2])
 AM_MAINTAINER_MODE
 
-AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_MACRO_DIR([m4])
+
+AC_CONFIG_HEADERS([config.h])
 
 dnl
 dnl Require programs