From d3169e48c0fc1cadc525a3a5061dffac07c1f363 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Wed, 15 Jun 2022 14:47:58 -0700
Subject: [PATCH] Remove deprecated --enable-mobile-ipv6 configure argument

---
 .cirrus.yml |  3 ---
 configure   | 11 -----------
 2 files changed, 14 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 6467129335..7b80236eaa 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -15,7 +15,6 @@ static_config: &STATIC_CONFIG --build-type=release --disable-broker-tests --enab
 asan_sanitizer_config: &ASAN_SANITIZER_CONFIG --build-type=debug --disable-broker-tests --sanitizers=address --enable-fuzzers --enable-coverage --disable-spicy --ccache
 ubsan_sanitizer_config: &UBSAN_SANITIZER_CONFIG --build-type=debug --disable-broker-tests --sanitizers=undefined --enable-fuzzers --disable-spicy --ccache
 tsan_sanitizer_config: &TSAN_SANITIZER_CONFIG --build-type=debug --disable-broker-tests --sanitizers=thread --enable-fuzzers --disable-spicy --ccache
-mobile_ipv6_config: &MOBILE_IPV6_CONFIG --build-type=release --enable-mobile-ipv6 --disable-broker-tests --prefix=$CIRRUS_WORKING_DIR/install --ccache
 openssl30_config: &OPENSSL30_CONFIG --build-type=release --disable-broker-tests --with-openssl=/opt/openssl --prefix=$CIRRUS_WORKING_DIR/install --ccache
 
 resources_template: &RESOURCES_TEMPLATE
@@ -243,8 +242,6 @@ ubuntu18_task:
     dockerfile: ci/ubuntu-18.04/Dockerfile
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
-  env:
-    ZEEK_CI_CONFIGURE_FLAGS: *MOBILE_IPV6_CONFIG
 
 alpine_task:
   container:
diff --git a/configure b/configure
index 01f5b9c90d..48323fef33 100755
--- a/configure
+++ b/configure
@@ -57,7 +57,6 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
     --enable-debug         compile in debugging mode (like --build-type=Debug)
     --enable-fuzzers       build fuzzer targets
     --enable-jemalloc      link against jemalloc
-    --enable-mobile-ipv6   analyze mobile IPv6 features defined by RFC 6275
     --enable-perftools     enable use of Google perftools (use tcmalloc)
     --enable-perftools-debug use Google's perftools for debugging
     --enable-static-binpac build binpac statically (ignored if --with-binpac is specified)
@@ -180,8 +179,6 @@ append_cache_entry CPACK_SOURCE_IGNORE_FILES STRING
 append_cache_entry ZEEK_SANITIZERS STRING ""
 append_cache_entry ZEEK_INCLUDE_PLUGINS STRING ""
 
-has_enable_mobile_ipv6=0
-
 # parse arguments
 while [ $# -ne 0 ]; do
     case "$1" in
@@ -278,9 +275,6 @@ while [ $# -ne 0 ]; do
         --enable-jemalloc)
             append_cache_entry ENABLE_JEMALLOC BOOL true
             ;;
-        --enable-mobile-ipv6)
-            has_enable_mobile_ipv6=1
-            ;;
         --enable-perftools)
             append_cache_entry ENABLE_PERFTOOLS BOOL true
             ;;
@@ -468,8 +462,3 @@ fi
 echo "# This is the command used to configure this build" >config.status
 echo $command >>config.status
 chmod u+x config.status
-
-if [ $has_enable_mobile_ipv6 -eq 1 ]; then
-    echo
-    echo "NOTE: The --enable-mobile-ipv6 argument no longer has any effect and will be removed in v5.1."
-fi