[network-manager-openvpn/NETWORKMANAGER_0_7] Use m4/ macro directory

[Michael Biebl <mbiebl src gnome org>]

commit 40ece2dc92118039d99886e7a8a1585f28786c1c
Author: Michael Biebl <biebl debian org>
Date:   Wed Apr 22 01:24:30 2009 +0200

    Use m4/ macro directory
    
    Keep the relevant m4 macros in-tree.
---
 Makefile.am  |    2 ++
 configure.ac |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c6ca85c..06dc70d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,3 +35,5 @@ EXTRA_DIST = nm-openvpn-service.name.in \
 
 CLEANFILES = $(nmvpnservice_DATA) $(desktop_DATA) *~
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
+
+ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index edbe260..76a0678 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,8 @@ AC_CONFIG_AUX_DIR(.)
 AM_INIT_AUTOMAKE([subdir-objects no-dist-gzip dist-bzip2])
 AM_MAINTAINER_MODE
 
+AC_CONFIG_MACRO_DIR([m4])
+
 AC_CONFIG_HEADERS([config.h])
 
 dnl