From: Justin Clift <jclift@redhat.com>
Date: Sat, 4 May 2013 16:31:13 +0000 (+0100)
Subject: Use dedicated m4 dir, update deprecated macros.
X-Git-Tag: auth-3.3-rc1~123^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F766%2Fhead;p=thirdparty%2Fpdns.git

Use dedicated m4 dir, update deprecated macros.
---

diff --git a/Makefile.am b/Makefile.am
index 1aebf67176..3d59fac96b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ codedocs/Makefile codedocs/doxygen.conf contrib/powerdns.solaris.init.d \
 contrib/systemd-pdns.service contrib/systemd-pdns-recursor.service \
 bootstrap build-scripts/semistaticg++
 
-ACLOCAL_AMFLAGS = -I.
+ACLOCAL_AMFLAGS = -I m4
 
 man8_MANS=pdns/docs/pdns_control.8 pdns/docs/pdns_server.8 pdns/docs/zone2sql.8 
 
diff --git a/configure.ac b/configure.ac
index 813cb6884b..b7b4ae49f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,9 @@ AC_INIT([pdns],[3.2])
 AC_CONFIG_SRCDIR([pdns/receiver.cc])
 AM_INIT_AUTOMAKE([tar-ustar])
 AC_CANONICAL_HOST
-AM_CONFIG_HEADER(config.h)
+LT_INIT
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_HEADERS([config.h])
 AC_C_BIGENDIAN
 AC_PREREQ(2.52)
 : ${CXXFLAGS="-Wall -O2"}
diff --git a/boost.m4 b/m4/boost.m4
similarity index 100%
rename from boost.m4
rename to m4/boost.m4