Merge branch 'modules' of github.com:mind04/pdns into mind04-modules

Conflicts:
	.travis.yml

diff --cc .travis.yml
index d6080c0ce2cff7ef6c1457c4684d4d01fff17369,b37d410bdf105c7b13cd6f6de1e971b58b3ca708..d20b425f96882e3291cbd7e24af03f7cbb058364
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -3,18 -3,12 +3,18 @@@ compiler
    - gcc
  before_script:
   - sudo apt-get update -qq
 - - sudo apt-get install -qq libboost-all-dev libtolua-dev bc libcdb-dev libnet-dns-perl ldnsutils dnsutils
 + - sudo apt-get install -qq libboost-all-dev libtolua-dev bc libcdb-dev libnet-dns-perl ldnsutils dnsutils libtool libcdb-dev xmlto dblatex links
  script:
   - ./bootstrap
-  - ./configure --with-modules='gmysql tinydns' --with-sqlite3 --enable-unit-tests
 - - ./configure --with-modules='gmysql random' --with-dynmodules='' --with-sqlite3
++ - ./configure --with-modules='gmysql tinydns random' --with-sqlite3 --enable-unit-tests
 + - make dist
   - make -j 4
 - - cd regression-tests
 + - cd pdns
 + - make testrunner
 + - ./testrunner
 + - cd docs
 + - make
 + - cd ../../regression-tests
   - touch verify-dnssec-zone/skip
   - ./start-test-stop 5300 bind
   - ./start-test-stop 5300 bind-presigned

diff --cc configure.ac
Simple merge

diff --cc pdns/Makefile.am
Simple merge