From 48c7cae9cc2cc48bcc2c1336dcffecf73cc88fc0 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Thu, 7 Dec 2017 21:44:39 +0100 Subject: [PATCH] get rid of useless bootstrap scripts; related cleanups --- README.md | 2 +- bootstrap | 2 -- build-scripts/dist-recursor | 2 +- build-scripts/jenkins/auth-git | 2 +- build-scripts/travis.sh | 2 +- docs/appendices/compiling.rst | 2 +- pdns/README-dnsdist.md | 7 +++++-- pdns/recursordist/README.md | 2 +- pdns/recursordist/bootstrap | 1 - pdns/recursordist/docs/appendices/compiling.rst | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) delete mode 100755 bootstrap delete mode 120000 pdns/recursordist/bootstrap diff --git a/README.md b/README.md index eba419fa31..de58eefb6f 100644 --- 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 index 442cb4f28e..0000000000 --- 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 859ac733aa..fa365ddf77 100755 --- 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 4a24ebac83..51a9bb1049 100755 --- 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 0c6dc42ee6..11225312f1 100755 --- 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 8a2239f9aa..011334cd3a 100644 --- 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 `__ and run ``./bootstrap`` in the clone. +If you want the bleeding edge, you can clone the `repository at GitHub `__ and run ``autoreconf -vi`` in the clone. You can also download snapshot tarballs `here `__. diff --git a/pdns/README-dnsdist.md b/pdns/README-dnsdist.md index 6c61430f54..296e56df0a 100644 --- 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 4dd758dd4b..2a1ad4d21b 100644 --- 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 index b17b398013..0000000000 --- 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 22abd92839..884c674c79 100644 --- 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 `__ and run ``./bootstrap`` in the ``pdns/recursordist`` directory of the clone. +If you want the bleeding edge, you can clone the `repository at GitHub `__ and run ``autoreconf -vi`` in the ``pdns/recursordist`` directory of the clone. You can also download snapshot tarballs `here `__. -- 2.47.2