From: Kees Monshouwer Date: Tue, 30 Apr 2013 21:07:42 +0000 (+0200) Subject: move random backend to modules X-Git-Tag: auth-3.3-rc1~38^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb4a57397f03a506e8ba64880cc8d6f2aa22fad6;p=thirdparty%2Fpdns.git move random backend to modules --- diff --git a/.travis.yml b/.travis.yml index 8908b4d326..b37d410bdf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ before_script: - sudo apt-get install -qq libboost-all-dev libtolua-dev bc libcdb-dev libnet-dns-perl ldnsutils dnsutils script: - ./bootstrap - - ./configure --with-modules='gmysql' --with-sqlite3 + - ./configure --with-modules='gmysql random' --with-dynmodules='' --with-sqlite3 - make -j 4 - cd regression-tests - touch verify-dnssec-zone/skip diff --git a/configure.ac b/configure.ac index b9b97f88a2..2483932d8e 100644 --- a/configure.ac +++ b/configure.ac @@ -271,7 +271,7 @@ fi -modules="gmysql geo" +modules="gmysql geo random" AC_ARG_WITH(modules, AC_HELP_STRING([--with-modules],[which backends to compile with]), [ modules="$withval" @@ -738,4 +738,5 @@ modules/gpgsqlbackend/Makefile modules/ldapbackend/Makefile \ modules/gsqlite3backend/Makefile \ modules/goraclebackend/Makefile modules/mydnsbackend/Makefile \ modules/luabackend/Makefile modules/tinydnsbackend/Makefile \ -modules/remotebackend/Makefile) +modules/remotebackend/Makefile \ +modules/randombackend/Makefile) diff --git a/modules/Makefile.am b/modules/Makefile.am index e6e84adfa5..f263da0995 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -1,2 +1,2 @@ SUBDIRS=@moduledirs@ -DIST_SUBDIRS=db2backend geobackend gmysqlbackend godbcbackend goraclebackend gpgsqlbackend gsqlite3backend ldapbackend luabackend mydnsbackend opendbxbackend oraclebackend pipebackend xdbbackend tinydnsbackend remotebackend +DIST_SUBDIRS=db2backend geobackend gmysqlbackend godbcbackend goraclebackend gpgsqlbackend gsqlite3backend ldapbackend luabackend mydnsbackend opendbxbackend oraclebackend pipebackend xdbbackend tinydnsbackend remotebackend randombackend diff --git a/modules/randombackend/Makefile.am b/modules/randombackend/Makefile.am new file mode 100644 index 0000000000..4ca7a4f9f5 --- /dev/null +++ b/modules/randombackend/Makefile.am @@ -0,0 +1,5 @@ +AM_CPPFLAGS=@THREADFLAGS@ +lib_LTLIBRARIES = librandombackend.la + +librandombackend_la_SOURCES=randombackend.cc +librandombackend_la_LDFLAGS=-module -avoid-version diff --git a/modules/randombackend/OBJECTFILES b/modules/randombackend/OBJECTFILES new file mode 100644 index 0000000000..c46b6efc17 --- /dev/null +++ b/modules/randombackend/OBJECTFILES @@ -0,0 +1 @@ +randombackend.o diff --git a/modules/randombackend/OBJECTLIBS b/modules/randombackend/OBJECTLIBS new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pdns/randombackend.cc b/modules/randombackend/randombackend.cc similarity index 93% rename from pdns/randombackend.cc rename to modules/randombackend/randombackend.cc index f8acd280e9..6b2fac8e83 100644 --- a/pdns/randombackend.cc +++ b/modules/randombackend/randombackend.cc @@ -16,13 +16,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "utility.hh" -#include "dnsbackend.hh" -#include "dns.hh" -#include "dnsbackend.hh" -#include "dnspacket.hh" -#include "ahuexception.hh" -#include "logger.hh" +#include "pdns/utility.hh" +#include "pdns/dnsbackend.hh" +#include "pdns/dns.hh" +#include "pdns/dnsbackend.hh" +#include "pdns/dnspacket.hh" +#include "pdns/ahuexception.hh" +#include "pdns/logger.hh" #include /* FIRST PART */ diff --git a/pdns/Makefile.am b/pdns/Makefile.am index a7655eda6c..f8fd23b954 100644 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@ -52,7 +52,7 @@ ueberbackend.hh pdns.conf-dist ws.hh ws.cc webserver.cc webserver.hh \ session.cc session.hh misc.cc misc.hh receiver.cc ueberbackend.cc \ dynlistener.cc dynlistener.hh dynhandler.cc dynhandler.hh \ resolver.hh resolver.cc slavecommunicator.cc mastercommunicator.cc communicator.cc communicator.hh dnsproxy.cc \ -dnsproxy.hh randombackend.cc unix_utility.cc common_startup.cc \ +dnsproxy.hh unix_utility.cc common_startup.cc \ utility.hh iputils.hh common_startup.hh unix_semaphore.cc \ backends/bind/bindbackend2.cc backends/bind/binddnssec.cc bind-dnssec.schema.sqlite3.sql.h \ backends/bind/bindparser.cc backends/bind/bindlexer.c \ @@ -103,7 +103,7 @@ pdnssec_SOURCES=pdnssec.cc dbdnsseckeeper.cc sstuff.hh dnsparser.cc dnsparser.hh backends/bind/bindparser.cc backends/bind/bindlexer.c \ backends/gsql/gsqlbackend.cc \ backends/gsql/gsqlbackend.hh backends/gsql/ssql.hh zoneparser-tng.cc \ - dynlistener.cc dns.cc randombackend.cc dnssecsigner.cc polarrsakeyinfra.cc md5.cc \ + dynlistener.cc dns.cc dnssecsigner.cc polarrsakeyinfra.cc md5.cc \ signingpipe.cc dnslabeltext.cc ednssubnet.cc cachecleaner.hh \ aes/aescpp.h \ aes/aescrypt.c aes/aes.h aes/aeskey.c aes/aes_modes.c aes/aesopt.h \