Merge pull request #1995 from pieterlexis/makefile-to-autoconf

author bert hubert <bert.hubert@netherlabs.nl>

Mon, 29 Dec 2014 11:57:10 +0000 (12:57 +0100)

committer bert hubert <bert.hubert@netherlabs.nl>

Mon, 29 Dec 2014 11:57:10 +0000 (12:57 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Mon, 29 Dec 2014 11:57:10 +0000 (12:57 +0100)
committer bert hubert <bert.hubert@netherlabs.nl>
Mon, 29 Dec 2014 11:57:10 +0000 (12:57 +0100)
diff --cc configure.ac
Simple merge
diff --cc pdns/Makefile.am
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Mon, 29 Dec 2014 11:57:10 +0000 (12:57 +0100)
committer	bert hubert <bert.hubert@netherlabs.nl>
	Mon, 29 Dec 2014 11:57:10 +0000 (12:57 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history