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 72f2302f1d5b359aa1d806c191a8d151333b89ab..46537468b6acfcd43d6bf64167e8d8372b42f4f2 100644 (file)
--- 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 f9502d105b6b54c00dbee74f3e9482d228dcda1d..cdfb57d11b156bae95251acce05999a4d442ec3f 100644 (file)
--- 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 (file)
index 0000000..0f4126c
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1 @@
+*.m4