From edafb52302c7082d96ee8a38456bc4422c9a12e3 Mon Sep 17 00:00:00 2001 From: Michael Carlberg Date: Tue, 20 Dec 2016 05:33:07 +0100 Subject: [PATCH] fix(build.sh): Prompt for libcurl support --- README.md | 5 +++-- build.sh | 12 ++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index bef2d0b9..78e22c49 100644 --- a/README.md +++ b/README.md @@ -76,10 +76,11 @@ A compiler with C++14 support ([clang-3.4+](http://llvm.org/releases/download.ht - xcb-util-image Optional dependencies for extended module support: -- jsoncpp (required by `internal/i3`) -- wireless_tools (required by `internal/network`) - alsa-lib (required by `internal/volume`) +- jsoncpp (required by `internal/i3`) - libmpdclient (required by `internal/mpd`) +- libcurl (required by `internal/github`) +- wireless_tools (required by `internal/network`) ~~~ sh # required diff --git a/build.sh b/build.sh index 9ed6e350..35ff3378 100755 --- a/build.sh +++ b/build.sh @@ -32,17 +32,20 @@ function main local enable_i3="ON" local enable_network="ON" local enable_mpd="ON" + local enable_curl="ON" msg "Setting build options" - read -r -p "$(msg "Enable i3 module ------- [Y/n]: ")" -n 1 p && echo + read -r -p "$(msg "Include support for \"internal/i3\" (requires i3) ------------------- [Y/n]: ")" -n 1 p && echo [[ "${p^^}" != "Y" ]] && enable_i3="OFF" - read -r -p "$(msg "Enable volume module --- [Y/n]: ")" -n 1 p && echo + read -r -p "$(msg "Include support for \"internal/volume\" (requires alsalib) ---------- [Y/n]: ")" -n 1 p && echo [[ "${p^^}" != "Y" ]] && enable_alsa="OFF" - read -r -p "$(msg "Enable network module -- [Y/n]: ")" -n 1 p && echo + read -r -p "$(msg "Include support for \"internal/network\" (requires wireless_tools) -- [Y/n]: ")" -n 1 p && echo [[ "${p^^}" != "Y" ]] && enable_network="OFF" - read -r -p "$(msg "Enable mpd module ------ [Y/n]: ")" -n 1 p && echo + read -r -p "$(msg "Include support for \"internal/mpd\" (requires libmpdclient) -------- [Y/n]: ")" -n 1 p && echo [[ "${p^^}" != "Y" ]] && enable_mpd="OFF" + read -r -p "$(msg "Include support for \"internal/github\" (requires libcurl) ---------- [Y/n]: ")" -n 1 p && echo + [[ "${p^^}" != "Y" ]] && enable_curl="OFF" local cxx="c++" local cc="cc" @@ -65,6 +68,7 @@ function main -DENABLE_I3:BOOL="${enable_i3}" \ -DENABLE_MPD:BOOL="${enable_mpd}" \ -DENABLE_NETWORK:BOOL="${enable_network}" \ + -DENABLE_CURL:BOOL="${enable_curl}" \ .. || msg_err "Failed to generate build... read output to get a hint of what went wrong" msg "Building project"