Use dedicated m4 dir, update deprecated macros.

evharten · May 4, 2013 · 1c48ac8 · 1c48ac8
1 parent be1bd36
commit 1c48ac8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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 → m4/boost.m4 b/boost.m4 → m4/boost.m4