From: Michael Poole <mdpoole@troilus.org>
Date: Tue, 17 Jan 2012 03:06:49 +0000 (-0500)
Subject: Move m4 support files into m4/ directory.
X-Git-Url: http://git.pk910.de/?p=srvx.git;a=commitdiff_plain;h=d56dbcf40a1fc75bcd0c2ded0d3e314e0c66f67e

Move m4 support files into m4/ directory.

automake 1.11 (or something else new in Ubuntu 11.10) complains if
this is not done.
---

diff --git a/Makefile.am b/Makefile.am
index 72f2302..4653746 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 EXTRA_DIST = FAQ UPGRADE srvx.conf.example sockcheck.conf.example Makefile.win32
 SUBDIRS = @MY_SUBDIRS@
 DIST_SUBDIRS = src rx
+ACLOCAL_AMFLAGS = -I m4
 
 all: srvx
 
diff --git a/configure.in b/configure.in
index f9502d1..cdfb57d 100644
--- a/configure.in
+++ b/configure.in
@@ -8,6 +8,7 @@ AC_CONFIG_HEADERS(src/config.h)
 AC_CONFIG_SRCDIR(src/opserv.c)
 dnl AM_CANONICAL_TARGET must be before AM_INIT_AUTOMAKE() or autoconf whines
 AC_CANONICAL_TARGET
+AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([gnu 1.6])
 AM_MAINTAINER_MODE
 LT_INIT
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 0000000..0f4126c
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1 @@
+*.m4