]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge pull request #6069 from Habbie/no-more-bootstrap
authorPieter Lexis <pieterlexis@users.noreply.github.com>
Thu, 22 Mar 2018 09:47:31 +0000 (10:47 +0100)
committerGitHub <noreply@github.com>
Thu, 22 Mar 2018 09:47:31 +0000 (10:47 +0100)
[WIP] get rid of useless bootstrap scripts; related cleanups

1  2 
README.md
build-scripts/travis.sh
docs/appendices/compiling.rst
pdns/recursordist/README.md

diff --cc README.md
Simple merge
index f175a8c0788d770d7ff2d42549b318847e56696f,11225312f1e80725046521a37e393cb2ca2df733..d515b1fadf5f859b454c8b486fb53a96ee4821e7
@@@ -367,10 -358,10 +367,10 @@@ 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' \
 +    --with-dynmodules='bind gmysql geoip gpgsql gsqlite3 ldap lua mydns opendbx pipe random remote tinydns godbc lua2' \
      --with-modules='' \
      --with-sqlite3 \
      --enable-libsodium \
Simple merge
Simple merge