From: Christian Hofstaedtler Date: Sun, 29 Jun 2014 13:47:44 +0000 (+0200) Subject: Integrate HACKING into README X-Git-Tag: auth-3.4.0-rc1~115^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1493%2Fhead;p=thirdparty%2Fpdns.git Integrate HACKING into README --- diff --git a/HACKING b/HACKING deleted file mode 100644 index adc62ee049..0000000000 --- a/HACKING +++ /dev/null @@ -1,13 +0,0 @@ -PowerDNS has moved to GitHub, the repository is at https://github.com/PowerDNS/pdns - -Then: - -$ ./bootstrap - -you may need to do that twice. You also need libtool-1.4, 1.3 won't work. -Automake 1.6 is (almost) required. - -Send any patches you may have to the mailinglist: - pdns-dev@mailman.powerdns.com - -Thanks! diff --git a/Makefile.am b/Makefile.am index fc6a6e4503..2e08c1f842 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS=modules codedocs @programdescend@ DIST_SUBDIRS=modules codedocs pdns pdns/ext/rapidjson -EXTRA_DIST=README HACKING INSTALL NOTICE debian-pdns/* pdns.spec \ +EXTRA_DIST=README INSTALL NOTICE debian-pdns/* pdns.spec \ codedocs/doxygen.conf contrib/powerdns.solaris.init.d \ contrib/systemd-pdns.service contrib/systemd-pdns-recursor.service \ bootstrap build-scripts/semistaticg++ pdns/docs/dnstcpbench.1 \ diff --git a/README.md b/README.md index 6dda811e41..3b5a724d5c 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,14 @@ PowerDNS Authoritative Server 3.0 and beyond depend on Boost. On Debian 7.0, the following is useful: apt-get install autoconf automake bison flex g++ git libboost-all-dev libtool make pkg-config ragel - + +If you build from git, first build configure: + + $ ./bootstrap + +(You may need to do that twice. You also need libtool-1.4, 1.3 won't work. +Automake 1.6 or newer is required, too.) + To compile a very clean version, use: $ ./configure --with-modules="" --without-lua diff --git a/pdns/docs/pdns.xml b/pdns/docs/pdns.xml index 53d1ba6f49..d552cd6396 100644 --- a/pdns/docs/pdns.xml +++ b/pdns/docs/pdns.xml @@ -17290,10 +17290,10 @@ This setting will make PowerDNS renotify the slaves after an AXFR is *received* - Q: I'm trying to build from SVN but I get lots of weird errors! + Q: I'm trying to build from Git but I get lots of weird errors! - A: Read the 'HACKING' file, it lists the build requirements (mostly autoconf, automake, libtool). In many cases, + A: Read the 'README' file, it lists the build requirements (mostly autoconf, automake, libtool). In many cases, it may be easier to build from the source distribution though. More information for developers is available on the PowerDNS Open Source Community Wiki.