get rid of useless bootstrap scripts; related cleanups

diff --git a/README.md b/README.md
index eba419fa3143c3df284ebec2b6142d2704869532..de58eefb6fc5d9103b38effbd0606ded3966c773 100644 (file)
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ When building from git, the following packages are also required: autoconf, auto
 ragel, bison and flex, then generate the configure file:
 
 ```
-$ ./bootstrap
+$ autoreconf -vi
 ```
 
 To compile a very clean version, use:

diff --git a/bootstrap b/bootstrap
deleted file mode 100755 (executable)
index 442cb4f..0000000
--- a/bootstrap
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-autoreconf -vi

diff --git a/build-scripts/dist-recursor b/build-scripts/dist-recursor
index 859ac733aa1f02fffa8f54e09fc6c5e5d97711ce..fa365ddf77abc4195e9d6289eafb565bd2274c0b 100755 (executable)
--- a/build-scripts/dist-recursor
+++ b/build-scripts/dist-recursor
@@ -10,6 +10,6 @@ set -x
 
 cd pdns/recursordist
 
-./bootstrap
+autoreconf -vi
 ./configure
 make dist

diff --git a/build-scripts/jenkins/auth-git b/build-scripts/jenkins/auth-git
index 4a24ebac83fed492b431b0d76a3c4a8e255055ed..51a9bb10495e7bd3813058218345c4623b80b961 100755 (executable)
--- a/build-scripts/jenkins/auth-git
+++ b/build-scripts/jenkins/auth-git
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -ex
 BUILDING_PRODUCT=auth ./build-scripts/jenkins-driver
-./bootstrap
+autoreconf -vi
 CC="ccache gcc" CXX="ccache g++" ./configure --with-modules='gmysql gpgsql gsqlite3 ldap lua mydns opendbx pipe remote tinydns random '$([ -d modules/bindbackend ] && echo bind) --enable-remotebackend-http --enable-unit-tests
 make dist
 #cd pdns; ./dist-recursor; cd ..

diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh
index 0c6dc42ee639aeab7d48d8e57d5445087a882e4c..11225312f1e80725046521a37e393cb2ca2df733 100755 (executable)
--- a/build-scripts/travis.sh
+++ b/build-scripts/travis.sh
@@ -358,7 +358,7 @@ install_dnsdist() {
 }
 
 build_auth() {
-  run "./bootstrap"
+  run "autoreconf -vi"
   # Build without --enable-botan, no botan 2.x in Travis CI
   run "CFLAGS='-O1' CXXFLAGS='-O1' ./configure \
     --with-dynmodules='bind gmysql geoip gpgsql gsqlite3 ldap lua mydns opendbx pipe random remote tinydns godbc' \

diff --git a/docs/appendices/compiling.rst b/docs/appendices/compiling.rst
index 8a2239f9aac0b52a6dd4a2f8aad52b8b608242c1..011334cd3a841ee1d401c93d47c70638d47052bf 100644 (file)
--- a/docs/appendices/compiling.rst
+++ b/docs/appendices/compiling.rst
@@ -24,7 +24,7 @@ Getting the sources
 
 There are 3 ways of getting the source.
 
-If you want the bleeding edge, you can clone the `repository at GitHub <https://github.com/PowerDNS/pdns>`__ and run ``./bootstrap`` in the clone.
+If you want the bleeding edge, you can clone the `repository at GitHub <https://github.com/PowerDNS/pdns>`__ and run ``autoreconf -vi`` in the clone.
 
 You can also download snapshot tarballs `here <https://downloads.powerdns.com/autobuilt_browser/#/auth>`__.
 

diff --git a/pdns/README-dnsdist.md b/pdns/README-dnsdist.md
index 6c61430f54bf1a7229464272d623894e06e06a06..296e56df0a106ad5e98c30a8c8e5de120459705c 100644 (file)
--- a/pdns/README-dnsdist.md
+++ b/pdns/README-dnsdist.md
@@ -9,6 +9,10 @@ interface.
 
 All `dnsdist` features are documented at [dnsdist.org](http://dnsdist.org).
 
+## Compiling from git
+
+Make sure to `autoreconf -vi` before running `configure`.
+
 ## macOS Notes
 
 Install dependencies from Homebrew:
@@ -17,10 +21,9 @@ Install dependencies from Homebrew:
 $ brew install autoconf automake boost libedit libsodium libtool lua pkg-config protobuf
 ```
 
-Bootstrap and let configure know where to find libedit:
+Let configure know where to find libedit:
 
 ```
-$ ./bootstrap
 $ ./configure 'PKG_CONFIG_PATH=/usr/local/opt/libedit/lib/pkgconfig'
 $ make
 ```

diff --git a/pdns/recursordist/README.md b/pdns/recursordist/README.md
index 4dd758dd4b836996023d2e10330bc312439dded4..2a1ad4d21b6ed1b2e4cf146b8741ad89b45fe99e 100644 (file)
--- a/pdns/recursordist/README.md
+++ b/pdns/recursordist/README.md
@@ -44,7 +44,7 @@ Then run
 
 ```
 $ cd pdns/pdns/recursordist/
-$ ./bootstrap
+$ autoreconf -vi
 $ ./configure
 $ make
 ```

diff --git a/pdns/recursordist/bootstrap b/pdns/recursordist/bootstrap
deleted file mode 120000 (symlink)
index b17b398..0000000
--- a/pdns/recursordist/bootstrap
+++ /dev/null
@@ -1 +0,0 @@
-../../bootstrap
\ No newline at end of file

diff --git a/pdns/recursordist/docs/appendices/compiling.rst b/pdns/recursordist/docs/appendices/compiling.rst
index 22abd928396f0e8ab5f17ab864cd07d087d86f83..884c674c7921729735a6c4656fdd26f18cdb051b 100644 (file)
--- a/pdns/recursordist/docs/appendices/compiling.rst
+++ b/pdns/recursordist/docs/appendices/compiling.rst
@@ -14,7 +14,7 @@ Getting the sources
 
 There are 3 ways of getting the source.
 
-If you want the bleeding edge, you can clone the `repository at GitHub <https://github.com/PowerDNS/pdns>`__ and run ``./bootstrap`` in the ``pdns/recursordist`` directory of the clone.
+If you want the bleeding edge, you can clone the `repository at GitHub <https://github.com/PowerDNS/pdns>`__ and run ``autoreconf -vi`` in the ``pdns/recursordist`` directory of the clone.
 
 You can also download snapshot tarballs `here <https://downloads.powerdns.com/autobuilt_browser/#/recursor>`__.