aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-08-16 23:26:56 +0200
committerChristian Grothoff <christian@grothoff.org>2020-08-16 23:26:56 +0200
commite856a517bde24b4766097bc5c424ec548d11e301 (patch)
tree773174148946f344f830048caee364a38f56926f
parenta065c0fb4caa2e4f9f19eaf52f28f7893d49db6d (diff)
parentcadd7feeb2fc23796601db1744812e38432661df (diff)
downloadgnunet-e856a517bde24b4766097bc5c424ec548d11e301.tar.gz
gnunet-e856a517bde24b4766097bc5c424ec548d11e301.zip
Merge branch 'master' of git+ssh://gnunet.org/gnunet
-rwxr-xr-x.buildbot/build.sh4
-rwxr-xr-xbootstrap4
2 files changed, 3 insertions, 5 deletions
diff --git a/.buildbot/build.sh b/.buildbot/build.sh
index 394558ff0..f2cdb3f2a 100755
--- a/.buildbot/build.sh
+++ b/.buildbot/build.sh
@@ -1,5 +1,3 @@
1#!/bin/bash 1#!/bin/bash
2 2
3./bootstrap 3./bootstrap && ./configure --prefix=/tmp/gnunet --enable-experimental && make
4./configure --prefix=/tmp/gnunet --enable-experimental
5make
diff --git a/bootstrap b/bootstrap
index b4f5b4dc3..df0e58dda 100755
--- a/bootstrap
+++ b/bootstrap
@@ -79,8 +79,8 @@ check_libtool()
79 existence libtoolize || \ 79 existence libtoolize || \
80 existence glibtoolize || \ 80 existence glibtoolize || \
81 existence slibtool; then 81 existence slibtool; then
82 autoreconf -if 82 autoreconf -if || exit 1
83 . "bin/pogen.sh" 83 . "bin/pogen.sh" || exit 1
84 else 84 else
85 echo "*** No libtoolize (libtool) or libtool found, please install it ***" >&2; 85 echo "*** No libtoolize (libtool) or libtool found, please install it ***" >&2;
86 exit 1 86 exit 1