From: Evan Hunt <each@isc.org>
Date: Tue, 2 Jul 2019 23:33:00 +0000 (-0700)
Subject: remove --with-geoip and change --without-geoip2 to --disable-geoip in CI
X-Git-Tag: v9.15.2~6^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1957bcaa99f7fe1f4b48517e6ce1244d1bed3c62;p=thirdparty%2Fbind9.git

remove --with-geoip and change --without-geoip2 to --disable-geoip in CI
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 470385f4fab..b66abf5c815 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -134,7 +134,6 @@ stages:
     --with-cmocka \
     --with-libxml2 \
     --with-json-c \
-    --with-geoip2 \
     --prefix=$HOME/.local \
     --without-make-clean \
     $EXTRA_CONFIGURE \
@@ -321,7 +320,7 @@ gcc:jessie:amd64:
   variables:
     CC: gcc
     CFLAGS: "-Wall -Wextra -O2 -g"
-    EXTRA_CONFIGURE: "--without-cmocka --with-python --without-geoip2 --with-geoip"
+    EXTRA_CONFIGURE: "--without-cmocka --with-python --disable-geoip"
   <<: *debian_jessie_amd64_image
   <<: *build_job
 
@@ -431,7 +430,7 @@ gcc:xenial:amd64:
   variables:
     CC: gcc
     CFLAGS: "-Wall -Wextra -O2 -g"
-    EXTRA_CONFIGURE: "--without-geoip2 --with-geoip"
+    EXTRA_CONFIGURE: "--disable-geoip"
   <<: *ubuntu_xenial_amd64_image
   <<: *build_job