summaryrefslogtreecommitdiff
path: root/scripts/ci/ci-driver.sh
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/ci/ci-driver.sh')
-rwxr-xr-xscripts/ci/ci-driver.sh13
1 files changed, 7 insertions, 6 deletions
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 2f7aad0709..15eab04d41 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -37,6 +37,7 @@ ALL_BUGS_ARE_FATAL="${ALL_BUGS_ARE_FATAL:-no}"
DISABLE_DIRAUTH="${DISABLE_DIRAUTH:-no}"
DISABLE_RELAY="${DISABLE_RELAY:-no}"
NSS="${NSS:-no}"
+GPL="${GPL:-no}"
# Options for which tests to run. All should be yes/no.
CHECK="${CHECK:-yes}"
@@ -200,6 +201,7 @@ yes_or_no ALL_BUGS_ARE_FATAL
yes_or_no DISABLE_DIRAUTH
yes_or_no DISABLE_RELAY
yes_or_no NSS
+yes_or_no GPL
yes_or_no RUN_STAGE_CONFIGURE
yes_or_no RUN_STAGE_BUILD
@@ -262,6 +264,9 @@ fi
if [[ "$NSS" == "yes" ]]; then
configure_options+=("--enable-nss")
fi
+if [[ "$GPL" == "yes" ]]; then
+ configure_options+=("--enable-gpl")
+fi
#############################################################################
# Tell the user about our versions of different tools and packages.
@@ -293,15 +298,11 @@ TOR_VER_AT_LEAST_044=no
# These are the currently supported Tor versions; no need to work with anything
# ancient in this script.
case "$TOR_VERSION" in
- 0.4.5.*)
- TOR_VER_AT_LEAST_043=yes
- TOR_VER_AT_LEAST_044=yes
- ;;
- 0.4.6.*)
+ 0.4.7.*)
TOR_VER_AT_LEAST_043=yes
TOR_VER_AT_LEAST_044=yes
;;
- 0.4.7.*)
+ 0.4.8.*)
TOR_VER_AT_LEAST_043=yes
TOR_VER_AT_LEAST_044=yes
;;